Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export

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

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<IcTripReportRecordDTO>().ok(icTripReportRecordService.detail(pageTripReportFormDTO));
     }