From af2a8f99681046e836b2ca05c6a43bc29b1e7e38 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 15:19:10 +0800
Subject: [PATCH] art: 技术状态鉴定申请-去除按照位置信息
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java
index 2735266..253212e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java
@@ -1,28 +1,27 @@
package org.jeecg.modules.mdc.controller;
-import java.util.Arrays;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+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.apache.shiro.SecurityUtils;
+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.vo.LoginUser;
+import org.jeecg.modules.mdc.dto.MdcProcessQuantityDto;
+import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
+import org.jeecg.modules.mdc.service.IMdcProcessQuantityService;
+import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo;
+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.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
-import org.jeecg.modules.mdc.service.IMdcProcessQuantityService;
-
-
-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: 鍔犲伐鏁伴噺琛�
@@ -42,7 +41,7 @@
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param mdcProcessQuantity
+ * @param vo
* @param pageNo
* @param pageSize
* @param req
@@ -51,13 +50,14 @@
@AutoLog(value = "鍔犲伐鏁伴噺琛�-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "鍔犲伐鏁伴噺琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍔犲伐鏁伴噺琛�-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(MdcProcessQuantity mdcProcessQuantity,
+ public Result<?> queryPageList(MdcProcessQuantityVo vo,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<MdcProcessQuantity> queryWrapper = QueryGenerator.initQueryWrapper(mdcProcessQuantity, req.getParameterMap());
- Page<MdcProcessQuantity> page = new Page<MdcProcessQuantity>(pageNo, pageSize);
- IPage<MdcProcessQuantity> pageList = mdcProcessQuantityService.page(page, queryWrapper);
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ Page<MdcProcessQuantityDto> page = new Page<MdcProcessQuantityDto>(pageNo, pageSize);
+ IPage<MdcProcessQuantityDto> pageList = mdcProcessQuantityService.pageList(userId, page, vo, req);
return Result.OK(pageList);
}
@@ -71,8 +71,11 @@
@ApiOperation(value = "鍔犲伐鏁伴噺琛�-娣诲姞", notes = "鍔犲伐鏁伴噺琛�-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody MdcProcessQuantity mdcProcessQuantity) {
- mdcProcessQuantityService.save(mdcProcessQuantity);
- return Result.OK("娣诲姞鎴愬姛锛�");
+ if (StringUtils.isBlank(mdcProcessQuantity.getEquipmentIds())) {
+ return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡");
+ }
+ boolean flag = mdcProcessQuantityService.addData(mdcProcessQuantity);
+ return flag ? Result.ok("娣诲姞鎴愬姛") : Result.error("娣诲姞澶辫触");
}
/**
@@ -127,8 +130,8 @@
@ApiOperation(value = "鍔犲伐鏁伴噺琛�-閫氳繃id鏌ヨ", notes = "鍔犲伐鏁伴噺琛�-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
- MdcProcessQuantity mdcProcessQuantity = mdcProcessQuantityService.getById(id);
- return Result.OK(mdcProcessQuantity);
+ MdcProcessQuantityDto dto = mdcProcessQuantityService.findById(id);
+ return Result.OK(dto);
}
/**
@@ -138,8 +141,10 @@
* @param mdcProcessQuantity
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, MdcProcessQuantity mdcProcessQuantity) {
- return super.exportXls(request, mdcProcessQuantity, MdcProcessQuantity.class, "鍔犲伐鏁伴噺琛�");
+ public ModelAndView exportXls(HttpServletRequest request, MdcProcessQuantityVo mdcProcessQuantity) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return mdcProcessQuantityService.exportXls(userId, mdcProcessQuantity);
}
/**
--
Gitblit v1.9.3