Prechádzať zdrojové kódy

fix:收款统计查询sql修改

ly 9 mesiacov pred
rodič
commit
033fcfc054

+ 2 - 3
src/main/java/cn/ezhizao/project/business/collection/domain/vo/ResStatisticsVo.java

@@ -36,9 +36,8 @@ public class ResStatisticsVo {
     private BigDecimal serviceNum;
 
     //到账日期
-    @Excel(name = "到账日期", width = 20, dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date receiptDate;
+    @Excel(name = "到账日期", width = 40)
+    private String receiptDate;
 
     @Excel(name = "确认所属时间")
     private String actuallyDate;

+ 2 - 2
src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -24,7 +24,7 @@
         tt1.typeName,
         tt1.contract_id as contractId,
         tt1.contract_no as contractNo,
-        date_format(tt1.daozhangriqi, '%Y-%m-%d') as receiptDate,
+        tt1.daozhangriqi as receiptDate,
         tt1.tishoukuanjine as withdrawalAmount,
         tt1.hetongleixing as contractType,
         tt1.shenqingren as applierName,
@@ -56,7 +56,7 @@
         type.`name` as typeName,
         c.contract_id,
         input.contract_no,
-        GROUP_CONCAT( DISTINCT arrive_date ) AS daozhangriqi,
+        GROUP_CONCAT( DISTINCT date_format(arrive_date, '%Y-%m-%d' ) ) AS daozhangriqi,
         SUM( detail.arrive_amount ) AS tishoukuanjine,
         GROUP_CONCAT( DISTINCT u.nick_name ) AS shenqingren,
         GROUP_CONCAT( DISTINCT c.project_name ) AS project_name,