From b396a797855249df75fa0d640b1d6db16fab8ff3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 25 Apr 2022 11:05:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BD=A2=E6=88=90=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E8=AF=A6=E6=83=85detail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcTripReportRecordController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 3f7dce489d..cd79899c15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -93,6 +93,7 @@ public class IcTripReportRecordController implements ResultDataResolver { PageTripReportFormDTO pageTripReportFormDTO=new PageTripReportFormDTO(); pageTripReportFormDTO.setCustomerId(tokenDto.getCustomerId()); pageTripReportFormDTO.setUserId(tokenDto.getUserId()); + pageTripReportFormDTO.setId(formDTO.getId()); return new Result().ok(icTripReportRecordService.detail(pageTripReportFormDTO)); } From ac6f2c44465573a1322e34b326ffdda8715ff1c6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 25 Apr 2022 14:31:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcExportTemplateDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml index d2970a6d02..7580c635df 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml @@ -23,8 +23,7 @@ c.ID,c.TEMP_ID,c.LABEL,c.PID,c.sort,ifi.ID AS itemId,ifig.TABLE_NAME,concat(ifi.COLUMN_NAME,if(ifi.COLUMN_NUM = 0,'',ifi.COLUMN_NUM)) columnName, ifi.OPTION_SOURCE_VALUE,ifi.OPTION_SOURCE_TYPE FROM ic_export_template_config c - LEFT JOIN ic_form_item ifi ON c.FORM_ITEM_ID = ifi.ID - # LEFT JOIN ic_form_item ifi2 ON c.FORM_ITEM_ID = ifi2.ID AND ifi2.OPTION_SOURCE_TYPE ='remote' AND ifi2.OPTION_SOURCE_VALUE LIKE '%?%' + LEFT JOIN ic_form_item ifi ON c.ITEM_ID = ifi.ID LEFT JOIN ic_form_item_group ifig ON ifi.ITEM_GROUP_ID = ifig.ID WHERE TEMP_ID = #{tempId} and c.CUSTOMER_ID = #{customerId} and c.DEL_FLAG = '0' ORDER BY c.PID,c.SORT