From b6f562b3b957c0be03bb5c3d88912607b6c99b20 Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Thu, 10 Aug 2023 18:07:33 +0800 Subject: [PATCH 1/2] 111 --- .../biz/projectdaily/ProjectDailyMapper.java | 2 +- .../biz/projectdaily/ProjectDailyMapper.xml | 2 +- .../biz/projectdaily/ProjectDailyRest.java | 2 +- .../biz/projectdaily/ProjectDailyService.java | 6 ++-- .../biz/projectdaily/ProjectDailyVo.java | 34 ------------------- 5 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVo.java diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java index ce5e88aa..1ef5b06b 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java +++ b/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 { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml index 184b9fae..98cdbdb0 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml @@ -1,7 +1,7 @@ - select * from project_daily ${ew.sqlSegment} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java index f94c2ab0..04954143 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java +++ b/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 pq) { ResultBean rb = ResultBean.fireFail(); - PagerVo projectDailyVoPagerVo = projectDailyService.selectListPage(pq); + PagerVo projectDailyVoPagerVo = projectDailyService.selectListPage(pq); return rb.success().setData(projectDailyVoPagerVo); } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index 6e35db70..edb16066 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/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 selectListPage(PagerQuery pq) { + public PagerVo selectListPage(PagerQuery pq) { ProjectDailyQuery params = pq.getParams(); QueryWrapper wq = new QueryWrapper<>(); if (params != null) { @@ -46,8 +46,8 @@ public class ProjectDailyService extends ServiceImpl page = PagerUtil.queryToPage(pq); - IPage projectDailyVoIPage = baseMapper.selectPageVo(page, wq); - PagerVo objectPagerVo = PagerUtil.pageToVo(projectDailyVoIPage, null); + IPage projectDailyVoIPage = baseMapper.selectPageVo(page, wq); + PagerVo objectPagerVo = PagerUtil.pageToVo(projectDailyVoIPage, null); return objectPagerVo; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVo.java deleted file mode 100644 index 0cc8f67b..00000000 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVo.java +++ /dev/null @@ -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; // 质押率=（贷款金额-帐户余额）/（库存总价值+应收帐款+在途商品+预付款）', -} From 1d689af140d509a4f10c47776fe54cde941d39f9 Mon Sep 17 00:00:00 2001 From: liupopo Date: Thu, 10 Aug 2023 18:20:45 +0800 Subject: [PATCH 2/2] aaa --- .../supervise/customer/biz/csmcash/CsmCashDifferentService.java | 2 ++ .../com/yxt/supervise/report/wx/SuperviseWxMessSenderTest.java | 2 +- .../test/java/com/yxt/supervise/report/wx/WxMessageTest.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java index 357c4796..55470829 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java +++ b/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