Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/UrlEnum.java

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/12/9
+ */
+@Getter
+@AllArgsConstructor
+public enum  UrlEnum {
+     待办安装单位上传监检资料(0,"待办安装单位上传监检资料"),
+     已办安装单位上传监检资料(1,"已办安装单位上传监检资料"),
+    待办安装单位编制质量问题处理(2,"待办安装单位编制质量问题处理"),
+    已办安装单位编制质量问题处理(3,"已办安装单位编制质量问题处理"),
+    待办安装单位提交整改书(4,"待办安装单位提交整改书"),
+    已办安装单位提交整改书(5,"已办安装单位提交整改书"),
+    待办安装单位告知申请(6,"待办安装单位告知申请"),
+    已办安装单位告知申请(7,"已办安装单位告知申请"),
+    待办设计单位上传监检资料(8,"待办设计单位上传监检资料"),
+    已办设计单位上传监检资料(9,"已办设计单位上传监检资料"),
+    待办建设单位审查质量问题处理方案(10,"待办建设单位审查质量问题处理方案"),
+    已办建设单位审查质量问题处理方案(11,"已办建设单位审查质量问题处理方案"),
+    待办监察单位确认接收的告知申请(12,"待办监察单位确认接收的告知申请"),
+    已办监察单位确认接收的告知申请(13,"已办监察单位确认接收的告知申请"),
+    待办验检测单位审核告知申请(14,"待办验检测单位审核告知申请"),
+    已办验检测单位审核告知申请(15,"已办验检测单位审核告知申请"),
+    待办检验检测单位审批项目监检资料(16,"待办检验检测单位审批项目监检资料"),
+    已办检验检测单位审批项目监检资料(17,"已办检验检测单位审批项目监检资料"),
+    待办检验检测单位审查质量问题(18,"待办检验检测单位审查问题"),
+    已办检验检测单位审查质量问题(19,"已办检验检测单位审查问题"),
+    待办检验检测单位审查整改过程(20,"待办检验检测单位审查整改过程"),
+    已办检验检测单位审查整改过程(21,"已办检验检测单位审查整改过程"),
+    待办检验检测单位问题分类(22,"待办检验检测单位问题分类"),
+    已办检验检测单位问题分类(23,"待办检验检测单位问题分类"),
+    待办企业审核任务(24,"待办企业审核任务"),
+    已办企业审核任务(25,"已办企业审核任务");
+
+    private Integer status;
+    private String name;
+
+
+}

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

@@ -36,4 +36,7 @@ public class TaskDto extends BaseDto {
 
     private Integer companyId;
 
+    Object extend;  //url
+    Integer number;  //状态码
+
 }

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 页面路径表(TzUgpPath)实体类
+ *
+ * @author makejava
+ * @since 2022-12-09 18:52:39
+ */
+@Data
+
+public class TzUgpPathDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+    
+    private String name;
+
+    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

+package com.yeejoin.amos.boot.module.ugp.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 页面路径表(TzUgpPath)实体类
+ *
+ * @author makejava
+ * @since 2022-12-09 18:52:39
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_ugp_path")
+public class TzUgpPath extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    private String name;
+    /**
+    * url路径
+    */
+    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/mapper/TzUgpPathDao.java

+package com.yeejoin.amos.boot.module.ugp.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ugp.api.entity.TzUgpPath;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 页面路径表(TzUgpPath)表数据库访问层
+ *
+ * @author makejava
+ * @since 2022-12-09 18:52:40
+ */
+@Mapper
+public interface TzUgpPathDao extends BaseMapper<TzUgpPath> {
+
+
+}
\ 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/service/TzUgpPathService.java

