From 725a6ed97f7501de1795fce78fbd42624b310015 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 16 五月 2025 15:03:33 +0800
Subject: [PATCH] art: 设备管理-设备处置 借用归还 列表，新增，编辑，提交
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java | 293 +++++++++++++-------------
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutQuery.java | 23 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java | 51 ++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java | 10
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentLeanOutMapper.java | 18 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentLeanOutMapper.xml | 7
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java | 35 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java | 182 ++++++++++++++++
9 files changed, 459 insertions(+), 162 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
index e1cf987..b5575e9 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
@@ -19,6 +19,8 @@
String SECOND_MAINTENANCE_CODE_RULE = "SecondMaintenanceCodeRule";
//涓変繚缂栫爜瑙勫垯
String THIRD_MAINTENANCE_CODE_RULE = "ThirdMaintenanceCodeRule";
+ //璁惧鍊熷嚭褰掕繕
+ String LEAN_OUT_CODE_RULE = "EquipmentLeanOutCodeRule";
/**
* 澶囦欢璇疯喘鍗曠姸鎬� 1:宸插垱寤� 2:宸叉彁浜� 3:宸查�氳繃 4:宸查┏鍥� 5:宸插畬鎴�
*/
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java
new file mode 100644
index 0000000..9cadba2
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java
@@ -0,0 +1,10 @@
+package org.jeecg.modules.eam.constant;
+
+public enum EquipmentLeanOutStatusEnum {
+ WAIT_SUBMIT, //寰呮彁浜�
+ WAIT_APPROVAL, //寰呭鎵�
+ WAIT_RETURN, //寰呭綊杩�
+ WAIT_CONFIRM, //寰呯‘璁�
+ COMPLETE, //宸插畬鎴�
+ ;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
index d6ee216..0c438eb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
@@ -1,167 +1,164 @@
package org.jeecg.modules.eam.controller;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
-import org.jeecg.modules.eam.service.IEamEquipmentLeanOutService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
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.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
+import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
+import org.jeecg.modules.eam.service.IEamEquipmentLeanOutService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+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-05-13
+ * @Date: 2025-05-13
* @Version: V1.0
*/
@Slf4j
-@Api(tags="璁惧鍊熷嚭褰掕繕")
+@Api(tags = "璁惧鍊熷嚭褰掕繕")
@RestController
@RequestMapping("/eam/eamEquipmentLeanOut")
public class EamEquipmentLeanOutController extends JeecgController<EamEquipmentLeanOut, IEamEquipmentLeanOutService> {
- @Autowired
- private IEamEquipmentLeanOutService eamEquipmentLeanOutService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamEquipmentLeanOut
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "璁惧鍊熷嚭褰掕繕-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁惧鍊熷嚭褰掕繕-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧鍊熷嚭褰掕繕-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamEquipmentLeanOut eamEquipmentLeanOut,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamEquipmentLeanOut> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipmentLeanOut, req.getParameterMap());
- Page<EamEquipmentLeanOut> page = new Page<EamEquipmentLeanOut>(pageNo, pageSize);
- IPage<EamEquipmentLeanOut> pageList = eamEquipmentLeanOutService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamEquipmentLeanOut
- * @return
- */
- @AutoLog(value = "璁惧鍊熷嚭褰掕繕-娣诲姞")
- @ApiOperation(value="璁惧鍊熷嚭褰掕繕-娣诲姞", notes="璁惧鍊熷嚭褰掕繕-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamEquipmentLeanOut eamEquipmentLeanOut) {
- eamEquipmentLeanOutService.save(eamEquipmentLeanOut);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamEquipmentLeanOut
- * @return
- */
- @AutoLog(value = "璁惧鍊熷嚭褰掕繕-缂栬緫")
- @ApiOperation(value="璁惧鍊熷嚭褰掕繕-缂栬緫", notes="璁惧鍊熷嚭褰掕繕-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamEquipmentLeanOut eamEquipmentLeanOut) {
- eamEquipmentLeanOutService.updateById(eamEquipmentLeanOut);
- 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) {
- eamEquipmentLeanOutService.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.eamEquipmentLeanOutService.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) {
- EamEquipmentLeanOut eamEquipmentLeanOut = eamEquipmentLeanOutService.getById(id);
- return Result.OK(eamEquipmentLeanOut);
- }
+ @Autowired
+ private IEamEquipmentLeanOutService eamEquipmentLeanOutService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamEquipmentLeanOut
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamEquipmentLeanOut eamEquipmentLeanOut) {
- return super.exportXls(request, eamEquipmentLeanOut, EamEquipmentLeanOut.class, "璁惧鍊熷嚭褰掕繕");
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param query
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "璁惧鍊熷嚭褰掕繕-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鍊熷嚭褰掕繕-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamEquipmentLeanOutQuery query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Page<EamEquipmentLeanOut> page = new Page<EamEquipmentLeanOut>(pageNo, pageSize);
+ IPage<EamEquipmentLeanOut> pageList = eamEquipmentLeanOutService.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, EamEquipmentLeanOut.class);
- }
+ /**
+ * 娣诲姞
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧鍊熷嚭褰掕繕-娣诲姞")
+ @ApiOperation(value = "璁惧鍊熷嚭褰掕繕-娣诲姞", notes = "璁惧鍊熷嚭褰掕繕-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamEquipmentLeanOut request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.LEAN_OUT_CODE_RULE);
+ request.setCode(codeSeq);
+ request.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name());
+ boolean b = eamEquipmentLeanOutService.addLeanOut(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 EamEquipmentLeanOut request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ boolean b = eamEquipmentLeanOutService.editLeanOut(request);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
+ 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) {
+ eamEquipmentLeanOutService.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.eamEquipmentLeanOutService.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) {
+ EamEquipmentLeanOut eamEquipmentLeanOut = eamEquipmentLeanOutService.getById(id);
+ return Result.OK(eamEquipmentLeanOut);
+ }
+
+ /**
+ * 鎻愪氦
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧鍊熷嚭褰掕繕-鎻愪氦")
+ @ApiOperation(value = "璁惧鍊熷嚭褰掕繕-鎻愪氦", notes = "璁惧鍊熷嚭褰掕繕-鎻愪氦")
+ @GetMapping(value = "/submit")
+ public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
+ boolean b = eamEquipmentLeanOutService.submit(id);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java
index 52f2534..cb95a7c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java
@@ -1,14 +1,18 @@
package org.jeecg.modules.eam.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;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -30,25 +34,21 @@
@ApiModelProperty(value = "涓婚敭")
private String id;
/**鍒涘缓浜�*/
- @Excel(name = "鍒涘缓浜�", width = 15)
@ApiModelProperty(value = "鍒涘缓浜�")
private String createBy;
/**鍒涘缓鏃堕棿*/
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
/**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
@ApiModelProperty(value = "鏇存柊浜�")
private String updateBy;
/**鏇存柊鏃堕棿*/
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
/**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
private Integer delFlag;
/**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
/**鍗曟嵁鍙�*/
@@ -56,32 +56,69 @@
@ApiModelProperty(value = "鍗曟嵁鍙�")
private String code;
/**鍊熷叆閮ㄩ棬*/
- @Excel(name = "鍊熷叆閮ㄩ棬", width = 15)
+ @Excel(name = "鍊熷叆閮ㄩ棬", width = 15, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
@ApiModelProperty(value = "鍊熷叆閮ㄩ棬")
+ @Dict(dicCode = "mdc_production, production_name, id")
private String leanDepartId;
/**鍊熷叆璐ｄ换浜�*/
@Excel(name = "鍊熷叆璐ｄ换浜�", width = 15)
@ApiModelProperty(value = "鍊熷叆璐ｄ换浜�")
+ @Dict(dicCode = "sys_user, realname, username")
private String leanPerson;
+ /**鍊熺敤鍘熷洜*/
+ @ApiModelProperty(value = "鍊熺敤鍘熷洜")
+ private String leanReason;
/**鍊熷嚭鐘舵��*/
@Excel(name = "鍊熷嚭鐘舵��", width = 15)
@ApiModelProperty(value = "鍊熷嚭鐘舵��")
+ @Dict(dicCode = "equipment_lean_out_status")
private String leanStatus;
/**鍊熷嚭寮�濮嬫椂闂�*/
- @ApiModelProperty(value = "鍊熷嚭寮�濮嬫椂闂�")
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date leanStartTime;
/**鍊熷嚭褰掕繕鏃堕棿*/
- @ApiModelProperty(value = "鍊熷嚭褰掕繕鏃堕棿")
+ @ApiModelProperty(value = "褰掕繕鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date leanEndTime;
/**瀹℃牳浜�*/
@Excel(name = "瀹℃牳浜�", width = 15)
@ApiModelProperty(value = "瀹℃牳浜�")
+ @Dict(dicCode = "sys_user, realname, username")
private String approvalUser;
+ /**瀹℃牳鎰忚*/
+ @Excel(name = "瀹℃牳鎰忚", width = 15)
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalComment;
/**瀹℃牳鏃堕棿*/
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date approvalTime;
+ /**纭浜�*/
+ @Excel(name = "纭浜�", width = 15)
+ @ApiModelProperty(value = "纭浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String confirmUser;
+ /**纭鎰忚*/
+ @Excel(name = "纭鎰忚", width = 15)
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /**纭鏃堕棿*/
+ @ApiModelProperty(value = "纭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentLeanOutMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentLeanOutMapper.java
index 219bba5..7354c3c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentLeanOutMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentLeanOutMapper.java
@@ -1,17 +1,27 @@
package org.jeecg.modules.eam.mapper;
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 璁惧鍊熷嚭褰掕繕
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-05-13
* @Version: V1.0
*/
public interface EamEquipmentLeanOutMapper extends BaseMapper<EamEquipmentLeanOut> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param queryWrapper
+ * @return
+ */
+ IPage<EamEquipmentLeanOut> queryPageList(Page<EamEquipmentLeanOut> page, @Param(Constants.WRAPPER) QueryWrapper<EamEquipmentLeanOut> queryWrapper);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentLeanOutMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentLeanOutMapper.xml
index ac1049f..8111445 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentLeanOutMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentLeanOutMapper.xml
@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamEquipmentLeanOutMapper">
+ <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamEquipmentLeanOut">
+ select wmo.*, e.equipment_code, e.equipment_name
+ from eam_equipment_lean_out wmo
+ inner join eam_equipment e
+ on wmo.equipment_id = e.id
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutQuery.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutQuery.java
new file mode 100644
index 0000000..0974597
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutQuery.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.eam.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class EamEquipmentLeanOutQuery {
+ private String code;
+ private String equipmentId;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date leanDateBegin;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date leanDateEnd;
+ private String leanStatus;
+
+ private String column;
+ private String order;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
index 4e9fb79..34979bb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
@@ -1,14 +1,47 @@
package org.jeecg.modules.eam.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
/**
* @Description: 璁惧鍊熷嚭褰掕繕
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-05-13
* @Version: V1.0
*/
public interface IEamEquipmentLeanOutService extends IService<EamEquipmentLeanOut> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param query
+ * @return
+ */
+ IPage<EamEquipmentLeanOut> queryPageList(Page<EamEquipmentLeanOut> page, EamEquipmentLeanOutQuery query);
+
+ /**
+ * 娣诲姞鍊熷嚭璁板綍
+ *
+ * @param request
+ * @return
+ */
+ boolean addLeanOut(EamEquipmentLeanOut request);
+
+ /**
+ * 缂栬緫
+ * @param request
+ * @return
+ */
+ boolean editLeanOut(EamEquipmentLeanOut request);
+
+ /**
+ * 鎻愪氦鐢宠
+ * @param id
+ * @return
+ */
+ boolean submit(String id);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
index 43209ae..c122711 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
@@ -1,19 +1,197 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.DataBaseConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.constant.AssetStatusEnum;
+import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
+import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.mapper.EamEquipmentLeanOutMapper;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
import org.jeecg.modules.eam.service.IEamEquipmentLeanOutService;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.system.service.IMdcProductionService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
/**
* @Description: 璁惧鍊熷嚭褰掕繕
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-05-13
* @Version: V1.0
*/
@Service
public class EamEquipmentLeanOutServiceImpl extends ServiceImpl<EamEquipmentLeanOutMapper, EamEquipmentLeanOut> implements IEamEquipmentLeanOutService {
+ @Resource
+ private EamEquipmentLeanOutMapper equipmentLeanOutMapper;
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
+ @Autowired
+ private IMdcProductionService mdcProductionService;
+ @Override
+ public IPage<EamEquipmentLeanOut> queryPageList(Page<EamEquipmentLeanOut> page, EamEquipmentLeanOutQuery query) {
+ QueryWrapper<EamEquipmentLeanOut> queryWrapper = new QueryWrapper<>();
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return page;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
+ }
+ //鎺у埗寰呮彁浜ょ姸鎬佺殑鏁版嵁鍙兘鏈汉鏌ョ湅
+ queryWrapper.and(i -> i.ne("wmo.lean_status", EquipmentLeanOutStatusEnum.WAIT_SUBMIT).or().eq("wmo.lean_person", sysUser.getUsername()));
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getCode())) {
+ queryWrapper.like("wmo.code", query.getCode());
+ }
+ if (StringUtils.isNotBlank(query.getLeanStatus())) {
+ queryWrapper.eq("wmo.lean_status", query.getLeanStatus());
+ }
+ if (query.getLeanDateBegin() != null && query.getLeanDateEnd() != null) {
+ queryWrapper.between("wmo.lean_start_time", query.getLeanDateBegin(), query.getLeanDateEnd());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+
+ return equipmentLeanOutMapper.queryPageList(page, queryWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean addLeanOut(EamEquipmentLeanOut request) {
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
+ throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽鍊熷嚭锛�");
+ }
+ if (StringUtils.isBlank(request.getLeanDepartId())) {
+ throw new JeecgBootException("鍊熷叆杞﹂棿涓嶅厑璁镐负绌猴紒");
+ }
+ if (request.getLeanDepartId().equals(equipment.getOrgId())) {
+ throw new JeecgBootException("褰撳墠璁惧灞炰簬姝よ溅闂达紝涓嶉渶瑕佸�熺敤锛�");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞鍊熺敤璁板綍锛�");
+ }
+ request.setLeanPerson(sysUser.getUsername());
+ return equipmentLeanOutMapper.insert(request) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean editLeanOut(EamEquipmentLeanOut request) {
+ EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瑕佺紪杈戠殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if(!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getLeanStatus())) {
+ throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
+ }
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
+ throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽鍊熷嚭锛�");
+ }
+ if (StringUtils.isBlank(request.getLeanDepartId())) {
+ throw new JeecgBootException("鍊熷叆杞﹂棿涓嶅厑璁镐负绌猴紒");
+ }
+ if (request.getLeanDepartId().equals(equipment.getOrgId())) {
+ throw new JeecgBootException("褰撳墠璁惧灞炰簬姝よ溅闂达紝涓嶉渶瑕佸�熺敤锛�");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫鍊熺敤璁板綍锛�");
+ }
+ UpdateWrapper<EamEquipmentLeanOut> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("equipment_id", request.getEquipmentId());
+ updateWrapper.set("lean_depart_id", request.getLeanDepartId());
+ updateWrapper.set("remark", request.getRemark());
+ updateWrapper.set("lean_reason", request.getLeanReason());
+ updateWrapper.eq("id", request.getId());
+ updateWrapper.eq("lean_person", sysUser.getUsername());
+ return super.update(updateWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean submit(String id) {
+ EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(id);
+ if (entity == null) {
+ throw new JeecgBootException("瑕佹彁浜ょ殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if(!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getLeanStatus())) {
+ throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
+ }
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
+ throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽鍊熷嚭锛�");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫鍊熺敤璁板綍锛�");
+ }
+ UpdateWrapper<EamEquipmentLeanOut> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("lean_status", EquipmentLeanOutStatusEnum.WAIT_APPROVAL.name());
+ updateWrapper.eq("id", id);
+ updateWrapper.eq("lean_person", sysUser.getUsername());
+ boolean success = super.update(updateWrapper);
+ if(success) {
+ equipment.setAssetStatus(AssetStatusEnum.LEAN_OUT.name());
+ eamEquipmentService.updateById(equipment);
+ }
+ //鍚姩瀹℃壒娴佺▼ TODO
+ return true;
+ }
}
--
Gitblit v1.9.3