计量设备月检验报表

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));
+    }
+
 }

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;
+    }
+}

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;
+    }
+}

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<EquOrderMonthVo> getDeviceOrderMonthList(EquOrderMonthQuery query);
 }

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<EquOrderMonthVo> getDeviceOrderMonthList(EquOrderMonthQuery query);
+
 }

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<EquOrderMonthVo> getDeviceOrderMonthList(EquOrderMonthQuery query) {
+        return equOrderMapper.getDeviceOrderMonthList(query);
+    }
+
     /**
      * 获取工作中心列表公共方法
      *

op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml

@@ -544,4 +544,40 @@
 	    and del_flag = '0'
 	</select>
 
+
+    <select id="getDeviceOrderMonthList" parameterType="com.op.device.domain.query.EquOrderMonthQuery" resultType="com.op.device.domain.vo.EquOrderMonthVo">
+        SELECT
+            os.standard_name checkItem,
+            STRING_AGG(DATEPART(day, eo.create_time), ',') WITHIN GROUP (ORDER BY eo.create_time) AS checkDate,
+            STRING_AGG(os.detail_reach, ',') WITHIN GROUP (ORDER BY eo.create_time) AS checkResult,
+            '' checkPerson,
+            '' confirmPerson
+        FROM
+            equ_order eo
+            LEFT JOIN equ_order_standard os ON eo.order_code = os.order_code
+        WHERE
+            eo.equipment_code = #{equipmentCode}
+            AND CONVERT(varchar(7), eo.create_time, 120) = #{queryDate}
+            AND eo.update_time IS NOT NULL
+            AND eo.plan_type = #{planType}
+        GROUP BY
+            os.standard_name
+        UNION ALL
+        SELECT
+            'other' checkItem,
+            STRING_AGG(DATEPART(day, eo.create_time), ',') WITHIN GROUP (ORDER BY eo.create_time) AS checkDate,
+            '' checkResult,
+            STRING_AGG ( eo.plan_person_name, ',' ) WITHIN GROUP ( ORDER BY eo.create_time ) AS checkPerson,
+            STRING_AGG ( eo.plan_person_name, ',' ) WITHIN GROUP ( ORDER BY eo.create_time ) AS confirmPerson
+        FROM
+            equ_order eo
+        WHERE
+            eo.equipment_code = #{equipmentCode}
+            AND CONVERT(varchar(7), eo.create_time, 120) = #{queryDate}
+            AND eo.update_time IS NOT NULL
+            AND eo.plan_type = #{planType}
+        GROUP BY
+            eo.plan_type
+	</select>
+
 </mapper>