修复产品价格库一些bug

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/entity/ProjectCostHuiji.java

@@ -310,7 +310,7 @@ public class ProjectCostHuiji implements Serializable, Cloneable {
      */
     @Excel(name = "状态",width = 15)
     @ApiModelProperty(value = "状态")
-    private java.lang.String status;
+    private java.lang.String hjstatus;
 
 
     @Override

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/mapper/xml/ProjectCostHuijiMapper.xml

@@ -79,7 +79,7 @@
 
     <!-- 根据任务号批量修改status 改为"4" -->
     <update id="updateStatus1">
-        update kzks_project_cost_huiji set status = '4' where taskno in
+        update kzks_project_cost_huiji set hjstatus = '4' where taskno in
         <foreach collection="tasknoList" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -87,7 +87,7 @@
 
     <!-- 根据任务号批量修改status 改为"0" -->
     <update id="updateStatus2">
-        update kzks_project_cost_huiji set status = '0' where taskno in
+        update kzks_project_cost_huiji set hjstatus = '0' where taskno in
         <foreach collection="tasknoList" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/impl/ProjectCostHuijiServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.ObjectUtils;
+import org.checkerframework.checker.nullness.Opt;
 import org.jeecg.modules.costModelProductPrice.entity.KzksCostModelProductPrice;
 import org.jeecg.modules.costModelProductPrice.mapper.KzksCostModelProductPriceMapper;
 import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
@@ -189,6 +190,24 @@ public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMap
             // 单台 -- 生产工时
             BigDecimal oneScgs = BigDecimal.valueOf(0);
 
+            projectCostHuiji.setEstimationcoat(Optional.ofNullable(projectCostHuiji.getEstimationcoat()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setContractfpe(Optional.ofNullable(projectCostHuiji.getContractfpe()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setTaskmoney(Optional.ofNullable(projectCostHuiji.getTaskmoney()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setClf(Optional.ofNullable(projectCostHuiji.getClf()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setZcb(Optional.ofNullable(projectCostHuiji.getZcb()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setSwf(Optional.ofNullable(projectCostHuiji.getSwf()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setWxf(Optional.ofNullable(projectCostHuiji.getWxf()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setZyf(Optional.ofNullable(projectCostHuiji.getZyf()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setRldlf(Optional.ofNullable(projectCostHuiji.getRldlf()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setGdzczj(Optional.ofNullable(projectCostHuiji.getGdzczj()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setGzjlwf(Optional.ofNullable(projectCostHuiji.getGzjlwf()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setGlf(Optional.ofNullable(projectCostHuiji.getGlf()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setZjcb(Optional.ofNullable(projectCostHuiji.getZjcb()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setLbsy(Optional.ofNullable(projectCostHuiji.getLbsy()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setWorkhour(Optional.ofNullable(projectCostHuiji.getWorkhour()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setSjgs(Optional.ofNullable(projectCostHuiji.getSjgs()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setScgs(Optional.ofNullable(projectCostHuiji.getScgs()).orElse(BigDecimal.ZERO));
+
 
             if (yzsl.compareTo(BigDecimal.ZERO) != 0) {
                 // 单台 -- 预估价
@@ -281,7 +300,7 @@ public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMap
                 productPrice.setBusinessman(projectCostHuiji.getBusinessman());
             productPrice.setSjgs(oneSjgs);
             productPrice.setScgs(oneScgs);
-            String status = Optional.ofNullable(projectCostHuiji.getStatus()).orElse("0");
+            String status = Optional.ofNullable(projectCostHuiji.getHjstatus()).orElse("0");
             productPrice.setStatus(status);
             productPriceList.add(productPrice);
         }