Merge remote-tracking branch 'origin/master'

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java

@@ -21,6 +21,8 @@ public class CsmCashDifferentService extends ServiceImpl<CsmCashDifferentMapper,
     public void resetByLog(CsmCashLog log) {
 
         String dataDate = log.getDataDate();
+        baseMapper.clearByDay(dataDate);
+
 
 
     }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java

@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface ProjectDailyMapper extends BaseMapper<ProjectDaily> {
 
-    IPage<ProjectDailyVo> selectPageVo(IPage<ProjectDaily> page, @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
+    IPage<ProjectDaily> selectPageVo(IPage<ProjectDaily> page, @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.supervise.report.biz.projectdaily.ProjectDailyMapper">
-    <select id="selectPageVo" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVo">
+    <select id="selectPageVo" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDaily">
         select * from project_daily
         <where>
             ${ew.sqlSegment}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java

@@ -79,7 +79,7 @@ public class ProjectDailyRest {
     @PostMapping("/selectListPage")
     public ResultBean ListPage(@RequestBody PagerQuery<ProjectDailyQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
-        PagerVo<ProjectDailyVo> projectDailyVoPagerVo = projectDailyService.selectListPage(pq);
+        PagerVo<ProjectDaily> projectDailyVoPagerVo = projectDailyService.selectListPage(pq);
         return rb.success().setData(projectDailyVoPagerVo);
     }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java

@@ -31,7 +31,7 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
     @Autowired
     private WechatRest wechatRest;
 
-    public PagerVo<ProjectDailyVo> selectListPage(PagerQuery<ProjectDailyQuery> pq) {
+    public PagerVo<ProjectDaily> selectListPage(PagerQuery<ProjectDailyQuery> pq) {
         ProjectDailyQuery params = pq.getParams();
         QueryWrapper<ProjectDaily> wq = new QueryWrapper<>();
         if (params != null) {
@@ -46,8 +46,8 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
             }
         }
         IPage<ProjectDaily> page = PagerUtil.queryToPage(pq);
-        IPage<ProjectDailyVo> projectDailyVoIPage = baseMapper.selectPageVo(page, wq);
+        IPage<ProjectDaily> projectDailyVoIPage = baseMapper.selectPageVo(page, wq);
-        PagerVo<ProjectDailyVo> objectPagerVo = PagerUtil.pageToVo(projectDailyVoIPage, null);
+        PagerVo<ProjectDaily> objectPagerVo = PagerUtil.pageToVo(projectDailyVoIPage, null);
         return objectPagerVo;
     }
 

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVo.java

@@ -1,34 +0,0 @@
-package com.yxt.supervise.report.biz.projectdaily;
-
-import cn.hutool.core.util.IdUtil;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.vo.Vo;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author feikefei
- * @create 2023-08-05-13:46
- */
-@Data
-public class ProjectDailyVo implements Vo {
-    private Integer id;
-    private String sid; // sid
-    private Date createTime; // 记录创建时间
-    private String remarks; // 备注说明',
-    private String orderDate; // 单据日期',
-
-    private String reportTime; // 汇总时间',
-
-    private String projectSid; // 项目Sid',
-    private String projectName; // 项目名称',
-
-    private double totalLoan = 0; // 贷款总额',
-    private double accountsBalance = 0; // 帐户余额',
-    private double accountsReceivable = 0; // 应收账款',
-    private double stockAmount = 0; // 库存货值',
-    private double transitAmount = 0; // 在途货值',
-    private double advancePayment = 0; // 预付款',
-    private double pledgeRate = 0; // 质押率=（贷款金额-帐户余额）/（库存总价值+应收帐款+在途商品+预付款）',
-}

yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/SuperviseWxMessSenderTest.java

@@ -7,7 +7,7 @@ import java.util.HashMap;
 
 public class SuperviseWxMessSenderTest {
 
-    @Test
+//    @Test
     public void testJgsjzlSend() {
 
         String touser = "oGdho68CArVhC_-7ELkG-jX21ruk";

yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/WxMessageTest.java

@@ -20,7 +20,7 @@ public class WxMessageTest {
         System.out.println(respMessReturn.getErrcode());
         System.out.println(respMessReturn.getErrmsg());
     }
-    @Test
+//    @Test
     public void testSendMessage() {
         String template_id="BT6BHEojCmgWNTcpz1raHNIpJEEISP1E134btP51p_8";
         String touser="oGdho68CArVhC_-7ELkG-jX21ruk";