yudao-team/oa-master
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
pch 2024-12-25 10:27:05 +08:00
commit 043269768b
24 changed files with 372 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/bgyp/BgypController.java
View File

@ -94,4 +94,18 @@ public class BgypController {
BeanUtils.toBean(list, BgypRespVO.class));
}
@PostMapping("/saveDraft")
@Operation(summary = "创建办公用品为草稿")
@PreAuthorize("@ss.hasPermission('home:bgyp:create')")
public CommonResult<Long> saveDraft(@Valid @RequestBody BgypSaveReqVO createReqVO) {
return success(bgypService.saveDraft(getLoginUserId(),createReqVO));
}
@GetMapping("/draft")
@Operation(summary = "获得办公用品草稿分页")
@PreAuthorize("@ss.hasPermission('home:bgyp:query')")
public CommonResult<PageResult<BgypRespVO>> getDraft(@Valid BgypPageReqVO pageReqVO) {
PageResult<BgypDO> pageResult = bgypService.getDraft(pageReqVO);
return success(BeanUtils.toBean(pageResult, BgypRespVO.class));
}
}

14
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/ClglController.java
View File

@ -94,4 +94,18 @@ public class ClglController {
BeanUtils.toBean(list, ClglRespVO.class));
}
@PostMapping("/saveDraft")
@Operation(summary = "创建车辆管理为草稿")
@PreAuthorize("@ss.hasPermission('home:clgl:create')")
public CommonResult<Long> saveDraft(@Valid @RequestBody ClglSaveReqVO createReqVO) {
return success(clglService.saveDraft(getLoginUserId(),createReqVO));
}
@GetMapping("/draft")
@Operation(summary = "获得车辆管理草稿分页")
@PreAuthorize("@ss.hasPermission('home:clgl:query')")
public CommonResult<PageResult<ClglRespVO>> getDraft(@Valid ClglPageReqVO pageReqVO) {
PageResult<ClglDO> pageResult = clglService.getDraft(pageReqVO);
return success(BeanUtils.toBean(pageResult, ClglRespVO.class));
}
}

14
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java
View File

@ -94,4 +94,18 @@ public class HyglController {
BeanUtils.toBean(list, HyglRespVO.class));
}
@PostMapping("/saveDraft")
@Operation(summary = "创建会议管理为草稿")
@PreAuthorize("@ss.hasPermission('home:hygl:create')")
public CommonResult<Long> saveDraft(@Valid @RequestBody HyglSaveReqVO createReqVO) {
return success(hyglService.saveDraft(getLoginUserId(),createReqVO));
}
@GetMapping("/draft")
@Operation(summary = "获得会议管理草稿分页")
@PreAuthorize("@ss.hasPermission('home:hygl:query')")
public CommonResult<PageResult<HyglRespVO>> getDraft(@Valid HyglPageReqVO pageReqVO) {
PageResult<HyglDO> pageResult = hyglService.getDraft(pageReqVO);
return success(BeanUtils.toBean(pageResult, HyglRespVO.class));
}
}

13
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/JbglController.java
View File

@ -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<Long> saveDraft(@Valid @RequestBody JbglSaveReqVO createReqVO) {
return success(jbglService.saveDraft(getLoginUserId(),createReqVO));
}
@GetMapping("/draft")
@Operation(summary = "获得加班管理草稿分页")
@PreAuthorize("@ss.hasPermission('home:jbgl:query')")
public CommonResult<PageResult<JbglRespVO>> getDraft(@Valid JbglPageReqVO pageReqVO) {
PageResult<JbglDO> pageResult = jbglService.getDraft(pageReqVO);
return success(BeanUtils.toBean(pageResult, JbglRespVO.class));
}
}

15
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/kqgl/KqglController.java
View File

