From 7e3a731b960455b16016c3c4e2e727caa8190bb0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 01 六月 2020 12:03:04 +0800
Subject: [PATCH] 优化查询小区多条是报错问题
---
CommunityService/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/CommunityService/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java b/CommunityService/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java
index c89d6f8..41cd1a1 100644
--- a/CommunityService/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java
+++ b/CommunityService/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java
@@ -5,9 +5,11 @@
import com.java110.community.dao.IInspectionTaskServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.smo.inspectionPoint.IInspectionInnerServiceSMO;
import com.java110.core.smo.inspectionTask.IInspectionTaskInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
+import com.java110.dto.inspectionPoint.InspectionDto;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -15,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -33,6 +36,9 @@
@Autowired
private IInspectionTaskServiceDao inspectionTaskServiceDaoImpl;
+
+ @Autowired
+ private IInspectionInnerServiceSMO inspectionInnerServiceSMOImpl;
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@@ -73,11 +79,27 @@
param.put("inspectionPlanPeriod", "2020022");
List<Map> inspectPlans = inspectionTaskServiceDaoImpl.queryTodayInspectionPlan(param);
Map taskParam = new HashMap();
+ List<Map> taskDetails = new ArrayList<>();
+ Map taskDetailInfo = null;
+ InspectionDto inspectionDto = null;
//#{task.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId}
if (inspectPlans != null && inspectPlans.size() > 0) {
for (Map inspectPlan : inspectPlans) {
inspectPlan.put("planInsTime", new Date());
inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+ inspectionDto = new InspectionDto();
+ inspectionDto.setCommunityId(inspectPlan.get("communityId") + "");
+ inspectionDto.setInspectionPlanId(inspectPlan.get("inspectionPlanId") + "");
+ List<InspectionDto> inspectionDtos = inspectionInnerServiceSMOImpl.queryInspectionsByPlan(inspectionDto);
+ for (InspectionDto tmpInspection : inspectionDtos) {
+ taskDetailInfo = new HashMap();
+ taskDetailInfo.put("taskId", inspectPlan.get("taskId"));
+ taskDetailInfo.put("taskDetailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskDetailId));
+ taskDetailInfo.put("inspectionId", tmpInspection.getInspectionId());
+ taskDetailInfo.put("inspectionName", tmpInspection.getInspectionName());
+ taskDetailInfo.put("state", "20200405");
+ taskDetails.add(taskDetailInfo);
+ }
}
taskParam.put("tasks", inspectPlans);
inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
@@ -90,6 +112,19 @@
for (Map inspectPlan : inspectPlans) {
inspectPlan.put("planInsTime", new Date());
inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+ inspectionDto = new InspectionDto();
+ inspectionDto.setCommunityId(inspectPlan.get("communityId") + "");
+ inspectionDto.setInspectionPlanId(inspectPlan.get("inspectionPlanId") + "");
+ List<InspectionDto> inspectionDtos = inspectionInnerServiceSMOImpl.queryInspectionsByPlan(inspectionDto);
+ for (InspectionDto tmpInspection : inspectionDtos) {
+ taskDetailInfo = new HashMap();
+ taskDetailInfo.put("taskId", inspectPlan.get("taskId"));
+ taskDetailInfo.put("taskDetailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskDetailId));
+ taskDetailInfo.put("inspectionId", tmpInspection.getInspectionId());
+ taskDetailInfo.put("inspectionName", tmpInspection.getInspectionName());
+ taskDetailInfo.put("state", "20200405");
+ taskDetails.add(taskDetailInfo);
+ }
}
taskParam.put("tasks", inspectPlans);
inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
@@ -101,11 +136,29 @@
for (Map inspectPlan : inspectPlans) {
inspectPlan.put("planInsTime", new Date());
inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+ inspectionDto = new InspectionDto();
+ inspectionDto.setCommunityId(inspectPlan.get("communityId") + "");
+ inspectionDto.setInspectionPlanId(inspectPlan.get("inspectionPlanId") + "");
+ List<InspectionDto> inspectionDtos = inspectionInnerServiceSMOImpl.queryInspectionsByPlan(inspectionDto);
+ for (InspectionDto tmpInspection : inspectionDtos) {
+ taskDetailInfo = new HashMap();
+ taskDetailInfo.put("taskId", inspectPlan.get("taskId"));
+ taskDetailInfo.put("taskDetailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskDetailId));
+ taskDetailInfo.put("inspectionId", tmpInspection.getInspectionId());
+ taskDetailInfo.put("inspectionName", tmpInspection.getInspectionName());
+ taskDetailInfo.put("state", "20200405");
+ taskDetails.add(taskDetailInfo);
+ }
}
taskParam.put("tasks", inspectPlans);
inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
}
+ if (taskDetails != null && taskDetails.size() > 0) {
+ Map taskDetailParam = new HashMap();
+ taskDetailParam.put("tasks", taskDetails);
+ inspectionTaskServiceDaoImpl.insertInspectionTaskDetail(taskParam);
+ }
return param;
--
Gitblit v1.8.0