更新BUG

src/main/java/com/taauav/admin/mapper/TauvInspectDriverMapper.xml

@@ -56,11 +56,14 @@
         <if test="param.driverName != null and param.driverName!=''">
             and driver_name like CONCAT('%',#{param.driverName},'%')
         </if>
+<!--        <if test="param.driverArea != null and param.driverArea != ''">-->
+<!--            and driver_area in-->
+<!--            <foreach collection="param.driverArea" item="area" open="(" close=")" separator=",">-->
+<!--                #{area}-->
+<!--            </foreach>-->
+<!--        </if>-->
         <if test="param.driverArea != null and param.driverArea != ''">
-            and driver_area in
-            <foreach collection="param.driverArea" item="area" open="(" close=")" separator=",">
-                #{area}
-            </foreach>
+            and driver_area = #{param.driverArea}
         </if>
 
         <if test="param.status != null and param.status != '' ">

src/main/java/com/taauav/admin/service/impl/TauvInspectFileServiceImpl.java

@@ -115,21 +115,21 @@ public class TauvInspectFileServiceImpl extends BaseServiceImpl<TauvInspectFileM
             if (map.containsKey("driverAreaType") && !StringUtils.isEmpty(map.get("driverAreaType")) && map.containsKey("driverArea") && !StringUtils.isEmpty(map.get("driverArea"))) {
                 Integer driverAreaType = Integer.valueOf(map.get("driverAreaType").toString());
                 BigInteger driverArea = BigInteger.valueOf(Long.valueOf(map.get("driverArea").toString()));
-                List<BigInteger> cityIds = new ArrayList<>();
-                if (driverArea != null) {
-                    if (driverAreaType == 1) {
-                        // 区划所有(取本级及子级区划ID)
-                        cityIds = lsCityService.getChildCityIds(driverArea);
-                        // 加入当前选中的区划
-                        cityIds.add(driverArea);
-                    } else {
-                        // 本级河湖区划
-                        cityIds.add(driverArea);
-                    }
-                }
-                String cityIdsStr = org.apache.commons.lang3.StringUtils.join(cityIds.toArray(), ",");
-                String[] cityIdsList = cityIdsStr.split(",");
-                map.put("driverArea", cityIdsList);
+//                List<BigInteger> cityIds = new ArrayList<>();
+//                if (driverArea != null) {
+//                    if (driverAreaType == 1) {
+//                        // 区划所有(取本级及子级区划ID)
+//                        cityIds = lsCityService.getChildCityIds(driverArea);
+//                        // 加入当前选中的区划
+//                        cityIds.add(driverArea);
+//                    } else {
+//                        // 本级河湖区划
+//                        cityIds.add(driverArea);
+//                    }
+//                }
+//                String cityIdsStr = org.apache.commons.lang3.StringUtils.join(cityIds.toArray(), ",");
+//                String[] cityIdsList = cityIdsStr.split(",");
+                map.put("driverArea", driverArea);
             } else {
                 map.remove("driverArea");
             }

src/main/java/com/taauav/front/service/impl/LSReportServiceImpl.java

@@ -243,7 +243,7 @@ public class LSReportServiceImpl extends BaseServiceImpl<LSReportMapper, TauvRep
                 // 问题数量
                 Integer questionNum = inspectFileService.getReviewNumByInspectDriverId(item.getId(), report.getInspectDriverId());
                 // 报告备注
-                TauvReportRemark remarkInfo = reportRemarkService.getInfoByReportIdAndQuestionId(report.getId(), report.getId());
+                TauvReportRemark remarkInfo = reportRemarkService.getInfoByReportIdAndQuestionId(report.getId(), item.getId());
                 LSReportQuestionListVo reportQuestionListVo = new LSReportQuestionListVo();
                 reportQuestionListVo.setId(item.getId());
                 reportQuestionListVo.setCategory(item.getCategory());