diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/InspectionWorkController.java b/op-modules/op-device/src/main/java/com/op/device/controller/InspectionWorkController.java new file mode 100644 index 000000000..efafbdf34 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/InspectionWorkController.java @@ -0,0 +1,99 @@ +package com.op.device.controller; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.op.device.service.IInspectionWorkService; +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.EquOrder; +import com.op.device.service.IEquOrderService; +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 wws + * @date 2023-11-07 + */ +@RestController +@RequestMapping("/inspectionWork") +public class InspectionWorkController extends BaseController{ + + @Autowired + private IInspectionWorkService iInspectionWorkService; + + /** + * 查询巡检记录列表 + */ + @RequiresPermissions("device:inspectionWork:list") + @GetMapping("/list") + public TableDataInfo list(EquOrder equOrder) { + startPage(); + List list = iInspectionWorkService.selectEquOrderList(equOrder); + return getDataTable(list); + } + + /** + * 导出巡检记录列表 + */ + @RequiresPermissions("device:inspectionWork:export") + @Log(title = "巡检记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquOrder equOrder) { + List list = iInspectionWorkService.selectEquOrderList(equOrder); + ExcelUtil util = new ExcelUtil(EquOrder.class); + util.exportExcel(response, list, "巡检记录数据"); + } + + /** + * 获取巡检记录详细信息 + */ + @RequiresPermissions("device:inspectionWork:query") + @GetMapping(value = "/{orderId}") + public AjaxResult getInfo(@PathVariable("orderId") String orderId) { + return iInspectionWorkService.selectEquOrderByOrderId(orderId); + } + + /** + * 新增巡检记录 + */ + @RequiresPermissions("device:inspectionWork:add") + @Log(title = "巡检记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquOrder equOrder) { + return toAjax(iInspectionWorkService.insertEquOrder(equOrder)); + } + + /** + * 修改巡检记录 + */ + @RequiresPermissions("device:inspectionWork:edit") + @Log(title = "巡检记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquOrder equOrder) { + return toAjax(iInspectionWorkService.updateEquOrder(equOrder)); + } + + /** + * 删除巡检记录 + */ + @RequiresPermissions("device:inspectionWork:remove") + @Log(title = "巡检记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{orderIds}") + public AjaxResult remove(@PathVariable String[] orderIds) { + return toAjax(iInspectionWorkService.deleteEquOrderByOrderIds(orderIds)); + } +} 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 7ef078b52..f7a5e2ef4 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 @@ -84,6 +84,16 @@ public class EquOrderStandard extends BaseEntity { // 图片路径 private String picturePath; + private String standardTypeName; + + public String getStandardTypeName() { + return standardTypeName; + } + + public void setStandardTypeName(String standardTypeName) { + this.standardTypeName = standardTypeName; + } + public String getPicturePath() { return picturePath; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java new file mode 100644 index 000000000..2e36528e9 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java @@ -0,0 +1,441 @@ +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; + +public class Equipment extends BaseEntity { + /** 设备ID */ + private Long equipmentId; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String equipmentCode; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String equipmentName; + + /** 品牌 */ + @Excel(name = "品牌") + private String equipmentBrand; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String equipmentSpec; + + /** 设备类型ID */ + @Excel(name = "设备类型ID") + private Long equipmentTypeId; + + /** 设备类型编码 */ + @Excel(name = "设备类型编码") + private String equipmentTypeCode; + + /** 设备类型名称 */ + @Excel(name = "设备类型名称") + private String equipmentTypeName; + + /** 所属车间ID */ + @Excel(name = "所属车间ID") + private Long workshopId; + + /** 所属工作中心编码 */ + @Excel(name = "所属工作中心编码") + private String workshopCode; + + /** 所属工作中心名称 */ + @Excel(name = "所属工作中心名称") + private String workshopName; + + /** 设备状态,0异常 */ + @Excel(name = "设备状态,0异常") + private String status; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private Long attr3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private Long attr4; + + /** 工段 */ + @Excel(name = "工段") + private String workshopSection; + + /** 设备位置 */ + @Excel(name = "设备位置") + private String equipmentLocation; + + /** 工时单价 */ + @Excel(name = "工时单价") + private Long hourlyUnitPrice; + + /** 设备条码 */ + @Excel(name = "设备条码") + private String equipmentBarcode; + + /** 设备条码图片 */ + @Excel(name = "设备条码图片") + private String equipmentBarcodeImage; + + /** 生产厂商 */ + @Excel(name = "生产厂商") + private String manufacturer; + + /** 供应商 */ + @Excel(name = "供应商") + private String supplier; + + /** 使用寿命 */ + @Excel(name = "使用寿命") + private String useLife; + + /** 购买时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "购买时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date buyTime; + + /** 资产原值 */ + @Excel(name = "资产原值") + private String assetOriginalValue; + + /** 资产净值 */ + @Excel(name = "资产净值") + private String netAssetValue; + + /** 资产负责人 */ + @Excel(name = "资产负责人") + private String assetHead; + + /** 固定资产编码 */ + @Excel(name = "固定资产编码") + private String fixedAssetCode; + + /** 部门 */ + @Excel(name = "部门") + private String department; + + /** 单台能力工时 */ + @Excel(name = "单台能力工时") + private String unitWorkingHours; + + /** PLCIP */ + @Excel(name = "PLCIP") + private String plcIp; + + /** PLC端口 */ + @Excel(name = "PLC端口") + private Long plcPort; + + /** 删除标志1删除,0正常 */ + private String delFlag; + + /** SAP资产号 */ + @Excel(name = "SAP资产号") + private String sapAsset; + + public void setEquipmentId(Long equipmentId) { + this.equipmentId = equipmentId; + } + + public Long getEquipmentId() { + return equipmentId; + } + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } + + public String getEquipmentCode() { + return equipmentCode; + } + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentName() { + return equipmentName; + } + public void setEquipmentBrand(String equipmentBrand) { + this.equipmentBrand = equipmentBrand; + } + + public String getEquipmentBrand() { + return equipmentBrand; + } + public void setEquipmentSpec(String equipmentSpec) { + this.equipmentSpec = equipmentSpec; + } + + public String getEquipmentSpec() { + return equipmentSpec; + } + public void setEquipmentTypeId(Long equipmentTypeId) { + this.equipmentTypeId = equipmentTypeId; + } + + public Long getEquipmentTypeId() { + return equipmentTypeId; + } + public void setEquipmentTypeCode(String equipmentTypeCode) { + this.equipmentTypeCode = equipmentTypeCode; + } + + public String getEquipmentTypeCode() { + return equipmentTypeCode; + } + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + public void setWorkshopId(Long workshopId) { + this.workshopId = workshopId; + } + + public Long getWorkshopId() { + return workshopId; + } + 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 setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + 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(Long attr3) { + this.attr3 = attr3; + } + + public Long getAttr3() { + return attr3; + } + public void setAttr4(Long attr4) { + this.attr4 = attr4; + } + + public Long getAttr4() { + return attr4; + } + public void setWorkshopSection(String workshopSection) { + this.workshopSection = workshopSection; + } + + public String getWorkshopSection() { + return workshopSection; + } + public void setEquipmentLocation(String equipmentLocation) { + this.equipmentLocation = equipmentLocation; + } + + public String getEquipmentLocation() { + return equipmentLocation; + } + public void setHourlyUnitPrice(Long hourlyUnitPrice) { + this.hourlyUnitPrice = hourlyUnitPrice; + } + + public Long getHourlyUnitPrice() { + return hourlyUnitPrice; + } + public void setEquipmentBarcode(String equipmentBarcode) { + this.equipmentBarcode = equipmentBarcode; + } + + public String getEquipmentBarcode() { + return equipmentBarcode; + } + public void setEquipmentBarcodeImage(String equipmentBarcodeImage) { + this.equipmentBarcodeImage = equipmentBarcodeImage; + } + + public String getEquipmentBarcodeImage() { + return equipmentBarcodeImage; + } + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturer() { + return manufacturer; + } + public void setSupplier(String supplier) { + this.supplier = supplier; + } + + public String getSupplier() { + return supplier; + } + public void setUseLife(String useLife) { + this.useLife = useLife; + } + + public String getUseLife() { + return useLife; + } + public void setBuyTime(Date buyTime) { + this.buyTime = buyTime; + } + + public Date getBuyTime() { + return buyTime; + } + public void setAssetOriginalValue(String assetOriginalValue) { + this.assetOriginalValue = assetOriginalValue; + } + + public String getAssetOriginalValue() { + return assetOriginalValue; + } + public void setNetAssetValue(String netAssetValue) { + this.netAssetValue = netAssetValue; + } + + public String getNetAssetValue() { + return netAssetValue; + } + public void setAssetHead(String assetHead) { + this.assetHead = assetHead; + } + + public String getAssetHead() { + return assetHead; + } + public void setFixedAssetCode(String fixedAssetCode) { + this.fixedAssetCode = fixedAssetCode; + } + + public String getFixedAssetCode() { + return fixedAssetCode; + } + public void setDepartment(String department) { + this.department = department; + } + + public String getDepartment() { + return department; + } + public void setUnitWorkingHours(String unitWorkingHours) { + this.unitWorkingHours = unitWorkingHours; + } + + public String getUnitWorkingHours() { + return unitWorkingHours; + } + public void setPlcIp(String plcIp) { + this.plcIp = plcIp; + } + + public String getPlcIp() { + return plcIp; + } + public void setPlcPort(Long plcPort) { + this.plcPort = plcPort; + } + + public Long getPlcPort() { + return plcPort; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + public void setSapAsset(String sapAsset) { + this.sapAsset = sapAsset; + } + + public String getSapAsset() { + return sapAsset; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("equipmentId", getEquipmentId()) + .append("equipmentCode", getEquipmentCode()) + .append("equipmentName", getEquipmentName()) + .append("equipmentBrand", getEquipmentBrand()) + .append("equipmentSpec", getEquipmentSpec()) + .append("equipmentTypeId", getEquipmentTypeId()) + .append("equipmentTypeCode", getEquipmentTypeCode()) + .append("equipmentTypeName", getEquipmentTypeName()) + .append("workshopId", getWorkshopId()) + .append("workshopCode", getWorkshopCode()) + .append("workshopName", getWorkshopName()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("workshopSection", getWorkshopSection()) + .append("equipmentLocation", getEquipmentLocation()) + .append("hourlyUnitPrice", getHourlyUnitPrice()) + .append("equipmentBarcode", getEquipmentBarcode()) + .append("equipmentBarcodeImage", getEquipmentBarcodeImage()) + .append("manufacturer", getManufacturer()) + .append("supplier", getSupplier()) + .append("useLife", getUseLife()) + .append("buyTime", getBuyTime()) + .append("assetOriginalValue", getAssetOriginalValue()) + .append("netAssetValue", getNetAssetValue()) + .append("assetHead", getAssetHead()) + .append("fixedAssetCode", getFixedAssetCode()) + .append("department", getDepartment()) + .append("unitWorkingHours", getUnitWorkingHours()) + .append("plcIp", getPlcIp()) + .append("plcPort", getPlcPort()) + .append("delFlag", getDelFlag()) + .append("sapAsset", getSapAsset()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java new file mode 100644 index 000000000..ec53c3fc4 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java @@ -0,0 +1,38 @@ +package com.op.device.domain.vo; + +import com.op.device.domain.EquOrder; +import com.op.device.domain.EquOrderDetail; +import com.op.device.domain.Equipment; + +import java.util.List; + +// 工单-报表VO +public class InspectionWorkVO { + private EquOrder order; + private Equipment equ; + private List detailList; + + public EquOrder getOrder() { + return order; + } + + public void setOrder(EquOrder order) { + this.order = order; + } + + public Equipment getEqu() { + return equ; + } + + public void setEqu(Equipment equ) { + this.equ = equ; + } + + public List getDetailList() { + return detailList; + } + + public void setDetailList(List detailList) { + this.detailList = detailList; + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java index d6611e4a3..7dc3458c2 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java @@ -65,4 +65,11 @@ public interface EquOrderDetailMapper { * @return */ List selectEquOrderDetailByParentCode(String code); + + /** + * 查询检查项list-工单code + * @param orderCode + * @return + */ + List selectEquOrderDetailByOrderCode(String orderCode); } 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 32da1d8a6..23c57844f 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 @@ -2,6 +2,7 @@ package com.op.device.mapper; import java.util.List; +import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquOrder; /** @@ -98,4 +99,12 @@ public interface EquOrderMapper { * @return */ int selectSerialNumber(); + + /** + * 替换循环类型 + * @param planLoopType + * @return + */ + @DS("#master") + String changeLoopType(String planLoopType); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquipmentMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquipmentMapper.java new file mode 100644 index 000000000..1447f0994 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquipmentMapper.java @@ -0,0 +1,13 @@ +package com.op.device.mapper; + +import com.op.device.domain.Equipment; + +public interface EquipmentMapper { + /** + * 查询设备管理 + * + * @param equipmentId 设备管理主键 + * @return 设备管理 + */ + public Equipment selectEquipmentByEquipmentCode(String equipmentCode); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IInspectionWorkService.java b/op-modules/op-device/src/main/java/com/op/device/service/IInspectionWorkService.java new file mode 100644 index 000000000..a958a1f37 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IInspectionWorkService.java @@ -0,0 +1,62 @@ +package com.op.device.service; + +import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquOrder; + +/** + * 巡检记录Service接口 + * + * @author wws + * @date 2023-11-07 + */ +public interface IInspectionWorkService { + /** + * 查询巡检记录 + * + * @param orderId 巡检记录主键 + * @return 巡检记录 + */ + public AjaxResult selectEquOrderByOrderId(String orderId); + + /** + * 查询巡检记录列表 + * + * @param equOrder 巡检记录 + * @return 巡检记录集合 + */ + public List selectEquOrderList(EquOrder equOrder); + + /** + * 新增巡检记录 + * + * @param equOrder 巡检记录 + * @return 结果 + */ + public int insertEquOrder(EquOrder equOrder); + + /** + * 修改巡检记录 + * + * @param equOrder 巡检记录 + * @return 结果 + */ + public int updateEquOrder(EquOrder equOrder); + + /** + * 批量删除巡检记录 + * + * @param orderIds 需要删除的巡检记录主键集合 + * @return 结果 + */ + public int deleteEquOrderByOrderIds(String[] orderIds); + + /** + * 删除巡检记录信息 + * + * @param orderId 巡检记录主键 + * @return 结果 + */ + public int deleteEquOrderByOrderId(String orderId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java new file mode 100644 index 000000000..873d91c1e --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java @@ -0,0 +1,145 @@ +package com.op.device.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.*; +import com.op.device.domain.vo.InspectionWorkVO; +import com.op.device.mapper.*; +import com.op.device.service.IInspectionWorkService; + +import java.util.List; +import com.op.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.service.IEquOrderService; + +import static com.op.common.core.web.domain.AjaxResult.success; + +/** + * 巡检记录Service业务层处理 + * + * @author wws + * @date 2023-11-07 + */ +@Service +public class InspectionWorkServiceImpl implements IInspectionWorkService { + @Autowired + private EquOrderMapper equOrderMapper; + @Autowired + private EquipmentMapper equipmentMapper; + @Autowired + private EquOrderDetailMapper equOrderDetailMapper; + @Autowired + private EquOrderStandardMapper equOrderStandardMapper; + @Autowired + private EquPlanMapper equPlanMapper; + + /** + * 查询巡检记录 + * + * @param orderId 巡检记录主键 + * @return 巡检记录 + */ + @Override + @DS("#header.poolName") + public AjaxResult selectEquOrderByOrderId(String orderId) { + InspectionWorkVO workVO = new InspectionWorkVO(); + EquOrder order = equOrderMapper.selectEquOrderByOrderId(orderId); + // 设置计划名称 + EquPlan equPlan = equPlanMapper.selectEquPlanByPlanCode(order.getPlanCode()); + order.setPlanName(equPlan.getPlanName()); + // 替换循环周期 + order.setPlanLoopType(equOrderMapper.changeLoopType(order.getPlanLoopType())); + + Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(order.getEquipmentCode()); + + List detailList = equOrderDetailMapper.selectEquOrderDetailByOrderCode(order.getOrderCode()); + for (EquOrderDetail detail : detailList) { + List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode()); + for (EquOrderStandard standard : standardList) { + if (standard.getStandardType().equals("quantify")){ + standard.setStandardTypeName("定量"); + }else { + standard.setStandardTypeName("定性"); + } + + if (standard.getDetailReach() != null) { + if (standard.getDetailReach().equals("0")){ + standard.setDetailReach("未达标"); + }else { + standard.setDetailReach("达标"); + } + } + } + detail.setStandardList(standardList); + } + workVO.setOrder(order); + workVO.setEqu(equipment); + workVO.setDetailList(detailList); + + return success(workVO); + } + + /** + * 查询巡检记录列表 + * + * @param equOrder 巡检记录 + * @return 巡检记录 + */ + @Override + @DS("#header.poolName") + public List selectEquOrderList(EquOrder equOrder) { + return equOrderMapper.selectEquOrderList(equOrder); + } + + /** + * 新增巡检记录 + * + * @param equOrder 巡检记录 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertEquOrder(EquOrder equOrder) { + equOrder.setCreateTime(DateUtils.getNowDate()); + return equOrderMapper.insertEquOrder(equOrder); + } + + /** + * 修改巡检记录 + * + * @param equOrder 巡检记录 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateEquOrder(EquOrder equOrder) { + equOrder.setUpdateTime(DateUtils.getNowDate()); + return equOrderMapper.updateEquOrder(equOrder); + } + + /** + * 批量删除巡检记录 + * + * @param orderIds 需要删除的巡检记录主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquOrderByOrderIds(String[] orderIds) { + return equOrderMapper.deleteEquOrderByOrderIds(orderIds); + } + + /** + * 删除巡检记录信息 + * + * @param orderId 巡检记录主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquOrderByOrderId(String orderId) { + return equOrderMapper.deleteEquOrderByOrderId(orderId); + } + +} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml index 2ca628837..9146edf76 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml @@ -57,6 +57,11 @@ where parent_code = #{parentCode} + + insert into equ_order_detail 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 a68120338..9f3741f23 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 @@ -70,9 +70,9 @@ and attr3 = #{attr3} and del_flag = #{delFlag} and create_by like concat('%', #{createBy}, '%') - and create_time = #{createTime} + and CONVERT(date,create_time) = #{createTime} and update_by like concat('%', #{updateBy}, '%') - and update_time = #{updateTime} + and CONVERT(date,update_time) = #{updateTime} and upkeep = #{upkeep} and calculation_rule = #{calculationRule} and shut_down = #{shutDown} @@ -119,7 +119,11 @@ WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0' - + + + insert into equ_order order_id, diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquipmentMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquipmentMapper.xml new file mode 100644 index 000000000..b69d3672a --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquipmentMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price, equipment_barcode, equipment_barcode_image, manufacturer, supplier, use_life, buy_time, asset_original_value, net_asset_value, asset_head, fixed_asset_code, department, unit_working_hours, plc_ip, plc_port, del_flag, sap_asset from base_equipment + + + + + \ No newline at end of file