11.20

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

@@ -314,7 +314,9 @@ public class BizProcessInspecionController extends BaseController {
 //    }
     @PostMapping("/selectInspecion")
     public AjaxResult selectInspecion(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
-        List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.query().eq("process_inspection_id", processInspecion.getId()).eq("is_process_inspection", 1).list();
+        List<Long> inspectionIds = new ArrayList<>();
+        inspectionIds.add(processInspecion.getId());
+        List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.getListByInspectionIds(inspectionIds);
         List<BizProcessInspectionDetail> itemRejects = processInspectionDetailService.query().eq("process_inspection_id", processInspecion.getId()).list();
         List<BizProcessInspectionPicture> itemInspectionPictureList = bizProcessInspectionPictureService.query().eq("process_inspection_id", processInspecion.getId()).list();
         processInspecion.setDayworkItemConsults(itemConsults);
@@ -459,7 +461,10 @@ public class BizProcessInspecionController extends BaseController {
 
     @PostMapping("/selectOutsourcedInspecion")
     public AjaxResult selectOutsourcedInspecionV1(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
-        List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.query().eq("process_inspection_id", processInspecion.getId()).eq("is_outsourced_inspection", 1).list();
+        List<Long> inspectionIds = new ArrayList<>();
+        inspectionIds.add(processInspecion.getId());
+        List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.getListByInspectionIds(inspectionIds);
+//        List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.query().eq("process_inspection_id", processInspecion.getId()).list();
         List<BizDayworkItemReject> itemRejects = bizDayworkItemRejectService.query().eq("process_inspection_id", processInspecion.getId()).list();
         List<BizProcessInspectionDetail> reject = processInspectionDetailService.query().eq("process_inspection_id", processInspecion.getId()).list();
         processInspecion.setDayworkItemRejects(itemRejects);
@@ -501,7 +506,7 @@ public class BizProcessInspecionController extends BaseController {
             l.setAllCarriers(relatedCarriers.stream().filter(t -> t.getDayworkId().equals(l.getDayworkId())).map(BizDayworkCarrier::getCarrierCode).collect(Collectors.joining(",")));
         });
         processInspecion.setRelateList(related);
-        itemConsults.addAll(bizDayworkItemConsultService.query().in("process_inspection_id", related.isEmpty() ? Collections.singletonList(0L) : related.stream().map(BizProcessInspecion::getId).collect(Collectors.toList())).eq("is_outsourced_inspection", 1).list());
+        itemConsults.addAll(bizDayworkItemConsultService.query().in("process_inspection_id", related.isEmpty() ? Collections.singletonList(0L) : related.stream().map(BizProcessInspecion::getId).collect(Collectors.toList())).list());
         processInspecion.setDayworkItemConsults(itemConsults);
         return success(processInspecion);
     }

src/main/java/cn/ezhizao/project/business/product/domain/BizDayworkItemConsult.java

@@ -98,4 +98,8 @@ public class BizDayworkItemConsult extends BaseEntity
     private List<Integer> departments;
     @TableField(exist = false)
     private List<BizDayworkItemConsultPicture> pictures;
+    private Long consultResultId;
+    private String consultResultResult;
+    @TableField(exist = false)
+    private String result;
 }

src/main/java/cn/ezhizao/project/business/product/domain/BizProcessInspecion.java

@@ -246,6 +246,7 @@ public class BizProcessInspecion extends BaseEntity
     private Integer isAmend;
     @TableField(exist = false)
     private String reviewerName;
+    private Integer inspectionStatus;
 
     public BizProcessInspecion() {
     }

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

@@ -21,7 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
     <select id="getListByInspectionIds" resultMap="BizDayworkItemConsultResult">
-        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.deleted = 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.deleted = 0
         and t2.del_flag = 0 and t1.process_inspection_id in
         <foreach collection="inspectionIds" index="index" item="item" separator="," open="(" close=")">
             #{item}