From 4d2251a4054b3d799a9ee8d0c04da82cbd6f34a2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 一月 2024 15:05:11 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
index c14e455..09930a0 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
@@ -103,6 +103,9 @@
if(Constants.equalsInteger(param.getWorktypeStatus(),Constants.ONE)){
//瀹℃牳閫氳繃锛屼慨鏀圭姸鎬侊紝浜х敓鍘嗗彶鐗堟湰
newVersionData(dispatchUnitMapper.selectById(param.getId()),update);
+ //瀛樺偍鎿嶄綔鍘嗗彶
+ this.saveDuLog(update,Constants.DispatchUnitLogType.WORK_TYPE_AUDIT_PASS,update.getCheckInfo());
+
}else{
//鏇存柊鏄庣粏鏁版嵁涓哄鏍稿け璐�
duSolutionMapper.update(null,new UpdateWrapper<DuSolution>().lambda()
@@ -111,6 +114,17 @@
.set(DuSolution::getCheckUserId,update.getCheckUserId())
.set(DuSolution::getCheckInfo,update.getCheckInfo())
.eq(DuSolution::getDispatchUnitId,update.getId()));
+
+ duWorktypeMapper.update(null,new UpdateWrapper<DuWorktype>().lambda()
+ .set(DuWorktype::getStatus,Constants.TWO)
+ .set(DuWorktype::getCheckUserId,update.getCheckUserId())
+ .set(DuWorktype::getCheckInfo,update.getCheckInfo())
+ .set(DuWorktype::getCheckDate,new Date() )
+ .eq(DuWorktype::getIsdeleted,Constants.ZERO)
+ .eq(DuWorktype::getStatus,Constants.ZERO)
+ .eq(DuWorktype::getDispatchUnitId,update.getId()));
+ //瀛樺偍鎿嶄綔鍘嗗彶
+ this.saveDuLog(update,Constants.DispatchUnitLogType.WORK_TYPE_AUDIT_UN_PASS,update.getCheckInfo());
}
return 1;
}
@@ -228,7 +242,7 @@
//瀹℃牳閫氳繃锛屼慨鏀圭姸鎬侊紝浜х敓鍘嗗彶鐗堟湰
newVersionData(dispatchUnit,update);
//瀛樺偍鎿嶄綔鍘嗗彶
- this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.AUDIT_PASS,null);
+ this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.AUDIT_PASS,update.getCheckInfo());
}else{
//鏇存柊鏄庣粏鏁版嵁涓哄鏍稿け璐�
duSolutionMapper.update(null,new UpdateWrapper<DuSolution>().lambda()
@@ -238,25 +252,14 @@
.set(DuSolution::getCheckInfo,update.getCheckInfo())
.eq(DuSolution::getDispatchUnitId,update.getId()));
-
- List<DuSolution> solutions = duSolutionMapper.selectList(new QueryWrapper<DuSolution>().lambda()
- .eq(DuSolution::getIsdeleted,Constants.ZERO)
- .eq(DuSolution::getDispatchUnitId,model.getId()));
-
- if(solutions == null || solutions.size() ==0){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ユ淳閬ｅ崟浣嶆湭璁剧疆鏂规宸ョ淇℃伅锛屽鏍搁�氳繃澶辫触锛�");
- }
- for (DuSolution s : solutions){
- duWorktypeMapper.update(null,new UpdateWrapper<DuWorktype>().lambda()
- .set(DuWorktype::getStatus,Constants.TWO)
- .set(DuWorktype::getCheckUserId,update.getCheckUserId())
- .set(DuWorktype::getCheckInfo,update.getCheckInfo())
- .set(DuWorktype::getCheckDate,new Date() )
- .eq(DuWorktype::getIsdeleted,Constants.ZERO)
- .eq(DuWorktype::getStatus,Constants.ZERO)
- .eq(DuWorktype::getDuSolutionId,s.getId()));
- }
-
+ duWorktypeMapper.update(null,new UpdateWrapper<DuWorktype>().lambda()
+ .set(DuWorktype::getStatus,Constants.TWO)
+ .set(DuWorktype::getCheckUserId,update.getCheckUserId())
+ .set(DuWorktype::getCheckInfo,update.getCheckInfo())
+ .set(DuWorktype::getCheckDate,new Date() )
+ .eq(DuWorktype::getIsdeleted,Constants.ZERO)
+ .eq(DuWorktype::getStatus,Constants.ZERO)
+ .eq(DuWorktype::getDispatchUnitId,update.getId()));
//瀛樺偍鎿嶄綔鍘嗗彶
this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.AUDIT_UN_PASS,update.getCheckInfo());
}
--
Gitblit v1.9.3