修复首页地图地块列表接口未正常返回作物图片的bug

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsBlockController.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.fms.controller;
 
 import com.yunfeiyun.agmp.common.annotation.Log;
+import com.yunfeiyun.agmp.common.constant.ResConstants;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
@@ -9,6 +10,7 @@ import com.yunfeiyun.agmp.common.enums.CommonEnums;
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
+import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.fms.domain.FmsBlock;
 import com.yunfeiyun.agmp.fms.domain.FmsLand;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsBlockBindUserReqVo;
@@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 地块Controller
@@ -229,14 +232,23 @@ public class FmsBlockController extends BaseController
         fmsPlanQuery.setTid(SecurityUtils.getTid());
         fmsPlanQuery.setPlanStatusArray(Arrays.asList(CommonEnums.PLAN_STATUS_START.getCode(), CommonEnums.PLAN_STATUS_NOT_START.getCode()));
         List<FmsPlanCropResVo> fmsPlanCropResVoList = fmsPlanService.selectFmsCropPlanResVoList(fmsPlanQuery);
+        Map<String,FmsPlanCropResVo> cropMap = new HashMap<>();
 
         for(FmsPlanCropResVo fmsPlanCropResVo : fmsPlanCropResVoList){
+            cropMap.put(fmsPlanCropResVo.getCropId(),fmsPlanCropResVo);
             FmsBlockPlanResVo fmsBlockPlanResVo = fmsBlockPlanResVoMap.get(fmsPlanCropResVo.getBlockId());
             if(null != fmsBlockPlanResVo){
                 fmsBlockPlanResVo.getFmsPlanCropResVoList().add(fmsPlanCropResVo);
             }
         }
-
+        List<SysRes> sysResList = resManager.queryRes(new ArrayList<>(cropMap.keySet()), ResConstants.BizType.CROP.getKey());
+        Map<String,SysRes> resMap = sysResList.stream().collect(Collectors.toMap(SysRes::getResBusId,item->item));
+        for(FmsPlanCropResVo fmsPlanCropResVo :fmsPlanCropResVoList){
+            SysRes sysRes = resMap.get(fmsPlanCropResVo.getCropId());
+            if(null != sysRes){
+                fmsPlanCropResVo.setCropPreview(sysRes.getResOssUrl());
+            }
+        }
         return AjaxResult.success(fmsBlockPlanResVoMap.values());
     }
 }

src/main/resources/mapper/FmsPlanMapper.xml

@@ -374,7 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planPlanenddate != null">#{planPlanenddate},</if>
             <if test="planStartdate != null">#{planStartdate},</if>
             <if test="planEnddate != null">#{planEnddate},</if>
-            <if test="planStatus != null">#{planStatusArray},</if>
+            <if test="planStatus != null">#{planStatus},</if>
             <if test="planRemark != null">#{planRemark},</if>
             <if test="planCreator != null">#{planCreator},</if>
             <if test="planCreateddate != null">#{planCreateddate},</if>
@@ -397,7 +397,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planPlanenddate != null">planPlanenddate = #{planPlanenddate},</if>
             <if test="planStartdate != null">planStartdate = #{planStartdate},</if>
             <if test="planEnddate != null">planEnddate = #{planEnddate},</if>
-            <if test="planStatus != null">planStatus = #{planStatusArray},</if>
+            <if test="planStatus != null">planStatus = #{planStatus},</if>
             <if test="planRemark != null">planRemark = #{planRemark},</if>
             <if test="planCreator != null">planCreator = #{planCreator},</if>
             <if test="planCreateddate != null">planCreateddate = #{planCreateddate},</if>