11.20

src/main/java/cn/ezhizao/project/business/product/controller/BizProcessInspecionController.java

@@ -391,7 +391,7 @@ public class BizProcessInspecionController extends BaseController {
         List<BizProcessInspecion> processInspectionList = bizProcessInspecionService.getInfoByIds(processInspectionIds);
 
         //咨询
-        List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.query().in("process_inspection_id", processInspectionIds).list();
+        List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.getListByInspectionIds(processInspectionIds);
         //明细
         List<BizProcessInspectionDetail> itemDetails = processInspectionDetailService.query().in("process_inspection_id", processInspectionIds).list();
         //废品

src/main/java/cn/ezhizao/project/business/product/controller/SortDayworkController.java

@@ -109,7 +109,9 @@ public class SortDayworkController extends BaseController {
         item = firstList.isEmpty() ? item : firstList.get(0);
         List<BizDayworkItemReject> rejectList = bizDayworkItemRejectService.query().eq("daywork_item_id", item.getId()).eq("process_inspection_id", 0L).list();
         item.setRejectList(rejectList);
-        List<BizDayworkItemConsult> consults = bizDayworkItemConsultService.query().eq("daywork_item_id", item.getId()).list();
+        List<Long> dayworkItemIds = new ArrayList<>();
+        dayworkItemIds.add(item.getId());
+        List<BizDayworkItemConsult> consults = bizDayworkItemConsultService.getListByDayworkItemIds(dayworkItemIds);
         item.setConsults(consults);
         BizProductionPlanDetail productionPlanDetail = productionPlanDetailService.getById(item.getProductionPlanDetailId());
         BizProduct product = productService.getById(productionPlanDetail.getProductId());

src/main/java/cn/ezhizao/project/business/product/mapper/BizDayworkItemConsultMapper.java

@@ -30,6 +30,7 @@ public interface BizDayworkItemConsultMapper extends BaseMapper<BizDayworkItemCo
      */
     public int physicalDelete(BizDayworkItemConsult bizDayworkItemConsult);
     List<BizDayworkItemConsult> getListByInspectionIds(List<Long> inspectionIds);
+    List<BizDayworkItemConsult> getListByDayworkItemIds(List<Long> dayworkItemIds);
 
 
 }

src/main/java/cn/ezhizao/project/business/product/service/IBizDayworkItemConsultService.java

@@ -29,4 +29,5 @@ public interface IBizDayworkItemConsultService extends IService<BizDayworkItemCo
      */
     int physicalDelete(BizDayworkItemConsult bizDayworkItemConsult);
     List<BizDayworkItemConsult> getListByInspectionIds(List<Long> inspectionIds);
+    List<BizDayworkItemConsult> getListByDayworkItemIds(List<Long> dayworkItemIds);
 }

src/main/java/cn/ezhizao/project/business/product/service/impl/BizDayworkItemConsultServiceImpl.java

@@ -47,4 +47,9 @@ public class BizDayworkItemConsultServiceImpl extends ServiceImpl<BizDayworkItem
     public List<BizDayworkItemConsult> getListByInspectionIds(List<Long> inspectionIds) {
         return bizDayworkItemConsultMapper.getListByInspectionIds(inspectionIds);
     }
+
+    @Override
+    public List<BizDayworkItemConsult> getListByDayworkItemIds(List<Long> dayworkItemIds) {
+        return bizDayworkItemConsultMapper.getListByDayworkItemIds(dayworkItemIds);
+    }
 }

src/main/resources/mybatis/business/product/BizDayworkItemConsultMapper.xml

@@ -29,6 +29,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item}
         </foreach>
     </select>
+    <select id="getListByDayworkItemIds" resultMap="BizDayworkItemConsultResult">
+        select t1.*,t2.nick_name as technicianName,t3.result from biz_daywork_item_consult t1 left join sys_user t2 on t1.technician_id = t2.user_id
+        left join biz_consult_result t3 on t1.consult_result_id = t3.id
+        where t1.deleted = 0
+        and t2.del_flag = 0 and t1.daywork_item_id in
+        <foreach collection="dayworkItemIds" index="index" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
     <delete id="physicalDelete">
         DELETE FROM biz_daywork_item_consult WHERE deleted = 0
         <if test="id != null">

src/main/resources/mybatis/business/product/BizDayworkItemMapper.xml

@@ -87,8 +87,9 @@
         0
     </select>
     <select id="getSortConsultList" resultType="cn.ezhizao.project.business.product.domain.BizDayworkItemConsult">
-        select t1.*,t2.nick_name as technicianName from biz_daywork_item_consult t1 left join sys_user t2 on
-        t1.technician_id = t2.user_id where t1.daywork_item_id = #{id} and t1.deleted = 0 and t2.del_flag = 0
+        select t1.*,t2.nick_name as technicianName,t3.result from biz_daywork_item_consult t1 left join sys_user t2 on
+        t1.technician_id = t2.user_id left join biz_consult_result t3 on t1.consult_result_id = t3.id where t1.daywork_item_id = #{id} and t1.deleted = 0 and t2.del_flag = 0
+
     </select>
     <select id="getListByDayworkId" resultMap="BizDayworkItemAndRejectList">
         select t1.*,t2.process_alias from biz_daywork_item t1 left join biz_process t2 on t1.process_id = t2.id where