修改重点部位详情查找by 陈浩 2021-08-04

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/KeySiteDto.java

@@ -90,5 +90,8 @@ public class KeySiteDto  extends BaseDto implements Serializable{
     
     @ApiModelProperty(value = "附件")
     private Map<String, List<AttachmentDto>> attachments;
+    
+    @ApiModelProperty(value = "数组形式附件")
+    private List<String> attachmentsList;
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/KeySiteController.java

@@ -21,6 +21,8 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -107,11 +109,20 @@ public class KeySiteController extends BaseController {
 	@GetMapping(value = "find/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个重点部位",  notes = "根据sequenceNbr查询单个重点部位")
 	public ResponseModel<KeySiteDto> selectOne(@PathVariable Long sequenceNbr) {
+		List<String> list = new ArrayList<String>();
 		Map<String, List<AttachmentDto>> files = sourceFileService.getAttachments(sequenceNbr);
 		KeySiteDto dto=  keySiteService.getSequenceNbr(sequenceNbr);
 		if(files!=null && dto!=null) {
 			dto.setAttachments(files);
+			JSONArray array=	JSONArray.parseArray(JSONArray.toJSONString(files.get("keySitePhoto")));
+			if(array!=null &&array.size()>0) {
+				for(Object i :array) {
+					JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(i));
+					list.add(object.getString("url"));
+				}
+			}
 		}
+		dto.setAttachmentsList(list);
 	    return ResponseHelper.buildResponse(dto);
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.velocity.runtime.directive.Foreach;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,6 +21,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;