清洗表数据入库,材料编码后端代码优化以及返回矿id

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesCleaningRuleMapper.java

@@ -40,4 +40,6 @@ public interface ActSuppliesCleaningRuleMapper
     void addActSuppliesImportCleaningAcc(@Param("actSuppliesImportCleaningAccs") List<ActSuppliesImportCleaningAcc> actSuppliesImportCleaningAccs);
 
     List<ActSuppliesImportCleaningAcc> selectActSuppliesCleaningCopy(Long id);
+
+    void insert(@Param("accList") List<ActSuppliesImportCleaningAcc> cleaningAccList);
 }

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

 package com.ruoyi.system.service.impl;
 
+import com.ruoyi.system.domain.ActSuppliesImportCleaningAcc;
 import com.ruoyi.system.domain.ActSuppliesMaterialDetails;
 import com.ruoyi.system.domain.ActSuppliesMaterialInfo;
+import com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper;
 import com.ruoyi.system.mapper.ActSuppliesMaterialMapper;
 import com.ruoyi.system.service.ActMaterialService;
 import com.ruoyi.system.service.ActSuppliesMaterialService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
-
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -19,9 +23,11 @@ import java.util.stream.Stream;
  * @date 2024/7/8
  */
 @Service
+@Slf4j
 @RequiredArgsConstructor
 public class ActSuppliesMaterialServiceImpl implements ActSuppliesMaterialService {
     private final ActSuppliesMaterialMapper actSuppliesMaterialMapper;
+    private final ActSuppliesCleaningRuleMapper actSuppliesCleaningRuleMapper;
 
 
     @Override
@@ -37,13 +43,32 @@ public class ActSuppliesMaterialServiceImpl implements ActSuppliesMaterialServic
             String mineId = part[0];
             String dateColumn = part[1];
             //执行删除操作
-            actSuppliesMaterialMapper.delete(mineId,dateColumn);
+            actSuppliesMaterialMapper.delete(mineId, dateColumn);
+        }
+        List<ActSuppliesImportCleaningAcc> cleaningAccList = new ArrayList<>();
+        for (ActSuppliesMaterialDetails material : materials) {
+            if (material != null) { // 检查 material 是否为 null
+                ActSuppliesImportCleaningAcc cleaningAcc = new ActSuppliesImportCleaningAcc();
+                cleaningAcc.setId(UUID.randomUUID().toString().replace("-", ""));
+                cleaningAcc.setSskId(material.getMineId() != null ? material.getMineId() : ""); // 处理可能的 null
+                cleaningAcc.setHdate(material.getDateColumn() != null ? material.getDateColumn() : "");
+                cleaningAcc.setNameColumn(material.getNameColumn() != null ? material.getNameColumn() : "");
+                cleaningAcc.setCodeColumn(material.getCodeColumn() != null ? material.getCodeColumn() : "");
+                cleaningAcc.setDepartmentColumn(material.getDepartmentColumn() != null ? material.getDepartmentColumn() : "");
+                cleaningAcc.setNumberColumn(material.getNameColumn() != null ? material.getNameColumn() : "");
+                cleaningAcc.setMoneyColumn(material.getMoneyColumn() != null ? material.getMoneyColumn().toString() : "0");
+                cleaningAcc.setMoneyColumns(material.getMoney() != null ? material.getMoney().toString() : "0");
+                cleaningAcc.setsOfExpenses(material.getSourceColoumn() != null ? material.getSourceColoumn() : "");
+                cleaningAcc.setUnit(material.getUnit() != null ? material.getUnit() : "");
+                cleaningAcc.setModel(material.getModel() != null ? material.getModel() : "");
+                cleaningAccList.add(cleaningAcc);
             }
+        }
+        actSuppliesCleaningRuleMapper.insert(cleaningAccList);
         Boolean saved = actSuppliesMaterialMapper.save(materials);
         if (!saved) {
             return false;
         }
-
         return true;
     }
 }

ruoyi-wages/src/main/resources/mapper/system/WagesConversionMapper.xml

@@ -26,7 +26,7 @@
     </delete>
 
     <select id="selectWagesConversionDataList" resultMap="WagesConversionData">
-        select id, if_generate_voucher, wage_month, create_date, update_date
+        select id, if_generate_voucher, wage_month, create_date, update_date,mine_id
         from wages_conversion_data
         where if_generate_voucher = 0 <if test="date != null"> and wage_month = #{date}</if>
         <if test="mineId != null"> and mine_id = #{mineId}</if>