检验业务申请单增加企业地址

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -30,6 +30,8 @@ public class JyjcOpeningApplicationModel extends BaseModel {
 
     @ApiModelProperty (value = "单位编码")
     private String unitCode;
+    @ApiModelProperty (value = "单位地址")
+    private String unitAddress;
 
     @ApiModelProperty (value = "单位编码Name")
     private String unitCodeName;

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

@@ -128,7 +128,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-             model.setStatus("6611"); //6611 对应数据字典 检验流程状态 待受理
+             model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
             } else if (model.getOperationType().equals("1")) {
                 model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
@@ -235,7 +235,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     jyjcInspectionApplicationAttachmentService.getBaseMapper().insert(attachments);
                 }
             }
-            model.setStatus("6611"); //6611 对应数据字典 检验流程状态 待受理
+            model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
             execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", model.getProcessInstanceId()).put("comments", "").build());
             Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
             String role = (String) nextNodeInfo.get("role");

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

@@ -271,6 +271,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         if (baseUnitLicenceEntity != null) {
             jyjcOpeningApplicationModel.setUseContact(baseUnitLicenceEntity.getUseContact());
             jyjcOpeningApplicationModel.setContactPhone(baseUnitLicenceEntity.getContactPhone());
+            jyjcOpeningApplicationModel.setUnitAddress(baseUnitLicenceEntity.getAddress());
             if (StringUtils.isNotBlank(baseUnitLicenceEntity.getIndustrySupervisor())) {
                 List<Map<String, String>> dicts = baseMapper.selectDataDictionaryList(Arrays.asList(baseUnitLicenceEntity.getIndustrySupervisor()));
                 if (!ValidationUtil.isEmpty(dicts)) {