Jelajahi Sumber

Merge remote-tracking branch 'origin/test' into test

xuzuoyun 5 tahun lalu
induk
melakukan
6aefe2c491

+ 5 - 2
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/PerformanceMapper.xml

@@ -10,6 +10,7 @@
         <result column="appType" property="appType"/>
         <result column="projectId" property="projectId"/>
         <result column="projectName" property="projectName"/>
+        <result column="accountName" property="accountName"/>
     </resultMap>
     <select id="getOptimizerTotalCostDetailGroupByUserId" resultMap="OptimizerTotalCostDetail">
         SELECT
@@ -69,7 +70,8 @@
 
     <select id="getUserOptimizerTotalCostGroupByProjectId" resultMap="OptimizerTotalCostDetail">
         SELECT
-        allocation.project_id as projectId,allocation.project_name as projectName,dailiAccount.account_id,sysUser.id as
+        allocation.project_id as projectId,allocation.project_name as projectName,allocation.auth_name as
+        accountName,sysUser.id as
         userId,sysUser.realname as realName,SUM(charge) as totalCost,#{year} AS year,#{quarter} as quarter,2 as appType
         FROM
         ctop_kuaishou_report_daily_account dailiAccount
@@ -99,7 +101,8 @@
     </select>
     <select id="getUserOptimizerTotalCostGroupByAccountId" resultMap="OptimizerTotalCostDetail">
         SELECT
-        allocation.project_id as projectId,allocation.project_name as projectName,dailiAccount.account_id,sysUser.id as
+        allocation.project_id as projectId,allocation.project_name as projectName,allocation.auth_name as accountName
+        ,sysUser.id as
         userId,sysUser.realname as realName,SUM(charge) as totalCost,#{year} AS year,#{quarter} as quarter,2 as appType
         FROM
         ctop_kuaishou_report_daily_account dailiAccount

+ 4 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceServiceImpl.java

@@ -151,15 +151,18 @@ public class PerformanceServiceImpl extends ServiceImpl<PerformanceMapper, Perfo
         List<OptimizerCostDetailVO> detailVOS = performanceMapper.getMemberPerformanceByOrgCode(startDate, endDate, year, quarter, sysUser.getOrgCode());
         List<OptimizerCostDetailVO> getDetails = new ArrayList<>();
         BigDecimal memberTotaRoyalty = BigDecimal.ZERO;
-        result.put("totalCost", totalCostVo.getTotalCost());
+        BigDecimal memberTotaCost = BigDecimal.ZERO;
+        result.put("mediaTotalCost", totalCostVo.getTotalCost());
         result.put("mediaTask", config.getMediaTask());
         for (OptimizerCostDetailVO vo : detailVOS) {
             BigDecimal royalty = getTotalRoyalty(config, vo, totalCostVo);
             vo.setTotalRoyalty(royalty);
             memberTotaRoyalty = memberTotaRoyalty.add(royalty);
+            memberTotaCost = memberTotaCost.add(vo.getTotalCost());
             getDetails.add(vo);
         }
         result.put("memberDetails", getDetails);
+        result.put("memberTotalCost", memberTotaCost.setScale(2, RoundingMode.HALF_UP).toString());
         if (totalCostVo.getTotalCost().compareTo(config.getMediaTask()) < 0) {
             result.put("totalRoyalty", "0");
             ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());

+ 1 - 0
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/OptimizerCostDetailVO.java

@@ -44,4 +44,5 @@ public class OptimizerCostDetailVO implements Serializable {
 
     private String projectName;
 
+    private String accountName;
 }