From cddd83f139af1786517759277ced8479cbe80d3b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 12:57:09 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/inspectionRoute/InspectionRouteDto.java | 10 ++++++++++
Api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java | 38 ++++++++++++++++++++++++++++++++++++--
java110-db/src/main/resources/mapper/community/InspectionRouteServiceDaoImplMapper.xml | 6 ++++++
3 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java b/Api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java
index 8cecb27..a3a7d6f 100644
--- a/Api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java
+++ b/Api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java
@@ -2,9 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.listener.AbstractServiceApiListener;
+import com.java110.core.smo.inspectionRoute.IInspectionRouteInnerServiceSMO;
import com.java110.core.smo.org.IOrgInnerServiceSMO;
import com.java110.core.smo.org.IOrgStaffRelInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.dto.inspectionRoute.InspectionRouteDto;
import com.java110.dto.org.OrgStaffRelDto;
import com.java110.dto.user.UserDto;
import com.java110.utils.constant.ServiceCodeInspectionPlanConstant;
@@ -22,6 +24,7 @@
import org.springframework.http.ResponseEntity;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@ -36,6 +39,8 @@
private IInspectionPlanInnerServiceSMO inspectionPlanInnerServiceSMOImpl;
@Autowired
private IOrgStaffRelInnerServiceSMO iOrgStaffRelInnerServiceSMO;
+ @Autowired
+ private IInspectionRouteInnerServiceSMO inspectionRouteInnerServiceSMOImpl;
@Override
@@ -80,9 +85,12 @@
if (count > 0) {
inspectionPlans = BeanConvertUtil.covertBeanList(inspectionPlanInnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto), ApiInspectionPlanDataVo.class);
ArrayList staffIds = new ArrayList<>();
+ ArrayList inspectionRouteIds = new ArrayList<>();
for( ApiInspectionPlanDataVo Plans : inspectionPlans){
- if(Plans.getStaffId() != null){
- staffIds.add(Plans.getStaffId());
+ staffIds.add(Plans.getStaffId());
+ String[] ids = Plans.getInspectionRouteId().split(",");
+ for( String s : ids){
+ inspectionRouteIds.add(s);
}
}
if(staffIds.size() > 0){
@@ -102,6 +110,32 @@
}
}
}
+ if(inspectionRouteIds.size() > 0){
+ //鍘婚噸
+ HashSet set = new HashSet(inspectionRouteIds);
+ inspectionRouteIds.clear();
+ inspectionRouteIds.addAll(set);
+ InspectionRouteDto inspectionRouteDto = new InspectionRouteDto();
+ String[] routeIds = (String[]) inspectionRouteIds.toArray(new String[inspectionRouteIds.size()]);
+ inspectionRouteDto.setInspectionRouteIds(routeIds);
+ List<InspectionRouteDto> inspectionRouteDtoList = inspectionRouteInnerServiceSMOImpl.queryInspectionRoutes(inspectionRouteDto);
+ for( ApiInspectionPlanDataVo planDataVo : inspectionPlans){
+ String[] routeIdArray = planDataVo.getInspectionRouteId().split(",");
+ for( String s : routeIdArray){
+ for( InspectionRouteDto inspectionRouteDto1 : inspectionRouteDtoList){
+ if(inspectionRouteDto1.getInspectionRouteId().equals(s)){
+ if(planDataVo.getInspectionRouteName() == null){
+ planDataVo.setInspectionRouteName(inspectionRouteDto1.getRouteName());
+ }else{
+ planDataVo.setInspectionRouteName(planDataVo.getInspectionRouteName()+","+inspectionRouteDto1.getRouteName());
+ }
+ }
+ }
+
+ }
+ }
+ }
+
} else {
inspectionPlans = new ArrayList<>();
}
diff --git a/java110-bean/src/main/java/com/java110/dto/inspectionRoute/InspectionRouteDto.java b/java110-bean/src/main/java/com/java110/dto/inspectionRoute/InspectionRouteDto.java
index 75d21bf..84dde02 100644
--- a/java110-bean/src/main/java/com/java110/dto/inspectionRoute/InspectionRouteDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/inspectionRoute/InspectionRouteDto.java
@@ -21,6 +21,8 @@
private String remark;
private String communityId;
private String routeName;
+ //鐢ㄤ簬鎵归噺鏌ヨ璺嚎
+ private String[] inspectionRouteIds;
private Date createTime;
@@ -92,4 +94,12 @@
public void setStatusCd(String statusCd) {
this.statusCd = statusCd;
}
+
+ public String[] getInspectionRouteIds() {
+ return inspectionRouteIds;
+ }
+
+ public void setInspectionRouteIds(String[] inspectionRouteIds) {
+ this.inspectionRouteIds = inspectionRouteIds;
+ }
}
diff --git a/java110-db/src/main/resources/mapper/community/InspectionRouteServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionRouteServiceDaoImplMapper.xml
index 11c4815..1598812 100644
--- a/java110-db/src/main/resources/mapper/community/InspectionRouteServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionRouteServiceDaoImplMapper.xml
@@ -113,6 +113,12 @@
<if test="routeName !=null and routeName != ''">
and t.Route_name= #{routeName}
</if>
+ <if test="inspectionRouteIds !=null">
+ and t.inspection_route_Id in
+ <foreach collection="inspectionRouteIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
--
Gitblit v1.8.0