点检工单新增点检结果

op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java

@@ -74,6 +74,12 @@ public class EquOrder extends BaseEntity {
     @Excel(name = "循环周期类型")
     private String planLoopType;
 
+    /**
+     * 点检结果
+     * **/
+    @Excel(name = "点检结果")
+    private String checkResult;
+
     /**
      * 循环执行时间开始
      */
@@ -848,6 +854,14 @@ public class EquOrder extends BaseEntity {
     public String getTimeDimension() { return timeDimension; }
     public void setTimeDimension(String timeDimension) { this.timeDimension = timeDimension; }
 
+    public String getCheckResult() {
+        return checkResult;
+    }
+
+    public void setCheckResult(String checkResult) {
+        this.checkResult = checkResult;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java

@@ -110,4 +110,10 @@ public interface EquOrderStandardMapper {
 
     //更新标准
     void updateActualValues(EquOrderStandard standardList);
+
+
+    /**
+     * 获取不合格记录
+     * **/
+    int selectUnqualifiedCount(String orderCode);
 }

op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java

@@ -188,6 +188,21 @@ public class EquOrderServiceImpl implements IEquOrderService {
         // 获取工单列表
         List<EquOrder> orderList = equOrderMapper.selectEquOrderList(equOrder);
 
+        for (EquOrder order : orderList) {
+            //获取点检结果
+            if ("0".equals(order.getOrderStatus())){
+                //未完成不获取结果
+                continue;
+            }
+            //获取不合格记录，大于0则不合格
+            int unqualifiedCount = equOrderStandardMapper.selectUnqualifiedCount(order.getOrderCode());
+            if (unqualifiedCount > 0) {
+                order.setCheckResult("未达标");
+            } else {
+                order.setCheckResult("达标");
+            }
+        }
+
         // 获取工作中心
         List<WorkCenter> workCenters = getWorkCenterCommon();