diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java index 58c2cb0d..4ac74c68 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -462,12 +462,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl replaceCodeList = Arrays.asList(lawsAsmsDomestic.getReplaceCode().split(";")); - replaceCodeList.forEach(replaceCode -> { - lawsReplacedStandardService.addRelation(replaceCode, lawsAsmsDomestic.getCode(), 1); - }); - } + lawsReplacedStandardService.addRelation(lawsAsmsDomestic.getReplaceCode(), lawsAsmsDomestic.getCode(), 1); // 标准性质 itemValues = getItemValues(lawsAsmsDomestic.getStandardNature(), "1695010513489833985", sysDictItemList); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java index c70480d4..3d6cbdc2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java @@ -14,7 +14,7 @@ public enum ProcessType { ES_INIT_CHANGE("企标立项/变更计划", "1", "es-init-change", "processEsInitChangeServiceImpl"), ES_ANNUAL_REPORT("年度制修订-各部门主动上报", "2", "es-annual-report", "processEsAnnualReportServiceImpl"), ES_ANNUAL_INIT("年度制修订-标准化部门主动发起", "3", "es-annual-init", "processEsAnnualInitServiceImpl"), - + FB_ENTRY_CHANGE("标准法规入库/变更流程", "4", "fb-entry-change", "ProcessFbEntryChangeServiceImpl"), ; private final String name; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java index 30957407..400ec294 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java @@ -1,7 +1,13 @@ package com.jero.modules.activiti.process.fb.controller; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.modules.activiti.process.esChange.entity.vo.ESChangeDataVO; import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; +import com.jero.modules.activiti.process.fb.vo.FbEntryChangeVO; +import com.jero.modules.laws.common.constant.ResultCommon; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +21,7 @@ import io.swagger.annotations.Api; * @Date: 2023-11-01 * @Version: V1.0 */ -@Api(tags="标准法规入库/变更流程") +@Api(tags="标准法规入库_变更流程") @RestController @RequestMapping("/process/fb/processFbEntryChange") @Slf4j @@ -23,4 +29,12 @@ public class ProcessFbEntryChangeController extends JeroController startProcess(@RequestBody FbEntryChangeVO fbEntryChangeVO) { + processFbEntryChangeService.startProcess(fbEntryChangeVO); + return Result.OK(ResultCommon.OK); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java index c349dfbf..af518444 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java @@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; @TableName("process_fb_entry_change") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_fb_entry_change对象", description="标准法规入库/变更流程") +@ApiModel(value="process_fb_entry_change对象", description="标准法规入库_变更流程") public class ProcessFbEntryChange implements Serializable { private static final long serialVersionUID = 1L; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java index 65d5d805..d933dff2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.fb.service; import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.activiti.process.fb.vo.FbEntryChangeVO; /** * @Description: 标准法规入库/变更流程 @@ -11,4 +12,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IProcessFbEntryChangeService extends IService { + /** + * @Author: liao + * @Date: 2023/11/1 17:23 + * @Description: 发起流程 + **/ + void startProcess(FbEntryChangeVO fbEntryChangeVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 0384b154..036225a3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.fb.service.impl; import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; import com.jero.modules.activiti.process.fb.mapper.ProcessFbEntryChangeMapper; import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; +import com.jero.modules.activiti.process.fb.vo.FbEntryChangeVO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,4 +22,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Slf4j public class ProcessFbEntryChangeServiceImpl extends ServiceImpl implements IProcessFbEntryChangeService { + /** + * @Author: liao + * @Date: 2023/11/1 17:23 + * @Description: 发起流程 + **/ + @Override + public void startProcess(FbEntryChangeVO fbEntryChangeVO) { + + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/FbEntryChangeUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/FbEntryChangeUserVO.java new file mode 100644 index 00000000..45c20b7f --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/FbEntryChangeUserVO.java @@ -0,0 +1,28 @@ +package com.jero.modules.activiti.process.fb.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Author: liao + * @Date: 2023/11/1 17:16 + * @Description: 标准法规入库_变更流程_人员信息 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="标准法规入库_变更流程_人员信息", description="标准法规入库_变更流程_人员信息") +public class FbEntryChangeUserVO { + + /**法规工程师-发起*/ + @ApiModelProperty(value = "法规工程师-发起") + private java.lang.String engineerId; + + /**法规工程师主管级领导-审批*/ + @ApiModelProperty(value = "法规工程师主管级领导-审批") + private java.lang.String leaderId; + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/FbEntryChangeVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/FbEntryChangeVO.java new file mode 100644 index 00000000..2d2e1c20 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/FbEntryChangeVO.java @@ -0,0 +1,34 @@ +package com.jero.modules.activiti.process.fb.vo; + +import com.jero.modules.activiti.process.common.entity.CommonVO; +import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Author: liao + * @Date: 2023/11/1 17:11 + * @Description: 标准法规入库_变更流程VO类 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="标准法规入库_变更流程VO类", description="标准法规入库_变更流程VO类") +public class FbEntryChangeVO { + + /**流程通用信息*/ + @ApiModelProperty(value = "流程通用信息") + private CommonVO common; + + /**业务信息*/ + @ApiModelProperty(value = "业务信息") + private ProcessFbEntryChange data; + + /**人员信息*/ + @ApiModelProperty(value = "人员信息") + private FbEntryChangeUserVO flowUser; + +} diff --git a/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn b/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn index db66837a..51cb37a5 100644 --- a/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn +++ b/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn @@ -1,6 +1,6 @@ - + Flow_0p6jmej