Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into dev_2nd_period_test

# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_third_record.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/store/modules/user.js
#	jero-web/src/views/processCenter/components/feedbackInformation.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java

@@ -152,6 +152,10 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/processCall", "anon");
         // 法规技术评估-条款信息评估结果表 工作流处理数据接口排除
         filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/processCall", "anon");
+        // 流程信息表 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/todoCenter/processInfoEO/processCall", "anon");
+        // 流程信息明细表 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/todoCenter/processInfoDetailEO/processCall", "anon");
 
         filterChainDefinitionMap.put("/lark/larkEventSubscriptionConfig", "anon"); //飞书调用接口，事件订阅配置。
         filterChainDefinitionMap.put("/lark/larkCardMessageConfig", "anon"); //飞书调用接口，卡片消息配置。

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java

@@ -5,13 +5,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.modules.system.enums.SysPermissionEnum;
+import com.jero.modules.system.mapper.TodoCenterMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CommonConstant;
-import com.jero.common.system.util.JwtUtil;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.MD5Util;
 import com.jero.common.util.oConvertUtils;
@@ -54,6 +55,9 @@ public class SysPermissionController {
 	@Autowired
 	private ISysDepartPermissionService sysDepartPermissionService;
 
+	@Autowired
+	private TodoCenterMapper todoCenterMapper;
+
 	/**
 	 * 加载数据节点
 	 *
@@ -641,6 +645,47 @@ public class SysPermissionController {
 			if (isWWWHttpUrl(permission.getUrl())) {
 				meta.put("url", permission.getUrl());
 			}
+
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+			Map<String,Object> params = new HashMap<>();
+			params.put("currentUserId",currentUser.getId());
+
+			List<String> flowTypeList = new ArrayList<>();
+			//项目法规任务
+			if(StringUtils.equals(permission.getId(), SysPermissionEnum.PROJECT_REGULATION_TASKS.getId())){
+				flowTypeList.add("1");
+				flowTypeList.add("2");
+				flowTypeList.add("3");
+				flowTypeList.add("4");
+				flowTypeList.add("10");
+				params.put("flowTypeList",flowTypeList);
+				//存在待办任务标识，true为有
+				boolean existTaskFlag = false;
+				int result = todoCenterMapper.todoCenterTaskCount(params);
+				if(result > 0){
+					existTaskFlag = true;
+				}
+				//查询当前登录用户是否有项目法规任务
+				meta.put("existTask",existTaskFlag);
+			}
+			//法规评估任务
+			if(StringUtils.equals(permission.getId(), SysPermissionEnum.REGULATORY_ASSESSMENT_TASKS.getId())){
+				flowTypeList.add("5");
+				flowTypeList.add("6");
+				params.put("flowTypeList",flowTypeList);
+				int result = todoCenterMapper.todoCenterTaskCount(params);
+				boolean existTaskFlag = false;
+				if(result > 0){
+					existTaskFlag = true;
+				}
+				meta.put("existTask",existTaskFlag);
+			}
+			//项目参数任务
+			if(StringUtils.equals(permission.getId(), SysPermissionEnum.PROJECT_PARAMETER_TASKS.getId())){
+				boolean existTaskFlag = false;
+				meta.put("existTask",existTaskFlag);
+			}
 			json.put("meta", meta);
 		}
 

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysPermissionEnum.java

@@ -0,0 +1,35 @@
+package com.jero.modules.system.enums;
+
+/**
+ * 菜单权限枚举类
+ * @Author: wzj
+ * @Date: 2022/10/26 16:14
+ **/
+public enum SysPermissionEnum {
+
+    PROJECT_REGULATION_TASKS("项目法规任务","1580735287309119489",""),
+    REGULATORY_ASSESSMENT_TASKS("法规评估任务","1580735611793059842",""),
+    PROJECT_PARAMETER_TASKS("项目参数任务","1580735965892980738","");
+
+    private String name;
+    private String id;
+    private String value;
+
+    private SysPermissionEnum(String name,String id, String value) {
+        this.name = name;
+        this.id = id;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getId() {
+        return id;
+    }
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/TodoCenterMapper.java

@@ -0,0 +1,14 @@
+package com.jero.modules.system.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * 待办中心mapper层
+ * @Author: wzj
+ * @Date: 2022/10/26 16:41
+ **/
+public interface TodoCenterMapper {
+    int todoCenterTaskCount(@Param("params") Map<String, Object> params);
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml

@@ -0,0 +1,21 @@
+<?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="com.jero.modules.system.mapper.TodoCenterMapper">
+
+    <select id="todoCenterTaskCount" resultType="java.lang.Integer">
+        select
+             count(1)
+        from
+             process_info pi
+        where
+             pi.id in (
+                 select detail.process_info_id from process_info_detail detail where detail.status = 'NotDone' and detail.user_id = #{params.currentUserId}
+             )
+        <if test="params.flowTypeList != null ">
+            and pi.flow_type in
+            <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java

@@ -18,6 +18,8 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
 
     List<ParamsCollectManifestEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
 
+    List<ParamsCollectManifestEO> listInfoOfTodoCenter();
+
     List<Map<String, Object>> listInfoForExport(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
 
     // 查询控件类型为 标题的 参数项

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.cert.collect.entity.ParamsManifestEO;
 import com.jero.modules.cert.collect.vo.ParamsManifestVO;
+import com.jero.modules.todoCenter.entity.ParamsManifestTodoCenterEO;
+import com.jero.modules.todoCenter.vo.ParamsManifestTodoCenterEOPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -24,6 +26,8 @@ public interface ParamsManifestEOMapper extends BaseMapper<ParamsManifestEO> {
 
     List<ParamsManifestVO> listInfoAll(@Param("idList") List<String> idList);
 
+    List<ParamsManifestTodoCenterEO> listForTodoCenter(ParamsManifestTodoCenterEOPage paramsManifestTodoCenterEOPage);
+
     ParamsManifestVO getProjectById(@Param("projectId") String projectId);
 
     List<Map<String, String>> labelListForProjectDetails(@Param("projectId") String projectId);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml

@@ -81,6 +81,10 @@
         order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
     </select>
 
+    <select id="listInfoOfTodoCenter" resultMap="ParamsCollectManifestEOResultMap">
+        select id,nio_number,state,sdt,dre,params_manifest_id from params_collect_manifest
+    </select>
+
     <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
         select *
         from params_collect_manifest

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml

@@ -120,6 +120,29 @@
 
     </select>
 
+    <select id="listForTodoCenter" resultType="com.jero.modules.todoCenter.entity.ParamsManifestTodoCenterEO" parameterType="com.jero.modules.todoCenter.vo.ParamsManifestTodoCenterEOPage">
+        select tmp_tb.* from(
+        select
+        pm.id as id,
+        pm.title as title,
+        pm.state as state,
+        pm.project_id as project_id,
+        pm.create_time as create_time,
+        concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.version) as project_name
+        from params_manifest pm
+        left join project_library_base as plb on plb.id = pm.project_id
+        left join project_name_info as pni on plb.project_name_id = pni.id
+        left join project_year_name_info as pyni on plb.year_name_id=pyni.id
+        ) tmp_tb
+        where 1=1 and state = #{state}
+        <if test="projectName !=null and projectName !=''">
+            AND project_name LIKE CONCAT(CONCAT('%',#{projectName}),'%')
+        </if>
+        <if test="title !=null and title !=''">
+            AND title LIKE CONCAT(CONCAT('%',#{title}),'%')
+        </if>
+    </select>
+
     <select id="getProjectById" resultMap="ParamsManifestEOResultMapForCopy">
         select tmp_tb.* from(
         select

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java

@@ -2,6 +2,7 @@ package com.jero.modules.lawsOpinionGather.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.MessageTypeEnum;
@@ -29,6 +30,10 @@ import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
+import com.jero.modules.todoCenter.service.IProcessInfoEOService;
+import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import com.jero.modules.wkflow.feginClient.WorkFlowFeignClient;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -70,6 +75,8 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 	private ILawsOpinionAssessmentResultEOService lawsOpinionAssessmentResultEOService;
 	@Autowired
 	private WorkFlowFeignClient workFlowFeignClient;
+	@Autowired
+	private IProcessInfoEOService processInfoEOService;
 
 	/**
 	 * 保存
@@ -129,6 +136,8 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 			QueryWrapper deleteWrapper = new QueryWrapper();
 			deleteWrapper.in("laws_opinion_gather_id",ids);
 			this.lawsOpinionAssessmentResultEOService.remove(deleteWrapper);
+
+			this.processInfoEOService.deleteByIds(actiProcInstIdList);
 		}else {
 			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
 				throw new JeroBootException("删除失败，请联系管理员！");
@@ -338,6 +347,12 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 					lawsOpinionGatherEO.setGatherResult(GatherResultEnum.COMPLETED.getValue());
 				});
 				this.updateBatchById(lawsOpinionGatherEOList);
+
+				LambdaUpdateWrapper<ProcessInfoEO> processInfoUpdateWrap = new LambdaUpdateWrapper<>();
+				processInfoUpdateWrap.set(ProcessInfoEO::getStatus, TodoCenterStatusEnum.COMPLETED.getValue());
+				processInfoUpdateWrap.in(ProcessInfoEO::getId,actiProcInstIdList);
+				processInfoUpdateWrap.eq(ProcessInfoEO::getFlowType, FlowTypeEnum.FGYJSJLC.getValue());
+				this.processInfoEOService.update(processInfoUpdateWrap);
 			}
 		}
 		return new Result<>().success("手动结束成功！");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java

@@ -2,6 +2,7 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
@@ -33,6 +34,10 @@ import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
+import com.jero.modules.todoCenter.service.IProcessInfoEOService;
+import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import com.jero.modules.wkflow.feginClient.WorkFlowFeignClient;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
@@ -97,6 +102,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 	private ILawsTechnologyEvaluationComplianceResultEOService lawsTechnologyEvaluationComplianceResultEOService;
 	@Autowired
 	private WorkFlowFeignClient workFlowFeignClient;
+	@Autowired
+	private IProcessInfoEOService processInfoEOService;
 
 	/**
 	 * 保存
@@ -156,7 +163,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		List<LawsTechnologyEvaluationFlowDetailEO> lawsTechnologyEvaluationFlowDetailEOList = lawsTechnologyEvaluationFlowDetailEOService.list(flowDetailEOQueryWrapper);
 
 		if(CollectionUtils.isNotEmpty(lawsTechnologyEvaluationFlowDetailEOList)){
-			String prcIds = lawsTechnologyEvaluationFlowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(","));
+			List<String> actiProcInstIdList = lawsTechnologyEvaluationFlowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.toList());
+			String prcIds = actiProcInstIdList.stream().collect(Collectors.joining(","));
 			Result<String> result = this.workFlowFeignClient.deleteProcessInstanceByPrcIds(prcIds);
 			if(result.getCode().equals(CommonConstant.SC_OK_200)){
 				removeByIds(ids);
@@ -170,6 +178,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 				this.lawsTechnologyEvaluationResultEOService.remove(deleteWrapper);
 
 				this.lawsTechnologyEvaluationComplianceResultEOService.remove(deleteWrapper);
+
+				this.processInfoEOService.deleteByIds(actiProcInstIdList);
 			}else {
 				if(StringUtils.equals(cut,CutEnum.CN.getValue())){
 					throw new JeroBootException("删除失败，请联系管理员！");
@@ -690,13 +700,20 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			List<LawsTechnologyEvaluationFlowDetailEO> lawsTechnologyEvaluationFlowDetailEOList = lawsTechnologyEvaluationFlowDetailEOService.list(flowDetailEOQueryWrapper);
 
 			if(CollectionUtils.isNotEmpty(lawsTechnologyEvaluationFlowDetailEOList)){
-				String actiProcInstIds = lawsTechnologyEvaluationFlowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(","));
+				List<String> actiProcInstIdList = lawsTechnologyEvaluationFlowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.toList());
+				String actiProcInstIds = actiProcInstIdList.stream().collect(Collectors.joining(","));
 				Result<String> result = this.workFlowFeignClient.completeLawsTechnologyEvaluationTaskByPids(actiProcInstIds);
 				if(result.getCode().equals(CommonConstant.SC_OK_200)){
 					lawsTechnologyEvaluationEOList.forEach(lawsTechnologyEvaluationEO -> {
 						lawsTechnologyEvaluationEO.setFlowStatus(GatherResultEnum.COMPLETED.getValue());
 					});
 					this.updateBatchById(lawsTechnologyEvaluationEOList);
+
+					LambdaUpdateWrapper<ProcessInfoEO> processInfoUpdateWrap = new LambdaUpdateWrapper<>();
+					processInfoUpdateWrap.set(ProcessInfoEO::getStatus, TodoCenterStatusEnum.COMPLETED.getValue());
+					processInfoUpdateWrap.in(ProcessInfoEO::getId,actiProcInstIdList);
+					processInfoUpdateWrap.eq(ProcessInfoEO::getFlowType, FlowTypeEnum.FGJSPG.getValue());
+					this.processInfoEOService.update(processInfoUpdateWrap);
 				}
 			}
 		}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmNodeEnum.java

@@ -0,0 +1,63 @@
+package com.jero.modules.project.enums;
+
+import com.alibaba.druid.util.StringUtils;
+import com.jero.common.constant.enums.CutEnum;
+
+/**
+ * 清单确认节点枚举类
+ */
+public enum InventoryAffirmNodeEnum {
+
+    INITIATED_BY_STUDIO_ENGINEERS("studiofq","R&H Studio发起","R&H Studio initiate"),
+    HOMOLOGATION_ENGINEER_AUDIT ("homologationEngineer audit","认证审核","homologationEngineer audit"),
+    REGULATION_OWNER_AUDIT("regulationOwner audit","法规审核","regulationOwner audit"),
+    ;
+
+    String key;
+    String cnName;
+    String enName;
+
+    private InventoryAffirmNodeEnum(String key, String cnName, String enName) {
+        this.key = key;
+        this.cnName = cnName;
+        this.enName = enName;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getCnName() {
+        return cnName;
+    }
+
+    public void setCnName(String cnName) {
+        this.cnName = cnName;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public static String getTextByValue(String key,String cut) {
+        InventoryAffirmNodeEnum[] values = values();
+        for (InventoryAffirmNodeEnum inventoryAffirmNodeEnum : values) {
+            if (inventoryAffirmNodeEnum.key.equals(key)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return inventoryAffirmNodeEnum.cnName;
+                }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                    return inventoryAffirmNodeEnum.enName;
+                }
+            }
+        }
+        return null;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java

@@ -11,6 +11,7 @@ public enum OperatorTypeEnum {
      * 工作流调用后台操作类型
      */
     ADD("添加","add"),
+    UPDATE("更新","update"),
     UPDATE_STATUS("修改状态","updateStatus"),
     DELETE("删除","delete"),
     QUERY("查询","query"),
@@ -40,6 +41,11 @@ public enum OperatorTypeEnum {
 
     ADD_LAWS_OPINION_GATHER("添加法规意见收集数据","addLawsOpinionGather"),
     UPDATE_LAWS_OPINION_GATHER_GATHER_RESULT("更新法规意见收集数据收集结果","updateLawsOpinionGatherGatherResult"),
+
+    /**
+     * 流程信息明细表
+     */
+    UPDATE_PROCESS_INFO_DETAIL_BY_TASK_ID("根据taskId更新流程信息明细表","updateProcessInfoDetailByTaskId"),
     ;
 
     String name;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java

@@ -9,10 +9,13 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.system.entity.SysRole;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -149,4 +152,8 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
     Result<?> expediting(JSONObject json);
 
 	List<SysRole> getRoleByUserId(String projectLibraryId,String cut);
+
+	void addProcessInfo(ProcessInfoEO processInfoEO, String projectLibraryId, Date endTime);
+
+	void addProcessInfoDetail(String processInfoId, List<ProcessInfoDetailEO> processInfoDetailEOList, Date endTime);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -58,6 +58,11 @@ import com.jero.modules.system.service.ISysAnnouncementService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
+import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
+import com.jero.modules.todoCenter.service.IProcessInfoEOService;
 import com.jero.modules.wkflow.entity.ProcessHistoryEO;
 import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
@@ -104,6 +109,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.*;
@@ -218,6 +224,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	@Autowired
 	private IProjectLawsInventoryRejectCauseEOService projectLawsInventoryRejectCauseEOService;
+	@Autowired
+	private IProcessInfoEOService processInfoEOService;
+	@Autowired
+	private IProcessInfoDetailEOService processInfoDetailEOService;
+
 	/**
 	 * 保存
 	 *
@@ -565,9 +576,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					this.projectTaskInventoryDetailEOService.updateById(projectTaskInventoryDetailEO);
 				}
 			}
+			//更新待办中心流程信息明细表，处理人
+			this.updateProcessInfoDetailAssignee(projectLawsInventoryEO,pId,flowType);
 		}
 	}
 
+	/**
+	 * 更新待办中心流程信息明细表，处理人
+	 * @param projectLawsInventoryEO
+	 * @param pId
+	 * @param flowType
+	 */
+	public void updateProcessInfoDetailAssignee(ProjectLawsInventoryEO projectLawsInventoryEO,String pId,String flowType){
+		this.processInfoDetailEOService.updateProcessInfoDetailUserId(projectLawsInventoryEO,pId,flowType);
+	}
 	/**
 	 * 通过id删除
 	 *
@@ -1382,6 +1404,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 				//清单确认截止时间
 				String inventoryAffirmDueDate = json.getString("inventoryAffirmDueDate");
+				Date endTime = new Date();
+				try {
+					endTime = sdf.parse(inventoryAffirmDueDate);
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
 
 				QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
 				if(StringUtils.isNotEmpty(ids)){
@@ -1391,9 +1419,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper);
 
 				List<String> userIdList = new ArrayList<>();
+				List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
 				for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
-
+					//未发起或拒绝 可以发起清单确认
-					//如果该数据的状态为 未发起或拒绝 可以发起清单确认
 					boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(),InventoryAffirmStatusEnum.NOT_STARTED.getValue())
 							||StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(),InventoryAffirmStatusEnum.REJECTED.getValue()));
 					//如果该数据的法规工程师、认证工程师都不为空
@@ -1418,13 +1446,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						if(homologationEngineerFlag){
 							updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null);
 							userIdList.add(projectLawsInventoryEO.getHomologationEngineerId());
+
+							ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+							processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+							processInfoDetailEO.setUserId(projectLawsInventoryEO.getHomologationEngineerId());
+							processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.HOMOLOGATION_ENGINEER_AUDIT.getKey());
+							processInfoDetailEO.setEndTime(endTime);
+							processInfoDetailEO.setCreateTime(new Date());
+							processInfoDetailEO.setCreateBy(currentUser.getId());
+							processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+
+							processInfoDetailEOList.add(processInfoDetailEO);
 						}
 						if(regulationOwnerFlag){
 							updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus,null);
 							userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
+
+							ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+							processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+							processInfoDetailEO.setUserId(projectLawsInventoryEO.getRegulationOwnerId());
+							processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey());
+							processInfoDetailEO.setEndTime(endTime);
+							processInfoDetailEO.setCreateTime(new Date());
+							processInfoDetailEO.setCreateBy(currentUser.getId());
+							processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+
+							processInfoDetailEOList.add(processInfoDetailEO);
 						}
 
 						if(homologationEngineerFlag || regulationOwnerFlag){
+							//创建一条当前发起清单确认的studio的已办任务。
+							ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+							processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+							processInfoDetailEO.setUserId(currentUser.getId());
+							processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.INITIATED_BY_STUDIO_ENGINEERS.getKey());
+							processInfoDetailEO.setEndTime(endTime);
+							processInfoDetailEO.setCreateTime(new Date());
+							processInfoDetailEO.setCreateBy(currentUser.getId());
+							processInfoDetailEO.setStatus(TaskStatusEnum.HAVE_DONE.getValue());
+
+							processInfoDetailEO.setSubmitTime(new Date());
+							processInfoDetailEOList.add(processInfoDetailEO);
+
 							super.update(projectLawsInventoryEO, updateWrapper);
 						}
 					}
@@ -1469,6 +1532,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 					//发送消息
 					sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,currentUser.getUsername());
+
+					//往待办中心添加数据。
+					ProcessInfoEO processInfoEO = new ProcessInfoEO();
+					this.addProcessInfo(processInfoEO,projectLibraryId,endTime);
+					this.addProcessInfoDetail(processInfoEO.getId(),processInfoDetailEOList,endTime);
 				}
 
 				result = "发起清单确认";
@@ -1654,6 +1722,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								projectLawsInventoryEO.setInventoryAffirmStatus(inventoryAffirmStatus);
 							}
 							super.baseMapper.updateById(projectLawsInventoryEO);
+							this.updateProcessInfoDetail(projectLawsInventoryEO.getId());
 
 							//如果法规、认证工程师都提交通过，法规清单 清单确认状态为：接受， 并且给当前项目的studio发送消息
 							if(StringUtils.equals(inventoryAffirmStatus,InventoryAffirmStatusEnum.ACCEPTED.getValue())){
@@ -4978,6 +5047,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			params.put("pIds",pIds);
 			//根据流程实例id 、 法规清单id  删除相关流程。
 			workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params);
+
+			//清除流程中心对应的数据
+			params.put("ids",ids);
+			this.processInfoEOService.change(params);
 		}
 		return Result.OK("变更成功！");
 	}
@@ -8587,4 +8660,102 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		conditionAssessmentEO.setConditionAssessment(CurrentProjectStatusEnum.BLUE.getValue());
 		this.conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO);
 	}
+
+	/**
+	 * 添加流程信息
+	 * @param processInfoEO
+	 * @param projectLibraryId
+	 * @param endTime
+	 */
+	@Override
+	public void addProcessInfo(ProcessInfoEO processInfoEO, String projectLibraryId, Date endTime){
+		String id = null;
+		//查询当前项目之前有没有启动过清单确认
+		QueryWrapper<ProcessInfoEO> processInfoQueryWrap = new QueryWrapper<>();
+		processInfoQueryWrap.lambda().eq(ProcessInfoEO::getProjectLibraryId,projectLibraryId);
+		processInfoQueryWrap.lambda().eq(ProcessInfoEO::getFlowType,FlowTypeEnum.QDQR.getValue());
+		List<ProcessInfoEO> processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap);
+		if(CollectionUtils.isNotEmpty(processInfoEOList)){
+			id = processInfoEOList.get(0).getId();
+			//删除之前创建的数据
+			this.processInfoEOService.remove(processInfoQueryWrap);
+		}else {
+			id = UUID.randomUUID().toString().replace("-", "");
+		}
+
+		processInfoEO.setId(id);
+		processInfoEO.setProjectLibraryId(projectLibraryId);
+
+		processInfoEO.setEndTime(endTime);
+		processInfoEO.setStatus(TodoCenterStatusEnum.LIST_TO_CONFIRM.getValue());
+		processInfoEO.setFlowType(FlowTypeEnum.QDQR.getValue());
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		processInfoEO.setCreateBy(currentUser.getId());
+		this.processInfoEOService.add(processInfoEO);
+	}
+
+	/**
+	 * 添加流程信息，用户的待办、已办信息。
+	 * @param processInfoId
+	 * @param processInfoDetailEOList
+	 * @param endTime
+	 */
+	@Override
+	public void addProcessInfoDetail(String processInfoId, List<ProcessInfoDetailEO> processInfoDetailEOList, Date endTime){
+		processInfoDetailEOList.forEach(detail -> {
+			detail.setProcessInfoId(processInfoId);
+			detail.setFlowType(FlowTypeEnum.QDQR.getValue());
+
+			QueryWrapper<ProcessInfoDetailEO> deleteDetailWrap = new QueryWrapper<>();
+			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,detail.getProjectLawsInventoryId());
+			deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getUserId,detail.getUserId());
+			this.processInfoDetailEOService.remove(deleteDetailWrap);
+		});
+
+		//删除studio在这个项目的清单确认已办任务。
+		/*QueryWrapper<ProcessInfoDetailEO> deleteStudioDetailWrap = new QueryWrapper<>();
+		deleteStudioDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,InventoryAffirmNodeEnum.INITIATED_BY_STUDIO_ENGINEERS.getKey());
+		deleteStudioDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoId);
+		this.processInfoDetailEOService.remove(deleteStudioDetailWrap);*/
+
+		this.processInfoDetailEOService.saveBatch(processInfoDetailEOList);
+	}
+
+	/**
+	 * 更新流程信息，用户的待办、已办任务信息
+	 * @param projeceLawsInventoryId
+	 */
+	public void updateProcessInfoDetail(String projeceLawsInventoryId){
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		QueryWrapper<ProcessInfoDetailEO> detailQueryWrapper = new QueryWrapper<>();
+		detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projeceLawsInventoryId);
+		detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getUserId,currentUser.getId());
+		detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.QDQR.getValue());
+		List<ProcessInfoDetailEO> detailEOList = this.processInfoDetailEOService.list(detailQueryWrapper);
+
+		if(CollectionUtils.isNotEmpty(detailEOList)){
+			String processInfoId = detailEOList.get(0).getProcessInfoId();
+
+			detailEOList.forEach(detail -> {
+				detail.setSubmitTime(new Date());
+				detail.setStatus(TaskStatusEnum.HAVE_DONE.getValue());
+			});
+			this.processInfoDetailEOService.updateBatchById(detailEOList);
+
+			//查询当前项目下还有没有未完成的任务
+			QueryWrapper<ProcessInfoDetailEO> queryWrapper = new QueryWrapper<>();
+			queryWrapper.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoId);
+			queryWrapper.lambda().eq(ProcessInfoDetailEO::getStatus,TaskStatusEnum.NOT_DONE.getValue());
+			int count = this.processInfoDetailEOService.count(queryWrapper);
+			//如果没有待办任务
+			if(count == 0){
+				ProcessInfoEO processInfoEO = new ProcessInfoEO();
+				processInfoEO.setStatus(TodoCenterStatusEnum.COMPLETED.getValue());
+				processInfoEO.setId(processInfoId);
+				this.processInfoEOService.updateById(processInfoEO);
+			}
+		}
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java

@@ -3,6 +3,7 @@ package com.jero.modules.project.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
@@ -14,6 +15,7 @@ import com.jero.modules.project.entity.*;
 import com.jero.modules.project.enums.JumpLinkEnum;
 import com.jero.modules.project.enums.MsgTypeEnum;
 import com.jero.modules.project.enums.SendMsgFlagEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
 import com.jero.modules.project.mapper.*;
 import com.jero.modules.project.service.IFeedbackHistoryService;
 import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
@@ -21,6 +23,8 @@ import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
 import com.jero.modules.project.util.SendMessageUtils;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -61,6 +65,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 	@Autowired
 	private IFeedbackHistoryService feedbackHistoryService;
 
+	@Autowired
+	private IProcessInfoDetailEOService processInfoDetailEOService;
+
 	@Value(value = "${jero.backUrl}")
 	private String backUrl;
 
@@ -106,6 +113,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			}else {
 				String id = UUID.randomUUID().toString().replace("-", "");
 				projectTaskInventoryDetail.setId(id);
+				projectTaskInventoryDetail.setTaskId(UUID.randomUUID().toString().replace("-", ""));
 				projectTaskInventoryDetailEOAddList.add(projectTaskInventoryDetail);
 			}
 		}
@@ -115,6 +123,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			List<String> createByList = new ArrayList<>();
 
 			List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = new ArrayList<>();
+			List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
 
 			String serialNumber = projectTaskInventoryFeedbackEOService.createSerialNumber();
 			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOAddList) {
@@ -138,6 +147,17 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 
 					long number = Long.parseLong(serialNumber) + 1;
 					serialNumber = String.valueOf(number);
+
+					ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+					processInfoDetailEO.setActiProcInstId(projectTaskInventoryDetailEO.getActiProcInstId());
+					processInfoDetailEO.setUserId(projectTaskInventoryDetailEO.getUserId());
+					processInfoDetailEO.setTaskDefinitionKey(projectTaskInventoryDetailEO.getTaskDefinitionKey());
+					processInfoDetailEO.setProjectLawsInventoryId(projectTaskInventoryDetailEO.getProjectTaskInventoryId());
+					processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+					processInfoDetailEO.setProcessInfoId(projectTaskInventoryDetailEO.getActiProcInstId());
+					processInfoDetailEO.setFlowType(projectTaskInventoryDetailEO.getFlowType());
+					processInfoDetailEO.setTaskId(projectTaskInventoryDetailEO.getTaskId());
+					processInfoDetailEOList.add(processInfoDetailEO);
 				}
 			}
 
@@ -156,6 +176,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			this.baseMapper.delete(deleteWrapper);
 
 			super.saveBatch(projectTaskInventoryDetailEOAddList);
+
+			this.processInfoDetailEOService.batchInsertDreUserTask(processInfoDetailEOList);
+
 			//获取没有发送过消息的用户
 			List<String> sendUserIdList = projectTaskInventoryDetailEOAddList.stream().filter(e -> {
 				boolean flag = true;
@@ -195,6 +218,17 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
     	Date now = new Date();
         projectTaskInventoryDetailEO.setUpdateTime(now);
         this.baseMapper.updateById(projectTaskInventoryDetailEO);
+        //如果是责任人 确认、取消确认操作。
+        if(StringUtils.equals(projectTaskInventoryDetailEO.getStatus(),TaskStatusEnum.HAVE_DONE.getValue())
+				|| StringUtils.equals(projectTaskInventoryDetailEO.getStatus(),TaskStatusEnum.NOT_DONE.getValue())){
+			ProjectTaskInventoryDetailEO taskInventoryDetailById = this.baseMapper.selectById(projectTaskInventoryDetailEO.getId());
+			if(taskInventoryDetailById != null){
+				LambdaUpdateWrapper<ProcessInfoDetailEO> processInfoDetailUpdateWrap= new LambdaUpdateWrapper();
+				processInfoDetailUpdateWrap.eq(ProcessInfoDetailEO::getTaskId,taskInventoryDetailById.getTaskId());
+				processInfoDetailUpdateWrap.set(ProcessInfoDetailEO::getStatus,projectTaskInventoryDetailEO.getStatus());
+				this.processInfoDetailEOService.update(processInfoDetailUpdateWrap);
+			}
+		}
     }
 
 	/**
@@ -205,8 +239,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 	 */
 	@Override
     public void deleteById(String id) {
-        removeById(id);
+		ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO = this.baseMapper.selectById(id);
-        QueryWrapper<ProjectTaskInventoryFeedbackEO> queryWrapper = new QueryWrapper<>();
+		removeById(id);
+		QueryWrapper<ProjectTaskInventoryFeedbackEO> queryWrapper = new QueryWrapper<>();
 		queryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,id);
 		List<ProjectTaskInventoryFeedbackEO> list = this.projectTaskInventoryFeedbackEOService.list(queryWrapper);
 		if(CollectionUtils.isNotEmpty(list)){
@@ -216,6 +251,12 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			historyDeleteWrapper.lambda().in(FeedbackHistory::getFeedbackId,projectTaskInventoryFeedbackIdList);
 			this.feedbackHistoryService.remove(historyDeleteWrapper);
 		}
+		if(!Objects.isNull(projectTaskInventoryDetailEO)){
+			//删除待办中心待办数据
+			QueryWrapper<ProcessInfoDetailEO> processInfoDetailRemoveWrap = new QueryWrapper<>();
+			processInfoDetailRemoveWrap.lambda().eq(ProcessInfoDetailEO::getTaskId,projectTaskInventoryDetailEO.getTaskId());
+			this.processInfoDetailEOService.remove(processInfoDetailRemoveWrap);
+		}
 	}
 
 	/**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/LawsAssessTodoCenterController.java

@@ -0,0 +1,50 @@
+package com.jero.modules.todoCenter.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.modules.todoCenter.service.IProcessInfoEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Api(tags="待办中心-法规评估")
+@RestController
+@RequestMapping("/todoCenter/lawsAssess")
+@Slf4j
+public class LawsAssessTodoCenterController {
+
+    @Autowired
+    private IProcessInfoEOService processInfoEOService;
+
+    @AutoLog(value = "分页查询-待办任务列表")
+    @ApiOperation(value="分页查询-待办任务列表", notes="分页查询-待办任务列表")
+    @GetMapping(value = "/todoTaskList")
+    public Result<?> todoTaskList(@RequestParam Map<String,Object> params) {
+        IPage page = this.processInfoEOService.lawsAssessTodoTaskList(params);
+        return Result.OK(page);
+    }
+
+    @AutoLog(value = "分页查询-已办任务列表")
+    @ApiOperation(value="分页查询-已办任务列表", notes="分页查询-已办任务列表")
+    @GetMapping(value = "/doneProcess")
+    public Result<?> doneProcess(@RequestParam Map<String,Object> params) {
+        IPage page = this.processInfoEOService.lawsAssessDoneProcess(params);
+        return Result.OK(page);
+    }
+
+    @AutoLog(value = "分页查询-已发任务列表")
+    @ApiOperation(value="分页查询-已发任务列表", notes="分页查询-已发任务列表")
+    @GetMapping(value = "/issuedProcess")
+    public Result<?> issuedProcess(@RequestParam Map<String,Object> params) {
+        IPage page = this.processInfoEOService.lawsAssessIssuedProcess(params);
+        return Result.OK(page);
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ParamsManifestTodoCenterController.java

@@ -0,0 +1,39 @@
+package com.jero.modules.todoCenter.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.modules.todoCenter.service.IParamsManifestTodoCenterService;
+import com.jero.modules.todoCenter.vo.ParamsManifestTodoCenterEOPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 09:43 2022/10/11
+ */
+
+@Api(tags="待办中心-参数清单")
+@RestController
+@RequestMapping("/todoCenter/params/manifest")
+@Slf4j
+public class ParamsManifestTodoCenterController {
+
+    @Autowired
+    private IParamsManifestTodoCenterService paramsManifestTodoCenterService;
+
+    @AutoLog(value = "分页查询")
+    @ApiOperation(value="分页查询", notes="分页查询")
+    @GetMapping(value = "/page")
+//	@RequiresPermissions("params:collectManifest:list")
+    public Result<?> page(ParamsManifestTodoCenterEOPage pageVO) {
+        IPage page  = paramsManifestTodoCenterService.queryPage(pageVO);
+        return Result.OK(page);
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ProcessInfoDetailEOController.java

@@ -0,0 +1,184 @@
+package com.jero.modules.todoCenter.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 流程信息明细表
+ * @Author: jero-boot
+ * @Date:   2022-10-14
+ * @Version: V1.0
+ */
+@Api(tags="流程信息明细表")
+@RestController
+@RequestMapping("/todoCenter/processInfoDetailEO")
+@Slf4j
+public class ProcessInfoDetailEOController extends JeroController<ProcessInfoDetailEO, IProcessInfoDetailEOService> {
+	@Autowired
+	private IProcessInfoDetailEOService processInfoDetailEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param processInfoDetailEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "流程信息明细表-分页列表查询")
+	@ApiOperation(value="流程信息明细表-分页列表查询", notes="流程信息明细表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProcessInfoDetailEO processInfoDetailEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProcessInfoDetailEO> queryWrapper = QueryGenerator.initQueryWrapper(processInfoDetailEO, req.getParameterMap());
+		Page<ProcessInfoDetailEO> page = new Page<ProcessInfoDetailEO>(pageNo, pageSize);
+		IPage<ProcessInfoDetailEO> pageList = processInfoDetailEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "流程信息明细表-列表查询")
+    @ApiOperation(value="流程信息明细表-列表查询", notes="流程信息明细表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProcessInfoDetailEO>> queryList() {
+        List<ProcessInfoDetailEO> list = processInfoDetailEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param processInfoDetailEO
+	 * @return
+	 */
+	@AutoLog(value = "流程信息明细表-添加")
+	@ApiOperation(value="流程信息明细表-添加", notes="流程信息明细表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProcessInfoDetailEO processInfoDetailEO) {
+		processInfoDetailEOService.add(processInfoDetailEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param processInfoDetailEO
+	 * @return
+	 */
+	@AutoLog(value = "流程信息明细表-编辑")
+	@ApiOperation(value="流程信息明细表-编辑", notes="流程信息明细表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProcessInfoDetailEO processInfoDetailEO) {
+		processInfoDetailEOService.editById(processInfoDetailEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "流程信息明细表-通过id删除")
+	@ApiOperation(value="流程信息明细表-通过id删除", notes="流程信息明细表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		processInfoDetailEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "流程信息明细表-批量删除")
+	@ApiOperation(value="流程信息明细表-批量删除", notes="流程信息明细表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.processInfoDetailEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "流程信息明细表-通过id查询")
+	@ApiOperation(value="流程信息明细表-通过id查询", notes="流程信息明细表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ProcessInfoDetailEO processInfoDetailEO = processInfoDetailEOService.queryById(id);
+		if(processInfoDetailEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(processInfoDetailEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param processInfoDetailEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProcessInfoDetailEO processInfoDetailEO) {
+        return super.exportXls(request, processInfoDetailEO, ProcessInfoDetailEO.class, "流程信息明细表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProcessInfoDetailEO.class);
+    }
+
+	 /**
+	  * 流程调用接口
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "流程信息明细表-流程调用")
+	 @ApiOperation(value="流程信息明细表-流程调用", notes="流程信息明细表-流程调用")
+	 @PostMapping(value = "/processCall")
+	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
+		 return this.processInfoDetailEOService.processCall(jsonObject);
+	 }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ProcessInfoEOController.java

@@ -0,0 +1,183 @@
+package com.jero.modules.todoCenter.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.jero.modules.todoCenter.service.IProcessInfoEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 流程信息表
+ * @Author: jero-boot
+ * @Date:   2022-10-14
+ * @Version: V1.0
+ */
+@Api(tags="流程信息表")
+@RestController
+@RequestMapping("/todoCenter/processInfoEO")
+@Slf4j
+public class ProcessInfoEOController extends JeroController<ProcessInfoEO, IProcessInfoEOService> {
+	@Autowired
+	private IProcessInfoEOService processInfoEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param processInfoEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "流程信息表-分页列表查询")
+	@ApiOperation(value="流程信息表-分页列表查询", notes="流程信息表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProcessInfoEO processInfoEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProcessInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(processInfoEO, req.getParameterMap());
+		Page<ProcessInfoEO> page = new Page<ProcessInfoEO>(pageNo, pageSize);
+		IPage<ProcessInfoEO> pageList = processInfoEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "流程信息表-列表查询")
+    @ApiOperation(value="流程信息表-列表查询", notes="流程信息表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProcessInfoEO>> queryList() {
+        List<ProcessInfoEO> list = processInfoEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param processInfoEO
+	 * @return
+	 */
+	@AutoLog(value = "流程信息表-添加")
+	@ApiOperation(value="流程信息表-添加", notes="流程信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProcessInfoEO processInfoEO) {
+		processInfoEOService.add(processInfoEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param processInfoEO
+	 * @return
+	 */
+	@AutoLog(value = "流程信息表-编辑")
+	@ApiOperation(value="流程信息表-编辑", notes="流程信息表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProcessInfoEO processInfoEO) {
+		processInfoEOService.editById(processInfoEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "流程信息表-通过id删除")
+	@ApiOperation(value="流程信息表-通过id删除", notes="流程信息表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		processInfoEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "流程信息表-批量删除")
+	@ApiOperation(value="流程信息表-批量删除", notes="流程信息表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.processInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "流程信息表-通过id查询")
+	@ApiOperation(value="流程信息表-通过id查询", notes="流程信息表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ProcessInfoEO processInfoEO = processInfoEOService.queryById(id);
+		if(processInfoEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(processInfoEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param processInfoEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProcessInfoEO processInfoEO) {
+        return super.exportXls(request, processInfoEO, ProcessInfoEO.class, "流程信息表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProcessInfoEO.class);
+    }
+
+	 /**
+	  * 流程调用接口
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "流程信息表-流程调用")
+	 @ApiOperation(value="流程信息表-流程调用", notes="流程信息表-流程调用")
+	 @PostMapping(value = "/processCall")
+	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
+		 return this.processInfoEOService.processCall(jsonObject);
+	 }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/controller/ProjectProcessTodoCenterController.java

@@ -0,0 +1,57 @@
+package com.jero.modules.todoCenter.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.modules.todoCenter.service.IProcessInfoEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Api(tags="待办中心-项目流程")
+@RestController
+@RequestMapping("/todoCenter/projectProcess")
+@Slf4j
+public class ProjectProcessTodoCenterController {
+
+    @Autowired
+    private IProcessInfoEOService processInfoEOService;
+
+    @AutoLog(value = "分页查询-待办任务列表")
+    @ApiOperation(value="分页查询-待办任务列表", notes="分页查询-待办任务列表")
+    @GetMapping(value = "/todoTaskList")
+    public Result<?> todoTaskList(@RequestParam Map<String,Object> params) {
+        IPage page = this.processInfoEOService.projectProcessTodoTaskList(params);
+        return Result.OK(page);
+    }
+
+    @AutoLog(value = "分页查询-已办任务列表")
+    @ApiOperation(value="分页查询-已办任务列表", notes="分页查询-已办任务列表")
+    @GetMapping(value = "/doneProcess")
+    public Result<?> doneProcess(@RequestParam Map<String,Object> params) {
+        IPage page = this.processInfoEOService.projectProcessDoneProcess(params);
+        return Result.OK(page);
+    }
+
+    @AutoLog(value = "分页查询-已发任务列表")
+    @ApiOperation(value="分页查询-已发任务列表", notes="分页查询-已发任务列表")
+    @GetMapping(value = "/issuedProcess")
+    public Result<?> issuedProcess(@RequestParam Map<String,Object> params) {
+        IPage page = this.processInfoEOService.projectProcessIssuedProcess(params);
+        return Result.OK(page);
+    }
+
+    @AutoLog(value = "待办中心-法规评估-初始化历史数据")
+    @ApiOperation(value="待办中心-法规评估-初始化历史数据", notes="待办中心-法规评估-初始化历史数据")
+    @GetMapping(value = "/initHistoryData")
+    public Result<?> initHistoryData(@RequestParam Map<String,Object> params) {
+        return this.processInfoEOService.initHistoryData(params);
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java

@@ -0,0 +1,47 @@
+package com.jero.modules.todoCenter.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ParamsManifestTodoCenterEO {
+    /**
+     * 参数清单id
+     */
+    private String id;
+
+    /**
+     * 相关项目名称
+     */
+    private String projectName;
+
+    /**
+     * 参数清单标题
+     */
+    private String title;
+
+    /**
+     * 相关项目版本
+     */
+    private String projectVersion;
+
+    /**
+     * 待发起数量 包括状态：待发起收集,变更,工程接口人退回
+     */
+    private Integer  waitCollectNum;
+
+    /**
+     * 待工程接口人处理数量（即待分配） 包括状态：待工程接口人处理,填写人退回
+     */
+    private Integer  waitSdtNum;
+
+    /**
+     * 待填写数量 包括状态：待填写,认证工程师退回
+     */
+    private Integer  waitFillNum;
+
+    private Date createTime;
+    private String state;
+    private String projectId;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoDetailEO.java

@@ -0,0 +1,122 @@
+package com.jero.modules.todoCenter.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 流程信息明细表
+ * @Author: jero-boot
+ * @Date:   2022-10-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("process_info_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="process_info_detail对象", description="流程信息明细表")
+public class ProcessInfoDetailEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+    private java.lang.String actiProcInstId;
+
+	/**待办id*/
+	@Excel(name = "待办id", width = 15)
+    @ApiModelProperty(value = "待办id")
+    private java.lang.String taskId;
+
+	/**处理人id*/
+	@Excel(name = "处理人id", width = 15)
+    @ApiModelProperty(value = "处理人id")
+    private java.lang.String userId;
+
+	/**任务状态：待办/已办*/
+	@Excel(name = "任务状态：待办/已办", width = 15)
+    @ApiModelProperty(value = "任务状态：待办/已办")
+    private java.lang.String status;
+
+	/**任务节点定义key*/
+	@Excel(name = "任务节点定义key", width = 15)
+    @ApiModelProperty(value = "任务节点定义key")
+    private java.lang.String taskDefinitionKey;
+
+	/**提交时间*/
+	@Excel(name = "提交时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "提交时间")
+    private java.util.Date submitTime;
+
+	/**流程信息id*/
+	@Excel(name = "流程信息id", width = 15)
+    @ApiModelProperty(value = "流程信息id")
+    private java.lang.String processInfoId;
+
+	/**法规清单id*/
+	@Excel(name = "法规清单id", width = 15)
+    @ApiModelProperty(value = "法规清单id")
+    private java.lang.String projectLawsInventoryId;
+
+	/**文档库id/标准id*/
+	@Excel(name = "文档库id/标准id", width = 15)
+    @ApiModelProperty(value = "文档库id/标准id")
+    private java.lang.String bussDocumentLibraryId;
+
+	/**流程类型*/
+	@Excel(name = "流程类型", width = 15)
+    @ApiModelProperty(value = "流程类型")
+    private java.lang.String flowType;
+
+    /**截止时间*/
+    @Excel(name = "截止时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止时间")
+    private java.util.Date endTime;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java

@@ -0,0 +1,141 @@
+package com.jero.modules.todoCenter.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 流程信息表
+ * @Author: jero-boot
+ * @Date:   2022-10-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("process_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="process_info对象", description="流程信息表")
+public class ProcessInfoEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**项目库id*/
+	@Excel(name = "项目库id", width = 15)
+    @ApiModelProperty(value = "项目库id")
+    private java.lang.String projectLibraryId;
+
+	/**法规清单id*/
+	@Excel(name = "法规清单id", width = 15)
+    @ApiModelProperty(value = "法规清单id")
+    private java.lang.String projectLawsInventoryId;
+
+	/**文档库id/标准id*/
+	@Excel(name = "文档库id/标准id", width = 15)
+    @ApiModelProperty(value = "文档库id/标准id")
+    private java.lang.String bussDocumentLibraryId;
+
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+    private java.lang.String actiProcInstId;
+
+	/**流程类型*/
+	@Excel(name = "流程类型", width = 15)
+    @ApiModelProperty(value = "流程类型")
+    private java.lang.String flowType;
+
+	/**截止日期*/
+	@Excel(name = "截止日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止日期")
+    private java.util.Date endTime;
+
+	/**任务状态*/
+	@Excel(name = "任务状态", width = 15)
+    @ApiModelProperty(value = "任务状态")
+    private java.lang.String status;
+
+    @ApiModelProperty(value = "流程编号")
+    private String prcNum;
+
+    @ApiModelProperty(value = "流程名称")
+    private String prcName;
+
+    /**流程类型展示字段*/
+	@TableField(exist = false)
+    private String flowTypeShow;
+
+    /**任务状态展示字段*/
+    @TableField(exist = false)
+    private String statusShow;
+
+    /**上一个操作人 用户id*/
+    @TableField(exist = false)
+    private String lastAssignee;
+    @TableField(exist = false)
+    private String lastAssigneeName;
+
+    /**当前操作人/代理人 用户id*/
+    @TableField(exist = false)
+    private String assignee;
+    @TableField(exist = false)
+    private String assigneeName;
+
+    /**标准编号*/
+    @TableField(exist = false)
+    private String serialNumber;
+    /**标准标题*/
+    @TableField(exist = false)
+    private String title;
+    /**项目名称*/
+    @TableField(exist = false)
+    private String projectName;
+    /**年份*/
+    @TableField(exist = false)
+    private String yearName;
+    /**待办id*/
+    @TableField(exist = false)
+    private String taskId;
+    /**任务节点定义key*/
+    @TableField(exist = false)
+    private String taskDefinitionKey;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/TodoCenterStatusEnum.java

@@ -0,0 +1,64 @@
+package com.jero.modules.todoCenter.enums;
+
+import com.jero.common.constant.enums.CutEnum;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 待办中心状态枚举类
+ */
+public enum TodoCenterStatusEnum {
+    LIST_TO_CONFIRM("待确认","List to confirm","List to confirm"),
+    COMPLETED("已完成","Completed","Completed"),
+    INQUIRY("询问","Inquiry","Inquiry"),
+    TO_SUBMIT("待提交","To submit","To submit"),
+    TO_AUDIT("待审核","To audit","To audit"),
+    ;
+
+    String cnName;
+    String enName;
+    String value;
+
+    private TodoCenterStatusEnum(String cnName,String enName, String value) {
+        this.cnName = cnName;
+        this.enName = enName;
+        this.value = value;
+    }
+
+    public String getCnName() {
+        return cnName;
+    }
+
+    public void setCnName(String cnName) {
+        this.cnName = cnName;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value,String cut) {
+        TodoCenterStatusEnum[] values = values();
+        for (TodoCenterStatusEnum todoCenterStatusEnum : values) {
+            if (todoCenterStatusEnum.value.equals(value)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return todoCenterStatusEnum.cnName;
+                }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                    return todoCenterStatusEnum.enName;
+                }
+            }
+        }
+        return null;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoDetailEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.todoCenter.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 流程信息明细表
+ * @Author: jero-boot
+ * @Date:   2022-10-14
+ * @Version: V1.0
+ */
+public interface ProcessInfoDetailEOMapper extends BaseMapper<ProcessInfoDetailEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java

@@ -0,0 +1,40 @@
+package com.jero.modules.todoCenter.mapper;
+
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.todoCenter.vo.ProcessInfoVO;
+
+/**
+ * @Description: 流程信息表
+ * @Author: jero-boot
+ * @Date:   2022-10-14
+ * @Version: V1.0
+ */
+public interface ProcessInfoEOMapper extends BaseMapper<ProcessInfoEO> {
+    /**
+     * 查询项目流程分页列表（已办、已发使用）
+     * @param page
+     * @param params
+     * @return
+     */
+    IPage<ProcessInfoVO> queryProjectProcessPageList(IPage page, Map<String, Object> params);
+
+    /**+
+     * 查询项目流程-待办列表
+     * @param page
+     * @param params
+     * @return
+     */
+    IPage<ProcessInfoVO> queryProjectProcessTodoTaskListList(IPage page,Map<String, Object> params);
+
+    /**
+     * 查询法规评估流程分页列表
+     * @param page
+     * @param params
+     * @return
+     */
+    IPage<ProcessInfoVO> queryLawsAssessPageList(IPage page, Map<String, Object> params);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoDetailEOMapper.xml

@@ -0,0 +1,22 @@
+<?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="com.jero.modules.todoCenter.mapper.ProcessInfoDetailEOMapper">
+    <resultMap id="ProcessInfoDetailEOResultMap" type="com.jero.modules.todoCenter.entity.ProcessInfoDetailEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+        <result column="task_id" property="taskId" />
+        <result column="user_id" property="userId" />
+        <result column="status" property="status" />
+        <result column="task_definition_key" property="taskDefinitionKey" />
+        <result column="submit_time" property="submitTime" />
+        <result column="process_info_id" property="processInfoId" />
+        <result column="project_laws_inventory_id" property="projectLawsInventoryId" />
+        <result column="buss_document_library_id" property="bussDocumentLibraryId" />
+        <result column="flow_type" property="flowType" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml

@@ -0,0 +1,285 @@
+<?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="com.jero.modules.todoCenter.mapper.ProcessInfoEOMapper">
+    <resultMap id="ProcessInfoEOResultMap" type="com.jero.modules.todoCenter.entity.ProcessInfoEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="project_library_id" property="projectLibraryId" />
+        <result column="project_laws_inventory_id" property="projectLawsInventoryId" />
+        <result column="buss_document_library_id" property="bussDocumentLibraryId" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+        <result column="flow_type" property="flowType" />
+        <result column="end_time" property="endTime" />
+        <result column="status" property="status" />
+    </resultMap>
+
+    <sql id="BaseQuerySql">
+        <where>
+            (
+                pi.id IN (
+                    SELECT
+                        pid.process_info_id
+                    FROM
+                        process_info_detail pid
+                    <where>
+                        pid.user_id = #{params.currentUserId}
+                        <if test="params.taskStatus != null and params.taskStatus != ''">
+                            and pid.status = #{params.taskStatus}
+                        </if>
+                    </where>
+                )
+            )
+            <if test="params.projectName != null and params.projectName !=''">
+                and (
+                    pni.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
+                    or pyni.year_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
+                )
+            </if>
+            <if test="params.serialNumber != null and params.serialNumber !=''">
+                and (
+                    pli.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
+                )
+            </if>
+            <if test="params.flowType != null and params.flowType !=''">
+                and pi.flow_type = #{params.flowType}
+            </if>
+            <if test="params.status != null and params.status !=''">
+                and pi.status = #{params.status}
+            </if>
+            <if test="params.flowTypeList != null">
+                and pi.flow_type in
+                <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="params.createBy != null and params.createBy != ''">
+                and pi.create_by = #{params.createBy}
+            </if>
+        </where>
+    </sql>
+
+    <select id="queryProjectProcessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
+        SELECT
+            pi.id,
+            pi.project_library_id,
+            pi.project_laws_inventory_id,
+            pi.buss_document_library_id,
+            pi.acti_proc_inst_id,
+            pni.project_name,
+            pyni.year_name,
+            pli.serial_number,
+            pli.title,
+            pi.flow_type,
+            createBy.username as "create_by",
+            pi.end_time,
+            (select detail.task_id from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} order by submit_time desc limit 1) as task_id,
+            (select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} order by submit_time desc limit 1) as task_definition_key,
+            pi.status,
+            pi.prc_num,
+            pi.prc_name,
+            plb.project_name_id,
+            plb.target_market,
+            plb.studio_engineer
+        FROM
+            process_info pi
+        left join project_library_base plb on plb.id = pi.project_library_id
+        left join project_name_info pni on pni.id = plb.project_name_id
+        left join project_year_name_info pyni on pyni.id = plb.year_name_id
+        left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id
+        LEFT JOIN sys_user createBy on createBy.id = pi.create_by
+        <include refid="BaseQuerySql"/>
+        order by pi.end_time asc
+    </select>
+    <select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
+        select temp.* from (
+               SELECT
+                   pi.id,
+                   pi.project_library_id,
+                   pi.project_laws_inventory_id,
+                   pi.buss_document_library_id,
+                   pi.acti_proc_inst_id,
+                   pni.project_name,
+                   pyni.year_name,
+                   pli.serial_number,
+                   pli.title,
+                   pi.flow_type,
+                   createBy.username AS "create_by",
+                   pi.end_time,
+                    (select detail.task_id from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = 'NotDone' limit 1) as task_id,
+                    (select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = 'NotDone' limit 1) as task_definition_key,
+                   pi.STATUS,
+                   pi.prc_num,
+                   pi.prc_name,
+                   plb.project_name_id,
+                   plb.target_market,
+                   plb.studio_engineer
+               FROM
+                   process_info pi
+                   LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
+                   LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
+                   LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
+                   LEFT JOIN project_laws_inventory pli ON pi.project_laws_inventory_id = pli.id
+                   LEFT JOIN sys_user createBy ON createBy.id = pi.create_by
+               where
+                     (
+                           pi.id IN (
+                               SELECT
+                                   pid.process_info_id
+                               FROM
+                                   process_info_detail pid
+                               where
+                                   pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
+                           )
+                     )
+                     AND pi.flow_type IN
+                     <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
+                        #{item}
+                     </foreach>
+               union
+               SELECT
+                   pi.id,
+                   pi.project_library_id,
+                   pi.project_laws_inventory_id,
+                   pi.buss_document_library_id,
+                   pi.acti_proc_inst_id,
+                   pni.project_name,
+                   pyni.year_name,
+                   '--' as serial_number,
+                   '' as title,
+                   pi.flow_type,
+                   createBy.username AS "create_by",
+                   (select pid.end_time from process_info_detail pid where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' order by pid.end_time asc limit 1) as end_time,
+                   '' as task_id,
+                   '' as task_definition_key,
+                   pi.STATUS,
+                   pi.prc_num,
+                   pi.prc_name,
+                   plb.project_name_id,
+                   plb.target_market,
+                   plb.studio_engineer
+               FROM
+                   process_info pi
+                   LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
+                   LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
+                   LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
+                   LEFT JOIN project_laws_inventory pli ON pi.project_laws_inventory_id = pli.id
+                   LEFT JOIN sys_user createBy ON createBy.id = pi.create_by
+               WHERE
+                   (
+                        pi.id IN (
+                            SELECT
+                                pid.process_info_id
+                            FROM
+                                process_info_detail pid
+                            where
+                                pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
+                        )
+                   )
+                   AND pi.flow_type = #{params.qdqrFlowTypeValue}
+        )temp
+        <where>
+            <if test="params.projectName != null and params.projectName !=''">
+                and (
+                    temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
+                    or temp.year_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
+                )
+            </if>
+            <if test="params.serialNumber != null and params.serialNumber !=''">
+                and (
+                    temp.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
+                )
+            </if>
+            <if test="params.flowType != null and params.flowType !=''">
+                and temp.flow_type = #{params.flowType}
+            </if>
+            <if test="params.status != null and params.status !=''">
+                and temp.status = #{params.status}
+            </if>
+            <if test="params.createBy != null and params.createBy != ''">
+                and temp.create_by = #{params.createBy}
+            </if>
+        </where>
+        order by temp.end_time asc
+    </select>
+    <select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
+        SELECT
+            pi.id,
+            pi.buss_document_library_id,
+            bdl.serial_number,
+            bdl.title,
+            pi.flow_type,
+            pi.end_time,
+            pi.STATUS,
+            pi.prc_num,
+            pi.prc_name,
+            (
+                select
+                    detail.task_id
+                from
+                     process_info_detail detail
+                where detail.process_info_id = pi.id
+                and detail.user_id = #{params.currentUserId}
+                <if test="params.queryType == 'todoProcess'">
+                    and detail.`status` = #{params.taskStatus}
+                </if>
+                order by detail.submit_time desc
+                limit 1
+            ) as task_id,
+            (
+                select
+                    detail.task_definition_key
+                from
+                    process_info_detail detail
+                where detail.process_info_id = pi.id
+                and detail.user_id = #{params.currentUserId}
+                <if test="params.queryType == 'todoProcess'">
+                    and detail.`status` = #{params.taskStatus}
+                </if>
+                order by detail.submit_time desc
+                limit 1
+            ) as task_definition_key,
+            createBy.username AS "create_by",
+            pi.acti_proc_inst_id,
+            pi.create_time
+        FROM
+            process_info pi
+        LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
+        LEFT JOIN sys_user createBy on createBy.id = pi.create_by
+        <where>
+            pi.flow_type IN
+            <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            <if test="params.queryType == 'issuedProcess'">
+                and pi.create_by = #{params.createBy}
+            </if>
+            <if test="params.queryType != 'issuedProcess'">
+                and (
+                    pi.id IN (
+                        SELECT
+                            pid.process_info_id
+                        FROM
+                            process_info_detail pid
+                        where
+                            pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
+                    )
+                )
+            </if>
+
+            <if test="params.serialNumber != null and params.serialNumber != ''">
+                and (
+                    bdl.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
+                    or bdl.title like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
+                )
+            </if>
+            <if test="params.flowType != null and params.flowType !=''">
+                and pi.flow_type = #{params.flowType}
+            </if>
+        </where>
+        order by pi.end_time asc
+    </select>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IParamsManifestTodoCenterService.java

@@ -0,0 +1,16 @@
+package com.jero.modules.todoCenter.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.todoCenter.vo.ParamsManifestTodoCenterEOPage;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 09:43 2022/10/11
+ */
+
+public interface IParamsManifestTodoCenterService {
+
+    // 分页查询当前登录人待办清单列表
+    IPage queryPage(ParamsManifestTodoCenterEOPage pageVO);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoDetailEOService.java

@@ -0,0 +1,85 @@
+package com.jero.modules.todoCenter.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 流程信息明细表
+ * @Author: jero-boot
+ * @Date:   2022-10-14
+ * @Version: V1.0
+ */
+public interface IProcessInfoDetailEOService extends IService<ProcessInfoDetailEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param processInfoDetailEO
+	 * @return
+	 */
+    void add(ProcessInfoDetailEO processInfoDetailEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param processInfoDetailEO
+	 * @return
+	 */
+    void editById(ProcessInfoDetailEO processInfoDetailEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProcessInfoDetailEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProcessInfoDetailEO> queryList();
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+    Result<?> processCall(JSONObject jsonObject);
+
+	/**
+	 * 批量插入dre工程师的待办任务
+	 * @param processInfoDetailEOList
+	 */
+    void batchInsertDreUserTask(List<ProcessInfoDetailEO> processInfoDetailEOList);
+
+	/**
+	 * 更新待办中心流程信息明细表，处理人
+	 * @param projectLawsInventoryEO
+	 * @param pId
+	 * @param flowType
+	 */
+    void updateProcessInfoDetailUserId(ProjectLawsInventoryEO projectLawsInventoryEO, String pId, String flowType);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoEOService.java

@@ -0,0 +1,122 @@
+package com.jero.modules.todoCenter.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 流程信息表
+ * @Author: jero-boot
+ * @Date:   2022-10-14
+ * @Version: V1.0
+ */
+public interface IProcessInfoEOService extends IService<ProcessInfoEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param processInfoEO
+	 * @return
+	 */
+    void add(ProcessInfoEO processInfoEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param processInfoEO
+	 * @return
+	 */
+    void editById(ProcessInfoEO processInfoEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProcessInfoEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProcessInfoEO> queryList();
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+    Result<?> processCall(JSONObject jsonObject);
+
+	/**
+	 * 项目流程-待办任务列表
+	 * @param params
+	 * @return
+	 */
+    IPage projectProcessTodoTaskList(Map<String,Object> params);
+
+	/**
+	 * 项目流程-已办任务列表
+	 * @param params
+	 * @return
+	 */
+	IPage projectProcessDoneProcess(Map<String, Object> params);
+
+	/**
+	 * 项目流程-已发任务列表
+	 * @param params
+	 * @return
+	 */
+	IPage projectProcessIssuedProcess(Map<String, Object> params);
+
+	/**
+	 * 法规清单变更，清除对应待办中心数据。
+	 * @param params
+	 */
+	void change(Map<String,Object> params);
+
+	/**
+	 * 法规评估-待办任务列表
+	 * @param params
+	 * @return
+	 */
+	IPage lawsAssessTodoTaskList(Map<String, Object> params);
+
+	/**
+	 * 法规评估-已办任务列表
+	 * @param params
+	 * @return
+	 */
+	IPage lawsAssessDoneProcess(Map<String, Object> params);
+
+	/**
+	 * 法规评估-已发任务列表
+	 * @param params
+	 * @return
+	 */
+	IPage lawsAssessIssuedProcess(Map<String, Object> params);
+
+    Result<?> initHistoryData(Map<String, Object> params);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java

@@ -0,0 +1,347 @@
+package com.jero.modules.todoCenter.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
+import com.jero.modules.cert.collect.enums.CollectManifestUserTypeEnum;
+import com.jero.modules.cert.collect.enums.ManifestStateEnum;
+import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
+import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
+import com.jero.modules.project.service.IProjectRelatedPersonnelService;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.todoCenter.entity.ParamsManifestTodoCenterEO;
+import com.jero.modules.todoCenter.service.IParamsManifestTodoCenterService;
+import com.jero.modules.todoCenter.vo.ParamsManifestTodoCenterEOPage;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 09:43 2022/10/11
+ */
+@Service
+public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoCenterService {
+    @Autowired
+    private ProjectLibraryBaseMapper projectLibraryBaseMapper;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private IProjectRelatedPersonnelService projectRelatedPersonnelService;
+
+    @Autowired
+    private ParamsCollectManifestEOMapper paramsCollectManifestEOMapper;
+
+    @Autowired
+    private ParamsManifestEOMapper paramsManifestEOMapper;
+
+    @Override
+    public IPage queryPage(ParamsManifestTodoCenterEOPage pageVO) {
+
+        // 查询所有项目下的 状态为收集中的清单
+        pageVO.setState(ManifestStateEnum.COLLECTING.getValue());
+        List<ParamsManifestTodoCenterEO> paramsManifestEOListAll = paramsManifestEOMapper.listForTodoCenter(pageVO);
+
+        // 筛选出当前登录人能在清单中是homo/sdt/dre角色的清单，并分页
+        LambdaQueryWrapper<ProjectLibraryBase> projectLibraryBaseLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        List<ProjectLibraryBase> projectLibraryBaseListAll = projectLibraryBaseMapper.selectList(projectLibraryBaseLambdaQueryWrapper);
+
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
+        List<ParamsManifestTodoCenterEO> paramsManifestEOList = new ArrayList<>();
+        List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+        Map<String, Boolean> manifestUserTypeOfHomo = new HashMap<>();
+        Map<String, Boolean> manifestUserTypeOfSdt = new HashMap<>();
+        Map<String, Boolean> manifestUserTypeOfDre = new HashMap<>();
+        Map<String, List<ParamsCollectManifestEO>> paramsManifestEOListMap = new HashMap<>();
+
+        // 查询清单的所有参数项
+        List<ParamsCollectManifestEO> pcmListAll = paramsCollectManifestEOMapper.listInfoOfTodoCenter();
+
+        String userType = "";
+        for(ParamsManifestTodoCenterEO paramsManifestEO : paramsManifestEOListAll) {
+            // 查询清单的所有参数项
+            List<ParamsCollectManifestEO> pcmList = pcmListAll.stream().filter(e->paramsManifestEO.getId().equals(e.getParamsManifestId())).collect(Collectors.toList());
+            int count1 = (int) pcmList.stream().filter(e-> CollectManifestStateEnum.SUBMIT.getValue().equals(e.getState())
+                    || CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.getState())).count();
+            if (count1 == pcmList.size()) {
+                continue;
+            }
+
+            // 判断是不是homo角色
+            projectLibraryBaseList = projectLibraryBaseListAll.stream().filter(e->paramsManifestEO.getProjectId().equals(e.getId())).collect(Collectors.toList());
+            userType = getLoginUserTypeOfHomo(projectLibraryBaseList, loginUser);
+            if(StringUtils.isNotBlank(userType)) {
+                paramsManifestEOList.add(paramsManifestEO);
+                manifestUserTypeOfHomo.put(paramsManifestEO.getId(), true);
+                paramsManifestEOListMap.put(paramsManifestEO.getId(), pcmList);
+                continue;
+            }
+
+            // 判断是不是sdt角色
+            userType = getLoginUserTypeOfSdt(pcmList, loginUser);
+            if(StringUtils.isNotBlank(userType)) {
+                paramsManifestEOList.add(paramsManifestEO);
+                manifestUserTypeOfSdt.put(paramsManifestEO.getId(), true);
+                paramsManifestEOListMap.put(paramsManifestEO.getId(), pcmList);
+                continue;
+            }
+
+            // 判断是不是dre角色
+            userType = getLoginUserTypeOfDre(pcmList, loginUser);
+            if(StringUtils.isNotBlank(userType)) {
+                paramsManifestEOList.add(paramsManifestEO);
+                manifestUserTypeOfDre.put(paramsManifestEO.getId(), true);
+                paramsManifestEOListMap.put(paramsManifestEO.getId(), pcmList);
+                continue;
+            }
+        }
+
+        // 分页
+        paramsManifestEOList = paramsManifestEOList.stream()
+                .sorted(Comparator.comparing(ParamsManifestTodoCenterEO::getCreateTime).reversed())
+                .collect(Collectors.toList());
+        List<ParamsManifestTodoCenterEO> result = new ArrayList<>();
+        int pageNo = pageVO.getPageNo();
+        int pageSize = pageVO.getPageSize();
+        IPage page = new Page(pageNo, pageSize);
+        page.setTotal(paramsManifestEOList.size());
+
+        int subSize = pageVO.getPageSize(); // 每页记录数
+        int subCount = paramsManifestEOList.size(); // 总记录数
+        int subPageTotal = (subCount / subSize) + ((subCount % subSize > 0) ? 1 : 0); //总页数
+        // 分页计算
+        int fromIndex = (pageNo-1) * subSize;
+        int toIndex = ((pageNo == subPageTotal) ? subCount : (pageNo * subSize));
+        if( fromIndex <= subCount && toIndex <= subCount) {
+            result = paramsManifestEOList.subList(fromIndex, toIndex);
+        } else {
+            result = new ArrayList();
+        }
+
+        // 统计清单中的待办参数数据
+        List<ParamsManifestTodoCenterEO> records = getStatistics(result, manifestUserTypeOfHomo, manifestUserTypeOfSdt, manifestUserTypeOfDre, paramsManifestEOListMap,loginUser);
+        page.setRecords(records);
+        return page;
+    }
+
+
+    public List<ParamsManifestTodoCenterEO> getStatistics(List<ParamsManifestTodoCenterEO> paramsManifestEOList, Map<String, Boolean> manifestUserTypeOfHomo
+            ,Map<String, Boolean> manifestUserTypeOfSdt, Map<String, Boolean> manifestUserTypeOfDre, Map<String, List<ParamsCollectManifestEO>> paramsManifestEOListMap, LoginUser loginUser) {
+        List<ParamsManifestTodoCenterEO> paramsManifestTodoCenterEOList = new ArrayList<>();
+
+        for(ParamsManifestTodoCenterEO paramsManifestTodoCenterEO : paramsManifestEOList) {
+            // 查询清单的所有参数项
+            ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+            paramsCollectManifestEO.setParamsManifestId(paramsManifestTodoCenterEO.getId());
+            List<ParamsCollectManifestEO> pcmList = paramsManifestEOListMap.get(paramsManifestTodoCenterEO.getId());
+            int count = 0;
+
+            if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfHomo.get(paramsManifestTodoCenterEO.getId())) {
+                // 统计待发起数量 包括状态：待发起收集,变更,工程接口人退回
+                count = (int) pcmList.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.SDT_BACK.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitCollectNum(count);
+                }
+                // 统计待分配数量 包括状态：待工程接口人处理,填写人退回
+                count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState()))).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitSdtNum(count);
+                }
+                // 统计待填写数量 包括状态：待填写,认证工程师退回
+                count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitFillNum(count);
+                }
+            } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfSdt.get(paramsManifestTodoCenterEO.getId())) {
+                // 统计待分配数量 包括状态：待工程接口人处理,填写人退回
+                count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState()))
+                        && loginUser.getUsername().equals(e.getSdt())).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitSdtNum(count);
+                }
+                // 统计待填写数量 包括状态：待填写,认证工程师退回
+                count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitFillNum(count);
+                }
+
+            } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfDre.get(paramsManifestTodoCenterEO.getId())) {
+                // 统计待填写数量 包括状态：待填写,认证工程师退回
+                count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))
+                        && loginUser.getUsername().equals(e.getDre())).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitFillNum(count);
+                }
+
+            }
+
+            paramsManifestTodoCenterEOList.add(paramsManifestTodoCenterEO);
+        }
+        return paramsManifestTodoCenterEOList;
+    }
+
+    /**
+     * 根据项目id，清单id查询当前登录人的Homo角色
+     * @param projectId
+     * @param paramsManifestId
+     * @return
+     */
+    public List<String> getLoginUserTypes(String projectId, String paramsManifestId, LoginUser loginUser) {
+
+        List<String> userTypeList = new ArrayList<>(); // 一个用户可以有多个用户类型
+//        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
+
+        // 查询项目下所有责任领域下的 homo人员
+        List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseMapper.queryById(projectId);
+        List<String> homoList = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(projectLibraryBaseList)) {
+            String homoIdStr = projectLibraryBaseList.get(0).getCertificationEngineer();
+            if (StringUtils.isNotEmpty(homoIdStr)) {
+                List<String> homoIdList = Arrays.asList(homoIdStr.split(",")).stream().distinct().collect(Collectors.toList());
+                homoList = sysUserService.listByIds(homoIdList).stream().map(SysUser::getUsername).collect(Collectors.toList());
+            }
+        }
+
+        // 查询项目下所有责任领域下的 sdt人员
+        List<String> sdtList = new ArrayList<>();
+        LambdaQueryWrapper<ProjectRelatedPersonnel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ProjectRelatedPersonnel::getProjectId, projectId);
+        List<ProjectRelatedPersonnel> prpList = projectRelatedPersonnelService.list(queryWrapper);
+//		String homoIdStr = prpList.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.joining(","));
+        String sdtIdStr = prpList.stream().map(e -> e.getEngineeringInterfacePerson()).collect(Collectors.joining(","));
+        // 项目下有homo-->不一定有sdt
+        if(StringUtils.isNotBlank(sdtIdStr)) {
+            List<String> sdtIdList = Arrays.asList(sdtIdStr.split(",")).stream().distinct().collect(Collectors.toList());
+            sdtList = sysUserService.listByIds(sdtIdList).stream().map(SysUser::getUsername).collect(Collectors.toList());
+        }
+
+        // 查询项目下参数清单下收集参数项中的 sdt,dre人员
+        ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+        paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
+        List<ParamsCollectManifestEO> pcmList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+        List<String> sdtListOfPCM = pcmList.stream()
+                .filter(e->StringUtils.isNotEmpty(e.getSdt()))
+                .map(ParamsCollectManifestEO::getSdt)
+                .distinct()
+                .collect(Collectors.toList());
+        sdtList.addAll(sdtListOfPCM); // 需要取并集，因为存在参数项开始收集但 人员相关名单中sdt被修改的情况
+
+        List<String> dreListOfPCM = pcmList.stream()
+                .filter(e->StringUtils.isNotEmpty(e.getDre()))
+                .map(ParamsCollectManifestEO::getDre)
+                .distinct()
+                .collect(Collectors.toList());
+
+        String loginUserName = loginUser.getUsername().toLowerCase();
+
+        homoList = toLowerCaseOfList(homoList);
+        sdtList = toLowerCaseOfList(sdtList);
+        dreListOfPCM = toLowerCaseOfList(dreListOfPCM);
+
+
+        if (homoList.contains(loginUserName)) {
+            userTypeList.add(CollectManifestUserTypeEnum.HOMO.getValue());
+        }
+
+        if (sdtList.contains(loginUserName)) {
+            userTypeList.add(CollectManifestUserTypeEnum.SDT.getValue());
+        }
+
+        if (dreListOfPCM.contains(loginUserName)) {
+            userTypeList.add(CollectManifestUserTypeEnum.DRE.getValue());
+        }
+
+        return userTypeList;
+    }
+
+    public String getLoginUserTypeOfHomo(List<ProjectLibraryBase> projectLibraryBaseList, LoginUser loginUser) {
+
+        String userType = ""; // 一个用户可以有多个用户类型
+
+        // 查询项目下的 homo人员
+        List<String> homoList = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(projectLibraryBaseList)) {
+            String homoIdStr = projectLibraryBaseList.get(0).getCertificationEngineer();
+            if (StringUtils.isNotEmpty(homoIdStr)) {
+                List<String> homoIdList = Arrays.asList(homoIdStr.split(",")).stream().distinct().collect(Collectors.toList());
+                homoList = sysUserService.listByIds(homoIdList).stream().map(SysUser::getUsername).collect(Collectors.toList());
+            }
+        }
+
+        String loginUserName = loginUser.getUsername().toLowerCase();
+        homoList = toLowerCaseOfList(homoList);
+        if (homoList.contains(loginUserName)) {
+            userType = CollectManifestUserTypeEnum.HOMO.getValue();
+        }
+        return userType;
+    }
+
+    public String getLoginUserTypeOfSdt(List<ParamsCollectManifestEO> pcmList, LoginUser loginUser) {
+
+        String userType = ""; // 一个用户可以有多个用户类型
+
+        List<String> sdtListOfPCM = pcmList.stream()
+                .filter(e->StringUtils.isNotEmpty(e.getSdt()))
+                .map(ParamsCollectManifestEO::getSdt)
+                .distinct()
+                .collect(Collectors.toList());
+
+        String loginUserName = loginUser.getUsername().toLowerCase();
+        sdtListOfPCM = toLowerCaseOfList(sdtListOfPCM);
+        if (sdtListOfPCM.contains(loginUserName)) {
+            userType = CollectManifestUserTypeEnum.SDT.getValue();
+        }
+        return userType;
+    }
+
+    public String getLoginUserTypeOfDre(List<ParamsCollectManifestEO> pcmList, LoginUser loginUser) {
+
+        String userType = ""; // 一个用户可以有多个用户类型
+
+        List<String> dreListOfPCM = pcmList.stream()
+                .filter(e->StringUtils.isNotEmpty(e.getDre()))
+                .map(ParamsCollectManifestEO::getDre)
+                .distinct()
+                .collect(Collectors.toList());
+
+        String loginUserName = loginUser.getUsername().toLowerCase();
+        dreListOfPCM = toLowerCaseOfList(dreListOfPCM);
+        if (dreListOfPCM.contains(loginUserName)) {
+            userType = CollectManifestUserTypeEnum.DRE.getValue();
+        }
+        return userType;
+    }
+
+    private List<String> toLowerCaseOfList(List<String> list) {
+        List<String> newList = list;
+        if (CollectionUtil.isNotEmpty(list)) {
+            newList = list.stream().map(String::toLowerCase).collect(Collectors.toList());
+        }
+        return newList;
+    }
+
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java

@@ -0,0 +1,226 @@
+package com.jero.modules.todoCenter.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.jero.common.api.vo.Result;
+import com.jero.common.exception.JeroBootException;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.mapper.ProcessInfoDetailEOMapper;
+import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
+import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum;
+import com.jero.modules.wkflow.enums.FlowTypeEnum;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @Description: 流程信息明细表
+ * @Author: jero-boot
+ * @Date:   2022-10-14
+ * @Version: V1.0
+ */
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class ProcessInfoDetailEOServiceImpl extends ServiceImpl<ProcessInfoDetailEOMapper, ProcessInfoDetailEO> implements IProcessInfoDetailEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param processInfoDetailEO
+	 * @return
+	 */
+	@Override
+    public void add(ProcessInfoDetailEO processInfoDetailEO) {
+        Date now = new Date();
+        processInfoDetailEO.setCreateTime(now);
+        processInfoDetailEO.setUpdateTime(now);
+        save(processInfoDetailEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param processInfoDetailEO
+	 * @return
+	 */
+	@Override
+    public void editById(ProcessInfoDetailEO processInfoDetailEO) {
+    	Date now = new Date();
+        processInfoDetailEO.setUpdateTime(now);
+    	saveOrUpdate(processInfoDetailEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ProcessInfoDetailEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ProcessInfoDetailEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public Result<?> processCall(JSONObject jsonObject) {
+		String requestSource = jsonObject.getString("requestSource");
+		if(StringUtils.isEmpty(requestSource)){
+			throw new JeroBootException("请求来源不能为空！");
+		}
+		if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){
+			throw new JeroBootException("来源有误，没有权限调用该接口！");
+		}
+
+		String operatorType = jsonObject.getString("operatorType");
+		if(StringUtils.isEmpty(operatorType)){
+			throw new JeroBootException("操作类型不能为空！");
+		}
+
+		if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){
+			JSONArray processInfoDetailList = jsonObject.getJSONArray("processInfoDetailList");
+			ProcessInfoDetailEO processInfoDetailEO = null;
+			List<ProcessInfoDetailEO> detailEOList = new ArrayList<>();
+			for (Object processInfoDetail : processInfoDetailList) {
+				processInfoDetailEO = JSONObject.parseObject(JSONObject.toJSONString(processInfoDetail), ProcessInfoDetailEO.class);
+				// 当前流程  当前用户 的数据删掉   确保唯一。
+				QueryWrapper<ProcessInfoDetailEO> deleteWrapper = new QueryWrapper<>();
+				deleteWrapper.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,processInfoDetailEO.getActiProcInstId());
+				deleteWrapper.lambda().eq(ProcessInfoDetailEO::getUserId,processInfoDetailEO.getUserId());
+				deleteWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,processInfoDetailEO.getFlowType());
+				this.baseMapper.delete(deleteWrapper);
+				detailEOList.add(processInfoDetailEO);
+			}
+			this.saveBatch(detailEOList);
+		}else if(StringUtils.equals(operatorType, OperatorTypeEnum.UPDATE.getValue())){
+			ProcessInfoDetailEO processInfoDetailEO = JSONObject.parseObject(jsonObject.toString(), ProcessInfoDetailEO.class);
+			this.baseMapper.updateById(processInfoDetailEO);
+		}else if(StringUtils.equals(operatorType, OperatorTypeEnum.QUERY.getValue())){
+			String userId = jsonObject.getString("userId");
+			String flowType = jsonObject.getString("flowType");
+			String actiProcInstId = jsonObject.getString("actiProcInstId");
+
+			QueryWrapper<ProcessInfoDetailEO> queryWrapper = new QueryWrapper<>();
+			queryWrapper.lambda().eq(ProcessInfoDetailEO::getUserId,userId);
+			queryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,flowType);
+			queryWrapper.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,actiProcInstId);
+			queryWrapper.isNull("task_id");
+
+			List<ProcessInfoDetailEO> processInfoDetailEOList = this.baseMapper.selectList(queryWrapper);
+			Result<List<ProcessInfoDetailEO>> objectResult = new Result<>();
+			objectResult.setResult(processInfoDetailEOList);
+			objectResult.setSuccess(true);
+			return objectResult;
+		}else if(StringUtils.equals(operatorType, OperatorTypeEnum.UPDATE_PROCESS_INFO_DETAIL_BY_TASK_ID.getValue())){
+			String taskId = jsonObject.getString("taskId");
+			String taskStatus = jsonObject.getString("taskStatus");
+			LambdaUpdateWrapper<ProcessInfoDetailEO> updateWrapper = new LambdaUpdateWrapper<>();
+			updateWrapper.set(ProcessInfoDetailEO::getStatus,taskStatus);
+			updateWrapper.set(ProcessInfoDetailEO::getSubmitTime,new Date());
+			updateWrapper.eq(ProcessInfoDetailEO::getTaskId,taskId);
+			this.update(updateWrapper);
+		}
+		return new Result<>().success("调用成功！");
+	}
+
+	@Override
+	public void batchInsertDreUserTask(List<ProcessInfoDetailEO> processInfoDetailEOList) {
+		processInfoDetailEOList.forEach(detail -> {
+			QueryWrapper<ProcessInfoDetailEO> removeWrap = new QueryWrapper<>();
+			removeWrap.lambda().eq(ProcessInfoDetailEO::getUserId,detail.getUserId());
+			removeWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,detail.getFlowType());
+			removeWrap.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,detail.getActiProcInstId());
+			removeWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,detail.getTaskDefinitionKey());
+			this.remove(removeWrap);
+		});
+
+		this.saveBatch(processInfoDetailEOList);
+	}
+
+	@Override
+	public void updateProcessInfoDetailUserId(ProjectLawsInventoryEO projectLawsInventoryEO, String pId, String flowType) {
+		QueryWrapper<ProcessInfoDetailEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,pId);
+		queryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,flowType);
+		List<ProcessInfoDetailEO> processInfoDetailEOList = this.list(queryWrapper);
+		if(CollectionUtils.isNotEmpty(processInfoDetailEOList)){
+			for (ProcessInfoDetailEO processInfoDetailEO : processInfoDetailEOList) {
+				if(StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())){
+					if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())){
+						//更新责任人的任务
+						processInfoDetailEO.setUserId(projectLawsInventoryEO.getDesignDutyId());
+					}
+					if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())){
+						//更新发起人的任务
+						processInfoDetailEO.setUserId(projectLawsInventoryEO.getDesignInitiatorId());
+					}
+				}
+				if(StringUtils.equals(flowType, FlowTypeEnum.PREHOMOQRLC.getValue())){
+					if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())){
+						//更新责任人的任务
+						processInfoDetailEO.setUserId(projectLawsInventoryEO.getPrehomoDutyId());
+					}
+					if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())){
+						//更新发起人的任务
+						processInfoDetailEO.setUserId(projectLawsInventoryEO.getPrehomoInitiatorId());
+					}
+				}
+
+				if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
+					if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())){
+						//更新责任人的任务
+						processInfoDetailEO.setUserId(projectLawsInventoryEO.getVerifyDutyId());
+					}
+					if(StringUtils.equals(processInfoDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())){
+						//更新发起人的任务
+						processInfoDetailEO.setUserId(projectLawsInventoryEO.getVerifyInitiatorId());
+					}
+				}
+				this.baseMapper.updateById(processInfoDetailEO);
+			}
+		}
+	}
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ParamsManifestTodoCenterEOPage.java