@ -94,4 +94,19 @@ public class KqglController {
BeanUtils.toBean(list, KqglRespVO.class));
}
@PostMapping("/saveDraft")
@Operation(summary = "创建考勤管理为草稿")
@PreAuthorize("@ss.hasPermission('home:kqgl:create')")
public CommonResult<Long> saveDraft(@Valid @RequestBody KqglSaveReqVO createReqVO) {
return success(kqglService.saveDraft(getLoginUserId(),createReqVO));
}
@GetMapping("/draft")
@Operation(summary = "获得考勤管理草稿分页")
@PreAuthorize("@ss.hasPermission('home:kqgl:query')")
public CommonResult<PageResult<KqglRespVO>> getDraft(@Valid KqglPageReqVO pageReqVO) {
PageResult<KqglDO> pageResult = kqglService.getDraft(pageReqVO);
return success(BeanUtils.toBean(pageResult, KqglRespVO.class));
}
}

15
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/xjgl/XjglController.java
View File

@ -99,4 +99,19 @@ public class XjglController {
return success(xjglService.backDay(id));
}
@PostMapping("/saveDraft")
@Operation(summary = "创建销假管理为草稿")
@PreAuthorize("@ss.hasPermission('home:xjgl:create')")
public CommonResult<Long> saveDraft(@Valid @RequestBody XjglSaveReqVO createReqVO) {
return success(xjglService.saveDraft(getLoginUserId(),createReqVO));
}
@GetMapping("/draft")
@Operation(summary = "获得销假管理草稿分页")
@PreAuthorize("@ss.hasPermission('home:xjgl:query')")
public CommonResult<PageResult<XjglRespVO>> getDraft(@Valid XjglPageReqVO pageReqVO) {
PageResult<XjglDO> pageResult = xjglService.getDraft(pageReqVO);
return success(BeanUtils.toBean(pageResult, XjglRespVO.class));
}
}

19
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/bgyp/BgypMapper.java
View File

@ -49,6 +49,25 @@ public interface BgypMapper extends BaseMapperX<BgypDO> {
.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<BgypDO> selectPageDraft(BgypPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<BgypDO>()
.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));
}

22
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/clgl/ClglMapper.java
View File

@ -56,6 +56,28 @@ public interface ClglMapper extends BaseMapperX<ClglDO> {
.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<ClglDO> selectPageDraft(ClglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ClglDO>()
.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));
}

31
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/hygl/HyglMapper.java
View File

@ -44,6 +44,37 @@ public interface HyglMapper extends BaseMapperX<HyglDO> {
.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<HyglDO> selectPageDraft(HyglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<HyglDO>()
.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));
}

22
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/jbgl/JbglMapper.java
View File

@ -34,6 +34,28 @@ public interface JbglMapper extends BaseMapperX<JbglDO> {
.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<JbglDO> selectPageDraft(JbglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<JbglDO>()
.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<JbglDO> selectPage(Long userId,JbglPageReqVO reqVO) {

15
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/kqgl/KqglMapper.java
View File

@ -27,6 +27,7 @@ public interface KqglMapper extends BaseMapperX<KqglDO> {
.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<KqglDO> selectPage(Long userId, KqglPageReqVO reqVO) {
@ -42,4 +43,18 @@ public interface KqglMapper extends BaseMapperX<KqglDO> {
.orderByDesc(KqglDO::getId));
}
default PageResult<KqglDO> selectPageDraft(KqglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<KqglDO>()
.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));
}
}

26
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/xjgl/XjglMapper.java
View File

@ -39,7 +39,33 @@ public interface XjglMapper extends BaseMapperX<XjglDO> {
.eqIfPresent(XjglDO::getTest2, reqVO.getTest2())
.eqIfPresent(XjglDO::getTest3, reqVO.getTest3())
.eqIfPresent(XjglDO::getTest4, reqVO.getTest4())
.ne(XjglDO::getStatus, 100) // 排除 status = 100
.orderByDesc(XjglDO::getId));
}
default PageResult<XjglDO> selectPageDraft(XjglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<XjglDO>()
.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));
}
}

8
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypService.java
View File

@ -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<BgypDO> getDraft(BgypPageReqVO pageReqVO);
}

15
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypServiceImpl.java
View File

