jiezhoufg/yc_fdjyfluru
1
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:
zjh 2025-12-11 17:06:12 +08:00
commit c0264d8ad8
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
View File

@ -250,8 +250,9 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
EngineReviewListPojo reviewListPojo = sw.buildFromDatasource("xdap_app_223770822127386625")
.eq("id", approvalId).doQuery(EngineReviewListPojo.class).get(0);
if (reviewListPojo == null || reviewListPojo.getStatusCode() == ParamValueVersionEnum.REFUSE.getCode()) {
throw new RuntimeException("无效的审批记录");
if (reviewListPojo == null || reviewListPojo.getStatusCode() == ParamValueVersionEnum.REFUSE.getCode()
|| reviewListPojo.getStatusCode() == ParamValueVersionEnum.PASSED.getCode()) {
throw new RuntimeException("无效的审批记录请检查是否已经审批完成或被拒绝");
}
//查看当前人是否有权限审批
String currentAssignees = reviewListPojo.getApproverPersons();

3
src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
View File

@ -360,12 +360,15 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
String id = engineParamDetailPojo.getId();
EngineParamDetailPojo engineParamDetailPojo1 = selectById(id);
String filledBy = engineParamDetailPojo1.getFilledBy();
if (ObjectUtils.isNotEmpty(filledBy)) {
sw.buildFromDatasource("xdap_app_223770822127386625")
.update("is_delete", 1)
.update("last_update_date", new Date())
.eq("owner_id", filledBy)
.eq("current_node", "数据维护")
.doUpdate(TodoTaskPojo.class);
}
//应该不会有新增参数 要不然还要给参数绑定部门，责任人，填写人
// EngineParamDetailPojo ei = new EngineParamDetailPojo();

4
src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java
View File

@ -44,8 +44,8 @@ public class EngineReviewListServiceImpl implements EngineReviewListService {
.like("subsystem_name", engineReviewListRequest.getSubsystemName())
.like("status_description", engineReviewListRequest.getStatusDescription())
.eq("yc_or_oth", engineReviewListRequest.getYcOrOth())
.eq("applicant", engineReviewListRequest.getApplicant())
.or()
.eq("applicant", engineReviewListRequest.getUserID())
.conjuctionOr()
.like("approver_persons",engineReviewListRequest.getUserID() )
.doPageQuery(page, size, EngineReviewListPojo.class);