Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -404,7 +404,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
 
         // 获取告知单号
-        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.GZ.getCode(), deviceList.size());
+        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.AZGZ.getCode(), deviceList.size());
         if (CollectionUtils.isEmpty(applyNoList)) {
             return;
         }
@@ -472,7 +472,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             dto.setEquList(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setEquipId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setApplyNo(applyNo);
-            jgRelationEquip.setBusinessType(ApplicationFormTypeEnum.GZ.getCode());
+            jgRelationEquip.setBusinessType(ApplicationFormTypeEnum.AZGZ.getCode());
             if (!CollectionUtils.isEmpty(instanceIdList)) {
                 dto.setInstanceId(instanceIdList.get(i));
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
@@ -594,13 +594,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     }
 
     public void cancel(JgInstallationNoticeDto noticeDto) {
-        FeignClientResult ajaxResult = Workflow.taskV2Client.rollBack(noticeDto.getInstanceId());
-        JgInstallationNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
-        if(ajaxResult.getStatus() == 200) {
-            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-            jgInstallationNotice.setStatus(String.valueOf(FlowStatusEnum.ROBACK.getCode()));
-            jgInstallationNoticeMapper.updateById(jgInstallationNotice);
-        }
+        //FeignClientResult ajaxResult = Workflow.taskV2Client.rollBack(noticeDto.getInstanceId());
+        //JgInstallationNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
+        //if(ajaxResult.getStatus() == 200) {
+        //    jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+        //    jgInstallationNotice.setStatus(String.valueOf(FlowStatusEnum.ROBACK.getCode()));
+        //    jgInstallationNoticeMapper.updateById(jgInstallationNotice);
+        //}
     }
 
     public void accept(JgInstallationNoticeDto dto,String op) {

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/JgUseRegistrationServiceImpl.java

@@ -106,7 +106,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JgRelationEquip jgRelationEquip = new JgRelationEquip();
             jgRelationEquip.setEquipId(map.get("equipId").toString());
             jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode()));
-            List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SY.getCode(), 1);
+            List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
             jgUseRegistration.setApplyNo(applicationFormCode.get(0));
             jgUseRegistration.setAuditStatus("待提交");
             jgUseRegistration.setStatus(UseStatusEnum.SUBMIT.getPass());

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -14,11 +14,19 @@ public enum ApplicationFormTypeEnum {
     /**
      * 申请单枚举
      */
-    GZ("GZ"),
+    AZGZ("AZGZ"),//安装告知
+    WBBA("WBBA"),//维保备案
+    SYDJ("SYDJ"),//使用登记
+    SBYJ("SBYJ"),//设备移交
+    GZGZ("GZGZ"),//改造告知
+    WXGZ("WXGZ"),//维修告知
+    YZGZ("YZGZ"),//移装告知
+    GZBG("GZBG"),//改造变更登记
+    YZBG("YZBG"),//移装变更登记
+    DWBG("DWBG"),//单位变更登记
     JY("JY"),
     JG("JG"),// 检验结果
-    WB("WB"),
-    SY("SY");
+    ;
 
     /**
      * 编号