From 9576a62f01bf465c95dbe7476e2ae2c600457d24 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 29 Apr 2022 18:27:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E3=80=81=E4=BB=BB=E5=8A=A1=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E3=80=82=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E5=8F=91=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rojectTaskInventoryDetailEOController.java | 170 ++++++++++ .../ProjectTaskInventoryEOController.java | 170 ++++++++++ .../entity/ProjectTaskInventoryDetailEO.java | 123 +++++++ .../entity/ProjectTaskInventoryEO.java | 197 +++++++++++ .../modules/project/enums/TaskStatusEnum.java | 47 +++ .../ProjectTaskInventoryDetailEOMapper.java | 17 + .../mapper/ProjectTaskInventoryEOMapper.java | 17 + .../ProjectTaskInventoryDetailEOMapper.xml | 19 ++ .../xml/ProjectTaskInventoryEOMapper.xml | 21 ++ .../IProjectTaskInventoryDetailEOService.java | 61 ++++ .../IProjectTaskInventoryEOService.java | 63 ++++ .../ProjectLawsInventoryEOServiceImpl.java | 18 +- ...ojectTaskInventoryDetailEOServiceImpl.java | 89 +++++ .../ProjectTaskInventoryEOServiceImpl.java | 308 ++++++++++++++++++ .../modules/wkflow/enums/FlowTypeEnum.java | 3 + 15 files changed, 1313 insertions(+), 10 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TaskStatusEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryDetailEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryDetailEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java new file mode 100644 index 000000000..ddfecd6f2 --- /dev/null +++ b/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 { + @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 queryWrapper = QueryGenerator.initQueryWrapper(projectTaskInventoryDetailEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectTaskInventoryDetailEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "项目库-任务清单明细表-列表查询") + @ApiOperation(value="项目库-任务清单明细表-列表查询", notes="项目库-任务清单明细表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List 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); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java new file mode 100644 index 000000000..875529992 --- /dev/null +++ b/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 { + @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 queryWrapper = QueryGenerator.initQueryWrapper(projectTaskInventoryEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectTaskInventoryEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "项目库-任务清单表-列表查询") + @ApiOperation(value="项目库-任务清单表-列表查询", notes="项目库-任务清单表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(ProjectTaskInventoryEO projectTaskInventoryEO,HttpServletRequest req) { + List 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); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java new file mode 100644 index 000000000..f6befb6bf --- /dev/null +++ b/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 ""; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java new file mode 100644 index 000000000..7a9e4f42f --- /dev/null +++ b/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; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TaskStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TaskStatusEnum.java new file mode 100644 index 000000000..01b203fdd --- /dev/null +++ b/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; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryDetailEOMapper.java new file mode 100644 index 000000000..7fddb4323 --- /dev/null +++ b/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 { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java new file mode 100644 index 000000000..bb5c79abc --- /dev/null +++ b/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 { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryDetailEOMapper.xml new file mode 100644 index 000000000..482e7c396 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryDetailEOMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml new file mode 100644 index 000000000..822f453be --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java new file mode 100644 index 000000000..536a4d686 --- /dev/null +++ b/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 { + + /** + * 保存 + * + * @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 ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectTaskInventoryDetailEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java new file mode 100644 index 000000000..2cc6fbef1 --- /dev/null +++ b/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 { + + /** + * 保存 + * + * @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 ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectTaskInventoryEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(ProjectTaskInventoryEO projectTaskInventoryEO, HttpServletRequest req); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 4cb328adf..8b3ca0ec4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/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 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 ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProjectTaskInventoryDetailEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java new file mode 100644 index 000000000..c0abe9436 --- /dev/null +++ b/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 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 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 queryList(ProjectTaskInventoryEO projectTaskInventoryEO, HttpServletRequest req) { + List result = new ArrayList<>(); + + String projectLibraryId = projectTaskInventoryEO.getProjectLibraryId(); + + if(StringUtils.isEmpty(projectLibraryId)){ + throw new JeroBootException("项目库id不能为空！"); + } + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + QueryWrapper 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 projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); + + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + List projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); + QueryWrapper taskInventoryQueryWrapper = new QueryWrapper<>(); + taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryIdList); + List projectTaskInventoryEOList = this.baseMapper.selectList(taskInventoryQueryWrapper); + + //验证当前用户在该项目中是什么角色 + int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId()); + + QueryWrapper taskDetailQueryWrapper = new QueryWrapper<>(); + taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectLawsInventoryIdList); + List 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 createTaskInventoryEOList(List projectTaskInventoryEOList, + List projectTaskInventoryDetailEOList, + Integer isProjectRole, + LoginUser currentUser) + { + List 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 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; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java index 47cf4edc6..11413e829 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java +++ b/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;