Explorar o código

增加功能:
bug表859,数据报表 前后台联调11和12的列表、明细和导出接口

jiakai hai 1 mes
pai
achega
3a95d8e598

+ 1 - 1
commons/src/main/java/com/jzg/commons/entity/report/vo/PayableStatisticsDetailParam.java

@@ -17,6 +17,6 @@ public class PayableStatisticsDetailParam extends PageRequest {
     private static final long serialVersionUID = 1L;
 
     @Schema(description = "年月时间,格式:yyyy-MM")
-    private String yearAndMonthTime;
+    private String yearMonth;
 
 }

+ 2 - 2
consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportMeetDataServiceImpl.java

@@ -95,7 +95,7 @@ public class ReportMeetDataServiceImpl extends ReportBaseServiceImpl implements
     @Override
     public IPage<?> getPayableStatisticsDetail(PayableStatisticsDetailParam param, String systemCode) {
         log.info("财务数据-应付统计明细. param=[{}], systemCode=[{}]", JSONUtil.toJsonStr(param), systemCode);
-        if (param == null || StrUtil.isBlank(param.getYearAndMonthTime())) {
+        if (param == null || StrUtil.isBlank(param.getYearMonth())) {
             log.warn("查询年月为空,返回空列表");
             return new Page<>(param.getPages(), param.getSize());
         }
@@ -138,7 +138,7 @@ public class ReportMeetDataServiceImpl extends ReportBaseServiceImpl implements
     @Override
     public void exportPayableStatisticsDetail(PayableStatisticsDetailParam param, String systemCode) {
         log.info("财务数据-应付统计明细导出Excel. param=[{}], systemCode=[{}]", JSONUtil.toJsonStr(param), systemCode);
-        if (param == null || StrUtil.isBlank(param.getYearAndMonthTime())) {
+        if (param == null || StrUtil.isBlank(param.getYearMonth())) {
             log.warn("查询年月为空,不导出");
             return;
         }

+ 2 - 2
consoleStatistics/src/main/resources/mapper/ReportMeetDataMapper.xml

@@ -153,8 +153,8 @@
         <where>
             saa.is_delete = 0
             AND saa.system_code = #{systemCode}
-            <if test="param.yearAndMonthTime != null and param.yearAndMonthTime != ''">
-                AND DATE_FORMAT(saa.create_time, '%Y-%m') = #{param.yearAndMonthTime}
+            <if test="param.yearMonth != null and param.yearMonth != ''">
+                AND DATE_FORMAT(saa.create_time, '%Y-%m') = #{param.yearMonth}
             </if>
         </where>
         ORDER BY saa.create_time DESC