+package com.yeejoin.amos.boot.module.ugp.api.service;
+
+/**
+ * 页面路径表(TzUgpPath)表服务接口
+ *
+ * @author makejava
+ * @since 2022-12-09 18:52:41
+ */
+public interface TzUgpPathService {
+
+
+
+}
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/TzUgpPathDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace=".dao.TzUgpPathDao">
+
+    <resultMap id="BaseResultMap" type=".entity.TzUgpPath">
+        <!--@Table tz_ugp_path-->
+        <result property="sequenceNbr" column="sequence_nbr" jdbcType="INTEGER"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="url" column="url" jdbcType="VARCHAR"/>
+        <result property="status" column="status" jdbcType="INTEGER"/>
+        <result property="recUserId" column="rec_user_id" jdbcType="INTEGER"/>
+        <result property="recDate" column="rec_date" jdbcType="TIMESTAMP"/>
+        <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
+        <result property="recUserName" column="rec_user_name" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="BaseResultMap">
+        select
+          sequence_nbr, name, url, status, rec_user_id, rec_date, is_delete, rec_user_name
+        from ugp_amos_ugp_biz.tz_ugp_path
+        where  = #{}
+    </select>
+
+    <!--查询指定行数据-->
+    <select id="queryAllByLimit" resultMap="BaseResultMap">
+        select
+          sequence_nbr, name, url, status, rec_user_id, rec_date, is_delete, rec_user_name
+        from ugp_amos_ugp_biz.tz_ugp_path
+        limit #{offset}, #{limit}
+    </select>
+
+    <!--通过实体作为筛选条件查询-->
+    <select id="queryAll" resultMap="BaseResultMap">
+        select
+          sequence_nbr, name, url, status, rec_user_id, rec_date, is_delete, rec_user_name
+        from ugp_amos_ugp_biz.tz_ugp_path
+        <where>
+            <if test="sequenceNbr != null">
+                and sequence_nbr = #{sequenceNbr}
+            </if>
+            <if test="name != null and name != ''">
+                and name = #{name}
+            </if>
+            <if test="url != null and url != ''">
+                and url = #{url}
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+            <if test="recUserId != null">
+                and rec_user_id = #{recUserId}
+            </if>
+            <if test="recDate != null">
+                and rec_date = #{recDate}
+            </if>
+            <if test="isDelete != null">
+                and is_delete = #{isDelete}
+            </if>
+            <if test="recUserName != null and recUserName != ''">
+                and rec_user_name = #{recUserName}
+            </if>
+        </where>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="" useGeneratedKeys="true">
+        insert into ugp_amos_ugp_biz.tz_ugp_path(sequence_nbr, name, url, status, rec_user_id, rec_date, is_delete, rec_user_name)
+        values (#{sequenceNbr}, #{name}, #{url}, #{status}, #{recUserId}, #{recDate}, #{isDelete}, #{recUserName})
+    </insert>
+
+    <!--通过主键修改数据-->
+    <update id="update">
+        update ugp_amos_ugp_biz.tz_ugp_path
+        <set>
+            <if test="sequenceNbr != null">
+                sequence_nbr = #{sequenceNbr},
+            </if>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="url != null and url != ''">
+                url = #{url},
+            </if>
+            <if test="status != null">
+                status = #{status},
+            </if>
+            <if test="recUserId != null">
+                rec_user_id = #{recUserId},
+            </if>
+            <if test="recDate != null">
+                rec_date = #{recDate},
+            </if>
+            <if test="isDelete != null">
+                is_delete = #{isDelete},
+            </if>
+            <if test="recUserName != null and recUserName != ''">
+                rec_user_name = #{recUserName},
+            </if>
+        </set>
+        where  = #{}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete from ugp_amos_ugp_biz.tz_ugp_path where  = #{}
+    </delete>
+
+</mapper>
\ 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/RectifyMsgController.java

@@ -60,7 +60,7 @@ public class RectifyMsgController extends BaseController {
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新整改短信通知表", notes = "根据sequenceNbr更新整改短信通知表")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新通知表", notes = "根据sequenceNbr更新通知表")
 	public ResponseModel<RectifyMsgDto> updateBySequenceNbrRectifyMsg(@RequestBody RectifyMsgDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(rectifyMsgServiceImpl.updateWithModel(model));
@@ -153,20 +153,6 @@ public class RectifyMsgController extends BaseController {
 	
 
 	/**
-	 * 根据sequenceNbr更新
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新项目安装告知短信记录表", notes = "根据sequenceNbr更新项目安装告知短信记录表")
-	public ResponseModel<RectifyMsgDto> updateBySequenceNbrInstallNoticeMsg(@RequestBody RectifyMsgDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-		model.setSequenceNbr(sequenceNbr);
-		return ResponseHelper.buildResponse(rectifyMsgServiceImpl.updateWithModel(model));
-	}
-
-	/**
 	 * 安装告知短信通知记录列表分页查询
 	 *
 	 * @param current 当前页

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

+package com.yeejoin.amos.boot.module.ugp.biz.controller ;
+import org.springframework.web.bind.annotation.*;
+/**
+ * 页面路径表(TzUgpPath)表控制层
+ *
+ * @author makejava
+ * @since 2022-12-09 18:52:42
+ */
+@RestController
+@RequestMapping("/tzUgpPath")
+public class TzUgpPathController {
+
+}
\ 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/service/impl/CompanyServiceImpl.java

@@ -170,9 +170,6 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
         return  true;
     }
 
-
-
-
     public Boolean companyCheck(CompanyDto model, Long sequenceNbr, String bizOrgType) throws Exception{
         Set<String> roleNameSet = new HashSet<>();
         List<RoleModel> userRoleList = new ArrayList<>();
@@ -218,7 +215,6 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
                         userRoleList.add(r);
                     }
                 });
