From 7d2ae4c2fd8d45f0896b9accf84ff4177638fbcd Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 17 七月 2025 20:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateController.java | 251 +++++++++++++++++++++++++------------------------
1 files changed, 127 insertions(+), 124 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateController.java
index f39d463..397bab3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateController.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -9,143 +10,145 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.constant.TechnicalStatusDeactivateStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusDeactivate;
+import org.jeecg.modules.eam.request.EamTechnicalStatusDeactivateQuery;
+import org.jeecg.modules.eam.request.EamTechnicalStatusDeactivateRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusDeactivateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-
- /**
+/**
* @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗�
* @Author: jeecg-boot
- * @Date: 2025-07-09
+ * @Date: 2025-07-09
* @Version: V1.0
*/
@Slf4j
-@Api(tags="鍋滅敤鍔犲伐璁惧鐢宠鍗�")
+@Api(tags = "鍋滅敤鍔犲伐璁惧鐢宠鍗�")
@RestController
@RequestMapping("/eam/eamTechnicalStatusDeactivate")
public class EamTechnicalStatusDeactivateController extends JeecgController<EamTechnicalStatusDeactivate, IEamTechnicalStatusDeactivateService> {
- @Autowired
- private IEamTechnicalStatusDeactivateService eamTechnicalStatusDeactivateService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamTechnicalStatusDeactivate
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-鍒嗛〉鍒楄〃鏌ヨ", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamTechnicalStatusDeactivate> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusDeactivate, req.getParameterMap());
- Page<EamTechnicalStatusDeactivate> page = new Page<EamTechnicalStatusDeactivate>(pageNo, pageSize);
- IPage<EamTechnicalStatusDeactivate> pageList = eamTechnicalStatusDeactivateService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamTechnicalStatusDeactivate
- * @return
- */
- @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-娣诲姞")
- @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-娣诲姞", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate) {
- eamTechnicalStatusDeactivateService.save(eamTechnicalStatusDeactivate);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamTechnicalStatusDeactivate
- * @return
- */
- @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-缂栬緫")
- @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-缂栬緫", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate) {
- eamTechnicalStatusDeactivateService.updateById(eamTechnicalStatusDeactivate);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鍒犻櫎", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<?> delete(@RequestParam(name="id",required=true) String id) {
- eamTechnicalStatusDeactivateService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-鎵归噺鍒犻櫎")
- @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-鎵归噺鍒犻櫎", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.eamTechnicalStatusDeactivateService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鏌ヨ")
- @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鏌ヨ", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate = eamTechnicalStatusDeactivateService.getById(id);
- return Result.OK(eamTechnicalStatusDeactivate);
- }
+ @Autowired
+ private IEamTechnicalStatusDeactivateService eamTechnicalStatusDeactivateService;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamTechnicalStatusDeactivate
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate) {
- return super.exportXls(request, eamTechnicalStatusDeactivate, EamTechnicalStatusDeactivate.class, "鍋滅敤鍔犲伐璁惧鐢宠鍗�");
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param query
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @ApiOperation(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamTechnicalStatusDeactivateQuery query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ Page<EamTechnicalStatusDeactivate> page = new Page<>(pageNo, pageSize);
+ IPage<EamTechnicalStatusDeactivate> pageList = eamTechnicalStatusDeactivateService.queryPageList(page, query);
+ return Result.OK(pageList);
+ }
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamTechnicalStatusDeactivate.class);
- }
+ /**
+ * 娣诲姞
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-娣诲姞")
+ @ApiOperation(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-娣诲姞", notes = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamTechnicalStatusDeactivateRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("璁惧鏄庣粏涓嶈兘涓虹┖锛�");
+ }
+ boolean b = eamTechnicalStatusDeactivateService.addTechnicalStatusDeactivate(request);
+ if (!b) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+ /**
+ * 缂栬緫
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-缂栬緫")
+ @ApiOperation(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-缂栬緫", notes = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamTechnicalStatusDeactivateRequest request) {
+ if (request == null) {
+ return Result.error("缂栬緫鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ boolean b = eamTechnicalStatusDeactivateService.editTechnicalStatusDeactivate(request);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-鎻愪氦")
+ @ApiOperation(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-鎻愪氦", notes = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-鎻愪氦")
+ @GetMapping("/submit")
+ public Result<?> submit(@RequestParam(name = "id") String id) {
+ boolean b = eamTechnicalStatusDeactivateService.submit(id);
+ if (!b) {
+ return Result.error("鎻愪氦澶辫触锛�");
+ }
+ return Result.OK("鎻愪氦鎴愬姛!");
+ }
+
+ @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-浣滃簾")
+ @ApiOperation(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-浣滃簾", notes = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-浣滃簾")
+ @GetMapping("/abolish")
+ public Result<?> abolish(@RequestParam(name = "id") String id) {
+ EamTechnicalStatusDeactivate entity = eamTechnicalStatusDeactivateService.getById(id);
+ if (entity == null) {
+ return Result.error("瑕佷綔搴熺殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!TechnicalStatusDeactivateStatusEnum.WAIT_SUBMIT.name().equals(entity.getApplicationStatus())) {
+ return Result.error("璇ョ姸鎬佺殑鏁版嵁涓嶅厑璁歌繘琛屼綔搴燂紒");
+ }
+ entity.setApplicationStatus(TechnicalStatusDeactivateStatusEnum.ABOLISH.name());
+ eamTechnicalStatusDeactivateService.updateById(entity);
+ return Result.OK("浣滃簾鎴愬姛!");
+ }
+
+ @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇�-瀹℃壒")
+ @ApiOperation(value = "鎶�鏈姸鎬佸彉鏇寸敵璇�-瀹℃壒", notes = "鎶�鏈姸鎬佸彉鏇寸敵璇�-瀹℃壒")
+ @PostMapping("/approval")
+ public Result<?> approval(@RequestBody EamTechnicalStatusDeactivateRequest request) {
+ if (request == null) {
+ return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ // 妫�鏌ヨ姹傚弬鏁�
+ if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
+ return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
+ }
+ EamTechnicalStatusDeactivate b = eamTechnicalStatusDeactivateService.approval(request);
+ if (b == null) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.ok("鎿嶄綔鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鏌ヨ", notes = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate = eamTechnicalStatusDeactivateService.getById(id);
+ return Result.OK(eamTechnicalStatusDeactivate);
+ }
}
--
Gitblit v1.9.3