六矿生成表清洗修改

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActClassificationController.java

@@ -152,19 +152,19 @@ public class ActClassificationController extends BaseController
 
 
 
-    @PreAuthorize("@ss.hasPermission('ActClassification:ActClassification:GetAll')")
-    @GetMapping("/all")
-    public List<ActClassification> getAllActClassifications() {
-        return actClassificationService.getAllActClassifications();
-    }
-
-    @PreAuthorize("@ss.hasPermission('ActClassification:ActClassification:GetSub')")
-    @GetMapping("/sub/{parentId}")
-    public List<ActClassification> getSubActClassifications(@PathVariable("parentId") int parentId) {
-        return actClassificationService.getSubActClassifications(parentId);
-    }
-
-    @PreAuthorize("@ss.hasPermission('ActClassification:ActClassification:SunDy')")
+//    @PreAuthorize("@ss.hasPermission('ActClassification:ActClassification:GetAll')")
+//    @GetMapping("/all")
+//    public List<ActClassification> getAllActClassifications() {
+//        return actClassificationService.getAllActClassifications();
+//    }
+//
+//    @PreAuthorize("@ss.hasPermission('ActClassification:ActClassification:GetSub')")
+//    @GetMapping("/sub/{parentId}")
+//    public List<ActClassification> getSubActClassifications(@PathVariable("parentId") int parentId) {
+//        return actClassificationService.getSubActClassifications(parentId);
+//    }
+
+    @PreAuthorize("@ss.hasPermi('ActClassification:ActClassification:getSubActClassDy')")
     @GetMapping("/SunDy/{sskId}")
     public List<ActClassification> getSubActClassDy(@PathVariable("sskId") int sskId) {
         return actClassificationService.getSubActClassDy(sskId);

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesSixMinesSummaryTable.java

@@ -33,6 +33,11 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
     /** 部门名称 */
     @Excel(name = "部门名称")
     private String departmentName;
+
+    /** 计量单位 */
+    @Excel(name = "计量单位")
+    private String unit;
+
     /** 数量 */
     @Excel(name = "数量")
     private Double number;
@@ -45,6 +50,10 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
     @Excel(name = "金额")
     private Double money;
 
+    /** 费用来源 */
+    @Excel(name = "费用来源")
+    private String costChannels;
+
     /** 创建人 */
     @Excel(name = "创建人")
     private String createBy;
@@ -151,6 +160,22 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
         this.mining = mining;
     }
 
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getCostChannels() {
+        return costChannels;
+    }
+
+    public void setCostChannels(String costChannels) {
+        this.costChannels = costChannels;
+    }
+
     @Override
     public String toString() {
         return "ActSuppliesSixMinesSummaryTable{" +

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesHistorydataServiceImpl.java

@@ -256,15 +256,19 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
 
                         actSuppliesSixMinesSummaryTable.setProjectName(actOperation2s.get(i).getActOperation2()[x][1].getV());
                         actSuppliesSixMinesSummaryTable.setDepartmentName(actOperation2s.get(i).getActOperation2()[x][3].getV());
+                        actSuppliesSixMinesSummaryTable.setUnit(actOperation2s.get(i).getActOperation2()[x][4].getV());
 
-                        if (actOperation2s.get(i).getActOperation2()[x][3].getV() != null) {
-                            actSuppliesSixMinesSummaryTable.setNumber(Double.valueOf(actOperation2s.get(i).getActOperation2()[x][4].getV()));
+                        if (actOperation2s.get(i).getActOperation2()[x][5].getV() != null) {
+                            actSuppliesSixMinesSummaryTable.setNumber(Double.valueOf(actOperation2s.get(i).getActOperation2()[x][5].getV()));
                         }
-                        if (actOperation2s.get(i).getActOperation2()[x][4].getV() != null) {
-                            actSuppliesSixMinesSummaryTable.setNuitPrice(Double.valueOf(actOperation2s.get(i).getActOperation2()[x][5].getV()));
+                        if (actOperation2s.get(i).getActOperation2()[x][6].getV() != null) {
+                            actSuppliesSixMinesSummaryTable.setNuitPrice(Double.valueOf(actOperation2s.get(i).getActOperation2()[x][6].getV()));
                         }
-                        if (actOperation2s.get(i).getActOperation2()[x][5].getV() != null) {
-                            actSuppliesSixMinesSummaryTable.setMoney(Double.valueOf(actOperation2s.get(i).getActOperation2()[x][6].getV()));
+                        if (actOperation2s.get(i).getActOperation2()[x][7].getV() != null) {
+                            actSuppliesSixMinesSummaryTable.setMoney(Double.valueOf(actOperation2s.get(i).getActOperation2()[x][7].getV()));
+                        }
+                        if (actOperation2s.get(i).getActOperation2()[x][8].getV() != null) {
+                            actSuppliesSixMinesSummaryTable.setCostChannels(actOperation2s.get(i).getActOperation2()[x][8].getV());
                         }
 
                         actSuppliesSixMinesSummaryTable.setCreateBy(actOperation2s.get(i).getCreateBy());

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml

@@ -59,9 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">project_id,</if>
             <if test="projectName != null">project_name,</if>
             <if test="departmentName != null">department_name,</if>
+            <if test="unit != null">unit,</if>
             <if test="number != null">number,</if>
             <if test="nuitPrice != null">nuit_price,</if>
             <if test="money != null">money,</if>
+            <if test="costChannels != null">cost_channels,</if>
             <if test="createBy != null">create_by,</if>
             <if test="hDate != null">h_date,</if>
             <if test="mining != null">ssk_id,</if>
@@ -72,9 +74,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">#{projectId},</if>
             <if test="projectName != null">#{projectName},</if>
             <if test="departmentName != null">#{departmentName},</if>
+            <if test="unit != null">#{unit},</if>
             <if test="number != null">#{number},</if>
             <if test="nuitPrice != null">#{nuitPrice},</if>
             <if test="money != null">#{money},</if>
+            <if test="costChannels != null">#{costChannels},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="hDate != null">#{hDate},</if>
             <if test="mining != null">#{mining},</if>