From 89b85525b41330d5e094987a2c8cda97bbfc731c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 15 Jan 2024 18:14:35 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=E5=9F=BA=E7=A1=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/ProcessProjectStandardCommon.java | 9 + .../ProcessProjectStandardController.java | 109 ++++++++++++ .../entity/ProcessProjectStandard.java | 101 +++++++++++ .../entity/ProcessProjectStandardTerm.java | 135 +++++++++++++++ .../ProcessProjectStandardTermUser.java | 162 ++++++++++++++++++ .../ProcessProjectStandardAutoListener.java | 19 ++ .../mapper/ProcessProjectStandardMapper.java | 11 ++ .../ProcessProjectStandardTermMapper.java | 12 ++ .../ProcessProjectStandardTermUserMapper.java | 12 ++ .../xml/ProcessProjectStandardMapper.xml | 23 +++ .../xml/ProcessProjectStandardTermMapper.xml | 30 ++++ .../ProcessProjectStandardTermUserMapper.xml | 33 ++++ .../ProcessProjectStandardService.java | 106 ++++++++++++ .../ProcessProjectStandardTermService.java | 17 ++ ...ProcessProjectStandardTermUserService.java | 17 ++ .../vo/ProcessProjectStandardVO.java | 26 +++ .../vo/StandardSelectionVO.java | 48 ++++++ .../laws/common/mapper/LawsCommonMapper.java | 3 + .../common/mapper/xml/LawsCommonMapper.xml | 46 +++++ .../entity/LawsSpecialProjectLibrary.java | 10 +- 20 files changed, 925 insertions(+), 4 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/listener/ProcessProjectStandardAutoListener.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermUserMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/StandardSelectionVO.java diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java new file mode 100644 index 00000000..0b55d473 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java @@ -0,0 +1,9 @@ +package com.jero.modules.activiti.process.projectstandard.common; + +/** + * @author liJiaRao + * @date 2024-01-15 17:25 + */ +public class ProcessProjectStandardCommon { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java new file mode 100644 index 00000000..cfbbad75 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java @@ -0,0 +1,109 @@ +package com.jero.modules.activiti.process.projectstandard.controller; + +import com.jero.common.aspect.annotation.DictPoint; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; +import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardService; + +import javax.servlet.http.HttpServletRequest; + +import com.jero.modules.activiti.process.projectstandard.vo.ProcessProjectStandardVO; +import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.web.bind.annotation.*; +import com.jero.common.api.vo.Result; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.validation.annotation.Validated; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + +import javax.annotation.Resource; + +/** + * 法规合规评估流程表(process_project_standard)表控制层 + * + * @author xxxxx + */ +@Slf4j +@Api(tags = "法规合规评估流程表") +@RestController +@RequestMapping("ProcessProjectStandard") +public class ProcessProjectStandardController extends JeroController { + /** + * 服务对象 + */ + @Resource + private ProcessProjectStandardService processProjectStandardService; + + + @DictPoint + @GetMapping("/queryProcessInfoVO") + @AutoLog(value = "未符合项跟踪流程-查询流程信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "draftId", value = "草稿id"), + @ApiImplicitParam(name = "taskId", value = "任务id"), + @ApiImplicitParam(name = "processInstanceId", value = "流程实例id") + }) + @ApiOperation("未符合项跟踪流程-查询流程信息") + public Result> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { + ProcessInfoVO processInfoVO = processProjectStandardService.queryProcessInfoVO(draftId, processInstanceId, taskId); + return Result.OK(processInfoVO); + } + + @AutoLog(value = "未符合项跟踪流程-发起流程") + @ApiOperation(value = "未符合项跟踪流程-发起流程") + @PostMapping(value = "/startProcess") + public Result startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processProjectStandardService.startProcess(processInfoVO); + return Result.OK(); + } + + @AutoLog(value = "未符合项跟踪流程-同意") + @ApiOperation(value = "未符合项跟踪流程-同意") + @PostMapping("/agree") + public Result agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processProjectStandardService.approveTask(processInfoVO, true); + return Result.OK(); + } + + @AutoLog(value = "未符合项跟踪流程-驳回") + @ApiOperation(value = "未符合项跟踪流程-驳回") + @PostMapping("/reject") + public Result reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processProjectStandardService.approveTask(processInfoVO, false); + return Result.OK(); + } + + @AutoLog(value = "未符合项跟踪流程-提交") + @ApiOperation(value = "未符合项跟踪流程-提交") + @PostMapping("/submit") + public Result submit(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processProjectStandardService.submit(processInfoVO); + return Result.OK(); + } + + @AutoLog(value = "未符合项跟踪流程-保存为草稿") + @ApiOperation(value = "未符合项跟踪流程-保存为草稿") + @PostMapping(value = "/saveToDraft") + public Result saveToDraft(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processProjectStandardService.saveToDraft(processInfoVO); + return Result.OK(); + } + + @ApiOperation(value="查询标准列表") + @GetMapping(value = "/quaryStandard") + public Result> quaryStandard(ManyStandardSelectionBoxVO selectionBoxVO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + return Result.OK(processProjectStandardService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize)); + } + + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java new file mode 100644 index 00000000..a93c0daf --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java @@ -0,0 +1,101 @@ +package com.jero.modules.activiti.process.projectstandard.entity; + +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 com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.List; + +import lombok.Data; + +/** + * + *@author liJiaRao + *@date 2024-01-15 16:18 + */ + +/** + * 法规合规评估流程表 + */ +@ApiModel(description = "法规合规评估流程表") +@Data +@TableName(value = "process_project_standard") +public class ProcessProjectStandard { + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键ID") + private String id; + + /** + * 创建人 + */ + @TableField(value = "create_by") + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(value = "create_time") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "update_by") + @ApiModelProperty(value = "更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 所属部门 + */ + @TableField(value = "org_code") + @ApiModelProperty(value = "所属部门") + private String orgCode; + + /** + * 0表示未删除,1表示删除 + */ + @TableField(value = "del_flag") + @ApiModelProperty(value = "0表示未删除,1表示删除") + private Integer delFlag; + + /** + * 来源(1-国内、2-海外) + */ + @TableField(value = "`source`") + @ApiModelProperty(value = "来源(1-国内、2-海外)") + private String source; + + /** + * 标准编号 + */ + @TableField(value = "standard_number") + @ApiModelProperty(value = "标准编号") + private String standardNumber; + + /** + * 分解单来源 + */ + @TableField(value = "decomposition_order_Source") + @ApiModelProperty(value = "分解单来源") + private String decompositionOrderSource; + + @TableField(exist = false) + @ApiModelProperty(value = "分解单来源列表") + private List decompositionOrderSourceVOList; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java new file mode 100644 index 00000000..13cb8d08 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java @@ -0,0 +1,135 @@ +package com.jero.modules.activiti.process.projectstandard.entity; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * + *@author liJiaRao + *@date 2024-01-15 16:27 + */ +/** + * 法规合规评估流程关联条款 + */ +@ApiModel(description="法规合规评估流程关联条款") +@Data +@TableName(value = "process_project_standard_term") +public class ProcessProjectStandardTerm { + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value="主键ID") + private String id; + + /** + * 创建人 + */ + @TableField(value = "create_by") + @ApiModelProperty(value="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(value = "create_time") + @ApiModelProperty(value="创建时间") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "update_by") + @ApiModelProperty(value="更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + @ApiModelProperty(value="更新时间") + private Date updateTime; + + /** + * 所属部门 + */ + @TableField(value = "org_code") + @ApiModelProperty(value="所属部门") + private String orgCode; + + /** + * 0表示未删除,1表示删除 + */ + @TableField(value = "del_flag") + @ApiModelProperty(value="0表示未删除,1表示删除") + private Integer delFlag; + + /** + * 评估流程id + */ + @TableField(value = "process_id") + @ApiModelProperty(value="评估流程id") + private String processId; + + /** + * 标准id + */ + @TableField(value = "standard_id") + @ApiModelProperty(value="标准id") + private String standardId; + + /** + * 条款号 + */ + @TableField(value = "term_number") + @ApiModelProperty(value="条款号") + private String termNumber; + + /** + * 条款名称 + */ + @TableField(value = "term_name") + @ApiModelProperty(value="条款名称") + private String termName; + + /** + * 条款内容 + */ + @TableField(value = "term_text") + @ApiModelProperty(value="条款内容") + private String termText; + + /** + * 拆分单id + */ + @TableField(value = "split_info_id") + @ApiModelProperty(value="拆分单id") + private String splitInfoId; + + /** + * 是否立项 + */ + @TableField(value = "project_approval_flag") + @ApiModelProperty(value="是否立项") + private Integer projectApprovalFlag; + + /** + * 设计工程师 + */ + @TableField(value = "design_engineer") + @ApiModelProperty(value="设计工程师") + private String designEngineer; + + /** + * 抄送人员 + */ + @TableField(value = "carbon_copy_personnels") + @ApiModelProperty(value="抄送人员") + private String carbonCopyPersonnels; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java new file mode 100644 index 00000000..04d5a0e1 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java @@ -0,0 +1,162 @@ +package com.jero.modules.activiti.process.projectstandard.entity; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * + *@author liJiaRao + *@date 2024-01-15 16:27 + */ +/** + * 法规合规评估流程关联条款关联用户 + */ +@ApiModel(description="法规合规评估流程关联条款关联用户") +@Data +@TableName(value = "process_project_standard_term_user") +public class ProcessProjectStandardTermUser { + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value="主键ID") + private String id; + + /** + * 创建人 + */ + @TableField(value = "create_by") + @ApiModelProperty(value="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(value = "create_time") + @ApiModelProperty(value="创建时间") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "update_by") + @ApiModelProperty(value="更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + @ApiModelProperty(value="更新时间") + private Date updateTime; + + /** + * 所属部门 + */ + @TableField(value = "org_code") + @ApiModelProperty(value="所属部门") + private String orgCode; + + /** + * 0表示未删除,1表示删除 + */ + @TableField(value = "del_flag") + @ApiModelProperty(value="0表示未删除,1表示删除") + private Integer delFlag; + + /** + * 评估流程id + */ + @TableField(value = "process_id") + @ApiModelProperty(value="评估流程id") + private String processId; + + /** + * 关联条款表id + */ + @TableField(value = "term_id") + @ApiModelProperty(value="关联条款表id") + private String termId; + + /** + * 责任单位负责人id + */ + @TableField(value = "responsible_unit_leader") + @ApiModelProperty(value="责任单位负责人id") + private String responsibleUnitLeader; + + /** + * 责任单位 + */ + @TableField(value = "responsible_unit") + @ApiModelProperty(value="责任单位") + private String responsibleUnit; + + /** + * 模块负责人id + */ + @TableField(value = "module_owner") + @ApiModelProperty(value="模块负责人id") + private String moduleOwner; + + /** + * 不涉及原因 + */ + @TableField(value = "not_involved") + @ApiModelProperty(value="不涉及原因") + private String notInvolved; + + /** + * 设计工程师 + */ + @TableField(value = "design_engineer") + @ApiModelProperty(value="设计工程师") + private String designEngineer; + + /** + * 父执行实例流id + */ + @TableField(value = "parent_execution_id") + @ApiModelProperty(value="父执行实例流id") + private String parentExecutionId; + + /** + * 车型系列 + */ + @TableField(value = "model_series") + @ApiModelProperty(value="车型系列") + private String modelSeries; + /** + * 车型系列 + */ + @TableField(exist = false) + @ApiModelProperty(value="车型系列") + private String modelSeries_dict; + + /** + * 依据描述 + */ + @TableField(value = "description") + @ApiModelProperty(value="依据描述") + private String description; + + /** + * 佐证材料 + */ + @TableField(value = "file_id") + @ApiModelProperty(value="佐证材料") + private String fileId; + + /** + * 是否立项 + */ + @TableField(value = "project_approval_flag") + @ApiModelProperty(value="是否立项") + private Integer projectApprovalFlag; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/listener/ProcessProjectStandardAutoListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/listener/ProcessProjectStandardAutoListener.java new file mode 100644 index 00000000..7e4c9f65 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/listener/ProcessProjectStandardAutoListener.java @@ -0,0 +1,19 @@ +package com.jero.modules.activiti.process.projectstandard.listener; + +import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessService; +import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardService; +import com.jero.modules.activiti.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +/** + * @author liJiaRao + * @date 2023-10-13 16:43 + */ +public class ProcessProjectStandardAutoListener implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + ProcessProjectStandardService processProjectAssessService = SpringContextUtil.getBean(ProcessProjectStandardService.class); + processProjectAssessService.autoComplete(delegateTask); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardMapper.java new file mode 100644 index 00000000..a246b2ae --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardMapper.java @@ -0,0 +1,11 @@ +package com.jero.modules.activiti.process.projectstandard.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; + +/** + * @author liJiaRao + * @date 2024-01-15 16:18 + */ +public interface ProcessProjectStandardMapper extends BaseMapper { +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java new file mode 100644 index 00000000..989882d8 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java @@ -0,0 +1,12 @@ +package com.jero.modules.activiti.process.projectstandard.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; + +/** + * + *@author liJiaRao + *@date 2024-01-15 16:27 + */ +public interface ProcessProjectStandardTermMapper extends BaseMapper { +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermUserMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermUserMapper.java new file mode 100644 index 00000000..f0396a13 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermUserMapper.java @@ -0,0 +1,12 @@ +package com.jero.modules.activiti.process.projectstandard.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; + +/** + * + *@author liJiaRao + *@date 2024-01-15 16:27 + */ +public interface ProcessProjectStandardTermUserMapper extends BaseMapper { +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml new file mode 100644 index 00000000..25614f43 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + id, create_by, create_time, update_by, update_time, org_code, del_flag, `source`, + standard_number, decomposition_order_Source + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml new file mode 100644 index 00000000..6a43b626 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id, create_by, create_time, update_by, update_time, org_code, del_flag, process_id, + standard_id, term_number, term_name, term_text, split_info_id, project_approval_flag, + design_engineer, carbon_copy_personnels + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml new file mode 100644 index 00000000..2ecaef8c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, create_by, create_time, update_by, update_time, org_code, del_flag, process_id, + term_id, responsible_unit_leader, responsible_unit, module_owner, not_involved, design_engineer, + parent_execution_id, model_series, description, file_id, project_approval_flag + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java new file mode 100644 index 00000000..159119c6 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -0,0 +1,106 @@ +package com.jero.modules.activiti.process.projectstandard.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.DictModel; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; +import com.jero.modules.activiti.process.projectstandard.vo.ProcessProjectStandardVO; +import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO; +import com.jero.modules.laws.common.mapper.LawsCommonMapper; +import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; +import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO; +import com.jero.modules.split.entity.SarFileSplitInfoEO; +import com.jero.modules.split.service.ISarFileSplitInfoService; +import org.activiti.engine.delegate.DelegateTask; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; +import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardMapper; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * + *@author liJiaRao + *@date 2024-01-15 16:17 + */ +@Service +public class ProcessProjectStandardService extends ServiceImpl { + @Resource + private ILawsCommonService lawsCommonService; + @Resource + private LawsCommonMapper lawsCommonMapper; + @Resource + private ISarFileSplitInfoService sarFileSplitInfoService; + @Resource + private ISysBaseAPI sysBaseAPI; + + + + public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { + return null; + } + + public void saveToDraft(ProcessInfoVO processInfoVO) { + + } + + public void startProcess(ProcessInfoVO processInfoVO) { + } + + public void approveTask(ProcessInfoVO processInfoVO, boolean b) { + } + + public void submit(ProcessInfoVO processInfoVO) { + } + + public IPage getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize) { + Page page = new Page<>(pageNo, pageSize); + IPage standardSelectionVO = lawsCommonMapper.getStandardSelectionVO(page,selectionBoxVO); + this.assignment(standardSelectionVO.getRecords()); + return standardSelectionVO; + } + + public void assignment(List records) { + List dictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source"); + for (StandardSelectionVO assess : records) { + String standardId = assess.getId(); + String source = assess.getSource(); + + // 查询标准拆分表 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 标准id + queryWrapper.eq(SarFileSplitInfoEO::getStandardId, standardId); + // 拆分表发布标识 + queryWrapper.isNotNull(SarFileSplitInfoEO::getPublishBeforeId); + // 文件字段标识 + queryWrapper.isNotNull(SarFileSplitInfoEO::getFileType); + List sarFileSplitInfoEOList = sarFileSplitInfoService.list(queryWrapper); + + Map flagMap = new HashMap<>(); + ListmapList = new ArrayList<>(); + sarFileSplitInfoEOList.forEach(e -> flagMap.put(e.getFileType(), e.getId())); + for (DictModel dictModel : dictModels) { + String text = dictModel.getText(); + String value = dictModel.getValue(); + DecompositionOrderSourceVO decompositionOrderSourceVO = new DecompositionOrderSourceVO(); + decompositionOrderSourceVO.setText(text); + decompositionOrderSourceVO.setValue(value); + decompositionOrderSourceVO.setSarFileSplitInfoId(flagMap.get(value)); + mapList.add(decompositionOrderSourceVO); + } + assess.setDecompositionOrderSourceVOList(mapList); + } + } + + public void autoComplete(DelegateTask delegateTask) { + + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermService.java new file mode 100644 index 00000000..2f6dfdad --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermService.java @@ -0,0 +1,17 @@ +package com.jero.modules.activiti.process.projectstandard.service; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; +import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardTermMapper; +/** + * + *@author liJiaRao + *@date 2024-01-15 16:27 + */ +@Service +public class ProcessProjectStandardTermService extends ServiceImpl { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java new file mode 100644 index 00000000..91264299 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java @@ -0,0 +1,17 @@ +package com.jero.modules.activiti.process.projectstandard.service; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; +import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardTermUserMapper; +/** + * + *@author liJiaRao + *@date 2024-01-15 16:27 + */ +@Service +public class ProcessProjectStandardTermUserService extends ServiceImpl { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java new file mode 100644 index 00000000..d36235c5 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java @@ -0,0 +1,26 @@ +package com.jero.modules.activiti.process.projectstandard.vo; + +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author liJiaRao + * @date 2024-01-15 16:24 + */ +@Data +public class ProcessProjectStandardVO { + /**业务基本信息*/ + @ApiModelProperty(value = "业务基本信息") + private ProcessProjectStandard processProjectStandard; + /**关联条款列表*/ + @ApiModelProperty(value = "关联条款列表") + private List processProjectStandardTermList; + /**关联标准分派列表*/ + @ApiModelProperty(value = "关联标准分派列表") + private List processProjectStandardTermUserList; +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/StandardSelectionVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/StandardSelectionVO.java new file mode 100644 index 00000000..72725321 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/StandardSelectionVO.java @@ -0,0 +1,48 @@ +package com.jero.modules.activiti.process.projectstandard.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.List; + +/** + * @Author: liao + * @Date: 2023/9/11 15:52 + * @Description: 多选标准弹框 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +public class StandardSelectionVO { + @ApiModelProperty(value = "来源（1国标、2外标）") + private String source; + @ApiModelProperty(value = "主键ID") + private String id; + @ApiModelProperty(value = "标准编号") + private String standardNumber; + @ApiModelProperty(value = "标准名称") + private String standardName; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "发布日期") + private java.util.Date releaseDate; + @ApiModelProperty(value = "标准状态") + @Dict(dicCode = "standard_state") + private String standardState; + @ApiModelProperty(value = "在产车实施日期") + private String onTheProductionDate; + @ApiModelProperty(value = "新车型实施日期") + private String newModelImplementationDate; + @ApiModelProperty(value = "分解单来源列表") + private List decompositionOrderSourceVOList; + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java index 8445813a..50cda0ed 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.common.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; import com.jero.modules.tag.entity.LawsTag; @@ -92,4 +93,6 @@ public interface LawsCommonMapper { **/ ManyStandardSelectionBox getSingleStandard(@Param("standardNumber") String standardNumber, @Param("id") String id); + + IPage getStandardSelectionVO(Page page, @Param("vo") ManyStandardSelectionBoxVO selectionBoxVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml index cb8c91df..efc4f2b6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml @@ -134,4 +134,50 @@ + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java index 04472c4f..684fa767 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsSpecialProjectLibrary.java @@ -5,6 +5,7 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -85,10 +86,11 @@ public class LawsSpecialProjectLibrary implements Serializable { @Excel(name = "标准状态(1-草案、2-征求意见稿、3-送审稿、4-报批稿、5-发布稿、5-修改单)", width = 15) @ApiModelProperty(value = "标准状态(1-草案、2-征求意见稿、3-送审稿、4-报批稿、5-发布稿、5-修改单)") private String standardState; - /**车型(字典)*/ - @Excel(name = "车型(字典)", width = 15) - @ApiModelProperty(value = "车型(字典)") - private String vehicleModel; + /**车型系列*/ + @Excel(name = "车型系列", width = 15, dicCode = "model_series") + @Dict(dicCode = "model_series") + @ApiModelProperty(value = "车型系列") + private String modelSeries; /**合规评估结果*/ @Excel(name = "合规评估结果", width = 15) @ApiModelProperty(value = "合规评估结果")