From 5c2b404e76f1d263b88e0dd2e26527fe8f6c65da Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 17 Nov 2023 15:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DevicePDAController.java | 14 +- .../controller/EquRepairOrderController.java | 2 +- .../controller/EquSpareApplyController.java | 2 +- .../java/com/op/device/domain/EquOrder.java | 22 +++ .../op/device/domain/EquOrderStandard.java | 20 +-- .../com/op/device/domain/EquRepairOrder.java | 45 +++-- .../op/device/domain/EquRepairWorkOrder.java | 158 +++++++++++++---- .../com/op/device/domain/EquSpareApply.java | 33 ++++ .../com/op/device/mapper/EquOrderMapper.java | 8 + .../device/mapper/EquOrderStandardMapper.java | 19 ++- .../device/mapper/EquRepairOrderMapper.java | 17 ++ .../mapper/EquRepairWorkOrderMapper.java | 26 ++- .../op/device/service/IDevicePDAService.java | 3 + .../service/IEquRepairOrderService.java | 3 +- .../device/service/IEquSpareApplyService.java | 3 +- .../service/impl/DevicePDAServiceImpl.java | 160 ++++++++++++++++-- .../impl/EquOutsourceWorkServiceImpl.java | 2 - .../impl/EquRepairOrderServiceImpl.java | 98 ++++++++--- .../impl/EquRepairWorkOrderServiceImpl.java | 51 +++++- .../impl/EquSpareApplyServiceImpl.java | 57 ++++++- .../mapper/device/EquOrderMapper.xml | 27 +++ .../mapper/device/EquOrderStandardMapper.xml | 63 ++++++- .../mapper/device/EquRepairOrderMapper.xml | 72 +++++++- .../device/EquRepairWorkOrderMapper.xml | 103 ++++++++++- 24 files changed, 870 insertions(+), 138 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java index 83cb43f66..b9734629c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -78,7 +78,18 @@ public class DevicePDAController { //维修 /** - * 获取维修记录（待处理和已经维修完成） + * 获取维修记录（待处理） + * + * @param equRepairWorkOrder + * @return + */ + @GetMapping("/getMaintenancePendRecords") + public AjaxResult getMaintenancePendRecords(EquRepairWorkOrder equRepairWorkOrder) { + return devicePDAService.getMaintenancePendRecords(equRepairWorkOrder); + } + + /** + * 获取维修记录（除了待维修的） * * @param equRepairWorkOrder * @return @@ -125,5 +136,4 @@ public class DevicePDAController { public AjaxResult updateMaintenanceRecords(@RequestBody EquRepairWorkOrder equRepairWorkOrder) { return devicePDAService.updateMaintenanceRecords(equRepairWorkOrder); } - } diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java index 3e99e71d0..e77b96947 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java @@ -84,7 +84,7 @@ public class EquRepairOrderController extends BaseController { @Log(title = "故障报修", businessType = BusinessType.UPDATE) @PutMapping("/edit") public AjaxResult edit(@RequestBody EquRepairOrder equRepairOrder) { - return toAjax(equRepairOrderService.updateEquRepairOrder(equRepairOrder)); + return equRepairOrderService.updateEquRepairOrder(equRepairOrder); } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java index b67b4da2c..995dbf72b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java @@ -74,7 +74,7 @@ public class EquSpareApplyController extends BaseController { @Log(title = "申领记录", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EquSpareApply equSpareApply) { - return toAjax(equSpareApplyService.insertEquSpareApply(equSpareApply)); + return equSpareApplyService.insertEquSpareApply(equSpareApply); } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java index 439b112c4..886b3cfe2 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java @@ -150,6 +150,28 @@ public class EquOrder extends BaseEntity { private int days; private String equipmentName; + //检查项列表 + private List standardList; + + /** 检查项名称 */ + private String itemName; + + /** 检查项方法/工具 */ + private String itemMethod; + + /** 维护类型编码 */ + private String itemType; + + /** 维护类型名称 */ + private String itemTypeName; + + //标准列表 + public List getStandardList() { + return standardList; + } + public void setStandardList(List standardList) { + this.standardList = standardList; + } private String planRestrict; private String outsourceCode; diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java index 1071d4dea..e6821ea20 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java @@ -1,6 +1,9 @@ package com.op.device.domain; import java.math.BigDecimal; +import java.util.List; + +import com.op.common.core.domain.BaseFileData; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; @@ -83,6 +86,7 @@ public class EquOrderStandard extends BaseEntity { // 图片路径 private String picturePath; + private List picturePaths; private String standardTypeName; @@ -96,8 +100,12 @@ public class EquOrderStandard extends BaseEntity { private String repairPicture; - //检查项检查方法 - private String itemMethod; + public List getPicturePaths() { + return picturePaths; + } + public void setPicturePaths(List picturePaths) { + this.picturePaths = picturePaths; + } public String getRepairPicture() { return repairPicture; @@ -275,14 +283,6 @@ public class EquOrderStandard extends BaseEntity { return delFlag; } - //检查项检查方法 - public void setItemMethod(String itemMethod) { - this.itemMethod = itemMethod; - } - public String getItemMethod() { - return itemMethod; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java index 18d96105c..cfed63506 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.domain.BaseFileData; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; @@ -51,9 +52,13 @@ public class EquRepairOrder extends BaseEntity { @Excel(name = "是否立即处理") private String orderHandle; - /** 报修人 */ - @Excel(name = "报修人") - private String orderRepairman; + /** 报修人编号 */ + @Excel(name = "报修人编号") + private String orderRepairmanCode; + + /** 报修人名字 */ + @Excel(name = "报修人名字") + private String orderRepairmanName; /** 联系方式 */ @Excel(name = "联系方式") @@ -168,7 +173,10 @@ public class EquRepairOrder extends BaseEntity { //图片文件 private String fileList; - private List files; + private List files; + + //检查项列表 + private List checkList; //图片文件 public String getFileList() { @@ -177,10 +185,10 @@ public class EquRepairOrder extends BaseEntity { public void setFileList(String fileList) { this.fileList = fileList; } - public List getFiles() { + public List getFiles() { return files; } - public void setFiles(List files) { + public void setFiles(List files) { this.files = files; } @@ -355,12 +363,20 @@ public class EquRepairOrder extends BaseEntity { public String getOrderHandle() { return orderHandle; } - public void setOrderRepairman(String orderRepairman) { - this.orderRepairman = orderRepairman; + public void setOrderRepairmanCode(String orderRepairmanCode) { + this.orderRepairmanCode = orderRepairmanCode; } - public String getOrderRepairman() { - return orderRepairman; + public String getOrderRepairmanCode() { + return orderRepairmanCode; + } + + public void setOrderRepairmanName(String orderRepairmanName) { + this.orderRepairmanName = orderRepairmanName; + } + + public String getOrderRepairmanName() { + return orderRepairmanName; } public void setOrderConnection(String orderConnection) { this.orderConnection = orderConnection; @@ -440,6 +456,13 @@ public class EquRepairOrder extends BaseEntity { return factoryCode; } + public List getCheckList() { + return checkList; + } + public void setCheckList(List checkList) { + this.checkList = checkList; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -451,7 +474,7 @@ public class EquRepairOrder extends BaseEntity { .append("orderSource", getOrderSource()) .append("orderTime", getOrderTime()) .append("orderHandle", getOrderHandle()) - .append("orderRepairman", getOrderRepairman()) + .append("orderRepairmanCode", getOrderRepairmanCode()) .append("orderConnection", getOrderConnection()) .append("orderStatus", getOrderStatus()) .append("orderRelevance", getOrderRelevance()) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java index f5c53c28e..17e53d243 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.domain.BaseFileData; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; @@ -80,9 +81,8 @@ public class EquRepairWorkOrder extends BaseEntity { private String workFaultDesc; /** 维修用时 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "维修用时", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date workCostTime; + @Excel(name = "维修用时") + private String workCostTime; /** 维修费用 */ @Excel(name = "维修费用") @@ -129,6 +129,12 @@ public class EquRepairWorkOrder extends BaseEntity { @Excel(name = "维修结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private String workEndTime; + //维修停机真正开始时间 + private String actualDownStartTime; + + //维修停机真正结束时间 + private String actualDownEndTime; + // 设备 /** 设备名称 */ @Excel(name = "设备名称") @@ -150,6 +156,14 @@ public class EquRepairWorkOrder extends BaseEntity { @Excel(name = "部门") private String department; + /** 所属工作中心编码 */ + @Excel(name = "所属工作中心编码") + private String workshopCode; + + /** 所属工作中心名称 */ + @Excel(name = "所属工作中心名称") + private String workshopName; + //报修 /** 故障描述 */ @Excel(name = "故障描述") @@ -170,20 +184,16 @@ public class EquRepairWorkOrder extends BaseEntity { private Date orderTime; /** 报修人 */ - @Excel(name = "报修人") - private String orderRepairman; + private String orderRepairmanCode; /** 联系方式 */ - @Excel(name = "联系方式") private String orderConnection; //班组 /** 班组名称 */ - @Excel(name = "班组名称") private String teamName; /** 班组人员 */ - @Excel(name = "班组人员") private String teamPerson; //时间列表 虚拟字段 @@ -209,11 +219,58 @@ public class EquRepairWorkOrder extends BaseEntity { //手持 //用户id private String userId; + //检查项列表 - private List checkList; + private List detailList; + + //维修前照片 + private String beforeRepairFile; + private List beforeRepairFiles; + + //维修后照片 + private String afterRepairFile; + private List afterRepairFiles; + //申领单列表 private List applyList; + //维修前 维修后 + public String getAfterRepairFile() { + return afterRepairFile; + } + public void setAfterRepairFile(String afterRepairFile) { + this.afterRepairFile = afterRepairFile; + } + + public List getAfterRepairFiles() { + return afterRepairFiles; + } + public void setAfterRepairFiles(List afterRepairFiles) { + this.afterRepairFiles = afterRepairFiles; + } + + public String getBeforeRepairFile() { + return beforeRepairFile; + } + public void setBeforeRepairFile(String beforeRepairFile) { + this.beforeRepairFile = beforeRepairFile; + } + + public List getBeforeRepairFiles() { + return beforeRepairFiles; + } + public void setBeforeRepairFiles(List beforeRepairFiles) { + this.beforeRepairFiles = beforeRepairFiles; + } + + //detailList 检查项详情 + public List getDetailList() { + return detailList; + } + public void setDetailList(List detailList) { + this.detailList = detailList; + } + //报修 public void setOrderDesc(String orderDesc) { this.orderDesc = orderDesc; @@ -243,12 +300,13 @@ public class EquRepairWorkOrder extends BaseEntity { return orderTime; } - public void setOrderRepairman(String orderRepairman) { - this.orderRepairman = orderRepairman; + public void setOrderRepairmanCode(String orderRepairmanCode) { + this.orderRepairmanCode = orderRepairmanCode; } - public String getOrderRepairman() { - return orderRepairman; + public String getOrderRepairmanCode() { + return orderRepairmanCode; } + public void setOrderConnection(String orderConnection) { this.orderConnection = orderConnection; } @@ -292,6 +350,20 @@ public class EquRepairWorkOrder extends BaseEntity { return department; } + public void setWorkshopCode(String workshopCode) { + this.workshopCode = workshopCode; + } + public String getWorkshopCode() { + return workshopCode; + } + + public void setWorkshopName(String workshopName) { + this.workshopName = workshopName; + } + public String getWorkshopName() { + return workshopName; + } + public void setWorkId(String workId) { this.workId = workId; } @@ -299,6 +371,7 @@ public class EquRepairWorkOrder extends BaseEntity { return workId; } + public void setOrderId(String orderId) { this.orderId = orderId; } @@ -397,10 +470,10 @@ public class EquRepairWorkOrder extends BaseEntity { return workFaultDesc; } - public void setWorkCostTime(Date workCostTime) { + public void setWorkCostTime(String workCostTime) { this.workCostTime = workCostTime; } - public Date getWorkCostTime() { + public String getWorkCostTime() { return workCostTime; } @@ -528,17 +601,17 @@ public class EquRepairWorkOrder extends BaseEntity { } //计划停机开始时间、结束时间 - public String getWorkPlanTimeStart() { - return workPlanTimeStart; + public String getActualDownStartTime() { + return actualDownStartTime; } - public void setWorkPlanTimeStart(String workPlanTimeStart) { - this.workPlanTimeStart = workPlanTimeStart; + public void setActualDownStartTime(String actualDownStartTime) { + this.actualDownStartTime = actualDownStartTime; } - public String getWorkPlanTimeEnd() { - return workPlanTimeEnd; + public String getActualDownEndTime() { + return actualDownEndTime; } - public void setWorkPlanTimeEnd(String workPlanTimeEnd) { - this.workPlanTimeEnd = workPlanTimeEnd; + public void setActualDownEndTime(String actualDownEndTime) { + this.actualDownEndTime = actualDownEndTime; } //委外维修人员/委外维修原因 虚拟字段 @@ -578,13 +651,6 @@ public class EquRepairWorkOrder extends BaseEntity { return userId; } - public List getCheckList() { - return checkList; - } - public void setCheckList(List checkList) { - this.checkList = checkList; - } - public List getApplyList() { return applyList; } @@ -592,6 +658,38 @@ public class EquRepairWorkOrder extends BaseEntity { this.applyList = applyList; } + //实际停机开始时间、结束时间 + public String getWorkPlanTimeStart() { + return workPlanTimeStart; + } + public void setWorkPlanTimeStart(String workPlanTimeStart) { + this.workPlanTimeStart = workPlanTimeStart; + } + public String getWorkPlanTimeEnd() { + return workPlanTimeEnd; + } + public void setWorkPlanTimeEnd(String workPlanTimeEnd) { + this.workPlanTimeEnd = workPlanTimeEnd; + } + + //图片文件 + private String fileList; + private List files; + + //图片文件 + public String getFileList() { + return fileList; + } + public void setFileList(String fileList) { + this.fileList = fileList; + } + public List getFiles() { + return files; + } + public void setFiles(List files) { + this.files = files; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java index 682394d66..3c89a262b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java @@ -1,5 +1,6 @@ package com.op.device.domain; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -98,6 +99,13 @@ public class EquSpareApply extends BaseEntity { /** 领用类型 */ private String applyType ; + //批量新增申领记录 + private List spareApplyLists; + /** 库存表 id */ + private String storageId; + /** 总数量 */ + private BigDecimal amount; + public List getApplyTimeArray() { return applyTimeArray; } @@ -261,6 +269,31 @@ public class EquSpareApply extends BaseEntity { this.applyType=applyType; } + //批量新增申领记录 + public List getSpareApplyLists(){ + return this.spareApplyLists; + } + /** 领用类型 */ + public void setSpareApplyLists(List spareApplyLists){ + this.spareApplyLists = spareApplyLists; + } + + //id + public void setStorageId(String storageId) { + this.storageId = storageId; + } + public String getStorageId() { + return storageId; + } + + //总数量 + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + public BigDecimal getAmount() { + return amount; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java index d26f7fa09..5d29e9ffe 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquOrder; +import com.op.device.domain.EquOrderStandard; import com.op.device.domain.EquPlan; import com.op.device.domain.dto.PDADTO; import org.apache.ibatis.annotations.Mapper; @@ -120,6 +121,13 @@ public interface EquOrderMapper { */ List selectTodayTask(PDADTO pdadto); + /** + * PC获取点检、巡检检查项 + * @param + * @return + */ + List selectEquOrderDetailsList(EquOrder equOrder); + /** * 通过设备编码查询设备名称 * @param equipmentCode diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java index 98ee5be5e..87cf3a264 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java @@ -71,10 +71,23 @@ public interface EquOrderStandardMapper { List selectEquOrderStandardByParentCode(String code); /** - * 手持维修工单关联检查项信息 - * @param equOrder - * @return + * 图片数据绑定 + * @param files */ + void insertBaseFileBatch(List files); + + /** + * 删除图片 + */ + void deleteBaseFileBySourceId(String id); + + /** + * 查询图片 + */ + public List getBaseFileBatch(String id); + + //PC查询点检巡检报修 + List selectPdaEquOrderList(EquOrderStandard equOrderStandard); public List selectPdaEquOrderList(EquOrder equOrder); int insertEquOrderStandards(@Param("list") List standards); diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java index 61116121b..13282b06f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.domain.BaseFileData; import com.op.device.domain.EquEquipment; +import com.op.device.domain.EquFile; import com.op.device.domain.EquRepairOrder; import org.apache.ibatis.annotations.Param; @@ -85,4 +86,20 @@ public interface EquRepairOrderMapper { * @param repairCode */ void deleteEquRepairOrderByRepairCode(String repairCode); + + /** + * 批量新增报修图片 + */ + Boolean insertBaseFileBatch(@Param("baseFiles") List baseFiles); + + /** + * 删除报修图片 + */ + void deleteBaseFileBySourceId(String OrderId); + + /** + * 查询图片 + */ + public List getBaseFileBatch(String orderId); + } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java index 30d70d593..b38575b01 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java @@ -3,8 +3,10 @@ package com.op.device.mapper; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.domain.BaseFileData; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.EquTeamUser; +import org.apache.ibatis.annotations.Param; /** * 维修工单Mapper接口 @@ -22,13 +24,20 @@ public interface EquRepairWorkOrderMapper { public EquRepairWorkOrder selectEquRepairWorkOrderByWorkId(String workId); /** - * 查询维修工单列表 + * 查询维修工单列表（待维修记录） * * @param equRepairWorkOrder 维修工单 * @return 维修工单集合 */ public List selectEquRepairWorkOrderList(EquRepairWorkOrder equRepairWorkOrder); + /** + * 查询维修工单列表（维修记录） + * + * @param equRepairWorkOrder 维修工单 + * @return 维修工单集合 + */ + public List selectRepairWorkOrderList(EquRepairWorkOrder equRepairWorkOrder); /** * 新增维修工单 * @@ -70,4 +79,19 @@ public interface EquRepairWorkOrderMapper { //获取维修人员列表 @DS("master") public List getMaintenancePersonList(EquTeamUser equTeamUser); + + /** + * 查询图片 + */ + public List getBaseFileBatch(String workId); + + /** + * 删除报修图片 + */ + void deleteBaseFileBySourceId(String workId); + + /** + * 批量新增报修图片 + */ + Boolean insertBaseFileBatch(@Param("baseFiles") List baseFiles); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java index ffe359e4a..4542997e8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java @@ -90,4 +90,7 @@ public interface IDevicePDAService { * @return */ public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder); + + //待处理 + AjaxResult getMaintenancePendRecords(EquRepairWorkOrder equRepairWorkOrder); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java index 0af4af3af..ef98c30ed 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java @@ -2,6 +2,7 @@ package com.op.device.service; import java.util.List; +import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.EquEquipment; import com.op.device.domain.EquEquipment; import com.op.device.domain.EquRepairOrder; @@ -44,7 +45,7 @@ public interface IEquRepairOrderService { * @param equRepairOrder 故障报修 * @return 结果 */ - public int updateEquRepairOrder(EquRepairOrder equRepairOrder); + public AjaxResult updateEquRepairOrder(EquRepairOrder equRepairOrder); /** * 批量删除故障报修 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java index 6d4d67829..129331686 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java @@ -2,6 +2,7 @@ package com.op.device.service; import java.util.List; +import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.EquSpareApply; @@ -34,7 +35,7 @@ public interface IEquSpareApplyService { * @param equSpareApply 申领记录 * @return 结果 */ - public int insertEquSpareApply(EquSpareApply equSpareApply); + public AjaxResult insertEquSpareApply(EquSpareApply equSpareApply); /** * 修改申领记录 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 28962f58c..460201984 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -304,7 +304,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @DS("#header.poolName") public AjaxResult addRepairRecord(EquRepairOrder equRepairOrder) { try { - equRepairOrder.setOrderId(IdUtils.fastSimpleUUID()); + String id = IdUtils.fastSimpleUUID(); + equRepairOrder.setOrderId(id); // 获取故障报修流水号 String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber()); String equipmentCode = equRepairOrder.getEquipmentCode(); @@ -312,10 +313,33 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equRepairOrder.setOrderCode("BX"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum); equRepairOrder.setCreateTime(DateUtils.getNowDate()); equRepairOrder.setCreateBy(SecurityUtils.getUsername()); + equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername()); + equRepairOrder.setOrderTime(DateUtils.getNowDate()); equRepairOrder.setOrderStatus("待审核"); -// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); -// String key = "#header.poolName"; -// equRepairOrder.setFactory(request.getHeader(key.substring(8)).replace("ds_","")); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + equRepairOrderMapper.insertEquRepairOrder(equRepairOrder); + + //新增文件 + if (StringUtils.isNotEmpty(equRepairOrder.getFileList())) { + String[] ids1 = equRepairOrder.getFileList().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id1 : ids1) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id1.split("&fileName=")[1]); + file.setFileAddress(id1); + file.setSourceId(id); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + file.setImageType("3"); + files.add(file); + } + equRepairOrderMapper.insertBaseFileBatch(files); + } + return success("新增报修记录成功！"); } catch (Exception e) { return error(); @@ -323,14 +347,14 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } /** - * 获取维修记录 + * 获取维修记录(待维修) * * @param equRepairWorkOrder * @return */ @Override @DS("#header.poolName") - public AjaxResult getMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { + public AjaxResult getMaintenancePendRecords(EquRepairWorkOrder equRepairWorkOrder) { try { if (equRepairWorkOrder.getWorkPlanTimeArray() != null) { // 设置创建日期开始和结束值 @@ -356,6 +380,39 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } } + /** + * 获取待维修记录（除了待维修） + * + * @param equRepairWorkOrder + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult getMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { + try { + if (equRepairWorkOrder.getWorkPlanTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equRepairWorkOrder.getWorkPlanTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equRepairWorkOrder.setWorkPlanTimeStart(formatter.format(equRepairWorkOrder.getWorkPlanTimeArray().get(0))); + equRepairWorkOrder.setWorkPlanTimeEnd(formatter.format(equRepairWorkOrder.getWorkPlanTimeArray().get(1))); + } + } + if (equRepairWorkOrder.getWorkPlanDownTimeArray() != null) { + // 设置更新日期开始和结束 + if (equRepairWorkOrder.getWorkPlanDownTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equRepairWorkOrder.setWorkPlanDownTimeStart(formatter.format(equRepairWorkOrder.getWorkPlanDownTimeArray().get(0))); + equRepairWorkOrder.setWorkPlanDownTimeEnd(formatter.format(equRepairWorkOrder.getWorkPlanDownTimeArray().get(1))); + } + } + + List list = equRepairWorkOrderMapper.selectRepairWorkOrderList(equRepairWorkOrder); + return success(list); + } catch (Exception e) { + return error(); + } + } /** * 获取维修记录 * @@ -383,11 +440,12 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @DS("#header.poolName") public AjaxResult updateDowntime(EquRepairWorkOrder equRepairWorkOrder) { try { - if(equRepairWorkOrder.getWorkDownMachine().equals("0")){ - equRepairWorkOrder.setWorkPlanDownTime(null); - } + //不停机 那么实际停机开始时间和实际停机结束时间都没有 + //如果停机 那么实际停机时间就是传入的时间 停机时间必须选择校验 equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); + //维修中 + equRepairWorkOrder.setWorkStatus("2"); equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); return success("提交成功，开始维修！"); } catch (Exception e) { @@ -396,7 +454,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } /** - * 手持提交是否停机维修 停机维修的开始时间 + * * * @param equipmentId * @return @@ -426,13 +484,35 @@ public class DevicePDAServiceImpl implements IDevicePDAService { //查询对应检查项信息 EquOrder equOrder = new EquOrder(); equOrder.setWorkCode(list.getWorkCode()); - List checkLists = equOrderStandardMapper.selectPdaEquOrderList(equOrder); - list.setCheckList(checkLists); + //检查项 + List checkLists = equOrderMapper.selectEquOrderDetailsList(equOrder); + //每个检查项对应的检测标准 + for(EquOrder equOrder1 :checkLists){ + EquOrderStandard equOrderStandard = new EquOrderStandard(); + equOrderStandard.setOrderCode(equOrder1.getOrderCode()); + List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); + for(EquOrderStandard standardList :standardLists){ + //每个检查标准里面的照片 + List files = equOrderStandardMapper.getBaseFileBatch(standardList.getId()); + if (!CollectionUtils.isEmpty(files)) { + standardList.setPicturePaths(files); + } + } + equOrder1.setStandardList(standardLists); + } + list.setDetailList(checkLists); + //备件申领单 EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder(); equRepairWorkOrder.setWorkCode(list.getWorkCode()); List applyLists = equSpareApplyMapper.selectRepairSparePartsRecord(equRepairWorkOrder); list.setApplyList(applyLists); + + //文件 + List files = equRepairWorkOrderMapper.getBaseFileBatch(workId); + if (!CollectionUtils.isEmpty(files)) { + list.setFiles(files); + } return success(list); } catch (Exception e) { return error(); @@ -450,11 +530,36 @@ public class DevicePDAServiceImpl implements IDevicePDAService { public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { try { //更新每一项点检/巡检检查项信息 - List equOrderStandards = equRepairWorkOrder.getCheckList(); - for(EquOrderStandard equOrderStandard:equOrderStandards){ - equOrderStandard.setUpdateBy(SecurityUtils.getUsername()); - equOrderStandard.setUpdateTime(DateUtils.getNowDate()); - equOrderStandardMapper.updateEquOrderStandard(equOrderStandard); + List checkLists = equRepairWorkOrder.getDetailList(); + for(EquOrder checkList:checkLists){ + checkList.setUpdateBy(SecurityUtils.getUsername()); + checkList.setUpdateTime(DateUtils.getNowDate()); + List standardLists = checkList.getStandardList(); + for(EquOrderStandard standardList :standardLists){ + //先删除每个检查项标准图片 + equOrderStandardMapper.deleteBaseFileBySourceId(standardList.getId()); + //图片 + if (StringUtils.isNotEmpty(standardList.getPicturePath())) { + String[] ids = standardList.getPicturePath().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id.split("&fileName=")[1]); + file.setFileAddress(id); + file.setSourceId(standardList.getId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + //维修后 + file.setImageType("4"); + files.add(file); + } + equOrderStandardMapper.insertBaseFileBatch(files); + } + equOrderStandardMapper.updateEquOrderStandard(standardList); + } + equOrderMapper.updateEquOrder(checkList); } //新建申领单 缺少code List equSpareApplies = equRepairWorkOrder.getApplyList(); @@ -466,6 +571,27 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equSpareApplyMapper.insertEquSpareApply(equSpareApply); } //维修人员名字？？？？前端能够提供吗？？？ + //图片 + //先删除每个维修工单对应图片 + equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId()); + if (StringUtils.isNotEmpty(equRepairWorkOrder.getFileList())) { + String[] ids = equRepairWorkOrder.getFileList().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id.split("&fileName=")[1]); + file.setFileAddress(id); + file.setSourceId(equRepairWorkOrder.getWorkId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + //维修后 + file.setImageType("4"); + files.add(file); + } + equRepairWorkOrderMapper.insertBaseFileBatch(files); + } equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java index 869f05595..324cd1fab 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java @@ -29,8 +29,6 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { @Autowired private EquOutsourceWorkMapper equOutsourceWorkMapper; - @Autowired - private EquRepairWorkOrderMapper equRepairWorkOrderMapper; /** * 查询委外工单 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java index ba5e35e42..55d73659c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java @@ -9,18 +9,23 @@ import com.op.common.core.domain.BaseFileData; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.device.domain.*; import com.op.device.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.service.IEquRepairOrderService; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + /** * 故障报修Service业务层处理 * @@ -42,7 +47,10 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { private EquOutsourceWorkMapper equOutsourceWorkMapper; @Autowired - private EquFileMapper equFileMapper; + private EquOrderStandardMapper equOrderStandardMapper; + + @Autowired + private EquOrderMapper equOrderMapper; /** * 查询故障报修 * @@ -53,10 +61,45 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { @DS("#header.poolName") public EquRepairOrder selectEquRepairOrderByOrderId(String orderId) { EquRepairOrder list = equRepairOrderMapper.selectEquRepairOrderByOrderId(orderId); - List files = equFileMapper.getEquFileBatch(orderId); + List files = equRepairOrderMapper.getBaseFileBatch(orderId); if (!CollectionUtils.isEmpty(files)) { list.setFiles(files); } + +// //查询对应检查项信息 +// EquOrder equOrder = new EquOrder(); +// equOrder.setOrderCode(list.getOrderCode()); +// List checkLists = equOrderStandardMapper.selectPdaEquOrderList(equOrder); +// //每个检查项对应文件 +// for(EquOrderStandard equOrderStandard :checkLists){ +// List file = equOrderStandardMapper.getBaseFileBatch(equOrderStandard.getId()); +// if (!CollectionUtils.isEmpty(file)) { +// equOrderStandard.setPicturePaths(file); +// } +// } +// list.setCheckList(checkLists); + + //查询对应检查项信息 + EquOrder equOrder = new EquOrder(); + //报修单号 + equOrder.setRepairCode(list.getOrderCode()); + //检查项 + List checkLists = equOrderMapper.selectEquOrderDetailsList(equOrder); + //每个检查项对应的检测标准 + for(EquOrder equOrder1 :checkLists){ + EquOrderStandard equOrderStandard = new EquOrderStandard(); + equOrderStandard.setOrderCode(equOrder1.getOrderCode()); + List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); + for(EquOrderStandard standardList :standardLists){ + //每个检查标准里面的照片 + List file = equOrderStandardMapper.getBaseFileBatch(standardList.getId()); + if (!CollectionUtils.isEmpty(file)) { + standardList.setPicturePaths(file); + } + } + equOrder1.setStandardList(standardLists); + } + list.setCheckList(checkLists); return list; } @@ -109,9 +152,8 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { file.setCreateTime(new Date()); files.add(file); } - equFileMapper.insertEquFileBatch(files); + equRepairOrderMapper.insertBaseFileBatch(files); } - return equRepairOrderMapper.insertEquRepairOrder(equRepairOrder); } @@ -201,30 +243,36 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { * @param equRepairOrder 故障报修 * @return 结果 */ + @Transactional//增加事务注解，出错时自动回滚 @Override @DS("#header.poolName") - public int updateEquRepairOrder(EquRepairOrder equRepairOrder) { - equFileMapper.deleteEquFileBySourceId(equRepairOrder.getOrderId()); - //上传附件 - if (StringUtils.isNotEmpty(equRepairOrder.getFileList())) { - String[] ids = equRepairOrder.getFileList().split(","); - List files = new ArrayList<>(); - BaseFileData file = null; - for (String id : ids) { - file = new BaseFileData(); - file.setFileId(IdUtils.fastSimpleUUID()); - file.setFileAddress(id); - file.setFileName(id.split("&fileName=")[1]); - file.setSourceId(equRepairOrder.getOrderId()); - file.setCreateBy(SecurityUtils.getUsername()); - file.setCreateTime(new Date()); - files.add(file); + public AjaxResult updateEquRepairOrder(EquRepairOrder equRepairOrder) { + try{ + equRepairOrderMapper.deleteBaseFileBySourceId(equRepairOrder.getOrderId()); + //上传附件 + if (StringUtils.isNotEmpty(equRepairOrder.getFileList())) { + String[] ids = equRepairOrder.getFileList().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileAddress(id); + file.setFileName(id.split("&fileName=")[1]); + file.setSourceId(equRepairOrder.getOrderId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + files.add(file); + } + equRepairOrderMapper.insertBaseFileBatch(files); } - equFileMapper.insertEquFileBatch(files); - } - equRepairOrder.setUpdateTime(DateUtils.getNowDate()); - equRepairOrder.setUpdateBy(SecurityUtils.getUsername()); - return equRepairOrderMapper.updateEquRepairOrder(equRepairOrder); + equRepairOrder.setUpdateTime(DateUtils.getNowDate()); + equRepairOrder.setUpdateBy(SecurityUtils.getUsername()); + equRepairOrderMapper.updateEquRepairOrder(equRepairOrder); + return success("修改故障报修成功！"); + }catch (Exception e) { + return error(); + } } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index 2a172e84e..6cb2f0d8d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -4,22 +4,22 @@ import java.text.SimpleDateFormat; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.domain.BaseFileData; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; -import com.op.device.domain.EquOutsourceWork; -import com.op.device.domain.EquTeamUser; -import com.op.device.mapper.EquOutsourceWorkMapper; +import com.op.device.domain.*; +import com.op.device.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.op.device.mapper.EquRepairWorkOrderMapper; -import com.op.device.domain.EquRepairWorkOrder; import com.op.device.service.IEquRepairWorkOrderService; +import org.springframework.util.CollectionUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; + /** * 维修工单Service业务层处理 * @@ -28,6 +28,12 @@ import javax.servlet.http.HttpServletRequest; */ @Service public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService { + @Autowired + private EquOrderMapper equOrderMapper; + + @Autowired + private EquOrderStandardMapper equOrderStandardMapper; + @Autowired private EquRepairWorkOrderMapper equRepairWorkOrderMapper; @@ -43,7 +49,40 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService @Override @DS("#header.poolName") public EquRepairWorkOrder selectEquRepairWorkOrderByWorkId(String workId) { - return equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(workId); + //查询报修前图片 + EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(workId); + List beforeFiles = equRepairWorkOrderMapper.getBaseFileBatch(list.getOrderId()); + if (!CollectionUtils.isEmpty(beforeFiles)) { + list.setBeforeRepairFiles(beforeFiles); + } + //查询维修后图片 + List afterFiles = equRepairWorkOrderMapper.getBaseFileBatch(workId); + if (!CollectionUtils.isEmpty(afterFiles)) { + list.setAfterRepairFiles(afterFiles); + } + + //查询报修前检查项图片 + EquOrder equOrder = new EquOrder(); + equOrder.setWorkCode(list.getWorkCode()); + //检查项 + List checkLists = equOrderMapper.selectEquOrderDetailsList(equOrder); + //每个检查项对应的检测标准 + for(EquOrder equOrder1 :checkLists){ + EquOrderStandard equOrderStandard = new EquOrderStandard(); + equOrderStandard.setOrderCode(equOrder1.getOrderCode()); + List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); + for(EquOrderStandard standardList :standardLists){ + //每个检查标准里面的照片 + List files = equOrderStandardMapper.getBaseFileBatch(standardList.getId()); + if (!CollectionUtils.isEmpty(files)) { + standardList.setPicturePaths(files); + } + } + equOrder1.setStandardList(standardLists); + } + list.setDetailList(checkLists); + + return list; } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java index e94737765..9e8121880 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java @@ -1,13 +1,17 @@ package com.op.device.service.impl; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.device.domain.EquRepairWorkOrder; +import com.op.device.domain.SparePartsLedger; +import com.op.device.mapper.SparePartsLedgerMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.mapper.EquSpareApplyMapper; @@ -18,6 +22,8 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import static com.op.common.core.web.domain.AjaxResult.error; + /** * 申领记录Service业务层处理 * @@ -28,6 +34,8 @@ import javax.servlet.http.HttpServletRequest; public class EquSpareApplyServiceImpl implements IEquSpareApplyService { @Autowired private EquSpareApplyMapper equSpareApplyMapper; + @Autowired + private SparePartsLedgerMapper sparePartsLedgerMapper; /** * 查询申领记录 @@ -69,15 +77,46 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { */ @Override @DS("#header.poolName") - public int insertEquSpareApply(EquSpareApply equSpareApply) { - equSpareApply.setApplyId(IdUtils.fastSimpleUUID()); - //工厂号 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String key = "#header.poolName"; - equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); - equSpareApply.setCreateTime(DateUtils.getNowDate()); - equSpareApply.setCreateBy(SecurityUtils.getUsername()); - return equSpareApplyMapper.insertEquSpareApply(equSpareApply); + public AjaxResult insertEquSpareApply(EquSpareApply equSpareApply) { + try { + //equSpareApply.getSpareApplyLists().size() 是在申领备件的时候进行的操作 + if(equSpareApply.getSpareApplyLists().size() >= 1){ + List list = equSpareApply.getSpareApplyLists(); + for(EquSpareApply applyList:list){ + applyList.setApplyId(IdUtils.fastSimpleUUID()); + //领用时间 + applyList.setApplyTime(DateUtils.getNowDate()); + //申领人 + applyList.setApplyPeople(SecurityUtils.getUsername()); + //工厂号 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + applyList.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + applyList.setCreateTime(DateUtils.getNowDate()); + applyList.setCreateBy(SecurityUtils.getUsername()); + equSpareApplyMapper.insertEquSpareApply(applyList); + //更新完备品申领单后，更新库存 + SparePartsLedger sparePartsLedger = new SparePartsLedger(); + sparePartsLedger.setStorageId(applyList.getStorageId()); + BigDecimal applyNum = new BigDecimal(applyList.getSpareQuantity()); + BigDecimal amount = applyList.getAmount(); + sparePartsLedger.setAmount(amount.subtract(applyNum)); + sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); + } + }else{ + equSpareApply.setApplyId(IdUtils.fastSimpleUUID()); + //工厂号 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + equSpareApply.setCreateTime(DateUtils.getNowDate()); + equSpareApply.setCreateBy(SecurityUtils.getUsername()); + equSpareApplyMapper.insertEquSpareApply(equSpareApply); + } + return AjaxResult.success("新增申领记录成功！"); + } catch (Exception e) { + return error(); + } } /** diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index db97cf3c7..781cc2a67 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -39,6 +39,12 @@ + + + + + + @@ -277,4 +283,25 @@ #{orderId} + + + + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml index 0d563af32..7fa8caa8f 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml @@ -31,11 +31,31 @@ - - - + + + + + + + + + + + + + + + + + + + select file_id, file_name, file_address, source_id, remark, attr1, + attr2, attr3, attr4, create_by, create_time, update_by, + update_time,image_type from base_file + + select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, @@ -215,7 +235,7 @@ - + - + + + INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time,image_type) + VALUES + + ( + #{baseFile.fileId}, + #{baseFile.fileName}, + #{baseFile.fileAddress}, + #{baseFile.sourceId}, + #{baseFile.remark}, + #{baseFile.createBy}, + #{baseFile.createTime}, + #{baseFile.imageType} + ) + + + + + delete from base_file where source_id = #{sourceId} + + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml index 275997613..fb112684e 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml @@ -13,7 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + @@ -46,8 +48,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + select file_id, file_name, file_address, source_id, remark, attr1, + attr2, attr3, attr4, create_by, create_time, update_by, + update_time,image_type from base_file + + - select order_id, order_code, equipment_code, order_desc, order_breakdown_time, order_source, order_time, order_handle, order_repairman, order_connection, order_status, order_relevance, order_picture, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,factory_code,repair_destination from equ_repair_order + select order_id, order_code, equipment_code, order_desc, order_breakdown_time, order_source, order_time, order_handle, order_repairman_code,order_repairman_name, order_connection, order_status, order_relevance, order_picture, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,factory_code,repair_destination from equ_repair_order + + INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time,image_type) + VALUES + + ( + #{baseFile.fileId}, + #{baseFile.fileName}, + #{baseFile.fileAddress}, + #{baseFile.sourceId}, + #{baseFile.remark}, + #{baseFile.createBy}, + #{baseFile.createTime}, + #{baseFile.imageType} + ) + + + + + delete from base_file where source_id = #{sourceId} + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml index 6647de50b..a2957e0b0 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml @@ -43,18 +43,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - + + + + + + + + + + + + + + + + + + + + select file_id, file_name, file_address, source_id, remark, attr1, + attr2, attr3, attr4, create_by, create_time, update_by, + update_time,image_type from base_file + + select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code from equ_repair_work_order @@ -132,6 +157,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY erwo.create_time DESC + + + + + delete from base_file where source_id = #{sourceId} + + + + + + INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time,image_type) + VALUES + + ( + #{baseFile.fileId}, + #{baseFile.fileName}, + #{baseFile.fileAddress}, + #{baseFile.sourceId}, + #{baseFile.remark}, + #{baseFile.createBy}, + #{baseFile.createTime}, + #{baseFile.imageType} + ) + + + \ No newline at end of file