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

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

@@ -214,4 +214,7 @@ public class JgMaintainNoticeDto extends BaseDto {
     private String equList;
 
     private String supervisoryCode;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    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/service/IJgMaintainNoticeService.java

@@ -39,10 +39,9 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
      *
      * @param page  分页对象
      * @param model 查询参数
-     * @param type  类型：enterprise-企业端、supervision-监管端
      * @return 维修告知列表
      */
-    Page<JgMaintainNoticeDto> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page, JgMaintainNoticeDto model, String type, ReginParams reginParams);
+    Page<JgMaintainNoticeDto> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page, JgMaintainNoticeDto model, ReginParams reginParams);
 
     /**
      * 批量删除

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

@@ -34,11 +34,11 @@
                     AND isn.maintain_type = #{param.maintainType}
                 </if>
             </if>
-            <if test="type == 'supervision'">
-                AND (isn.notice_status in ('6612', '6614', '6616') )
+            <if test="type != 'company'">
+                AND isn.instance_id is not null
                 AND isn.receive_org_code = #{orgCode}
             </if>
-            <if test="type == 'enterprise'">
+            <if test="type == 'company'">
                 AND isn.install_unit_credit_code = #{orgCode}
             </if>
         </where>

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

@@ -128,12 +128,11 @@ public class JgMaintainNoticeController extends BaseController {
     public ResponseModel<Page<JgMaintainNoticeDto>> queryForPage(
             @ApiParam(value = "当前页码", required = true) @RequestParam(value = "current", defaultValue = "1") int current,
             @ApiParam(value = "每页大小", required = true) @RequestParam(value = "size", defaultValue = "20") int size,
-            @ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
             @RequestBody(required = false) JgMaintainNoticeDto model
     ) {
         Page<JgMaintainNotice> page = new Page<>(current, size);
         ReginParams reginParams = getSelectedOrgInfo();
-        return ResponseHelper.buildResponse(iJgMaintainNoticeService.queryForJgMaintainNoticePage(page, model, type, reginParams));
+        return ResponseHelper.buildResponse(iJgMaintainNoticeService.queryForJgMaintainNoticePage(page, model, 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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
@@ -298,12 +299,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
                 // 创建新的代办
-                taskModelDto.setModel(jgChangeRegistrationReform);
-                taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
-                taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
                 commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
             }
         } else {
@@ -321,7 +317,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             map.put("relationId", jgChangeRegistrationReform.getInstanceId());
             jgChangeRegistrationReform.setNextExecuteUserIds("");
-            map.put("model",jgChangeRegistrationReform);
+            map.put("model",conveterTaskMessageDTO(jgChangeRegistrationReform));
             commonServiceImpl.updateTaskModel(map);
         }
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
@@ -417,6 +413,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
             originalData.remove("sequenceNbr");
             originalDataOther.remove("sequenceNbr");
+            originalDataOther.remove("status");
             if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
                 detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
             }
@@ -707,7 +704,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         taskModelDto.setNextExecuteUser(jgChangeRegistrationReform.getNextExecutorIds());
         //跳转路径
 //        taskModelDto.setRoutePath();
-        taskModelDto.setModel(jgChangeRegistrationReform);
+        taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
         return taskModelDto;
     }
 
@@ -726,4 +723,19 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         return workflowResultDto;
     }
 
+    /**
+     * 将jgChangeRegistrationReform转换成TaskModelDto
+     * @param jgChangeRegistrationReform
+     * @return
+     */
+   public TaskMessageDto conveterTaskMessageDTO(JgChangeRegistrationReform jgChangeRegistrationReform) {
+       TaskMessageDto taskMessageDto = new TaskMessageDto();
+       taskMessageDto.setInstanceId(jgChangeRegistrationReform.getInstanceId());
+       taskMessageDto.setStatus(jgChangeRegistrationReform.getStatus());
+       taskMessageDto.setPromoter(jgChangeRegistrationReform.getPromoter());
+       taskMessageDto.setNextExecuteUserIds(jgChangeRegistrationReform.getNextExecuteUserIds());
+       taskMessageDto.setSequenceNbr(jgChangeRegistrationReform.getSequenceNbr());
+       taskMessageDto.setNextExecuteIds(jgChangeRegistrationReform.getNextExecutorIds());
+       return taskMessageDto;
+   }
 }
\ 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/JgMaintainNoticeServiceImpl.java

@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
@@ -69,6 +70,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     private static final String TABLE_PAGE_ID = "maintainInfo";
 
     @Autowired
+    IJgInstallationNoticeService iJgInstallationNoticeService;
+
+    @Autowired
     EquipmentCategoryMapper equipmentCategoryMapper;
     @Autowired
     JgMaintainNoticeEqMapper jgMaintainNoticeEqMapper;
@@ -260,12 +264,12 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
      *
      * @param page  分页对象
      * @param model 查询参数
-     * @param type  类型：enterprise-企业端、supervision-监管端
      * @return 维修告知列表
      */
     @Override
-    public Page<JgMaintainNoticeDto> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page, JgMaintainNoticeDto model, String type, ReginParams reginParams) {
+    public Page<JgMaintainNoticeDto> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page, JgMaintainNoticeDto model, ReginParams reginParams) {
         String orgCode = reginParams.getCompany().getCompanyCode();
+        String type = reginParams.getCompany().getLevel();
         List<DataDictionary> dictionaries = dataDictionaryService.getByType("WXLX");
         Page<JgMaintainNotice> noticePage = jgMaintainNoticeMapper.queryForPage(page, model, type, orgCode);
         Page<JgMaintainNoticeDto> noticeDtoPage = new Page<>();