From 53e1e15513dbc648bd87b2c62cf361f72ae1f176 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 05 九月 2023 17:09:21 +0800
Subject: [PATCH] 保养移交单 精度检验单
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FinishTransferOrder.java | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java | 15 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IPrecisionInspectionService.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 54 ++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentPrecisionParameters.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspectionDetail.java | 27 +----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/PrecisionInspectionMapper.java | 5 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml | 32 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PrecisionInspectionServiceImpl.java | 7 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java | 33 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java | 78 +++++++++++++++
12 files changed, 235 insertions(+), 30 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index d6914d6..06c690a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -92,6 +92,18 @@
@Autowired
private ISysUserService sysUserService;
+ @Autowired
+ private IPrecisionInspectionService precisionInspectionService;
+
+ @Autowired
+ private IEamEquipmentService equipmentService;
+
+ @Autowired
+ private IEquipmentPrecisionParametersService equipmentPrecisionParametersService;
+
+ @Autowired
+ private IPrecisionInspectionDetailService precisionInspectionDetailService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -219,6 +231,7 @@
dailyMaintenanceOrder.setPlanEndTime(date);//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
dailyMaintenanceOrder.setCreateType("1");//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
dailyMaintenanceOrder.setConfirmStatus("0");//绉讳氦纭鐘舵�侊紙0鏈‘璁わ紝1涓讳换纭锛�2妫�楠屽憳纭锛�
+ dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//绮惧害妫�楠屽崟娴佺▼鐘舵�侊紙0鏈‘璁わ紝1绮惧害妫�楠岃�咃紝2缁翠慨瀹や富浠伙紝3璁惧妫�楠屽憳锛�4浣跨敤鍗曚綅鎶�鏈富绠★紝5璁惧妫�楠屽憳锛堢洊绔狅級锛�
dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
@@ -442,9 +455,25 @@
List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery()
.eq(FinishTransferOrder::getMaintenanceOrderId, id)
+ .eq(FinishTransferOrder::getDelFlag,0)
.eq(FinishTransferOrder::getEquipmentId, maintenanceOrder.getEquipmentId()).list();
for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
finishTransferOrderService.removeById(finishTransferOrder);
+ }
+
+ List<PrecisionInspection> precisionInspectionList = precisionInspectionService.lambdaQuery()
+ .eq(PrecisionInspection::getMaintenanceOrderId, id)
+ .eq(PrecisionInspection::getDelFlag,0)
+ .eq(PrecisionInspection::getEquipmentId, maintenanceOrder.getEquipmentId()).list();
+ for (PrecisionInspection precisionInspection : precisionInspectionList) {
+ List<PrecisionInspectionDetail> precisionInspectionDetails = precisionInspectionDetailService.lambdaQuery()
+ .eq(PrecisionInspectionDetail::getPrecisionInspectionId, precisionInspection.getId())
+ .eq(PrecisionInspectionDetail::getDelFlag,0)
+ .list();
+ for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetails) {
+ precisionInspectionDetailService.removeById(precisionInspectionDetail);
+ }
+ precisionInspectionService.removeById(precisionInspection);
}
if (b) {
@@ -488,6 +517,8 @@
finishTransferOrder.setDelFlag(0);
finishTransferOrderService.save(finishTransferOrder);
+ this.createPrecisionInspection(maintenanceOrder);
+
if (!b) {
return Result.error("鎶ュ伐澶辫触!");
} else {
@@ -495,6 +526,29 @@
}
}
+ void createPrecisionInspection(DailyMaintenanceOrder dailyMaintenanceOrder){
+ PrecisionInspection precisionInspection = new PrecisionInspection();
+ precisionInspection.setMaintenanceOrderId(dailyMaintenanceOrder.getId());
+ precisionInspection.setEquipmentId(dailyMaintenanceOrder.getEquipmentId());
+ precisionInspectionService.save(precisionInspection);
+
+ List<EquipmentPrecisionParameters> equipmentPrecisionParameters = equipmentPrecisionParametersService.lambdaQuery()
+ .eq(EquipmentPrecisionParameters::getEquipmentId, dailyMaintenanceOrder.getEquipmentId())
+ .eq(EquipmentPrecisionParameters::getDelFlag, "0").list();
+ PrecisionInspectionDetail precisionInspectionDetail = null;
+ for (EquipmentPrecisionParameters equipmentPrecisionParameter : equipmentPrecisionParameters) {
+ precisionInspectionDetail = new PrecisionInspectionDetail();
+ precisionInspectionDetail.setPrecisionInspectionId(precisionInspection.getId());
+ precisionInspectionDetail.setEquipmentId(dailyMaintenanceOrder.getEquipmentId());
+ precisionInspectionDetail.setPrecisionParametersId(equipmentPrecisionParameter.getPrecisionParametersId());
+
+ String upperLimit = equipmentPrecisionParameter.getUpperLimit()+"";
+ String lowerLimit = equipmentPrecisionParameter.getLowerLimit()+"";
+ precisionInspectionDetail.setTolerance("["+upperLimit+"鈥�"+lowerLimit+"]");
+ precisionInspectionDetailService.save(precisionInspectionDetail);
+ }
+ }
+
/**
* 鏃ュ父淇濆吇宸ュ崟 鑾峰彇璁惧鍙扮珯宸茬粦瀹氱殑瀵硅薄閮ㄩ棬
* qsw 2023-7-11
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
index c551c47..3659766 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
@@ -94,6 +94,39 @@
return Result.OK(pageList);
}
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param equipmentPrecisionParameters
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "mom_eam_equipment_precision_parameters-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="mom_eam_equipment_precision_parameters-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment_precision_parameters-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/getByEquipmentId")
+ public Result<IPage<EquipmentPrecisionParameters>> getByEquipmentId(EquipmentPrecisionParameters equipmentPrecisionParameters,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EquipmentPrecisionParameters> queryWrapper = QueryGenerator.initQueryWrapper(equipmentPrecisionParameters, req.getParameterMap());
+ Page<EquipmentPrecisionParameters> page = new Page<EquipmentPrecisionParameters>(pageNo, pageSize);
+ IPage<EquipmentPrecisionParameters> pageList = equipmentPrecisionParametersService.page(page, queryWrapper);
+ for (EquipmentPrecisionParameters parameters : pageList.getRecords()) {
+ String precisionParametersId = parameters.getPrecisionParametersId();
+ PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
+ if(precisionParameters != null){
+ parameters.setPrecisionParametersNum(precisionParameters.getNum());
+ parameters.setPrecisionParametersName(precisionParameters.getName());
+ }
+ String upperLimit = parameters.getUpperLimit()+"";
+ String lowerLimit = parameters.getLowerLimit()+"";
+ parameters.setTolerance("["+upperLimit+"鈥�"+lowerLimit+"]");
+ }
+ return Result.OK(pageList);
+ }
+
/**
* 娣诲姞
*
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
index a21d417..e5e5261 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
@@ -6,11 +6,16 @@
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.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
+import org.jeecg.modules.eam.entity.FinishTransferOrder;
import org.jeecg.modules.eam.entity.PrecisionInspection;
+import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IPrecisionInspectionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,8 +24,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
- /**
+/**
* @Description: mom_eam_precision_inspection
* @Author: jeecg-boot
* @Date: 2023-09-04
@@ -33,6 +40,9 @@
public class PrecisionInspectionController extends JeecgController<PrecisionInspection, IPrecisionInspectionService> {
@Autowired
private IPrecisionInspectionService precisionInspectionService;
+
+ @Autowired
+ private IDailyMaintenanceOrderService dailyMaintenanceOrderService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -158,4 +168,70 @@
return super.importExcel(request, response, PrecisionInspection.class);
}
+ /**
+ * 鏃ュ父鐐规
+ * qsw 2023-4-26
+ */
+ @GetMapping("getPrecisionInspectionList")
+ public Result<?> getPrecisionInspectionList(@RequestParam(name = "maintenanceOrderId", required = true) String maintenanceOrderId) {
+ List<Map<String, Object>> precisionInspectionList = precisionInspectionService.getPrecisionInspectionList(maintenanceOrderId);
+ return Result.ok(precisionInspectionList);
+ }
+
+
+ /**
+ * 璁惧绮惧害妫�楠屾祦绋�
+ */
+ @RequestMapping(value = "/precisionInspection", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> precisionInspection(@RequestBody PrecisionInspection precisionInspection) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = sysUser.getId();
+
+ PrecisionInspection preInspection = precisionInspectionService.getById(precisionInspection.getId());
+ DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
+ String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();
+
+ if ("0".equals(precisionInspectionStatus)){
+ preInspection.setPrecisionInspectionUser(userId);
+ precisionInspectionService.updateById(preInspection);
+
+ maintenanceOrder.setPrecisionInspectionStatus("1");
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ }else if("1".equals(precisionInspectionStatus)){
+ preInspection.setRepairDirectorUser(userId);
+ precisionInspectionService.updateById(preInspection);
+
+ maintenanceOrder.setPrecisionInspectionStatus("2");
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ }else if("2".equals(precisionInspectionStatus)){
+ preInspection.setEachTolerance(precisionInspection.getEachTolerance());
+ preInspection.setPartTolerance(precisionInspection.getPartTolerance());
+ preInspection.setEquipmentInspectorUser(userId);
+ precisionInspectionService.updateById(preInspection);
+
+ maintenanceOrder.setPrecisionInspectionStatus("3");
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ } else if("3".equals(precisionInspectionStatus)){
+ preInspection.setSparePart(precisionInspection.getSparePart());
+ preInspection.setProcessPass(precisionInspection.getProcessPass());
+ preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
+ preInspection.setUseUnitDirectorUser(userId);
+ precisionInspectionService.updateById(preInspection);
+
+ maintenanceOrder.setPrecisionInspectionStatus("4");
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ }else if("4".equals(precisionInspectionStatus)){
+ preInspection.setEquipmentInspectorSignUser(userId);
+ preInspection.setJudgmentResult(precisionInspection.getJudgmentResult());
+ precisionInspectionService.updateById(preInspection);
+
+ maintenanceOrder.setPrecisionInspectionStatus("5");
+ maintenanceOrder.setStatus("8");
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ }
+
+
+ return Result.OK("瀹℃壒鎴愬姛!");
+ }
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
index 6a538ef..018ebde 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
@@ -120,6 +120,9 @@
@ApiModelProperty(value = "绉讳氦纭鐘舵�侊紙0鏈‘璁わ紝1涓讳换纭锛�2妫�楠屽憳纭锛�")
private String confirmStatus;
+ @ApiModelProperty(value = "绮惧害妫�楠屽崟娴佺▼鐘舵�侊紙0鏈‘璁わ紝1绮惧害妫�楠岃�咃紝2缁翠慨瀹や富浠伙紝3璁惧妫�楠屽憳锛�4浣跨敤鍗曚綅鎶�鏈富绠★紝5璁惧妫�楠屽憳锛堢洊绔狅級锛�")
+ private String precisionInspectionStatus;
+
@ApiModelProperty(value = "闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�")
private String description;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentPrecisionParameters.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentPrecisionParameters.java
index d86c766..8209733 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentPrecisionParameters.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentPrecisionParameters.java
@@ -125,4 +125,8 @@
@TableField(exist = false)
private String precisionParametersUnitName;
+
+ //鍏佸樊 鐢ㄤ簬鐢熶骇娌堝寳绮惧害妫�楠屽崟
+ @TableField(exist = false)
+ private String tolerance;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FinishTransferOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FinishTransferOrder.java
index c0fd03d..4fdb78d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FinishTransferOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FinishTransferOrder.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.constant.CommonConstant;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -103,7 +104,7 @@
@Excel(name = "delFlag", width = 15)
@ApiModelProperty(value = "delFlag")
@TableLogic
- private Integer delFlag;
+ private Integer delFlag= CommonConstant.DEL_FLAG_0;
/**remark*/
@Excel(name = "remark", width = 15)
@ApiModelProperty(value = "remark")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java
index a409c05..b8210be 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java
@@ -4,12 +4,12 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.constant.CommonConstant;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -91,7 +91,7 @@
/**璁惧鍒ゅ畾缁撴灉*/
@Excel(name = "璁惧鍒ゅ畾缁撴灉", width = 15)
@ApiModelProperty(value = "璁惧鍒ゅ畾缁撴灉")
- private Integer judgmentResult;
+ private String judgmentResult;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
@@ -120,9 +120,12 @@
@Excel(name = "delFlag", width = 15)
@ApiModelProperty(value = "delFlag")
@TableLogic
- private Integer delFlag;
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**璁惧妫�楠屽憳绛惧瓧锛堢洊绔狅級*/
@Excel(name = "璁惧妫�楠屽憳绛惧瓧锛堢洊绔狅級", width = 15)
@ApiModelProperty(value = "璁惧妫�楠屽憳绛惧瓧锛堢洊绔狅級")
private String equipmentInspectorSignUser;
+
+ @TableField(exist = false)
+ private List<PrecisionInspectionDetail> precisionInspectionDetailList;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspectionDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspectionDetail.java
index fe90cfb..8c6c849 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspectionDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspectionDetail.java
@@ -10,6 +10,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.entity.JeecgEntity;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -29,13 +31,9 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="mom_eam_precision_inspection_detail瀵硅薄", description="mom_eam_precision_inspection_detail")
-public class PrecisionInspectionDetail implements Serializable {
+public class PrecisionInspectionDetail extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭id*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭id")
- private String id;
/**绮惧害妫�楠岃〃id*/
@Excel(name = "绮惧害妫�楠岃〃id", width = 15)
@ApiModelProperty(value = "绮惧害妫�楠岃〃id")
@@ -64,22 +62,7 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
+
/**tenantId*/
@Excel(name = "tenantId", width = 15)
@ApiModelProperty(value = "tenantId")
@@ -88,5 +71,5 @@
@Excel(name = "delFlag", width = 15)
@ApiModelProperty(value = "delFlag")
@TableLogic
- private Integer delFlag;
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/PrecisionInspectionMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/PrecisionInspectionMapper.java
index 561b555..012577f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/PrecisionInspectionMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/PrecisionInspectionMapper.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.eam.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.PrecisionInspection;
+
+import java.util.List;
+import java.util.Map;
/**
* @Description: mom_eam_precision_inspection
@@ -11,4 +15,5 @@
*/
public interface PrecisionInspectionMapper extends BaseMapper<PrecisionInspection> {
+ List<Map<String, Object>> getPrecisionInspectionList(@Param("maintenanceOrderId")String maintenanceOrderId);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
index 05f68b5..0619819 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
@@ -2,4 +2,36 @@
<!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.PrecisionInspectionMapper">
+ <select id="getPrecisionInspectionList" parameterType="Map" resultType="Map">
+ SELECT
+ t1.id,
+ t1.maintenance_order_id AS maintenanceOrderId,
+ t2.depart_name AS maintenanceUnitName,
+ t3.realname AS precisionInspectionUserName,
+ t4.realname AS repairDirectorUserName,
+ t5.realname AS equipmentInspectorUserName,
+ t6.realname AS useUnitDirectorUserName,
+ t7.realname AS equipmentInspectorSignUserName,
+ t1.each_tolerance AS eachTolerance,
+ t1.part_tolerance AS partTolerance,
+ t1.process_pass AS processPass,
+ t1.meet_process_require AS meetProcessRequire,
+ t1.judgment_result AS judgmentResult,
+ t1.remark,
+ t8.name AS equipmentName,
+ t8.model AS equipmentModel,
+ t8.num AS equipmentNum,
+ t9.depart_name AS useUnitName
+ FROM
+ mom_eam_precision_inspection t1
+ LEFT JOIN sys_depart t2 ON t1.maintenance_unit = t2.id
+ LEFT JOIN sys_user t3 ON t1.precision_inspection_user = t3.id
+ LEFT JOIN sys_user t4 ON t1.repair_director_user = t4.id
+ LEFT JOIN sys_user t5 ON t1.equipment_inspector_user = t5.id
+ LEFT JOIN sys_user t6 ON t1.use_unit_director_user = t6.id
+ LEFT JOIN sys_user t7 ON t1.equipment_inspector_sign_user = t7.id
+ LEFT JOIN mom_eam_equipment t8 ON t1.equipment_id = t8.id
+ LEFT JOIN sys_depart t9 ON t1.use_unit = t9.id
+ where t1.del_flag = '0' and t1.maintenance_order_id = #{maintenanceOrderId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IPrecisionInspectionService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IPrecisionInspectionService.java
index 068ae32..ab81b8e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IPrecisionInspectionService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IPrecisionInspectionService.java
@@ -3,6 +3,9 @@
import org.jeecg.modules.eam.entity.PrecisionInspection;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+import java.util.Map;
+
/**
* @Description: mom_eam_precision_inspection
* @Author: jeecg-boot
@@ -11,4 +14,5 @@
*/
public interface IPrecisionInspectionService extends IService<PrecisionInspection> {
+ List<Map<String, Object>> getPrecisionInspectionList(String maintenanceOrderId);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PrecisionInspectionServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PrecisionInspectionServiceImpl.java
index 005e240..29aee37 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PrecisionInspectionServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PrecisionInspectionServiceImpl.java
@@ -7,6 +7,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import java.util.Map;
+
/**
* @Description: mom_eam_precision_inspection
* @Author: jeecg-boot
@@ -16,4 +19,8 @@
@Service
public class PrecisionInspectionServiceImpl extends ServiceImpl<PrecisionInspectionMapper, PrecisionInspection> implements IPrecisionInspectionService {
+ @Override
+ public List<Map<String, Object>> getPrecisionInspectionList(String maintenanceOrderId) {
+ return this.baseMapper.getPrecisionInspectionList(maintenanceOrderId);
+ }
}
--
Gitblit v1.9.3