@@ -0,0 +1,45 @@
+package com.jero.modules.todoCenter.vo;
+
+import lombok.Data;
+
+@Data
+public class ParamsManifestTodoCenterEOPage {
+    /**
+     * 参数清单id
+     */
+    private String id;
+
+    /**
+     * 相关项目名称
+     */
+    private String projectName;
+
+    /**
+     * 参数清单标题
+     */
+    private String title;
+
+    /**
+     * 相关项目版本
+     */
+    private String projectVersion;
+
+    /**
+     * 待发起数量 包括状态：待发起收集,变更,工程接口人退回
+     */
+    private Integer  waitCollectNum;
+
+    /**
+     * 待工程接口人处理数量（即待分配） 包括状态：待工程接口人处理,填写人退回
+     */
+    private Integer  waitSdtNum;
+
+    /**
+     * 待填写数量 包括状态：待填写,认证工程师退回
+     */
+    private Integer  waitFillNum;
+
+    private int pageNo;
+    private int pageSize;
+    private String state;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java

@@ -0,0 +1,105 @@
+package com.jero.modules.todoCenter.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * 流程信息表VO类
+ */
+@Data
+public class ProcessInfoVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+    private String id;
+
+	/**创建人*/
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    private String sysOrgCode;
+
+	/**项目库id*/
+    private String projectLibraryId;
+
+	/**法规清单id*/
+    private String projectLawsInventoryId;
+
+	/**文档库id/标准id*/
+    private String bussDocumentLibraryId;
+
+	/**流程实例id*/
+    private String actiProcInstId;
+
+	/**流程类型*/
+    private String flowType;
+
+	/**截止日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.util.Date endTime;
+
+	/**任务状态*/
+    private String status;
+
+    /**流程编号**/
+    private String prcNum;
+
+    /**流程名称*/
+    private String prcName;
+
+    /**流程类型展示字段*/
+    private String flowTypeShow;
+
+    /**任务状态展示字段*/
+    private String statusShow;
+
+    /**上一个操作人 用户id*/
+    private String lastAssignee;
+    private String lastAssigneeName;
+
+    /**当前操作人/代理人 用户id*/
+    private String assignee;
+    private String assigneeName;
+
+    /**标准编号*/
+    private String serialNumber;
+    /**标准标题*/
+    private String title;
+    /**项目名称*/
+    private String projectName;
+    /**年份*/
+    private String yearName;
+    /**待办id*/
+    private String taskId;
+    /**任务节点定义key*/
+    private String taskDefinitionKey;
+    /**项目名称id*/
+    private String projectNameId;
+    /**目标市场*/
+    private String targetMarket;
+    /**studio*/
+    private String studioEngineer;
+    /**任务清单明细表id，任务清单明细数据与待办中心明细表 是taskId一对一的关系**/
+    private String primaryKeyId;
+    /**符合性流程：责任人填写反馈意见*/
+    private String personChargeFeedback;
+    /**截止日期 过期标识：true为已经过期 false为没有过期**/
+    private boolean endTimePastDueFlag = false;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java

@@ -1,16 +1,21 @@
 package com.jero.modules.wkflow.enums;
 
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * 流程类型枚举类
  */
 public enum FlowTypeEnum {
 
-    RWQRLC("1","任务确认流程","RWQRLC","任务确认流程","rwqrlc"),
+    RWQRLC("1","任务确认流程","RWQRLC","任务确认流程","rwqrlc","清单任务确认","List task Confirmation"),
-    SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc"),
+    SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc","设计符合性确认","Design conformance verification"),
-    PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc"),
+    PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc","Pre-Homo确认","The Pre - Homo confirmation"),
-    YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc"),
+    YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性确认","Verify conformance confirmation"),
-    FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc"),
+    FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc","法规意见收集","Collection of Legislative Comments"),
-    FGJSPG("6","法规技术评估","FGJSPG","法规技术评估流程","fgjspglc"),
+    FGJSPG("6","法规技术评估流程","FGJSPG","法规技术评估流程","fgjspglc","法规技术评估","Regulatory and technical assessment"),
+    QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单确认","Regulation list confirmation"),
     ;
 
     private String value;
@@ -18,13 +23,17 @@ public enum FlowTypeEnum {
     private String prcNum;
     private String prcName;
     private String processDefinitionKey;
+    private String cnName;
+    private String enName;
 
-    private FlowTypeEnum(String value, String lable, String prcNum, String prcName, String processDefinitionKey) {
+    private FlowTypeEnum(String value, String lable, String prcNum, String prcName, String processDefinitionKey,String cnName,String enName) {
         this.value = value;
         this.lable = lable;
         this.prcNum = prcNum;
         this.prcName = prcName;
         this.processDefinitionKey = processDefinitionKey;
+        this.cnName = cnName;
+        this.enName = enName;
     }
     public String getValue() {
         return value;
@@ -43,4 +52,26 @@ public enum FlowTypeEnum {
     public String getProcessDefinitionKey() {
         return processDefinitionKey;
     }
+
+    public String getCnName() {
+        return cnName;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public static String getTextByValue(String value, String cut) {
+        FlowTypeEnum[] values = values();
+        for (FlowTypeEnum flowTypeEnum : values) {
+            if (flowTypeEnum.value.equals(value)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return flowTypeEnum.cnName;
+                }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                    return flowTypeEnum.enName;
+                }
+            }
+        }
+        return null;
+    }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java

@@ -181,4 +181,18 @@ public interface WorkFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByPrcIds",method = RequestMethod.GET)
     Result<String> deleteProcessInstanceByPrcIds(@RequestParam("prcIds") String prcIds);
+
+    /**
+     * 根据流程类型，查询未完成的流程信息
+     * @param prcType
+     * @return
+     */
+    @RequestMapping(value = "/bat-wkflow/datas/bus-process-name/queryProcessInfoByPrcType",method = RequestMethod.GET)
+    List<Map<String, Object>> queryProcessInfoByPrcType(@RequestParam("prcType") String prcType);
+
+    /**
+     * 处理历史数据-之前的数据发起的时候在busProcessNew中没有待办信息
+     */
+    @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/dispostHistoryBusProcessNewData",method = RequestMethod.GET)
+    Result dispostHistoryBusProcessNewData();
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java

@@ -196,4 +196,20 @@ public class WorkFlowFeignClientImpl{
     public Result<String> deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){
         return workFlowFeignClient.deleteProcessInstance(taskId);
     }
+
+    /**
+     * 根据流程类型，查询未完成的流程信息
+     * @param prcType
+     * @return
+     */
+    public List<Map<String, Object>> queryProcessInfoByPrcType(String prcType) {
+        return workFlowFeignClient.queryProcessInfoByPrcType(prcType);
+    }
+
+    /**
+     * 处理历史数据-之前的数据发起的时候在busProcessNew中没有待办信息
+     */
+    public Result dispostHistoryBusProcessNewData() {
+        return workFlowFeignClient.dispostHistoryBusProcessNewData();
+    }
 }

jero-web/src/common/lang/en-us.js

@@ -1337,4 +1337,17 @@ module.exports = {
   Topping:'Topping',
   cancelTopping:'Cancel Topping',
   relatedProjectVersion:'Related project version',
+  taskType:'Task Type',
+  taskStatus:'Task Status',
+  taskConfirmationHandling:'Task confirmation handling',
+  relatedVersion:'Related version',
+  filledBy:'Filled by',
+  parameterToBeInitiated:'Parameter to be initiated',
+  listTaskConfirmation:'List task confirmation',
+  completednum: 'Quantity to be filled',
+  filledBynum:'Filled by',
+  parameterToBeInitiatednum:'Parameter to be initiated',
+  listToConfirm:'List to confirm',
+  toSubmit:'To submit',
+  toAudit:'To audit',
 }

jero-web/src/common/lang/zh-cn.js

@@ -516,8 +516,8 @@ module.exports = {
   AddProcess: '添加流程',
   RelatedItems: '相关项目',
   Sponsor: '发起人',
-  CurrentProcessor: '当前处理人',
+  CurrentProcessor: '当前操作人',
-  LastProcessor: '上一处理人',
+  LastProcessor: '上一操作人',
   ProcessingTime: '办理时间',
   cutoffTime: '截止时间',
   ProcessStatus: '流程状态',
@@ -1438,4 +1438,17 @@ module.exports = {
   Topping:'置顶',
   cancelTopping:'取消置顶',
   relatedProjectVersion:'相关项目版本',
+  taskType:'任务类型',
+  taskStatus:'任务状态',
+  taskConfirmationHandling:'任务确认办理',
+  relatedVersion:'相关版本',
+  filledBy:'待分配填写人',
+  parameterToBeInitiated:'参数待发起',
+  listTaskConfirmation:'清单任务确认',
+  completednum: '待填写',
+  filledBynum:'待分配填写人',
+  parameterToBeInitiatednum:'参数待发起',
+  listToConfirm:'待确认',
+  toSubmit:'待提交',
+  toAudit:'待审核',
 }

jero-web/src/components/menu/index.js

@@ -109,8 +109,10 @@ export default {
         props = { to: { path: menu.path } }
       }
 
-      const attrs = { href: menu.path, target: menu.meta.target , title:menu.meta.title }
+      const attrs = { href: menu.path, target: menu.meta.target, title: menu.meta.title }
-
+      if (menu.meta && menu.meta.existTask) {
+        attrs.style = 'color:red'
+      }
       if (menu.children && menu.alwaysShow) {
         // 把有子菜单的 并且 父菜单是要隐藏子菜单的
         // 都给子菜单增加一个 hidden 属性
@@ -162,7 +164,8 @@ export default {
       span
       slot = 'title' >
         { this.renderIcon(menu.meta.icon) }
-        < span title={menu.meta.title}> { menu.meta.title } < /span>
+        < span
+      title = { menu.meta.title } > { menu.meta.title } < /span>
         < /span>
       {
         itemArr

jero-web/src/views/dashboard/components/myList.vue

@@ -10,11 +10,17 @@
     <div class="myList-box-content" v-if="dataSource.length > 0">
       <div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
         <div class="top">
-          <span class="top-text" :title="item.prcName">{{item.prcName}}</span>
+          <span class="top-text" v-if="item.flowType == 10"
-<!--          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
+                :title="item.flowTypeShow+'-'+item.projectName">
+            {{item.flowTypeShow+'-'+item.projectName}}
+          </span>
+          <span class="top-text" :title="item.flowTypeShow+'-'+item.serialNumber">
+            {{item.flowTypeShow+'-'+item.serialNumber}}
+          </span>
+          <!--          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
         </div>
         <div class="button">
-          {{item.creatTime}}
+          {{item.endTime}}
         </div>
         <div class="with">
           {{$t('Pending')}}
@@ -43,9 +49,13 @@
         dataSource: [],
         loading: false,
         prcTypeName: {
-          1: this.$t('taskConfirmationProcess'),
+          1: this.$t('listTaskConfirmation'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          2: this.$t('designComplianceReview'),
-          6:this.$t('regulatoryTechnologyAssessmentProcess')
+          3: this.$t('preHomeConfirmation'),
+          4: this.$t('verificationComplianceReview'),
+          10: this.$t('confirmationOfRegulationsList'),
+          5: this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6: this.$t('regulatoryTechnologyAssessmentProcess')
         }
       }
     },
@@ -74,11 +84,11 @@
       queryProcess() {
         this.loading = true
         let parmes = {}
-        parmes.current = this.pageNo
+        parmes.pageNo = this.pageNo
-        parmes.size = this.pageSize
+        parmes.pageSize = this.pageSize
-        parmes.userId = this.userInfo().userId
+        // parmes.userId = this.userInfo().userId
-        postAction('task/todoTaskList', parmes).then((res) => {
+        getAction('/todoCenter/projectProcess/todoTaskList', parmes).then((res) => {
-          this.dataSource = res.list || []
+          this.dataSource = res.result.records || []
           this.loading = false
         })
       },
@@ -88,29 +98,138 @@
         })
       },
       prcClick(row) {
-        // let index = row.taskIds.lastIndexOf(',')
+        let query = {}
-        // row.taskIds = row.taskIds.slice(0, index)
         row.router = this.$route.path
-        if (row.prcType == '1') {
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            isTrue: true
+          }
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',
-            query: row
+            query: query
           })
           window.open(newUrl.href, '_blank')
-        } else if (row.prcType == '5') {
+        } else if (row.flowType == '10') {
           let newUrl = this.$router.resolve({
-            path: '/regulatoryProcessReview',
+            path: '/ProjectDetails',
-            query: row
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '102'
+            }
           })
           window.open(newUrl.href, '_blank')
-        } else if (row.prcType == '6') {
+        } else if (row.flowType == '2') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId: row.projectLibraryId,
+            id: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            isDisplay: true,
+            flowType: 2,
+            Sponsor: 'designInitiatorName',
+            personLiable: 'designDutyName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
           let newUrl = this.$router.resolve({
-            path: '/evaluationProcess',
+            path: '/taskListProcess',
-            query: row
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '3') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            studioEngineer: row.studioEngineer,
+            projectLibraryId: row.projectLibraryId,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 3,
+            isDisplay: true,
+            id: row.projectLibraryId,
+            Sponsor: 'prehomoInitiatorName',
+            personLiable: 'prehomoDutyName',
+            typeOfDeliverables: 'prehomoDeliverableTypeName',
+            deliverableTemplate: 'prehomoDeliverableTemplate',
+            DueDate: 'prehomoDueDate',
+            remarks: 'prehomoRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '4') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            id: row.projectLibraryId,
+            projectLibraryId: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 4,
+            isDisplay: true,
+            Sponsor: 'verifyInitiatorName',
+            personLiable: 'verifyDutyName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
           })
           window.open(newUrl.href, '_blank')
         }
-      }
+      },
     }
   }
 </script>
