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 { - 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; // 质押率=(贷款金额-帐户余额)/(库存总价值+应收帐款+在途商品+预付款)', -} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/SuperviseWxMessSenderTest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/SuperviseWxMessSenderTest.java index 3eaa4556..da99f8a2 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/SuperviseWxMessSenderTest.java +++ b/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"; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/WxMessageTest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/WxMessageTest.java index e040e770..ae8aedd8 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/WxMessageTest.java +++ b/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";