Merge branch 'develop_tzs_register' of…

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

@@ -118,4 +118,10 @@ public class JgEquipTransferDto  extends BaseDto {
 
     @ApiModelProperty(value = "流程建议")
     private String processAdvice;
+
+    @ApiModelProperty(value = "使用单位统一信用代码-数据隔离使用")
+    private String useUnitCodeFilter;
+
+    @ApiModelProperty(value = "施工单位统一信用代码-数据隔离使用")
+    private String installUnitCodeFilter;
 }

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

@@ -165,4 +165,10 @@ public class JgEquipTransfer extends BaseEntity {
      */
     @TableField(exist = false)
     private String equList;
+
+    /**
+     * 下一节点可执行人逗号分割
+     */
+    @TableField(value = "next_execute_user_ids")
+    private String nextExecuteUserIds;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgEquipTransferMapper.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * @date 2023-12-20
  */
 public interface JgEquipTransferMapper extends CustomBaseMapper<JgEquipTransfer> {
-    Page<JgEquipTransferDto> queryForPage(Page<JgEquipTransferDto> page, @Param("param") JgEquipTransferDto model, @Param("type") String type, @Param("companyCode") String companyCode);
+    Page<JgEquipTransferDto> queryForPage(Page<JgEquipTransferDto> page, @Param("param") JgEquipTransferDto model);
 
     @MapKey("sequenceNbr")
     List<Map<String, Object>> queryEquipInformation(Long sequenceNbr);

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
-
 import java.util.Map;
 
 /**
@@ -22,10 +21,9 @@ public interface IJgEquipTransferService  extends IService<JgEquipTransfer> {
      *
      * @param page  分页对象
      * @param dto 查询参数
-     * @param type  类型：enterprise-企业端、supervision-监管端
      * @return 设备移交分页列表
      */
-    Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransferDto> page, JgEquipTransferDto dto, String type, ReginParams reginParams);
+    Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransferDto> page, JgEquipTransferDto dto, ReginParams reginParams);
 
     /**
      * 根据sequenceNbr查询

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

@@ -81,13 +81,24 @@
                     AND	date_format(jet.apply_date, '%Y-%m-%d') = #{param.applyDate}
                 </if>
             </if>
-            <if test="type == 'useUnit'">
-                AND jet.use_unit_credit_code = #{companyCode}
-            </if>
-            <if test="type == 'installUnit'">
-                AND jet.install_unit_credit_code = #{companyCode}
-                AND jet.instance_id  is not null
-            </if>
+            <choose>
+                <when test="param.useUnitCodeFilter != '' and param.useUnitCodeFilter != null and
+                    param.installUnitCodeFilter != '' and param.installUnitCodeFilter != null">
+                    -- 同时有使用单位和施工单位
+                    and (jet.use_unit_credit_code = #{param.useUnitCodeFilter}
+                    or jet.install_unit_credit_code = #{param.installUnitCodeFilter})
+                </when>
+                <otherwise >
+                    -- 只有使用单位或者施工单位
+                    <if test="param.useUnitCodeFilter != '' and param.useUnitCodeFilter != null">
+                        and jet.use_unit_credit_code = #{param.useUnitCodeFilter}
+                    </if>
+                    <if test="param.installUnitCodeFilter != '' and param.installUnitCodeFilter != null">
+                        and jet.install_unit_credit_code = #{param.installUnitCodeFilter}
+                        AND jet.instance_id  is not null
+                    </if>
+                </otherwise>
+            </choose>
         </where>
         ORDER BY jet.apply_date DESC
     </select>

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

@@ -113,10 +113,9 @@ public class JgEquipTransferController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "设备移交分页查询", notes = "设备移交分页查询")
     public ResponseModel<Page<JgEquipTransferDto>> queryForPage(@RequestParam(value = "current") int current,
                                                                 @RequestParam(value = "size") int size,
-                                                                @ApiParam(value = "类型：useUnit-使用单位、installUnit-施工单位", required = true) @RequestParam(value = "type", defaultValue = "useUnit") String type,
                                                                 @RequestBody(required = false) JgEquipTransferDto dto) {
         Page<JgEquipTransferDto> page = new Page<>(current, size);
-        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferPage(page, dto, type, getSelectedOrgInfo()));
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferPage(page, dto, getSelectedOrgInfo()));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -5,6 +5,7 @@ import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -14,14 +15,14 @@ import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.ymt.api.common.BaseException;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.*;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -49,25 +50,16 @@ import java.util.stream.Stream;
  */
 @Slf4j
 @Service
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto, JgEquipTransfer, JgEquipTransferMapper> implements IJgEquipTransferService {
     private static final String EQUIP_TRANSFER_PROCESS_KEY = "equipmentHandover";
     private static final String SUBMIT_TYPE_FLOW = "1";
-    @Autowired
-    JgEquipTransferEqMapper jgEquipTransferEqMapper;
-    @Autowired
-    OtherInfoMapper tzsJgOtherInfoMapper;
-    @Autowired
-    RegistrationInfoMapper tzsJgRegistrationInfoMapper;
-    @Autowired
-    RedisUtils redisUtils;
-    @Autowired
-    TzsServiceFeignClient tzsServiceFeignClient;
-    @Autowired
-    CmWorkflowServiceImpl workflowService;
-    @Autowired
-    CommonServiceImpl commonService;
-    @Autowired
-    CmWorkflowServiceImpl cmWorkflowService;
+    private final JgEquipTransferEqMapper jgEquipTransferEqMapper;
+    private final RedisUtils redisUtils;
+    private final TzsServiceFeignClient tzsServiceFeignClient;
+    private final CommonServiceImpl commonService;
+    private final CmWorkflowServiceImpl cmWorkflowService;
+    private final IJgInstallationNoticeService jrmInstallationNoticeService;
 
     /**
      * 保存和保存并提交
@@ -383,10 +375,27 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                     .build()));
         }
     }
+    private String getStringFromMap(Map<String, Object> map, String key) {
+        return map.getOrDefault(key, "").toString();
+    }
 
     @Override
-    public Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransferDto> page, JgEquipTransferDto dto, String type, ReginParams reginParams) {
-        Page<JgEquipTransferDto> equipTransferPage = this.baseMapper.queryForPage(page, dto, type, reginParams.getCompany().getCompanyCode());
+    public Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransferDto> page, JgEquipTransferDto dto, ReginParams reginParams) {
+        CompanyBo company = reginParams.getCompany();
+        Map<String, Object> companyTypeMap = jrmInstallationNoticeService.getCompanyType();
+
+        String companyLevel = getStringFromMap(companyTypeMap, "companyLevel");
+        String companyType = getStringFromMap(companyTypeMap, "companyType");
+
+        if ("company".equals(companyLevel) && companyType != null) {
+            if (companyType.contains("use")) {
+                dto.setUseUnitCodeFilter(company.getCompanyCode());
+            }
+            if (companyType.contains("construction")) {
+                dto.setInstallUnitCodeFilter(company.getCompanyCode());
+            }
+        }
+        Page<JgEquipTransferDto> equipTransferPage = this.baseMapper.queryForPage(page, dto);
         Page<JgEquipTransferDto> equipTransferDtoPage = new Page<>();
         BeanUtils.copyProperties(equipTransferPage, equipTransferDtoPage, "records");
         List<JgEquipTransferDto> records = equipTransferPage.getRecords().stream().map(transfer -> {
@@ -496,6 +505,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             dto.setInstanceStatus(workflowResult.getNextExecutorRoleIds() + "," + workflowResult.getExecutorRoleIds());
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setNextTaskId(workflowResult.getNextTaskId());
+            dto.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
         }
         if (!CollectionUtils.isEmpty(workflowResultList)) {
             dto.setInstanceId(workflowResultList.get(i).getInstanceId());
@@ -538,5 +548,4 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
         return equipTransferInfo;
     }
-
 }
\ No newline at end of file

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

@@ -752,11 +752,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 Map<String, Object> mapCode;
                 ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
                 mapCode = code.getResult();
-                LambdaQueryWrapper<SupervisoryCodeInfo> queryWrapper3 = new LambdaQueryWrapper<>();
-                queryWrapper3.eq(SupervisoryCodeInfo::getSupervisoryCode,mapCode.get("superviseCode").toString());
-                SupervisoryCodeInfo supervisoryCodeInfo = supervisoryCodeInfoMapper.selectOne(queryWrapper3);
-                supervisoryCodeInfo.setStatus("1");
-                supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
+                supervisoryCodeInfoMapper.updateStatusBySuperviseCode(mapCode.get("superviseCode").toString());
                 jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                 jgInstallationNotice.setHandleDate(new Date());
                 Map<String,Object> map1 =new HashMap<>();

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

@@ -82,9 +82,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Autowired
     IJgInstallationNoticeService jrmInstallationNoticeService;
 
-    @Autowired
-    private CommonMapper commonMapper;
-
     /**
      * 分页查询
      */
@@ -270,12 +267,12 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     @Transactional
     public void revocation(String instanceId) {
-        // 执行流程
         JgMaintenanceContract contract = new JgMaintenanceContract();
         LambdaQueryWrapper<JgMaintenanceContract> lambda = new QueryWrapper<JgMaintenanceContract>().lambda();
         lambda.eq(JgMaintenanceContract::getInstanceId, instanceId);
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();
+        contract = this.getOne(lambda);
         ProcessTaskDTO processTaskDTO = workflowService.rollBack(instanceId);
         String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
         this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -291,7 +288,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         // 更新下一步可执行人
         String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
         contract.setNextExecuteUserIds(nextUserIds);
-        this.update(contract, lambda);
+        this.updateById(contract);
         // 删除待办
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(contract));
         jsonObject.put("nextTaskId", contract.getNextTaskId());
@@ -299,6 +296,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode());
         jsonObject.put("flowStatus", this.getTaskCodeByName(contract.getStatus()));
         jsonObject.put("flowStatusLabel", contract.getStatus());
