diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java index 286ad35f3..3357e2b3b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java @@ -3,6 +3,7 @@ package com.op.device.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.op.device.domain.query.EquOrderMonthQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -96,4 +97,15 @@ public class EquOrderController extends BaseController { public AjaxResult remove(@PathVariable String[] orderIds) { return equOrderService.deleteEquOrderByOrderIds(orderIds); } + + + /** + * 根据设备ID查询月工单 + */ + @GetMapping("/month-list") + @Log(title = "查询月设备工单", businessType = BusinessType.QUERY) + public AjaxResult deviceOrderMonthList(EquOrderMonthQuery query) { + return AjaxResult.success(equOrderService.getDeviceOrderMonthList(query)); + } + } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/query/EquOrderMonthQuery.java b/op-modules/op-device/src/main/java/com/op/device/domain/query/EquOrderMonthQuery.java new file mode 100644 index 000000000..fe714ef54 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/query/EquOrderMonthQuery.java @@ -0,0 +1,49 @@ +package com.op.device.domain.query; + +/** + * remark + * + * @author 019117 + * @date + */ +public class EquOrderMonthQuery { + + /** + * 设备编号 + * **/ + private String equipmentCode; + + /** + * 日期 + * **/ + private String queryDate; + + /** + * 计划类型 + * **/ + private String planType; + + public String getEquipmentCode() { + return equipmentCode; + } + + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } + + public String getQueryDate() { + return queryDate; + } + + public void setQueryDate(String queryDate) { + this.queryDate = queryDate; + } + + public String getPlanType() { + return planType; + } + + public void setPlanType(String planType) { + this.planType = planType; + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquOrderMonthVo.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquOrderMonthVo.java new file mode 100644 index 000000000..4670da0b8 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquOrderMonthVo.java @@ -0,0 +1,88 @@ +package com.op.device.domain.vo; + +/** + * remark + * + * @author 019117 + * @date + */ +public class EquOrderMonthVo { + + /** + * 检查项目 + * **/ + private String checkItem; + + /** + * 检查日期 + * **/ + private String checkDate; + + /** + * 检查结果 + * **/ + private String checkResult; + + /** + * 检查人员 + * **/ + private String checkPerson; + + /** + * 确认人员 + * **/ + private String confirmPerson; + + /** + * 异常处理情况 + * **/ + private String exceptionHandle; + + public String getCheckItem() { + return checkItem; + } + + public void setCheckItem(String checkItem) { + this.checkItem = checkItem; + } + + public String getCheckDate() { + return checkDate; + } + + public void setCheckDate(String checkDate) { + this.checkDate = checkDate; + } + + public String getCheckResult() { + return checkResult; + } + + public void setCheckResult(String checkResult) { + this.checkResult = checkResult; + } + + public String getCheckPerson() { + return checkPerson; + } + + public void setCheckPerson(String checkPerson) { + this.checkPerson = checkPerson; + } + + public String getConfirmPerson() { + return confirmPerson; + } + + public void setConfirmPerson(String confirmPerson) { + this.confirmPerson = confirmPerson; + } + + public String getExceptionHandle() { + return exceptionHandle; + } + + public void setExceptionHandle(String exceptionHandle) { + this.exceptionHandle = exceptionHandle; + } +} 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 eff308f37..55372d427 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 @@ -6,6 +6,8 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquOrder; import com.op.device.domain.Equipment; import com.op.device.domain.dto.PDADTO; +import com.op.device.domain.query.EquOrderMonthQuery; +import com.op.device.domain.vo.EquOrderMonthVo; import org.apache.ibatis.annotations.Mapper; /** @@ -192,4 +194,9 @@ public interface EquOrderMapper { String getGroupLine(String auxiliaryEquipmentCode); String selectEquipment(String equipmentCode); + + /** + * 根据设备ID查询月工单 + */ + List getDeviceOrderMonthList(EquOrderMonthQuery query); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java index b945c6407..540d72cba 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java @@ -4,6 +4,8 @@ import java.util.List; import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.EquOrder; +import com.op.device.domain.query.EquOrderMonthQuery; +import com.op.device.domain.vo.EquOrderMonthVo; /** * 计划工单Service接口 @@ -59,4 +61,10 @@ public interface IEquOrderService { * @return 结果 */ public int deleteEquOrderByOrderId(String orderId); + + /** + * 根据设备ID查询月工单 + */ + List getDeviceOrderMonthList(EquOrderMonthQuery query); + } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java index cd453a0ad..b09e150ac 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java @@ -20,6 +20,8 @@ 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.domain.query.EquOrderMonthQuery; +import com.op.device.domain.vo.EquOrderMonthVo; import com.op.device.mapper.*; import com.op.system.api.RemoteOpenService; import com.op.system.api.domain.SysNoticeGroup; @@ -565,6 +567,17 @@ public class EquOrderServiceImpl implements IEquOrderService { return equOrderMapper.deleteEquOrderByOrderId(orderId); } + /** + * 根据设备ID查询月工单 + * + * @param query + */ + @Override + @DS("#header.poolName") + public List getDeviceOrderMonthList(EquOrderMonthQuery query) { + return equOrderMapper.getDeviceOrderMonthList(query); + } + /** * 获取工作中心列表公共方法 * 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 0e255a72a..7121964d2 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 @@ -544,4 +544,40 @@ and del_flag = '0' + + +