From 9d3675b12829de9ec46c210c5c8c460705206dbc Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期六, 18 十一月 2023 16:46:48 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java | 66 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
index f4115e5..bc9ad0e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
@@ -127,6 +127,8 @@
@PostMapping(value = "/add")
@Transactional(rollbackFor = { Exception.class })
public Result<String> add(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ dailyInspectionStandard.setWritePerson(sysUser.getRealname());
dailyInspectionStandardService.save(dailyInspectionStandard);
List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
DailyInspectionStandardDetail isd = null;
@@ -153,6 +155,7 @@
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
@Transactional(rollbackFor = { Exception.class })
public Result<String> edit(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
+ dailyInspectionStandard.setApprovalStatus("1");
dailyInspectionStandardService.updateById(dailyInspectionStandard);
//1.鍒犻櫎鍘熺偣妫�椤圭洰
List<DailyInspectionStandardDetail> dailyInspectionStandardDetails = dailyInspectionStandardDetailService.lambdaQuery()
@@ -448,8 +451,17 @@
@PostMapping(value = "/revise")
@Transactional(rollbackFor = { Exception.class })
public Result<String> revise(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ dailyInspectionStandard.setWritePerson(sysUser.getRealname());
dailyInspectionStandard.setId("");
+ dailyInspectionStandard.setApprovalStatus("1");
dailyInspectionStandard.setCreateTime(new Date());
+ dailyInspectionStandard.setTakeEffectTime(null);
+ dailyInspectionStandard.setLoseEfficacyTime(null);
+ dailyInspectionStandard.setApprovalFeedback(null);
+ dailyInspectionStandard.setAuditFeedback(null);
+ dailyInspectionStandard.setAuditPerson(null);
+ dailyInspectionStandard.setApprovalPerson(null);
dailyInspectionStandardService.save(dailyInspectionStandard);
List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
DailyInspectionStandardDetail isd = null;
@@ -492,15 +504,18 @@
@Transactional(rollbackFor = { Exception.class })
public Result<String> versionTakeEffect(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
- List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
- .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
- .eq(DailyInspectionStandard::getVersionStatus, "2").list();
- for (DailyInspectionStandard standard : dailyInspectionStandards) {
- standard.setVersionStatus("3");
- standard.setLoseEfficacyTime(new Date());
- dailyInspectionStandardService.updateById(standard);
- }
- dailyInspectionStandard.setTakeEffectTime(new Date());
+// List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+// .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
+// .eq(DailyInspectionStandard::getVersionStatus, "2").list();
+// for (DailyInspectionStandard standard : dailyInspectionStandards) {
+// standard.setVersionStatus("3");
+// standard.setLoseEfficacyTime(new Date());
+// dailyInspectionStandardService.updateById(standard);
+// }
+// dailyInspectionStandard.setTakeEffectTime(new Date());
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ dailyInspectionStandard.setLoseEfficacyPerson(sysUser.getRealname());
+ dailyInspectionStandard.setLoseEfficacyTime(new Date());
boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
if (b){
return Result.OK("缂栬緫鎴愬姛!");
@@ -509,5 +524,36 @@
}
}
-
+ /**
+ * 绛惧娴佺▼
+ * qsw 2023-11-16
+ */
+ @RequestMapping(value = "/auditApproval", method = {RequestMethod.PUT,RequestMethod.POST})
+ @Transactional(rollbackFor = { Exception.class })
+ public Result<String> auditApproval(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String approvalStatus = dailyInspectionStandard.getApprovalStatus();
+ if("5".equals(approvalStatus)){//瀹℃牳閫氳繃鍚庯紝鐗堟湰鐢熸晥
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
+ .eq(DailyInspectionStandard::getVersionStatus, "2").list();
+ for (DailyInspectionStandard standard : dailyInspectionStandards) {
+ standard.setVersionStatus("3");
+ standard.setLoseEfficacyTime(new Date());
+ standard.setLoseEfficacyPerson(sysUser.getRealname());
+ dailyInspectionStandardService.updateById(standard);
+ }
+ dailyInspectionStandard.setApprovalPerson(sysUser.getRealname());
+ dailyInspectionStandard.setVersionStatus("2");
+ dailyInspectionStandard.setTakeEffectTime(new Date());
+ }else if("3".equals(approvalStatus)){
+ dailyInspectionStandard.setAuditPerson(sysUser.getRealname());
+ }
+ boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
+ if (b){
+ return Result.OK("瀹℃牳鎴愬姛!");
+ }else{
+ return Result.error("瀹℃牳澶辫触!");
+ }
+ }
}
--
Gitblit v1.9.3