+        jsonObject.put("changeCertificate", null);
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
@@ -430,6 +428,17 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 contract.setNextExecuteUserIds(nextUserIds);
                 executeOneStep(contract, taskName, nextUserIds, "0");
             }
+            commonService.deleteTaskModel(contract.getSequenceNbr()+"");
+        } else {
+            List<TaskModelDto> modelDtos = new ArrayList<>();
+            TaskModelDto dto = new TaskModelDto();
+            dto.setModel(contract);
+            dto.setTaskContent(buildTaskContent(contract));
+            dto.setTaskCode(contract.getApplyNo());
+            dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
+            dto.setRelationId(contract.getSequenceNbr() + "");
+            modelDtos.add(dto);
+            commonService.buildTaskModel(modelDtos);
         }
         updateById(contract);
         return true;

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

@@ -291,6 +291,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+                    taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
                     taskModelDto.setModel(taskMessageDto);
                     taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
@@ -324,6 +325,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             params.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+            taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
             params.put("model", taskMessageDto);
             commonServiceImpl.updateTaskModel(params);
         }
@@ -355,9 +357,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         dto.setStartUserCompanyName(jgUseRegistration.getUseUnitName());
         dto.setStartDate(new Date());
         jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
+        // 设备信息
+        LambdaQueryWrapper<JgUseRegistrationEq> lambda1 = new QueryWrapper<JgUseRegistrationEq>().lambda();
+        lambda1.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(jgUseRegistration.getSequenceNbr()));
+        JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(lambda1);
         jgUseRegistration.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+        taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
         list.add(dto);
