1.app维保记录详情

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/PlanTypeEnum.java

+package com.yeejoin.amos.maintenance.common.enums;
+
+import lombok.Data;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @author DELL
+ */
+public enum  PlanTypeEnum {
+    /**
+     * 计划类型枚举
+     */
+    PLAN_TYPE_DAY("1","日计划"),
+    PLAN_TYPE_WEEK("2","周计划"),
+    PLAN_TYPE_MONTH("3","月计划"),
+    PLAN_TYPE_YEAR("4","年计划");
+
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * code
+     */
+    private String code;
+
+    PlanTypeEnum(String code, String name){
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static PlanTypeEnum getEnumByCode(String code) {
+        Optional<PlanTypeEnum> op = Arrays.stream(PlanTypeEnum.values()).filter(e->e.code.equals(code)).findFirst();
+        return op.orElse(null);
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -33,10 +33,7 @@ import com.yeejoin.amos.maintenance.business.util.DaoCriteria;
 import com.yeejoin.amos.maintenance.business.util.ToolUtils;
 import com.yeejoin.amos.maintenance.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.maintenance.business.vo.CheckInfoVo;
-import com.yeejoin.amos.maintenance.common.enums.CheckStatusEnum;
-import com.yeejoin.amos.maintenance.common.enums.PlanTaskFinishStatusEnum;
-import com.yeejoin.amos.maintenance.common.enums.PointLevelEnum;
-import com.yeejoin.amos.maintenance.common.enums.PointStatusEnum;
+import com.yeejoin.amos.maintenance.common.enums.*;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.response.*;
 import com.yeejoin.amos.maintenance.core.enums.QueryOperatorEnum;
@@ -1125,6 +1122,10 @@ public class CheckServiceImpl implements ICheckService {
         if (facility.containsKey("isOk")) {
             facility.put("isOkDesc", CheckStatusEnum.getEnum(String.valueOf(facility.get("isOk"))).getName());
         }
+        if(facility.containsKey("planType")){
+            PlanTypeEnum planType = PlanTypeEnum.getEnumByCode(String.valueOf(facility.get("planType")));
+            facility.put("planTypeDesc", planType != null ? planType.getName() : "其他");
+        }
         return facility;
     }
 

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -2033,9 +2033,18 @@
             pc.plan_name as planName,
             pc.plan_type as planType,
             pc.owner_name as ownerName,
-            pc.begin_time as beginTime,
-            pc.end_time as endTime,
-            pc.check_time as checkTime,
+            date_format(
+            pc.begin_time,
+            '%Y-%m-%d %H:%i:%s'
+            ) as beginTime,
+            date_format(
+            pc.end_time,
+            '%Y-%m-%d %H:%i:%s'
+            ) as endTime,
+            date_format(
+            pc.check_time,
+            '%Y-%m-%d %H:%i:%s'
+            ) as checkTime,
             pc.risk_and_manage as riskAndManage,
             pc.remark
         FROM p_check pc