From d5c2bbe053800a69a63c190ede9691222f9d0810 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期二, 18 七月 2023 09:44:35 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcProcessQuantityMapper.java | 5 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcProcessQuantityVo.java | 33 ++++++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java | 9 ++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java | 5 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcProcessQuantityService.java | 7 ++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java | 30 ---------------
6 files changed, 48 insertions(+), 41 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 1bd0fbe..fcf13a0 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
@@ -23,6 +23,7 @@
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 io.swagger.annotations.Api;
@@ -46,7 +47,7 @@
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param mdcProcessQuantity
+ * @param vo
* @param pageNo
* @param pageSize
* @param req
@@ -55,14 +56,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) {
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, mdcProcessQuantity, req);
+ IPage<MdcProcessQuantityDto> pageList = mdcProcessQuantityService.pageList(userId, page, vo, req);
return Result.OK(pageList);
}
@@ -143,7 +144,7 @@
* @param mdcProcessQuantity
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, MdcProcessQuantity mdcProcessQuantity) {
+ public ModelAndView exportXls(HttpServletRequest request, MdcProcessQuantityVo mdcProcessQuantity) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
return mdcProcessQuantityService.exportXls(userId, mdcProcessQuantity);
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java
index 5f1cf2c..7a0e517 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java
@@ -66,34 +66,4 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @TableField(exist = false)
- private String equipmentId;
-
- @TableField(exist = false)
- private String startTime;
-
- @TableField(exist = false)
- private String endTime;
-
- /**
- * 鍓嶅彴浼犲叆 鍒ゆ柇姣忎釜id
- */
- @TableField(exist = false)
- private String parentId;
-
- /**
- * 鍓嶅彴浼犲叆 杞﹂棿灞傜骇:1 閮ㄩ棬灞傜骇:2
- */
- @TableField(exist = false)
- private String typeTree;
-
- /**
- * 閮ㄩ棬parentId 鍏宠仈瀛愰泦id
- */
- @TableField(exist = false)
- private List<String> mdcSectionIds;
-
- @TableField(exist = false)
- private String equipmentIds;
-
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcProcessQuantityMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcProcessQuantityMapper.java
index 93e6343..dd2f909 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcProcessQuantityMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcProcessQuantityMapper.java
@@ -7,6 +7,7 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mdc.dto.MdcProcessQuantityDto;
import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
+import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo;
import java.util.List;
@@ -25,7 +26,7 @@
* @param mdcProcessQuantity
* @return
*/
- IPage<MdcProcessQuantityDto> pageList(Page<MdcProcessQuantityDto> page, @Param("mdcProcessQuantity") MdcProcessQuantity mdcProcessQuantity);
+ IPage<MdcProcessQuantityDto> pageList(Page<MdcProcessQuantityDto> page, @Param("mdcProcessQuantity") MdcProcessQuantityVo mdcProcessQuantity);
/**
* 瀵煎嚭鏁版嵁
@@ -33,7 +34,7 @@
* @param mdcProcessQuantity
* @return
*/
- List<MdcProcessQuantityDto> list(@Param("mdcProcessQuantity") MdcProcessQuantity mdcProcessQuantity);
+ List<MdcProcessQuantityDto> list(@Param("mdcProcessQuantity") MdcProcessQuantityVo mdcProcessQuantity);
/**
* 鏍规嵁id鏌ヨ
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcProcessQuantityService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcProcessQuantityService.java
index 2409658..b1a98c6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcProcessQuantityService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcProcessQuantityService.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.dto.MdcProcessQuantityDto;
import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
+import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@@ -23,11 +24,11 @@
*
* @param userId
* @param page
- * @param mdcProcessQuantity
+ * @param vo
* @param req
* @return
*/
- IPage<MdcProcessQuantityDto> pageList(String userId, Page<MdcProcessQuantityDto> page, MdcProcessQuantity mdcProcessQuantity, HttpServletRequest req);
+ IPage<MdcProcessQuantityDto> pageList(String userId, Page<MdcProcessQuantityDto> page, MdcProcessQuantityVo vo, HttpServletRequest req);
/**
* 瀵煎嚭
@@ -36,7 +37,7 @@
* @param mdcProcessQuantity
* @return
*/
- ModelAndView exportXls(String userId, MdcProcessQuantity mdcProcessQuantity);
+ ModelAndView exportXls(String userId, MdcProcessQuantityVo mdcProcessQuantity);
/**
* 鏍规嵁id鏌ヨ
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java
index 6cbc674..37d65a6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java
@@ -12,6 +12,7 @@
import org.jeecg.modules.mdc.mapper.MdcProcessQuantityMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcProcessQuantityService;
+import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -47,7 +48,7 @@
* @return
*/
@Override
- public IPage<MdcProcessQuantityDto> pageList(String userId, Page<MdcProcessQuantityDto> page, MdcProcessQuantity mdcProcessQuantity, HttpServletRequest req) {
+ public IPage<MdcProcessQuantityDto> pageList(String userId, Page<MdcProcessQuantityDto> page, MdcProcessQuantityVo mdcProcessQuantity, HttpServletRequest req) {
List<String> equipmentIds = new ArrayList<>();
if (StringUtils.isNotEmpty(mdcProcessQuantity.getParentId()) && StringUtils.isEmpty(mdcProcessQuantity.getEquipmentId())) {
if ("2".equals(mdcProcessQuantity.getTypeTree())) {
@@ -89,7 +90,7 @@
* @return
*/
@Override
- public ModelAndView exportXls(String userId, MdcProcessQuantity mdcProcessQuantity) {
+ public ModelAndView exportXls(String userId, MdcProcessQuantityVo mdcProcessQuantity) {
List<String> equipmentIds = new ArrayList<>();
if (StringUtils.isNotEmpty(mdcProcessQuantity.getParentId()) && StringUtils.isEmpty(mdcProcessQuantity.getEquipmentId())) {
if ("2".equals(mdcProcessQuantity.getTypeTree())) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcProcessQuantityVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcProcessQuantityVo.java
new file mode 100644
index 0000000..2412efe
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcProcessQuantityVo.java
@@ -0,0 +1,33 @@
+package org.jeecg.modules.mdc.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author: LiuS
+ * @create: 2023-07-18 09:25
+ */
+@Data
+public class MdcProcessQuantityVo {
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鏃ユ湡")
+ private Date efficientDate;
+ private Integer processQuantity;
+ private String equipmentId;
+ private String startTime;
+ private String endTime;
+ private String parentId;
+ private String typeTree;
+ private List<String> mdcSectionIds;
+ private String equipmentIds;
+ private String equipmentName;
+ private String partsCode;
+ private String batchCode;
+ private String sequenceNumber;
+}
--
Gitblit v1.9.3