项目成本导入优化新版

module_kzks/src/main/java/org/jeecg/modules/projectBudgetNew/controller/ProjectBudgetNewController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.projectBudgetNew.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.projectBudgetNew.entity.ProjectBudgetNew;
+import org.jeecg.modules.projectBudgetNew.service.IProjectBudgetNewService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.system.base.controller.JeecgController;
+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;
+
+ /**
+ * @Description: 项目预算新版
+ * @Author: jeecg-boot
+ * @Date:   2024-03-06
+ * @Version: V1.0
+ */
+@Api(tags="项目预算新版")
+@RestController
+@RequestMapping("/projectBudgetNew/projectBudgetNew")
+@Slf4j
+public class ProjectBudgetNewController extends JeecgController<ProjectBudgetNew, IProjectBudgetNewService> {
+	@Autowired
+	private IProjectBudgetNewService projectBudgetNewService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectBudgetNew
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "项目预算新版-分页列表查询")
+	@ApiOperation(value="项目预算新版-分页列表查询", notes="项目预算新版-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ProjectBudgetNew>> queryPageList(ProjectBudgetNew projectBudgetNew,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectBudgetNew> queryWrapper = QueryGenerator.initQueryWrapper(projectBudgetNew, req.getParameterMap());
+		Page<ProjectBudgetNew> page = new Page<ProjectBudgetNew>(pageNo, pageSize);
+		IPage<ProjectBudgetNew> pageList = projectBudgetNewService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param projectBudgetNew
+	 * @return
+	 */
+	@AutoLog(value = "项目预算新版-添加")
+	@ApiOperation(value="项目预算新版-添加", notes="项目预算新版-添加")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_budget_new:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ProjectBudgetNew projectBudgetNew) {
+		projectBudgetNewService.save(projectBudgetNew);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param projectBudgetNew
+	 * @return
+	 */
+	@AutoLog(value = "项目预算新版-编辑")
+	@ApiOperation(value="项目预算新版-编辑", notes="项目预算新版-编辑")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_budget_new:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ProjectBudgetNew projectBudgetNew) {
+		projectBudgetNewService.updateById(projectBudgetNew);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目预算新版-通过id删除")
+	@ApiOperation(value="项目预算新版-通过id删除", notes="项目预算新版-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_budget_new:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		projectBudgetNewService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "项目预算新版-批量删除")
+	@ApiOperation(value="项目预算新版-批量删除", notes="项目预算新版-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_budget_new:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.projectBudgetNewService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "项目预算新版-通过id查询")
+	@ApiOperation(value="项目预算新版-通过id查询", notes="项目预算新版-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ProjectBudgetNew> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectBudgetNew projectBudgetNew = projectBudgetNewService.getById(id);
+		if(projectBudgetNew==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectBudgetNew);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectBudgetNew
+    */
+    //@RequiresPermissions("org.jeecg.modules:kzks_project_budget_new:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectBudgetNew projectBudgetNew) {
+        return super.exportXls(request, projectBudgetNew, ProjectBudgetNew.class, "项目预算新版");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kzks_project_budget_new:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectBudgetNew.class);
+    }
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectBudgetNew/entity/ProjectBudgetNew.java

@@ -0,0 +1,86 @@
+package org.jeecg.modules.projectBudgetNew.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 项目预算新版
+ * @Author: jeecg-boot
+ * @Date:   2024-03-06
+ * @Version: V1.0
+ */
+@Data
+@TableName("kzks_project_budget_new")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kzks_project_budget_new对象", description="项目预算新版")
+public class ProjectBudgetNew implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**型号分类*/
+	@Excel(name = "型号分类", width = 15)
+    @ApiModelProperty(value = "型号分类")
+    private java.lang.String model;
+	/**任务号*/
+	@Excel(name = "任务号", width = 15)
+    @ApiModelProperty(value = "任务号")
+    private java.lang.String taskNumber;
+	/**任务名称*/
+	@Excel(name = "任务名称", width = 15)
+    @ApiModelProperty(value = "任务名称")
+    private java.lang.String taskName;
+	/**责任部门*/
+	@Excel(name = "责任部门", width = 15)
+    @ApiModelProperty(value = "责任部门")
+    private java.lang.String zrbm;
+	/**提出单位*/
+	@Excel(name = "提出单位", width = 15)
+    @ApiModelProperty(value = "提出单位")
+    private java.lang.String tcUnit;
+	/**费用类型*/
+	@Excel(name = "费用类型", width = 15)
+    @ApiModelProperty(value = "费用类型")
+    private java.lang.String fyType;
+	/**费用（万元）*/
+	@Excel(name = "费用（万元）", width = 15)
+    @ApiModelProperty(value = "费用（万元）")
+    private java.lang.String fy;
+}

module_kzks/src/main/java/org/jeecg/modules/projectBudgetNew/mapper/ProjectBudgetNewMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.projectBudgetNew.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.projectBudgetNew.entity.ProjectBudgetNew;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 项目预算新版
+ * @Author: jeecg-boot
+ * @Date:   2024-03-06
+ * @Version: V1.0
+ */
+public interface ProjectBudgetNewMapper extends BaseMapper<ProjectBudgetNew> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectBudgetNew/mapper/xml/ProjectBudgetNewMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.projectBudgetNew.mapper.ProjectBudgetNewMapper">
+
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/projectBudgetNew/service/IProjectBudgetNewService.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.projectBudgetNew.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.projectBudgetNew.entity.ProjectBudgetNew;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 项目预算新版
+ * @Author: jeecg-boot
+ * @Date:   2024-03-06
+ * @Version: V1.0
+ */
+public interface IProjectBudgetNewService extends IService<ProjectBudgetNew> {
+
+    /**
+     * 通过excel导入项目预算
+     * @return
+     */
+    public Result<?> importExcel1(String strUrl, Class<ProjectBudgetNew> clazz);
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectBudgetNew/service/impl/ProjectBudgetNewServiceImpl.java

@@ -0,0 +1,147 @@
+package org.jeecg.modules.projectBudgetNew.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.projectBudget.entity.ProjectBudget;
+import org.jeecg.modules.projectBudget.mapper.ProjectBudgetMapper;
+import org.jeecg.modules.projectBudgetNew.entity.ProjectBudgetNew;
+import org.jeecg.modules.projectBudgetNew.mapper.ProjectBudgetNewMapper;
+import org.jeecg.modules.projectBudgetNew.service.IProjectBudgetNewService;
+import org.jeecg.modules.projectCost.mapper.ProjectCostMapper;
+import org.jeecg.modules.projectCostYs.entity.KzksProjectCostYs;
+import org.jeecg.modules.projectCostYs.mapper.KzksProjectCostYsMapper;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * @Description: 项目预算新版
+ * @Author: jeecg-boot
+ * @Date:   2024-03-06
+ * @Version: V1.0
+ */
+@Slf4j
+@Service
+public class ProjectBudgetNewServiceImpl extends ServiceImpl<ProjectBudgetNewMapper, ProjectBudgetNew> implements IProjectBudgetNewService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    public ProjectBudgetNewMapper projectBudgetNewMapper;
+    @Autowired
+    @SuppressWarnings("all")
+    public KzksProjectCostYsMapper costYsMapper;
+
+    /**
+     * 通过excel导入项目预算
+     * @return
+     */
+    public Result<?> importExcel1(String strUrl, Class<ProjectBudgetNew> clazz) {
+
+        InputStream inputStream = null;
+        try {
+            inputStream = new FileInputStream(strUrl);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        // 获取上传文件对象
+        ImportParams params = new ImportParams();
+        params.setTitleRows(0);/*表格标题所占行数（默认是0）*/
+        params.setHeadRows(1);/*表头所占据的行数行数,默认1，代表标题占据一行*/
+        params.setNeedSave(true);
+        try {
+            List<ProjectBudgetNew> list = ExcelImportUtil.importExcel(inputStream, clazz, params);
+
+            //处理数据、每个任务号有唯一的项目预算
+            Map<String, Object> columnMap;
+            for (ProjectBudgetNew budget : list){
+                BigDecimal clys = null;//材料费
+                BigDecimal wxys = null;//外协费
+                BigDecimal swys = null;//事务费
+                BigDecimal zyys = null;//专用费
+                BigDecimal jjys = null;//间接费
+
+                BigDecimal ys = new BigDecimal(budget.getFy());
+
+                switch (budget.getFyType()){
+                    case "材料费":
+                        clys = ys;
+                    case "外协费":
+                        wxys = ys;
+                    case "事务费":
+                        swys = ys;
+                    case "专用费":
+                        zyys = ys;
+                    case "间接费":
+                        jjys = ys;
+                }
+
+                if(budget.getTaskNumber()!=null && !budget.getTaskNumber().equals("")){
+                    //删除原来的项目预算
+                    columnMap = new HashMap<>();
+                    columnMap.put("task_number",budget.getTaskNumber());
+                    this.projectBudgetNewMapper.deleteByMap(columnMap);
+
+                    //根据任务号查对应的预算
+                    QueryWrapper<KzksProjectCostYs> ysQueryWrapper = new QueryWrapper<>();
+                    ysQueryWrapper.eq("taskno",budget.getTaskNumber());
+                    KzksProjectCostYs costYs = costYsMapper.selectOne(ysQueryWrapper);
+                    if(costYs!=null){
+                        //修改项目成本对应任务号的材料预算、外协预算——单独一个表
+                        costYsMapper.updateYSNew(clys,wxys, swys, zyys, jjys, budget.getTaskNumber());
+                    }
+                    else{
+                        KzksProjectCostYs kzksProjectCostYs = new KzksProjectCostYs();
+                        kzksProjectCostYs.setClys(clys);
+                        kzksProjectCostYs.setWxys(wxys);
+                        kzksProjectCostYs.setSwys(swys);
+                        kzksProjectCostYs.setZyys(zyys);
+                        kzksProjectCostYs.setJjys(jjys);
+                        kzksProjectCostYs.setTaskno(budget.getTaskNumber());
+                        costYsMapper.insert(kzksProjectCostYs);
+                    }
+                }
+            }
+
+            //update-begin-author:taoyan date:20190528 for:批量插入数据
+            long start = System.currentTimeMillis();
+            this.saveBatch(list);
+            //400条 saveBatch消耗时间1592毫秒  循环插入消耗时间1947毫秒
+            //1200条  saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
+            log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
+            //update-end-author:taoyan date:20190528 for:批量插入数据
+            return Result.ok("文件导入成功！数据行数：" + list.size());
+        } catch (Exception e) {
+            //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
+            String msg = e.getMessage();
+            log.error(msg, e);
+            if(msg!=null && msg.indexOf("Duplicate entry")>=0){
+                return Result.error("文件导入失败:有重复数据！");
+            }else{
+                return Result.error("文件导入失败:" + e.getMessage());
+            }
+            //update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
+        } finally {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectCostYs/entity/KzksProjectCostYs.java

@@ -48,6 +48,18 @@ public class KzksProjectCostYs implements Serializable {
 	@Excel(name = "外协预算", width = 15)
     @ApiModelProperty(value = "外协预算")
     private java.math.BigDecimal wxys;
+    /**事务费预算*/
+    @Excel(name = "事务费预算", width = 15)
+    @ApiModelProperty(value = "事务费预算")
+    private java.math.BigDecimal swys;
+    /**专用费预算*/
+    @Excel(name = "专用费预算", width = 15)
+    @ApiModelProperty(value = "专用费预算")
+    private java.math.BigDecimal zyys;
+    /**间接费预算*/
+    @Excel(name = "间接费预算", width = 15)
+    @ApiModelProperty(value = "间接费预算")
+    private java.math.BigDecimal jjys;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;

module_kzks/src/main/java/org/jeecg/modules/projectCostYs/mapper/KzksProjectCostYsMapper.java

@@ -24,6 +24,9 @@ public interface KzksProjectCostYsMapper extends BaseMapper<KzksProjectCostYs> {
     @Select("update kzks_project_cost_ys set clys = #{clys}, wxys = #{wxys} where taskno = #{taskno}")
     public void updateYS(BigDecimal clys, BigDecimal wxys, String taskno);
 
+    /**修改该任务号的材料预算及外协预算、事务预算、专用预算、间接预算*/
+    public void updateYSNew(@Param("clys") BigDecimal clys, @Param("wxys") BigDecimal wxys, @Param("swys") BigDecimal swys, @Param("zyys") BigDecimal zyys, @Param("jjys") BigDecimal jjys, @Param("taskno") String taskno);
+
     @Select("select sum(clys) as clys,sum(wxys) as wxys from kzks_project_cost_ys ")
     KzksProjectCostYs selectSumClys();
 

module_kzks/src/main/java/org/jeecg/modules/projectCostYs/mapper/xml/KzksProjectCostYsMapper.xml

@@ -10,4 +10,25 @@
             #{taskNo}
         </foreach>
     </select>
+
+    <update id="updateYSNew">
+        update kzks_project_cost_ys set
+        <if test="clys!=null">
+            clys = #{clys},
+        </if>
+        <if test="wxys!=null">
+            wxys = #{wxys},
+        </if>
+        <if test="swys!=null">
+            swys = #{swys},
+        </if>
+        <if test="zyys!=null">
+            zyys = #{zyys},
+        </if>
+        <if test="jjys!=null">
+            jjys = #{jjys}
+        </if>
+        where taskno = #{taskno}
+    </update>
+
 </mapper>

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

@@ -19,6 +19,8 @@ import org.jeecg.modules.kyTaskTemp.entity.KyTaskTemp;
 import org.jeecg.modules.kyTaskTemp.service.IKyTaskTempService;
 import org.jeecg.modules.projectBudget.entity.ProjectBudget;
 import org.jeecg.modules.projectBudget.service.IProjectBudgetService;
+import org.jeecg.modules.projectBudgetNew.entity.ProjectBudgetNew;
+import org.jeecg.modules.projectBudgetNew.service.IProjectBudgetNewService;
 import org.jeecg.modules.projectImportList.dto.ProjectChb;
 import org.jeecg.modules.projectImportList.entity.ProjectImportList;
 import org.jeecg.modules.projectImportList.service.IProjectImportListService;
@@ -53,6 +55,9 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
     private IProjectBudgetService budgetService;
     @Autowired
     @SuppressWarnings("all")
+    private IProjectBudgetNewService projectBudgetNewService;
+    @Autowired
+    @SuppressWarnings("all")
     private JeecgBaseConfig jeecgBaseConfig;
     @Autowired
     @SuppressWarnings("all")
@@ -93,7 +98,8 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
         System.out.println("文件地址为：" + url);
 
         if (projectImportList.getFileType().equals("1")) { //项目预算
-            return budgetService.importExcel1(url, ProjectBudget.class);
+//            return budgetService.importExcel1(url, ProjectBudget.class);
+            return projectBudgetNewService.importExcel1(url, ProjectBudgetNew.class);
         } else if (projectImportList.getFileType().equals("2")) { //项目费用
             return projectImportListService.importExcel1(url, ProjectChb.class);
         } else if (projectImportList.getFileType().equals("3")) { //科目编号