优化

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -44,7 +44,6 @@ import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.mapper.store.InStoreFormMapper;
 import com.platform.dao.mapper.store.OutStoreFormMapper;
 import com.platform.dao.mapper.store.StoreCheckJobMapper;
-import com.platform.dao.mapper.upms.SysDeptMapper;
 import com.platform.dao.mapper.upms.SysUserDeptMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.mapper.upms.SysUserRoleMapper;
@@ -1540,16 +1539,25 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             List<RepairApplicationFormVO> detailList = new ArrayList<RepairApplicationFormVO>();
             vo.setYear(map.get("searchStartTimeMonth").getYear());
             vo.setMonth(map.get("searchStartTimeMonth").getMonthValue());
-            for (RepairApplicationFormVO repairApplicationForm : list) {
-//                if (repairApplicationForm.getDealMinutes() == null) {
-//                    continue;
-//                }
-              /*  if (type == 1) {
-                    double minutes = repairApplicationForm.getDealMinutes();
-                    if (minutes < 24.0) {
-                        continue;
+
+            // 维修描述
+            Weekend<CustomFieldTemplateData> weekend = new Weekend<>(CustomFieldTemplateData.class);
+            WeekendCriteria<CustomFieldTemplateData, Object> weekendCriteria = weekend.weekendCriteria();
+            weekendCriteria = weekendCriteria.andEqualTo(CustomFieldTemplateData::getRemark,CommonConstants.REPAIR_RECORD);
+            weekendCriteria.andLessThan(CustomFieldTemplateData::getCreatedTime,map.get("searchEndTimeMonth"));
+            weekendCriteria.andGreaterThan(CustomFieldTemplateData::getCreatedTime,map.get("searchStartTimeMonth"));
+            List<CustomFieldTemplateData> listCustomer = customFieldTemplateDataMapper.selectByExample(weekend);
+            Map<String,CustomFieldTemplateData> dataMap = new HashMap<>();
+            if(listCustomer != null && listCustomer.size() > 0){
+                listCustomer.forEach(item->{
+                    String key = item.getObjId() + "&" + item.getCreatedUserId();
+                    CustomFieldTemplateData tempData = dataMap.get(key);
+                    if(tempData == null){
+                        dataMap.put(key,item);
                     }
-                }*/
+                });
+            }
+            for (RepairApplicationFormVO repairApplicationForm : list) {
                 if (repairApplicationForm.getApplyTime().isAfter(map.get("searchStartTimeMonth")) && repairApplicationForm.getApplyTime().isBefore(map.get("searchEndTimeMonth"))) {
                     i++;
                     // 维修专业
@@ -1564,17 +1572,10 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                         String infoStr = info.toString();
                         repairApplicationForm.setRepairProfessor(infoStr.substring(0,infoStr.length()-1));
                     }
-                    // 维修描述
-                    Weekend<CustomFieldTemplateData> weekend = new Weekend<>(CustomFieldTemplateData.class);
-                    WeekendCriteria<CustomFieldTemplateData, Object> weekendCriteria = weekend.weekendCriteria();
-                    weekendCriteria = weekendCriteria.andEqualTo(CustomFieldTemplateData::getRemark,CommonConstants.REPAIR_RECORD)
-                            .andEqualTo(CustomFieldTemplateData::getObjId,repairApplicationForm.getId());
-                    if(StringUtils.isNotBlank(repairApplicationForm.getRepairUserId())){
-                        weekendCriteria.andEqualTo(CustomFieldTemplateData::getCreatedUserId,repairApplicationForm.getRepairUserId());
-                    }
-                    List<CustomFieldTemplateData> listCustomer = customFieldTemplateDataMapper.selectByExample(weekend);
-                    if(listCustomer != null && listCustomer.size() > 0){
-                        RepairRecordTemplateData dataInfo = JsonUtils.jsonToModel(listCustomer.get(0).getData(),RepairRecordTemplateData.class);
+                    String key = repairApplicationForm.getId() + "&" + repairApplicationForm.getRepairUserId();
+                    CustomFieldTemplateData data = dataMap.get(key);
+                    if(data != null){
+                        RepairRecordTemplateData dataInfo = JsonUtils.jsonToModel(data.getData(),RepairRecordTemplateData.class);
                         repairApplicationForm.setOtherChangeContent(dataInfo.getRemark());
                     }
                     detailList.add(repairApplicationForm);
@@ -1583,9 +1584,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             vo.setNum(i);
             vo.setDetailList(detailList);
             result.add(vo);
-            /*if (type == 2) {
-                i = 0;
-            }*/
         }
         return result;
     }