-
                 userRoleList.stream().forEach(r -> {
                     roleIds.add(r.getSequenceNbr());
                 });
@@ -269,7 +265,6 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
 
         return this.updateById(company);
     }
-
     public CompanyDto queryBySeq1(Long sequenceNbr) {
         return companyMapper.queryBySeq1(sequenceNbr);
     }

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

@@ -317,7 +317,6 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         wps.setTemperature_time(json.getDouble("wps_temperature_time"));
         wps.setMaterial_minT_of_a_b_thickness(json.getDouble("wps_material_minT_of_a_b_thickness"));
 
-
         HashMap<String, String> stringStringHashMap = new WeldingQualification( ).equipmentWeldingQualification(pqr, wps);
 
 

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

@@ -7,8 +7,10 @@ import com.yeejoin.amos.boot.module.ugp.api.Enum.*;
 import com.yeejoin.amos.boot.module.ugp.api.dto.TaskDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.*;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.TaskMapper;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.TzUgpPathDao;
 import com.yeejoin.amos.boot.module.ugp.api.service.TaskService;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
+import org.apache.tomcat.util.buf.UEncoder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.querydsl.QPageRequest;
 import org.springframework.stereotype.Service;
@@ -45,6 +47,9 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
     @Autowired
     ProjectInitiationServiceImpl projectInitiationService;
 
