From 99d6db0aab044b740ce02f57872c1e38ae647b58 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 19:00:50 +0800
Subject: [PATCH] 三不原则分析 中心修改 台账导入导出字段修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportThreeNoSpareController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportThreeNoSpareController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportThreeNoSpareController.java
index fd153a0..a30a494 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportThreeNoSpareController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportThreeNoSpareController.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -9,10 +10,16 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.StrUtil;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.dto.EamReportThreeNoSpareDto;
import org.jeecg.modules.eam.entity.EamReportThreeNoSpare;
+import org.jeecg.modules.eam.request.EamReportThreeNoSpareQuery;
import org.jeecg.modules.eam.service.IEamReportThreeNoSpareService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -53,7 +60,7 @@
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param eamReportThreeNoSpare
+ * @param eamReportThreeNoSpareQuery
* @param pageNo
* @param pageSize
* @param req
@@ -62,13 +69,12 @@
//@AutoLog(value = "鈥滀笁涓嶆斁杩囩殑鍘熷垯鈥濆垎鏋愯〃-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value="鈥滀笁涓嶆斁杩囩殑鍘熷垯鈥濆垎鏋愯〃-鍒嗛〉鍒楄〃鏌ヨ", notes="鈥滀笁涓嶆斁杩囩殑鍘熷垯鈥濆垎鏋愯〃-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<IPage<EamReportThreeNoSpare>> queryPageList(EamReportThreeNoSpare eamReportThreeNoSpare,
+ public Result<IPage<EamReportThreeNoSpareQuery>> queryPageList(EamReportThreeNoSpareQuery eamReportThreeNoSpareQuery,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamReportThreeNoSpare> queryWrapper = QueryGenerator.initQueryWrapper(eamReportThreeNoSpare, req.getParameterMap());
- Page<EamReportThreeNoSpare> page = new Page<EamReportThreeNoSpare>(pageNo, pageSize);
- IPage<EamReportThreeNoSpare> pageList = eamReportThreeNoSpareService.page(page, queryWrapper);
+ Page<EamReportThreeNoSpareQuery> page = new Page<EamReportThreeNoSpareQuery>(pageNo, pageSize);
+ IPage<EamReportThreeNoSpareQuery> pageList = eamReportThreeNoSpareService.pageList(page, eamReportThreeNoSpareQuery);
return Result.OK(pageList);
}
@@ -98,10 +104,43 @@
//@RequiresPermissions("org.jeecg.modules.mdc:eam_report_three_no_spare:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody EamReportThreeNoSpare eamReportThreeNoSpare) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ eamReportThreeNoSpare.setTrainingUser(user.getUsername());
+ eamReportThreeNoSpare.setTrainingUserTime(new Date());
eamReportThreeNoSpareService.updateById(eamReportThreeNoSpare);
return Result.OK("缂栬緫鎴愬姛!");
}
+ /**
+ * 鎿嶄綔宸ユ彁浜�-鍙戣捣娴佺▼
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "鈥滀笁涓嶆斁杩囩殑鍘熷垯鈥濆垎鏋愯〃--鎻愪氦", notes = "鈥滀笁涓嶆斁杩囩殑鍘熷垯鈥濆垎鏋愯〃--鎻愪氦")
+ @GetMapping(value = "/submit")
+ public Result<?> submit(String id){
+ eamReportThreeNoSpareService.submit(id);
+ return Result.OK("鎻愪氦鎴愬姛锛�");
+ }
+
+ /**
+ * 娴佺▼瀹℃牳
+ * @param eamReportThreeNoSpareDto
+ */
+ @AutoLog(value = "鈥滀笁涓嶆斁杩囩殑鍘熷垯鈥濆垎鏋愯〃--鎵ц/瀹℃壒")
+ @ApiOperation(value = "鈥滀笁涓嶆斁杩囩殑鍘熷垯鈥濆垎鏋愯〃--鎵ц/瀹℃壒", notes = "鈥滀笁涓嶆斁杩囩殑鍘熷垯鈥濆垎鏋愯〃--鎵ц/瀹℃壒")
+ @PostMapping(value = "/perform")
+ public Result<?> audit(@RequestBody EamReportThreeNoSpareDto eamReportThreeNoSpareDto){
+ if (eamReportThreeNoSpareDto == null) {
+ return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ // 妫�鏌ヨ姹傚弬鏁�
+ if (StrUtil.isBlank(eamReportThreeNoSpareDto.getTaskId()) || StrUtil.isBlank(eamReportThreeNoSpareDto.getDataId()) || StrUtil.isBlank(eamReportThreeNoSpareDto.getInstanceId())) {
+ return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
+ }
+ return eamReportThreeNoSpareService.audit(eamReportThreeNoSpareDto);
+ }
+
/**
* 閫氳繃id鍒犻櫎
*
--
Gitblit v1.9.3