@@ -422,10 +429,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<JgUseRegistration> queryWrapper = new QueryWrapper<JgUseRegistration>().lambda();
         queryWrapper.eq(JgUseRegistration::getInstanceId, instanceId);
         JgUseRegistration data = this.baseMapper.selectOne(queryWrapper);
+        // 设备信息
+        LambdaQueryWrapper<JgUseRegistrationEq> lambda1 = new QueryWrapper<JgUseRegistrationEq>().lambda();
+        lambda1.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(data.getSequenceNbr()));
+        JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(lambda1);
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
         jsonObject.put("nextTaskId", data.getNextTaskId());
         jsonObject.put("nextExecuteUser", data.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
+        jsonObject.put("equipId", jgUseRegistrationEq.getEquId());
         // 撤回删除代办
         commonServiceImpl.rollbackTask(instanceId, jsonObject);
     }
@@ -447,6 +459,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());
+            jsonObject.put("status", jgUseRegistration.getStatus());
+            jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
             return jsonObject;
         }
         Map<String, Object> detail = this.baseMapper.getDetail(id);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -60,6 +60,12 @@
     "url": "/mixuap?appId=1742358052905971713&id=1736722525146083329&formType=edit&roleIds={roleIds}&userId={userId}"
   },
   {
+  "type": "106",
+  "pageType": "draft",
+  "name": "维保备案",
+  "url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
     "type": "106",
     "pageType": "edit",
     "name": "维保备案",
@@ -127,11 +133,17 @@
   {
     "type": "111",
     "name": "改造变更登记",
-    "pageType": "look",
+    "pageType": "draft",
     "url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "111",
+    "name": "改造变更登记",
+    "pageType": "look",
+    "url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&roleIds={roleIds}&userId={userId}&pageType=look"
+  },
+  {
+    "type": "111",
     "pageType": "edit",
     "name": "改造变更登记",
     "url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&roleIds={roleIds}&userId={userId}&pageType=edit"

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/SupervisoryCodeInfoMapper.java

@@ -15,4 +15,6 @@ import java.util.List;
 public interface SupervisoryCodeInfoMapper extends BaseMapper<SupervisoryCodeInfo> {
 
     void updateStatus(@Param("superviseCodeList") List<String> superviseCodeList);
+
+    void updateStatusBySuperviseCode(String superviseCode);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/SupervisoryCodeInfoMapper.xml

@@ -8,4 +8,8 @@
             #{superviseCode}
         </foreach>
     </update>
+
+    <update id="updateStatusBySuperviseCode">
+        update biz_jg_supervisory_code set status = '1' where  supervisory_code = #{superviseCode}
+    </update>
 </mapper>
\ No newline at end of file