From 0ff959525d87541273d3e22a100bf1717f2d7170 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 24 Dec 2024 08:28:34 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=94=80=E5=81=87=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/xjgl/XjglController.java | 15 ++++++++++ .../home/dal/mysql/xjgl/XjglMapper.java | 28 ++++++++++++++++++- .../module/home/service/xjgl/XjglService.java | 9 ++++++ .../home/service/xjgl/XjglServiceImpl.java | 18 +++++++++++- 4 files changed, 68 insertions(+), 2 deletions(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/xjgl/XjglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/xjgl/XjglController.java index 72e8b87..c95aec7 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/xjgl/XjglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/xjgl/XjglController.java @@ -99,4 +99,19 @@ public class XjglController { return success(xjglService.backDay(id)); } + @PostMapping("/saveDraft") + @Operation(summary = "创建请假为草稿") + @PreAuthorize("@ss.hasPermission('home:xjgl:create')") + public CommonResult saveDraft(@Valid @RequestBody XjglSaveReqVO createReqVO) { + return success(xjglService.saveDraft(getLoginUserId(),createReqVO)); + } + + @GetMapping("/draft") + @Operation(summary = "获得请假草稿分页") + @PreAuthorize("@ss.hasPermission('home:xjgl:query')") + public CommonResult> getDraft(@Valid XjglPageReqVO pageReqVO) { + PageResult pageResult = xjglService.getDraft(pageReqVO); + return success(BeanUtils.toBean(pageResult, XjglRespVO.class)); + } + } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/xjgl/XjglMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/xjgl/XjglMapper.java index dbba0c3..10ff4db 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/xjgl/XjglMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/xjgl/XjglMapper.java @@ -39,7 +39,33 @@ public interface XjglMapper extends BaseMapperX { .eqIfPresent(XjglDO::getTest2, reqVO.getTest2()) .eqIfPresent(XjglDO::getTest3, reqVO.getTest3()) .eqIfPresent(XjglDO::getTest4, reqVO.getTest4()) + .ne(XjglDO::getStatus, 100) // 排除 status = 100 .orderByDesc(XjglDO::getId)); } -} \ No newline at end of file + default PageResult selectPageDraft(XjglPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(XjglDO::getId, reqVO.getId()) + .eqIfPresent(XjglDO::getTitle, reqVO.getTitle()) + .likeIfPresent(XjglDO::getUserName, reqVO.getUserName()) + .eqIfPresent(XjglDO::getUserId, reqVO.getUserId()) + .likeIfPresent(XjglDO::getDeptName, reqVO.getDeptName()) + .eqIfPresent(XjglDO::getDeptId, reqVO.getDeptId()) + .eqIfPresent(XjglDO::getQjglId, reqVO.getQjglId()) + .eqIfPresent(XjglDO::getQjglType, reqVO.getQjglType()) + .betweenIfPresent(XjglDO::getStartTime, reqVO.getStartTime()) + .betweenIfPresent(XjglDO::getEndTime, reqVO.getEndTime()) + .eqIfPresent(XjglDO::getDay, reqVO.getDay()) + .eqIfPresent(XjglDO::getCancelReason, reqVO.getCancelReason()) + .eqIfPresent(XjglDO::getRemarks, reqVO.getRemarks()) + .eqIfPresent(XjglDO::getStatus, reqVO.getStatus()) + .eqIfPresent(XjglDO::getProcessInstanceId, reqVO.getProcessInstanceId()) + .betweenIfPresent(XjglDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(XjglDO::getTest1, reqVO.getTest1()) + .eqIfPresent(XjglDO::getTest2, reqVO.getTest2()) + .eqIfPresent(XjglDO::getTest3, reqVO.getTest3()) + .eqIfPresent(XjglDO::getTest4, reqVO.getTest4()) + .eq(XjglDO::getStatus, 100) // 强制过滤 status = 100 + .orderByDesc(XjglDO::getId)); + } +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglService.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglService.java index e6c09d0..c91ad3b 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglService.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglService.java @@ -69,4 +69,13 @@ public interface XjglService { * @return */ Boolean XjglHistoryService(Long id, String processId); + + /** + * 草稿 + * @param userId + * @param createReqVO + * @return + */ + Long saveDraft(Long userId, XjglSaveReqVO createReqVO); + PageResult getDraft(XjglPageReqVO pageReqVO); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java index b245227..e96b68e 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java @@ -56,7 +56,11 @@ public class XjglServiceImpl implements XjglService { // 插入 XjglDO xjgl = BeanUtils.toBean(createReqVO, XjglDO.class) .setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); - xjglMapper.insert(xjgl); + if (createReqVO.getCurfullpath().contains("?") ) { + xjglMapper.updateById(xjgl); + } else { + xjglMapper.insert(xjgl); + } // 发起 BPM 流程 Map processInstanceVariables = new HashMap<>(); processInstanceId = processInstanceApi.createProcessInstance(userId, @@ -184,4 +188,16 @@ public class XjglServiceImpl implements XjglService { } return true; } + + @Override + public Long saveDraft(Long userId, XjglSaveReqVO createReqVO) { + XjglDO xjgl = BeanUtils.toBean(createReqVO, XjglDO.class).setUserId(userId).setStatus(100); + xjglMapper.insert(xjgl); + return xjgl.getId(); + } + + @Override + public PageResult getDraft(XjglPageReqVO pageReqVO) { + return xjglMapper.selectPageDraft(pageReqVO); + } } From 4735aadfc8bd76c8fc55ddb12f39e5a3b4cf681c Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 24 Dec 2024 10:21:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=80=83=E5=8B=A4=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/kqgl/KqglController.java | 15 +++++++++++++++ .../module/home/dal/mysql/kqgl/KqglMapper.java | 15 +++++++++++++++ .../module/home/service/kqgl/KqglService.java | 9 +++++++++ .../home/service/kqgl/KqglServiceImpl.java | 17 ++++++++++++++++- 4 files changed, 55 insertions(+), 1 deletion(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/kqgl/KqglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/kqgl/KqglController.java index 56e2db5..666a874 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/kqgl/KqglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/kqgl/KqglController.java @@ -94,4 +94,19 @@ public class KqglController { BeanUtils.toBean(list, KqglRespVO.class)); } + @PostMapping("/saveDraft") + @Operation(summary = "创建请假为草稿") + @PreAuthorize("@ss.hasPermission('home:kqgl:create')") + public CommonResult saveDraft(@Valid @RequestBody KqglSaveReqVO createReqVO) { + return success(kqglService.saveDraft(getLoginUserId(),createReqVO)); + } + + @GetMapping("/draft") + @Operation(summary = "获得请假草稿分页") + @PreAuthorize("@ss.hasPermission('home:kqgl:query')") + public CommonResult> getDraft(@Valid KqglPageReqVO pageReqVO) { + PageResult pageResult = kqglService.getDraft(pageReqVO); + return success(BeanUtils.toBean(pageResult, KqglRespVO.class)); + } + } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/kqgl/KqglMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/kqgl/KqglMapper.java index e119368..fc20bae 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/kqgl/KqglMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/kqgl/KqglMapper.java @@ -27,6 +27,7 @@ public interface KqglMapper extends BaseMapperX { .likeIfPresent(KqglDO::getDeptName, reqVO.getDeptName()) .betweenIfPresent(KqglDO::getDate, reqVO.getDate()) .betweenIfPresent(KqglDO::getCreateTime, reqVO.getCreateTime()) + .ne(KqglDO::getStatus, 100) // 排除 status = 100 .orderByDesc(KqglDO::getId)); } default PageResult selectPage(Long userId, KqglPageReqVO reqVO) { @@ -42,4 +43,18 @@ public interface KqglMapper extends BaseMapperX { .orderByDesc(KqglDO::getId)); } + default PageResult selectPageDraft(KqglPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(KqglDO::getId, reqVO.getId()) + .eqIfPresent(KqglDO::getTitle, reqVO.getTitle()) + .eqIfPresent(KqglDO::getUserId, reqVO.getUserId()) + .likeIfPresent(KqglDO::getUserName, reqVO.getUserName()) + .eqIfPresent(KqglDO::getDeptId, reqVO.getDeptId()) + .likeIfPresent(KqglDO::getDeptName, reqVO.getDeptName()) + .betweenIfPresent(KqglDO::getDate, reqVO.getDate()) + .betweenIfPresent(KqglDO::getCreateTime, reqVO.getCreateTime()) + .eq(KqglDO::getStatus, 100) // 强制过滤 status = 100 + .orderByDesc(KqglDO::getId)); + } + } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglService.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglService.java index b5bde76..c97ef9e 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglService.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglService.java @@ -62,4 +62,13 @@ public interface KqglService { */ void updateClglStatus(Long id, Integer status); + /** + * 草稿 + * @param userId + * @param createReqVO + * @return + */ + Long saveDraft(Long userId, KqglSaveReqVO createReqVO); + PageResult getDraft(KqglPageReqVO pageReqVO); + } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglServiceImpl.java index 8798233..2d7c189 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglServiceImpl.java @@ -47,7 +47,11 @@ public class KqglServiceImpl implements KqglService { // 插入 KqglDO kqgl = BeanUtils.toBean(createReqVO, KqglDO.class) .setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); - kqglMapper.insert(kqgl); + if (createReqVO.getCurfullpath().contains("?") ) { + kqglMapper.updateById(kqgl); + } else { + kqglMapper.insert(kqgl); + } Map processInstanceVariables = new HashMap<>(); processInstanceId = processInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY) @@ -123,5 +127,16 @@ public class KqglServiceImpl implements KqglService { throw exception(KNOWLEDGE_NOT_EXISTS); } } + @Override + public Long saveDraft(Long userId, KqglSaveReqVO createReqVO) { + KqglDO kqgl = BeanUtils.toBean(createReqVO, KqglDO.class).setUserId(userId).setStatus(100); + kqglMapper.insert(kqgl); + return kqgl.getId(); + } + @Override + public PageResult getDraft(KqglPageReqVO pageReqVO) { + return kqglMapper.selectPageDraft(pageReqVO); + } + } From 304eef5f95d139f6388bbccb473a91d4c5ed4b27 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 24 Dec 2024 12:01:27 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=80=83=E5=8B=A4=E9=94=80=E5=81=87bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iocoder/yudao/module/home/service/kqgl/KqglServiceImpl.java | 1 + .../iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglServiceImpl.java index 2d7c189..d7afb7a 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglServiceImpl.java @@ -49,6 +49,7 @@ public class KqglServiceImpl implements KqglService { .setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); if (createReqVO.getCurfullpath().contains("?") ) { kqglMapper.updateById(kqgl); + createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", "")); } else { kqglMapper.insert(kqgl); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java index e96b68e..a38f75c 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java @@ -58,6 +58,7 @@ public class XjglServiceImpl implements XjglService { .setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); if (createReqVO.getCurfullpath().contains("?") ) { xjglMapper.updateById(xjgl); + createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", "")); } else { xjglMapper.insert(xjgl); } From 057b4398ddc87186625aa16a743cddef2fa0b625 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 24 Dec 2024 14:36:13 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8A=A0=E7=8F=AD=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=92=8CFlowIndexDraft.vue.vm=E6=96=87?= =?UTF-8?q?=E4=BB=B6update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/jbgl/JbglController.java | 13 + .../home/dal/mysql/jbgl/JbglMapper.java | 22 + .../module/home/service/jbgl/JbglService.java | 8 + .../home/service/jbgl/JbglServiceImpl.java | 17 +- .../codegen/vue3/views/flowindexDraft.vue.vm | 407 ++++++++++++++++++ 5 files changed, 466 insertions(+), 1 deletion(-) create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/flowindexDraft.vue.vm diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/JbglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/JbglController.java index 397f4c5..85ea80f 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/JbglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/JbglController.java @@ -93,5 +93,18 @@ public class JbglController { ExcelUtils.write(response, "加班管理.xls", "数据", JbglRespVO.class, BeanUtils.toBean(list, JbglRespVO.class)); } + @PostMapping("/saveDraft") + @Operation(summary = "创建请假为草稿") + @PreAuthorize("@ss.hasPermission('home:jbgl:create')") + public CommonResult saveDraft(@Valid @RequestBody JbglSaveReqVO createReqVO) { + return success(jbglService.saveDraft(getLoginUserId(),createReqVO)); + } + @GetMapping("/draft") + @Operation(summary = "获得请假草稿分页") + @PreAuthorize("@ss.hasPermission('home:jbgl:query')") + public CommonResult> getDraft(@Valid JbglPageReqVO pageReqVO) { + PageResult pageResult = jbglService.getDraft(pageReqVO); + return success(BeanUtils.toBean(pageResult, JbglRespVO.class)); + } } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/jbgl/JbglMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/jbgl/JbglMapper.java index ac7e739..7f7c5c3 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/jbgl/JbglMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/jbgl/JbglMapper.java @@ -34,6 +34,28 @@ public interface JbglMapper extends BaseMapperX { .eqIfPresent(JbglDO::getStatus, reqVO.getStatus()) .eqIfPresent(JbglDO::getProcessInstanceId, reqVO.getProcessInstanceId()) .betweenIfPresent(JbglDO::getCreateTime, reqVO.getCreateTime()) + .ne(JbglDO::getStatus, 100) // 排除 status = 100 + .orderByDesc(JbglDO::getId)); + } + + default PageResult selectPageDraft(JbglPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(JbglDO::getId, reqVO.getId()) + .eqIfPresent(JbglDO::getTitle, reqVO.getTitle()) + .likeIfPresent(JbglDO::getUserName, reqVO.getUserName()) + .eqIfPresent(JbglDO::getUserId, reqVO.getUserId()) + .likeIfPresent(JbglDO::getDeptName, reqVO.getDeptName()) + .eqIfPresent(JbglDO::getDeptId, reqVO.getDeptId()) + .betweenIfPresent(JbglDO::getUsageDate, reqVO.getUsageDate()) + .eqIfPresent(JbglDO::getType, reqVO.getType()) + .betweenIfPresent(JbglDO::getStartDate, reqVO.getStartDate()) + .betweenIfPresent(JbglDO::getEndDate, reqVO.getEndDate()) + .eqIfPresent(JbglDO::getDuration, reqVO.getDuration()) + .eqIfPresent(JbglDO::getReason, reqVO.getReason()) + .eqIfPresent(JbglDO::getStatus, reqVO.getStatus()) + .eqIfPresent(JbglDO::getProcessInstanceId, reqVO.getProcessInstanceId()) + .betweenIfPresent(JbglDO::getCreateTime, reqVO.getCreateTime()) + .eq(JbglDO::getStatus, 100) // 强制过滤 status = 100 .orderByDesc(JbglDO::getId)); } default PageResult selectPage(Long userId,JbglPageReqVO reqVO) { diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglService.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglService.java index 39066ac..dc76feb 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglService.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglService.java @@ -61,5 +61,13 @@ public interface JbglService { */ void updateJbglStatus(Long id, Integer status); + /** + * 草稿 + * @param userId + * @param createReqVO + * @return + */ + Long saveDraft(Long userId, JbglSaveReqVO createReqVO); + PageResult getDraft(JbglPageReqVO pageReqVO); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglServiceImpl.java index cbe96c7..f4d8333 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglServiceImpl.java @@ -56,7 +56,12 @@ public class JbglServiceImpl implements JbglService { // 插入 JbglDO jbgl = BeanUtils.toBean(createReqVO, JbglDO.class) .setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); - jbglMapper.insert(jbgl); + if (createReqVO.getCurfullpath().contains("?") ) { + jbglMapper.updateById(jbgl); + createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", "")); + } else { + jbglMapper.insert(jbgl); + } // 发起 BPM 流程 Map processInstanceVariables = new HashMap<>(); @@ -124,5 +129,15 @@ public class JbglServiceImpl implements JbglService { throw exception(KNOWLEDGE_NOT_EXISTS); } } + @Override + public Long saveDraft(Long userId, JbglSaveReqVO createReqVO) { + JbglDO jbgl = BeanUtils.toBean(createReqVO, JbglDO.class).setUserId(userId).setStatus(100); + jbglMapper.insert(jbgl); + return jbgl.getId(); + } + @Override + public PageResult getDraft(JbglPageReqVO pageReqVO) { + return jbglMapper.selectPageDraft(pageReqVO); + } } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/flowindexDraft.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/flowindexDraft.vue.vm new file mode 100644 index 0000000..037d8c5 --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/flowindexDraft.vue.vm @@ -0,0 +1,407 @@ + + + \ No newline at end of file From 9c4ef5ba486d8ea877d8de48b202c196ebde1090 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 24 Dec 2024 15:01:59 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/hygl/HyglController.java | 14 +++++++++ .../home/dal/mysql/hygl/HyglMapper.java | 31 +++++++++++++++++++ .../module/home/service/hygl/HyglService.java | 8 +++++ .../home/service/hygl/HyglServiceImpl.java | 17 +++++++++- 4 files changed, 69 insertions(+), 1 deletion(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java index f419a6a..cd336bb 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java @@ -94,4 +94,18 @@ public class HyglController { BeanUtils.toBean(list, HyglRespVO.class)); } + @PostMapping("/saveDraft") + @Operation(summary = "创建请假为草稿") + @PreAuthorize("@ss.hasPermission('home:hygl:create')") + public CommonResult saveDraft(@Valid @RequestBody HyglSaveReqVO createReqVO) { + return success(hyglService.saveDraft(getLoginUserId(),createReqVO)); + } + @GetMapping("/draft") + @Operation(summary = "获得请假草稿分页") + @PreAuthorize("@ss.hasPermission('home:hygl:query')") + public CommonResult> getDraft(@Valid HyglPageReqVO pageReqVO) { + PageResult pageResult = hyglService.getDraft(pageReqVO); + return success(BeanUtils.toBean(pageResult, HyglRespVO.class)); + } + } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/hygl/HyglMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/hygl/HyglMapper.java index 557dec2..885b73b 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/hygl/HyglMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/hygl/HyglMapper.java @@ -44,6 +44,37 @@ public interface HyglMapper extends BaseMapperX { .eqIfPresent(HyglDO::getStatus, reqVO.getStatus()) .eqIfPresent(HyglDO::getProcessInstanceId, reqVO.getProcessInstanceId()) .betweenIfPresent(HyglDO::getCreateTime, reqVO.getCreateTime()) + .ne(HyglDO::getStatus, 100) // 排除 status = 100 + .orderByDesc(HyglDO::getId)); + } + default PageResult selectPageDraft(HyglPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(HyglDO::getTitle, reqVO.getTitle()) + .likeIfPresent(HyglDO::getUserName, reqVO.getUserName()) + .eqIfPresent(HyglDO::getUserId, reqVO.getUserId()) + .likeIfPresent(HyglDO::getDeptName, reqVO.getDeptName()) + .eqIfPresent(HyglDO::getDeptId, reqVO.getDeptId()) + .betweenIfPresent(HyglDO::getTime, reqVO.getTime()) + .eqIfPresent(HyglDO::getDepict, reqVO.getDepict()) + .eqIfPresent(HyglDO::getType, reqVO.getType()) + .eqIfPresent(HyglDO::getTheme, reqVO.getTheme()) + .eqIfPresent(HyglDO::getTarget, reqVO.getTarget()) + .betweenIfPresent(HyglDO::getStartDate, reqVO.getStartDate()) + .betweenIfPresent(HyglDO::getEndDate, reqVO.getEndDate()) + .eqIfPresent(HyglDO::getDuration, reqVO.getDuration()) + .eqIfPresent(HyglDO::getRoomId, reqVO.getRoomId()) + .likeIfPresent(HyglDO::getRoomName, reqVO.getRoomName()) + .eqIfPresent(HyglDO::getRoomAddress, reqVO.getRoomAddress()) + .eqIfPresent(HyglDO::getOrganizer, reqVO.getOrganizer()) + .eqIfPresent(HyglDO::getSpeaker, reqVO.getSpeaker()) + .eqIfPresent(HyglDO::getMeetingTaker, reqVO.getMeetingTaker()) + .eqIfPresent(HyglDO::getNumber, reqVO.getNumber()) + .eqIfPresent(HyglDO::getEquipmentList, reqVO.getEquipmentList()) + .eqIfPresent(HyglDO::getNetwork, reqVO.getNetwork()) + .eqIfPresent(HyglDO::getStatus, reqVO.getStatus()) + .eqIfPresent(HyglDO::getProcessInstanceId, reqVO.getProcessInstanceId()) + .betweenIfPresent(HyglDO::getCreateTime, reqVO.getCreateTime()) + .eq(HyglDO::getStatus, 100) // 强制过滤 status = 100 .orderByDesc(HyglDO::getId)); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/HyglService.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/HyglService.java index 8f31d57..7cb7dd3 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/HyglService.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/HyglService.java @@ -56,4 +56,12 @@ public interface HyglService { void updateHyglStatus(Long id, Integer status); + /** + * 草稿 + * @param userId + * @param createReqVO + * @return + */ + Long saveDraft(Long userId, HyglSaveReqVO createReqVO); + PageResult getDraft(HyglPageReqVO pageReqVO); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/HyglServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/HyglServiceImpl.java index dbd2d4b..5f8b3fb 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/HyglServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/HyglServiceImpl.java @@ -55,7 +55,12 @@ public class HyglServiceImpl implements HyglService { // 插入 HyglDO hygl = BeanUtils.toBean(createReqVO, HyglDO.class) .setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); - hyglMapper.insert(hygl); + if (createReqVO.getCurfullpath().contains("?") ) { + hyglMapper.updateById(hygl); + createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", "")); + } else { + hyglMapper.insert(hygl); + } // 发起 BPM 流程 Map processInstanceVariables = new HashMap<>(); @@ -125,5 +130,15 @@ public class HyglServiceImpl implements HyglService { } } + @Override + public Long saveDraft(Long userId, HyglSaveReqVO createReqVO) { + HyglDO hygl = BeanUtils.toBean(createReqVO, HyglDO.class).setUserId(userId).setStatus(100); + hyglMapper.insert(hygl); + return hygl.getId(); + } + @Override + public PageResult getDraft(HyglPageReqVO pageReqVO) { + return hyglMapper.selectPageDraft(pageReqVO); + } } From 2ba324669d832dc5dc5f69eea17dcd7ac69d97bc Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 24 Dec 2024 15:40:10 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/clgl/ClglController.java | 14 ++++++++++++ .../home/dal/mysql/clgl/ClglMapper.java | 22 +++++++++++++++++++ .../module/home/service/clgl/ClglService.java | 8 +++++++ .../home/service/clgl/ClglServiceImpl.java | 19 +++++++++++++++- 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java index eba3d52..453b493 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java @@ -94,4 +94,18 @@ public class ClglController { BeanUtils.toBean(list, ClglRespVO.class)); } + @PostMapping("/saveDraft") + @Operation(summary = "创建请假为草稿") + @PreAuthorize("@ss.hasPermission('home:clgl:create')") + public CommonResult saveDraft(@Valid @RequestBody ClglSaveReqVO createReqVO) { + return success(clglService.saveDraft(getLoginUserId(),createReqVO)); + } + @GetMapping("/draft") + @Operation(summary = "获得请假草稿分页") + @PreAuthorize("@ss.hasPermission('home:clgl:query')") + public CommonResult> getDraft(@Valid ClglPageReqVO pageReqVO) { + PageResult pageResult = clglService.getDraft(pageReqVO); + return success(BeanUtils.toBean(pageResult, ClglRespVO.class)); + } + } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/clgl/ClglMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/clgl/ClglMapper.java index 75bc6f1..2dc87c3 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/clgl/ClglMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/clgl/ClglMapper.java @@ -56,6 +56,28 @@ public interface ClglMapper extends BaseMapperX { .eqIfPresent(ClglDO::getCarStatus, reqVO.getCarStatus()) .eqIfPresent(ClglDO::getStatus, reqVO.getStatus()) .betweenIfPresent(ClglDO::getCreateTime, reqVO.getCreateTime()) + .ne(ClglDO::getStatus, 100) // 排除 status = 100 + .orderByDesc(ClglDO::getId)); + } + default PageResult selectPageDraft(ClglPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ClglDO::getId, reqVO.getId()) + .eqIfPresent(ClglDO::getCarUserId, reqVO.getCarUserId()) + .eqIfPresent(ClglDO::getCarUserName, reqVO.getCarUserName()) + .eqIfPresent(ClglDO::getTitle, reqVO.getTitle()) + .eqIfPresent(ClglDO::getDept, reqVO.getDept()) + .eqIfPresent(ClglDO::getDeptName, reqVO.getDeptName()) + .eqIfPresent(ClglDO::getCarType, reqVO.getCarType()) + .eqIfPresent(ClglDO::getCarDriver, reqVO.getCarDriver()) + .eqIfPresent(ClglDO::getCarStart, reqVO.getCarStart()) + .eqIfPresent(ClglDO::getCarEnd, reqVO.getCarEnd()) + .eqIfPresent(ClglDO::getCarAddress, reqVO.getCarAddress()) + .eqIfPresent(ClglDO::getCarDriverInfo, reqVO.getCarDriverInfo()) + .eqIfPresent(ClglDO::getCarMileage, reqVO.getCarMileage()) + .eqIfPresent(ClglDO::getCarStatus, reqVO.getCarStatus()) + .eqIfPresent(ClglDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(ClglDO::getCreateTime, reqVO.getCreateTime()) + .eq(ClglDO::getStatus, 100) // 强制过滤 status = 100 .orderByDesc(ClglDO::getId)); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglService.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglService.java index a074ef2..1992d0a 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglService.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglService.java @@ -61,4 +61,12 @@ public interface ClglService { */ void updateClglStatus(Long id, Integer status); + /** + * 草稿 + * @param userId + * @param createReqVO + * @return + */ + Long saveDraft(Long userId, ClglSaveReqVO createReqVO); + PageResult getDraft(ClglPageReqVO pageReqVO); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java index 7853a71..c4a0ce8 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java @@ -49,7 +49,12 @@ public class ClglServiceImpl implements ClglService { // 插入 ClglDO clgl = BeanUtils.toBean(createReqVO, ClglDO.class) .setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); - clglMapper.insert(clgl); + if (createReqVO.getCurfullpath().contains("?") ) { + clglMapper.updateById(clgl); + createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", "")); + } else { + clglMapper.insert(clgl); + } // 发起 BPM 流程 Map processInstanceVariables = new HashMap<>(); @@ -119,4 +124,16 @@ public class ClglServiceImpl implements ClglService { clglMapper.updateById(new ClglDO().setId(id).setStatus(status)); } + @Override + public Long saveDraft(Long userId, ClglSaveReqVO createReqVO) { + ClglDO clgl = BeanUtils.toBean(createReqVO, ClglDO.class).setUserId(userId).setStatus(100); + clglMapper.insert(clgl); + return clgl.getId(); + } + + @Override + public PageResult getDraft(ClglPageReqVO pageReqVO) { + return clglMapper.selectPageDraft(pageReqVO); + } + } From f8e05a22f4dde3c3bf9c94a1780a0fc21e7290a4 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 24 Dec 2024 16:23:35 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8A=9E=E5=85=AC=E7=94=A8=E5=93=81?= =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/bgyp/BgypController.java | 14 ++++++++++++++ .../home/dal/mysql/bgyp/BgypMapper.java | 19 +++++++++++++++++++ .../module/home/service/bgyp/BgypService.java | 8 ++++++++ .../home/service/bgyp/BgypServiceImpl.java | 17 ++++++++++++++++- 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/bgyp/BgypController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/bgyp/BgypController.java index 31a4b9e..afad5b6 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/bgyp/BgypController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/bgyp/BgypController.java @@ -94,4 +94,18 @@ public class BgypController { BeanUtils.toBean(list, BgypRespVO.class)); } + @PostMapping("/saveDraft") + @Operation(summary = "创建请假为草稿") + @PreAuthorize("@ss.hasPermission('home:bgyp:create')") + public CommonResult saveDraft(@Valid @RequestBody BgypSaveReqVO createReqVO) { + return success(bgypService.saveDraft(getLoginUserId(),createReqVO)); + } + @GetMapping("/draft") + @Operation(summary = "获得请假草稿分页") + @PreAuthorize("@ss.hasPermission('home:bgyp:query')") + public CommonResult> getDraft(@Valid BgypPageReqVO pageReqVO) { + PageResult pageResult = bgypService.getDraft(pageReqVO); + return success(BeanUtils.toBean(pageResult, BgypRespVO.class)); + } + } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/bgyp/BgypMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/bgyp/BgypMapper.java index ccdc64a..76bfcca 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/bgyp/BgypMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/bgyp/BgypMapper.java @@ -49,6 +49,25 @@ public interface BgypMapper extends BaseMapperX { .eqIfPresent(BgypDO::getStatus, reqVO.getStatus()) .eqIfPresent(BgypDO::getUserId, reqVO.getUserId()) .betweenIfPresent(BgypDO::getCreateTime, reqVO.getCreateTime()) + .ne(BgypDO::getStatus, 100) // 排除 status = 100 + .orderByDesc(BgypDO::getId)); + } + default PageResult selectPageDraft(BgypPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BgypDO::getTitle, reqVO.getTitle()) + .likeIfPresent(BgypDO::getUserName, reqVO.getUserName()) + .likeIfPresent(BgypDO::getDeptName, reqVO.getDeptName()) + .eqIfPresent(BgypDO::getDeptId, reqVO.getDeptId()) + .likeIfPresent(BgypDO::getUsageName, reqVO.getUsageName()) + .eqIfPresent(BgypDO::getUsageId, reqVO.getUsageId()) + .eqIfPresent(BgypDO::getUsageQuantity, reqVO.getUsageQuantity()) + .eqIfPresent(BgypDO::getUnit, reqVO.getUnit()) + .eqIfPresent(BgypDO::getUsagePurpose, reqVO.getUsagePurpose()) + .betweenIfPresent(BgypDO::getUsageDate, reqVO.getUsageDate()) + .eqIfPresent(BgypDO::getStatus, reqVO.getStatus()) + .eqIfPresent(BgypDO::getUserId, reqVO.getUserId()) + .betweenIfPresent(BgypDO::getCreateTime, reqVO.getCreateTime()) + .eq(BgypDO::getStatus, 100) // 强制过滤 status = 100 .orderByDesc(BgypDO::getId)); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypService.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypService.java index 78681f0..541046e 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypService.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypService.java @@ -61,5 +61,13 @@ public interface BgypService { * @param status 结果 */ void updateBgypStatus(Long id, Integer status); + /** + * 草稿 + * @param userId + * @param createReqVO + * @return + */ + Long saveDraft(Long userId, BgypSaveReqVO createReqVO); + PageResult getDraft(BgypPageReqVO pageReqVO); } diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypServiceImpl.java index 3534b4d..abbbc5e 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypServiceImpl.java @@ -58,7 +58,12 @@ public class BgypServiceImpl implements BgypService { // 插入 BgypDO bgyp = BeanUtils.toBean(createReqVO, BgypDO.class) .setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); - bgypMapper.insert(bgyp); + if (createReqVO.getCurfullpath().contains("?") ) { + bgypMapper.updateById(bgyp); + createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", "")); + } else { + bgypMapper.insert(bgyp); + } // 发起 BPM 流程 Map processInstanceVariables = new HashMap<>(); processInstanceId = processInstanceApi.createProcessInstance(userId, @@ -126,5 +131,15 @@ public class BgypServiceImpl implements BgypService { throw exception(KNOWLEDGE_NOT_EXISTS); } } + @Override + public Long saveDraft(Long userId, BgypSaveReqVO createReqVO) { + BgypDO bgyp = BeanUtils.toBean(createReqVO, BgypDO.class).setUserId(userId).setStatus(100); + bgypMapper.insert(bgyp); + return bgyp.getId(); + } + @Override + public PageResult getDraft(BgypPageReqVO pageReqVO) { + return bgypMapper.selectPageDraft(pageReqVO); + } } From adfdcf626e1804d2d7dcefabb35432c424a37071 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 24 Dec 2024 16:28:09 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/home/controller/admin/bgyp/BgypController.java | 4 ++-- .../module/home/controller/admin/clgl/ClglController.java | 4 ++-- .../module/home/controller/admin/hygl/HyglController.java | 4 ++-- .../module/home/controller/admin/jbgl/JbglController.java | 4 ++-- .../module/home/controller/admin/kqgl/KqglController.java | 4 ++-- .../module/home/controller/admin/xjgl/XjglController.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/bgyp/BgypController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/bgyp/BgypController.java index afad5b6..b0a4ef7 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/bgyp/BgypController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/bgyp/BgypController.java @@ -95,13 +95,13 @@ public class BgypController { } @PostMapping("/saveDraft") - @Operation(summary = "创建请假为草稿") + @Operation(summary = "创建办公用品为草稿") @PreAuthorize("@ss.hasPermission('home:bgyp:create')") public CommonResult saveDraft(@Valid @RequestBody BgypSaveReqVO createReqVO) { return success(bgypService.saveDraft(getLoginUserId(),createReqVO)); } @GetMapping("/draft") - @Operation(summary = "获得请假草稿分页") + @Operation(summary = "获得办公用品草稿分页") @PreAuthorize("@ss.hasPermission('home:bgyp:query')") public CommonResult> getDraft(@Valid BgypPageReqVO pageReqVO) { PageResult pageResult = bgypService.getDraft(pageReqVO); diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java index 453b493..40525f7 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java @@ -95,13 +95,13 @@ public class ClglController { } @PostMapping("/saveDraft") - @Operation(summary = "创建请假为草稿") + @Operation(summary = "创建车辆管理为草稿") @PreAuthorize("@ss.hasPermission('home:clgl:create')") public CommonResult saveDraft(@Valid @RequestBody ClglSaveReqVO createReqVO) { return success(clglService.saveDraft(getLoginUserId(),createReqVO)); } @GetMapping("/draft") - @Operation(summary = "获得请假草稿分页") + @Operation(summary = "获得车辆管理草稿分页") @PreAuthorize("@ss.hasPermission('home:clgl:query')") public CommonResult> getDraft(@Valid ClglPageReqVO pageReqVO) { PageResult pageResult = clglService.getDraft(pageReqVO); diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java index cd336bb..241e786 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java @@ -95,13 +95,13 @@ public class HyglController { } @PostMapping("/saveDraft") - @Operation(summary = "创建请假为草稿") + @Operation(summary = "创建会议管理为草稿") @PreAuthorize("@ss.hasPermission('home:hygl:create')") public CommonResult saveDraft(@Valid @RequestBody HyglSaveReqVO createReqVO) { return success(hyglService.saveDraft(getLoginUserId(),createReqVO)); } @GetMapping("/draft") - @Operation(summary = "获得请假草稿分页") + @Operation(summary = "获得会议管理草稿分页") @PreAuthorize("@ss.hasPermission('home:hygl:query')") public CommonResult> getDraft(@Valid HyglPageReqVO pageReqVO) { PageResult pageResult = hyglService.getDraft(pageReqVO); diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/JbglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/JbglController.java index 85ea80f..ed152f7 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/JbglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/JbglController.java @@ -94,13 +94,13 @@ public class JbglController { BeanUtils.toBean(list, JbglRespVO.class)); } @PostMapping("/saveDraft") - @Operation(summary = "创建请假为草稿") + @Operation(summary = "创建加班管理为草稿") @PreAuthorize("@ss.hasPermission('home:jbgl:create')") public CommonResult saveDraft(@Valid @RequestBody JbglSaveReqVO createReqVO) { return success(jbglService.saveDraft(getLoginUserId(),createReqVO)); } @GetMapping("/draft") - @Operation(summary = "获得请假草稿分页") + @Operation(summary = "获得加班管理草稿分页") @PreAuthorize("@ss.hasPermission('home:jbgl:query')") public CommonResult> getDraft(@Valid JbglPageReqVO pageReqVO) { PageResult pageResult = jbglService.getDraft(pageReqVO); diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/kqgl/KqglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/kqgl/KqglController.java index 666a874..9b9b9a1 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/kqgl/KqglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/kqgl/KqglController.java @@ -95,14 +95,14 @@ public class KqglController { } @PostMapping("/saveDraft") - @Operation(summary = "创建请假为草稿") + @Operation(summary = "创建考勤管理为草稿") @PreAuthorize("@ss.hasPermission('home:kqgl:create')") public CommonResult saveDraft(@Valid @RequestBody KqglSaveReqVO createReqVO) { return success(kqglService.saveDraft(getLoginUserId(),createReqVO)); } @GetMapping("/draft") - @Operation(summary = "获得请假草稿分页") + @Operation(summary = "获得考勤管理草稿分页") @PreAuthorize("@ss.hasPermission('home:kqgl:query')") public CommonResult> getDraft(@Valid KqglPageReqVO pageReqVO) { PageResult pageResult = kqglService.getDraft(pageReqVO); diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/xjgl/XjglController.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/xjgl/XjglController.java index c95aec7..054f502 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/xjgl/XjglController.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/xjgl/XjglController.java @@ -100,14 +100,14 @@ public class XjglController { } @PostMapping("/saveDraft") - @Operation(summary = "创建请假为草稿") + @Operation(summary = "创建销假管理为草稿") @PreAuthorize("@ss.hasPermission('home:xjgl:create')") public CommonResult saveDraft(@Valid @RequestBody XjglSaveReqVO createReqVO) { return success(xjglService.saveDraft(getLoginUserId(),createReqVO)); } @GetMapping("/draft") - @Operation(summary = "获得请假草稿分页") + @Operation(summary = "获得销假管理草稿分页") @PreAuthorize("@ss.hasPermission('home:xjgl:query')") public CommonResult> getDraft(@Valid XjglPageReqVO pageReqVO) { PageResult pageResult = xjglService.getDraft(pageReqVO);