维修

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -25,6 +25,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class RepairApplicationFormVO extends BaseVO implements Serializable {
+
     private BigDecimal repairCount;
 
     private String name;

platform-dao/src/main/java/com/platform/dao/vo/report/FiftyFailSbReportVO.java

@@ -16,6 +16,7 @@ import java.util.List;
 @Accessors(chain = true)
 public class FiftyFailSbReportVO implements Serializable {
     private static final long serialVersionUID = 1L;
+    private String sbId;
     /**
      * 月份
      */

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -9,6 +9,7 @@
         sb.model as model,
         sb.name as sbName,part.name as partName,
         sb.no as sbNo, sb.cph as sbCph, sb.model_id as modelId,sb.position_no as positionNo,
+        sb.id as sbId,
         error.name as repairErrorTypeName
     </sql>
     <select id="selectPageList" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"
@@ -502,7 +503,7 @@
     </select>
 
     <select id="getFiftyFailSbReport" resultType="com.platform.dao.vo.report.FiftyFailSbReportVO">
-        select sb.name,sb.no,count(1) as totalNum from t_sb_info sb inner join t_repair_application_form form
+        select sb.id as sbId, sb.name,sb.no,count(1) as totalNum from t_sb_info sb inner join t_repair_application_form form
         on sb.id=form.sb_id
         group by sb.id
         order by count(1) desc

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -752,11 +752,13 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         for (FiftyFailSbReportVO vo:fiftyFailSbReportVOS){
             List<RepairApplicationFormVO> repairApplicationFormVOS1 = new ArrayList<>();
             for (RepairApplicationFormVO formVO:repairApplicationFormVOS){
-                if (formVO.getSbNo()!=null&&formVO.getSbNo().equals(vo.getNo())){
+                if (formVO.getSbId()!=null&&formVO.getSbId().equals(vo.getSbId())){
+//                    System.out.println(formVO.getSbName()+"==="+formVO.getSbNo());
                     repairApplicationFormVOS1.add(formVO);
                 }
             }
             vo.setDetailList(repairApplicationFormVOS1);
+//            System.out.println("==========================");
         }
         return fiftyFailSbReportVOS;
     }