+    @Autowired
+    TzUgpPathDao tzUgpPathDao;
+
     /**
      * 获取当前登录人的所有待办事项
      * @return
@@ -54,6 +59,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
         List<TaskDto> taskDtoList = new ArrayList<>();
         TaskDto task = new TaskDto();
         JSONObject jsonObject = new JSONObject();
+        jsonObject.put("extend","");
         ReginParams ReginParams = orgService.getReginParams();
         String companyType = ReginParams.getBusinessInfo().getCompanyType();
         Long companyId = ReginParams.getBusinessInfo().getCompanySequenceNbr();
@@ -63,38 +69,56 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
             //项目流程任务
             if (OrgEnum.安装单位.getKey().equals(companyType)) {
                 for (Project project : projectList) {
-                    if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus()) || ProjectInitiationEnum.告知申请.getName().equals(project.getStatus())) {
-                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.填报.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                    if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus()) ) {
+                        TaskDto taskDto = setTask(project.getStatus(), false, TaskTypeEnum.填报.getKey(), project.getRecDate(), project.getSequenceNbr(),UrlEnum.待办安装单位上传监检资料.getStatus());
+                        taskDtoList.add(taskDto);
+                    }
+                    if ( ProjectInitiationEnum.告知申请.getName().equals(project.getStatus())) {
+                        TaskDto taskDto = setTask(project.getStatus(), false, TaskTypeEnum.填报.getKey(), project.getRecDate(), project.getSequenceNbr(),UrlEnum.待办安装单位告知申请.getStatus());
+                        taskDtoList.add(taskDto);
                     }
                     if (ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus())) {
-                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr(),null));
                     }
                 }
             } else if (OrgEnum.建设单位.getKey().equals(companyType)) {
                 for (Project project : projectList) {
                     if (ProjectInitiationEnum.项目立项.getName().equals(project.getStatus())) {
-                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.填报.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.填报.getKey(), project.getRecDate(), project.getSequenceNbr(),null));
                     }
                 }
             } else if (OrgEnum.设计单位.getKey().equals(companyType)) {
                 for (Project project : projectList) {
                     if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())) {
-                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.填报.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.填报.getKey(), project.getRecDate(), project.getSequenceNbr(),UrlEnum.待办设计单位上传监检资料.getStatus()));
                     }
                     if (ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus()) || ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus())) {
-                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr(),null));
                     }
                 }
             } else if (OrgEnum.监察部门.getKey().equals(companyType)) {
                 for (Project project : projectList) {
-                    if (ProjectInitiationEnum.平台审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.接受审查意见.getName().equals(project.getStatus()) || ProjectInitiationEnum.接受告知.getName().equals(project.getStatus())) {
-                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                    if (ProjectInitiationEnum.平台审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.接受审查意见.getName().equals(project.getStatus()) ) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr(),null));
+                    }
+                    if ( ProjectInitiationEnum.接受告知.getName().equals(project.getStatus())) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(),
+                                project.getRecDate(), project.getSequenceNbr(),UrlEnum.待办监察单位确认接收的告知申请.getStatus()));
                     }
                 }
             } else if (OrgEnum.监检机构.getKey().equals(companyType)) {
                 for (Project project : projectList) {
-                    if (ProjectInitiationEnum.审查项目.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检科室分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员审核.getName().equals(project.getStatus())) {
-                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                    if ( ProjectInitiationEnum.监检科室分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员分配.getName().equals(project.getStatus()) ) {
+
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr(),null));
+                    }
+                    if ( ProjectInitiationEnum.监检员审核.getName().equals(project.getStatus())) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(),
+                                project.getRecDate(), project.getSequenceNbr(),UrlEnum.待办验检测单位审核告知申请.getStatus()));
+                    }
+                    if (ProjectInitiationEnum.审查项目.getName().equals(project.getStatus()) ) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(),
+                                project.getRecDate(), project.getSequenceNbr(),UrlEnum.待办检验检测单位审批项目监检资料.getStatus()));
                     }
                 }
             }
@@ -106,20 +130,35 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
             }
             if (OrgEnum.安装单位.getKey().equals(companyType)) {
                 for (QualityProblem qualityProblem : qualityProblemList) {
-                    if (ProblemProcessEnum.编制处理方案.getName().equals(qualityProblem.getStatus()) || ProblemProcessEnum.提交整改书.getName().equals(qualityProblem.getStatus())) {
-                        taskDtoList.add(setTask(qualityProblem.getStatus(), false, TaskTypeEnum.填报.getKey(), qualityProblem.getRecDate(), qualityProblem.getSequenceNbr()));
+                    if (ProblemProcessEnum.编制处理方案.getName().equals(qualityProblem.getStatus()) ) {
+                        TaskDto taskDto = setTask(qualityProblem.getStatus(), false, TaskTypeEnum.填报.getKey(), qualityProblem.getRecDate(), qualityProblem.getSequenceNbr(),UrlEnum.待办安装单位编制质量问题处理.getStatus());
+                        taskDtoList.add(taskDto);
+                    }
+                    if ( ProblemProcessEnum.提交整改书.getName().equals(qualityProblem.getStatus())) {
+                        TaskDto taskDto = setTask(qualityProblem.getStatus(), false, TaskTypeEnum.填报.getKey(), qualityProblem.getRecDate(), qualityProblem.getSequenceNbr(),UrlEnum.待办安装单位提交整改书.getStatus());
+                        taskDtoList.add(taskDto);
                     }
                 }
             } else if (OrgEnum.建设单位.getKey().equals(companyType)) {
                 for (QualityProblem qualityProblem : qualityProblemList) {
                     if (ProblemProcessEnum.审查处理方案.getName().equals(qualityProblem.getStatus())) {
-                        taskDtoList.add(setTask(qualityProblem.getStatus(), false, TaskTypeEnum.流程.getKey(), qualityProblem.getRecDate(), qualityProblem.getSequenceNbr()));
+                        taskDtoList.add(setTask(qualityProblem.getStatus(), false, TaskTypeEnum.流程.getKey(),
+                                qualityProblem.getRecDate(), qualityProblem.getSequenceNbr(),UrlEnum.待办建设单位审查质量问题处理方案.getStatus()));
                     }
                 }
             } else if (OrgEnum.监检机构.getKey().equals(companyType)) {
                 for (QualityProblem qualityProblem : qualityProblemList) {
-                    if (ProblemProcessEnum.确定问题.getName().equals(qualityProblem.getStatus()) || ProblemProcessEnum.问题分类.getName().equals(qualityProblem.getStatus()) || ProblemProcessEnum.审查整改过程.getName().equals(qualityProblem.getStatus())) {
-                        taskDtoList.add(setTask(qualityProblem.getStatus(), false, TaskTypeEnum.流程.getKey(), qualityProblem.getRecDate(), qualityProblem.getSequenceNbr()));
+                    if ( ProblemProcessEnum.问题分类.getName().equals(qualityProblem.getStatus()) ) {
+                        taskDtoList.add(setTask(qualityProblem.getStatus(), false, TaskTypeEnum.流程.getKey(),
+                                qualityProblem.getRecDate(), qualityProblem.getSequenceNbr(),UrlEnum.待办检验检测单位问题分类.getStatus()));
+                    }
+                    if (ProblemProcessEnum.确定问题.getName().equals(qualityProblem.getStatus()) ) {
+                        taskDtoList.add(setTask(qualityProblem.getStatus(), false, TaskTypeEnum.流程.getKey(),
+                                qualityProblem.getRecDate(), qualityProblem.getSequenceNbr(),UrlEnum.待办检验检测单位审查质量问题.getStatus()));
+                    }
+                    if ( ProblemProcessEnum.审查整改过程.getName().equals(qualityProblem.getStatus())) {
+                        taskDtoList.add(setTask(qualityProblem.getStatus(), false, TaskTypeEnum.流程.getKey(),
+                                qualityProblem.getRecDate(), qualityProblem.getSequenceNbr(),UrlEnum.待办检验检测单位审查整改过程.getStatus()));
                     }
                 }
             }
@@ -141,7 +180,8 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
         if(OrgEnum.监察部门.getKey().equals(companyType)||OrgEnum.监检机构.getKey().equals(companyType)){
             List<Company> companyList = companyService.list(companyWrapper);
             for (Company company : companyList) {
-                taskDtoList.add(setTask(null, false, TaskTypeEnum.企业审核.getKey(), company.getRecDate(), company.getSequenceNbr()));
+                taskDtoList.add(setTask(null, false, TaskTypeEnum.企业审核.getKey(),
+                        company.getRecDate(), company.getSequenceNbr(),UrlEnum.待办企业审核任务.getStatus()));
             }
         }
         return taskDtoList;
@@ -155,7 +195,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
      * @Param sequenceNbr 项目/问题处置的sequenceNbr
      * @return
      */
