1.装备水源id查询维保记录

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dto/CheckInputDto.java

@@ -19,6 +19,10 @@ public class CheckInputDto {
 	private String isOk;
 	private String isOkDesc;
 	/**
+	 * 检查项类型:文本,选择,数字
+	 */
+	private String itemType;
+	/**
 	 * 拍照配置
 	 */
 	private String pictureJson;

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

@@ -429,7 +429,7 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
-    public Page<Check> getCheckListByOriginalId(String originalId, CommonPageable pageable) {
+    public Page<Map<String, Object>> getCheckListByOriginalId(String originalId, CommonPageable pageable) {
         Point point = iPointDao.findByOriginalId(originalId);
         if (point == null) {
             throw new RuntimeException("不存在该设备设施");
@@ -446,7 +446,20 @@ public class CheckServiceImpl implements ICheckService {
         orders.add(idOrder);
         Sort sort = Sort.by(orders);
         pageable.setSort(sort);
-        return checkDao.findAll(spec, pageable);
+        Page<Check> page = checkDao.findAll(spec, pageable);
+        List<Map<String, Object>> content = page.getContent().stream().map(r -> {
+            Map<String, Object> target = Bean.BeantoMap(r);
+            if (StringUtil.isNotEmpty(r.getPlanType())) {
+                PlanTypeEnum planTypeEnum = PlanTypeEnum.getEnumByCode(r.getPlanType());
+                target.put("planTypeDesc", planTypeEnum != null ? planTypeEnum.getName() : "");
+            }
+            if (StringUtil.isNotEmpty(r.getIsOk())) {
+                CheckStatusEnum checkStatusEnum = CheckStatusEnum.getEnum(r.getPlanType());
+                target.put("isOkDesc", checkStatusEnum != null ? checkStatusEnum.getName() : "");
+            }
+            return target;
+        }).collect(Collectors.toList());
+        return new PageImpl<>(content, pageable, page.getTotalElements());
     }
 
     @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/ICheckService.java

@@ -269,7 +269,14 @@ public interface ICheckService {
      */
     int checkHasRecord(Long planTaskId, Long pointId);
 
-    Page<Check> getCheckListByOriginalId(String originalId, CommonPageable pageable);
+
+    /**
+     * 维保记录-按照管理id查询
+     * @param originalId 关联id
+     * @param pageable 分页信息 0页开始
+     * @return Page<Map<String,Object>>
+     */
+    Page<Map<String,Object>> getCheckListByOriginalId(String originalId, CommonPageable pageable);
 
     /**
      * 维保检查项详情

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

@@ -2068,7 +2068,8 @@
            ii.data_json,
            ii.test_requirement as testRequirement,
            ii.basis_json as basisJson,
-           ii.is_must as isMust
+           ii.is_must as isMust,
+           ii.item_type as itemType
         from p_check_input ci
          left join p_input_item ii on ci.input_id = ii.id
         where ci.check_id=#{checkId}