yangzian 4 лет назад
Родитель
Сommit
4c2b9fe167

+ 3 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/DemoController.java

@@ -77,16 +77,16 @@ public class DemoController {
      * @author: zianY
      * @time: 2021/7/28 20:35
      */
-    @ApiOperation(value="test2", notes="test2")
+   /* @ApiOperation(value="test2", notes="test2")
     @GetMapping(value = "/test2")
     public Result<PageInfo<ctopCwjsSettlementInfo>> test2(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
         PageHelper.startPage(pageNo,pageSize);
-        List<ctopCwjsSettlementInfo> list = settlementInfoService.getList();
+        List<ctopCwjsSettlementInfo> list = settlementInfoService.getSettlementList(null,pageNo,pageSize);
         PageInfo<ctopCwjsSettlementInfo> pageInfo = new PageInfo<>(list);
         return Result.successMsg("chenggong.",pageInfo);
     }
-
+*/
 
 
 

+ 16 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/SettlementController.java

@@ -4,8 +4,12 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.ctop.finance.settlement.entity.pojo.ctopCwjsSettlementInfo;
 import org.jeecg.ctop.finance.settlement.entity.vo.BytedanceAccountImportVo;
 
 
@@ -14,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
 
 
 /**
@@ -29,6 +34,17 @@ public class SettlementController {
     @Autowired
     private ISettlementInfoService settlementInfoService;
 
+    @ApiOperation(value="财务结算-账户列表查询", notes="财务结算-账户列表查询")
+    @GetMapping(value = "/getSettlementList")
+    public Result getSettlementList(ctopCwjsSettlementInfo settlementInfo,
+                                                                      @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                      @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+       return settlementInfoService.getSettlementList(settlementInfo,pageNo,pageSize);
+    }
+
+
+
+
 
 
     @PostMapping("/import")

+ 13 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/pojo/ctopCwjsSettlementInfo.java

@@ -1,6 +1,7 @@
 package org.jeecg.ctop.finance.settlement.entity.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -21,23 +22,30 @@ public class ctopCwjsSettlementInfo implements Serializable {
     /**
      * 主键id
      */
+    //@TableField(exist = false)
     private Long id;
 
     /**
      * 广告主公司id
      */
-    @Dict(dicCode = "id", dictTable = "ctop_advertiser", dicText = "name")
+    //@Dict(dicCode = "id", dictTable = "ctop_advertiser", dicText = "name")
     private String advertiserId;
+    @TableField(exist = false)
+    private String advertiserName;
 
     /**
      * 产品id
      */
     private String productId;
+    @TableField(exist = false)
+    private String productName;
 
     /**
      * 项目id
      */
     private String projectId;
+    @TableField(exist = false)
+    private String projectName;
 
     /**
      * 媒体类型 1-头条 2-快手 3-头条内广 4-快手内广
@@ -78,11 +86,15 @@ public class ctopCwjsSettlementInfo implements Serializable {
      * 创建人id
      */
     private String createUserId;
+    @TableField(exist = false)
+    private String createUserName;
 
     /**
      * 创建时间
      */
     private Date createTime;
+    private String startTime;
+    private String endTime;
 
     /**
      * 更新时间

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/SettlementInfoMapper.java

@@ -16,6 +16,6 @@ import java.util.List;
  */
 public interface SettlementInfoMapper extends BaseMapper<ctopCwjsSettlementInfo> {
 
-    List<ctopCwjsSettlementInfo> getList();
+    List<ctopCwjsSettlementInfo> getSettlementList(ctopCwjsSettlementInfo settlementInfo);
 
 }

+ 52 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/SettlementInfoMapper.xml

@@ -2,10 +2,60 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.ctop.finance.settlement.mapper.SettlementInfoMapper">
 
-    <select id="getList" resultType="org.jeecg.ctop.finance.settlement.entity.pojo.ctopCwjsSettlementInfo">
+    <!-- 查询 财务结算-账户列表-->
+    <select id="getSettlementList" resultType="org.jeecg.ctop.finance.settlement.entity.pojo.ctopCwjsSettlementInfo">
+        SELECT * from (
+        SELECT
+            id,
+            advertiser_id,
+            ( SELECT ad.NAME FROM ctop_advertiser ad WHERE ad.id = cwjs.advertiser_id LIMIT 1 ) advertiserName,
+            product_id,
+            ( SELECT cp.product_name FROM ctop_product cp WHERE cp.id = cwjs.product_id LIMIT 1 ) productName,
+            project_id,
+            ( SELECT project.project_name FROM ctop_project project WHERE project.id = cwjs.project_id LIMIT 1 ) projectName,
+            media_id,
+            operate_type,
+            account_id,
+            account_name,
+            kuai_shou_id,
+            STATUS,
+            del_flag,
+            create_user_id,
+            ( SELECT su.realname FROM sys_user su WHERE su.id = cwjs.create_user_id LIMIT 1 ) createUserName,
+            create_time,
+            update_time
+        FROM
+            ctop_cwjs_settlement_info cwjs
+        WHERE
+            cwjs.del_flag = 0) t
+        <where>
+            <if test="advertiserName !=null and advertiserName != ''">
+                AND advertiserName like concat ('%',#{advertiserName},'%')
+            </if>
+            <if test="productName !=null and productName != ''">
+                AND productName like concat ('%',#{productName},'%')
+            </if>
+            <if test="projectName !=null and projectName != ''">
+                AND projectName like concat ('%',#{projectName},'%')
+            </if>
+            <if test="accountName !=null and accountName != ''">
+                AND accountName like concat ('%',#{accountName},'%')
+            </if>
+            <if test="createUserName !=null and createUserName != ''">
+                AND createUserName like concat ('%',#{createUserName},'%')
+            </if>
+            <if test="mediaId !=null and mediaId != ''">
+                AND media_id = #{mediaId}
+            </if>
+            <if test="startTime !=null and startTime != ''">
+                AND create_time &gt;= #{startTime}
+            </if>
+            <if test="endTime !=null and endTime != ''">
+                AND create_time &lt;= #{endTime}
+            </if>
 
-select * from ctop_cwjs_settlement_info
 
+        </where>
 
     </select>
 

+ 2 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/ISettlementInfoService.java

@@ -1,12 +1,13 @@
 package org.jeecg.ctop.finance.settlement.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.ctop.finance.settlement.entity.pojo.ctopCwjsSettlementInfo;
 
 import java.util.List;
 
 public interface ISettlementInfoService extends IService<ctopCwjsSettlementInfo> {
 
-    List<ctopCwjsSettlementInfo> getList();
+    Result getSettlementList(ctopCwjsSettlementInfo settlementInfo, Integer pageNo, Integer pageSize);
 
 }

+ 20 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementInfoServiceImpl.java

@@ -1,6 +1,10 @@
 package org.jeecg.ctop.finance.settlement.service.serviceImpl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.poi.ss.formula.functions.T;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.ctop.finance.settlement.entity.pojo.ctopCwjsSettlementInfo;
 import org.jeecg.ctop.finance.settlement.mapper.SettlementInfoMapper;
 import org.jeecg.ctop.finance.settlement.service.ISettlementInfoService;
@@ -17,8 +21,22 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
     private SettlementInfoMapper settlementInfoMapper;
 
 
+    /**
+     *
+     * @description: 查询 财务结算-账户列表
+     *
+     * @param settlementInfo
+     * @param pageNo
+     * @param pageSize
+     * @return: org.jeecg.common.api.vo.Result
+     * @author: zianY
+     */
     @Override
-    public List<ctopCwjsSettlementInfo> getList() {
-        return settlementInfoMapper.getList();
+    public Result getSettlementList(ctopCwjsSettlementInfo settlementInfo, Integer pageNo, Integer pageSize) {
+
+        PageHelper.startPage(pageNo,pageSize);
+        List<ctopCwjsSettlementInfo> list = settlementInfoMapper.getSettlementList(settlementInfo);
+        PageInfo<ctopCwjsSettlementInfo> pageInfo = new PageInfo<>(list);
+        return Result.successMsg("chenggong.",pageInfo);
     }
 }