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

@@ -2,9 +2,9 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.util.StringUtils;
@@ -186,4 +186,12 @@ public class JgTransferNoticeDto extends BaseDto {
                 + (StringUtils.isEmpty(this.address) ? "" : this.address);
     }
 
+    private List<String> roleIds;
+
+    private  String dataType;
+
+    private String nextExecuteIds;
+
+    private String status;
+
 }

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

@@ -3,10 +3,10 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -280,6 +280,14 @@ public class JgTransferNotice extends BaseEntity {
     @TableField("province_name")
     private String provinceName;
 
-    @TableField("promoter")
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+
+    @TableField("status")
+    private String status;
+
+    @TableField(value = "promoter")
     private String promoter;
+
 }

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

@@ -18,7 +18,10 @@
         tjtn.instance_id AS instanceId,
         tjtn.transfer_type AS transferType,
         tjtn.plan_date AS planDate,
-        tjtn.promoter AS promoter
+        tjtn.promoter AS promoter,
+        tjtn.next_execute_ids AS nextExecuteIds,
+        tjtn.instance_status AS instanceStatus,
+        tjtn.notice_report_url AS noticeReportUrl
         FROM
             tzs_jg_transfer_notice tjtn
         <where>
@@ -47,8 +50,7 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND tjtn.notice_status in ('6612', '6613', '6614')
-                AND tjtn.receive_org_code = #{orgCode}
+                AND tjtn.notice_status in ('6612', '6613', '6610')
             </if>
             <if test="type == 'enterprise'">
                 AND tjtn.install_unit_credit_code = #{orgCode}

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

@@ -606,7 +606,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         if (submit) {
             if ("0".equals(op)) {
                 jgMaintainNotice.setPromoter(reginParams.getUserModel().getUserId());
-                jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
+                jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                 this.generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
 //                // 更新其他业务表
 //                tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());

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

@@ -413,8 +413,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 Workflow.taskClient.completeByTask(taskId, taskResultDTO);
                 extracted(instanceId, roleList, contract);
                 contract.setInstanceId(instanceId);
-                contract.setApplyStatus(FlowStatusEnum.SUBMITTED.getName());
-                contract.setStatus(FlowStatusEnum.SUBMITTED.getName());
+                contract.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                contract.setStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
             } catch (Exception e) {
                 log.error("维保使用单位提交流程启动失败：{}", e);
             }

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

@@ -661,7 +661,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         boolean submit = submit(JgReformNotice, op);
         if (submit) {
             if ("0".equals(op)) {
-                JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
+                JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                 this.generateInstallationNoticeReport(JgReformNotice.getSequenceNbr());
                 // 更新其他业务表
                 // tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());

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

@@ -6,28 +6,20 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.JgInstallationNoticeDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.*;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancel;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.CancelFlowStatusEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgScrapCancelService;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -37,6 +29,7 @@ import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -44,8 +37,6 @@ import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.*;
 import java.util.stream.Collectors;