修改ugp任务逻辑

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/TaskDto.java

@@ -20,7 +20,7 @@ public class TaskDto extends BaseDto {
 
     private String title;
 
-    private Long projectId;
+    private Long sourceId;
 
     private Boolean status;
 
@@ -34,9 +34,9 @@ public class TaskDto extends BaseDto {
 
     private String agencyCode;
 
-    private Integer companyId;
-
     Object extend;  //url
     Integer number;  //状态码
 
+    private Date sendTime;
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/TzUgpPathDto.java

@@ -25,14 +25,4 @@ public class TzUgpPathDto extends BaseDto {
     private String url;
     
     private Integer status;
-    
-    private Long recUserId;
-    
-    private Date recDate;
-    
-    private Integer isDelete;
-    
-    private String recUserName;
-
-
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/TzUgpPath.java

@@ -19,6 +19,7 @@ import java.util.Date;
 @TableName("tz_ugp_path")
 public class TzUgpPath extends BaseEntity {
     private static final long serialVersionUID = 1L;
+
     private String name;
     /**
     * url路径
@@ -26,14 +27,6 @@ public class TzUgpPath extends BaseEntity {
     private String url;
     
     private Integer status;
-    
-    private Long recUserId;
-    
-    private Date recDate;
-    
-    private Integer isDelete;
-    
-    private String recUserName;
 
 
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.mysql.cj.xdevapi.JsonArray;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -49,7 +48,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
-import javax.swing.text.StyledEditorKit;
 
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -132,7 +130,7 @@ public class CompanyController extends BaseController {
 		unitIds.add(superviseRule.getSuperviseDeptId());
 		unitIds.add(superviseRule.getInspectionUnitId());
 		//新增企业审核任务信息
-		taskService.setTask(null, false, TaskTypeEnum.企业审核.getKey(), new Date(), model.getSequenceNbr(), TaskTypeEnum.企业审核.getKey(), unitIds);
+		taskService.saveOrUpdateTask(null, false, TaskTypeEnum.企业审核.getKey(), new Date(), model.getSequenceNbr(), TaskTypeEnum.企业审核.getKey(), unitIds);
 
 	    return ResponseHelper.buildResponse(model);
 	}

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java

@@ -33,7 +33,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 企业信息表服务实现类
@@ -261,8 +260,7 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
         unitIds.add(superviseRule.getSuperviseDeptId());
         unitIds.add(superviseRule.getInspectionUnitId());
         //新增企业审核任务信息
-        taskService.setTask(null, true, TaskTypeEnum.企业审核.getKey(), new Date(), model.getSequenceNbr(), TaskTypeEnum.企业审核.getKey(), unitIds);
-
+        taskService.saveOrUpdateTask(null, true, TaskTypeEnum.企业审核.getKey(), new Date(), model.getSequenceNbr(), TaskTypeEnum.企业审核.getKey(), unitIds);
         return this.updateById(company);
     }
     public CompanyDto queryBySeq1(Long sequenceNbr) {

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProblemInitiationServiceImpl.java

@@ -20,7 +20,6 @@ import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
@@ -150,7 +149,7 @@ public class ProblemInitiationServiceImpl {
             //更新任务表的状态 已办
             if(!ValidationUtil.isEmpty(unitIds)) {
                 taskType = getUnitId(unitIds, objectd);
-                taskService.setTask(objectd.getStatus(), true, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.质量问题.getKey(), unitIds);
+                taskService.saveOrUpdateTask(objectd.getStatus(), true, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.质量问题.getKey(), unitIds);
             }
 
             //更新problem中的status字段，表示当前流程下一个执行的任务
@@ -161,7 +160,7 @@ public class ProblemInitiationServiceImpl {
 
             if(!ValidationUtil.isEmpty(unitIds)) {
                 taskType = getUnitId(unitIds, objectd);
-                taskService.setTask(objectd.getStatus(), false, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.质量问题.getKey(), unitIds);
+                taskService.saveOrUpdateTask(objectd.getStatus(), false, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.质量问题.getKey(), unitIds);
             }
         }
     }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java

@@ -3,54 +3,32 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Maps;
 import com.mao.expertSystem.WeldingQualification;
 import com.mao.expertSystem.material.MyPqr;
 import com.mao.expertSystem.material.MyWps;
 import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
-import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.AuditEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.SMSEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.TaskTypeEnum;
-import com.yeejoin.amos.boot.module.ugp.api.Util.CommonResponse;
-import com.yeejoin.amos.boot.module.ugp.api.Util.HttpUtil;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectInitiationDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.*;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectInitiationMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IProjectInitiationService;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.client.AgencyUserClient;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.rule.model.IdxProjectModel;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
-import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.client.TaskClient;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
-import org.bouncycastle.pqc.crypto.newhope.NHOtherInfoGenerator;
-import org.drools.core.factmodel.traits.TraitTypeEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-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.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
 
@@ -194,7 +172,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             //更新任务表的状态 已办
             if(!ValidationUtil.isEmpty(unitIds)) {
                 taskType = getUnitId(unitIds, project, superviseRule);
-                taskService.setTask(project.getStatus(), true, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.项目立项.getKey(), unitIds);
+                taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.项目立项.getKey(), unitIds);
             }
 
             //更新project种的status字段，表示当前流程下一个执行的任务
@@ -204,7 +182,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             if(!ValidationUtil.isEmpty(unitIds)) {
                 project = projectService.getById(object.getLong("sequenceNbr"));
                 taskType = getUnitId(unitIds, project, superviseRule);
-                taskService.setTask(project.getStatus(), false, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.项目立项.getKey(), unitIds);
+                taskService.saveOrUpdateTask(project.getStatus(), false, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.项目立项.getKey(), unitIds);
             }
         }
     }