From 53dbe1b2140aa03458a5eac46c21c2e0047dab45 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 19 四月 2023 00:42:31 +0800
Subject: [PATCH] 优化根据楼栋查询单元bug
---
service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceStandardCmd.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceStandardCmd.java b/service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceStandardCmd.java
index 137139e..4e1d071 100644
--- a/service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceStandardCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceStandardCmd.java
@@ -20,8 +20,11 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.maintainanceStandardItem.MaintainanceStandardItemDto;
+import com.java110.intf.community.IMaintainanceStandardItemV1InnerServiceSMO;
import com.java110.intf.community.IMaintainanceStandardV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,9 +54,14 @@
@Autowired
private IMaintainanceStandardV1InnerServiceSMO maintainanceStandardV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMaintainanceStandardItemV1InnerServiceSMO maintainanceStandardItemV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
+ Assert.hasKeyAndValue(reqJson,"communityId","灏忓尯涓嶅瓨鍦�");
}
@Override
@@ -67,6 +75,9 @@
if (count > 0) {
maintainanceStandardDtos = maintainanceStandardV1InnerServiceSMOImpl.queryMaintainanceStandards(maintainanceStandardDto);
+
+ refreshItemCount(maintainanceStandardDtos);
+
} else {
maintainanceStandardDtos = new ArrayList<>();
}
@@ -77,4 +88,29 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
+ private void refreshItemCount(List<MaintainanceStandardDto> maintainanceStandardDtos) {
+
+ if(maintainanceStandardDtos == null || maintainanceStandardDtos.size()< 1){
+ return ;
+ }
+
+ List<String> standardIds = new ArrayList<>();
+ for(MaintainanceStandardDto maintainanceStandardDto : maintainanceStandardDtos){
+ standardIds.add(maintainanceStandardDto.getStandardId());
+ }
+
+ MaintainanceStandardItemDto maintainanceStandardItemDto = new MaintainanceStandardItemDto();
+ maintainanceStandardItemDto.setStandardIds(standardIds.toArray(new String[standardIds.size()]));
+ maintainanceStandardItemDto.setCommunityId(maintainanceStandardDtos.get(0).getCommunityId());
+
+ List<MaintainanceStandardItemDto> maintainanceStandardItemDtos = maintainanceStandardItemV1InnerServiceSMOImpl.queryMaintainanceStandardItemsGroupCount(maintainanceStandardItemDto);
+
+ for(MaintainanceStandardDto maintainanceStandardDto : maintainanceStandardDtos){
+ for(MaintainanceStandardItemDto tmpMaintainanceStandardItemDto : maintainanceStandardItemDtos){
+ if(maintainanceStandardDto.getStandardId().equals(tmpMaintainanceStandardItemDto.getStandardId()))
+ maintainanceStandardDto.setItemCount(tmpMaintainanceStandardItemDto.getItemCount());
+ }
+ }
+ }
}
--
Gitblit v1.8.0