-    public TaskDto setTask(String InitiationStatus,boolean status, String taskType, Date sendTime,Long sequenceNbr){
+    public TaskDto setTask(String InitiationStatus,boolean status, String taskType, Date sendTime,Long sequenceNbr,Integer  number){
         TaskDto task = new TaskDto();
         String title = "", taskStatus = "";
         task.setTaskType(taskType);
@@ -177,10 +217,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
             }else {
                 taskStatus = CompanyExamineEnum.企业审核.getNo();
             }
-
-
         }
-
         task.setTitle(title);
         task.setStatus(status);
         if(status){
@@ -189,13 +226,10 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
         } else {
             task.setStatusLabel(TaskTypeEnum.待办.getName());
         }
-
         task.setSendTime(sendTime);
         task.setContent(title+", "+taskStatus);
         task.setSequenceNbr(sequenceNbr);
 
-
-
         if(TaskTypeEnum.填报.getKey().equals(taskType)){
             task.setTaskTypeLabel(TaskTypeEnum.填报.getName());
         } else if(TaskTypeEnum.流程.getKey().equals(taskType)){
@@ -203,8 +237,13 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
         } else{
             task.setTaskTypeLabel(TaskTypeEnum.企业审核.getName());
         }
-
-
+      //再加一个url路径 和状态
+        JSONObject jsonObject = new JSONObject();
+        if (!ValidationUtil.isEmpty(number)) {
+            jsonObject.put("extend",tzUgpPathDao.selectOne(new LambdaQueryWrapper<TzUgpPath>().eq(TzUgpPath::getStatus,number)).getUrl());
+            task.setExtend(jsonObject);
+            task.setNumber(number);
+        }
         return task;
     }
 