@ -58,7 +58,12 @@ public class BgypServiceImpl implements BgypService {
// 插入
BgypDO bgyp = BeanUtils.toBean(createReqVO, BgypDO.class)
.setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
if (createReqVO.getCurfullpath().contains("?") ) {
bgypMapper.updateById(bgyp);
createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", ""));
} else {
bgypMapper.insert(bgyp);
}
// 发起 BPM 流程
Map<String, Object> 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<BgypDO> getDraft(BgypPageReqVO pageReqVO) {
return bgypMapper.selectPageDraft(pageReqVO);
}
}

8
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglService.java
View File

@ -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<ClglDO> getDraft(ClglPageReqVO pageReqVO);
}

17
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java
View File

@ -49,7 +49,12 @@ public class ClglServiceImpl implements ClglService {
// 插入
ClglDO clgl = BeanUtils.toBean(createReqVO, ClglDO.class)
.setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
if (createReqVO.getCurfullpath().contains("?") ) {
clglMapper.updateById(clgl);
createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", ""));
} else {
clglMapper.insert(clgl);
}
// 发起 BPM 流程
Map<String, Object> 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<ClglDO> getDraft(ClglPageReqVO pageReqVO) {
return clglMapper.selectPageDraft(pageReqVO);
}
}

8
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/HyglService.java
View File

@ -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<HyglDO> getDraft(HyglPageReqVO pageReqVO);
}

15
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/HyglServiceImpl.java
View File

@ -55,7 +55,12 @@ public class HyglServiceImpl implements HyglService {
// 插入
HyglDO hygl = BeanUtils.toBean(createReqVO, HyglDO.class)
.setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
if (createReqVO.getCurfullpath().contains("?") ) {
hyglMapper.updateById(hygl);
createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", ""));
} else {
hyglMapper.insert(hygl);
}
// 发起 BPM 流程
Map<String, Object> 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<HyglDO> getDraft(HyglPageReqVO pageReqVO) {
return hyglMapper.selectPageDraft(pageReqVO);
}
}

8
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglService.java
View File

@ -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<JbglDO> getDraft(JbglPageReqVO pageReqVO);
}

15
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglServiceImpl.java
View File

@ -56,7 +56,12 @@ public class JbglServiceImpl implements JbglService {
// 插入
JbglDO jbgl = BeanUtils.toBean(createReqVO, JbglDO.class)
.setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
if (createReqVO.getCurfullpath().contains("?") ) {
jbglMapper.updateById(jbgl);
createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", ""));
} else {
jbglMapper.insert(jbgl);
}
// 发起 BPM 流程
Map<String, Object> 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<JbglDO> getDraft(JbglPageReqVO pageReqVO) {
return jbglMapper.selectPageDraft(pageReqVO);
}
}

9
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglService.java
View File

@ -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<KqglDO> getDraft(KqglPageReqVO pageReqVO);
}

16
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/kqgl/KqglServiceImpl.java
View File

@ -47,7 +47,12 @@ public class KqglServiceImpl implements KqglService {
// 插入
KqglDO kqgl = BeanUtils.toBean(createReqVO, KqglDO.class)
.setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
if (createReqVO.getCurfullpath().contains("?") ) {
kqglMapper.updateById(kqgl);
createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", ""));
} else {
kqglMapper.insert(kqgl);
}
Map<String, Object> processInstanceVariables = new HashMap<>();
processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
@ -123,5 +128,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<KqglDO> getDraft(KqglPageReqVO pageReqVO) {
return kqglMapper.selectPageDraft(pageReqVO);
}
}

9
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglService.java
View File

@ -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<XjglDO> getDraft(XjglPageReqVO pageReqVO);
}

17
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java
View File

@ -56,7 +56,12 @@ public class XjglServiceImpl implements XjglService {
// 插入
XjglDO xjgl = BeanUtils.toBean(createReqVO, XjglDO.class)
.setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
if (createReqVO.getCurfullpath().contains("?") ) {
xjglMapper.updateById(xjgl);
createReqVO.setCurfullpath( createReqVO.getCurfullpath().replaceAll("\\?id=\\d+", ""));
} else {
xjglMapper.insert(xjgl);
}
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();
processInstanceId = processInstanceApi.createProcessInstance(userId,
@ -184,4 +189,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<XjglDO> getDraft(XjglPageReqVO pageReqVO) {
return xjglMapper.selectPageDraft(pageReqVO);
}
}