Browse Source

现场联调问题修改

master
lijw 9 months ago
parent
commit
ef6b987901
2 changed files with 3 additions and 4 deletions
  1. +1
    -1
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
  2. +2
    -3
      inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportMapper.xml

+ 1
- 1
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java View File

@ -716,7 +716,7 @@ public class PatrolResultController extends BaseController {
String[] strings = new String[1];
List<String> algIds = new ArrayList<>();
logger.info("map: " + map.toString());
logger.info("map: " + map);
if (map != null) {
String subIdStr = map.get("alg_subtype_ids");
if (subIdStr.contains(StringUtils.COMMA)) {


+ 2
- 3
inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportMapper.xml View File

@ -77,7 +77,7 @@
<select id="selectByAllList" parameterType="InspectionReport" resultMap="InspectionReportResult">
select a.* from inspection_report a
left JOIN patrol_task b on a.task_id=b.task_id
left join basedata_device c on b.device_list = c.device_id
left JOIN basedata_device c on b.device_list = c.device_id
left JOIN basedata_area d on b.area_id =d.area_id
left JOIN basedata_eqpbook e on find_in_set( e.patrol_device_code, b.dev_no )
<where>
@ -97,8 +97,7 @@
concat('%',#{inspectionTaskName},'%')
</if>
</where>
GROUP BY a.line_id
ORDER BY a.line_id desc
ORDER BY a.inspection_date DESC
</select>
<select id="selectInspectionReportByLineId" parameterType="Long" resultMap="InspectionReportResult">


Loading…
Cancel
Save