fix:升级模块工单列表执行人这一行加上数据

src/main/java/cn/ezhizao/project/business/upgrade/controller/BizWorkOrderUpdateController.java

@@ -5,6 +5,7 @@ import java.math.MathContext;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
@@ -15,6 +16,7 @@ import cn.ezhizao.project.business.collection.domain.BizCollection;
 import cn.ezhizao.project.business.collection.domain.BizCollectionDetail;
 import cn.ezhizao.project.business.collection.service.IBizCollectionDetailService;
 import cn.ezhizao.project.business.collection.service.impl.BizCollectionServiceImpl;
+import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
 import cn.ezhizao.project.business.housingFund.service.IBizHousingFundConfirmService;
 import cn.ezhizao.project.business.keepAccounts.domain.BizFinancialKeepAccount;
@@ -106,7 +108,12 @@ public class BizWorkOrderUpdateController extends BaseController
         }else{
             list = bizWorkOrderUpdateService.getList2(bizWorkOrder);
         }
-
+        BizEntrust entrustConditions = new BizEntrust();
+        entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrderUpdate::getId).collect(Collectors.toList()));
+        List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
+        list.forEach(v -> {
+            v.setEntrusts(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList()));
+        });
 
         //判断是否是合同查询
         if (bizWorkOrder.getNoContract() == 0) {

src/main/resources/mybatis/business/BizWorkOrderUpdateMapper.xml

@@ -11,12 +11,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <id column="id" property="id"/>
         <result column="company_id" jdbcType="BIGINT" property="companyId"/>
         <collection property="records"   select="getRecords" column="id"/>
+        <collection property="entrusts"   select="getEntrusts" column="id"/>
     </resultMap>
 
     <resultMap type="cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord"
                id="BizWorkOrderRecordResult">
         <id column="id" property="id"/>
     </resultMap>
+    <resultMap type="cn.ezhizao.project.business.entrust.domain.BizEntrust"
+               id="BizEntrustResult">
+        <id column="id" property="id"/>
+    </resultMap>
 
     <select id="getList" parameterType="BizWorkOrderUpdate" resultMap="BizWorkOrderUpdateResult">
         SELECT * FROM biz_work_order_update
@@ -108,6 +113,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getRecords" resultMap="BizWorkOrderRecordResult">
         SELECT * FROM biz_work_order_record WHERE deleted = 0 AND work_order_id = #{id}
     </select>
+    <select id="getEntrusts" resultMap="BizEntrustResult">
+        SELECT * FROM biz_entrust WHERE deleted = 0 AND work_order_id = #{id}
+    </select>
+
     <delete id="physicalDelete">
         DELETE FROM biz_work_order_update