@@ -167,6 +286,7 @@
             text-overflow: ellipsis;
             white-space: nowrap;
           }
+
           /*.top-admin {*/
           /*  font-size: 16px;*/
           /*  font-family: Blue Sky Noto;*/

jero-web/src/views/processCenter/ProcessMapping.vue

@@ -16,7 +16,7 @@
         data() {
             return {
                 name: '',
-                actUrl: 'http://10.0.1.13:17210/bat-wkflow/modeler.html?modelId='//本地
+                actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId='//本地
                 // actUrl: 'http://10.255.35.25:8082/modeler.html?modelId='  //正式
                 // actUrl: 'http://10.255.128.148:8888/modeler.html?modelId='  //测试
             }

jero-web/src/views/processCenter/components/evaluatorFeedback.vue

@@ -156,12 +156,13 @@
             </a-col>
           </a-row>
         </div>
-        <div class="box-text" style="margin-top: 10px" v-if="disabled">
+        <div class="box-text" style="margin-top: 10px"
+             v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && !isTrue">
           <div class="header-text">
             {{$t('sponsorReview')}}
           </div>
         </div>
-        <a-row :gutter="24" v-if="disabled">
+        <a-row :gutter="24" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && !isTrue">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
@@ -175,6 +176,18 @@
             </div>
           </a-col>
         </a-row>
+        <!--        <a-row :gutter="24" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && isTrue">-->
+        <!--          <a-col :span="24">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text" :title="$t('reviewComments')">{{$t('reviewComments')}}</span>-->
+        <!--              </div>-->
+        <!--              <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="formInline.approvalOpinion">-->
+        <!--                {{formInline.approvalOpinion}}-->
+        <!--              </div>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+        <!--        </a-row>-->
       </a-form-model>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -259,7 +272,8 @@
         },
         disabled: false,
         uploadIndex: '',
