数据入库（添加一个备用字段）

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

@@ -24,8 +24,9 @@ public class ActSuppliesMaterialController {
 
     @PostMapping("/save")
     public AjaxResult saveInfo(@RequestBody ActSuppliesMaterialInfo actSuppliesMaterialInfo){
-        System.out.println(actSuppliesMaterialInfo);
+        //System.out.println(actSuppliesMaterialInfo);
         List<ActSuppliesMaterialDetails> materials = actSuppliesMaterialInfo.getMaterials();
+
         Boolean saved = actSuppliesMaterialService.save(materials);
         if (!saved) {
             return AjaxResult.error("插入失败，请重新尝试");

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

@@ -53,5 +53,8 @@ public class ActSuppliesMaterialDetails {
     @JsonProperty(value = "DateColumn")
     private String dateColumn;
 
+    //备用字段
+    private String spare;
+
 
 }

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

@@ -20,25 +20,34 @@
         <result property="twoLevel" column="two_level"/>
         <result property="dateColumn" column="date_column"/>
         <result property="sourceColoumn" column="source_coloumn"/>
+        <result property="spare" column="spare"/>
     </resultMap>
 
     <insert id="save" parameterType="java.util.List">
         INSERT INTO act_supplies_material_info
         (name_column, code_column, department_column, number_column,
         money_column, money, unit, model, mine_name,
-        mine_id, one_level, two_level, date_column, source_coloumn)
+        mine_id, one_level, two_level, date_column, source_coloumn,spare)
         VALUES
         <foreach collection="accList" item="item" separator=",">
-            (#{item.nameColumn}, #{item.codeColumn}, #{item.departmentColumn}, #{item.numberColumn}, #{item.moneyColumn}, #{item.money}, #{item.unit},
-            #{item.model}, #{item.mineName}, #{item.mineId}, #{item.oneLevel}, #{item.twoLevel}, #{item.dateColumn}, #{item.sourceColoumn})
+            (#{item.nameColumn}, #{item.codeColumn}, #{item.departmentColumn},
+             #{item.numberColumn}, #{item.moneyColumn}, #{item.money}, #{item.unit},
+            #{item.model}, #{item.mineName}, #{item.mineId}, #{item.oneLevel},
+             #{item.twoLevel}, #{item.dateColumn}, #{item.sourceColoumn},
+            <choose>
+                <when test="item.spare != null and item.spare != ''">
+                    #{item.spare}
+                </when>
+                <otherwise>
+                    ' '
+                </otherwise>
+            </choose>)
         </foreach>
     </insert>
 
-
     <delete id="delete">
         delete from act_supplies_material_info
         where mine_id = #{mineId} and date_column = #{dateColumn}
     </delete>
 
-
 </mapper>
\ No newline at end of file

ruoyi-wages/src/main/java/com/ruoyi/system/controller/AsiccSuppliesController.java

@@ -20,12 +20,6 @@ import java.util.Map;
 public class AsiccSuppliesController {
     private final AsiccSuppliesService asiccSuppliesService;
 
-//    @PostMapping("/data")
-//    public AjaxResult getData(@RequestParam("mineId") String mineId){
-//        List<Object> voList = asiccSuppliesService.getData(mineId);
-//        return AjaxResult.success(voList);
-//    }
-
     @PostMapping("/getData")
     public AjaxResult getData(@RequestBody AsiccDAO asiccDAO){
         Map<String,Object> voList = asiccSuppliesService.getData(asiccDAO);

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/AsiccSuppliesServiceImpl.java

@@ -26,7 +26,7 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
 
     @Override
     public Map<String,Object> getData(AsiccDAO asiccDAO) {
-        long begin = System.currentTimeMillis();
+        //long begin = System.currentTimeMillis();
         List<ActSuppliesDetails> detailsList = asiccSuppliesMapper.select();
 
         //特殊处理最后没有匹配上的数据的id为10
@@ -43,15 +43,15 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
         //存放处理之后的code （asiccDAO中的Code）
 
         for (String code : asiccDAO.getCodes()) {
-            List<String> codeList = new ArrayList<>();
+            Map<String,String> codeList = new HashMap<>();
             String kmCode = StringUtils.substring(code, 0, 6);
             if (map.containsKey(kmCode)) {
                 Object sid = map.get(kmCode);
                 ActSupplies supplies = asiccSuppliesMapper.selectById(sid);
                 String oneLevel = supplies.getOneLevel();
                 String twoLevel = supplies.getTwoLevel();
-                codeList.add(oneLevel);
-                codeList.add(twoLevel);
+                codeList.put("一级分类",oneLevel);
+                codeList.put("二级分类",twoLevel);
                 voMap.put(code,codeList);
             } else {
                 kmCode = StringUtils.substring(kmCode, 0, 4);
@@ -60,8 +60,8 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
                     ActSupplies supplies = asiccSuppliesMapper.selectById(sid);
                     String oneLevel = supplies.getOneLevel();
                     String twoLevel = supplies.getTwoLevel();
-                    codeList.add(oneLevel);
-                    codeList.add(twoLevel);
+                    codeList.put("一级分类",oneLevel);
+                    codeList.put("二级分类",twoLevel);
                     voMap.put(code,codeList);
                 } else {
                     kmCode = StringUtils.substring(kmCode, 0, 2);
@@ -70,21 +70,21 @@ public class AsiccSuppliesServiceImpl implements AsiccSuppliesService {
                         ActSupplies supplies = asiccSuppliesMapper.selectById(sid);
                         String oneLevel = supplies.getOneLevel();
                         String twoLevel = supplies.getTwoLevel();
-                        codeList.add(oneLevel);
-                        codeList.add(twoLevel);
+                        codeList.put("一级分类",oneLevel);
+                        codeList.put("二级分类",twoLevel);
                         voMap.put(code,codeList);
                     }else {
                         //kmCode一律为10
                         String oneLevel = actSupplies.getSuppliesName();
-                        codeList.add(oneLevel);
-                        codeList.add("null");
+                        codeList.put("一级分类",oneLevel);
+                        codeList.put("二级分类",null);
                         voMap.put(code,codeList);
                     }
                 }
             }
         }
-        long end = System.currentTimeMillis();
-        System.err.println(end-begin);
+//        long end = System.currentTimeMillis();
+//        System.err.println("查询时间：" + (end - begin) + " 毫秒");
         return voMap;
     }
 }