diff --git a/ruoyi-api/src/main/resources/mapper/ApiMapper.xml b/ruoyi-api/src/main/resources/mapper/ApiMapper.xml index 687fa1d..d2e622a 100644 --- a/ruoyi-api/src/main/resources/mapper/ApiMapper.xml +++ b/ruoyi-api/src/main/resources/mapper/ApiMapper.xml @@ -245,7 +245,7 @@ - UPDATE record_inspection_task SET task_state = #{state},remark = #{remark} WHERE objid = #{tableId}; + UPDATE record_inspection_task SET task_state = #{state},remark = #{remark},update_time=now() WHERE objid = #{tableId}; diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java index 9963eb8..418c284 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java @@ -36,6 +36,15 @@ public class RecordInspectionTask extends BaseEntity @Excel(name = "完成状态") private String taskState; private String imgPath; +private int sanQty; + + public int getSanQty() { + return sanQty; + } + + public void setSanQty(int sanQty) { + this.sanQty = sanQty; + } public String getImgPath() { return imgPath; diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml index 86cf7e8..cc14cf9 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml @@ -12,10 +12,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select objid, inspection_id, area_id, area_name, plane_position, task_state from record_inspection_task + select objid, inspection_id, area_id, area_name, plane_position, task_state,update_time from record_inspection_task - select rit.objid, rit.inspection_id, area_id, area_name, plane_position, task_state, + + select rit.objid, + rit.inspection_id, + area_id, + area_name, + plane_position, + count(info.inspection_id) as sanQty, + task_state, rii.img_path from record_inspection_task rit - left join bg_wheel_chocks.record_inspection_img rii on rit.objid = rii.task_id + left join record_inspection_img rii on rit.objid = rii.task_id + left join record_inspection_info as info on info.inspection_id=rit.inspection_id and + info.location_code=plane_position + where rit.inspection_id in #{objid} + group by info. location_code, rit.inspection_id; \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html index 34531ad..3d7d705 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html @@ -30,7 +30,7 @@ width: calc(48% - 2px); margin: 12px 1% 0 1%; border: 1px solid #1111; - height: 206px; + height: 180px; } .printList .item .card .left, .printList .item .card .right { diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html index e10635a..f82da2c 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html @@ -92,7 +92,7 @@ title: '主键', visible: false }, - { + { field: 'inspectionId', title: 'id', visible: false @@ -113,6 +113,9 @@ formatter: function (value, row, index) { return $.table.selectDictLabel(taskStateDatas, value); } + }, { + field: 'updateTime', + title: '完成时间' }, { title: '操作', @@ -137,7 +140,7 @@ initinspectionTable = function (index, row, $detail) { - var [childTable,childTable1] = $detail.html('
\n' + + var [childTable, childTable1] = $detail.html('
\n' + '
\n' + ' \n' + '
\n' + '
\n' + - '
'+ + '
' + '
\n' + '
\n' + - '
'+ + '
' + '
\n' + '
\n' + '
\n' + @@ -165,13 +168,13 @@ contentType: "application/x-www-form-urlencoded", queryParams: { inspectionId: row.inspectionId, - locationCode:row.planePosition + locationCode: row.planePosition }, columns: [ { title: '序号', formatter: function (value, row, index) { - return index+1 + return index + 1 } }, { @@ -195,7 +198,8 @@ title: '提交时间' } - ]}); + ] + }); $(childTable1).bootstrapTable({ url: ctx + "manage/record_inspection_img/list", method: 'post',