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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/CompanyBo.java

@@ -21,8 +21,17 @@ public class CompanyBo {
     private Long sequenceNbr;
     private String regionCode;
     private String companyCode;
+    private String companyType;
     private List<CompanyBo> children;
 
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
+
     public String getAddress() {
         return address;
     }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java

@@ -28,8 +28,14 @@ public class BaseController {
     @Autowired
     protected HttpServletRequest request;
 
+    /**
+     * 企业
+     */
     public static final String COMPANY_TYPE_COMPANY = "company";
 
+    /**
+     * 监管/行政审批局
+     */
     public static final String COMPANY_TYPE_SUPERVISION = "supervision";
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java

@@ -136,4 +136,7 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
   @ApiModelProperty(value = "下一步任务id")
   private String nextTaskId;
 
+  @ApiModelProperty(value = "下一步执行人userids")
+  private String nextExecuteUseIds;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationUnit.java

@@ -222,4 +222,9 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
+    /**
+     *工作流下一节点执行人UseridS
+     */
+    @TableField(value = "next_execute_user_ids")
+    private String nextExecuteUseIds;
 }

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

@@ -51,10 +51,10 @@
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
-            <if test="dto.dataType == 'supervision' ">
+            <if test="dto.dataType != null and dto.dataType == 'supervision' ">
                 and  ur.receive_org_code = #{dto.receiveOrgCode}
             </if>
-            <if test="dto.dataType == 'company' ">
+            <if test="dto.dataType != null and dto.dataType == 'company' ">
                 and  ur.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
         </where>

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

@@ -21,6 +21,7 @@
         crt.instance_id as instanceId,
         crt.use_registration_code as useRegistrationCode,
         crt.next_execute_user_ids as nextExecuteUserIds,
+        crt.create_user_id as createUserId,
         use.USE_UNIT_NAME as useUnitName,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,
@@ -50,7 +51,7 @@
             <if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
                 and  crt.receive_company_code = #{dto.receiveOrgCode}
             </if>
-            <if test="roleIds != null and dto.dataType == 'supervision'">
+            <if test="roleIds != null and type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     crt.execute_sequence like concat('%',#{role},'%')
                 </foreach>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -57,7 +57,7 @@ public class CommonController extends BaseController {
 	@GetMapping(value = "/creatTree")
 	@ApiOperation(httpMethod = "GET", value = "获取管辖分局树", notes = "获取管辖分局树")
 	public ResponseModel<Object> creatTree() {
-		return ResponseHelper.buildResponse(commonService.getTree());
+		return ResponseHelper.buildResponse(commonService.getTree(getSelectedOrgInfo()));
 	}
 
 
@@ -70,7 +70,8 @@ public class CommonController extends BaseController {
 	@GetMapping(value = "/getApproveTree")
 	@ApiOperation(httpMethod = "GET", value = "获取行政审批局树", notes = "获取行政审批局树")
 	public ResponseModel<Object> getApproveTree() {
-		return ResponseHelper.buildResponse(commonService.getApproveTree());
+		ReginParams reginParams = getSelectedOrgInfo();
+		return ResponseHelper.buildResponse(commonService.getApproveTree(reginParams));
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java

@@ -98,7 +98,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 		ReginParams reginParams = getSelectedOrgInfo();
 		if(reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)){
 			dto.setDataType(COMPANY_TYPE_COMPANY);
-			dto.setUnitCode(reginParams.getCompany().getCompanyCode());
+			dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
 		} else {
 			dto.setDataType(COMPANY_TYPE_SUPERVISION);
 			dto.setReceiveOrgCode(reginParams.getCompany().getCompanyCode());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationUnitController.java

@@ -145,6 +145,12 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	) {
 		Page<JgChangeRegistrationUnit> page = new Page<>(current, size);
 		ReginParams reginParams = getSelectedOrgInfo();
+		 ReginParams info = getSelectedOrgInfo();
+		if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
+			type = "enterprise";
+		}else {
+			type = "supervision";
+		}
 		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryForJgChangeRegistrationUnitPage(page, model, type, reginParams));
 	}
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgScrapCancelController.java

@@ -105,7 +105,7 @@ public class JgScrapCancelController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询")
     @PostMapping(value = "/getList")
-    public ResponseModel<Page<Map<String, Object>>> getList(@RequestBody JgScrapCancelDto dto,
+    public ResponseModel<Page<Map<String, Object>>> getList(JgScrapCancelDto dto,
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);

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

@@ -3,10 +3,8 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,8 +21,8 @@ public interface ICommonService {
 
     List<LinkedHashMap> getRegion(String level, String parentId);
 
-    List<LinkedHashMap> getTree();
-    List<LinkedHashMap> getApproveTree();
+    List<LinkedHashMap> getTree(ReginParams selectedOrgInfo);
+    List<LinkedHashMap> getApproveTree(ReginParams reginParams);
 
     List<LinkedHashMap> creatTree();
 

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

@@ -7,6 +7,7 @@ import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -117,6 +118,8 @@ public class CommonServiceImpl implements ICommonService {
     private static final String basic = "basic";
     // 业务通用发起——告知单详情
     private static final String notice = "notice";
+    // 业务通用发起——技术参数-改造变更登记使用
+    private static final String techInfo = "techInfo";
     // 业务通用发起——安装告知表单key
     private static final String AZGZ_FORM_ID = "1734141426742095873";
     // 业务通用发起——移装变更表单key
@@ -259,10 +262,16 @@ public class CommonServiceImpl implements ICommonService {
 
 
     @Override
-    public List<LinkedHashMap> getTree() {
+    public List<LinkedHashMap> getTree(ReginParams reginParams) {
+        // 企业逻辑
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
             //判断redis是否存在管辖机构树
             return !ObjectUtils.isEmpty(result) ? result : creatTree();
+        } else {
+            return Collections.singletonList((LinkedHashMap)BeanUtil.beanToMap(reginParams.getCompany()));
+        }
+
     }
 
     @Override
@@ -277,10 +286,17 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public List<LinkedHashMap> getApproveTree() {
+    public List<LinkedHashMap> getApproveTree(ReginParams reginParams) {
+        // 企业逻辑
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(ADMINISTRATION_UNIT_TREE);
             //判断redis是否存在行政审批局树
             return !ObjectUtils.isEmpty(result) ? result : creatApproveTree();
+        } else {
+            // 监管单位逻辑
+            return Collections.singletonList((LinkedHashMap)BeanUtil.beanToMap(reginParams.getCompany()));
+        }
+
     }
 
 
@@ -515,6 +531,7 @@ public class CommonServiceImpl implements ICommonService {
     public void invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
         Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);
         Map<String, Object> noticeObj = (Map<String, Object>) map.get(notice);
+        Map<String, Object> techInfoObj = (Map<String, Object>) map.get(techInfo);
         Map<String, Object> provideMap = new HashMap<>();
 
         String type = (String) basicObj.get("type");
@@ -559,6 +576,7 @@ public class CommonServiceImpl implements ICommonService {
                 noticeObj.put("submit", "true");
             }
             noticeObj.put("receiveCompanyCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
+            noticeObj.put("techInfo",techInfoObj);
             JSONObject jsonObject = new JSONObject(noticeObj);
             jgChangeRegistrationReformServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.YZBG.getBusinessCode())) {
@@ -598,7 +616,7 @@ public class CommonServiceImpl implements ICommonService {
             jgChangeRegistrationNameService.save2(submitType, jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode()) || type.equals(ApplicationFormTypeEnum.SBTY.getBusinessCode())) {
             noticeObj.put("submit", submitType);
-            noticeObj.put("formType","add");
+            noticeObj.put("formType", "add");
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
             jgEnableDisableServiceImpl.saveOrUpdate(jsonObject, reginParams);

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

@@ -89,6 +89,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
 
+    @Autowired
+    private CommonMapper commonMapper;
+
     /**
      * 分页查询
      */
@@ -205,7 +208,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
                 jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
                 jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
-                ProcessTaskDTO processTaskDTO = startByVariable();
+                ProcessTaskDTO processTaskDTO = startByVariable(jgChangeRegistrationReform);
                 updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
                 List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
                 commonServiceImpl.buildTaskModel(taskModelDtoList);
@@ -220,7 +223,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
     }
 
-    public ProcessTaskDTO startByVariable() {
+    public ProcessTaskDTO startByVariable(JgChangeRegistrationReform jgChangeRegistrationReform) {
         ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
         //启动流程
         try {
@@ -228,6 +231,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             dto.setProcessDefinitionKey("renovationRegistrationReviewNew");
             dto.setBusinessKey("submit");
             dto.setCompleteFirstTask(Boolean.TRUE);
+            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
             List<ActWorkflowStartDTO> actWorkflowStartDTOList = Arrays.asList(dto);
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             actWorkflowBatchDTO.setProcess(actWorkflowStartDTOList);
@@ -342,6 +346,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);
+            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
             //执行流程
             processTaskDTO = iCmWorkflowService.complete(taskId, dto);
         } catch (Exception e) {
@@ -407,7 +412,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         Map<String, Object> originalData = new HashMap<>();
 
         if ((detail.get("status").equals("已完成") || detail.get("status").equals("流程结束"))) {
-            originalData = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
+            originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
             originalData.remove("sequenceNbr");
             if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
                 detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
@@ -464,7 +469,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             //当前数据
             String newData = jgRegistrationHistory.getChangeData();
             //将历史数据更新到技术参数表中
-            IdxBizJgTechParamsElevator idxBizJgTechParamsElevatorNew = JSONObject.parseObject(newData, IdxBizJgTechParamsElevator.class);
+            JSONObject allData = JSONObject.parseObject(newData);
+            Map<String,Object> techInfo = (Map<String, Object>) allData.get("techInfo");
+            IdxBizJgTechParamsElevator idxBizJgTechParamsElevatorNew = JSONObject.parseObject(JSONObject.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
             BeanUtil.copyProperties(idxBizJgTechParamsElevatorNew, idxBizJgTechParamsElevator, "sequenceNbr", "record");
             idxBizJgTechParamsElevatorMapper.updateById(idxBizJgTechParamsElevator);
             //将历史数据回填到历史记录表中

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

@@ -392,6 +392,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         // 判断当前是否为提交
         List<String> instanceIdList = new ArrayList<>();
+        List<String> nextExecutorUserIds = new ArrayList<>();
         List<String> taskIds = new ArrayList<>();
         List<WorkflowResultDto> workflowResultDtos = new ArrayList<>();
         String nextExecutorRoleIds = "";
@@ -412,6 +413,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             List<ProcessTaskDTO> processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
             workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
             nextExecutorRoleIds = workflowResultDtos.get(0).getNextExecutorRoleIds();
+            nextExecutorUserIds.add(workflowResultDtos.get(0).getNextExecutorUserIds());
             for (WorkflowResultDto processTaskDTO : workflowResultDtos) {
                 instanceIdList.add(processTaskDTO.getInstanceId());
                 taskIds.add(processTaskDTO.getNextTaskId());
@@ -496,8 +498,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             dto.setUseInnerCode(ValidationUtil.isEmpty(obj.get("USE_INNER_CODE")) ? "" : String.valueOf(obj.get("USE_INNER_CODE")));
             dto.setEquAddress((String.valueOf(obj.get("ADDRESS"))));
             dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
+
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setUnitChangeRegistrationId(applyNo);
+            if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
+                dto.setNextExecuteUseIds(nextExecutorUserIds.get(0));
+            }
             if (!CollectionUtils.isEmpty(instanceIdList)) {
                 dto.setInstanceId(instanceIdList.get(i));
                 dto.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());