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 f6efdf79..721d8669 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 @@ -82,11 +82,20 @@ public class EquRepairOrderController extends BaseController { */ @RequiresPermissions("device:faultReport:edit") @Log(title = "故障报修", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("/edit") public AjaxResult edit(@RequestBody EquRepairOrder equRepairOrder) { return toAjax(equRepairOrderService.updateEquRepairOrder(equRepairOrder)); } + /** + * 审核维修工单 + */ + @RequiresPermissions("device:faultReport:check") + @PutMapping("/check") + public AjaxResult check(@RequestBody EquRepairOrder equRepairOrder) { + return toAjax(equRepairOrderService.checkEquRepairOrder(equRepairOrder)); + } + /** * 删除故障报修 */ @@ -107,4 +116,15 @@ public class EquRepairOrderController extends BaseController { return getDataTable(list); } + /** + * 查询设备类型 + */ + + @GetMapping("/getEquipmentTypeList") + public TableDataInfo getEquipmentTypeList(EquEquipment equEquipment) { + startPage(); + List list = equRepairOrderService.getEquipmentTypeList(equEquipment); + return getDataTable(list); + } + } diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java new file mode 100644 index 00000000..98471154 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.EquRepairWorkOrder; +import com.op.device.service.IEquRepairWorkOrderService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 维修工单Controller + * + * @author Open Platform + * @date 2023-10-19 + */ +@RestController +@RequestMapping("/repairOrder") +public class EquRepairWorkOrderController extends BaseController { + @Autowired + private IEquRepairWorkOrderService equRepairWorkOrderService; + + /** + * 查询维修工单列表 + */ + @RequiresPermissions("device:repairOrder:list") + @GetMapping("/list") + public TableDataInfo list(EquRepairWorkOrder equRepairWorkOrder) { + startPage(); + List list = equRepairWorkOrderService.selectEquRepairWorkOrderList(equRepairWorkOrder); + return getDataTable(list); + } + + /** + * 导出维修工单列表 + */ + @RequiresPermissions("device:repairOrder:export") + @Log(title = "维修工单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquRepairWorkOrder equRepairWorkOrder) { + List list = equRepairWorkOrderService.selectEquRepairWorkOrderList(equRepairWorkOrder); + ExcelUtil util = new ExcelUtil(EquRepairWorkOrder.class); + util.exportExcel(response, list, "维修工单数据"); + } + + /** + * 获取维修工单详细信息 + */ + @RequiresPermissions("device:repairOrder:query") + @GetMapping(value = "/{workId}") + public AjaxResult getInfo(@PathVariable("workId") String workId) { + return success(equRepairWorkOrderService.selectEquRepairWorkOrderByWorkId(workId)); + } + + /** + * 新增维修工单 + */ + @RequiresPermissions("device:repairOrder:add") + @Log(title = "维修工单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquRepairWorkOrder equRepairWorkOrder) { + return toAjax(equRepairWorkOrderService.insertEquRepairWorkOrder(equRepairWorkOrder)); + } + + /** + * 修改维修工单 + */ + @RequiresPermissions("device:repairOrder:edit") + @Log(title = "维修工单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquRepairWorkOrder equRepairWorkOrder) { + return toAjax(equRepairWorkOrderService.updateEquRepairWorkOrder(equRepairWorkOrder)); + } + + /** + * 删除维修工单 + */ + @RequiresPermissions("device:repairOrder:remove") + @Log(title = "维修工单", businessType = BusinessType.DELETE) + @DeleteMapping("/{workIds}") + public AjaxResult remove(@PathVariable String[] workIds) { + return toAjax(equRepairWorkOrderService.deleteEquRepairWorkOrderByWorkIds(workIds)); + } +} 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 4ecd84b1..f0f43828 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 @@ -84,9 +84,121 @@ public class EquRepairOrder extends BaseEntity { /** 删除标志 */ private String delFlag; + /** 设备类型名称 */ + @Excel(name = "设备类型名称") + private String equipmentTypeName; + + /** 设备位置 */ + @Excel(name = "设备位置") + private String equipmentLocation; + + /** 部门 */ + @Excel(name = "部门") + private String department; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String equipmentSpec; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String equipmentName; + /** 创建人 */ @Excel(name = "创建人") - private String craeteBy; + private String createBy; + + /** 报修后去向 */ + @Excel(name = "报修去向") + private String repairDestination; + + /** 计划维修时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划维修时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date workPlanTime; + + /** 计划停机时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划停机时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date workPlanDownTime; + + /** 维修人员 */ + @Excel(name = "维修人员") + private String workPerson; + + /** 维修组 */ + @Excel(name = "维修组") + private String workTeam; + + public void setWorkPlanTime(Date workPlanTime) { + this.workPlanTime = workPlanTime; + } + public Date getWorkPlanTime() { + return workPlanTime; + } + + public void setWorkPlanDownTime(Date workPlanDownTime) { + this.workPlanDownTime = workPlanDownTime; + } + public Date getWorkPlanDownTime() { + return workPlanDownTime; + } + + public void setWorkPerson(String workPerson) { + this.workPerson = workPerson; + } + public String getWorkPerson() { + return workPerson; + } + + public void setWorkTeam(String workTeam) { + this.workTeam = workTeam; + } + public String getWorkTeam() { + return workTeam; + } + + public void setRepairDestination(String repairDestination) { + this.repairDestination = repairDestination; + } + public String getRepairDestination() { + return repairDestination; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentLocation(String equipmentLocation) { + this.equipmentLocation = equipmentLocation; + } + public String getEquipmentLocation() { + return equipmentLocation; + } + + public void setDepartment(String department) { + this.department = department; + } + public String getDepartment() { + return department; + } + + public void setEquipmentSpec(String equipmentSpec) { + this.equipmentSpec = equipmentSpec; + } + public String getEquipmentSpec() { + return equipmentSpec; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + public String getEquipmentName() { + return equipmentName; + } public void setOrderId(String orderId) { this.orderId = orderId; @@ -207,12 +319,12 @@ public class EquRepairOrder extends BaseEntity { public String getDelFlag() { return delFlag; } - public void setCraeteBy(String craeteBy) { - this.craeteBy = craeteBy; + public void setCreateBy(String createBy) { + this.createBy = createBy; } - public String getCraeteBy() { - return craeteBy; + public String getCreateBy() { + return createBy; } @Override @@ -235,7 +347,7 @@ public class EquRepairOrder extends BaseEntity { .append("attr2", getAttr2()) .append("attr3", getAttr3()) .append("delFlag", getDelFlag()) - .append("craeteBy", getCraeteBy()) + .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) 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 new file mode 100644 index 00000000..dbea3a02 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -0,0 +1,306 @@ +package com.op.device.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 维修工单对象 equ_repair_work_order + * + * @author Open Platform + * @date 2023-10-19 + */ +public class EquRepairWorkOrder extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String workId; + + /** 报修主键 */ + @Excel(name = "报修主键") + private String orderId; + + /** 报修单号 */ + @Excel(name = "报修单号") + private String orderCode; + + /** 是否立即处理 */ + @Excel(name = "是否立即处理") + private String workHandle; + + /** 计划维修时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划维修时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date workPlanTime; + + /** 计划停机时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划停机时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date workPlanDownTime; + + /** 关联计划 */ + @Excel(name = "关联计划") + private String orderRelevance; + + /** 维修人员 */ + @Excel(name = "维修人员") + private String workPerson; + + /** 维修组 */ + @Excel(name = "维修组") + private String workTeam; + + /** 是否委外 */ + @Excel(name = "是否委外") + private String workOutsource; + + /** 是否停机维修 */ + @Excel(name = "是否停机维修") + private String workDownMachine; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String equipmentCode; + + /** 原因分析 */ + @Excel(name = "原因分析") + private String workReason; + + /** 故障描述 */ + @Excel(name = "故障描述") + private String workFaultDesc; + + /** 维修用时 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "维修用时", width = 30, dateFormat = "yyyy-MM-dd") + private Date workCostTime; + + /** 维修费用 */ + @Excel(name = "维修费用") + private String workCost; + + /** 委外工单id */ + @Excel(name = "委外工单id") + private String outWorkId; + + /** 委外工单编码 */ + @Excel(name = "委外工单编码") + private String outWorkCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + public void setWorkId(String workId) { + this.workId = workId; + } + + public String getWorkId() { + return workId; + } + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOrderId() { + return orderId; + } + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderCode() { + return orderCode; + } + public void setWorkHandle(String workHandle) { + this.workHandle = workHandle; + } + + public String getWorkHandle() { + return workHandle; + } + public void setWorkPlanTime(Date workPlanTime) { + this.workPlanTime = workPlanTime; + } + + public Date getWorkPlanTime() { + return workPlanTime; + } + public void setWorkPlanDownTime(Date workPlanDownTime) { + this.workPlanDownTime = workPlanDownTime; + } + + public Date getWorkPlanDownTime() { + return workPlanDownTime; + } + public void setOrderRelevance(String orderRelevance) { + this.orderRelevance = orderRelevance; + } + + public String getOrderRelevance() { + return orderRelevance; + } + public void setWorkPerson(String workPerson) { + this.workPerson = workPerson; + } + + public String getWorkPerson() { + return workPerson; + } + public void setWorkTeam(String workTeam) { + this.workTeam = workTeam; + } + + public String getWorkTeam() { + return workTeam; + } + public void setWorkOutsource(String workOutsource) { + this.workOutsource = workOutsource; + } + + public String getWorkOutsource() { + return workOutsource; + } + public void setWorkDownMachine(String workDownMachine) { + this.workDownMachine = workDownMachine; + } + + public String getWorkDownMachine() { + return workDownMachine; + } + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } + + public String getEquipmentCode() { + return equipmentCode; + } + public void setWorkReason(String workReason) { + this.workReason = workReason; + } + + public String getWorkReason() { + return workReason; + } + public void setWorkFaultDesc(String workFaultDesc) { + this.workFaultDesc = workFaultDesc; + } + + public String getWorkFaultDesc() { + return workFaultDesc; + } + public void setWorkCostTime(Date workCostTime) { + this.workCostTime = workCostTime; + } + + public Date getWorkCostTime() { + return workCostTime; + } + public void setWorkCost(String workCost) { + this.workCost = workCost; + } + + public String getWorkCost() { + return workCost; + } + public void setOutWorkId(String outWorkId) { + this.outWorkId = outWorkId; + } + + public String getOutWorkId() { + return outWorkId; + } + public void setOutWorkCode(String outWorkCode) { + this.outWorkCode = outWorkCode; + } + + public String getOutWorkCode() { + return outWorkCode; + } + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr2() { + return attr2; + } + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("workId", getWorkId()) + .append("orderId", getOrderId()) + .append("orderCode", getOrderCode()) + .append("workHandle", getWorkHandle()) + .append("workPlanTime", getWorkPlanTime()) + .append("workPlanDownTime", getWorkPlanDownTime()) + .append("orderRelevance", getOrderRelevance()) + .append("workPerson", getWorkPerson()) + .append("workTeam", getWorkTeam()) + .append("workOutsource", getWorkOutsource()) + .append("workDownMachine", getWorkDownMachine()) + .append("equipmentCode", getEquipmentCode()) + .append("workReason", getWorkReason()) + .append("workFaultDesc", getWorkFaultDesc()) + .append("workCostTime", getWorkCostTime()) + .append("workCost", getWorkCost()) + .append("outWorkId", getOutWorkId()) + .append("outWorkCode", getOutWorkCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .append("delFlag", getDelFlag()) + .append("factoryCode", getFactoryCode()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java index 3c49c050..f21b5c85 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java @@ -58,4 +58,7 @@ public interface EquEquipmentMapper { * @return 结果 */ public int deleteEquEquipmentByEquipmentIds(Long[] equipmentIds); + + //查询设备类型 + List getEquipmentTypeList(EquEquipment equEquipment); } \ No newline at end of file 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 50e3248c..7450e35d 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 @@ -57,4 +57,10 @@ public interface EquRepairOrderMapper { * @return 结果 */ public int deleteEquRepairOrderByOrderIds(String[] orderIds); + + /** + * 获取流水号 + * @return + */ + int selectSerialNumber(); } 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 new file mode 100644 index 00000000..fdaa5574 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquRepairWorkOrder; + +/** + * 维修工单Mapper接口 + * + * @author Open Platform + * @date 2023-10-19 + */ +public interface EquRepairWorkOrderMapper { + /** + * 查询维修工单 + * + * @param workId 维修工单主键 + * @return 维修工单 + */ + public EquRepairWorkOrder selectEquRepairWorkOrderByWorkId(String workId); + + /** + * 查询维修工单列表 + * + * @param equRepairWorkOrder 维修工单 + * @return 维修工单集合 + */ + public List selectEquRepairWorkOrderList(EquRepairWorkOrder equRepairWorkOrder); + + /** + * 新增维修工单 + * + * @param equRepairWorkOrder 维修工单 + * @return 结果 + */ + public int insertEquRepairWorkOrder(EquRepairWorkOrder equRepairWorkOrder); + + /** + * 修改维修工单 + * + * @param equRepairWorkOrder 维修工单 + * @return 结果 + */ + public int updateEquRepairWorkOrder(EquRepairWorkOrder equRepairWorkOrder); + + /** + * 删除维修工单 + * + * @param workId 维修工单主键 + * @return 结果 + */ + public int deleteEquRepairWorkOrderByWorkId(String workId); + + /** + * 批量删除维修工单 + * + * @param workIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquRepairWorkOrderByWorkIds(String[] workIds); +} 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 9fa7224a..b0b6a1f5 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 @@ -5,6 +5,7 @@ import java.util.List; import com.op.device.domain.EquEquipment; import com.op.device.domain.EquEquipment; import com.op.device.domain.EquRepairOrder; +import com.op.device.domain.EquRepairWorkOrder; /** * 故障报修Service接口 @@ -68,4 +69,10 @@ public interface IEquRepairOrderService { * @return 结果 */ List selectEquEquipmentList(EquEquipment equEquipment); + + //查询设备类型 + List getEquipmentTypeList(EquEquipment equEquipment); + + //审核 + public int checkEquRepairOrder(EquRepairOrder equRepairOrder); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java new file mode 100644 index 00000000..b0a15541 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java @@ -0,0 +1,60 @@ +package com.op.device.service; + +import java.util.List; +import com.op.device.domain.EquRepairWorkOrder; + +/** + * 维修工单Service接口 + * + * @author Open Platform + * @date 2023-10-19 + */ +public interface IEquRepairWorkOrderService { + /** + * 查询维修工单 + * + * @param workId 维修工单主键 + * @return 维修工单 + */ + public EquRepairWorkOrder selectEquRepairWorkOrderByWorkId(String workId); + + /** + * 查询维修工单列表 + * + * @param equRepairWorkOrder 维修工单 + * @return 维修工单集合 + */ + public List selectEquRepairWorkOrderList(EquRepairWorkOrder equRepairWorkOrder); + + /** + * 新增维修工单 + * + * @param equRepairWorkOrder 维修工单 + * @return 结果 + */ + public int insertEquRepairWorkOrder(EquRepairWorkOrder equRepairWorkOrder); + + /** + * 修改维修工单 + * + * @param equRepairWorkOrder 维修工单 + * @return 结果 + */ + public int updateEquRepairWorkOrder(EquRepairWorkOrder equRepairWorkOrder); + + /** + * 批量删除维修工单 + * + * @param workIds 需要删除的维修工单主键集合 + * @return 结果 + */ + public int deleteEquRepairWorkOrderByWorkIds(String[] workIds); + + /** + * 删除维修工单信息 + * + * @param workId 维修工单主键 + * @return 结果 + */ + public int deleteEquRepairWorkOrderByWorkId(String workId); +} 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 b2b1ea35..507cf010 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 @@ -4,8 +4,12 @@ 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.security.utils.SecurityUtils; import com.op.device.domain.EquEquipment; +import com.op.device.domain.EquRepairWorkOrder; import com.op.device.mapper.EquEquipmentMapper; +import com.op.device.mapper.EquRepairWorkOrderMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.mapper.EquRepairOrderMapper; @@ -26,6 +30,9 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { @Autowired private EquEquipmentMapper equEquipmentMapper; + @Autowired + private EquRepairWorkOrderMapper equRepairWorkOrderMapper; + /** * 查询故障报修 * @@ -51,7 +58,7 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { } /** - * 新增故障报修 + * 新增故障报修PC端 * * @param equRepairOrder 故障报修 * @return 结果 @@ -59,7 +66,14 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { @Override @DS("#header.poolName") public int insertEquRepairOrder(EquRepairOrder equRepairOrder) { + equRepairOrder.setOrderId(IdUtils.fastSimpleUUID()); + // 获取故障报修流水号 + String serialNum = String.format("%03d", equRepairOrderMapper.selectSerialNumber()); + String equipmentCode = equRepairOrder.getEquipmentCode(); + equRepairOrder.setOrderCode(DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum); equRepairOrder.setCreateTime(DateUtils.getNowDate()); + equRepairOrder.setCreateBy(SecurityUtils.getUsername()); + equRepairOrder.setOrderStatus("待审核"); return equRepairOrderMapper.insertEquRepairOrder(equRepairOrder); } @@ -71,8 +85,51 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { */ @Override @DS("#header.poolName") + public int checkEquRepairOrder(EquRepairOrder equRepairOrder) { + if(equRepairOrder.getRepairDestination().equals("计划性维修")){ + EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder(); + //报修单号 + equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode()); + equRepairWorkOrder.setOrderId(equRepairOrder.getOrderId()); + equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode()); + equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam()); + equRepairWorkOrder.setWorkPlanDownTime(equRepairOrder.getWorkPlanDownTime()); + //是否停机维修 + if(equRepairOrder.getWorkPlanTime() != null){ + equRepairWorkOrder.setWorkDownMachine("1"); + equRepairWorkOrder.setWorkPlanTime(equRepairOrder.getWorkPlanTime()); + }else{ + equRepairWorkOrder.setWorkDownMachine("0"); + } + equRepairWorkOrder.setWorkId(IdUtils.fastSimpleUUID()); + equRepairWorkOrder.setCreateTime(DateUtils.getNowDate()); + equRepairWorkOrder.setCreateBy(SecurityUtils.getUsername()); + equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder); + equRepairOrder.setOrderStatus("审核通过"); + }else if(equRepairOrder.getRepairDestination().equals("不维修")){ + equRepairOrder.setOrderStatus("驳回"); + }else if(equRepairOrder.getRepairDestination().equals("委外维修")){ + equRepairOrder.setOrderStatus("审核通过"); + }else if(equRepairOrder.getRepairDestination().equals("立即维修")){ + //立即维修 + equRepairOrder.setOrderStatus("审核通过"); + } + equRepairOrder.setUpdateTime(DateUtils.getNowDate()); + equRepairOrder.setUpdateBy(SecurityUtils.getUsername()); + return equRepairOrderMapper.updateEquRepairOrder(equRepairOrder); + } + + /** + * 修改故障报修 + * + * @param equRepairOrder 故障报修 + * @return 结果 + */ + @Override + @DS("#header.poolName") public int updateEquRepairOrder(EquRepairOrder equRepairOrder) { equRepairOrder.setUpdateTime(DateUtils.getNowDate()); + equRepairOrder.setUpdateBy(SecurityUtils.getUsername()); return equRepairOrderMapper.updateEquRepairOrder(equRepairOrder); } @@ -103,12 +160,24 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { /** * 查询故障报修列表 * - * @param equEquipment 故障报修 - * @return 故障报修 + * @param equEquipment + * @return */ @Override @DS("#header.poolName") public List selectEquEquipmentList(EquEquipment equEquipment) { return equEquipmentMapper.selectEquEquipmentList(equEquipment); } + + /** + * 查询设备类型 + * + * @param equEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List getEquipmentTypeList(EquEquipment equEquipment) { + return equEquipmentMapper.getEquipmentTypeList(equEquipment); + } } 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 new file mode 100644 index 00000000..5d16e66b --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -0,0 +1,97 @@ +package com.op.device.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +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; + +/** + * 维修工单Service业务层处理 + * + * @author Open Platform + * @date 2023-10-19 + */ +@Service +public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService { + @Autowired + private EquRepairWorkOrderMapper equRepairWorkOrderMapper; + + /** + * 查询维修工单 + * + * @param workId 维修工单主键 + * @return 维修工单 + */ + @Override + @DS("#header.poolName") + public EquRepairWorkOrder selectEquRepairWorkOrderByWorkId(String workId) { + return equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(workId); + } + + /** + * 查询维修工单列表 + * + * @param equRepairWorkOrder 维修工单 + * @return 维修工单 + */ + @Override + @DS("#header.poolName") + public List selectEquRepairWorkOrderList(EquRepairWorkOrder equRepairWorkOrder) { + return equRepairWorkOrderMapper.selectEquRepairWorkOrderList(equRepairWorkOrder); + } + + /** + * 新增维修工单 + * + * @param equRepairWorkOrder 维修工单 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertEquRepairWorkOrder(EquRepairWorkOrder equRepairWorkOrder) { + equRepairWorkOrder.setCreateTime(DateUtils.getNowDate()); + return equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder); + } + + /** + * 修改维修工单 + * + * @param equRepairWorkOrder 维修工单 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateEquRepairWorkOrder(EquRepairWorkOrder equRepairWorkOrder) { + equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); + return equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); + } + + /** + * 批量删除维修工单 + * + * @param workIds 需要删除的维修工单主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquRepairWorkOrderByWorkIds(String[] workIds) { + return equRepairWorkOrderMapper.deleteEquRepairWorkOrderByWorkIds(workIds); + } + + /** + * 删除维修工单信息 + * + * @param workId 维修工单主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquRepairWorkOrderByWorkId(String workId) { + return equRepairWorkOrderMapper.deleteEquRepairWorkOrderByWorkId(workId); + } +} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml index 63a1e006..69bb6a85 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml @@ -239,4 +239,12 @@ #{equipmentId} + + + \ 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 2cbce4e0..a1b9135f 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 @@ -22,14 +22,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + - 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, craete_by, create_time, update_by, update_time from equ_repair_order + 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,repair_destination from equ_repair_order @@ -81,10 +114,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" attr2, attr3, del_flag, - craete_by, + create_by, create_time, update_by, update_time, + repair_destination, #{orderId}, @@ -104,10 +138,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{attr2}, #{attr3}, #{delFlag}, - #{craeteBy}, + #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, + #{repairDestination}, @@ -130,10 +165,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" attr2 = #{attr2}, attr3 = #{attr3}, del_flag = #{delFlag}, - craete_by = #{craeteBy}, + create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + repair_destination = #{repairDestination}, where order_id = #{orderId} @@ -149,4 +185,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ 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 new file mode 100644 index 00000000..f4547b34 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select work_id, order_id, order_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_cost_time, work_cost, 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 + + + + + + + + insert into equ_repair_work_order + + work_id, + order_id, + order_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_cost_time, + work_cost, + out_work_id, + out_work_code, + attr1, + attr2, + attr3, + create_by, + create_time, + update_time, + update_by, + del_flag, + factory_code, + + + #{workId}, + #{orderId}, + #{orderCode}, + #{workHandle}, + #{workPlanTime}, + #{workPlanDownTime}, + #{orderRelevance}, + #{workPerson}, + #{workTeam}, + #{workOutsource}, + #{workDownMachine}, + #{equipmentCode}, + #{workReason}, + #{workFaultDesc}, + #{workCostTime}, + #{workCost}, + #{outWorkId}, + #{outWorkCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{createBy}, + #{createTime}, + #{updateTime}, + #{updateBy}, + #{delFlag}, + #{factoryCode}, + + + + + update equ_repair_work_order + + order_id = #{orderId}, + order_code = #{orderCode}, + work_handle = #{workHandle}, + work_plan_time = #{workPlanTime}, + work_plan_down_time = #{workPlanDownTime}, + order_relevance = #{orderRelevance}, + work_person = #{workPerson}, + work_team = #{workTeam}, + work_outsource = #{workOutsource}, + work_down_machine = #{workDownMachine}, + equipment_code = #{equipmentCode}, + work_reason = #{workReason}, + work_fault_desc = #{workFaultDesc}, + work_cost_time = #{workCostTime}, + work_cost = #{workCost}, + out_work_id = #{outWorkId}, + out_work_code = #{outWorkCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + create_by = #{createBy}, + create_time = #{createTime}, + update_time = #{updateTime}, + update_by = #{updateBy}, + del_flag = #{delFlag}, + factory_code = #{factoryCode}, + + where work_id = #{workId} + + + + delete from equ_repair_work_order where work_id = #{workId} + + + + delete from equ_repair_work_order where work_id in + + #{workId} + + + \ No newline at end of file