Browse Source

利润单-销售和运营修改

yangzian 3 years ago
parent
commit
4a8c9db3fa

+ 3 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/SettlementFileController.java

@@ -99,7 +99,9 @@ public class SettlementFileController {
     @PostMapping(value = "/getAccountNumAndImgNum")
     public Result getAccountNumAndImgNum(@RequestBody SettlementFileParamsVo paramsVo) {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        SysUser user = userService.getById(loginUser.getId());
+        String userId = "e9ca23d68d884d4ebb19d07889727dae";
+        SysUser user = userService.getById(userId);
+        //SysUser user = userService.getById(loginUser.getId());
         return settlementFileInfoService.getAccountNumAndImgNum(paramsVo,user);
     }
     @Autowired

+ 2 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/ReportSettlementMapper.java

@@ -80,11 +80,11 @@ public interface ReportSettlementMapper {
 
     Map<String,Object> getProfitRebate(@Param("productName") String productName,@Param("startTime")String startTime,@Param("endTime")String endTime);
 
-    Map<String,Object> getProfitBytedanceSale(String accountId);
+    Map<String,Object> getProfitReportSale(String accountId);
 
     Map<String,Object> getProfitBytedanceOperate(String accountId);
 
-    Map<String,Object> getProfitKuaiShouOperate(String accountId);
+    Map<String,Object> getProfitReportOperateAndArea(String accountId);
 
 
 

+ 59 - 8
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/ReportSettlementMapper.xml

@@ -287,16 +287,41 @@
         limit 1
     </select>
 
-    <!-- 查询 头条利润表  销售人员姓名 -->
-    <select id="getProfitBytedanceSale" resultType="java.util.LinkedHashMap">
-        SELECT f.create_user_id,u.realname as saleName
+    <!-- 查询 利润表  销售人员姓名 -->
+    <select id="getProfitReportSale" resultType="java.util.LinkedHashMap">
+       <!-- SELECT f.create_user_id,u.realname as saleName
         from ctop_cwjs_settlement_info f
         LEFT  JOIN sys_user u on u.id = f.create_user_id
         where f.del_flag = 0
         <if test="accountId !=null and accountId != ''">
             AND f.account_id = #{accountId}
         </if>
-        limit 1
+        limit 1-->
+        ( SELECT
+        p.sale_id,
+        y.realname AS saleName
+        FROM
+        ctop_user_allocation u
+        LEFT JOIN ctop_project p ON u.project_id = p.id
+        LEFT JOIN sys_user y ON y.id = p.sale_id
+        WHERE
+        u.account_id = #{accountId}
+        LIMIT 1
+        )
+        UNION ALL
+        (
+        SELECT
+        f.create_user_id,
+        u.realname AS saleName
+        FROM
+        ctop_cwjs_settlement_info f
+        LEFT JOIN sys_user u ON u.id = f.create_user_id
+        WHERE
+        f.del_flag = 0
+        AND f.account_id = #{accountId}
+        LIMIT 1
+        )
+        LIMIT 1
     </select>
 
     <!-- 查询 头条利润表  广告主和运营和运营所属区域-->
@@ -387,9 +412,9 @@
     </select>
 
 
-    <!-- 查询 快手 利润表  广告主和运营和运营所属区域-->
-    <select id="getProfitKuaiShouOperate" resultType="java.util.LinkedHashMap">
-        SELECT
+    <!-- 查询 利润表  运营和运营所属区域-->
+    <select id="getProfitReportOperateAndArea" resultType="java.util.LinkedHashMap">
+        <!--SELECT
         c.create_user_id AS operateUserId,
         p.user_name AS operateName,
         IFNULL( p.nick_name, '' ) AS operateArea,
@@ -402,7 +427,33 @@
             <if test="accountId !=null and accountId != ''">
                 AND c.account_id = #{accountId}
             </if>
-            limit 1
+            limit 1-->
+
+        ( SELECT
+        u.user_id AS operateUserId,
+        u.user_name AS operateName,
+        IFNULL( p.nick_name, '' ) AS operateArea
+        FROM
+        ctop_user_allocation u
+        LEFT JOIN user_company p ON u.user_id = p.user_id
+        WHERE
+        u.account_id = #{accountId}
+        LIMIT 1
+        ) UNION ALL
+        (
+        SELECT
+        c.create_user_id AS operateUserId,
+        p.user_name AS operateName,
+        IFNULL( p.nick_name, '' ) AS operateArea
+        FROM
+        ctop_cwjs_settlement_file_info c
+        LEFT JOIN user_company p ON c.create_user_id = p.user_id
+        WHERE
+        c.del_flag = 0
+        AND c.account_id = #{accountId}
+        LIMIT 1
+        )
+        LIMIT 1
     </select>
 
     <!--  查询 所有已绑定用户的运营人员id -->

+ 10 - 9
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java

@@ -558,15 +558,16 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                 ProfitReportBytedanceVo voSource = new ProfitReportBytedanceVo();
                 voSource.setAccountId(map.get("accountId")+"");
 
-                //查询销售
-                Map<String,Object> slaeMap = reportSettlementMapper.getProfitBytedanceSale(map.get("accountId")+"");
-                voSource.setSaleName(Check.isNull(slaeMap) ? "" : slaeMap.getOrDefault("saleName","")+"");//销售
-
                 voSource.setAdvertiserName(!Check.isNull(map.get("advertiserName")) ? map.getOrDefault("advertiserName","")+"" : "" );//广告主名称
                 //产品名称
                 voSource.setProductName(!Check.isNull(map.get("productName")) ? map.getOrDefault("productName","")+"" : "" );
 
-                Map<String,Object> operateMap = reportSettlementMapper.getProfitBytedanceOperate(map.get("accountId")+"");
+
+                //查询销售
+                Map<String,Object> slaeMap = reportSettlementMapper.getProfitReportSale(map.get("accountId")+"");
+                voSource.setSaleName(Check.isNull(slaeMap) ? "" : slaeMap.getOrDefault("saleName","")+"");//销售
+                //查询运营
+                Map<String,Object> operateMap = reportSettlementMapper.getProfitReportOperateAndArea(map.get("accountId")+"");
                 if (!Check.isNull(operateMap)){
                     voSource.setOperateName(operateMap.getOrDefault("operateName","")+"");//运营
                     voSource.setOperateArea(operateMap.getOrDefault("operateArea","")+"");//运营所属区域
@@ -724,11 +725,11 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                 voSource.setKsId(map.getOrDefault("ksId", "") + "");//快手id
                 voSource.setAdvertiserName(!Check.isNull(map.get("advertiserName")) ? map.getOrDefault("advertiserName", "") + "" : "");//广告主名称
 
-                //查询销售
-                Map<String, Object> slaeMap = reportSettlementMapper.getProfitBytedanceSale(map.get("accountId") + "");
+                //销售
+                Map<String, Object> slaeMap = reportSettlementMapper.getProfitReportSale(map.get("accountId") + "");
                 voSource.setSaleName(Check.isNull(slaeMap) ? "" : slaeMap.getOrDefault("saleName", "") + "");//销售
-
-                Map<String, Object> operateMap = reportSettlementMapper.getProfitKuaiShouOperate(map.get("accountId") + "");
+                //运营
+                Map<String, Object> operateMap = reportSettlementMapper.getProfitReportOperateAndArea(map.get("accountId") + "");
                 if (!Check.isNull(operateMap)) {
                     voSource.setOperateName(operateMap.getOrDefault("operateName", "") + "");//运营
                     voSource.setOperateArea(operateMap.getOrDefault("operateArea", "") + "");//运营所属区域