阿dasd

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -153,14 +153,18 @@ public enum LogType {
     TRAIN7(67,TRAIN.id, TRAIN1004.id, TRAIN1007.id, "省培训成绩录入完成，等待审核"),
     TRAIN8(68,TRAIN.id, TRAIN1007.id, END.id, "省培训完成"),
 
-    SEND_BACK_1(69,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1200.id, "清退任务创建完成,等待下属单位把装备退回"),
-    SEND_BACK_2(70,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1203.id, "等待装备清退出库"),
-    SEND_BACK_3(71,SEND_BACK.id, SEND_BACK_1203.id, SEND_BACK_1206.id, "(%sendUnit)装备清退出库完成,向(%receiveUnit)发起清退装备,等待签收"),
-    SEND_BACK_4(72,SEND_BACK.id, SEND_BACK_1206.id,  END.id, "(%receiveUnit)签收(%sendUnit)单位清退的装备,装备入库成功"),
-    SEND_BACK_7(75,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1205.id, "异常装备任务生成,等待填写装备异常信息"),
-    SEND_BACK_8(76,SEND_BACK.id, SEND_BACK_1205.id, END.id, "异常装备处理完成"),
-    SEND_BACK_9(77,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1207.id, "异常装备的确认任务"),
-    SEND_BACK_10(78,SEND_BACK.id, SEND_BACK_1207.id, END.id, "异常装备的确认任务通过"),
+    SEND_BACK_1(69,SEND_BACK_STATISTICAL.id, ORIGIN_STATUS.id, SEND_BACK_1200.id, "省发起清退任务,等待下属单位把需要清退到装备送至省单位"),
+    SEND_BACK_2(70,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1201.id, "省发起对市发起清退任务"),
+    SEND_BACK_3(71,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1202.id, "省发起省直属单位清退装备提交任务"),
+    SEND_BACK_4(72,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1203.id, "省对着自己发起装备清退任务，清退自己单位对装备"),
+    SEND_BACK_7(75,SEND_BACK_STATISTICAL.id, ORIGIN_STATUS.id, SEND_BACK_1204.id, "转发了省级清退任务，生成市对清退统计任务"),
+    SEND_BACK_8(76,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1205.id, "市转发了省清退任务，对区县发起了清退任务"),
+    SEND_BACK_9(77,SEND_BACK.id, SEND_BACK_1201.id, SEND_BACK_1206.id, "市等待下级单位提交清退装备，在选择装备库送至省里"),
+    SEND_BACK_10(78,SEND_BACK.id, SEND_BACK_1205.id,SEND_BACK_1206.id , "区县根据清退通知，选择了需要清退对装备"),
+    SEND_BACK_11(100,SEND_BACK.id, SEND_BACK_1206.id,SEND_BACK_1207.id , "区县根据清退通知，选择了需要清退对装备"),
+
+
+
 
 
     WORK_H1(79,WORK_HANDOVER.id, ORIGIN_STATUS.id, WORKHANDOVER1011.id, "工作交接任务生成完成,等待上传交接单"),

dev-file/src/main/java/com/tykj/dev/device/file/service/FilesUtil.java

@@ -38,14 +38,18 @@ public class FilesUtil {
 
     public static String stringFileToList(List<FileRet> fileRets){
         StringBuffer fileString = new StringBuffer();
-        fileRets.forEach(
-               fileRet -> fileString.append("<*>").append(fileRet.getName())
-                       .append(",")
-                       .append(fileRet.getFilePath())
-                       .append(",")
-                       .append(fileRet.getPreviewPath())
-       );
-       return fileString.toString();
+        if (fileRets!=null) {
+            fileRets.forEach(
+                    fileRet -> fileString.append("<*>").append(fileRet.getName())
+                            .append(",")
+                            .append(fileRet.getFilePath())
+                            .append(",")
+                            .append(fileRet.getPreviewPath())
+            );
+            return fileString.toString();
+        }else {
+            return fileString.toString();
+        }
     }
     public static void main(String[] args) {
         stringFileToList("<*>123123,123123,123123<*>222,222,222");