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;

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -284,9 +285,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
-
+        String[] taskName = new String[]{"流程结束"};
         // 字段转换
         this.convertField(noticeDto);
+        ArrayList<String> roleListFirst = new ArrayList<>();
+        ArrayList<String> roleListSecond = new ArrayList<>();
         noticeDto.setPromoter(reginParams.getUserModel().getUserId());
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             AjaxResult ajaxResult;
@@ -299,34 +302,32 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     ajaxResult = Workflow.taskClient.startByVariable(dto);
                     String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
                     noticeDto.setInstanceId(instanceId);
+                    // 查询下节点任务
+                    getNext(roleListFirst, instanceId,taskName);
+                    noticeDto.setInstanceStatus(String.join(",", roleListFirst));
                 } catch (Exception e) {
                     log.error("提交失败：{}", e);
                 }
             }
 
-            ajaxResult = Workflow.taskClient.getTask(noticeDto.getInstanceId());
-            JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
-            String taskId = dataObject.getString("id");
-            //组装信息
-            TaskResultDTO taskResultDTO = new TaskResultDTO();
-            taskResultDTO.setResultCode("approvalStatus");
-            taskResultDTO.setTaskId(taskId);
-            taskResultDTO.setComment("提交流程");
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("approvalStatus", op);
-            taskResultDTO.setVariable(map);
-            //执行流程
-            AjaxResult ajaxResult1;
-            try {
-                ajaxResult1 = Workflow.taskClient.completeByTask(taskId, taskResultDTO);
-                if (ajaxResult1.get("code").equals(200)) {
-                    noticeDto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-                    JgTransferNotice bean = new JgTransferNotice();
-                    BeanUtils.copyProperties(noticeDto, bean);
-                    jgTransferNoticeMapper.updateById(bean);
+            JgTransferNotice notice = new JgTransferNotice();
+            BeanUtils.copyProperties(noticeDto,notice);
+
+            boolean submit = submit(notice, op);
+
+            if(submit) {
+                // 查询下节点任务
+                getNext(roleListSecond, notice.getInstanceId(),taskName);
+                notice.setStatus(taskName[0]);
+                if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
+                    notice.setInstanceStatus(notice.getInstanceStatus() + "," + roleListSecond);
+                } else {
+                    notice.setInstanceStatus(String.join(",", roleListSecond));
                 }
-            } catch (Exception e) {
-                log.error("提交失败：{}", e);
+                notice.setPromoter(RequestContext.getExeUserId());
+                notice.setNextExecuteIds(String.join(",", roleListSecond));
+                notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                jgTransferNoticeMapper.updateById(notice);
             }
         } else {
             JgTransferNotice bean = new JgTransferNotice();
@@ -373,6 +374,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
     public void saveNotice(String submitType, Map<String, JgTransferNoticeDto> jgTransferNoticeDtoMap, ReginParams reginParams) {
+        String[] taskName = new String[]{"流程结束"};
         JgTransferNoticeDto model = jgTransferNoticeDtoMap.get(TABLE_PAGE_ID);
         // 字段转换
         convertField(model);
@@ -389,6 +391,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             return;
         }
 
+        ArrayList<String> roleListFirst = new ArrayList<>();
+        ArrayList<String> roleListSecond = new ArrayList<>();
         // 判断当前是否为提交
         List<String> instanceIdList = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
@@ -401,7 +405,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(String.valueOf(i));
-                dto.setCompleteFirstTask(true);
+//                dto.setCompleteFirstTask(true);
                 list.add(dto);
             }
             actWorkflowBatchDTO.setProcess(list);
@@ -412,11 +416,39 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 for (Object obj : returnList
                 ) {
                     JSONObject jsonObject = JSON.parseObject(JSONObject.toJSONString(obj));
-                    instanceIdList.add(jsonObject.getString("id"));
+                    String instanceId = jsonObject.getString("id");
+                    instanceIdList.add(instanceId);
+                    // 查询下节点任务
+                    if(returnList.get(0).equals(obj)) {
+                        getNext(roleListFirst, instanceId,taskName);
+                    }
+                    // 推动下一个节点
+                    AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+                    JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+                    String taskId = dataObject.getString("id");
+                    //组装信息
+                    TaskResultDTO dto = new TaskResultDTO();
+                    dto.setResultCode("approvalStatus");
+                    dto.setTaskId(taskId);
+                    dto.setComment("提交流程");
+                    HashMap<String, Object> map = new HashMap<>();
+                    map.put("approvalStatus", "0");
+                    dto.setVariable(map);
+                    //执行流程
+                    AjaxResult ajaxResult1 = null;
+                    try {
+                        ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
+                        if (ajaxResult1.get("code").equals(200)) {
+                            getNext(roleListSecond, instanceId,taskName);
+                        } else {
+                            log.error("提交失败");
                         }
-
                     } catch (Exception e) {
-                e.printStackTrace();
+                        log.error("提交失败：{}", e);
+                    }
+                }
+            } catch (Exception e) {
+                log.error("提交失败：{}", e);
             }
         }
 
@@ -431,6 +463,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
+            dto.setNextExecuteIds(String.join(",", roleListSecond));
+            dto.setInstanceStatus(String.join(",", roleListFirst));
+            dto.setPromoter(reginParams.getUserModel().getUserId());
+            dto.setStatus(taskName[0]);
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
@@ -568,11 +604,17 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
     public void cancel(JgTransferNoticeDto noticeDto) {
+        String[] taskName = new String[]{"流程结束"};
         FeignClientResult ajaxResult = Workflow.taskV2Client.rollBack(noticeDto.getInstanceId());
-        JgTransferNotice JgTransferNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
-        if (ajaxResult.getStatus() == 200) {
-            JgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-            jgTransferNoticeMapper.updateById(JgTransferNotice);
+        JgTransferNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
+        ArrayList<String> roleList = new ArrayList<>();
+        if(ajaxResult.getStatus() == 200) {
+            getNext(roleList, noticeDto.getInstanceId(),taskName);
+            jgInstallationNotice.setStatus(taskName[0]);
+            jgInstallationNotice.setPromoter("");
+            jgInstallationNotice.setNextExecuteIds(String.join(",", roleList));
+            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            jgTransferNoticeMapper.updateById(jgInstallationNotice);
         }
     }
 
@@ -624,7 +666,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         if(submit) {
             jgTransferNotice.setPromoter(reginParams.getUserModel().getUserId());
             if("0".equals(op)) {
-                jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
+                jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
 //                this.generateMaintainNoticeReport(JgTransferNotice.getSequenceNbr());
             } else {
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
@@ -652,4 +694,20 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
 //            prefix = ObjectUtils.isEmpty(elevatorMap) ? equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQHDT.getCode(), dto.getCity()).get("code").toString() : elevatorMap.get("code").toString();
 //        }
     }
+
+    void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
+        AjaxResult aj = Workflow.taskClient.getTaskNoAuth(instanceId);
+        JSONObject taskNoAuth = JSON.parseObject(JSON.toJSONString(aj.get("data")));
+        if (!ObjectUtils.isEmpty(taskNoAuth)) {
+            String nextTaskId = taskNoAuth.getString("id");
+            AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+            taskName[0] = taskNoAuth.getString("name");
+            JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+            for (Object datum : data) {
+                if (((Map) datum).containsKey("groupId")) {
+                    roleListFirst.add(((Map) datum).get("groupId").toString());
+                }
+            }
+        }
+    }
 }
\ No newline at end of file