项目成本专用费、事务费、外协费详情

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/controller/ProjectChbSwfController.java

@@ -49,7 +49,14 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IProjectChbSwfService> {
 	@Autowired
 	private IProjectChbSwfService projectChbSwfService;
-	
+
+	/**项目成本——事务费详情——根据任务号查询*/
+	@ApiOperation("项目成本——事务费详情")
+	@GetMapping("/getSWFDetailList")
+	public List<ProjectChbSwf> getSWFDetailList(String taskno){
+		return projectChbSwfService.getSWFDetailList(taskno);
+	}
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +78,7 @@ public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IPro
 		IPage<ProjectChbSwf> pageList = projectChbSwfService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +93,7 @@ public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IPro
 		projectChbSwfService.save(projectChbSwf);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +108,7 @@ public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IPro
 		projectChbSwfService.updateById(projectChbSwf);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +123,7 @@ public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IPro
 		projectChbSwfService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +138,7 @@ public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IPro
 		this.projectChbSwfService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/mapper/ProjectChbSwfMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.projectChbSwf.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProjectChbSwfMapper extends BaseMapper<ProjectChbSwf> {
 
+    /**项目成本——事务费详情——根据任务号查询*/
+    @Select("select * from kzks_project_chb_swf where taskno = #{taskno}")
+    public List<ProjectChbSwf> getSWFDetailList(@Param("taskno") String taskno);
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/service/IProjectChbSwfService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
 
+import java.util.List;
+
 /**
  * @Description: 事务费
  * @Author: jeecg-boot
@@ -12,6 +14,9 @@ import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
  */
 public interface IProjectChbSwfService extends IService<ProjectChbSwf> {
 
+    /**项目成本——事务费详情——根据任务号查询*/
+    public List<ProjectChbSwf> getSWFDetailList(String taskno);
+
     /**
      * 通过excel导入数据
      * @return

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/service/impl/ProjectChbSwfServiceImpl.java

@@ -34,6 +34,11 @@ public class ProjectChbSwfServiceImpl extends ServiceImpl<ProjectChbSwfMapper, P
     @SuppressWarnings("all")
     public ProjectChbSwfMapper swfMapper;
 
+    /**项目成本——事务费详情——根据任务号查询*/
+    public List<ProjectChbSwf> getSWFDetailList(String taskno){
+        return swfMapper.getSWFDetailList(taskno);
+    }
+
     /**
      * 通过excel导入数据
      * @return

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/controller/ProjectChbWxfController.java

@@ -1,42 +1,27 @@
 package org.jeecg.modules.projectChbWxf.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
-import org.jeecg.modules.projectChbWxf.service.IProjectChbWxfService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
+import org.jeecg.modules.projectChbWxf.service.IProjectChbWxfService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
  * @Description: 外协费
  * @Author: jeecg-boot
  * @Date:   2023-08-10
@@ -49,7 +34,15 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IProjectChbWxfService> {
 	@Autowired
 	private IProjectChbWxfService projectChbWxfService;
-	
+
+	 /**项目成本——外协费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——外协费详情")
+	 @GetMapping("/getWXFDetailList")
+	 public List<ProjectChbWxf> getWXFDetailList(String taskno){
+		 return projectChbWxfService.getWXFDetailList(taskno);
+	 }
+
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +64,7 @@ public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IPro
 		IPage<ProjectChbWxf> pageList = projectChbWxfService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +79,7 @@ public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IPro
 		projectChbWxfService.save(projectChbWxf);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +94,7 @@ public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IPro
 		projectChbWxfService.updateById(projectChbWxf);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +109,7 @@ public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IPro
 		projectChbWxfService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +124,7 @@ public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IPro
 		this.projectChbWxfService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/mapper/ProjectChbWxfMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.projectChbWxf.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProjectChbWxfMapper extends BaseMapper<ProjectChbWxf> {
 
+    /**项目成本——外协费详情——根据任务号查询*/
+    @Select("select * from kzks_project_chb_wxf where taskno = #{taskno}")
+    public List<ProjectChbWxf> getWXFDetailList(String taskno);
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/service/IProjectChbWxfService.java

@@ -1,8 +1,10 @@
 package org.jeecg.modules.projectChbWxf.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
-import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
 
 /**
  * @Description: 外协费
@@ -12,6 +14,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProjectChbWxfService extends IService<ProjectChbWxf> {
 
+
+    /**项目成本——外协费详情——根据任务号查询*/
+    public List<ProjectChbWxf> getWXFDetailList(String taskno);
+
     /**
      * 通过excel导入数据
      * @return

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/service/impl/ProjectChbWxfServiceImpl.java

@@ -36,6 +36,12 @@ public class ProjectChbWxfServiceImpl extends ServiceImpl<ProjectChbWxfMapper, P
     @SuppressWarnings("all")
     public ProjectChbWxfMapper wxfMapper;
 
+
+    /**项目成本——外协费详情——根据任务号查询*/
+    public List<ProjectChbWxf> getWXFDetailList(String taskno){
+        return wxfMapper.getWXFDetailList(taskno);
+    }
+
     /**
      * 通过excel导入数据
      * @return

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/controller/ProjectChbZyfController.java

@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.checkerframework.checker.units.qual.A;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -49,7 +51,15 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IProjectChbZyfService> {
 	@Autowired
 	private IProjectChbZyfService projectChbZyfService;
-	
+
+
+	 /**项目成本——专用费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——专用费详情")
+	 @GetMapping("/getZYFDetailList")
+	 public List<ProjectChbZyf> getZYFDetailList(String taskno){
+		 return projectChbZyfService.getZYFDetailList(taskno);
+	 }
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +81,7 @@ public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IPro
 		IPage<ProjectChbZyf> pageList = projectChbZyfService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +96,7 @@ public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IPro
 		projectChbZyfService.save(projectChbZyf);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +111,7 @@ public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IPro
 		projectChbZyfService.updateById(projectChbZyf);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +126,7 @@ public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IPro
 		projectChbZyfService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +141,7 @@ public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IPro
 		this.projectChbZyfService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/mapper/ProjectChbZyfMapper.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.projectChbZyf.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,6 +16,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProjectChbZyfMapper extends BaseMapper<ProjectChbZyf> {
 
-    public void truncateTableByYear();
+    /**项目成本——专用费详情——根据任务号查询*/
+    @Select("select * from kzks_project_chb_zyf where taskno = #{taskno}")
+    public List<ProjectChbZyf> getZYFDetailList(String taskno);
 
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/service/IProjectChbZyfService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbZyf.service;
 
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -7,6 +8,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * @Description: 专用费
@@ -16,7 +18,8 @@ import javax.servlet.http.HttpServletResponse;
  */
 public interface IProjectChbZyfService extends IService<ProjectChbZyf> {
 
-    public void truncateTableByYear();
+    /**项目成本——专用费详情——根据任务号查询*/
+    public List<ProjectChbZyf> getZYFDetailList(String taskno);
 
     public Result<?> importExcel1(String strUrl, Class<ProjectChbZyf> clazz);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/service/impl/ProjectChbZyfServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.projectChbZyf.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
 import org.jeecg.modules.projectChbZyf.mapper.ProjectChbZyfMapper;
@@ -39,6 +40,11 @@ public class ProjectChbZyfServiceImpl extends ServiceImpl<ProjectChbZyfMapper, P
     @SuppressWarnings("all")
     public ProjectChbZyfMapper zyfMapper;
 
+    /**项目成本——专用费详情——根据任务号查询*/
+    public List<ProjectChbZyf> getZYFDetailList(String taskno){
+        return zyfMapper.getZYFDetailList(taskno);
+    }
+
     /**
      * 通过excel导入数据
      * @return
@@ -115,8 +121,4 @@ public class ProjectChbZyfServiceImpl extends ServiceImpl<ProjectChbZyfMapper, P
             }
         }
     }
-
-    public void truncateTableByYear(){
-        zyfMapper.truncateTableByYear();
-    }
 }

module_kzks/src/main/java/org/jeecg/modules/projectImportList/controller/ProjectImportListController.java

@@ -22,18 +22,11 @@ import org.jeecg.modules.projectChbZyf.service.IProjectChbZyfService;
 import org.jeecg.modules.projectImportList.entity.ProjectImportList;
 import org.jeecg.modules.projectImportList.service.IProjectImportListService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StreamUtils;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.Arrays;
 
 /**
@@ -65,19 +58,6 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 	@SuppressWarnings("all")
 	private JeecgBaseConfig jeecgBaseConfig;
 
-	 /**
-	  * 通过excel导入数据——————原表数据
-	  *
-	  * @param request
-	  * @param response
-	  * @return
-	  */
-	 //@RequiresPermissions("kzks_project_import_list:importExcel")
-	 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-	 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-		 return super.importExcel(request, response, ProjectImportList.class);
-	 }
-
 
 	 /**
 	  * 通过excel导入其他表的数据
@@ -91,7 +71,6 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 	  */
 	 @ApiOperation(value="导入并解析数据——专用费4", notes="导入并解析数据——专用费4")
 	 @RequestMapping(value = "/importOtherExcel", method = RequestMethod.POST)
-//	 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)//
 	 public Result<?> importOtherExcel(@RequestBody ProjectImportList projectImportList,HttpServletRequest request, HttpServletResponse response) {
 
 		 Result<?> result = new Result<>();
@@ -229,5 +208,16 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
     }
 
 
-
+	/**
+	 * 通过excel导入数据——————原表数据
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	//@RequiresPermissions("kzks_project_import_list:importExcel")
+	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+		return super.importExcel(request, response, ProjectImportList.class);
+	}
 }