refact(注册开通)：流程调整

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

@@ -149,4 +149,7 @@ public class JyjcOpeningApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "省内详细办公地址")
     private String officeAddress;
+
+    @ApiModelProperty(value = "单位所在地：陕西省内企业，省外企业")
+    private String dataSources;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.BaseEnterpriseCertDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionCompanyPublicityDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
@@ -64,6 +66,10 @@ public class JyjcOpeningApplicationController extends BaseController {
             // 详情保存逻辑
             BeanUtil.copyProperties(model, jyjcOpeningApplicationModel);
         }
+        if(model.containsKey("buniessInfo")){
+            List<BaseEnterpriseCertDto> baseEnterpriseCertDtos = JSONArray.parseArray(JSONObject.toJSONString(model.get("buniessInfo")), BaseEnterpriseCertDto.class);
+            jyjcOpeningApplicationModel.setBaseUnitLicences(baseEnterpriseCertDtos);
+        }
         return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdate(jyjcOpeningApplicationModel, getCompanyCode()));
     }
 
@@ -78,6 +84,10 @@ public class JyjcOpeningApplicationController extends BaseController {
         } else {
             BeanUtil.copyProperties(jsonObject, model);
         }
+        if(jsonObject.containsKey("buniessInfo")){
+            List<BaseEnterpriseCertDto> baseEnterpriseCertDtos = JSONArray.parseArray(JSONObject.toJSONString(jsonObject.get("buniessInfo")), BaseEnterpriseCertDto.class);
+            model.setBaseUnitLicences(baseEnterpriseCertDtos);
+        }
         model.setSequenceNbr(sequenceNbr);
         JyjcOpeningApplicationModel data = jyjcOpeningApplicationServiceImpl.submitApplication(model, getCompanyCode());
         return ResponseHelper.buildResponse(Collections.singletonList(data));
@@ -265,7 +275,7 @@ public class JyjcOpeningApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/v2/users")
     @ApiOperation(httpMethod = "GET", value = "查询当前登录人、指定人员类型的人员map结构", notes = "查询当前登录人、指定人员类型的人员map结构，key为jyjcUserInfos代表检验检测人员，chargeUserInfos为检验检测区域负责人")
