物料转换优化修改

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

@@ -105,19 +105,22 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
         //re:导入表的行，ce:导入表的列，se:导入表的sheet;rt:模板表的行，ct:模板表的列，st:模板表的sheet;ys:运算符
 //        String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ct\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}]" ;
         List<String> filteredList = new ArrayList<>();
+        String content2;
+        if(actSuppliesRoleDetail.getConvertStatus()==6){
+            content2="["+actSuppliesRoleDetail.getCleanIng()+"]";
+        }else {
 
+            for (int i = 0; i < actSuppliesRoleDetail.getDetailMH().length; i++) {
 
-        for (int i =0 ;i<actSuppliesRoleDetail.getDetailMH().length; i++){
-
-            filteredList.add("{\"se\":\"0\",\"re\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYH()[i]))-1)+"\",\"ce\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYL()[i]))-1)+"\",\"st\":\"0\",\"rt\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailMH()[i]))-1)+"\",\"ct\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailML()[i]))-1)+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}") ;
-
-        }
+                filteredList.add("{\"se\":\"0\",\"re\":\"" + (Integer.parseInt((actSuppliesRoleDetail.getDetailYH()[i])) - 1) + "\",\"ce\":\"" + (Integer.parseInt((actSuppliesRoleDetail.getDetailYL()[i])) - 1) + "\",\"st\":\"0\",\"rt\":\"" + (Integer.parseInt((actSuppliesRoleDetail.getDetailMH()[i])) - 1) + "\",\"ct\":\"" + (Integer.parseInt((actSuppliesRoleDetail.getDetailML()[i])) - 1) + "\",\"ys\":\"" + actSuppliesRoleDetail.getConvertStatus() + "\"}");
 
+            }
 
-        String content = String.join(",",filteredList);
 
-        String content2 = "["+content+"]";
+            String content = String.join(",", filteredList);
 
+             content2 = "[" + content + "]";
+        }
         actSuppliesRoleDetail.setDetailContent(content2);
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesRoleDetail.setUpdateBy(user.getUserName());