-        dataList: []
+        dataList: [],
+        isTrue: false
       }
     },
     mounted() {
@@ -283,8 +297,14 @@
       })
       if (this.$route.query.taskDefinitionKey == 'pgrqr') {
         this.disabled = false
+        if (this.$route.query.isDisabled) {
+          this.disabled = JSON.parse(this.$route.query.isDisabled)
+        }
       } else {
         this.disabled = true
+        if (this.$route.query.isDisabled) {
+          this.isTrue = JSON.parse(this.$route.query.isDisabled)
+        }
       }
     },
     methods: {
@@ -443,4 +463,5 @@
     white-space: normal;
     word-break: break-all;
   }
+
 </style>

jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue

@@ -74,7 +74,9 @@
                <span v-else>--</span>
         </span>
         <span slot="Results" slot-scope="text,result">
-           {{text == 'Compliance' ? $t('accord'):$t('nonConformity')}}
+            <span v-if="text == 'Compliance'">{{$t('accord')}}</span>
+            <span v-else-if="text == 'Non-Compliance'">{{$t('nonConformity')}}</span>
+            <span v-else>--</span>
         </span>
         <span slot="sponsorFeedback" slot-scope="text,result">
              <a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
@@ -282,6 +284,81 @@
             ellipsis: true,
             scopedSlots: { customRender: 'sponsorFeedback' }
           }
