维修告知和移装告知接口参数修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgMaintainNoticeService.java

@@ -58,7 +58,7 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, Map<String, JSObject> model, ReginParams reginParams);
+    void saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
 
     /**
      * 打印告知单

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgTransferNoticeService.java

@@ -26,7 +26,7 @@ public interface IJgTransferNoticeService extends IService<JgTransferNotice> {
 
     Boolean deleteForBatch(Long[] sequenceNbrs);
 
-    void saveNotice(String submitType, Map<String, JSObject> model, ReginParams reginParams);
+    void saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
 
     String generateTransferNoticeReport(Long sequenceNbr);
 

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

@@ -97,6 +97,65 @@ public class CommonServiceImpl implements ICommonService {
     @Autowired
     PrivilegeFeginService privilegeFeginService;
 
+    // 业务通用发起——基本信息
+    private static final String basic = "basic";
+    // 业务通用发起——告知单详情
+    private static final String notice = "notice";
+    // 业务通用发起——安装告知表单key
+    private static final String AZGZ_FORM_ID = "1734141426742095873";
+    // 业务通用发起——移装变更表单key
+    private static final String YZBG_PAGE_ID = "changeRegistrationTransfer";
+    // 业务通用发起——改造告知表单key
+    private static final String GZGZ_PAGE_ID = "reformNoticeAdd";
+    // 业务通用发起——维修告知表单key
+    private static final String WXGZ_PAGE_ID = "maintainInfo";
+    // 业务通用发起——移装告知表单key
+    private static final String YZGZ_PAGE_ID = "transferNoticeAdd";
+    // 业务通用发起——单位变更表单key
+    private static final String DWBG_PAGE_ID = "changeRegisInfo";
+    // 业务通用发起——设备注销表单key
+    private static final String SBZX_PAGE_ID = "jgScrapCancelAdd";
+    // 业务通用发起——更名变更表单key
+    private static final String GMBG_PAGE_ID = "jgRegistrationInfo";
+
+    @Autowired
+    private IJgInstallationNoticeService iJgInstallationNoticeService;
+
+    @Autowired
+    JgMaintenanceContractServiceImpl jgMaintenanceContractServiceImpl;
+
+    @Autowired
+    JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
+
+    @Autowired
+    JgEquipTransferServiceImpl jgEquipTransferServiceImpl;
+
+    @Autowired
+    JgReformNoticeServiceImpl jgReformNoticeService;
+
+    @Autowired
+    private IJgMaintainNoticeService iJgMaintainNoticeService;
+    @Autowired
+    private IJgTransferNoticeService jgTransferNoticeService;
+
+    @Autowired
+    JgChangeRegistrationReformServiceImpl jgChangeRegistrationReformServiceImpl;
+
+    @Autowired
+    IJgChangeRegistrationTransferService jgChangeRegistrationTransferService;
+
+    @Autowired
+    JgChangeRegistrationUnitServiceImpl jgChangeRegistrationUnitServiceImpl;
+
+    @Autowired
+    JgChangeRegistrationNameServiceImpl jgChangeRegistrationNameService;
+
+    @Autowired
+    JgEnableDisableServiceImpl jgEnableDisableServiceImpl;
+
+    @Autowired
+    JgScrapCancelServiceImpl jgScrapCancelService;
+
     public static byte[] file2byte(File file) {
         try {
             FileInputStream in = new FileInputStream(file);
@@ -223,28 +282,7 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public List<Map<String, Object>> superviseBusinessCategory(String type) {
         Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(superviseBusinessCategory);
-        List<Map<String, Object>> mapList = new ArrayList<>();
-        switch (type) {
-            case "SGGZ":
-                mapList = resourceJson.get("SGGZ");
-                break;
-            case "DJGL":
-                mapList = resourceJson.get("DJGL");
-                break;
-            case "WBBA":
-                mapList = resourceJson.get("WBBA");
-                break;
-            case "SBYJ":
-                mapList = resourceJson.get("SBYJ");
-                break;
-            case "QTBF":
-                mapList = resourceJson.get("QTBF");
-                break;
-            case "XZSB":
-                mapList = resourceJson.get("XZSB");
-                break;
-        }
-        return mapList;
+        return resourceJson.get(type);
     }
 
     private List<LinkedHashMap> deleteTreeData(List<LinkedHashMap> result) {
@@ -457,65 +495,6 @@ public class CommonServiceImpl implements ICommonService {
     }
 
 
-
-    // 业务通用发起——基本信息
-    private static final String basic = "basic";
-    // 业务通用发起——添加设备
-    private static final String devices = "devices";
-    // 业务通用发起——告知单详情
-    private static final String notice = "notice";
-    // 业务通用发起——安装告知表单id
-    private static final String AZGZ_FORM_ID = "1734141426742095873";
-
-    private static final String YZBG_PAGE_ID = "changeRegistrationTransfer";
-
-    private static final String GZGZ_PAGE_ID = "reformNoticeAdd";
-
-    @Autowired
-    private IJgInstallationNoticeService iJgInstallationNoticeService;
-
-    @Autowired
-    JgMaintenanceContractServiceImpl jgMaintenanceContractServiceImpl;
-
-    @Autowired
-    JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
-
-    @Autowired
-    JgEquipTransferServiceImpl jgEquipTransferServiceImpl;
-
-    @Autowired
-    JgReformNoticeServiceImpl jgReformNoticeService;
-
-    @Autowired
-    private IJgMaintainNoticeService iJgMaintainNoticeService;
-    @Autowired
-    private IJgTransferNoticeService jgTransferNoticeService;
-
-    @Autowired
-    JgChangeRegistrationReformServiceImpl jgChangeRegistrationReformServiceImpl;
-
-    @Autowired
-    IJgChangeRegistrationTransferService jgChangeRegistrationTransferService;
-
-    @Autowired
-    JgChangeRegistrationUnitServiceImpl jgChangeRegistrationUnitServiceImpl;
-
-    @Autowired
-    JgChangeRegistrationNameServiceImpl jgChangeRegistrationNameService;
-
-    @Autowired
-    JgEnableDisableServiceImpl jgEnableDisableServiceImpl;
-
-    @Autowired
-    JgScrapCancelServiceImpl jgScrapCancelService;
-
-    private static final String WXGZ_PAGE_ID = "maintainInfo";
-
-    private static final String YZGZ_PAGE_ID = "transferNoticeAdd";
-    private static final String DWBG_PAGE_ID = "changeRegisInfo";
-    private static final String SBZX_PAGE_ID = "jgScrapCancelAdd";
-    private static final String GMBG_PAGE_ID = "jgRegistrationInfo";
-
     @Override
     public void invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
         Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);