-    public ResponseModel<Map<String, List<TzsUserInfoVo>>> getBizUserInfosByUnitCodeV2(@ApiParam(value = "人员类型", allowableValues = "jy,jc,charge") @RequestParam String personType) {
+    public ResponseModel<Map<String, List<TzsUserInfoVo>>> getBizUserInfosByUnitCodeV2(@ApiParam(value = "人员类型", allowableValues = "jy,jc,charge" , defaultValue = "jy,jc,charge") @RequestParam String personType) {
         return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.getUserListByUnitCodeAndPostV2(getCompanyCode(), personType));
     }
 

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -442,25 +443,26 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     private void setBaseEnterpriseInfo(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel) {
         LambdaQueryWrapper<TzBaseEnterpriseInfo> enterpriseInfoQueryWrapper = new LambdaQueryWrapper<>();
         enterpriseInfoQueryWrapper.eq(TzBaseEnterpriseInfo::getUseCode, unitCode);
-        TzBaseEnterpriseInfo baseUnitLicenceEntity = enterpriseInfoMapper.selectOne(enterpriseInfoQueryWrapper);
+        TzBaseEnterpriseInfo baseEnterpriseInfo = enterpriseInfoMapper.selectOne(enterpriseInfoQueryWrapper);
         // 获取企业资质
-        if (baseUnitLicenceEntity != null) {
-            jyjcOpeningApplicationModel.setUseContact(baseUnitLicenceEntity.getUseContact());
-            jyjcOpeningApplicationModel.setContactPhone(baseUnitLicenceEntity.getContactPhone());
-            jyjcOpeningApplicationModel.setUnitAddress(baseUnitLicenceEntity.getFullAddress());
-            if (StringUtils.isNotBlank(baseUnitLicenceEntity.getIndustrySupervisor())) {
-                DataDictionary dict = dataDictionaryMapper.getByCode(baseUnitLicenceEntity.getIndustrySupervisor(), INDUSTRY_SUPERVISOR_DICT_TYPE);
+        if (baseEnterpriseInfo != null) {
+            jyjcOpeningApplicationModel.setUseContact(baseEnterpriseInfo.getUseContact());
+            jyjcOpeningApplicationModel.setContactPhone(baseEnterpriseInfo.getContactPhone());
+            jyjcOpeningApplicationModel.setUnitAddress(baseEnterpriseInfo.getFullAddress());
+            if (StringUtils.isNotBlank(baseEnterpriseInfo.getIndustrySupervisor())) {
+                DataDictionary dict = dataDictionaryMapper.getByCode(baseEnterpriseInfo.getIndustrySupervisor(), INDUSTRY_SUPERVISOR_DICT_TYPE);
                 if (dict != null) {
                     jyjcOpeningApplicationModel.setIndustrySupervisor(dict.getName());
                 } else {
-                    jyjcOpeningApplicationModel.setIndustrySupervisor(baseUnitLicenceEntity.getIndustrySupervisor());
+                    jyjcOpeningApplicationModel.setIndustrySupervisor(baseEnterpriseInfo.getIndustrySupervisor());
                 }
             }
-            jyjcOpeningApplicationModel.setGeographic(JyjcGeographicModel.builder().latitude(baseUnitLicenceEntity.getLatitude()).longitude(baseUnitLicenceEntity.getLongitude()).build());
-            jyjcOpeningApplicationModel.setLongitude(baseUnitLicenceEntity.getLongitude());
-            jyjcOpeningApplicationModel.setLatitude(baseUnitLicenceEntity.getLatitude());
-            if (ObjectUtils.isNotEmpty(baseUnitLicenceEntity.getUnitBusinessLicense())) {
-                jyjcOpeningApplicationModel.setUnitBusinessLicense(JSONArray.parseArray(baseUnitLicenceEntity.getUnitBusinessLicense(), AttachmentDto.class));
+            jyjcOpeningApplicationModel.setGeographic(JyjcGeographicModel.builder().latitude(baseEnterpriseInfo.getLatitude()).longitude(baseEnterpriseInfo.getLongitude()).build());
+            jyjcOpeningApplicationModel.setLongitude(baseEnterpriseInfo.getLongitude());
+            jyjcOpeningApplicationModel.setLatitude(baseEnterpriseInfo.getLatitude());
+            jyjcOpeningApplicationModel.setDataSources(baseEnterpriseInfo.getDataSources());
+            if (ObjectUtils.isNotEmpty(baseEnterpriseInfo.getUnitBusinessLicense())) {
+                jyjcOpeningApplicationModel.setUnitBusinessLicense(JSONArray.parseArray(baseEnterpriseInfo.getUnitBusinessLicense(), AttachmentDto.class));
             }
         }
     }
@@ -654,6 +656,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 if ("0".equals(op)) {
                     // 通过操作
                     jyjcOpeningApplication.setStatus(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getPass());
+                    jyjcOpeningApplication.setExpiryDate(DateUtil.parseDate(params.get("expiryDate").toString()));
                 } else {
                     // 驳回操作
                     jyjcOpeningApplication.setStatus(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getReject());
@@ -663,6 +666,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 jyjcOpeningApplication.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 // 更新代办
                 updateTask(jyjcOpeningApplication, workflowResultDto, op);
+                // 更新json
+                commonService.saveOrUpdateHistory(jyjcOpeningApplication.getOpenBizType(),JSONObject.parseObject(JSONObject.toJSONString(params)), jyjcOpeningApplication.getSequenceNbr());
             } else {
                 // 流程结束
                 jyjcOpeningApplication.setStatus(taskCode);
@@ -682,6 +687,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 jyjcOpeningApplication.setPromoter("");
                 jyjcOpeningApplication.setNextTaskId("");
                 jyjcOpeningApplication.setNextExecuteUserIds("");
+                jyjcOpeningApplication.setExpiryDate(DateUtil.parseDate(params.get("expiryDate").toString()));
                 // 将审批通过的资质信息写入到企业资质表
                 this.saveLicenseData2Company(jyjcOpeningApplication);
             }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseEnterpriseInfo.java

@@ -213,4 +213,10 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
      */
     @TableField(value = "org_code")
     protected String orgCode;
+
+    /**
+     * 完整地址
+     */
+    @TableField(value = "full_address")
+    private String fullAddress;
 }