From 4e5af86ad91040f4c9a2656396079b7192c8bdcf Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 08 七月 2024 14:33:34 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java | 49 +++++++++++-------------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProcessQuantityServiceImpl.java | 24 ++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcProcessQuantityService.java | 9 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java | 11 +++++
4 files changed, 66 insertions(+), 27 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 fcf13a0..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,33 +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.apache.shiro.SecurityUtils;
-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.common.system.vo.LoginUser;
-import org.jeecg.modules.mdc.dto.MdcProcessQuantityDto;
-import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
-import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
-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;
-import io.swagger.annotations.ApiOperation;
+import java.util.Arrays;
/**
* @Description: 鍔犲伐鏁伴噺琛�
@@ -77,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("娣诲姞澶辫触");
}
/**
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 290f6f2..13c7747 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
@@ -1,6 +1,7 @@
package org.jeecg.modules.mdc.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -38,9 +39,14 @@
@ApiModelProperty(value = "涓婚敭")
private String id;
/**
+ * 璁惧缂栧彿
+ */
+ @Excel(name = "璁惧缂栧彿", width = 15)
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ private String equipmentId;
+ /**
* 鏍囧噯鍔犲伐鏃堕棿id
*/
- @Excel(name = "鏍囧噯鍔犲伐鏃堕棿id", width = 15)
@ApiModelProperty(value = "鏍囧噯鍔犲伐鏃堕棿id")
private String standardId;
/**
@@ -64,4 +70,7 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ @TableField(exist = false)
+ private String equipmentIds;
+
}
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 b1a98c6..9d3a72d 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
@@ -46,4 +46,13 @@
* @return
*/
MdcProcessQuantityDto findById(String id);
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcProcessQuantity
+ * @return
+ */
+ boolean addData(MdcProcessQuantity mdcProcessQuantity);
+
}
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 1082564..371afbc 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
@@ -16,6 +16,7 @@
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.ModelAndView;
@@ -141,4 +142,27 @@
public MdcProcessQuantityDto findById(String id) {
return this.baseMapper.findById(id);
}
+
+
+ /**
+ * 娣诲姞鏁版嵁
+ *
+ * @param mdcProcessQuantity
+ * @return
+ */
+ @Override
+ public boolean addData(MdcProcessQuantity mdcProcessQuantity) {
+ boolean result = false;
+ String[] equipmentIds = mdcProcessQuantity.getEquipmentIds().split(",");
+ for (String equipmentId : equipmentIds) {
+ MdcProcessQuantity processQuantity = new MdcProcessQuantity();
+ BeanUtils.copyProperties(mdcProcessQuantity, processQuantity);
+ processQuantity.setEquipmentId(equipmentId);
+ boolean b = super.save(processQuantity);
+ if (b) {
+ result = true;
+ }
+ }
+ return result;
+ }
}
--
Gitblit v1.9.3