From c0328edb2de39f27e47b7ad1eedf8f80b883335e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 24 一月 2023 17:41:49 +0800
Subject: [PATCH] 优化 供应链 类型的bug
---
service-community/src/main/java/com/java110/community/cmd/maintainanceTask/ListMaintainanceTaskDetailCmd.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/ListMaintainanceTaskDetailCmd.java b/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/ListMaintainanceTaskDetailCmd.java
index 40c0f1c..4ace13d 100644
--- a/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/ListMaintainanceTaskDetailCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/ListMaintainanceTaskDetailCmd.java
@@ -20,10 +20,16 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.file.FileRelDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IMaintainanceTaskDetailV1InnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
+import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailDataVo;
+import com.java110.vo.api.junkRequirement.PhotoVo;
import org.springframework.beans.factory.annotation.Autowired;
import com.java110.dto.maintainanceTaskDetail.MaintainanceTaskDetailDto;
import java.util.List;
@@ -44,16 +50,21 @@
* 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
-@Java110Cmd(serviceCode = "maintainanceTaskDetail.listMaintainanceTaskDetail")
+@Java110Cmd(serviceCode = "maintainanceTask.listMaintainanceTaskDetail")
public class ListMaintainanceTaskDetailCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListMaintainanceTaskDetailCmd.class);
@Autowired
private IMaintainanceTaskDetailV1InnerServiceSMO maintainanceTaskDetailV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
+ Assert.hasKeyAndValue(reqJson,"communityId","鏈寘鍚皬鍖�");
}
@Override
@@ -67,6 +78,7 @@
if (count > 0) {
maintainanceTaskDetailDtos = maintainanceTaskDetailV1InnerServiceSMOImpl.queryMaintainanceTaskDetails(maintainanceTaskDetailDto);
+ refreshPhotos(maintainanceTaskDetailDtos);
} else {
maintainanceTaskDetailDtos = new ArrayList<>();
}
@@ -77,4 +89,26 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
+ private void refreshPhotos( List<MaintainanceTaskDetailDto> maintainanceTaskDetailDtos) {
+ List<PhotoVo> photoVos = null;
+ PhotoVo photoVo = null;
+ String imgUrl = MappingCache.getValue("IMG_PATH");
+
+ for (MaintainanceTaskDetailDto inspectionTaskDetail : maintainanceTaskDetailDtos) {
+ if(!"20200407".equals(inspectionTaskDetail.getState())){
+ continue;
+ }
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(inspectionTaskDetail.getTaskDetailId());
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ photoVos = new ArrayList<>();
+ for (FileRelDto tmpFileRelDto : fileRelDtos) {
+ photoVo = new PhotoVo();
+ photoVo.setUrl(tmpFileRelDto.getFileRealName().startsWith("http")?tmpFileRelDto.getFileRealName():imgUrl+tmpFileRelDto.getFileRealName());
+ photoVos.add(photoVo);
+ }
+ inspectionTaskDetail.setPhotos(photoVos);
+ }
+ }
}
--
Gitblit v1.8.0