+        ],
+        columnsOne: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'itemNum',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'itemName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'itemContent',
+            align: 'center',
+            width: 280,
+            scopedSlots: { customRender: 'clauseContent' }
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethodsName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResult',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'Results' }
+          },
+          {
+            title: this.$t('nameTechnicalDocument'),
+            dataIndex: 'technicalFileName',
+            align: 'center',
+            width: 280,
+            ellipsis: true
+          },
+          {
+            title: this.$t('chapter'),
+            dataIndex: 'section',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'opinion',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'accessoryFile',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'accessoryFile' }
+          },
+          {
+            title: this.$t('sponsorFeedback'),
+            dataIndex: 'sponsorFeedback',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'sponsorFeedbackIndex' }
+          }
         ]
       }
     },
@@ -306,10 +383,18 @@
     },
     computed: {
       columns() {
-        if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+        let disabled = false
-          return this.columnsTwo
+        if (this.$route.query.isDisabled) {
+          disabled = JSON.parse(this.$route.query.isDisabled)
+        }
+        if (disabled) {
+          return this.columnsOne
         } else {
-          return this.columnsThree
+          if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+            return this.columnsTwo
+          } else {
+            return this.columnsThree
+          }
         }
       }
     },
@@ -345,14 +430,14 @@
             this.$message.warning(this.$t('PleaseCompleteList'))
             return
           }