@@ -213,6 +252,8 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
      * @return
      */
     public List<TaskDto> doneTask(){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("extend","");
         List<Project> projectList = projectResourceService.getProjectList();
 //        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         ReginParams ReginParams = orgService.getReginParams();
@@ -227,25 +268,37 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
                 if (OrgEnum.安装单位.getKey().equals(companyType)) {
                     for (ProjectInitiation projectInitiation : projectInitiationList) {
                         if (ProjectInitiationEnum.提交资料.getName().equals(projectInitiation.getTaskName())) {
-                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.填报.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr()));
+                            TaskDto taskDto = setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.填报.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办安装单位上传监检资料.getStatus());
+                            taskDtoList.add(taskDto);
                         }
                     }
                 } else if (OrgEnum.设计单位.getKey().equals(companyType)) {
                     for (ProjectInitiation projectInitiation : projectInitiationList) {
                         if (ProjectInitiationEnum.提交资料.getName().equals(projectInitiation.getTaskName())) {
-                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.填报.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr()));
+                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.填报.getKey(),
+                                    projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办设计单位上传监检资料.getStatus()));
                         }
                     }
                 } else if (OrgEnum.监察部门.getKey().equals(companyType)) {
                     for (ProjectInitiation projectInitiation : projectInitiationList) {
                         if (ProjectInitiationEnum.接受告知.getName().equals(projectInitiation.getTaskName())) {
-                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr()));
+                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(),
+                                    projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办监察单位确认接收的告知申请.getStatus()));
                         }
                     }
                 } else if (OrgEnum.监检机构.getKey().equals(companyType)) {
                     for (ProjectInitiation projectInitiation : projectInitiationList) {
-                        if (ProjectInitiationEnum.审查项目.getName().equals(projectInitiation.getTaskName()) || ProjectInitiationEnum.监检科室分配.getName().equals(projectInitiation.getTaskName()) || ProjectInitiationEnum.监检员分配.getName().equals(projectInitiation.getTaskName()) || ProjectInitiationEnum.监检员审核.getName().equals(projectInitiation.getTaskName())) {
-                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr()));
+                        if ( ProjectInitiationEnum.监检科室分配.getName().equals(projectInitiation.getTaskName()) || ProjectInitiationEnum.监检员分配.getName().equals(projectInitiation.getTaskName()) ) {
+
+                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr(),null));
+                        }
+                        if (ProjectInitiationEnum.监检员审核.getName().equals(projectInitiation.getTaskName())) {
+                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(),
+                                    projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办验检测单位审核告知申请.getStatus()));
+                        }
+                        if (ProjectInitiationEnum.审查项目.getName().equals(projectInitiation.getTaskName()) ) {
+                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(),
+                                    projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办检验检测单位审批项目监检资料.getStatus()));
                         }
                     }
                 }
