Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmDeviceRepairServiceImpl.java

@@ -127,22 +127,41 @@ public class CrmDeviceRepairServiceImpl extends AbstractCrudService<CrmDeviceRep
 
     @Override
     public List<CrmDeviceRepairAddVO> getAddHistoryInfo(String projectName){
+
+        QueryWrapper<CrmDeviceRepair> wrapper = Wrappers.query();
+        wrapper.select("project_name as projectName","concat(Max(create_time),'') as createTime")
+                .groupBy("project_name");
+        List<Map<String,Object>> mapList = this.listMaps(wrapper);
+
         List<CrmDeviceRepairAddVO> list = new ArrayList<>();
         LambdaQueryWrapper<CrmDeviceRepair> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.like(StringUtils.isNotBlank(projectName),CrmDeviceRepair::getProjectName,projectName)
                 .orderByDesc(CrmDeviceRepair::getId);
         List<CrmDeviceRepair> repairList = this.list(queryWrapper);
+        int n = 0;
         if(CollectionUtils.isNotEmpty(repairList)){
-            for (int i = 0; i < repairList.size(); i++) {
-                CrmDeviceRepairAddVO addVO = new CrmDeviceRepairAddVO();
-                addVO.setProjectName(repairList.get(i).getProjectName());
-                addVO.setProjectAddress(repairList.get(i).getProjectAddress());
-                addVO.setReflectName(repairList.get(i).getReflectName());
-                addVO.setReflectPhone(repairList.get(i).getReflectPhone());
-                addVO.setRepairContent(repairList.get(i).getRepairContent());
-                addVO.setRepairPicture(repairList.get(i).getRepairPicture());
-                list.add(addVO);
+            if(mapList.size() > 0){
+                for (int i = 0; i < repairList.size(); i++) {
+                    for (int j = 0; j < mapList.size(); j++) {
+                        if(repairList.get(i).getProjectName().equals(mapList.get(j).get("projectName").toString()) && repairList.get(i).getCreateTime().equals(LocalDateTime.parse(mapList.get(j).get("createTime").toString(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))){
+                            n++;
+                            if(n > 10){
+                                break;
+                            }
+
+                            CrmDeviceRepairAddVO addVO = new CrmDeviceRepairAddVO();
+                            addVO.setProjectName(repairList.get(i).getProjectName());
+                            addVO.setProjectAddress(repairList.get(i).getProjectAddress());
+                            addVO.setReflectName(repairList.get(i).getReflectName());
+                            addVO.setReflectPhone(repairList.get(i).getReflectPhone());
+                            addVO.setRepairContent(repairList.get(i).getRepairContent());
+                            addVO.setRepairPicture(repairList.get(i).getRepairPicture());
+                            list.add(addVO);
+                        }
+                    }
+                }
             }
+
         }
 
         return list;