diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java new file mode 100644 index 00000000..b9609d4a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java @@ -0,0 +1,109 @@ +package com.jero.modules.activiti.process.esAbolish.controller; + +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.process.common.entity.TransferVO; +import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; +import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + + +/** + * @author: Mzaxd + * @Date: 2023/10/18 10:44 + */ +@Slf4j +@RestController +@Api(tags = "企标废止发起流程") +@RequestMapping("/process/es/abolish") +public class ESAbolishController { + + @Resource + private ProcessEsAbolishService abolishService; + + @Resource + private ActFlowCommonService actFlowCommonService; + + /** + * 新增立项变更申请 + * + * @param abolishData + */ + @AutoLog(value = "企标废止发起流程-发起流程") + @ApiOperation(value="企标废止发起流程-发起流程", notes="企标废止发起流程-发起流程") + @PostMapping("/start") + public Result startProcess(@RequestBody ESAbolishDataVO abolishData) { + abolishService.startProcess(abolishData); + return Result.OK(); + } + + /** + * 保存到待办 + * @param abolishData + */ + @AutoLog(value = "企标废止发起流程-保存") + @ApiOperation(value="企标废止发起流程-保存", notes="企标废止发起流程-保存") + @PostMapping("/save") + public Result save(@RequestBody ESAbolishDataVO abolishData) { + abolishService.saveToDraft(abolishData); + return Result.OK(); + } + + /** + * 保存到待办 + * @param taskId + */ + @AutoLog(value = "企标废止发起流程-办理") + @ApiOperation(value="企标废止发起流程-办理", notes="企标废止发起流程-办理") + @GetMapping("/handle/{taskId}") + @Translation + public Result handle(@PathVariable("taskId") String taskId) { + return Result.OK(abolishService.getHandleData(taskId)); + } + + /** + * 同意 + * + * @param abolishData + */ + @AutoLog(value = "企标废止发起流程-同意") + @ApiOperation(value="企标废止发起流程-同意", notes="企标废止发起流程-同意") + @PostMapping("/agree") + public Result agree(@RequestBody ESAbolishDataVO abolishData) { + abolishService.approvalInitChange(abolishData, true); + return Result.OK(); + } + + /** + * 驳回 + * + * @param abolishData + */ + @AutoLog(value = "企标废止发起流程-驳回") + @ApiOperation(value="企标废止发起流程-驳回", notes="企标废止发起流程-驳回") + @PostMapping("/reject") + public Result reject(@RequestBody ESAbolishDataVO abolishData) { + abolishService.approvalInitChange(abolishData, false); + return Result.OK(); + } + + /** + * 转办 + * + */ + @AutoLog(value = "企标废止发起流程-转办") + @ApiOperation(value="企标废止发起流程-转办", notes="企标废止发起流程-转办") + @PostMapping(value = "/transfer") + public Result transfer(@RequestBody TransferVO transferVO) { + actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + return Result.OK(); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishDataVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishDataVO.java index 05aa705c..9c48281e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishDataVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishDataVO.java @@ -18,8 +18,8 @@ public class ESAbolishDataVO { @JsonProperty("common") CommonVO common; - @JsonProperty("dataList") - List dataList; + @JsonProperty("data") + ProcessEsAbolish data; @JsonProperty("flowUser") ESAbolishFlowUserVO flowUser; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java index de22d018..8bb6d5dd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esAbolish.service; import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; /** * @author ThinkBook @@ -10,4 +11,11 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ProcessEsAbolishService extends IService { + void startProcess(ESAbolishDataVO annualInitData); + + void saveToDraft(ESAbolishDataVO annualInitData); + + ProcessEsAbolish getHandleData(String taskId); + + void approvalInitChange(ESAbolishDataVO annualInitData, boolean pass); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java index 34ed827e..aa4d8705 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esAbolish.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish; +import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService; import com.jero.modules.activiti.process.esAbolish.mapper.ProcessEsAbolishMapper; import lombok.extern.slf4j.Slf4j; @@ -20,6 +21,25 @@ import org.springframework.transaction.annotation.Transactional; public class ProcessEsAbolishServiceImpl extends ServiceImpl implements ProcessEsAbolishService{ + @Override + public void startProcess(ESAbolishDataVO annualInitData) { + + } + + @Override + public void saveToDraft(ESAbolishDataVO annualInitData) { + + } + + @Override + public ProcessEsAbolish getHandleData(String taskId) { + return null; + } + + @Override + public void approvalInitChange(ESAbolishDataVO annualInitData, boolean pass) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java new file mode 100644 index 00000000..bfedc6fe --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java @@ -0,0 +1,109 @@ +package com.jero.modules.activiti.process.esArchive.controller; + +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.process.common.entity.TransferVO; +import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; +import com.jero.modules.activiti.process.esArchive.service.ProcessEsArchiveService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + + +/** + * @author: Mzaxd + * @Date: 2023/10/18 10:44 + */ +@Slf4j +@RestController +@Api(tags = "企标封存发起流程") +@RequestMapping("/process/es/archive") +public class ESArchiveController { + + @Resource + private ProcessEsArchiveService archiveService; + + @Resource + private ActFlowCommonService actFlowCommonService; + + /** + * 新增立项变更申请 + * + * @param archiveData + */ + @AutoLog(value = "企标封存发起流程-发起流程") + @ApiOperation(value="企标封存发起流程-发起流程", notes="企标封存发起流程-发起流程") + @PostMapping("/start") + public Result startProcess(@RequestBody ESArchiveDataVO archiveData) { + archiveService.startProcess(archiveData); + return Result.OK(); + } + + /** + * 保存到待办 + * @param archiveData + */ + @AutoLog(value = "企标封存发起流程-保存") + @ApiOperation(value="企标封存发起流程-保存", notes="企标封存发起流程-保存") + @PostMapping("/save") + public Result save(@RequestBody ESArchiveDataVO archiveData) { + archiveService.saveToDraft(archiveData); + return Result.OK(); + } + + /** + * 保存到待办 + * @param taskId + */ + @AutoLog(value = "企标封存发起流程-办理") + @ApiOperation(value="企标封存发起流程-办理", notes="企标封存发起流程-办理") + @GetMapping("/handle/{taskId}") + @Translation + public Result handle(@PathVariable("taskId") String taskId) { + return Result.OK(archiveService.getHandleData(taskId)); + } + + /** + * 同意 + * + * @param archiveData + */ + @AutoLog(value = "企标封存发起流程-同意") + @ApiOperation(value="企标封存发起流程-同意", notes="企标封存发起流程-同意") + @PostMapping("/agree") + public Result agree(@RequestBody ESArchiveDataVO archiveData) { + archiveService.approvalInitChange(archiveData, true); + return Result.OK(); + } + + /** + * 驳回 + * + * @param archiveData + */ + @AutoLog(value = "企标封存发起流程-驳回") + @ApiOperation(value="企标封存发起流程-驳回", notes="企标封存发起流程-驳回") + @PostMapping("/reject") + public Result reject(@RequestBody ESArchiveDataVO archiveData) { + archiveService.approvalInitChange(archiveData, false); + return Result.OK(); + } + + /** + * 转办 + * + */ + @AutoLog(value = "企标封存发起流程-转办") + @ApiOperation(value="企标封存发起流程-转办", notes="企标封存发起流程-转办") + @PostMapping(value = "/transfer") + public Result transfer(@RequestBody TransferVO transferVO) { + actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + return Result.OK(); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/vo/ESArchiveDataVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/vo/ESArchiveDataVO.java index dd63f851..822941e4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/vo/ESArchiveDataVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/vo/ESArchiveDataVO.java @@ -18,8 +18,8 @@ public class ESArchiveDataVO { @JsonProperty("common") CommonVO common; - @JsonProperty("dataList") - List dataList; + @JsonProperty("data") + ProcessEsArchive data; @JsonProperty("flowUser") ESArchiveFlowUserVO flowUser; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java index 23500eb2..7f09c7cf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esArchive.service; import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; /** * @author ThinkBook @@ -10,4 +11,11 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ProcessEsArchiveService extends IService { + void startProcess(ESArchiveDataVO annualInitData); + + void saveToDraft(ESArchiveDataVO archiveData); + + ProcessEsArchive getHandleData(String taskId); + + void approvalInitChange(ESArchiveDataVO archiveData, boolean pass); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java index 88ec0de7..6a98ed39 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esArchive.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive; +import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.esArchive.service.ProcessEsArchiveService; import com.jero.modules.activiti.process.esArchive.mapper.ProcessEsArchiveMapper; import lombok.extern.slf4j.Slf4j; @@ -20,6 +21,25 @@ import org.springframework.transaction.annotation.Transactional; public class ProcessEsArchiveServiceImpl extends ServiceImpl implements ProcessEsArchiveService{ + @Override + public void startProcess(ESArchiveDataVO annualInitData) { + + } + + @Override + public void saveToDraft(ESArchiveDataVO archiveData) { + + } + + @Override + public ProcessEsArchive getHandleData(String taskId) { + return null; + } + + @Override + public void approvalInitChange(ESArchiveDataVO archiveData, boolean pass) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java new file mode 100644 index 00000000..8e9ccdbf --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java @@ -0,0 +1,109 @@ +package com.jero.modules.activiti.process.esChange.controller; + +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.process.common.entity.TransferVO; +import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esChange.entity.vo.ESChangeDataVO; +import com.jero.modules.activiti.process.esChange.service.ProcessEsChangeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + + +/** + * @author: Mzaxd + * @Date: 2023/10/18 10:44 + */ +@Slf4j +@RestController +@Api(tags = "企标变更发起流程") +@RequestMapping("/process/es/change") +public class ESChangeController { + + @Resource + private ProcessEsChangeService changeService; + + @Resource + private ActFlowCommonService actFlowCommonService; + + /** + * 新增立项变更申请 + * + * @param changeData + */ + @AutoLog(value = "企标变更发起流程-发起流程") + @ApiOperation(value="企标变更发起流程-发起流程", notes="企标变更发起流程-发起流程") + @PostMapping("/start") + public Result startProcess(@RequestBody ESChangeDataVO changeData) { + changeService.startProcess(changeData); + return Result.OK(); + } + + /** + * 保存到待办 + * @param changeData + */ + @AutoLog(value = "企标变更发起流程-保存") + @ApiOperation(value="企标变更发起流程-保存", notes="企标变更发起流程-保存") + @PostMapping("/save") + public Result save(@RequestBody ESChangeDataVO changeData) { + changeService.saveToDraft(changeData); + return Result.OK(); + } + + /** + * 保存到待办 + * @param taskId + */ + @AutoLog(value = "企标变更发起流程-办理") + @ApiOperation(value="企标变更发起流程-办理", notes="企标变更发起流程-办理") + @GetMapping("/handle/{taskId}") + @Translation + public Result handle(@PathVariable("taskId") String taskId) { + return Result.OK(changeService.getHandleData(taskId)); + } + + /** + * 同意 + * + * @param changeData + */ + @AutoLog(value = "企标变更发起流程-同意") + @ApiOperation(value="企标变更发起流程-同意", notes="企标变更发起流程-同意") + @PostMapping("/agree") + public Result agree(@RequestBody ESChangeDataVO changeData) { + changeService.approvalInitChange(changeData, true); + return Result.OK(); + } + + /** + * 驳回 + * + * @param changeData + */ + @AutoLog(value = "企标变更发起流程-驳回") + @ApiOperation(value="企标变更发起流程-驳回", notes="企标变更发起流程-驳回") + @PostMapping("/reject") + public Result reject(@RequestBody ESChangeDataVO changeData) { + changeService.approvalInitChange(changeData, false); + return Result.OK(); + } + + /** + * 转办 + * + */ + @AutoLog(value = "企标变更发起流程-转办") + @ApiOperation(value="企标变更发起流程-转办", notes="企标变更发起流程-转办") + @PostMapping(value = "/transfer") + public Result transfer(@RequestBody TransferVO transferVO) { + actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + return Result.OK(); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/vo/ESChangeDataVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/vo/ESChangeDataVO.java index e80acf62..e3e9f151 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/vo/ESChangeDataVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/vo/ESChangeDataVO.java @@ -19,8 +19,8 @@ public class ESChangeDataVO { @JsonProperty("common") CommonVO commonVO; - @JsonProperty("dataList") - List dataList; + @JsonProperty("data") + ProcessEsRecheck data; @JsonProperty("flowUser") ESRecheckFlowUserVO flowUser; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/ProcessEsChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/ProcessEsChangeService.java index 4b8ff2b7..cbe2cd9f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/ProcessEsChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/ProcessEsChangeService.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esChange.service; import com.jero.modules.activiti.process.esChange.entity.ProcessEsChange; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.activiti.process.esChange.entity.vo.ESChangeDataVO; /** * @author ThinkBook @@ -10,4 +11,11 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ProcessEsChangeService extends IService { + void startProcess(ESChangeDataVO changeData); + + void saveToDraft(ESChangeDataVO changeData); + + ProcessEsChange getHandleData(String taskId); + + void approvalInitChange(ESChangeDataVO changeData, boolean pass); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java index 7ed3ffe6..22f1031e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esChange.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.esChange.entity.ProcessEsChange; +import com.jero.modules.activiti.process.esChange.entity.vo.ESChangeDataVO; import com.jero.modules.activiti.process.esChange.service.ProcessEsChangeService; import com.jero.modules.activiti.process.esChange.mapper.ProcessEsChangeMapper; import lombok.extern.slf4j.Slf4j; @@ -20,6 +21,25 @@ import org.springframework.transaction.annotation.Transactional; public class ProcessEsChangeServiceImpl extends ServiceImpl implements ProcessEsChangeService{ + @Override + public void startProcess(ESChangeDataVO changeData) { + + } + + @Override + public void saveToDraft(ESChangeDataVO changeData) { + + } + + @Override + public ProcessEsChange getHandleData(String taskId) { + return null; + } + + @Override + public void approvalInitChange(ESChangeDataVO changeData, boolean pass) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java new file mode 100644 index 00000000..845d885a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java @@ -0,0 +1,109 @@ +package com.jero.modules.activiti.process.esEnable.controller; + +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.process.common.entity.TransferVO; +import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esEnable.entity.vo.ESEnableDataVO; +import com.jero.modules.activiti.process.esEnable.service.ProcessEsEnableService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + + +/** + * @author: Mzaxd + * @Date: 2023/10/18 10:44 + */ +@Slf4j +@RestController +@Api(tags = "企标启用发起流程") +@RequestMapping("/process/es/enable") +public class ESEnableController { + + @Resource + private ProcessEsEnableService enableService; + + @Resource + private ActFlowCommonService actFlowCommonService; + + /** + * 新增立项变更申请 + * + * @param enableData + */ + @AutoLog(value = "企标启用发起流程-发起流程") + @ApiOperation(value="企标启用发起流程-发起流程", notes="企标启用发起流程-发起流程") + @PostMapping("/start") + public Result startProcess(@RequestBody ESEnableDataVO enableData) { + enableService.startProcess(enableData); + return Result.OK(); + } + + /** + * 保存到待办 + * @param enableData + */ + @AutoLog(value = "企标启用发起流程-保存") + @ApiOperation(value="企标启用发起流程-保存", notes="企标启用发起流程-保存") + @PostMapping("/save") + public Result save(@RequestBody ESEnableDataVO enableData) { + enableService.saveToDraft(enableData); + return Result.OK(); + } + + /** + * 保存到待办 + * @param taskId + */ + @AutoLog(value = "企标启用发起流程-办理") + @ApiOperation(value="企标启用发起流程-办理", notes="企标启用发起流程-办理") + @GetMapping("/handle/{taskId}") + @Translation + public Result handle(@PathVariable("taskId") String taskId) { + return Result.OK(enableService.getHandleData(taskId)); + } + + /** + * 同意 + * + * @param enableData + */ + @AutoLog(value = "企标启用发起流程-同意") + @ApiOperation(value="企标启用发起流程-同意", notes="企标启用发起流程-同意") + @PostMapping("/agree") + public Result agree(@RequestBody ESEnableDataVO enableData) { + enableService.approvalInitChange(enableData, true); + return Result.OK(); + } + + /** + * 驳回 + * + * @param enableData + */ + @AutoLog(value = "企标启用发起流程-驳回") + @ApiOperation(value="企标启用发起流程-驳回", notes="企标启用发起流程-驳回") + @PostMapping("/reject") + public Result reject(@RequestBody ESEnableDataVO enableData) { + enableService.approvalInitChange(enableData, false); + return Result.OK(); + } + + /** + * 转办 + * + */ + @AutoLog(value = "企标启用发起流程-转办") + @ApiOperation(value="企标启用发起流程-转办", notes="企标启用发起流程-转办") + @PostMapping(value = "/transfer") + public Result transfer(@RequestBody TransferVO transferVO) { + actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + return Result.OK(); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/vo/ESEnableDataVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/vo/ESEnableDataVO.java index 10eb9e06..0d0868f9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/vo/ESEnableDataVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/vo/ESEnableDataVO.java @@ -16,10 +16,10 @@ import java.util.List; public class ESEnableDataVO { @JsonProperty("common") - CommonVO commonVO; + CommonVO common; - @JsonProperty("dataList") - List dataList; + @JsonProperty("data") + ProcessEsEnable data; @JsonProperty("flowUser") ESEnableFlowUserVO flowUser; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java index 82b7743c..4921cb49 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esEnable.service; import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.activiti.process.esEnable.entity.vo.ESEnableDataVO; /** * @author ThinkBook @@ -10,4 +11,12 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ProcessEsEnableService extends IService { + void startProcess(ESEnableDataVO enableData); + + void saveToDraft(ESEnableDataVO enableData); + + ProcessEsEnable getHandleData(String taskId); + + void approvalInitChange(ESEnableDataVO enableData, boolean pass); + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java index 6c631dc0..8bf6794a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esEnable.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable; +import com.jero.modules.activiti.process.esEnable.entity.vo.ESEnableDataVO; import com.jero.modules.activiti.process.esEnable.service.ProcessEsEnableService; import com.jero.modules.activiti.process.esEnable.mapper.ProcessEsEnableMapper; import lombok.extern.slf4j.Slf4j; @@ -20,6 +21,25 @@ import org.springframework.transaction.annotation.Transactional; public class ProcessEsEnableServiceImpl extends ServiceImpl implements ProcessEsEnableService{ + @Override + public void startProcess(ESEnableDataVO enableData) { + + } + + @Override + public void saveToDraft(ESEnableDataVO enableData) { + + } + + @Override + public ProcessEsEnable getHandleData(String taskId) { + return null; + } + + @Override + public void approvalInitChange(ESEnableDataVO enableData, boolean pass) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java new file mode 100644 index 00000000..45b30f98 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java @@ -0,0 +1,109 @@ +package com.jero.modules.activiti.process.esRecheck.controller; + +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.process.common.entity.TransferVO; +import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO; +import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + + +/** + * @author: Mzaxd + * @Date: 2023/10/18 10:44 + */ +@Slf4j +@RestController +@Api(tags = "企标复审发起流程") +@RequestMapping("/process/es/recheck") +public class ESRecheckController { + + @Resource + private ProcessEsRecheckService recheckService; + + @Resource + private ActFlowCommonService actFlowCommonService; + + /** + * 新增立项变更申请 + * + * @param recheckData + */ + @AutoLog(value = "企标复审发起流程-发起流程") + @ApiOperation(value="企标复审发起流程-发起流程", notes="企标复审发起流程-发起流程") + @PostMapping("/start") + public Result startProcess(@RequestBody ESRecheckDataVO recheckData) { + recheckService.startProcess(recheckData); + return Result.OK(); + } + + /** + * 保存到待办 + * @param recheckData + */ + @AutoLog(value = "企标复审发起流程-保存") + @ApiOperation(value="企标复审发起流程-保存", notes="企标复审发起流程-保存") + @PostMapping("/save") + public Result save(@RequestBody ESRecheckDataVO recheckData) { + recheckService.saveToDraft(recheckData); + return Result.OK(); + } + + /** + * 保存到待办 + * @param taskId + */ + @AutoLog(value = "企标复审发起流程-办理") + @ApiOperation(value="企标复审发起流程-办理", notes="企标复审发起流程-办理") + @GetMapping("/handle/{taskId}") + @Translation + public Result handle(@PathVariable("taskId") String taskId) { + return Result.OK(recheckService.getHandleData(taskId)); + } + + /** + * 同意 + * + * @param recheckData + */ + @AutoLog(value = "企标复审发起流程-同意") + @ApiOperation(value="企标复审发起流程-同意", notes="企标复审发起流程-同意") + @PostMapping("/agree") + public Result agree(@RequestBody ESRecheckDataVO recheckData) { + recheckService.approvalInitChange(recheckData, true); + return Result.OK(); + } + + /** + * 驳回 + * + * @param recheckData + */ + @AutoLog(value = "企标复审发起流程-驳回") + @ApiOperation(value="企标复审发起流程-驳回", notes="企标复审发起流程-驳回") + @PostMapping("/reject") + public Result reject(@RequestBody ESRecheckDataVO recheckData) { + recheckService.approvalInitChange(recheckData, false); + return Result.OK(); + } + + /** + * 转办 + * + */ + @AutoLog(value = "企标复审发起流程-转办") + @ApiOperation(value="企标复审发起流程-转办", notes="企标复审发起流程-转办") + @PostMapping(value = "/transfer") + public Result transfer(@RequestBody TransferVO transferVO) { + actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + return Result.OK(); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/vo/ESRecheckDataVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/vo/ESRecheckDataVO.java index 91115c8f..696dcbe9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/vo/ESRecheckDataVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/vo/ESRecheckDataVO.java @@ -18,7 +18,7 @@ public class ESRecheckDataVO { CommonVO common; @JsonProperty("dataList") - List dataList; + List data; @JsonProperty("flowUser") ESRecheckFlowUserVO flowUser; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java index 26f20fbd..fd59297f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esRecheck.service; import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO; /** * @author ThinkBook @@ -10,4 +11,11 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ProcessEsRecheckService extends IService { + void startProcess(ESRecheckDataVO recheckData); + + void saveToDraft(ESRecheckDataVO recheckData); + + ProcessEsRecheck getHandleData(String taskId); + + void approvalInitChange(ESRecheckDataVO recheckData, boolean pass); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java index 63c7315f..66143097 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esRecheck.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck; +import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO; import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService; import com.jero.modules.activiti.process.esRecheck.mapper.ProcessEsRecheckMapper; import lombok.extern.slf4j.Slf4j; @@ -20,6 +21,25 @@ import org.springframework.transaction.annotation.Transactional; public class ProcessEsRecheckServiceImpl extends ServiceImpl implements ProcessEsRecheckService{ + @Override + public void startProcess(ESRecheckDataVO recheckData) { + + } + + @Override + public void saveToDraft(ESRecheckDataVO recheckData) { + + } + + @Override + public ProcessEsRecheck getHandleData(String taskId) { + return null; + } + + @Override + public void approvalInitChange(ESRecheckDataVO recheckData, boolean pass) { + + } }