fix预算

module_kzks/src/main/java/org/jeecg/modules/projectBudget/service/impl/ProjectBudgetServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectBudget.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
@@ -7,6 +8,8 @@ import org.jeecg.modules.projectBudget.entity.ProjectBudget;
 import org.jeecg.modules.projectBudget.mapper.ProjectBudgetMapper;
 import org.jeecg.modules.projectBudget.service.IProjectBudgetService;
 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;
@@ -39,6 +42,9 @@ public class ProjectBudgetServiceImpl extends ServiceImpl<ProjectBudgetMapper, P
     @Autowired
     @SuppressWarnings("all")
     public ProjectCostMapper costMapper;
+    @Autowired
+    @SuppressWarnings("all")
+    public KzksProjectCostYsMapper costYsMapper;
 
 
     /**计算外协预算*/
@@ -126,8 +132,21 @@ public class ProjectBudgetServiceImpl extends ServiceImpl<ProjectBudgetMapper, P
                     columnMap.put("task_number",budget.getTaskNumber());
                     this.budgetMapper.deleteByMap(columnMap);
 
-                    //修改项目成本对应任务号的材料预算、外协预算
-                    costMapper.updateYS(clys,wxys,budget.getTaskNumber());
+                    //根据任务号查对应的预算
+                    QueryWrapper<KzksProjectCostYs> ysQueryWrapper = new QueryWrapper<>();
+                    ysQueryWrapper.eq("taskno",budget.getTaskNumber());
+                    KzksProjectCostYs costYs = costYsMapper.selectOne(ysQueryWrapper);
+                    if(costYs!=null){
+                        //修改项目成本对应任务号的材料预算、外协预算——单独一个表
+                        costYsMapper.updateYS(clys,wxys,budget.getTaskNumber());
+                    }
+                    else{
+                        KzksProjectCostYs ys = new KzksProjectCostYs();
+                        ys.setClys(clys);
+                        ys.setWxys(wxys);
+                        ys.setTaskno(budget.getTaskNumber());
+                        costYsMapper.insert(ys);
+                    }
                 }
             }
 

module_kzks/src/main/java/org/jeecg/modules/projectCost/mapper/ProjectCostMapper.java

@@ -17,10 +17,6 @@ import org.jeecg.modules.projectCost.vo.ProjectCostVO;
  */
 public interface ProjectCostMapper extends BaseMapper<ProjectCost> {
 
-    /**修改该任务号的材料预算及外协预算*/
-    @Select("update kzks_project_cost set clys = #{clys}, wxys = #{wxys} where taskno = #{taskno}")
-    public void updateYS(BigDecimal clys,BigDecimal wxys, String taskno);
-
     /**根据任务号查询项目成本的主任务及组批后的主任务*/
     public List<ProjectCostVO> costListByTaskNoMain(String taskno);
 

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

@@ -33,7 +33,7 @@ public class KzksProjectCostYs implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     private java.lang.Integer id;
 	/**任务号*/

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

@@ -1,8 +1,10 @@
 package org.jeecg.modules.projectCostYs.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectCostYs.entity.KzksProjectCostYs;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +16,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 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);
+
 }