项目库-任务清单 、任务清单明细。

任务确认流程发消息修改。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java

@@ -0,0 +1,170 @@
+package com.jero.modules.project.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
+import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
+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-04-29
+ * @Version: V1.0
+ */
+@Api(tags="项目库-任务清单明细表")
+@RestController
+@RequestMapping("/project/projectTaskInventoryDetailEO")
+@Slf4j
+public class ProjectTaskInventoryDetailEOController extends JeroController<ProjectTaskInventoryDetailEO, IProjectTaskInventoryDetailEOService> {
+	@Autowired
+	private IProjectTaskInventoryDetailEOService projectTaskInventoryDetailEOService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectTaskInventoryDetailEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "项目库-任务清单明细表-分页列表查询")
+	@ApiOperation(value="项目库-任务清单明细表-分页列表查询", notes="项目库-任务清单明细表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectTaskInventoryDetailEO> queryWrapper = QueryGenerator.initQueryWrapper(projectTaskInventoryDetailEO, req.getParameterMap());
+		Page<ProjectTaskInventoryDetailEO> page = new Page<ProjectTaskInventoryDetailEO>(pageNo, pageSize);
+		IPage<ProjectTaskInventoryDetailEO> pageList = projectTaskInventoryDetailEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-任务清单明细表-列表查询")
+    @ApiOperation(value="项目库-任务清单明细表-列表查询", notes="项目库-任务清单明细表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectTaskInventoryDetailEO>> queryList() {
+        List<ProjectTaskInventoryDetailEO> list = projectTaskInventoryDetailEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectTaskInventoryDetailEO
+	 * @return
+	 */
+	@AutoLog(value = "项目库-任务清单明细表-添加")
+	@ApiOperation(value="项目库-任务清单明细表-添加", notes="项目库-任务清单明细表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) {
+		projectTaskInventoryDetailEOService.add(projectTaskInventoryDetailEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectTaskInventoryDetailEO
+	 * @return
+	 */
+	@AutoLog(value = "项目库-任务清单明细表-编辑")
+	@ApiOperation(value="项目库-任务清单明细表-编辑", notes="项目库-任务清单明细表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) {
+		projectTaskInventoryDetailEOService.editById(projectTaskInventoryDetailEO);
+		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) {
+		projectTaskInventoryDetailEOService.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.projectTaskInventoryDetailEOService.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) {
+		ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO = projectTaskInventoryDetailEOService.queryById(id);
+		if(projectTaskInventoryDetailEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectTaskInventoryDetailEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectTaskInventoryDetailEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) {
+        return super.exportXls(request, projectTaskInventoryDetailEO, ProjectTaskInventoryDetailEO.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, ProjectTaskInventoryDetailEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java

@@ -0,0 +1,170 @@
+package com.jero.modules.project.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.service.IProjectTaskInventoryEOService;
+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-04-29
+ * @Version: V1.0
+ */
+@Api(tags="项目库-任务清单表")
+@RestController
+@RequestMapping("/project/projectTaskInventoryEO")
+@Slf4j
+public class ProjectTaskInventoryEOController extends JeroController<ProjectTaskInventoryEO, IProjectTaskInventoryEOService> {
+	@Autowired
+	private IProjectTaskInventoryEOService projectTaskInventoryEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectTaskInventoryEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "项目库-任务清单表-分页列表查询")
+	@ApiOperation(value="项目库-任务清单表-分页列表查询", notes="项目库-任务清单表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectTaskInventoryEO projectTaskInventoryEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectTaskInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectTaskInventoryEO, req.getParameterMap());
+		Page<ProjectTaskInventoryEO> page = new Page<ProjectTaskInventoryEO>(pageNo, pageSize);
+		IPage<ProjectTaskInventoryEO> pageList = projectTaskInventoryEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-任务清单表-列表查询")
+    @ApiOperation(value="项目库-任务清单表-列表查询", notes="项目库-任务清单表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectTaskInventoryEO>> queryList(ProjectTaskInventoryEO projectTaskInventoryEO,HttpServletRequest req) {
+        List<ProjectTaskInventoryEO> list = projectTaskInventoryEOService.queryList(projectTaskInventoryEO,req);
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectTaskInventoryEO
+	 * @return
+	 */
+	@AutoLog(value = "项目库-任务清单表-添加")
+	@ApiOperation(value="项目库-任务清单表-添加", notes="项目库-任务清单表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectTaskInventoryEO projectTaskInventoryEO) {
+		projectTaskInventoryEOService.add(projectTaskInventoryEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectTaskInventoryEO
+	 * @return
+	 */
+	@AutoLog(value = "项目库-任务清单表-编辑")
+	@ApiOperation(value="项目库-任务清单表-编辑", notes="项目库-任务清单表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectTaskInventoryEO projectTaskInventoryEO) {
+		projectTaskInventoryEOService.editById(projectTaskInventoryEO);
+		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) {
+		projectTaskInventoryEOService.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.projectTaskInventoryEOService.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) {
+		ProjectTaskInventoryEO projectTaskInventoryEO = projectTaskInventoryEOService.queryById(id);
+		if(projectTaskInventoryEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectTaskInventoryEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectTaskInventoryEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectTaskInventoryEO projectTaskInventoryEO) {
+        return super.exportXls(request, projectTaskInventoryEO, ProjectTaskInventoryEO.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, ProjectTaskInventoryEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java

@@ -0,0 +1,123 @@
+package com.jero.modules.project.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-04-29
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_task_inventory_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_task_inventory_detail对象", description="项目库-任务清单明细表")
+public class ProjectTaskInventoryDetailEO 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 projectTaskInventoryId;
+
+	/**待办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 actiProcInstId;
+
+	/**状态：待办 、已办*/
+	@Excel(name = "状态：待办 、已办", width = 15)
+    @ApiModelProperty(value = "状态：待办 、已办")
+    private java.lang.String status;
+
+	/**设计符合性、验证符合性、prehomo确认流程*/
+	@Excel(name = "设计符合性、验证符合性、prehomo确认流程", width = 15)
+    @ApiModelProperty(value = "设计符合性、验证符合性、prehomo确认流程")
+    private java.lang.String flowType;
+
+	/**办理人id*/
+	@Excel(name = "办理人id", width = 15)
+    @ApiModelProperty(value = "办理人id")
+    private java.lang.String userId;
+
+	/**表单数据   json*/
+	@Excel(name = "表单数据   json", width = 15)
+    private transient java.lang.String formDataString;
+
+    private byte[] formData;
+
+    public byte[] getFormData(){
+        if(formDataString==null){
+            return null;
+        }
+        try {
+            return formDataString.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String getFormDataString(){
+        if(formData==null || formData.length==0){
+            return "";
+        }
+        try {
+            return new String(formData,"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java

@@ -0,0 +1,197 @@
+package com.jero.modules.project.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.util.Date;
+
+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 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-04-29
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_task_inventory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_task_inventory对象", description="项目库-任务清单表")
+public class ProjectTaskInventoryEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private 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 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 String sysOrgCode;
+
+	/**法规清单id*/
+	@Excel(name = "法规清单id", width = 15)
+    @ApiModelProperty(value = "法规清单id")
+    private String projectLawsInventoryId;
+
+	/**设计符合性流程状态*/
+	@Excel(name = "设计符合性流程状态", width = 15)
+    @ApiModelProperty(value = "设计符合性流程状态")
+    private String designStatus;
+
+	/**设计符合性流程 流程实例id*/
+	@Excel(name = "设计符合性流程 流程实例id", width = 15)
+    @ApiModelProperty(value = "设计符合性流程 流程实例id")
+    private String designPId;
+
+	/**prehomo确认流程状态*/
+	@Excel(name = "prehomo确认流程状态", width = 15)
+    @ApiModelProperty(value = "prehomo确认流程状态")
+    private String prehomoStatus;
+
+	/**prehomo流程 流程实例id*/
+	@Excel(name = "prehomo流程 流程实例id", width = 15)
+    @ApiModelProperty(value = "prehomo流程 流程实例id")
+    private String prehomoPId;
+
+	/**验证符合性流程状态*/
+	@Excel(name = "验证符合性流程状态", width = 15)
+    @ApiModelProperty(value = "验证符合性流程状态")
+    private String verifyStatus;
+
+	/**验证符合性流程 流程实例id*/
+	@Excel(name = "验证符合性流程 流程实例id", width = 15)
+    @ApiModelProperty(value = "验证符合性流程 流程实例id")
+    private String verifyPId;
+
+	/**认证进度*/
+	@Excel(name = "认证进度", width = 15)
+    @ApiModelProperty(value = "认证进度")
+    private String certificationProgress;
+
+	/**项目状态评估*/
+	@Excel(name = "项目状态评估", width = 15)
+    @ApiModelProperty(value = "项目状态评估")
+    private String projectStatusAssess;
+
+	/**项目库id**/
+	@TableField(exist = false)
+	private String projectLibraryId;
+
+    /**编号**/
+    @TableField(exist = false)
+    private String serialNumber;
+
+    /**标题**/
+    @TableField(exist = false)
+    private String title;
+
+    /**责任领域**/
+    @TableField(exist = false)
+    private String dutyTerritory;
+
+	/**设计符合性 待办id**/
+    @TableField(exist = false)
+    private String designTaskId;
+
+    /**设计符合性 待办状态  0待办 1已办**/
+    @TableField(exist = false)
+    private String designTaskStatus;
+
+    /**设计符合性 截止时间**/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "设计符合性确认-截止时间")
+    @TableField(exist = false)
+    private Date designDueDate;
+
+    /**验证符合性 待办id**/
+    @TableField(exist = false)
+    private String verifyTaskId;
+
+    /**验证符合性 待办状态  0待办 1已办**/
+    @TableField(exist = false)
+    private String verifyTaskStatus;
+
+    /**验证符合性 截止时间**/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "验证符合性-截止时间")
+    @TableField(exist = false)
+    private Date verifyDueDate;
+
+
+    /**prehomo确认 待办id**/
+    @TableField(exist = false)
+    private String prehomoTaskId;
+
+    /**prehomo确认 待办状态  0待办 1已办**/
+    @TableField(exist = false)
+    private String prehomoTaskStatus;
+
+    /**prehomo确认 截止时间**/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "prehomo确认-截止时间")
+    @TableField(exist = false)
+    private Date prehomoDueDate;
+
+    /** 展示标识  1展示 **/
+    @TableField(exist = false)
+    private String showFlag;
+
+    /**法规工程师id**/
+    @TableField(exist = false)
+    private String regulationOwnerId;
+
+    /**认证工程师id**/
+    @TableField(exist = false)
+    private String homologationEngineerId;
+
+    /**角色编码**/
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**角色名称**/
+    @TableField(exist = false)
+    private String roleName;
+
+    /**中英文切换**/
+    @TableField(exist = false)
+    private String cut;
+}

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

@@ -0,0 +1,47 @@
+package com.jero.modules.project.enums;
+
+/**
+ * 任务状态枚举类
+ */
+public enum TaskStatusEnum {
+
+    NOT_DONE("待办","NotDone"), // 未完成
+    HAVE_DONE("已办","haveDone"), // 已完成
+    SHOW_FLAG("展示数据","showData") // 展示数据
+    ;
+
+
+    String name;
+    String value;
+
+    private TaskStatusEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value) {
+        TaskStatusEnum[] values = values();
+        for (TaskStatusEnum taskStatusEnum : values) {
+            if (taskStatusEnum.value.equals(value)) {
+                return taskStatusEnum.name;
+            }
+        }
+        return null;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryDetailEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.project.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 项目库-任务清单明细表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+public interface ProjectTaskInventoryDetailEOMapper extends BaseMapper<ProjectTaskInventoryDetailEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.project.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 项目库-任务清单表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+public interface ProjectTaskInventoryEOMapper extends BaseMapper<ProjectTaskInventoryEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryDetailEOMapper.xml

@@ -0,0 +1,19 @@
+<?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.project.mapper.ProjectTaskInventoryDetailEOMapper">
+    <resultMap id="ProjectTaskInventoryDetailEOResultMap" type="com.jero.modules.project.entity.ProjectTaskInventoryDetailEO">
+        <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_task_inventory_id" property="projectTaskInventoryId" />
+        <result column="task_id" property="taskId" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+        <result column="status" property="status" />
+        <result column="flow_type" property="flowType" />
+        <result column="user_id" property="userId" />
+        <result column="form_data" property="formData" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.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.project.mapper.ProjectTaskInventoryEOMapper">
+    <resultMap id="ProjectTaskInventoryEOResultMap" type="com.jero.modules.project.entity.ProjectTaskInventoryEO">
+        <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_laws_inventory_id" property="projectLawsInventoryId" />
+        <result column="design_status" property="designStatus" />
+        <result column="design_p_id" property="designPId" />
+        <result column="prehomo_status" property="prehomoStatus" />
+        <result column="prehomo_p_id" property="prehomoPId" />
+        <result column="verify_status" property="verifyStatus" />
+        <result column="verify_p_id" property="verifyPId" />
+        <result column="certification_progress" property="certificationProgress" />
+        <result column="project_status_assess" property="projectStatusAssess" />
+    </resultMap>
+</mapper>

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

@@ -0,0 +1,61 @@
+package com.jero.modules.project.service;
+
+import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 项目库-任务清单明细表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+public interface IProjectTaskInventoryDetailEOService extends IService<ProjectTaskInventoryDetailEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectTaskInventoryDetailEO
+	 * @return
+	 */
+    void add(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectTaskInventoryDetailEO
+	 * @return
+	 */
+    void editById(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectTaskInventoryDetailEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectTaskInventoryDetailEO> queryList();
+}

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

@@ -0,0 +1,63 @@
+package com.jero.modules.project.service;
+
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Description: 项目库-任务清单表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+public interface IProjectTaskInventoryEOService extends IService<ProjectTaskInventoryEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectTaskInventoryEO
+	 * @return
+	 */
+    void add(ProjectTaskInventoryEO projectTaskInventoryEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectTaskInventoryEO
+	 * @return
+	 */
+    void editById(ProjectTaskInventoryEO projectTaskInventoryEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectTaskInventoryEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectTaskInventoryEO> queryList(ProjectTaskInventoryEO projectTaskInventoryEO, HttpServletRequest req);
+}

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

@@ -1097,6 +1097,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String id = jsonObject.getString("id"); //法规清单id
 		String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id
 		String taskAffirmDueDate = jsonObject.getString("taskAffirmDueDate"); //截止日期
+		String serialNumber = jsonObject.getString("serialNumber"); //编号
 		String projectLibraryId = jsonObject.getString("projectLibraryId"); //项目库id
 		String engineeringInterfacePerson = jsonObject.getString("engineeringInterfacePerson"); //工程接口人id
 
@@ -1115,23 +1116,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " initiated the regulation list confirmation of " + projectNameInfoEO.getProjectName()
-					+ " (project name).The due date is：" +taskAffirmDueDate+ ". Please check and deal with it in time.";
+					+ " (project name).The due date is：" +taskAffirmDueDate+ " Please check and deal with it in time.";
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
 			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
 			userIdList.add(dreUserId);
-			//暂时没有英文消息模板。
-			msgContentEN = sysUser.getUsername() + " 将 " + projectNameInfoEO.getProjectName()
-					+ " (project name).的任务确认流程分发您，截止日期为：" +taskAffirmDueDate+ ". Please check and deal with it in time.";
+			msgContentEN = sysUser.getUsername() + " has distributed the regulation task confirmation of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
+					+ " (project name).to you. the due date is " +taskAffirmDueDate+ " Please check and handle it in time.";
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
-			//暂时没有英文消息模板。
-			msgContentEN = sysUser.getUsername() + " 将 " + projectNameInfoEO.getProjectName()
-					+ " (project name).的任务确认流程退回，截止日期为：" +taskAffirmDueDate+ ". Please check and deal with it in time.";
+			msgContentEN = sysUser.getUsername() + " has returned the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ " (project name).the due date is " +taskAffirmDueDate+ " Please check and handle it in time.";
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
-			//暂时没有英文消息模板。
-			msgContentEN = sysUser.getUsername() + " 将 " + projectNameInfoEO.getProjectName()
-					+ " (project name).的任务确认流程通过，截止日期为：" +taskAffirmDueDate+ ". Please check and deal with it in time.";
+			msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ " (project name).the due date is " +taskAffirmDueDate+ " Please check and handle it in time.";
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){

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

@@ -0,0 +1,89 @@
+package com.jero.modules.project.service.impl;
+
+import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
+import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper;
+import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 项目库-任务清单明细表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+@Service
+public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<ProjectTaskInventoryDetailEOMapper, ProjectTaskInventoryDetailEO> implements IProjectTaskInventoryDetailEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectTaskInventoryDetailEO
+	 * @return
+	 */
+	@Override
+    public void add(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) {
+        Date now = new Date();
+        projectTaskInventoryDetailEO.setCreateTime(now);
+        projectTaskInventoryDetailEO.setUpdateTime(now);
+        save(projectTaskInventoryDetailEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param projectTaskInventoryDetailEO
+	 * @return
+	 */
+	@Override
+    public void editById(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) {
+    	Date now = new Date();
+        projectTaskInventoryDetailEO.setUpdateTime(now);
+    	saveOrUpdate(projectTaskInventoryDetailEO);
+    }
+
+	/**
+	 * 通过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 ProjectTaskInventoryDetailEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ProjectTaskInventoryDetailEO> queryList() {
+        return list();
+    }
+}

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

@@ -0,0 +1,308 @@
+package com.jero.modules.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
+import com.jero.modules.project.enums.ProjectRoleEnum;
+import com.jero.modules.project.enums.TaskAffirmStatusEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
+import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
+import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
+import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper;
+import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper;
+import com.jero.modules.project.service.IProjectTaskInventoryEOService;
+import com.jero.modules.wkflow.enums.FlowTypeEnum;
+import org.apache.commons.collections4.CollectionUtils;
+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.ArrayList;
+import java.util.List;
+import java.util.Date;
+import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 项目库-任务清单表
+ * @Author: jero-boot
+ * @Date:   2022-04-29
+ * @Version: V1.0
+ */
+@Service
+public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskInventoryEOMapper, ProjectTaskInventoryEO> implements IProjectTaskInventoryEOService {
+
+	@Autowired
+	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
+
+	@Autowired
+	private ProjectLawsInventoryEOMapper projectLawsInventoryEOMapper;
+
+	@Autowired
+	private ProjectTaskInventoryDetailEOMapper projectTaskInventoryDetailEOMapper;
+
+
+	/**
+	 * 保存
+	 *
+	 * @param projectTaskInventoryEO
+	 * @return
+	 */
+	@Override
+    public void add(ProjectTaskInventoryEO projectTaskInventoryEO) {
+        Date now = new Date();
+        projectTaskInventoryEO.setCreateTime(now);
+        projectTaskInventoryEO.setUpdateTime(now);
+        save(projectTaskInventoryEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param projectTaskInventoryEO
+	 * @return
+	 */
+	@Override
+    public void editById(ProjectTaskInventoryEO projectTaskInventoryEO) {
+    	Date now = new Date();
+        projectTaskInventoryEO.setUpdateTime(now);
+    	saveOrUpdate(projectTaskInventoryEO);
+    }
+
+	/**
+	 * 通过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 ProjectTaskInventoryEO queryById(String id) {
+        return getById(id);
+    }
+
+	/**
+	 * 列表查询
+	 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
+	 * 法规工程师 / 认证工程师： 查询跟自己有关系的数据 ， 包含自己待办、已办
+	 * 其他人：查询自己待办、已办数据。
+	 *
+	 * @param projectTaskInventoryEO
+	 * @param req
+	 * @return
+	 */
+	@Override
+    public List<ProjectTaskInventoryEO> queryList(ProjectTaskInventoryEO projectTaskInventoryEO, HttpServletRequest req) {
+		List<ProjectTaskInventoryEO> result = new ArrayList<>();
+
+		String projectLibraryId = projectTaskInventoryEO.getProjectLibraryId();
+
+		if(StringUtils.isEmpty(projectLibraryId)){
+			throw new JeroBootException("项目库id不能为空！");
+		}
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
+		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
+		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
+
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+			List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
+			QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
+			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryIdList);
+			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = this.baseMapper.selectList(taskInventoryQueryWrapper);
+
+			//验证当前用户在该项目中是什么角色
+			int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId());
+
+			QueryWrapper<ProjectTaskInventoryDetailEO> taskDetailQueryWrapper = new QueryWrapper<>();
+			taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectLawsInventoryIdList);
+			List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList = this.projectTaskInventoryDetailEOMapper.selectList(taskDetailQueryWrapper);
+
+			if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList) && CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){
+				projectLawsInventoryEOList.forEach(projectLawsInventory -> {
+					projectTaskInventoryEOList.forEach(projectTaskInventory -> {
+						if(StringUtils.equals(projectLawsInventory.getId(),projectTaskInventory.getProjectLawsInventoryId())){
+							projectTaskInventory.setRegulationOwnerId(StringUtils.isNotEmpty(projectLawsInventory.getRegulationOwnerId()) ? projectLawsInventory.getRegulationOwnerId() : "");
+							projectTaskInventory.setHomologationEngineerId(StringUtils.isNotEmpty(projectLawsInventory.getHomologationEngineerId()) ? projectLawsInventory.getHomologationEngineerId() : "");
+							projectTaskInventory.setSerialNumber(StringUtils.isNotEmpty(projectLawsInventory.getSerialNumber()) ? projectLawsInventory.getSerialNumber() : "");
+							projectTaskInventory.setTitle(StringUtils.isNotEmpty(projectLawsInventory.getTitle()) ? projectLawsInventory.getTitle() : "");
+							projectTaskInventory.setDutyTerritory(StringUtils.isNotEmpty(projectLawsInventory.getDutyTerritory()) ? projectLawsInventory.getDutyTerritory() : "");
+							projectTaskInventory.setDesignDueDate(projectLawsInventory.getDesignDueDate());
+							projectTaskInventory.setVerifyDueDate(projectLawsInventory.getVerifyDueDate());
+							projectTaskInventory.setPrehomoDueDate(projectLawsInventory.getPrehomoDueDate());
+						}
+					});
+				});
+
+				result = createTaskInventoryEOList(projectTaskInventoryEOList,projectTaskInventoryDetailEOList,isProjectRole,currentUser);
+			}
+		}
+
+		return result;
+    }
+
+	/**
+	 * 创建任务清单列表数据
+	 * @param projectTaskInventoryEOList
+	 * @param projectTaskInventoryDetailEOList
+	 * @param isProjectRole
+	 * @param currentUser
+	 * @return
+	 */
+    public List<ProjectTaskInventoryEO> createTaskInventoryEOList(List<ProjectTaskInventoryEO> projectTaskInventoryEOList,
+																  List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList,
+																  Integer isProjectRole,
+																  LoginUser currentUser)
+	{
+		List<ProjectTaskInventoryEO> result = new ArrayList<>();
+		for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOList) {
+			//流程实例id
+			String actiProcInstId = "";
+
+			String roleCode = "";
+			//是否是这条数据的法规工程师
+			boolean isRegulationOwner = StringUtils.equals(projectTaskInventoryEO.getRegulationOwnerId(),currentUser.getId());
+			//是否是这条数据的认证工程师
+			boolean isHomologationEngineer = StringUtils.equals(projectTaskInventoryEO.getHomologationEngineerId(),currentUser.getId());
+			//是否是studio
+			boolean isStudio = StringUtils.equals(ProjectRoleEnum.STUDIO_ENGINEER.getValue(),String.valueOf(isProjectRole));
+			if(isRegulationOwner){
+				roleCode = ProjectRoleEnum.REGULATI_ENGINEER.getValue();
+			}
+			if(isHomologationEngineer){
+				roleCode = ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue();
+			}
+			if(isRegulationOwner && isHomologationEngineer){
+				roleCode = ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue();
+			}
+
+			projectTaskInventoryEO.setRoleCode(roleCode);
+
+			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) {
+				if(StringUtils.equals(projectTaskInventoryEO.getProjectLawsInventoryId(),projectTaskInventoryDetailEO.getProjectTaskInventoryId())){
+					/**
+					 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
+					 * 法规工程师 / 认证工程师： 查询跟自己有关系的数据 ， 包含自己待办、已办
+					 * 其他人：查询自己待办、已办数据。
+					 */
+					if(isStudio || (isRegulationOwner || isHomologationEngineer)){
+						actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
+						if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
+							projectTaskInventoryEO.setDesignPId(actiProcInstId);
+							projectTaskInventoryEO.setDesignTaskId(projectTaskInventoryDetailEO.getTaskId());
+							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
+								projectTaskInventoryEO.setDesignTaskStatus(projectTaskInventoryDetailEO.getStatus());
+							}else {
+								projectTaskInventoryEO.setDesignTaskStatus(TaskStatusEnum.SHOW_FLAG.getValue());
+							}
+						}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
+							projectTaskInventoryEO.setPrehomoPId(actiProcInstId);
+							projectTaskInventoryEO.setPrehomoTaskId(projectTaskInventoryDetailEO.getTaskId());
+
+							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
+								projectTaskInventoryEO.setPrehomoTaskStatus(projectTaskInventoryDetailEO.getStatus());
+							}else {
+								projectTaskInventoryEO.setPrehomoTaskStatus(TaskStatusEnum.SHOW_FLAG.getValue());
+							}
+						}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
+							projectTaskInventoryEO.setVerifyPId(actiProcInstId);
+							projectTaskInventoryEO.setVerifyTaskId(projectTaskInventoryDetailEO.getTaskId());
+
+							if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
+								projectTaskInventoryEO.setVerifyTaskStatus(projectTaskInventoryDetailEO.getStatus());
+							}else {
+								projectTaskInventoryEO.setVerifyTaskStatus(TaskStatusEnum.SHOW_FLAG.getValue());
+							}
+						}
+					}else {
+						if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
+							actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
+							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
+								projectTaskInventoryEO.setDesignPId(actiProcInstId);
+								projectTaskInventoryEO.setDesignTaskId(projectTaskInventoryDetailEO.getTaskId());
+								projectTaskInventoryEO.setDesignTaskStatus(projectTaskInventoryDetailEO.getStatus());
+							}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
+								projectTaskInventoryEO.setPrehomoPId(actiProcInstId);
+								projectTaskInventoryEO.setPrehomoTaskId(projectTaskInventoryDetailEO.getTaskId());
+								projectTaskInventoryEO.setPrehomoTaskStatus(projectTaskInventoryDetailEO.getStatus());
+							}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
+								projectTaskInventoryEO.setVerifyPId(actiProcInstId);
+								projectTaskInventoryEO.setVerifyTaskId(projectTaskInventoryDetailEO.getTaskId());
+								projectTaskInventoryEO.setVerifyTaskStatus(projectTaskInventoryDetailEO.getStatus());
+							}
+							projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
+						}
+					}
+				}
+			}
+
+			if(StringUtils.isNotEmpty(actiProcInstId) && (isRegulationOwner || isHomologationEngineer || isStudio)){
+				projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
+			}
+
+			result.add(projectTaskInventoryEO);
+		}
+
+		if(CollectionUtils.isNotEmpty(result)){
+			result = result.stream().filter(e -> (StringUtils.equals(e.getShowFlag(),TaskStatusEnum.SHOW_FLAG.getValue()))).collect(Collectors.toList());
+		}
+		return result;
+	}
+
+	/**
+	 * 验证用户在该项目中的角色
+	 * @param projectLibraryId 	项目库id
+	 * @param currentUserId	 	登录人id
+	 * @return
+	 */
+	public int checkUserRole(String projectLibraryId,String currentUserId){
+		int result = -1;
+		try{
+			QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>();
+			projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLibraryId);
+			projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer,currentUserId);
+			Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
+			if(projectLibrayBaseCount > 0){
+				result = Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
+			}
+		}catch (Exception ex){
+			log.error("验证用户在该项目中的角色失败：" + ex.getMessage());
+			throw new JeroBootException("验证用户在该项目中的角色失败！");
+		}
+		return result;
+	}
+}

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

@@ -6,6 +6,9 @@ package com.jero.modules.wkflow.enums;
 public enum FlowTypeEnum {
 
     RWQRLC("1","任务确认流程","RWQRLC","任务确认流程","rwqrlc"),
+    SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxsclc"),
+    PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc"),
+    YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc"),
     ;
 
     private String value;