Переглянути джерело

归一化展示(增加单个研制数量相关数据对比)

sl 1 рік тому
батько
коміт
a97fc2980e

+ 1 - 0
module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -103,6 +103,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 //    }
     public ProjectCostHuijiCompare compareList(String ids){
         return projectCostHuijiService.compareListByIds(Arrays.asList(ids.split(",")));
+
     }
 
     /**

+ 1 - 0
module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/entity/ProjectCostHuiji.java

@@ -306,6 +306,7 @@ public class ProjectCostHuiji implements Serializable, Cloneable {
     @ApiModelProperty(value = "生产工时")
     private java.math.BigDecimal scgs;
 
+
     @Override
     public ProjectCostHuiji clone() {
         try {

+ 22 - 0
module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/entity/ProjectCostHuijiCompare.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.projectCostHuiji.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * ClassName: ProjectCostHuijiCompare
+ * Package: org.jeecg.modules.projectCostHuiji.entity
+ * Description:
+ *
+ * @Author sl
+ * @Create 2023/10/24 17:07
+ * @Version 1.0
+ */
+@Data
+public class ProjectCostHuijiCompare {
+    //对比  总的
+    private List<ProjectCostHuiji> compareAll;
+    //对比  每台
+    private List<ProjectCostHuiji> compareOne;
+}

+ 1 - 0
module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/IProjectCostHuijiService.java

@@ -31,6 +31,7 @@ public interface IProjectCostHuijiService extends IService<ProjectCostHuiji> {
     //sl修改添加每台的对比
     public ProjectCostHuijiCompare compareListByIds(List<String> ids);
 
+
     /**计算项目成本汇集的总和*/
     public ProjectCostHuiji costHJSum(ProjectCostHuiji projectCostHuiji);
 

+ 1 - 0
module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/impl/ProjectCostHuijiServiceImpl.java

@@ -79,6 +79,7 @@ public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMap
                 if(projectCostHuiji1.getWorkhour() != null) projectCostHuiji1.setWorkhour(projectCostHuiji1.getWorkhour().divide(yzslBigDec, 2, RoundingMode.HALF_UP));//工时
             }
             listOne.add(projectCostHuiji1);
+
         }
         projectCostHuijiCompare.setCompareAll(listAll);//总的数据对比
         projectCostHuijiCompare.setCompareOne(listOne);//单个研制数量的数据对比