@@ -266,20 +319,35 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
                 }
                 if (OrgEnum.安装单位.getKey().equals(companyType)) {
                     for (ProjectInitiation projectInitiation : projectInitiations) {
-                        if (ProblemProcessEnum.编制处理方案.getName().equals(projectInitiation.getTaskName()) || ProblemProcessEnum.提交整改书.getName().equals(projectInitiation.getTaskName())) {
-                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.填报.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr()));
+                        if (ProblemProcessEnum.编制处理方案.getName().equals(projectInitiation.getTaskName()) ) {
+                            TaskDto taskDto = setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.填报.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办安装单位编制质量问题处理.getStatus());
+                            taskDtoList.add(taskDto);
+                        }
+                        if ( ProblemProcessEnum.提交整改书.getName().equals(projectInitiation.getTaskName())) {
+                            TaskDto taskDto = setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.填报.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办安装单位提交整改书.getStatus());
+                            taskDtoList.add(taskDto);
                         }
                     }
                 } else if (OrgEnum.建设单位.getKey().equals(companyType)) {
                     for (ProjectInitiation projectInitiation : projectInitiations) {
                         if (ProblemProcessEnum.审查处理方案.getName().equals(projectInitiation.getTaskName())) {
-                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr()));
+                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(),
+                                    projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办建设单位审查质量问题处理方案.getStatus()));
                         }
                     }
                 } else if (OrgEnum.监检机构.getKey().equals(companyType)) {
                     for (ProjectInitiation projectInitiation : projectInitiations) {
-                        if (ProblemProcessEnum.确定问题.getName().equals(projectInitiation.getTaskName()) || ProblemProcessEnum.问题分类.getName().equals(projectInitiation.getTaskName()) || ProblemProcessEnum.审查整改过程.getName().equals(projectInitiation.getTaskName())) {
-                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(), projectInitiation.getRecDate(), project.getSequenceNbr()));
+                        if ( ProblemProcessEnum.问题分类.getName().equals(projectInitiation.getTaskName()) ) {
+                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(),
+                                    projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办检验检测单位审查质量问题.getStatus()));
+                        }
+                        if (ProblemProcessEnum.确定问题.getName().equals(projectInitiation.getTaskName()) ) {
+                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(),
+                                    projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办检验检测单位问题分类.getStatus()));
+                        }
+                        if (ProblemProcessEnum.审查整改过程.getName().equals(projectInitiation.getTaskName())) {
+                            taskDtoList.add(setTask(projectInitiation.getTaskName(), true, TaskTypeEnum.流程.getKey(),
+                                    projectInitiation.getRecDate(), project.getSequenceNbr(),UrlEnum.已办检验检测单位审查整改过程.getStatus()));
                         }
                     }
                 }
@@ -300,7 +368,8 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
             if(OrgEnum.监察部门.getKey().equals(companyType)||OrgEnum.监检机构.getKey().equals(companyType)) {
                 List<Company> companyList = companyService.list(companyWrapper);
                 for (Company company : companyList) {
-                    taskDtoList.add(setTask(null, true, TaskTypeEnum.企业审核.getKey(), company.getRecDate(), company.getSequenceNbr()));
+                    taskDtoList.add(setTask(null, true, TaskTypeEnum.企业审核.getKey(),
+                            company.getRecDate(), company.getSequenceNbr(), UrlEnum.已办企业审核任务.getStatus()));
                 }
             }
         }

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

+package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.ugp.api.dto.TzUgpPathDto;
+import com.yeejoin.amos.boot.module.ugp.api.entity.TzUgpPath;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.TzUgpPathDao;
+import com.yeejoin.amos.boot.module.ugp.api.service.TzUgpPathService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import javax.annotation.Resource;
+import java.util.List;
+/**
+ * 页面路径表(TzUgpPath)表服务实现类
+ *
+ * @author makejava
+ * @since 2022-12-09 18:52:42
+ */
+@Service
+public class TzUgpPathServiceImpl extends BaseService<TzUgpPathDto,TzUgpPath,TzUgpPathDao> implements TzUgpPathService {
+
+}
\ No newline at end of file