安装改造流程状态修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -51,7 +51,7 @@
             </if>
         </where>
         ORDER BY
-        isn.notice_date DESC
+        isn.rec_date DESC
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -657,7 +657,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             jgInstallationNotice.setStatus(taskName[0]);
             jgInstallationNotice.setPromoter("");
             jgInstallationNotice.setNextExecuteIds(String.join(",", roleList));
-            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
             jgInstallationNoticeMapper.updateById(jgInstallationNotice);
         }
     }
@@ -715,7 +715,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     supervisoryCodeInfo.setStatus("1");
                     supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
 
-                    jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
+                    jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     this.generateInstallationNoticeReport(jgInstallationNotice.getSequenceNbr());
                     // 更新其他业务表
                     tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
@@ -745,7 +745,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 }
             } else {
                 jgInstallationNotice.setPromoter("");
-                jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+                jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
             }
             jgInstallationNoticeMapper.updateById(jgInstallationNotice);
         }