-          Object.keys(this.dataSource[i]).forEach(res=>{
+          Object.keys(this.dataSource[i]).forEach(res => {
             if (this.dataSource[i][res] && typeof this.dataSource[i][res] == 'string') {
               this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“')
               this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘')
             }
           })
         }
-        if (this.$route.query.taskDefinitionKey == 'pgrqr'){
+        if (this.$route.query.taskDefinitionKey == 'pgrqr') {
           let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
           for (let i = 0; i < this.dataSource.length; i++) {
             this.dataSource[i].feedbackTime = feedbackTime
@@ -361,7 +446,7 @@
         callBack && callBack(this.dataSource)
       },
       preservationData(callBack) {
-        if (this.$route.query.taskDefinitionKey == 'pgrqr'){
+        if (this.$route.query.taskDefinitionKey == 'pgrqr') {
           let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
           for (let i = 0; i < this.dataSource.length; i++) {
             this.dataSource[i].feedbackTime = feedbackTime

jero-web/src/views/processCenter/components/feedbackInformation.vue

@@ -12,18 +12,18 @@
             {{$t('feedbackPoint')+(index+1)}}
             <a-icon class="icon-size"
                     @click="addData"
-                    v-if="(formInline.dataList.length-1) == index"
+                    v-if="(formInline.dataList.length-1) == index && !disabled"
                     type="plus-circle"/>
             <a-icon class="icon-size"
                     @click="deleteData"
-                    v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
+                    v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
                     type="minus-circle"/>
           </div>
           <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
                 <a-form-model-item class="itemModel"
@@ -62,7 +62,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text"
                         :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
                 </div>
@@ -72,6 +72,7 @@
                                     }]">
                   <a-textarea :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"
                               :disabled="disabled"
+                              :title="item.issueOrSuggest"
                               v-model="item.issueOrSuggest" :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -79,7 +80,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
                 </div>
                 <a-form-model-item class="itemModel"
@@ -89,6 +90,7 @@
                                      {max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
                                     }]">
                   <a-textarea :placeholder="$t('PleaseEnter')+$t('reason')"
+                              :title="item.reason"
                               :disabled="disabled"
                               v-model="item.reason" :rows="4"/>
                 </a-form-model-item>
@@ -112,6 +114,7 @@
               </div>
             </a-col>
           </a-row>
+
         </div>
       </a-form-model>
     </div>
@@ -166,7 +169,9 @@
         }
         this.formInline = { ...this.formInline }
       })
-
+      if (this.$route.query.isDisabled) {
+        this.disabled = JSON.parse(this.$route.query.isDisabled)
+      }
     },
     methods: {
       clickButtonToUpload(item, index) {
@@ -301,4 +306,7 @@
     margin-left: 8px;
     cursor: pointer;
   }
+  ::v-deep .ant-input-disabled{
+    color: #000F16;
+  }
 </style>

jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue

@@ -72,7 +72,7 @@
         </a-col>
       </a-row>
       <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
-        <a-col :span="12">
+        <a-col :span="12" v-if="$route.query.isDisplay">
           <div class="box-title-text">
             <div class="title-text-fq">
               <span class="Required" v-if="$route.query.isDisplay">*</span>
@@ -88,16 +88,29 @@
             </a-form-model-item>
           </div>
         </a-col>
+        <a-col :span="24" v-else>
+          <div class="box-title-text">
+            <div class="title-text-fq">
+              <span class="title-text-text"
+                    :title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <span class="text-header">
+                {{formInline.engineerFeedbackContent}}
+              </span>
+            </a-form-model-item>
+          </div>
+        </a-col>
       </a-row>
       <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text-fq">
-<!--              <span class="Required" v-if="this.$route.query.isDisplay">*</span>-->
+              <!--              <span class="Required" v-if="this.$route.query.isDisplay">*</span>-->
               <span class="title-text-text"
                     :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
             </div>
-<!--            :prop="!this.$route.query.isDisplay?'':'fileId'"-->
+            <!--            :prop="!this.$route.query.isDisplay?'':'fileId'"-->
             <a-form-model-item class="itemModel">
               <a-button type="primary" class="button-text"
                         @click="clickButtonToUpload('fileId')">

jero-web/src/views/processCenter/components/taskCirculationHistory.vue

@@ -80,7 +80,7 @@
     methods: {
       getList() {
         let query = {
-          actiProcInstId: this.$route.query.actiProcInstId
+          actiProcInstId: this.$route.query.actiProcInstId || this.$route.query.prcId
         }
         this.loading = true
         getAction('/wkflow/processHistoryEO/list', query).then((res) => {

jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

@@ -26,7 +26,7 @@
           :title="$t('evaluatorFeedback')"
         />
         <footerProcess
-          v-if="isDisplay"
+          v-if="isDisplay && !disabled"
           :isPreservation="isPreservation"
           :isSubmit="true"
           :isSendBack="isSendBack"
@@ -78,6 +78,7 @@
         isPreservation: false,
         isSendBack: false,
         isTrue: false,
+        disabled:false,
         standardContentList: [],
         standardContent: [
           {
@@ -155,6 +156,9 @@
         this.isSendBack = true
       }
       this.queryTaskDetailByTask()
+      if (this.$route.query.isDisabled) {
+        this.disabled = JSON.parse(this.$route.query.isDisabled)
+      }
     },
     methods: {
       ...mapGetters(['userInfo']),

jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue

@@ -28,7 +28,7 @@
           "/>
         <examineInformation
           :isFlag="isFlag"
-          v-if="isDisplay"
+          v-if="isDisplay && isTrue"
           isApprovalOpinion
           :title="titleName"
           :isSendBack="isSendBackOne"
@@ -37,6 +37,7 @@
         <!--        @terminationProcess="terminationProcess"-->
         <footerProcess
           is-submit
+          v-if="isTrue"
           :isSendBack="isSendBack"
           @submit="submit"
           @sendBack="sendBack"
@@ -116,7 +117,8 @@
         queryProject: {},
         loading: false,
         titleName: '',
-        textLoading: this.$t('dataLoading')
+        textLoading: this.$t('dataLoading'),
+        isTrue: false
       }
     },
     created() {
@@ -130,6 +132,9 @@
       } else {
         this.titleName = this.$t('taskConfirmationResponsiblePerson')
       }
+      if (this.$route.query.isTrue) {
+        this.isTrue = JSON.parse(this.$route.query.isTrue)
+      }
       this.queryTaskDetailByTask(function() {
         _this.queryProjectLawsInventoryInfo()
       })
@@ -181,10 +186,10 @@
         this.loading = true
         getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
           if (res instanceof String) {
-            this.queryBy = JSON.parse(res)
+            this.queryBy = JSON.parse(res) || {}
             callback()
           } else {
-            this.queryBy = res
+            this.queryBy = res || {}
             callback()
           }
         })

jero-web/src/views/processCenter/processForm/processDetails/index.vue

@@ -15,6 +15,7 @@
     </div>
     <regulatoryCirculationHistory :isTrue="isTrue"
                                   v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
+    <taskCirculationHistory v-else-if="$route.query.prcType == '2' || $route.query.prcType == '3' || $route.query.prcType == '4'"/>
     <circulationHistory v-else/>
   </div>
 </template>
@@ -22,6 +23,7 @@
 <script>
   import circulationHistory from '../../components/circulationHistory'
   import regulatoryCirculationHistory from '../../components/regulatoryCirculationHistory'
+  import taskCirculationHistory from '../../components/taskCirculationHistory'
   import axios from 'axios'
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -30,7 +32,8 @@
     name: 'processDetails',
     components: {
       circulationHistory,
-      regulatoryCirculationHistory
+      regulatoryCirculationHistory,
+      taskCirculationHistory
     },
     data() {
       return {

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -19,7 +19,7 @@
           :title="$t('feedbackInformation')"
         />
         <footerProcess
-          v-if="isDisplay"
+          v-if="isDisplay && !disabled"
           isPreservation
           :isSubmit="true"
           @preservation="preservation"
@@ -61,6 +61,7 @@
         },
         loading: false,
         isDisplay: true,
+        disabled: false,
         feedbackDataList: [],
         queryProject: {},
         standardContentList: [
@@ -101,6 +102,9 @@
     },
     mounted() {
       this.isDisplay = false
+      if (this.$route.query.isDisabled) {
+        this.disabled = JSON.parse(this.$route.query.isDisabled)
+      }
       this.queryTaskDetailByTask(() => {
         this.lawsOpinionAssessmentResult()
       })

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -324,14 +324,19 @@
         putAction(this.url.dreSubmit, query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
-
+            if (this.$route.query.router) {
-            this.$router.push({
+              this.$router.push({
-              path: '/ProjectDetails',
+                path: '/projectRegulationTasks'
-              query: {
+              })
-                type: '103',
+            } else {
-                ...this.$route.query
+              this.$router.push({
-              }
+                path: '/ProjectDetails',
-            })
+                query: {
+                  type: '103',
+                  ...this.$route.query
+                }
+              })
+            }
             // setTimeout(() => {
             //   this.loading = false
             //   window.close()
@@ -375,13 +380,19 @@
           if (res.success) {
             setTimeout(() => {
               this.loading = false
-              this.$router.push({
+              if (this.$route.query.router) {
-                path: '/ProjectDetails',
+                this.$router.push({
-                query: {
+                  path: '/projectRegulationTasks'
-                  type: '103',
+                })
-                  ...this.$route.query
+              } else {
-                }
+                this.$router.push({
-              })
+                  path: '/ProjectDetails',
+                  query: {
+                    type: '103',
+                    ...this.$route.query
+                  }
+                })
+              }
             }, 1000)
           }
         })
@@ -390,10 +401,10 @@
         this.loading = true
         getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
           if (res instanceof String) {
-            this.queryBy = JSON.parse(res)
+            this.queryBy = JSON.parse(res) || {}
             callback()
           } else {
-            this.queryBy = res
+            this.queryBy = res || {}
             callback()
           }
         })

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -670,6 +670,10 @@
       // }
     },
     mounted() {
+      console.log(this.$route.query)
+      if(this.$route.query.type == '1'){
+        this.handleOkRoleSwitching()
+      }
       this.GetgetLoginUserType()
       console.log(this.currentPersonRole)
       setTimeout(() => {
@@ -704,36 +708,62 @@
         })
       },
       handleOkRoleSwitching() {
-        this.$refs.ruleFormRoleSwitching.validate(valid => {
+        if(this.$route.query.type == '1'){
-          if (valid) {
+          let query = {
-            let query = {
+            userType:this.$route.query.userType,
-              userType: this.formInlineRoleSwitching.roleSwitchingCode,
+            paramsManifestId: this.$route.query.id,
-              paramsManifestId: this.$route.query.id,
+            projectId: this.$route.query.projectId,
-              projectId: this.$route.query.projectId,
+            userId: this.userInfo().id
-              userId: this.userInfo().id
-            }
-            this.confirmLoadingRoleSwitching = true
-            postAction('/params/userTypeLog/edit', query).then((res) => {
-              if (res.success) {
-                this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
-                this.$message.success(this.$t('OperationSuccessful'))
-                this.$refs.CollectionTabel.getHeader(this.currentPersonRole)
-                this.visibleRoleSwitching = false
-                this.confirmLoadingRoleSwitching = false
-                localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
-                this.RoleType.forEach((item,index) => {
-                  if(item.value == this.currentPersonRole){
-                    this.rolename = item.label
-                  }
-                })
-                this.selectedRowKeysValue = []
-              } else {
-                this.confirmLoadingRoleSwitching = false
-                this.$message.warning(this.$t('operationFailed'))
-              }
-            })
           }
-        })
+          this.confirmLoadingRoleSwitching = true
+          postAction('/params/userTypeLog/edit', query).then((res) => {
+            if (res.success) {
+              this.currentPersonRole = this.$route.query.userType
+              this.visibleRoleSwitching = false
+              this.confirmLoadingRoleSwitching = false
+              localStorage.setItem('currentPersonRole', JSON.stringify(this.$route.query.userType))
+              this.RoleType.forEach((item,index) => {
+                if(item.value == this.currentPersonRole){
+                  this.rolename = item.label
+                }
+              })
+              this.selectedRowKeysValue = []
+            } else {
+              this.confirmLoadingRoleSwitching = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          })
+        }else {
+          this.$refs.ruleFormRoleSwitching.validate(valid => {
+            if (valid) {
+              let query = {
+                userType: this.formInlineRoleSwitching.roleSwitchingCode,
+                paramsManifestId: this.$route.query.id,
+                projectId: this.$route.query.projectId,
+                userId: this.userInfo().id
+              }
+              this.confirmLoadingRoleSwitching = true
+              postAction('/params/userTypeLog/edit', query).then((res) => {
+                if (res.success) {
+                  this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.visibleRoleSwitching = false
+                  this.confirmLoadingRoleSwitching = false
+                  localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
+                  this.RoleType.forEach((item,index) => {
+                    if(item.value == this.currentPersonRole){
+                      this.rolename = item.label
+                    }
+                  })
+                  this.selectedRowKeysValue = []
+                } else {
+                  this.confirmLoadingRoleSwitching = false
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        }
       },
       roleSwitchingClick() {
         this.visibleRoleSwitching = true

jero-web/src/views/system/PermissionList.vue

@@ -56,7 +56,7 @@
                 <a href="javascript:;" @click="handleDataRule(record)">{{$t('DataRules')}}</a>
               </a-menu-item>
 
-              <a-menu-item>
+              <a-menu-item v-if="isTrue(record)">
                 <a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete(record.id)">
                   <a>{{$t('delete')}}</a>
                 </a-popconfirm>
@@ -187,6 +187,16 @@
       }
     },
     methods: {
+      isTrue(record) {
+        if (record.id == '1580735287309119489' ||
+          record.id == '1580735611793059842' ||
+          record.id == '1580735965892980738' ||
+          record.id == '1580734309507805185' ||
+          record.id == '1580762600394469378') {
+          return false
+        }
+        return true
+      },
       loadData() {
         this.dataSource = []
         getPermissionList().then((res) => {

jero-web/src/views/toDoCenter/projectParameterTasks/index.vue

@@ -0,0 +1,308 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('RelatedItems')">
+                <span>{{$t('RelatedItems')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
+                       v-model.trim="queryParam.projectName"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('ListTitle')">
+                <span>{{$t('ListTitle')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ListTitle')"
+                       v-model.trim="queryParam.title"></a-input>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+        <!--         -->
+
+        <span slot="projectVersion" slot-scope="text,record">
+          <span class="text-operation">{{text ? text:'--'}}</span>
+        </span>
+        <span slot="waitFillNumoperation" slot-scope="text,record">
+          <a class="text-operation" v-if='text'
+             @click="waitFillClick(record)">{{text}}</a>
+          <span class="text-operation" v-else >{{'--'}}</span>
+        </span>
+        <span slot="waitSdtNumoperation" slot-scope="text,record">
+          <a class="text-operation" v-if='text'
+             @click="waitSdtClick(record)">{{text}}</a>
+          <span class="text-operation" v-else >{{'--'}}</span>
+        </span>
+        <span slot="waitCollectNumoperation" slot-scope="text,record">
+          <a class="text-operation" v-if='text'
+             @click="waitCollectClick(record)">{{text}}</a>
+          <span class="text-operation" v-else >{{'--'}}</span>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} ` +$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {},
+    data() {
+      return {
+        queryParam: {},
+        taskTypeList: [],
+        taskStatusList: [],
+        dataSource: [],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        loading: false,
+        url:{
+          list:'',
+        },
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('ListTitle'),
+            align: 'center',
+            dataIndex: 'title',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('relatedVersion'),
+            align: 'center',
+            dataIndex: 'projectVersion',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'projectVersion' }
+          },
+          {
+            title: this.$t('completednum'),
+            align: 'center',
+            dataIndex: 'waitFillNum',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'waitFillNumoperation' }
+          },
+          {
+            title: this.$t('filledBynum'),
+            align: 'center',
+            dataIndex: 'waitSdtNum',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'waitSdtNumoperation' }
+          },
+          {
+            title: this.$t('parameterToBeInitiatednum'),
+            align: 'center',
+            dataIndex: 'waitCollectNum',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'waitCollectNumoperation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      //待填写数量
+      waitFillClick(item) {
+        let _this = this
+        item.type = '1'
+        item.userType = 'dre'
+        console.log(item)
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      //待分配填写人数量
+      waitSdtClick(item) {
+        let _this = this
+        item.type = '1'
+        item.userType = 'sdt'
+        console.log(item)
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      //参数待发起数量
+      waitCollectClick(item) {
+        let _this = this
+        item.type = '1'
+        item.userType = 'homo'
+        console.log(item)
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction('todoCenter/params/manifest/page', query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+</style>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue

@@ -0,0 +1,354 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
+           <a class="text-operation" v-if="record.flowType != '10'"
+              @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
+          <a class="text-operation"
+             @click="viewClick(record)">{{$t('view')}}</a>
+      </span>
+      <span slot="RelatedItems" slot-scope="text,record">
+          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+       <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
+        </a>
+        <span v-else>--</span>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'SentList',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            scopedSlots: { customRender: 'RelatedItems' },
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            scopedSlots: { customRender: 'standardInformation' },
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('LastProcessor'),
+            align: 'center',
+            dataIndex: 'lastAssigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('CurrentProcessor'),
+            align: 'center',
+            dataIndex: 'assigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        url: {
+          list: '/todoCenter/projectProcess/issuedProcess'
+        },
+        queryParam: {}
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      monitoringProcessClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: row.flowType,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      RelatedItemsClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/ProjectDetails',
+          query: {
+            id: item.projectLibraryId,
+            projectName: item.projectName,
+            projectNameId: item.projectNameId,
+            targetMarket: item.targetMarket,
+            studioEngineer: item.studioEngineer
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewClick(row) {
+        let query = {}
+        row.router = this.$route.path
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            isTrue: false
+          }
+          let newUrl = this.$router.resolve({
+            path: '/handshakeProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '10') {
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '102'
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '2') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId: row.projectLibraryId,
+            id: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            isDisplay: false,
+            flowType: 2,
+            Sponsor: 'designInitiatorName',
+            personLiable: 'designDutyName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '3') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            studioEngineer: row.studioEngineer,
+            projectLibraryId: row.projectLibraryId,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 3,
+            isDisplay: false,
+            id: row.projectLibraryId,
+            Sponsor: 'prehomoInitiatorName',
+            personLiable: 'prehomoDutyName',
+            typeOfDeliverables: 'prehomoDeliverableTypeName',
+            deliverableTemplate: 'prehomoDeliverableTemplate',
+            DueDate: 'prehomoDueDate',
+            remarks: 'prehomoRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '4') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            id: row.projectLibraryId,
+            projectLibraryId: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 4,
+            isDisplay: false,
+            Sponsor: 'verifyInitiatorName',
+            personLiable: 'verifyDutyName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+</style>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue

@@ -0,0 +1,337 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="endTime" slot-scope="text,record">
+          <span :title="text" :class="{'activeRed':record.endTimePastDueFlag}">{{text}}</span>
+      </span>
+      <span slot="operation" slot-scope="text,record">
+          <a class="text-operation"
+             @click="ProcessingClick(record)">{{$t('Processing')}}</a>
+      </span>
+      <span slot="RelatedItems" slot-scope="text,record">
+          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
+        </a>
+        <span v-else>--</span>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'dealtWith',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            scopedSlots: { customRender: 'RelatedItems' },
+            width: 170
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'endTime' }
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        url: {
+          list: '/todoCenter/projectProcess/todoTaskList'
+        },
+        queryParam: {}
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      RelatedItemsClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/ProjectDetails',
+          query: {
+            id: item.projectLibraryId,
+            projectName: item.projectName,
+            projectNameId: item.projectNameId,
+            targetMarket: item.targetMarket,
+            studioEngineer: item.studioEngineer
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      ProcessingClick(row) {
+        let query = {}
+        row.router = this.$route.path
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            isTrue: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/handshakeProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '10') {
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '102'
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '2') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId: row.projectLibraryId,
+            id: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            isDisplay: true,
+            flowType: 2,
+            Sponsor: 'designInitiatorName',
+            personLiable: 'designDutyName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '3') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            studioEngineer: row.studioEngineer,
+            projectLibraryId: row.projectLibraryId,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 3,
+            isDisplay: true,
+            id: row.projectLibraryId,
+            Sponsor: 'prehomoInitiatorName',
+            personLiable: 'prehomoDutyName',
+            typeOfDeliverables: 'prehomoDeliverableTypeName',
+            deliverableTemplate: 'prehomoDeliverableTemplate',
+            DueDate: 'prehomoDueDate',
+            remarks: 'prehomoRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '4') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            id: row.projectLibraryId,
+            projectLibraryId: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 4,
+            isDisplay: true,
+            Sponsor: 'verifyInitiatorName',
+            personLiable: 'verifyDutyName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .activeRed{
+     color: red;
+  }
+</style>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue

@@ -0,0 +1,355 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
+          <a class="text-operation" v-if="record.flowType != '10'"
+            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
+          <a class="text-operation"
+             @click="viewClick(record)">{{$t('view')}}</a>
+      </span>
+      <span slot="RelatedItems" slot-scope="text,record">
+          <a @click="RelatedItemsClick(record)" :title="text">
+            {{text}}
+          </a>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
+        </a>
+        <span v-else>--</span>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'doneList',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/todoCenter/projectProcess/doneProcess'
+        },
+        queryParam: {},
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            scopedSlots: { customRender: 'RelatedItems' },
+            width: 170
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('CurrentProcessor'),
+            align: 'center',
+            dataIndex: 'assigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      monitoringProcessClick(row){
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType:row.flowType,
+            prcId:row.actiProcInstId,
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      RelatedItemsClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/ProjectDetails',
+          query: {
+            id: item.projectLibraryId,
+            projectName: item.projectName,
+            projectNameId: item.projectNameId,
+            targetMarket: item.targetMarket,
+            studioEngineer:item.studioEngineer,
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item){
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId,
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewClick(row) {
+        let query = {}
+        row.router = this.$route.path
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey:row.taskDefinitionKey,
+            taskIds:row.taskId,
+            prcType:row.flowType,
+            prcNum:row.prcNum,
+            isTrue:false,
+          }
+          let newUrl = this.$router.resolve({
+            path: '/handshakeProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }else if(row.flowType == '10'){
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer:row.studioEngineer,
+              type:'102',
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        }else if(row.flowType == '2'){
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds:row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId:row.projectLibraryId,
+            id: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            isDisplay: false,
+            flowType: 2,
+            Sponsor: 'designInitiatorName',
+            personLiable: 'designDutyName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }else if(row.flowType == '3'){
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds:row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            studioEngineer: row.studioEngineer,
+            projectLibraryId:row.projectLibraryId,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 3,
+            isDisplay: false,
+            id: row.projectLibraryId,
+            Sponsor: 'prehomoInitiatorName',
+            personLiable: 'prehomoDutyName',
+            typeOfDeliverables: 'prehomoDeliverableTypeName',
+            deliverableTemplate: 'prehomoDeliverableTemplate',
+            DueDate: 'prehomoDueDate',
+            remarks: 'prehomoRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }else if(row.flowType == '4'){
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            id: row.projectLibraryId,
+            projectLibraryId: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 4,
+            isDisplay: false,
+            Sponsor: 'verifyInitiatorName',
+            personLiable: 'verifyDutyName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .text-operation{
+     margin-right: 8px;
+  }
+</style>

jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue

@@ -0,0 +1,259 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('RelatedItems')">
+                <span>{{$t('RelatedItems')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
+                       v-model="queryParam.projectName"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standardInformation')">
+                <span>{{$t('standardInformation')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
+                       v-model="queryParam.serialNumber"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('taskType')">
+                <span>{{$t('taskType')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('taskType')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowType">
+                <a-select-option v-for="(item, key) in taskTypeList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('taskStatus')">
+                  <span>{{$t('taskStatus')}}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('taskStatus')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="queryParam.status">
+                  <a-select-option v-for="(item, key) in taskStatusList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
+          </template>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                   <a @click="handleToggleSearch" style="margin-left: 8px">
+                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator" style="margin-bottom: 8px">
+      <div @click="taskConfirmationHandlingClick"
+           class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('taskConfirmationHandling')}}
+      </div>
+    </div>
+    <a-tabs v-model="tabActive" @change="callback">
+      <a-tab-pane :key="$t('toDoProcess')" :tab="$t('toDoProcess')">
+        <dealtWith v-if="tabActive == $t('toDoProcess')" ref="dealtWithRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('processDone')" :tab="$t('processDone')">
+        <doneList v-if="tabActive == $t('processDone')" ref="doneListRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('sentProcess')" :tab="$t('sentProcess')">
+        <SentList v-if="tabActive == $t('sentProcess')" ref="SentListRef"/>
+      </a-tab-pane>
+    </a-tabs>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import dealtWith from './components/dealtWith'
+  import doneList from './components/doneList'
+  import SentList from './components/SentList'
+
+  export default {
+    name: 'index',
+    components: {
+      dealtWith,
+      doneList,
+      SentList
+    },
+    data() {
+      return {
+        queryParam: {},
+        toggleSearchStatus: false,
+        taskTypeList: [
+          {
+            name:this.$t('confirmationOfRegulationsList'),
+            value:'10',
+          },
+          {
+            name:this.$t('listTaskConfirmation'),
+            value:'1',
+          },
+          {
+            name:this.$t('designComplianceReview'),
+            value:'2',
+          },
+          {
+            name:this.$t('preHomeConfirmation'),
+            value:'3',
+          },
+          {
+            name:this.$t('verificationComplianceReview'),
+            value:'4',
+          },
+        ],
+        taskStatusList: [
+          {
+            name:this.$t('listToConfirm'),
+            value:'List to confirm',
+          },
+          {
+            name:this.$t('Finished'),
+            value:'Completed',
+          },
+          {
+            name:this.$t('inquiry'),
+            value:'Inquiry',
+          },
+          {
+            name:this.$t('toSubmit'),
+            value:'To submit',
+          },
+          {
+            name:this.$t('toAudit'),
+            value:'To audit',
+          },
+        ],
+        tabActive: this.$t('toDoProcess')
+      }
+    },
+    methods: {
+      callback(value) {
+        this.tabActive = value
+      },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      searchQuery() {
+        if (this.tabActive == this.$t('toDoProcess')) {
+          this.$refs.dealtWithRef.searchQuery(this.queryParam )
+        } else if (this.tabActive == this.$t('processDone')) {
+          this.$refs.doneListRef.searchQuery(this.queryParam )
+        } else if (this.tabActive == this.$t('sentProcess')) {
+          this.$refs.SentListRef.searchQuery(this.queryParam )
+        }
+      },
+      searchReset() {
+        this.queryParam = {}
+        if (this.tabActive == this.$t('toDoProcess')) {
+          this.$refs.dealtWithRef.searchReset()
+        } else if (this.tabActive == this.$t('processDone')) {
+          this.$refs.doneListRef.searchReset()
+        } else if (this.tabActive == this.$t('sentProcess')) {
+          this.$refs.SentListRef.searchReset()
+        }
+      },
+      taskConfirmationHandlingClick() {
+        this.$router.push({
+          path: '/toDoTaskConfirmation'
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+</style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue

@@ -0,0 +1,231 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
+         <a class="text-operation"
+            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
+          <a class="text-operation"
+             @click="viewClick(record)">{{$t('view')}}</a>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+        <a @click="standardInformationClick(record)" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
+        </a>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'SentList',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/todoCenter/lawsAssess/issuedProcess'
+        },
+        columns: [
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            scopedSlots: { customRender: 'standardInformation' },
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('LastProcessor'),
+            align: 'center',
+            dataIndex: 'lastAssigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('CurrentProcessor'),
+            align: 'center',
+            dataIndex: 'assigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        queryParam: {}
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      monitoringProcessClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: row.flowType,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewClick(row) {
+        row.router = this.$route.path
+        let query = {}
+        if (row.flowType == '5') {
+          query = {
+            prcId: row.actiProcInstId,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            router: row.router,
+            prcNum: row.prcNum,
+            taskDefinitionKey: row.taskDefinitionKey,
+            isDisabled: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/regulatoryProcessReview',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '6') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            prcId: row.actiProcInstId,
+            router: row.router,
+            isDisabled: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+</style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue

@@ -0,0 +1,214 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
+          <a class="text-operation"
+             @click="ProcessingClick(record)">{{$t('Processing')}}</a>
+      </span>
+      <span slot="endTime" slot-scope="text,record">
+          <span :title="text" :class="{'activeRed':record.endTimePastDueFlag}">{{text}}</span>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+        <a @click="standardInformationClick(record)" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
+        </a>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'dealtWith',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            scopedSlots: { customRender: 'standardInformation' },
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'endTime' }
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        url: {
+          list: '/todoCenter/lawsAssess/todoTaskList'
+        },
+        total: 0,
+        queryParam: {}
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      ProcessingClick(row){
+        row.router = this.$route.path
+        let query = {}
+        if (row.flowType == '5') {
+          query = {
+            prcId:row.actiProcInstId,
+            taskIds:row.taskId,
+            prcType:row.flowType,
+            router:row.router,
+            prcNum:row.prcNum,
+            taskDefinitionKey:row.taskDefinitionKey,
+            isDisabled:false
+          }
+          let newUrl = this.$router.resolve({
+            path: '/regulatoryProcessReview',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '6') {
+          query = {
+            taskDefinitionKey:row.taskDefinitionKey,
+            taskIds:row.taskId,
+            prcType:row.flowType,
+            prcNum:row.prcNum,
+            prcId:row.actiProcInstId,
+            router:row.router,
+            isDisabled:false,
+          }
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .activeRed{
+    color: red;
+  }
+</style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue

@@ -0,0 +1,231 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
+         <a class="text-operation"
+            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
+          <a class="text-operation"
+             @click="viewClick(record)">{{$t('view')}}</a>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+       <a @click="standardInformationClick(record)" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
+        </a>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'doneList',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('CurrentProcessor'),
+            align: 'center',
+            dataIndex: 'assigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        queryParam: {},
+        url: {
+          list: '/todoCenter/lawsAssess/doneProcess'
+        }
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      monitoringProcessClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: row.flowType,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewClick(row) {
+        row.router = this.$route.path
+        let query = {}
+        if (row.flowType == '5') {
+          query = {
+            prcId: row.actiProcInstId,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            router: row.router,
+            prcNum: row.prcNum,
+            taskDefinitionKey: row.taskDefinitionKey,
+            isDisabled: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/regulatoryProcessReview',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '6') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            prcId: row.actiProcInstId,
+            router: row.router,
+            isDisabled: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+</style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue

@@ -0,0 +1,174 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standardInformation')">
+                <span>{{$t('standardInformation')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
+                       v-model="queryParam.serialNumber"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('taskType')">
+                <span>{{$t('taskType')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('taskType')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowType">
+                <a-select-option v-for="(item, key) in taskTypeList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <a-tabs v-model="tabActive" @change="callback">
+      <a-tab-pane :key="$t('toDoProcess')" :tab="$t('toDoProcess')">
+        <dealtWith v-if="tabActive == $t('toDoProcess')" ref="dealtWithRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('processDone')" :tab="$t('processDone')">
+        <doneList v-if="tabActive == $t('processDone')" ref="doneListRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('sentProcess')" :tab="$t('sentProcess')">
+        <SentList v-if="tabActive == $t('sentProcess')" ref="SentListRef"/>
+      </a-tab-pane>
+    </a-tabs>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import dealtWith from './components/dealtWith'
+  import doneList from './components/doneList'
+  import SentList from './components/SentList'
+
+  export default {
+    name: 'index',
+    components: {
+      dealtWith,
+      doneList,
+      SentList
+    },
+    data() {
+      return {
+        queryParam: {},
+        taskTypeList: [
+          {
+            name: this.$t('collectionOfRegulatoryOpinions'),
+            value: '5'
+          },
+          {
+            name: this.$t('regulatoryTechnicalAssessment'),
+            value: '6'
+          }
+        ],
+        tabActive: this.$t('toDoProcess')
+      }
+    },
+    methods: {
+      callback(value) {
+        this.tabActive = value
+      },
+      searchQuery() {
+        if (this.tabActive == this.$t('toDoProcess')) {
+          this.$refs.dealtWithRef.searchQuery(this.queryParam )
+        } else if (this.tabActive == this.$t('processDone')) {
+          this.$refs.doneListRef.searchQuery(this.queryParam )
+        } else if (this.tabActive == this.$t('sentProcess')) {
+          this.$refs.SentListRef.searchQuery(this.queryParam )
+        }
+      },
+      searchReset() {
+        this.queryParam = {}
+        if (this.tabActive == this.$t('toDoProcess')) {
+          this.$refs.dealtWithRef.searchReset()
+        } else if (this.tabActive == this.$t('processDone')) {
+          this.$refs.doneListRef.searchReset()
+        } else if (this.tabActive == this.$t('sentProcess')) {
+          this.$refs.SentListRef.searchReset()
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+</style>

jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue

@@ -0,0 +1,266 @@
+<template>
+  <div>
+    <a-modal
+      :title="$t('batchProcessing')"
+      :width="700"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <template slot="footer">
+        <a-button key="back" @click="handleCancel">
+          {{$t('cancel')}}
+        </a-button>
+        <a-button type="danger" :loading="confirmLoading" v-if="taskDefinitionKey == 'dreqr'" @click="sendBackClick">
+          {{$t('sendBack')}}
+        </a-button>
+        <a-button type="primary" :loading="confirmLoading" @click="handleOk">
+          {{$t('confirm')}}
+        </a-button>
+      </template>
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24" v-if="taskDefinitionKey != 'dreqr'">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"></span>
+              </div>
+              <a-form-model-item class="itemModel" prop="flag">
+                <a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.flag">
+                  <a-radio value="0">
+                    {{$t('accept')}}
+                  </a-radio>
+                  <a-radio value="1">
+                    {{$t('disagree')}}
+                  </a-radio>
+                  <a-radio value="3" v-if="taskDefinitionKey == 'zrrjsrw'">
+                    {{$t('inquiry')}}
+                  </a-radio>
+                  <a-radio value="4" v-if="taskDefinitionKey == 'zrrqr'">
+                    {{$t('sendBack')}}
+                  </a-radio>
+                </a-radio-group>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="isTrue">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('selectInquiry')">{{$t('selectInquiry')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dreUserIdName">
+                <PersonnelSelection class="box-input"
+                                    :personneQuery="formInline"
+                                    :query="{db_field_name:'dreUserId',db_field_txt:$t('selectInquiry')}"
+                                    :isInput="true"
+                                    :isSingleChoice="true"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.dreUserIdName"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="approvalOpinion">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion"
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+
+    </a-modal>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import moment from 'moment'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'batchProcessing',
+    components: {
+      PersonnelSelection
+    },
+    data() {
+      return {
+        formInline: {},
+        rules: {
+          flag: [
+            {
+              required: true,
+              message: this.$t('reviewResults') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          dreUserIdName: [
+            {
+              required: true,
+              message: this.$t('selectInquiry') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          approvalOpinion: [
+            {
+              max: 300,
+              message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ]
+        },
+        confirmLoading: false,
+        visible: false,
+        selectedRowKeys: [],
+        issue: false,
+        isTrue: false,
+        taskDefinitionKey: '',
+        taskIds: [],
+        projectLawsInventoryIds: []
+      }
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getData(data) {
+        this.selectedRowKeys = data
+        this.taskDefinitionKey = this.selectedRowKeys[0].taskDefinitionKey
+        this.taskIds = []
+        this.projectLawsInventoryIds = []
+        this.selectedRowKeys.forEach(res => {
+          this.taskIds.push(res.taskId)
+          this.projectLawsInventoryIds.push(res.projectLawsInventoryId)
+        })
+        this.confirmLoading = false
+        this.visible = true
+        this.isTrue = false
+        this.$nextTick(() => {
+          this.formInline = {}
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      sendBackClick() {
+        this.formInline.flag = '1'
+        this.handleOk()
+      },
+      flagChange(event) {
+        if (event.target.value == 3) {
+          this.isTrue = true
+        } else {
+          this.isTrue = false
+        }
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      addBatch() {
+        let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        let query = {
+          rejectUserId: this.userInfo().id,
+          rejectTime: rejectTime,
+          rejectCause: this.formInline.approvalOpinion,
+          taskIds: this.taskIds.join(','),
+          rejectType: '1'
+        }
+        postAction('/project/projectLawsInventoryRejectCauseEO/addBatch', query).then((res) => {
+
+        })
+      },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+            let query = {
+              ...this.formInline,
+              taskIds: this.taskIds.join(','),
+              userId: this.userInfo().id,
+              taskDefinitionKey: this.taskDefinitionKey,
+              handlingTime: handlingTime,
+              projectLawsInventoryIds: this.projectLawsInventoryIds.join(',')
+            }
+            if (this.formInline.flag == '1') {
+              this.addBatch()
+            }
+            if (!this.formInline.flag) {
+              query.flag = '0'
+            }
+            this.confirmLoading = true
+            postAction('/workFlow/completeTaskBatch', query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.confirmLoading = false
+                this.$emit('batchProcessingForm')
+              } else {
+                this.confirmLoading = false
+                this.$message.warning(this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 84px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+</style>

jero-web/src/views/toDoCenter/taskConfirmation/index.vue

@@ -0,0 +1,354 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('RelatedItems')">
+                <span>{{$t('RelatedItems')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
+                       v-model="queryParam.projectName"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standardInformation')">
+                <span>{{$t('standardInformation')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
+                       v-model="queryParam.serialNumber"></a-input>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator" style="margin-bottom: 16px">
+      <div @click="batchProcessingClick"
+           class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('batchProcessing')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+        :data-source="dataSource"
+        :rowKey="(record)=>JSON.stringify(record)"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <!--         -->
+        <span slot="operation" slot-scope="text,record">
+          <a class="text-operation"
+             @click="ProcessingClick(record)">{{$t('Processing')}}</a>
+        </span>
+        <span slot="RelatedItems" slot-scope="text,record">
+          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
+       </span>
+        <span slot="standardInformation" slot-scope="text,record">
+        <a @click="standardInformationClick(record)" :title="text">{{text}}</a>
+       </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+    <batchProcessing ref="batchProcessingRef" @batchProcessingForm="batchProcessingForm"/>
+  </a-card>
+</template>
+
+<script>
+  import batchProcessing from './components/batchProcessing'
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {
+      batchProcessing
+    },
+    data() {
+      return {
+        dataSource: [],
+        queryParam: {},
+        loading: false,
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            scopedSlots: { customRender: 'RelatedItems' },
+            width: 170
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        url: {
+          list: '/todoCenter/projectProcess/todoTaskList'
+        }
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      RelatedItemsClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/ProjectDetails',
+          query: {
+            id: item.projectLibraryId,
+            projectName: item.projectName,
+            projectNameId: item.projectNameId,
+            targetMarket: item.targetMarket,
+            studioEngineer: item.studioEngineer
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.projectLawsInventoryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      batchProcessingForm() {
+        this.selectedRowKeys = []
+        this.getList()
+      },
+      batchProcessingClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let content = []
+          selectedRowKeys.forEach(res => {
+            content.push(JSON.parse(res))
+          })
+          for (let i = 0; i < content.length; i++) {
+            if (content[i].taskDefinitionKey != content[0].taskDefinitionKey) {
+              this.$message.warning(this.$t('processNodesAreInconsistentPleaseSelectConsistentData'))
+              return
+            }
+          }
+          this.$refs.batchProcessingRef.getData(JSON.parse(JSON.stringify(content)))
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      searchQuery() {
+        this.selectedRowKeys = []
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.selectedRowKeys = []
+        this.pageNo = 1
+        this.queryParam = {}
+        this.getList()
+      },
+      ProcessingClick(row) {
+        let query = {}
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            isTrue: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/handshakeProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = []
+        if (value && value.length > 0) {
+          value.forEach(res => {
+            res = JSON.parse(res)
+            if (res.flowType == '1') {
+              this.selectedRowKeys.push(JSON.stringify(res))
+            } else {
+              this.$message.warning(this.$t('onlyDataTaskConfirmationProcessSelected'))
+            }
+          })
+        }
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          flowType: '1',
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+</style>