From 9fa63e316511ca3b116fe86776c04b3b2ac13f97 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 07 十一月 2022 02:27:52 +0800
Subject: [PATCH] 优化 保养计划
---
service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceItemCmd.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceItemCmd.java b/service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceItemCmd.java
index fa95b0a..6fa38af 100644
--- a/service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceItemCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceItemCmd.java
@@ -20,7 +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.inspectionItemTitle.InspectionItemTitleDto;
+import com.java110.dto.inspectionItemTitleValue.InspectionItemTitleValueDto;
+import com.java110.dto.maintainanceItemValue.MaintainanceItemValueDto;
import com.java110.intf.community.IMaintainanceItemV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainanceItemValueV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -54,10 +58,14 @@
@Autowired
private IMaintainanceItemV1InnerServiceSMO maintainanceItemV1InnerServiceSMOImpl;
+ @Autowired
+ private IMaintainanceItemValueV1InnerServiceSMO maintainanceItemValueV1InnerServiceSMOImpl;
+
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
- Assert.hasKeyAndValue(reqJson,"communityId","鏈寘鍚皬鍖�");
+ Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖�");
}
@Override
@@ -71,6 +79,7 @@
if (count > 0) {
maintainanceItemDtos = maintainanceItemV1InnerServiceSMOImpl.queryMaintainanceItems(maintainanceItemDto);
+ refreshTitileValues(maintainanceItemDtos);
} else {
maintainanceItemDtos = new ArrayList<>();
}
@@ -81,4 +90,35 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
+ private void refreshTitileValues(List<MaintainanceItemDto> maintainanceItemDtos) {
+
+ if (maintainanceItemDtos == null || maintainanceItemDtos.size() < 1) {
+ return;
+ }
+
+ List<String> itemIds = new ArrayList<>();
+ for (MaintainanceItemDto maintainanceItemDto : maintainanceItemDtos) {
+ itemIds.add(maintainanceItemDto.getItemId());
+ }
+
+ MaintainanceItemValueDto maintainanceItemValueDto = new MaintainanceItemValueDto();
+ maintainanceItemValueDto.setItemIds(itemIds.toArray(new String[itemIds.size()]));
+ maintainanceItemValueDto.setCommunityId(maintainanceItemDtos.get(0).getCommunityId());
+ List<MaintainanceItemValueDto> maintainanceItemValueDtos
+ = maintainanceItemValueV1InnerServiceSMOImpl.queryMaintainanceItemValues(maintainanceItemValueDto);
+
+ List<MaintainanceItemValueDto> tmpMaintainanceItemValueDtos = null;
+ for (MaintainanceItemDto maintainanceItemDto : maintainanceItemDtos) {
+ tmpMaintainanceItemValueDtos = new ArrayList<>();
+ for (MaintainanceItemValueDto tmpMaintainanceItemValueDto : maintainanceItemValueDtos) {
+ if (maintainanceItemDto.getItemId().equals(tmpMaintainanceItemValueDto.getItemId())) {
+ tmpMaintainanceItemValueDtos.add(tmpMaintainanceItemValueDto);
+ }
+ }
+ maintainanceItemDto.setTitleValues(tmpMaintainanceItemValueDtos);
+ }
+
+
+ }
}
--
Gitblit v1.8.0