From 5efc4a883cb33dc9092053192a3a178bb71f437d Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Thu, 10 Aug 2023 16:46:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/biz/projectdaily/ProjectDaily.java | 1 + .../biz/projectdaily/ProjectDailyMapper.java | 9 ++++++- .../biz/projectdaily/ProjectDailyMapper.xml | 10 ++++++++ .../biz/projectdaily/ProjectDailyRest.java | 8 +++++++ .../biz/projectdaily/ProjectDailyService.java | 24 +++++++++++++++---- 5 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java index 96572601..606ea7f5 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java @@ -43,6 +43,7 @@ public class ProjectDaily extends EntityWithId { private String userName; // 用户(报告人)姓名', private int userType = 1; // 用户(报告人)类型:1监管、2客户、3银行', private String userStaffSid; // 关联人员的Sid', + private String totalLoanA; /** 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 34dd6fd4..35ac4ab4 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 @@ -6,9 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; @Mapper public interface ProjectDailyMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew); + + @Select("select * from project_daily where sid = #{sid}") + ProjectDaily selectOne(@Param("sid") String sid); + + @Select("select * from project_daily where projectSid = #{projectSid} and orderDate = #{orderDate}") + ProjectDaily selectByProSidAndOrderDate(@Param("projectSid") String projectSid,@Param("orderDate") String orderDate); } 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 new file mode 100644 index 00000000..184b9fae --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file 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 84f9f974..f94c2ab0 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 @@ -74,4 +74,12 @@ public class ProjectDailyRest { projectDailyService.sendMess(projectSid, orderDate); return rb.success(); } + + @ApiOperation("查询项目监管报表信息APP") + @PostMapping("/selectListPage") + public ResultBean ListPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + 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 9c7db256..1af3aa21 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 @@ -22,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -41,7 +42,15 @@ public class ProjectDailyService extends ServiceImpl wq = new QueryWrapper<>(); if (params != null) { - + if (params.getDataDateStart() != null && !params.getDataDateStart().equals("")) { + wq.ge("orderDate", params.getDataDateStart()); + } + if (params.getDataDateEnd() != null && !params.getDataDateEnd().equals("")) { + wq.le("orderDate", params.getDataDateEnd()); + } + if (params.getProjectName() != null && !params.getProjectName().equals("")) { + wq.like("projectName", params.getProjectName()); + } } IPage page = PagerUtil.queryToPage(pq); IPage projectDailyVoIPage = baseMapper.selectPageVo(page, wq); @@ -99,10 +108,7 @@ public class ProjectDailyService extends ServiceImpl qw = new QueryWrapper<>(); - qw.eq("projectSid", projectSid) - .eq("orderDate", orderDate); - return baseMapper.selectOne(qw); + return baseMapper.selectByProSidAndOrderDate(projectSid,orderDate); } public void sendMess(String projectSid, String orderDate) { @@ -119,4 +125,12 @@ public class ProjectDailyService extends ServiceImpl