Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/java/com/ruoyi/service/impl/PdfTemplateManagementServiceImpl.java

@@ -485,6 +485,7 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
                         document.setParagraph("4." + (index + 1) + " " + record.getUsecase(), 10f, Element.ALIGN_LEFT, 0,2f, 10f);
                         PdfPTable useCaseTable = new PdfPTable(new float[]{15, 35, 15, 35});
                         useCaseTable.setWidthPercentage(100);
+                        useCaseTable.setSplitLate(false);
                         document.writeCell("测试编号", Element.ALIGN_LEFT, 1, 1, useCaseTable);
                         document.writeCell(record.getUsecaseNo(), Element.ALIGN_LEFT, 1, 1, useCaseTable);
                         document.writeCell("测试时间", Element.ALIGN_LEFT, 1, 1, useCaseTable);

quality-review/src/main/resources/mapper/TaskMapper.xml

@@ -411,7 +411,7 @@
         select
             su.nick_name AS principal,
             GROUP_CONCAT(distinct u.nick_name) AS inspectionPersonnel,
-            DATE_FORMAT(mtt.task_begin_time, '%Y-%m-%d') AS inspectionDate
+            DATE_FORMAT(mtt.task_end_time, '%Y-%m-%d') AS inspectionDate
         from
             t_task t
             left join t_task_user_relation tur on t.id = tur.task_id