From 4337640b7ab86136baed2fd6aa959e4828a75cea Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 十二月 2023 17:33:51 +0800
Subject: [PATCH] 计算加工工件个数算法和密码安全策略
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 96 ++++++++++++++++++++++++++++++++----------------
1 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
index 5522fdf..5abbfad 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -9,12 +9,14 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -104,27 +106,8 @@
List<Map<String, Object>> records = maintenanceStandardList.getRecords();
for (Map<String, Object> record : records) {
String maintenanceStandardId = (String) record.get("id");
- List<Map<String, Object>> maintenanceStandardDetaillist = maintenanceStandardDetailService.getMaintenanceStandardDetailList(maintenanceStandardId);
-// for (Map<String, Object> detail : maintenanceStandardDetaillist) {
-// //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁
-//// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String)detail.get("id")).eq(SysUploadRela::getDelFlag, 0).list();
-// List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), null);
-// if (sysUploadRelas.size() > 0) {
-// detail.put("isNoPhotoFlag", true);
-//// List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)detail.get("id"), "daily_maintenance_standard_photo");
-// List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), "daily_maintenance_standard_photo");
-// SysUpload upload = new SysUpload();
-// if (CollectionUtils.isNotEmpty(uploadRelas)) {
-//// upload = uploadService.getById(uploadRelas.get(0).getUploadId());
-// upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
-// }
-// detail.put("upload", upload);
-// } else {
-// detail.put("isNoPhotoFlag", false);
-// SysUpload upload = new SysUpload();
-// detail.put("upload", upload);
-// }
-// }
+ String equipmentId = (String) record.get("equipmentId");
+ List<Map<String, Object>> maintenanceStandardDetaillist = maintenanceStandardDetailService.getMaintenanceStandardDetailList(maintenanceStandardId,equipmentId);
record.put("maintenanceStandardDetaillist", maintenanceStandardDetaillist);
}
return Result.ok(maintenanceStandardList);
@@ -154,6 +137,8 @@
@Transactional(rollbackFor = {Exception.class})
public Result<String> add(@RequestBody MaintenanceStandard maintenanceStandard) {
// maintenanceStandard.setType("daily");
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ maintenanceStandard.setWritePerson(sysUser.getRealname());
maintenanceStandardService.save(maintenanceStandard);
List<MaintenanceStandardDetail> maintenanceStandardDetaillist = maintenanceStandard.getMaintenanceStandardDetaillist();
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetaillist) {
@@ -175,6 +160,7 @@
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
@Transactional(rollbackFor = {Exception.class})
public Result<String> edit(@RequestBody MaintenanceStandard maintenanceStandard) {
+ maintenanceStandard.setApprovalStatus("1");
maintenanceStandardService.updateById(maintenanceStandard);
//1.鍒犻櫎鍘熶繚鍏婚」鐩�
List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandardDetailService.lambdaQuery().eq(MaintenanceStandardDetail::getMaintenanceStandardId, maintenanceStandard.getId()).eq(MaintenanceStandardDetail::getDelFlag, 0).eq(MaintenanceStandardDetail::getStatus, "1").list();
@@ -285,8 +271,18 @@
//浣滀笟鎸囧涔�
List<MaintenanceStandardWorkInstruction> maintenanceStandardWorkInstructionList = maintenanceStandardWorkInstructionService.lambdaQuery().eq(MaintenanceStandardWorkInstruction::getMaintenanceStandardId,maintenanceStandard.getId())
.eq(MaintenanceStandardWorkInstruction::getDelFlag, CommonConstant.DEL_FLAG_0).list();
+
maintenanceStandard.setId("");
maintenanceStandard.setCreateTime(new Date());
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ maintenanceStandard.setWritePerson(sysUser.getRealname());
+ maintenanceStandard.setApprovalStatus("1");
+ maintenanceStandard.setTakeEffectTime(null);
+ maintenanceStandard.setLoseEfficacyTime(null);
+ maintenanceStandard.setApprovalFeedback(null);
+ maintenanceStandard.setAuditFeedback(null);
+ maintenanceStandard.setAuditPerson(null);
+ maintenanceStandard.setApprovalPerson(null);
maintenanceStandardService.save(maintenanceStandard);
//鏄庣粏淇℃伅
List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist();
@@ -358,20 +354,56 @@
@Transactional(rollbackFor = { Exception.class })
public Result<String> versionTakeEffect(@RequestBody MaintenanceStandard maintenanceStandard) {
- List<MaintenanceStandard> maintenanceStandardList = maintenanceStandardService.lambdaQuery()
- .eq(MaintenanceStandard::getNum, maintenanceStandard.getNum())
- .eq(MaintenanceStandard::getVersionStatus, "2").list();
- for (MaintenanceStandard standard : maintenanceStandardList) {
- standard.setVersionStatus("3");
- standard.setLoseEfficacyTime(new Date());
- maintenanceStandardService.updateById(standard);
- }
- maintenanceStandard.setTakeEffectTime(new Date());
+// List<MaintenanceStandard> maintenanceStandardList = maintenanceStandardService.lambdaQuery()
+// .eq(MaintenanceStandard::getNum, maintenanceStandard.getNum())
+// .eq(MaintenanceStandard::getVersionStatus, "2").list();
+// for (MaintenanceStandard standard : maintenanceStandardList) {
+// standard.setVersionStatus("3");
+// standard.setLoseEfficacyTime(new Date());
+// maintenanceStandardService.updateById(standard);
+// }
+// maintenanceStandard.setTakeEffectTime(new Date());
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ maintenanceStandard.setLoseEfficacyPerson(sysUser.getRealname());
+ maintenanceStandard.setLoseEfficacyTime(new Date());
boolean b = maintenanceStandardService.updateById(maintenanceStandard);
if (b){
- return Result.OK("鐢熸晥鎴愬姛!");
+ return Result.OK("澶辨晥鎴愬姛!");
}else{
- return Result.error("鐢熸晥澶辫触!");
+ return Result.error("澶辨晥澶辫触!");
+ }
+ }
+
+ /**
+ * 绛惧娴佺▼
+ * qsw 2023-11-16
+ */
+ @RequestMapping(value = "/auditApproval", method = {RequestMethod.PUT,RequestMethod.POST})
+ @Transactional(rollbackFor = { Exception.class })
+ public Result<String> auditApproval(@RequestBody MaintenanceStandard maintenanceStandard) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String approvalStatus = maintenanceStandard.getApprovalStatus();
+ if("5".equals(approvalStatus)){//瀹℃牳閫氳繃鍚庯紝鐗堟湰鐢熸晥
+ List<MaintenanceStandard> dailyMaintenanceStandards = maintenanceStandardService.lambdaQuery()
+ .eq(MaintenanceStandard::getNum, maintenanceStandard.getNum())
+ .eq(MaintenanceStandard::getVersionStatus, "2").list();
+ for (MaintenanceStandard dailyMaintenanceStandard : dailyMaintenanceStandards) {
+ dailyMaintenanceStandard.setVersionStatus("3");
+ dailyMaintenanceStandard.setLoseEfficacyTime(new Date());
+ dailyMaintenanceStandard.setLoseEfficacyPerson(sysUser.getRealname());
+ maintenanceStandardService.updateById(dailyMaintenanceStandard);
+ }
+ maintenanceStandard.setApprovalPerson(sysUser.getRealname());
+ maintenanceStandard.setVersionStatus("2");
+ maintenanceStandard.setTakeEffectTime(new Date());
+ }else if("3".equals(approvalStatus)){
+ maintenanceStandard.setAuditPerson(sysUser.getRealname());
+ }
+ boolean b = maintenanceStandardService.updateById(maintenanceStandard);
+ if (b){
+ return Result.OK("瀹℃牳鎴愬姛!");
+ }else{
+ return Result.error("瀹℃牳澶辫触!");
}
}
--
Gitblit v1.9.3