From c642e468df7f88cdd33d7b5417dd500ee3850813 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 08 七月 2024 11:05:58 +0800
Subject: [PATCH] 调整标准加工时间和加工数量维护功能
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcStandardProcessDurationController.java | 82 +++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 47 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcStandardProcessDurationController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcStandardProcessDurationController.java
index 84adfeb..b793d0d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcStandardProcessDurationController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcStandardProcessDurationController.java
@@ -1,39 +1,33 @@
package org.jeecg.modules.mdc.controller;
-import java.util.Arrays;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.mdc.entity.MdcStandardProcessDuration;
+import org.jeecg.modules.mdc.service.IMdcStandardProcessDurationService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
-
-
-import org.jeecg.modules.mdc.service.IMdcStandardProcessDurationService;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.Arrays;
/**
- * @Description: 鏍囧噯鍔犲伐鏃堕棿琛�
+ * @Description: 鏍囧噯鍔犲伐鏃堕棿
* @Author: Lius
- * @Date: 2023-07-17
+ * @Date: 2024-07-08
* @Version: V1.0
*/
@Slf4j
-@Api(tags = "鏍囧噯鍔犲伐鏃堕棿琛�")
+@Api(tags = "鏍囧噯鍔犲伐鏃堕棿")
@RestController
@RequestMapping("/mdc/mdcStandardProcessDuration")
public class MdcStandardProcessDurationController extends JeecgController<MdcStandardProcessDuration, IMdcStandardProcessDurationService> {
@@ -50,17 +44,16 @@
* @param req
* @return
*/
- @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿琛�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "鏍囧噯鍔犲伐鏃堕棿琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿-鍒嗛〉鍒楄〃鏌ヨ", notes = "鏍囧噯鍔犲伐鏃堕棿-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
public Result<?> queryPageList(MdcStandardProcessDuration mdcStandardProcessDuration,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
+ QueryWrapper<MdcStandardProcessDuration> queryWrapper = QueryGenerator.initQueryWrapper(mdcStandardProcessDuration, req.getParameterMap());
Page<MdcStandardProcessDuration> page = new Page<MdcStandardProcessDuration>(pageNo, pageSize);
- IPage<MdcStandardProcessDuration> pageList = mdcStandardProcessDurationService.pageList(userId, page, mdcStandardProcessDuration, req);
+ IPage<MdcStandardProcessDuration> pageList = mdcStandardProcessDurationService.page(page, queryWrapper);
return Result.OK(pageList);
}
@@ -70,15 +63,12 @@
* @param mdcStandardProcessDuration
* @return
*/
- @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿琛�-娣诲姞")
- @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿琛�-娣诲姞", notes = "鏍囧噯鍔犲伐鏃堕棿琛�-娣诲姞")
+ @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿-娣诲姞")
+ @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿-娣诲姞", notes = "鏍囧噯鍔犲伐鏃堕棿-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody MdcStandardProcessDuration mdcStandardProcessDuration) {
- if (StringUtils.isBlank(mdcStandardProcessDuration.getEquipmentIds())) {
- return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡");
- }
- boolean flag = mdcStandardProcessDurationService.addData(mdcStandardProcessDuration);
- return flag ? Result.ok("娣诲姞鎴愬姛") : Result.error("娣诲姞澶辫触");
+ mdcStandardProcessDurationService.save(mdcStandardProcessDuration);
+ return Result.OK("娣诲姞鎴愬姛锛�");
}
/**
@@ -87,8 +77,8 @@
* @param mdcStandardProcessDuration
* @return
*/
- @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿琛�-缂栬緫")
- @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿琛�-缂栬緫", notes = "鏍囧噯鍔犲伐鏃堕棿琛�-缂栬緫")
+ @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿-缂栬緫")
+ @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿-缂栬緫", notes = "鏍囧噯鍔犲伐鏃堕棿-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody MdcStandardProcessDuration mdcStandardProcessDuration) {
mdcStandardProcessDurationService.updateById(mdcStandardProcessDuration);
@@ -101,8 +91,8 @@
* @param id
* @return
*/
- @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿琛�-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿琛�-閫氳繃id鍒犻櫎", notes = "鏍囧噯鍔犲伐鏃堕棿琛�-閫氳繃id鍒犻櫎")
+ @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿-閫氳繃id鍒犻櫎", notes = "鏍囧噯鍔犲伐鏃堕棿-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
mdcStandardProcessDurationService.removeById(id);
@@ -115,8 +105,8 @@
* @param ids
* @return
*/
- @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿琛�-鎵归噺鍒犻櫎")
- @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿琛�-鎵归噺鍒犻櫎", notes = "鏍囧噯鍔犲伐鏃堕棿琛�-鎵归噺鍒犻櫎")
+ @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿-鎵归噺鍒犻櫎", notes = "鏍囧噯鍔犲伐鏃堕棿-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.mdcStandardProcessDurationService.removeByIds(Arrays.asList(ids.split(",")));
@@ -129,8 +119,8 @@
* @param id
* @return
*/
- @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿琛�-閫氳繃id鏌ヨ")
- @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿琛�-閫氳繃id鏌ヨ", notes = "鏍囧噯鍔犲伐鏃堕棿琛�-閫氳繃id鏌ヨ")
+ @AutoLog(value = "鏍囧噯鍔犲伐鏃堕棿-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "鏍囧噯鍔犲伐鏃堕棿-閫氳繃id鏌ヨ", notes = "鏍囧噯鍔犲伐鏃堕棿-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
MdcStandardProcessDuration mdcStandardProcessDuration = mdcStandardProcessDurationService.getById(id);
@@ -145,9 +135,7 @@
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MdcStandardProcessDuration mdcStandardProcessDuration) {
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- return mdcStandardProcessDurationService.exportXls(userId, mdcStandardProcessDuration);
+ return super.exportXls(request, mdcStandardProcessDuration, MdcStandardProcessDuration.class, "鏍囧噯鍔犲伐鏃堕棿");
}
/**
--
Gitblit v1.9.3