对账单相关接口

admin/src/main/java/com/kym/admin/controller/InvestorInfoController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/investorInfo")
 public class InvestorInfoController {
 
-    private InvestorInfoService investorInfoService;
+    private final InvestorInfoService investorInfoService;
 
     public InvestorInfoController(InvestorInfoService investorInfoService) {
         this.investorInfoService = investorInfoService;
@@ -31,18 +31,35 @@ public class InvestorInfoController {
      */
     @PostMapping("/create")
     R<?> create(@RequestBody InvestorInfo investorInfo) {
-        investorInfoService.save(investorInfo);
-        return R.success();
+        return R.success(investorInfoService.save(investorInfo));
     }
 
-    // 修改
+    /**
+     * 修改投资者/物业信息
+     * @param investorInfo
+     * @return
+     */
     @PostMapping("/update")
     R<?> update(@RequestBody InvestorInfo investorInfo) {
-        investorInfoService.updateById(investorInfo);
-        return R.success();
+        return R.success(investorInfoService.updateById(investorInfo));
+    }
+
+    /**
+     * 获取单个投资者/物业信息
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    R<?> getInvestorInfoById(@PathVariable("id") Long id) {
+        return R.success(investorInfoService.getById(id));
     }
 
-    // 查询详情
+    /**
+     * 投资者/物业信息列表
+     * @param params
+     * @return
+     */
     @GetMapping("/list")
     R<?> list(@ModelAttribute CommonQueryParam params) {
         return R.success(investorInfoService.list(params));

admin/src/main/java/com/kym/admin/controller/StatementsController.java

@@ -1,6 +1,7 @@
 package com.kym.admin.controller;
 
 import com.kym.common.R;
+import com.kym.entity.admin.queryParams.StatementsQueryParam;
 import com.kym.service.admin.StatementsService;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,6 +38,7 @@ public class StatementsController {
 
     /**
      * 预览
+     *
      * @param statId
      * @return
      */
@@ -45,4 +47,15 @@ public class StatementsController {
         return R.success(statementsService.getById(statId));
     }
 
+    /**
+     * 对账单列表
+     *
+     * @param params
+     * @return
+     */
+    @GetMapping("/listStatements")
+    R<?> list(@ModelAttribute StatementsQueryParam params) {
+        return R.success(statementsService.listStatements(params));
+    }
+
 }

entity/src/main/java/com/kym/entity/admin/queryParams/StatementsQueryParam.java

@@ -0,0 +1,29 @@
+package com.kym.entity.admin.queryParams;
+
+import com.kym.entity.common.PageParams;
+import lombok.Data;
+
+/**
+ * @author skyline
+ * @description 查询参数
+ * @date 2023-08-22 18:56
+ */
+@Data
+public class StatementsQueryParam extends PageParams {
+
+    /**
+     * 站点id
+     */
+    private String stationId;
+
+    /**
+     * 统计月份
+     */
+    private String statMonth;
+
+    /**
+     * 投资者/物业名称
+     */
+    private String adminUserName;
+
+}

service/src/main/java/com/kym/service/admin/StatementsService.java

@@ -1,7 +1,9 @@
 package com.kym.service.admin;
 
-import com.kym.entity.admin.Statements;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kym.entity.admin.Statements;
+import com.kym.entity.admin.queryParams.StatementsQueryParam;
+import com.kym.entity.common.PageBean;
 
 /**
  * <p>
@@ -14,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface StatementsService extends IService<Statements> {
 
     void createStatements(String statMonthId);
+
+    PageBean<Statements> listStatements(StatementsQueryParam params);
 }

service/src/main/java/com/kym/service/admin/impl/StatementsServiceImpl.java

@@ -2,10 +2,13 @@ package com.kym.service.admin.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import com.kym.common.utils.CommUtil;
 import com.kym.entity.admin.InvestorInfo;
 import com.kym.entity.admin.Statements;
 import com.kym.entity.admin.StationStatMonth;
+import com.kym.entity.admin.queryParams.StatementsQueryParam;
+import com.kym.entity.common.PageBean;
 import com.kym.mapper.admin.StatementsMapper;
 import com.kym.service.admin.InvestorInfoService;
 import com.kym.service.admin.StatementsService;
@@ -94,4 +97,16 @@ public class StatementsServiceImpl extends ServiceImpl<StatementsMapper, Stateme
         }).toList();
         saveBatch(res);
     }
+
+    @Override
+    public PageBean<Statements> listStatements(StatementsQueryParam params) {
+        PageHelper.startPage(params.getPageNum(), params.getPageSize());
+        var res = lambdaQuery()
+                .eq(!CommUtil.isEmptyOrNull(params.getStationId()), Statements::getStationId, params.getStationId())
+                .eq(!CommUtil.isEmptyOrNull(params.getStatMonth()), Statements::getStatMonth, params.getStatMonth())
+                .like(!CommUtil.isEmptyOrNull(params.getAdminUserName()), Statements::getAdminUserName, params.getAdminUserName())
+                .orderByDesc(Statements::getStatMonth)
+                .list();
+        return new PageBean<>(res);
+    }
 }