瀏覽代碼

删除遗留的无用模块代码以及实体类

syh 4 年之前
父節點
當前提交
dcbbcafefe
共有 91 個文件被更改,包括 25 次插入7855 次删除
  1. 0 12
      jeecg-boot-module-system/pom.xml
  2. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/PerformanceSaleServiceImpl.java
  3. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerConfig.java
  4. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/Performance.java
  5. 3 3
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/PerformanceMapper.java
  6. 2 3
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/PerformanceMapper.xml
  7. 5 5
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IPerformanceService.java
  8. 7 7
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceServiceImpl.java
  9. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/SalePerformanceDetailServiceImpl.java
  10. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/DesignerCostDetailVO.java
  11. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/OptimizerCostDetailVO.java
  12. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/OptimizerVO.java
  13. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/UserPerformanceDetailVO.java
  14. 0 181
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performanceappraisal/controller/OptimizerRoleInfoController.java
  15. 0 40
      module-media/pom.xml
  16. 0 66
      performance-appraisal/pom.xml
  17. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/controller/AccountVideoQuarterInfoController.java
  18. 0 153
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/entity/AccountVideoQuarterInfo.java
  19. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/mapper/AccountVideoQuarterInfoMapper.java
  20. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/mapper/xml/AccountVideoQuarterInfoMapper.xml
  21. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/service/IAccountVideoQuarterInfoService.java
  22. 0 20
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/service/impl/AccountVideoQuarterInfoServiceImpl.java
  23. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/controller/PerformanceAccountController.java
  24. 0 113
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/entity/PerformanceAccount.java
  25. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/mapper/PerformanceAccountMapper.java
  26. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/mapper/xml/PerformanceAccountMapper.xml
  27. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/service/IPerformanceAccountService.java
  28. 0 20
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/service/impl/PerformanceAccountServiceImpl.java
  29. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/OptimizerConfigController.java
  30. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceConfigController.java
  31. 0 244
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceController.java
  32. 0 326
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceOptimizerController.java
  33. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/RolePerformancRraiseController.java
  34. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/RolePerformanceCommissionController.java
  35. 0 81
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerRoleInfo.java
  36. 0 63
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/PerformanceConfig.java
  37. 0 102
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/PerformanceOptimizer.java
  38. 0 85
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java
  39. 0 78
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java
  40. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/OptimizerConfigMapper.java
  41. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/OptimizerRoleInfoMapper.java
  42. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/PerformanceConfigMapper.java
  43. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/PerformanceOptimizerMapper.java
  44. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/RolePerformancRraiseMapper.java
  45. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/RolePerformanceCommissionMapper.java
  46. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/OptimizerConfigMapper.xml
  47. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/OptimizerRoleInfoMapper.xml
  48. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/PerformanceConfigMapper.xml
  49. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/PerformanceOptimizerMapper.xml
  50. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/RolePerformancRraiseMapper.xml
  51. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/RolePerformanceCommissionMapper.xml
  52. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IOptimizerConfigService.java
  53. 0 18
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IOptimizerRoleInfoService.java
  54. 0 16
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IPerformanceConfigService.java
  55. 0 28
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IPerformanceOptimizerService.java
  56. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IRolePerformancRraiseService.java
  57. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IRolePerformanceCommissionService.java
  58. 0 30
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/OptimizerConfigServiceImpl.java
  59. 0 50
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/OptimizerRoleInfoServiceImpl.java
  60. 0 34
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceConfigServiceImpl.java
  61. 0 817
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceOptimizerServiceImpl.java
  62. 0 19
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/RolePerformancRraiseServiceImpl.java
  63. 0 19
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/RolePerformanceCommissionServiceImpl.java
  64. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/controller/PlaneProjectCostController.java
  65. 0 100
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/entity/PlaneProjectCost.java
  66. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/mapper/PlaneProjectCostMapper.java
  67. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/mapper/xml/PlaneProjectCostMapper.xml
  68. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/service/IPlaneProjectCostService.java
  69. 0 20
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/service/impl/PlaneProjectCostServiceImpl.java
  70. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/controller/UserEfficientVideoMapController.java
  71. 0 25
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/AccountDTO.java
  72. 0 32
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/DesignMaterialInfo.java
  73. 0 22
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/EffiVideoDTO.java
  74. 0 18
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/PerformanceTimeDTO.java
  75. 0 21
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/PlaneProjectCostDTO.java
  76. 0 17
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/ProjectDTO.java
  77. 0 34
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/TransferorAccountDTO.java
  78. 0 42
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/UserDto2.java
  79. 0 104
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/UserEfficientVideoMap.java
  80. 0 31
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/VideoDTO.java
  81. 0 261
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/UserEfficientVideoMapMapper.java
  82. 0 1774
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/xml/UserEfficientVideoMapMapper.xml
  83. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/service/IUserEfficientVideoMapService.java
  84. 0 20
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/service/impl/UserEfficientVideoMapServiceImpl.java
  85. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/uservideomap/controller/UserVideoMapController.java
  86. 0 117
      performance-appraisal/src/main/java/cn/com/ctop/uservideomap/entity/UserVideoMap.java
  87. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/uservideomap/mapper/UserVideoMapMapper.java
  88. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/uservideomap/mapper/xml/UserVideoMapMapper.xml
  89. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/uservideomap/service/IUserVideoMapService.java
  90. 0 20
      performance-appraisal/src/main/java/cn/com/ctop/uservideomap/service/impl/UserVideoMapServiceImpl.java
  91. 0 2
      pom.xml

+ 0 - 12
jeecg-boot-module-system/pom.xml

@@ -63,12 +63,6 @@
         </dependency>
         <dependency>
             <groupId>cn.com.ctop</groupId>
-            <artifactId>module-media</artifactId>
-            <version>2.0.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
             <artifactId>module-common</artifactId>
             <version>2.0.2</version>
         </dependency>
@@ -85,12 +79,6 @@
         </dependency>
         <dependency>
             <groupId>cn.com.ctop</groupId>
-            <artifactId>performance-appraisal</artifactId>
-            <version>2.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
             <artifactId>module-oa</artifactId>
             <version>2.0.2</version>
             <scope>compile</scope>

+ 1 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/PerformanceSaleServiceImpl.java

@@ -4,13 +4,12 @@ import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
-
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IPerformanceSaleService;
 import org.jeecg.modules.performance.entity.SalePerformanceDetail;
+import org.jeecg.modules.performance.service.IPerformanceService;
 import org.jeecg.modules.performance.service.ISalePerformanceDetailService;
 import org.jeecg.modules.system.entity.SysUserRole;
 import org.jeecg.modules.system.service.ISysUserRoleService;

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerConfig.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.entity;
+package org.jeecg.modules.performance.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/Performance.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.entity;
+package org.jeecg.modules.performance.entity;
 
 import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 3 - 3
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/PerformanceMapper.java

@@ -1,9 +1,9 @@
-package cn.com.ctop.performanceappraisal.mapper;
+package org.jeecg.modules.performance.mapper;
 
-import cn.com.ctop.performanceappraisal.entity.Performance;
-import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.performance.entity.Performance;
+import org.jeecg.modules.performance.vo.OptimizerCostDetailVO;
 
 import java.math.BigDecimal;
 import java.util.List;

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.performanceappraisal.mapper.PerformanceMapper">
-    <resultMap id="OptimizerTotalCostDetail" type="cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO">
+<mapper namespace="org.jeecg.modules.performance.mapper.PerformanceMapper">
+    <resultMap id="OptimizerTotalCostDetail" type="org.jeecg.modules.performance.vo.OptimizerCostDetailVO">
         <result column="realName" property="realName"/>
         <result column="totalCost" property="totalCost"/>
         <result column="year" property="year"/>
@@ -25,7 +25,6 @@
         LEFT JOIN
         sys_user sysUser ON sysUser.id = userRole.user_id
         WHERE
-        <!-- userRole.role_id = '79fba4f45f1b8e284af9c68311c6c771' -->
         dailiAccount.stat_date &gt;= #{startDate}
         AND
         dailiAccount.stat_date &lt;= #{endDate}

+ 5 - 5
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IPerformanceService.java

@@ -1,10 +1,10 @@
-package cn.com.ctop.performanceappraisal.service;
+package org.jeecg.modules.performance.service;
 
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import cn.com.ctop.performanceappraisal.entity.Performance;
-import cn.com.ctop.performanceappraisal.vo.DesignerCostDetailVO;
-import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.performance.entity.OptimizerConfig;
+import org.jeecg.modules.performance.entity.Performance;
+import org.jeecg.modules.performance.vo.DesignerCostDetailVO;
+import org.jeecg.modules.performance.vo.OptimizerCostDetailVO;
 
 import java.math.BigDecimal;
 import java.util.List;

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

@@ -1,18 +1,18 @@
-package cn.com.ctop.performanceappraisal.service.impl;
+package org.jeecg.modules.performance.service.impl;
 
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import cn.com.ctop.performanceappraisal.entity.Performance;
-import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
-import cn.com.ctop.performanceappraisal.vo.DesignerCostDetailVO;
-import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.performance.entity.OptimizerConfig;
+import org.jeecg.modules.performance.entity.Performance;
+import org.jeecg.modules.performance.mapper.PerformanceMapper;
+import org.jeecg.modules.performance.service.IPerformanceService;
+import org.jeecg.modules.performance.vo.DesignerCostDetailVO;
+import org.jeecg.modules.performance.vo.OptimizerCostDetailVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 1 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/SalePerformanceDetailServiceImpl.java

@@ -4,16 +4,15 @@ import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
-
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.performance.constants.RateConstant;
 import org.jeecg.modules.performance.entity.SalePerformanceDetail;
 import org.jeecg.modules.performance.mapper.SalePerformanceDetailMapper;
+import org.jeecg.modules.performance.service.IPerformanceService;
 import org.jeecg.modules.performance.service.ISalePerformanceDetailService;
 import org.jeecg.modules.system.entity.SysUserRole;
 import org.jeecg.modules.system.service.ISysUserRoleService;

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

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.vo;
+package org.jeecg.modules.performance.vo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.vo;
+package org.jeecg.modules.performance.vo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.vo;
+package org.jeecg.modules.performance.vo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.vo;
+package org.jeecg.modules.performance.vo;
 
 import lombok.Data;
 

+ 0 - 181
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performanceappraisal/controller/OptimizerRoleInfoController.java

@@ -1,181 +0,0 @@
-package org.jeecg.modules.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.entity.SysUser;
-import cn.com.ctop.performanceappraisal.entity.OptimizerRoleInfo;
-import cn.com.ctop.performanceappraisal.service.IOptimizerRoleInfoService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Map;
-
-/**
- * 优化师角色关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-17
- */
-@Slf4j
-@Api(tags = "优化师角色关系表")
-@RestController
-@RequestMapping("/ctop/optimizerRoleInfo")
-public class OptimizerRoleInfoController {
-    @Autowired
-    private IOptimizerRoleInfoService optimizerRoleInfoService;
-    @Autowired
-    private ISysUserService sysUserService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param optimizerRoleInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "优化师角色关系表-分页列表查询")
-    @ApiOperation(value = "优化师角色关系表-分页列表查询", notes = "优化师角色关系表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<OptimizerRoleInfo>> queryPageList(OptimizerRoleInfo optimizerRoleInfo,
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
-        Result<IPage<OptimizerRoleInfo>> result = new Result<>();
-        optimizerRoleInfo.setType(1);
-        QueryWrapper<OptimizerRoleInfo> queryWrapper = QueryGenerator.initQueryWrapper(optimizerRoleInfo, req.getParameterMap());
-        Page<OptimizerRoleInfo> page = new Page<>(pageNo, pageSize);
-        IPage<OptimizerRoleInfo> pageList = optimizerRoleInfoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-
-    @AutoLog(value = "优化师角色关系表-添加")
-    @ApiOperation(value = "优化师角色关系表-添加", notes = "优化师角色关系表-添加")
-    @PostMapping(value = "/add")
-    public Result<OptimizerRoleInfo> add(String belongerId, String userId, String orgCode) {
-        Result<OptimizerRoleInfo> result = new Result<OptimizerRoleInfo>();
-        try {
-            SysUser user = sysUserService.getById(userId);
-            OptimizerRoleInfo roleInfo = new OptimizerRoleInfo();
-            roleInfo.setType(2);
-            roleInfo.setBelongerId(belongerId);
-            roleInfo.setUserId(userId);
-            roleInfo.setRealname(user.getRealname());
-            roleInfo.setOrgCode(orgCode);
-            roleInfo.setEnabled(1);
-            optimizerRoleInfoService.save(roleInfo);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param optimizerRoleInfo
-     * @return
-     */
-    @AutoLog(value = "优化师角色关系表-编辑")
-    @ApiOperation(value = "优化师角色关系表-编辑", notes = "优化师角色关系表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<OptimizerRoleInfo> edit(@RequestBody OptimizerRoleInfo optimizerRoleInfo) {
-        Result<OptimizerRoleInfo> result = new Result<OptimizerRoleInfo>();
-        OptimizerRoleInfo optimizerRoleInfoEntity = optimizerRoleInfoService.getById(optimizerRoleInfo.getId());
-        if (optimizerRoleInfoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = optimizerRoleInfoService.updateById(optimizerRoleInfo);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "优化师角色关系表-通过id删除")
-    @ApiOperation(value = "优化师角色关系表-通过id删除", notes = "优化师角色关系表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            optimizerRoleInfoService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "优化师角色关系表-批量删除")
-    @ApiOperation(value = "优化师角色关系表-批量删除", notes = "优化师角色关系表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<OptimizerRoleInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<OptimizerRoleInfo> result = new Result<OptimizerRoleInfo>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.optimizerRoleInfoService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "优化师角色关系表-通过id查询")
-    @ApiOperation(value = "优化师角色关系表-通过id查询", notes = "优化师角色关系表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<OptimizerRoleInfo> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<OptimizerRoleInfo> result = new Result<OptimizerRoleInfo>();
-        OptimizerRoleInfo optimizerRoleInfo = optimizerRoleInfoService.getById(id);
-        if (optimizerRoleInfo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(optimizerRoleInfo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 获取优化师经理的统计数据
-     */
-    @GetMapping("manager/detail")
-    public Map<String, Object> managerDetail(@RequestParam(name = "orgCode", defaultValue = "A01") String orgCode, @RequestParam(name = "appType", defaultValue = "2") String appType) {
-        return optimizerRoleInfoService.getManagerDetail(appType, orgCode);
-    }
-}

+ 0 - 40
module-media/pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>jeecg-boot-parent</artifactId>
-        <groupId>org.jeecgframework.boot</groupId>
-        <version>2.0.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>cn.com.ctop</groupId>
-    <artifactId>module-media</artifactId>
-
-    <name>module-media</name>
-    <!-- FIXME change it to the project's website -->
-    <url>http://www.example.com</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-common</artifactId>
-            <version>2.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>

+ 0 - 66
performance-appraisal/pom.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>jeecg-boot-parent</artifactId>
-        <groupId>org.jeecgframework.boot</groupId>
-        <version>2.0.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>cn.com.ctop</groupId>
-    <artifactId>performance-appraisal</artifactId>
-
-    <name>performance-appraisal</name>
-    <url>http://www.example.com</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-common</artifactId>
-            <version>2.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-base-common</artifactId>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-kuaishou</artifactId>
-            <version>2.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <!-- 解决MyBatis配置文件引入问题 -->
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-                <!-- 是否替换资源中的属性-->
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
-</project>

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/controller/AccountVideoQuarterInfoController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.accountvideoquarterinfo.controller;
-
-import cn.com.ctop.accountvideoquarterinfo.entity.AccountVideoQuarterInfo;
-import cn.com.ctop.accountvideoquarterinfo.service.IAccountVideoQuarterInfoService;
-import cn.com.ctop.common.module.annotation.AutoLog;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绩效明细_账户下所有视频的季度消耗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-13
- */
-@Slf4j
-@Api(tags = "绩效明细_账户下所有视频的季度消耗数据")
-@RestController
-@RequestMapping("/accountvideoquarterinfo/accountVideoQuarterInfo")
-public class AccountVideoQuarterInfoController {
-    @Autowired
-    private IAccountVideoQuarterInfoService accountVideoQuarterInfoService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param accountVideoQuarterInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-分页列表查询")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-分页列表查询", notes = "绩效明细_账户下所有视频的季度消耗数据-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<AccountVideoQuarterInfo>> queryPageList(AccountVideoQuarterInfo accountVideoQuarterInfo,
-                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                HttpServletRequest req) {
-        Result<IPage<AccountVideoQuarterInfo>> result = new Result<IPage<AccountVideoQuarterInfo>>();
-        QueryWrapper<AccountVideoQuarterInfo> queryWrapper = QueryGenerator.initQueryWrapper(accountVideoQuarterInfo, req.getParameterMap());
-        Page<AccountVideoQuarterInfo> page = new Page<AccountVideoQuarterInfo>(pageNo, pageSize);
-        IPage<AccountVideoQuarterInfo> pageList = accountVideoQuarterInfoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param accountVideoQuarterInfo
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-添加")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-添加", notes = "绩效明细_账户下所有视频的季度消耗数据-添加")
-    @PostMapping(value = "/add")
-    public Result<AccountVideoQuarterInfo> add(@RequestBody AccountVideoQuarterInfo accountVideoQuarterInfo) {
-        Result<AccountVideoQuarterInfo> result = new Result<AccountVideoQuarterInfo>();
-        try {
-            accountVideoQuarterInfoService.save(accountVideoQuarterInfo);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param accountVideoQuarterInfo
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-编辑")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-编辑", notes = "绩效明细_账户下所有视频的季度消耗数据-编辑")
-    @PutMapping(value = "/edit")
-    public Result<AccountVideoQuarterInfo> edit(@RequestBody AccountVideoQuarterInfo accountVideoQuarterInfo) {
-        Result<AccountVideoQuarterInfo> result = new Result<AccountVideoQuarterInfo>();
-        AccountVideoQuarterInfo accountVideoQuarterInfoEntity = accountVideoQuarterInfoService.getById(accountVideoQuarterInfo.getId());
-        if (accountVideoQuarterInfoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = accountVideoQuarterInfoService.updateById(accountVideoQuarterInfo);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-通过id删除")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-通过id删除", notes = "绩效明细_账户下所有视频的季度消耗数据-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            accountVideoQuarterInfoService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-批量删除")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-批量删除", notes = "绩效明细_账户下所有视频的季度消耗数据-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<AccountVideoQuarterInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<AccountVideoQuarterInfo> result = new Result<AccountVideoQuarterInfo>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.accountVideoQuarterInfoService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-通过id查询")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-通过id查询", notes = "绩效明细_账户下所有视频的季度消耗数据-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<AccountVideoQuarterInfo> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<AccountVideoQuarterInfo> result = new Result<AccountVideoQuarterInfo>();
-        AccountVideoQuarterInfo accountVideoQuarterInfo = accountVideoQuarterInfoService.getById(id);
-        if (accountVideoQuarterInfo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(accountVideoQuarterInfo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<AccountVideoQuarterInfo> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                AccountVideoQuarterInfo accountVideoQuarterInfo = JSON.parseObject(deString, AccountVideoQuarterInfo.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(accountVideoQuarterInfo, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<AccountVideoQuarterInfo> pageList = accountVideoQuarterInfoService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "绩效明细_账户下所有视频的季度消耗数据列表");
-        mv.addObject(NormalExcelConstants.CLASS, AccountVideoQuarterInfo.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("绩效明细_账户下所有视频的季度消耗数据列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<AccountVideoQuarterInfo> listAccountVideoQuarterInfos = ExcelImportUtil.importExcel(file.getInputStream(), AccountVideoQuarterInfo.class, params);
-                accountVideoQuarterInfoService.saveBatch(listAccountVideoQuarterInfos);
-                return Result.ok("文件导入成功!数据行数:" + listAccountVideoQuarterInfos.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-}

+ 0 - 153
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/entity/AccountVideoQuarterInfo.java

@@ -1,153 +0,0 @@
-package cn.com.ctop.accountvideoquarterinfo.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * 绩效明细_账户下所有视频的季度消耗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-13
- */
-@Data
-@TableName("ctop_performance_account_video_quarter_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_performance_account_video_quarter_info对象", description = "绩效明细_账户下所有视频的季度消耗数据")
-public class AccountVideoQuarterInfo {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * accountId
-     */
-    @Excel(name = "accountId", width = 15)
-    @ApiModelProperty(value = "accountId")
-    private Long accountId;
-    /**
-     * projectId
-     */
-    @Excel(name = "projectId", width = 15)
-    @ApiModelProperty(value = "projectId")
-    private Long projectId;
-    /**
-     * projectName
-     */
-    @Excel(name = "projectName", width = 15)
-    @ApiModelProperty(value = "projectName")
-    private String projectName;
-    /**
-     * signature
-     */
-    @Excel(name = "signature", width = 15)
-    @ApiModelProperty(value = "signature")
-    private String signature;
-    /**
-     * designResponsibleName
-     */
-    @Excel(name = "designResponsibleName", width = 15)
-    @ApiModelProperty(value = "designResponsibleName")
-    private String designResponsibleName;
-    /**
-     * designResponsibleId
-     */
-    @Excel(name = "designResponsibleId", width = 15)
-    @ApiModelProperty(value = "designResponsibleId")
-    private String designResponsibleId;
-    /**
-     * planId
-     */
-    @Excel(name = "planId", width = 15)
-    @ApiModelProperty(value = "planId")
-    private String planId;
-    /**
-     * planName
-     */
-    @Excel(name = "planName", width = 15)
-    @ApiModelProperty(value = "planName")
-    private String planName;
-    /**
-     * clipId
-     */
-    @Excel(name = "clipId", width = 15)
-    @ApiModelProperty(value = "clipId")
-    private String clipId;
-    /**
-     * clipName
-     */
-    @Excel(name = "clipName", width = 15)
-    @ApiModelProperty(value = "clipName")
-    private String clipName;
-    /**
-     * shotId
-     */
-    @Excel(name = "shotId", width = 15)
-    @ApiModelProperty(value = "shotId")
-    private String shotId;
-    /**
-     * shotName
-     */
-    @Excel(name = "shotName", width = 15)
-    @ApiModelProperty(value = "shotName")
-    private String shotName;
-    /**
-     * planeId
-     */
-    @Excel(name = "planeId", width = 15)
-    @ApiModelProperty(value = "planeId")
-    private String planeId;
-    /**
-     * planeName
-     */
-    @Excel(name = "planeName", width = 15)
-    @ApiModelProperty(value = "planeName")
-    private String planeName;
-    /**
-     * videoCost
-     */
-    @Excel(name = "videoCost", width = 15)
-    @ApiModelProperty(value = "videoCost")
-    private java.math.BigDecimal videoCost;
-    /**
-     * appType
-     */
-    @Excel(name = "appType", width = 15)
-    @ApiModelProperty(value = "appType")
-    private Integer appType;
-    /**
-     * year
-     */
-    @Excel(name = "year", width = 15)
-    @ApiModelProperty(value = "year")
-    private Integer year;
-    /**
-     * quarter
-     */
-    @Excel(name = "quarter", width = 15)
-    @ApiModelProperty(value = "quarter")
-    private Integer quarter;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/mapper/AccountVideoQuarterInfoMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.accountvideoquarterinfo.mapper;
-
-import cn.com.ctop.accountvideoquarterinfo.entity.AccountVideoQuarterInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 绩效明细_账户下所有视频的季度消耗数据
- *
- * @author: jeecg-boot
- * @date: 2020-04-13
- * @cersion: V1.0
- */
-public interface AccountVideoQuarterInfoMapper extends BaseMapper<AccountVideoQuarterInfo> {
-
-}

+ 0 - 5
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/mapper/xml/AccountVideoQuarterInfoMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.accountvideoquarterinfo.mapper.AccountVideoQuarterInfoMapper">
-
-</mapper>

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/service/IAccountVideoQuarterInfoService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.accountvideoquarterinfo.service;
-
-import cn.com.ctop.accountvideoquarterinfo.entity.AccountVideoQuarterInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 绩效明细_账户下所有视频的季度消耗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-13
- */
-public interface IAccountVideoQuarterInfoService extends IService<AccountVideoQuarterInfo> {
-
-}

+ 0 - 20
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/service/impl/AccountVideoQuarterInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package cn.com.ctop.accountvideoquarterinfo.service.impl;
-
-import cn.com.ctop.accountvideoquarterinfo.entity.AccountVideoQuarterInfo;
-import cn.com.ctop.accountvideoquarterinfo.mapper.AccountVideoQuarterInfoMapper;
-import cn.com.ctop.accountvideoquarterinfo.service.IAccountVideoQuarterInfoService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 绩效明细_账户下所有视频的季度消耗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-13
- */
-@Service
-public class AccountVideoQuarterInfoServiceImpl extends ServiceImpl<AccountVideoQuarterInfoMapper, AccountVideoQuarterInfo> implements IAccountVideoQuarterInfoService {
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/controller/PerformanceAccountController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.performanceaccount.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import cn.com.ctop.performanceaccount.service.IPerformanceAccountService;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 运营明细表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-05
- */
-@Slf4j
-@Api(tags = "运营明细表")
-@RestController
-@RequestMapping("/performanceaccount/performanceAccount")
-public class PerformanceAccountController {
-    @Autowired
-    private IPerformanceAccountService performanceAccountService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param performanceAccount
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "运营明细表-分页列表查询")
-    @ApiOperation(value = "运营明细表-分页列表查询", notes = "运营明细表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<PerformanceAccount>> queryPageList(PerformanceAccount performanceAccount,
-                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                           HttpServletRequest req) {
-        Result<IPage<PerformanceAccount>> result = new Result<IPage<PerformanceAccount>>();
-        QueryWrapper<PerformanceAccount> queryWrapper = QueryGenerator.initQueryWrapper(performanceAccount, req.getParameterMap());
-        Page<PerformanceAccount> page = new Page<PerformanceAccount>(pageNo, pageSize);
-        IPage<PerformanceAccount> pageList = performanceAccountService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param performanceAccount
-     * @return
-     */
-    @AutoLog(value = "运营明细表-添加")
-    @ApiOperation(value = "运营明细表-添加", notes = "运营明细表-添加")
-    @PostMapping(value = "/add")
-    public Result<PerformanceAccount> add(@RequestBody PerformanceAccount performanceAccount) {
-        Result<PerformanceAccount> result = new Result<PerformanceAccount>();
-        try {
-            performanceAccountService.save(performanceAccount);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param performanceAccount
-     * @return
-     */
-    @AutoLog(value = "运营明细表-编辑")
-    @ApiOperation(value = "运营明细表-编辑", notes = "运营明细表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<PerformanceAccount> edit(@RequestBody PerformanceAccount performanceAccount) {
-        Result<PerformanceAccount> result = new Result<PerformanceAccount>();
-        PerformanceAccount performanceAccountEntity = performanceAccountService.getById(performanceAccount.getId());
-        if (performanceAccountEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = performanceAccountService.updateById(performanceAccount);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "运营明细表-通过id删除")
-    @ApiOperation(value = "运营明细表-通过id删除", notes = "运营明细表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            performanceAccountService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "运营明细表-批量删除")
-    @ApiOperation(value = "运营明细表-批量删除", notes = "运营明细表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<PerformanceAccount> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<PerformanceAccount> result = new Result<PerformanceAccount>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.performanceAccountService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "运营明细表-通过id查询")
-    @ApiOperation(value = "运营明细表-通过id查询", notes = "运营明细表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<PerformanceAccount> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<PerformanceAccount> result = new Result<PerformanceAccount>();
-        PerformanceAccount performanceAccount = performanceAccountService.getById(id);
-        if (performanceAccount == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(performanceAccount);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<PerformanceAccount> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                PerformanceAccount performanceAccount = JSON.parseObject(deString, PerformanceAccount.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(performanceAccount, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<PerformanceAccount> pageList = performanceAccountService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "运营明细表列表");
-        mv.addObject(NormalExcelConstants.CLASS, PerformanceAccount.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("运营明细表列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<PerformanceAccount> listPerformanceAccounts = ExcelImportUtil.importExcel(file.getInputStream(), PerformanceAccount.class, params);
-                performanceAccountService.saveBatch(listPerformanceAccounts);
-                return Result.ok("文件导入成功!数据行数:" + listPerformanceAccounts.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-}

+ 0 - 113
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/entity/PerformanceAccount.java

@@ -1,113 +0,0 @@
-package cn.com.ctop.performanceaccount.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 运营明细表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-05
- */
-@Data
-@TableName("ctop_performance_account")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_performance_account对象", description = "运营明细表")
-public class PerformanceAccount {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * 账户id
-     */
-    @Excel(name = "账户id", width = 15)
-    @ApiModelProperty(value = "账户id")
-    private Long accountId;
-    /**
-     * 账户期间消耗
-     */
-    @Excel(name = "账户期间消耗", width = 15)
-    @ApiModelProperty(value = "账户期间消耗")
-    private java.math.BigDecimal cost;
-    /**
-     * 年
-     */
-    @Excel(name = "年", width = 15)
-    @ApiModelProperty(value = "年")
-    private Integer year;
-    /**
-     * 1头条2快手
-     */
-    @Excel(name = "1头条2快手", width = 15)
-    @ApiModelProperty(value = "1头条2快手")
-    private Integer mediaType;
-    /**
-     * 季度
-     */
-    @Excel(name = "季度", width = 15)
-    @ApiModelProperty(value = "季度")
-    private Integer quarter;
-    /**
-     * 账户所属人
-     */
-    @Excel(name = "账户所属人", width = 15)
-    @ApiModelProperty(value = "账户所属人")
-    private String userId;
-    /**
-     * 账户消耗计算开始时间
-     */
-    @Excel(name = "账户消耗计算开始时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "账户消耗计算开始时间")
-    private String startDate;
-    /**
-     * 账户消耗计算结束时间
-     */
-    @Excel(name = "账户消耗计算结束时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "账户消耗计算结束时间")
-    private String endDate;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    @TableField(exist = false)
-    private String realname;
-
-    @TableField(exist = false)
-    private String authName;
-
-    @TableField(exist = false)
-    private String advertiserName;
-
-    @TableField(exist = false)
-    private String projectName;
-
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/mapper/PerformanceAccountMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceaccount.mapper;
-
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 运营明细表
- *
- * @author: jeecg-boot
- * @date: 2020-04-05
- * @cersion: V1.0
- */
-public interface PerformanceAccountMapper extends BaseMapper<PerformanceAccount> {
-
-}

+ 0 - 5
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/mapper/xml/PerformanceAccountMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.performanceaccount.mapper.PerformanceAccountMapper">
-
-</mapper>

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/service/IPerformanceAccountService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceaccount.service;
-
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 运营明细表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-05
- */
-public interface IPerformanceAccountService extends IService<PerformanceAccount> {
-
-}

+ 0 - 20
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/service/impl/PerformanceAccountServiceImpl.java

@@ -1,20 +0,0 @@
-package cn.com.ctop.performanceaccount.service.impl;
-
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import cn.com.ctop.performanceaccount.mapper.PerformanceAccountMapper;
-import cn.com.ctop.performanceaccount.service.IPerformanceAccountService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 运营明细表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-05
- */
-@Service
-public class PerformanceAccountServiceImpl extends ServiceImpl<PerformanceAccountMapper, PerformanceAccount> implements IPerformanceAccountService {
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/OptimizerConfigController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import cn.com.ctop.performanceappraisal.service.IOptimizerConfigService;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 优化师配置信息表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-13
- */
-@Slf4j
-@Api(tags = "优化师配置信息表")
-@RestController
-@RequestMapping("/ctop/optimizerConfig")
-public class OptimizerConfigController {
-    @Autowired
-    private IOptimizerConfigService optimizerConfigService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param optimizerConfig
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "优化师配置信息表-分页列表查询")
-    @ApiOperation(value = "优化师配置信息表-分页列表查询", notes = "优化师配置信息表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<OptimizerConfig>> queryPageList(OptimizerConfig optimizerConfig,
-                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                        HttpServletRequest req) {
-        Result<IPage<OptimizerConfig>> result = new Result<IPage<OptimizerConfig>>();
-        QueryWrapper<OptimizerConfig> queryWrapper = QueryGenerator.initQueryWrapper(optimizerConfig, req.getParameterMap());
-        Page<OptimizerConfig> page = new Page<OptimizerConfig>(pageNo, pageSize);
-        IPage<OptimizerConfig> pageList = optimizerConfigService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param optimizerConfig
-     * @return
-     */
-    @AutoLog(value = "优化师配置信息表-添加")
-    @ApiOperation(value = "优化师配置信息表-添加", notes = "优化师配置信息表-添加")
-    @PostMapping(value = "/add")
-    public Result<OptimizerConfig> add(@RequestBody OptimizerConfig optimizerConfig) {
-        Result<OptimizerConfig> result = new Result<OptimizerConfig>();
-        try {
-            optimizerConfigService.save(optimizerConfig);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param optimizerConfig
-     * @return
-     */
-    @AutoLog(value = "优化师配置信息表-编辑")
-    @ApiOperation(value = "优化师配置信息表-编辑", notes = "优化师配置信息表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<OptimizerConfig> edit(@RequestBody OptimizerConfig optimizerConfig) {
-        Result<OptimizerConfig> result = new Result<OptimizerConfig>();
-        OptimizerConfig optimizerConfigEntity = optimizerConfigService.getById(optimizerConfig.getId());
-        if (optimizerConfigEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = optimizerConfigService.updateById(optimizerConfig);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "优化师配置信息表-通过id删除")
-    @ApiOperation(value = "优化师配置信息表-通过id删除", notes = "优化师配置信息表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            optimizerConfigService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "优化师配置信息表-批量删除")
-    @ApiOperation(value = "优化师配置信息表-批量删除", notes = "优化师配置信息表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<OptimizerConfig> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<OptimizerConfig> result = new Result<OptimizerConfig>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.optimizerConfigService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "优化师配置信息表-通过id查询")
-    @ApiOperation(value = "优化师配置信息表-通过id查询", notes = "优化师配置信息表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<OptimizerConfig> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<OptimizerConfig> result = new Result<OptimizerConfig>();
-        OptimizerConfig optimizerConfig = optimizerConfigService.getById(id);
-        if (optimizerConfig == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(optimizerConfig);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<OptimizerConfig> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                OptimizerConfig optimizerConfig = JSON.parseObject(deString, OptimizerConfig.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(optimizerConfig, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<OptimizerConfig> pageList = optimizerConfigService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "优化师配置信息表列表");
-        mv.addObject(NormalExcelConstants.CLASS, OptimizerConfig.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("优化师配置信息表列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<OptimizerConfig> listOptimizerConfigs = ExcelImportUtil.importExcel(file.getInputStream(), OptimizerConfig.class, params);
-                optimizerConfigService.saveBatch(listOptimizerConfigs);
-                return Result.ok("文件导入成功!数据行数:" + listOptimizerConfigs.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceConfigController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceappraisal.entity.PerformanceConfig;
-import cn.com.ctop.performanceappraisal.service.IPerformanceConfigService;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绩效配置文件表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-01-08
- */
-@Slf4j
-@Api(tags = "绩效配置文件表")
-@RestController
-@RequestMapping("/ctop/performanceConfig")
-public class PerformanceConfigController {
-    @Autowired
-    private IPerformanceConfigService performanceConfigService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param performanceConfig
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "绩效配置文件表-分页列表查询")
-    @ApiOperation(value = "绩效配置文件表-分页列表查询", notes = "绩效配置文件表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<PerformanceConfig>> queryPageList(PerformanceConfig performanceConfig,
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
-        Result<IPage<PerformanceConfig>> result = new Result<IPage<PerformanceConfig>>();
-        QueryWrapper<PerformanceConfig> queryWrapper = QueryGenerator.initQueryWrapper(performanceConfig, req.getParameterMap());
-        Page<PerformanceConfig> page = new Page<PerformanceConfig>(pageNo, pageSize);
-        IPage<PerformanceConfig> pageList = performanceConfigService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param performanceConfig
-     * @return
-     */
-    @AutoLog(value = "绩效配置文件表-添加")
-    @ApiOperation(value = "绩效配置文件表-添加", notes = "绩效配置文件表-添加")
-    @PostMapping(value = "/add")
-    public Result<PerformanceConfig> add(@RequestBody PerformanceConfig performanceConfig) {
-        Result<PerformanceConfig> result = new Result<PerformanceConfig>();
-        try {
-            performanceConfigService.save(performanceConfig);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param performanceConfig
-     * @return
-     */
-    @AutoLog(value = "绩效配置文件表-编辑")
-    @ApiOperation(value = "绩效配置文件表-编辑", notes = "绩效配置文件表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<PerformanceConfig> edit(@RequestBody PerformanceConfig performanceConfig) {
-        Result<PerformanceConfig> result = new Result<PerformanceConfig>();
-        PerformanceConfig performanceConfigEntity = performanceConfigService.getById(performanceConfig.getId());
-        if (performanceConfigEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = performanceConfigService.updateById(performanceConfig);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "绩效配置文件表-通过id删除")
-    @ApiOperation(value = "绩效配置文件表-通过id删除", notes = "绩效配置文件表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            performanceConfigService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "绩效配置文件表-批量删除")
-    @ApiOperation(value = "绩效配置文件表-批量删除", notes = "绩效配置文件表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<PerformanceConfig> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<PerformanceConfig> result = new Result<PerformanceConfig>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.performanceConfigService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "绩效配置文件表-通过id查询")
-    @ApiOperation(value = "绩效配置文件表-通过id查询", notes = "绩效配置文件表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<PerformanceConfig> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<PerformanceConfig> result = new Result<PerformanceConfig>();
-        PerformanceConfig performanceConfig = performanceConfigService.getById(id);
-        if (performanceConfig == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(performanceConfig);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<PerformanceConfig> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                PerformanceConfig performanceConfig = JSON.parseObject(deString, PerformanceConfig.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(performanceConfig, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<PerformanceConfig> pageList = performanceConfigService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "绩效配置文件表列表");
-        mv.addObject(NormalExcelConstants.CLASS, PerformanceConfig.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("绩效配置文件表列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<PerformanceConfig> listPerformanceConfigs = ExcelImportUtil.importExcel(file.getInputStream(), PerformanceConfig.class, params);
-                performanceConfigService.saveBatch(listPerformanceConfigs);
-                return Result.ok("文件导入成功!数据行数:" + listPerformanceConfigs.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-}

+ 0 - 244
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceController.java

@@ -1,244 +0,0 @@
-package cn.com.ctop.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceappraisal.entity.Performance;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
-import cn.com.ctop.userefficientvideomap.mapper.UserEfficientVideoMapMapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设计师季度绩效表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-@Slf4j
-@Api(tags = "设计师季度绩效表")
-@RestController
-@RequestMapping("/ctop/performance")
-public class PerformanceController {
-    @Autowired
-    private IPerformanceService performanceService;
-    @Autowired
-    private UserEfficientVideoMapMapper userEfficientVideoMapMapper;
-
-    /**
-     * 分页列表查询
-     *
-     * @param performance
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-分页列表查询")
-    @ApiOperation(value = "设计师季度绩效表-分页列表查询", notes = "设计师季度绩效表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<Performance>> queryPageList(Performance performance,
-                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param performance
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-添加")
-    @ApiOperation(value = "设计师季度绩效表-添加", notes = "设计师季度绩效表-添加")
-    @PostMapping(value = "/add")
-    public Result<Performance> add(@RequestBody Performance performance) {
-        Result<Performance> result = new Result<Performance>();
-        try {
-            performanceService.save(performance);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param performance
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-编辑")
-    @ApiOperation(value = "设计师季度绩效表-编辑", notes = "设计师季度绩效表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<Performance> edit(@RequestBody Performance performance) {
-        Result<Performance> result = new Result<Performance>();
-        Performance performanceEntity = performanceService.getById(performance.getId());
-        if (performanceEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = performanceService.updateById(performance);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-通过id删除")
-    @ApiOperation(value = "设计师季度绩效表-通过id删除", notes = "设计师季度绩效表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            performanceService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-批量删除")
-    @ApiOperation(value = "设计师季度绩效表-批量删除", notes = "设计师季度绩效表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<Performance> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<Performance> result = new Result<Performance>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.performanceService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-通过id查询")
-    @ApiOperation(value = "设计师季度绩效表-通过id查询", notes = "设计师季度绩效表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<Performance> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<Performance> result = new Result<Performance>();
-        Performance performance = performanceService.getById(id);
-        if (performance == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(performance);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    @GetMapping("/project/list")
-    public Map<String, Object> projectList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, String appType) {
-        return performanceService.getUserOptimizerProjectList(pageNo, pageSize, appType);
-    }
-
-    @GetMapping("/account/list")
-    public Map<String, Object> accountList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                           Long projectId, String appType) {
-        return performanceService.getUserOptimizerAccountList(appType, projectId, pageNo, pageSize);
-    }
-
-
-    @AutoLog(value = "设计组内设计师季度绩效表-分页列表查询")
-    @ApiOperation(value = "设计组内设计师季度绩效表-分页列表查询", notes = "设计组内设计师季度绩效表-分页列表查询")
-    @GetMapping(value = "/designerDepartMemberPerformanceList")
-    public Result<IPage<Performance>> designerDepartMemberPerformanceList(Performance performance,
-                                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                          HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        //String departId = userEfficientVideoMapMapper.getDepartIdByUserId("e9ca23d68d884d4ebb19d07889727dae");
-        String departId = userEfficientVideoMapMapper.getDepartIdByUserId(sysUser.getId());
-        List<String> userIdList = userEfficientVideoMapMapper.getUserIdListByDepId(departId);
-        ////
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        queryWrapper.in("user_id", userIdList);
-
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    @AutoLog(value = "北京设计师季度绩效列表-分页列表查询")
-    @ApiOperation(value = "北京设计师季度绩效列表-分页列表查询", notes = "北京设计师季度绩效列表-分页列表查询")
-    @GetMapping(value = "/beijingDesignerPageList")
-    public Result<IPage<Performance>> beijingDesignerPageList(Performance performance,
-                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                              HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    @AutoLog(value = "北京设计师季度绩效列表-分页列表查询")
-    @ApiOperation(value = "北京设计师季度绩效列表-分页列表查询", notes = "北京设计师季度绩效列表-分页列表查询")
-    @GetMapping(value = "/beijingPlaneDesignerList")
-    public Result<IPage<Performance>> beijingPlaneDesignerPageList(Performance performance,
-                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                   HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        //sysUser.setId("b0e4798234df4096936e6bc6d00db3ba");
-        queryWrapper.eq("user_id", sysUser.getId());
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-}

+ 0 - 326
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceOptimizerController.java

@@ -1,326 +0,0 @@
-package cn.com.ctop.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceappraisal.entity.PerformanceOptimizer;
-import cn.com.ctop.performanceappraisal.service.IPerformanceOptimizerService;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 优化师绩效信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-13
- */
-@Slf4j
-@Api(tags = "优化师绩效信息")
-@RestController
-@RequestMapping("/ctop/performanceOptimizer")
-public class PerformanceOptimizerController {
-    @Autowired
-    private IPerformanceOptimizerService performanceOptimizerService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param performanceOptimizer
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-分页列表查询")
-    @ApiOperation(value = "优化师绩效信息-分页列表查询", notes = "优化师绩效信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<PerformanceOptimizer>> queryPageList(PerformanceOptimizer performanceOptimizer,
-                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                             HttpServletRequest req) {
-        Result<IPage<PerformanceOptimizer>> result = new Result<>();
-        QueryWrapper<PerformanceOptimizer> queryWrapper = QueryGenerator.initQueryWrapper(performanceOptimizer, req.getParameterMap());
-        Page<PerformanceOptimizer> page = new Page<PerformanceOptimizer>(pageNo, pageSize);
-        IPage<PerformanceOptimizer> pageList = performanceOptimizerService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param performanceOptimizer
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-添加")
-    @ApiOperation(value = "优化师绩效信息-添加", notes = "优化师绩效信息-添加")
-    @PostMapping(value = "/add")
-    public Result<PerformanceOptimizer> add(@RequestBody PerformanceOptimizer performanceOptimizer) {
-        Result<PerformanceOptimizer> result = new Result<PerformanceOptimizer>();
-        try {
-            performanceOptimizerService.save(performanceOptimizer);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param performanceOptimizer
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-编辑")
-    @ApiOperation(value = "优化师绩效信息-编辑", notes = "优化师绩效信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<PerformanceOptimizer> edit(@RequestBody PerformanceOptimizer performanceOptimizer) {
-        Result<PerformanceOptimizer> result = new Result<PerformanceOptimizer>();
-        PerformanceOptimizer performanceOptimizerEntity = performanceOptimizerService.getById(performanceOptimizer.getId());
-        if (performanceOptimizerEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = performanceOptimizerService.updateById(performanceOptimizer);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-通过id删除")
-    @ApiOperation(value = "优化师绩效信息-通过id删除", notes = "优化师绩效信息-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            performanceOptimizerService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-批量删除")
-    @ApiOperation(value = "优化师绩效信息-批量删除", notes = "优化师绩效信息-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<PerformanceOptimizer> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<PerformanceOptimizer> result = new Result<PerformanceOptimizer>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.performanceOptimizerService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-通过id查询")
-    @ApiOperation(value = "优化师绩效信息-通过id查询", notes = "优化师绩效信息-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<PerformanceOptimizer> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<PerformanceOptimizer> result = new Result<PerformanceOptimizer>();
-        PerformanceOptimizer performanceOptimizer = performanceOptimizerService.getById(id);
-        if (performanceOptimizer == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(performanceOptimizer);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<PerformanceOptimizer> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                PerformanceOptimizer performanceOptimizer = JSON.parseObject(deString, PerformanceOptimizer.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(performanceOptimizer, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<PerformanceOptimizer> pageList = performanceOptimizerService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "优化师绩效信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, PerformanceOptimizer.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("优化师绩效信息列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<PerformanceOptimizer> listPerformanceOptimizers = ExcelImportUtil.importExcel(file.getInputStream(), PerformanceOptimizer.class, params);
-                performanceOptimizerService.saveBatch(listPerformanceOptimizers);
-                return Result.ok("文件导入成功!数据行数:" + listPerformanceOptimizers.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-    /**
-     * 优化师绩效详情
-     *
-     * @param pageNo
-     * @param pageSize
-     * @param mediaType
-     * @return
-     */
-    @GetMapping(value = "/detail")
-    @ResponseBody
-    public Map<String, Object> getPerformanceDetail(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    @RequestParam(name = "mediaType", defaultValue = "2") String mediaType) {
-        return performanceOptimizerService.getPerformanceDetail(mediaType, pageNo, pageSize);
-    }
-
-    /**
-     * 优化师绩效排行榜
-     *
-     * @param mediaType
-     * @param pageNo
-     * @param pageSize
-     * @return
-     */
-    @GetMapping(value = "/ranking/list")
-    @ResponseBody
-    public Map<String, Object> getRankingList(@RequestParam(name = "mediaType", defaultValue = "2") String mediaType,
-                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                              @RequestParam(name = "pageSize", defaultValue = "3") Integer pageSize,
-                                              @RequestParam(name = "orgCode", defaultValue = "A01") String orgCode) {
-        return performanceOptimizerService.getRankingList(mediaType, pageNo, pageSize, orgCode);
-    }
-
-    /**
-     * 获取项目经理相关数据
-     *
-     * @param
-     * @param mediaType
-     * @return
-     */
-    @GetMapping(value = "/manager/detail")
-    @ResponseBody
-    public Map<String, Object> getManagerPerformanceDetail(@RequestParam(name = "orgCode", defaultValue = "A01") String orgCode,
-                                                           @RequestParam(name = "mediaType", defaultValue = "2") String mediaType) {
-        return performanceOptimizerService.getManagerPerformanceDetail(mediaType, orgCode);
-    }
-
-
-    /**
-     * 计算运营绩效
-     */
-    @GetMapping(value = "/yunyingPerformance")
-    @ResponseBody
-    public void yunyingPerformance(@RequestParam(name = "year") Integer year,
-                                   @RequestParam(name = "quarter") Integer quarter) {
-
-        Map<String, String> map = DateUtils.quarterStartEndDate(year, quarter);
-        //performanceOptimizerService.toutiaoYunyingQuarterPerformance(year, quarter, map.get("startDate"), map.get("endDate"));
-        //performanceOptimizerService.kuaishouYunyingQuarterPerformance(year, quarter, map.get("startDate"), map.get("endDate"));
-
-        performanceOptimizerService.toutiaoYunyingQuarterPerformance(year, quarter, "2020-01-01", "2020-03-31");
-        performanceOptimizerService.kuaishouYunyingQuarterPerformance(year, quarter, "2020-01-01", "2020-03-31");
-
-    }
-
-    /**
-     * 计算运营绩效
-     */
-    @GetMapping(value = "/kuaishouYunyingLeaderQuarterPerformance")
-    @ResponseBody
-    public void kuaishouYunyingLeaderQuarterPerformance(@RequestParam(name = "year") Integer year,
-                                                        @RequestParam(name = "quarter") Integer quarter) {
-
-        Map<String, String> map = DateUtils.quarterStartEndDate(year, quarter);
-        performanceOptimizerService.kuaishouYunyingLeaderQuarterPerformance(year, quarter);
-    }
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/RolePerformancRraiseController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceappraisal.entity.RolePerformancRraise;
-import cn.com.ctop.performanceappraisal.service.IRolePerformancRraiseService;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 角色提点比例
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-@Slf4j
-@Api(tags = "角色提点比例")
-@RestController
-@RequestMapping("/ctop/rolePerformancRraise")
-public class RolePerformancRraiseController {
-    @Autowired
-    private IRolePerformancRraiseService rolePerformancRraiseService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param rolePerformancRraise
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-分页列表查询")
-    @ApiOperation(value = "角色提点比例-分页列表查询", notes = "角色提点比例-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<RolePerformancRraise>> queryPageList(RolePerformancRraise rolePerformancRraise,
-                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                             HttpServletRequest req) {
-        Result<IPage<RolePerformancRraise>> result = new Result<IPage<RolePerformancRraise>>();
-        QueryWrapper<RolePerformancRraise> queryWrapper = QueryGenerator.initQueryWrapper(rolePerformancRraise, req.getParameterMap());
-        Page<RolePerformancRraise> page = new Page<RolePerformancRraise>(pageNo, pageSize);
-        IPage<RolePerformancRraise> pageList = rolePerformancRraiseService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param rolePerformancRraise
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-添加")
-    @ApiOperation(value = "角色提点比例-添加", notes = "角色提点比例-添加")
-    @PostMapping(value = "/add")
-    public Result<RolePerformancRraise> add(@RequestBody RolePerformancRraise rolePerformancRraise) {
-        Result<RolePerformancRraise> result = new Result<RolePerformancRraise>();
-        try {
-            rolePerformancRraiseService.save(rolePerformancRraise);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param rolePerformancRraise
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-编辑")
-    @ApiOperation(value = "角色提点比例-编辑", notes = "角色提点比例-编辑")
-    @PutMapping(value = "/edit")
-    public Result<RolePerformancRraise> edit(@RequestBody RolePerformancRraise rolePerformancRraise) {
-        Result<RolePerformancRraise> result = new Result<RolePerformancRraise>();
-        RolePerformancRraise rolePerformancRraiseEntity = rolePerformancRraiseService.getById(rolePerformancRraise.getId());
-        if (rolePerformancRraiseEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = rolePerformancRraiseService.updateById(rolePerformancRraise);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-通过id删除")
-    @ApiOperation(value = "角色提点比例-通过id删除", notes = "角色提点比例-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            rolePerformancRraiseService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-批量删除")
-    @ApiOperation(value = "角色提点比例-批量删除", notes = "角色提点比例-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<RolePerformancRraise> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<RolePerformancRraise> result = new Result<RolePerformancRraise>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.rolePerformancRraiseService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-通过id查询")
-    @ApiOperation(value = "角色提点比例-通过id查询", notes = "角色提点比例-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<RolePerformancRraise> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<RolePerformancRraise> result = new Result<RolePerformancRraise>();
-        RolePerformancRraise rolePerformancRraise = rolePerformancRraiseService.getById(id);
-        if (rolePerformancRraise == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(rolePerformancRraise);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<RolePerformancRraise> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                RolePerformancRraise rolePerformancRraise = JSON.parseObject(deString, RolePerformancRraise.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(rolePerformancRraise, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<RolePerformancRraise> pageList = rolePerformancRraiseService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "角色提点比例列表");
-        mv.addObject(NormalExcelConstants.CLASS, RolePerformancRraise.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("角色提点比例列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<RolePerformancRraise> listRolePerformancRraises = ExcelImportUtil.importExcel(file.getInputStream(), RolePerformancRraise.class, params);
-                rolePerformancRraiseService.saveBatch(listRolePerformancRraises);
-                return Result.ok("文件导入成功!数据行数:" + listRolePerformancRraises.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/RolePerformanceCommissionController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceappraisal.entity.RolePerformanceCommission;
-import cn.com.ctop.performanceappraisal.service.IRolePerformanceCommissionService;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 角色提成比例
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-@Slf4j
-@Api(tags = "角色提成比例")
-@RestController
-@RequestMapping("/ctop/rolePerformanceCommission")
-public class RolePerformanceCommissionController {
-    @Autowired
-    private IRolePerformanceCommissionService rolePerformanceCommissionService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param rolePerformanceCommission
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-分页列表查询")
-    @ApiOperation(value = "角色提成比例-分页列表查询", notes = "角色提成比例-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<RolePerformanceCommission>> queryPageList(RolePerformanceCommission rolePerformanceCommission,
-                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                  HttpServletRequest req) {
-        Result<IPage<RolePerformanceCommission>> result = new Result<IPage<RolePerformanceCommission>>();
-        QueryWrapper<RolePerformanceCommission> queryWrapper = QueryGenerator.initQueryWrapper(rolePerformanceCommission, req.getParameterMap());
-        Page<RolePerformanceCommission> page = new Page<RolePerformanceCommission>(pageNo, pageSize);
-        IPage<RolePerformanceCommission> pageList = rolePerformanceCommissionService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param rolePerformanceCommission
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-添加")
-    @ApiOperation(value = "角色提成比例-添加", notes = "角色提成比例-添加")
-    @PostMapping(value = "/add")
-    public Result<RolePerformanceCommission> add(@RequestBody RolePerformanceCommission rolePerformanceCommission) {
-        Result<RolePerformanceCommission> result = new Result<RolePerformanceCommission>();
-        try {
-            rolePerformanceCommissionService.save(rolePerformanceCommission);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param rolePerformanceCommission
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-编辑")
-    @ApiOperation(value = "角色提成比例-编辑", notes = "角色提成比例-编辑")
-    @PutMapping(value = "/edit")
-    public Result<RolePerformanceCommission> edit(@RequestBody RolePerformanceCommission rolePerformanceCommission) {
-        Result<RolePerformanceCommission> result = new Result<RolePerformanceCommission>();
-        RolePerformanceCommission rolePerformanceCommissionEntity = rolePerformanceCommissionService.getById(rolePerformanceCommission.getId());
-        if (rolePerformanceCommissionEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = rolePerformanceCommissionService.updateById(rolePerformanceCommission);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-通过id删除")
-    @ApiOperation(value = "角色提成比例-通过id删除", notes = "角色提成比例-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            rolePerformanceCommissionService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-批量删除")
-    @ApiOperation(value = "角色提成比例-批量删除", notes = "角色提成比例-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<RolePerformanceCommission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<RolePerformanceCommission> result = new Result<RolePerformanceCommission>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.rolePerformanceCommissionService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-通过id查询")
-    @ApiOperation(value = "角色提成比例-通过id查询", notes = "角色提成比例-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<RolePerformanceCommission> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<RolePerformanceCommission> result = new Result<RolePerformanceCommission>();
-        RolePerformanceCommission rolePerformanceCommission = rolePerformanceCommissionService.getById(id);
-        if (rolePerformanceCommission == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(rolePerformanceCommission);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<RolePerformanceCommission> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                RolePerformanceCommission rolePerformanceCommission = JSON.parseObject(deString, RolePerformanceCommission.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(rolePerformanceCommission, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<RolePerformanceCommission> pageList = rolePerformanceCommissionService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "角色提成比例列表");
-        mv.addObject(NormalExcelConstants.CLASS, RolePerformanceCommission.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("角色提成比例列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<RolePerformanceCommission> listRolePerformanceCommissions = ExcelImportUtil.importExcel(file.getInputStream(), RolePerformanceCommission.class, params);
-                rolePerformanceCommissionService.saveBatch(listRolePerformanceCommissions);
-                return Result.ok("文件导入成功!数据行数:" + listRolePerformanceCommissions.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-}

+ 0 - 81
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerRoleInfo.java

@@ -1,81 +0,0 @@
-package cn.com.ctop.performanceappraisal.entity;
-
-import cn.com.ctop.common.module.annotation.Dict;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * 优化师角色关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-17
- */
-@Data
-@TableName("ctop_optimizer_role_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_optimizer_role_info对象", description = "优化师角色关系表")
-public class OptimizerRoleInfo {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * 部门代码
-     */
-    @Excel(name = "部门代码", width = 15)
-    @ApiModelProperty(value = "部门代码")
-    private String orgCode;
-    /**
-     * 角色类型 1:运营经理 2:运营专员
-     */
-    @Excel(name = "角色类型 1:运营经理 2:运营专员", width = 15)
-    @ApiModelProperty(value = "角色类型 1:运营经理 2:运营专员")
-    @Dict(dicCode = "optimizer_type")
-    private Integer type;
-    /**
-     * 用户id
-     */
-    @Excel(name = "用户id", width = 15)
-    @ApiModelProperty(value = "用户id")
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
-    private String userId;
-    private String realname;
-    /**
-     * 归属人id
-     */
-    @Excel(name = "归属人id", width = 15)
-    @ApiModelProperty(value = "归属人id")
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
-    private String belongerId;
-    /**
-     * enabled
-     */
-    @Excel(name = "enabled", width = 15)
-    @ApiModelProperty(value = "enabled")
-    @Dict(dicCode = "valid_status")
-    private Integer enabled;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

+ 0 - 63
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/PerformanceConfig.java

@@ -1,63 +0,0 @@
-package cn.com.ctop.performanceappraisal.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * 绩效配置文件表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-01-08
- */
-@Data
-@TableName("ctop_performance_config")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_performance_config对象", description = "绩效配置文件表")
-public class PerformanceConfig {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * year
-     */
-    @Excel(name = "year", width = 15)
-    @ApiModelProperty(value = "year")
-    private Integer year;
-    /**
-     * quarter
-     */
-    @Excel(name = "quarter", width = 15)
-    @ApiModelProperty(value = "quarter")
-    private Integer quarter;
-    /**
-     * mediaTaskRaise
-     */
-    @Excel(name = "mediaTaskRaise", width = 15)
-    @ApiModelProperty(value = "mediaTaskRaise")
-    private Integer mediaTaskRaise;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

+ 0 - 102
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/PerformanceOptimizer.java

@@ -1,102 +0,0 @@
-package cn.com.ctop.performanceappraisal.entity;
-
-import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * 优化师绩效信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-13
- */
-@Data
-@TableName("ctop_performance_optimizer")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_performance_optimizer对象", description = "优化师绩效信息")
-public class PerformanceOptimizer {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 总消耗
-     */
-    @Excel(name = "总消耗", width = 15)
-    @ApiModelProperty(value = "总消耗")
-    private java.math.BigDecimal totalCost;
-    /**
-     * 总提成
-     */
-    @Excel(name = "总提成", width = 15)
-    @ApiModelProperty(value = "总提成")
-    private java.math.BigDecimal totalRoyalty;
-    /**
-     * 年
-     */
-    @Excel(name = "年", width = 15)
-    @ApiModelProperty(value = "年")
-    private String year;
-    /**
-     * 季度
-     */
-    @Excel(name = "季度", width = 15)
-    @ApiModelProperty(value = "季度")
-    private String quarter;
-    /**
-     * 用户id
-     */
-    @Excel(name = "用户id", width = 15)
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-    /**
-     * 用户名称
-     */
-    @Excel(name = "用户名称", width = 15)
-    @ApiModelProperty(value = "用户名称")
-    private String realname;
-    /**
-     * 媒体类型
-     */
-    @Excel(name = "媒体类型1_头条2_快手", width = 15)
-    @ApiModelProperty(value = "媒体类型1_头条2_快手")
-    private Integer appType;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public PerformanceOptimizer() {
-    }
-
-    public PerformanceOptimizer(OptimizerCostDetailVO vo) {
-        this.appType = vo.getAppType();
-        this.totalCost = vo.getTotalCost();
-        this.totalRoyalty = vo.getTotalRoyalty();
-        this.year = vo.getYear();
-        this.quarter = vo.getQuarter();
-        this.userId = vo.getUserId();
-        this.realname = vo.getRealName();
-        this.appType = vo.getAppType();
-    }
-}

+ 0 - 85
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java

@@ -1,85 +0,0 @@
-package cn.com.ctop.performanceappraisal.entity;
-
-import cn.com.ctop.common.module.annotation.Dict;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * 角色提点比例
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-@Data
-@TableName("ctop_role_performance_raise")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_role_performance_raise对象", description = "角色提点比例")
-public class RolePerformancRraise {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 角色id
-     */
-    @Excel(name = "角色id", width = 15)
-    @ApiModelProperty(value = "角色id")
-    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
-    private String roleId;
-    /**
-     * 提点梯度级别
-     */
-    @Excel(name = "提点梯度级别", width = 15)
-    @ApiModelProperty(value = "提点梯度级别")
-    private Integer level;
-    /**
-     * n 千分之n
-     */
-    @Excel(name = "n 千分之n", width = 15)
-    @ApiModelProperty(value = "n 千分之n")
-    private java.math.BigDecimal raiseRate;
-    /**
-     * n 百分之n
-     */
-    @Excel(name = "n 百分之n", width = 15)
-    @ApiModelProperty(value = "n 百分之n")
-    private java.math.BigDecimal videoEfficiencyRate;
-    /**
-     * 1:快手 2:头条
-     */
-    @Excel(name = "媒体类型1_头条2_快手", width = 15)
-    @ApiModelProperty(value = "媒体类型1_头条2_快手")
-    @Dict(dicCode = "media_type")
-    private Integer appType;
-    /**
-     * 是否可用
-     */
-    @Excel(name = "是否可用", width = 15)
-    @ApiModelProperty(value = "是否可用")
-    @Dict(dicCode = "valid_status")
-    private Integer enabled;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

+ 0 - 78
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java

@@ -1,78 +0,0 @@
-package cn.com.ctop.performanceappraisal.entity;
-
-import cn.com.ctop.common.module.annotation.Dict;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * 角色提成比例
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-@Data
-@TableName("ctop_role_performance_commission")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_role_performance_commission对象", description = "角色提成比例")
-public class RolePerformanceCommission {
-
-    /**
-     * 主键id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键id")
-    private Long id;
-    /**
-     * sys_role的主键id
-     */
-    @Excel(name = "sys_role的主键id", width = 15)
-    @ApiModelProperty(value = "sys_role的主键id")
-    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
-    private String roleId;
-    /**
-     * 角色提成比例
-     */
-    @Excel(name = "角色提成比例", width = 15)
-    @ApiModelProperty(value = "角色提成比例")
-    private java.math.BigDecimal roleCommissionRate;
-    /**
-     * 是否可用 1:可用 2:不可用
-     */
-    @Excel(name = "是否可用", width = 15)
-    @ApiModelProperty(value = "是否可用 1:可用 2:不可用")
-    @Dict(dicCode = "valid_status")
-    private Integer enabled;
-    /**
-     * 1:快手  2:头条
-     */
-    @Excel(name = "媒体类型1_头条2_快手", width = 15)
-    @ApiModelProperty(value = "媒体类型1_头条2_快手")
-    @Dict(dicCode = "media_type")
-    private Integer appType;
-
-    @Excel(name = "是否有平面", width = 15)
-    @ApiModelProperty(value = "是否有平面")
-    @Dict(dicCode = "has_plane")
-    private Integer hasPlane;
-    /**
-     * 开始时间
-     */
-    @ApiModelProperty(value = "开始时间")
-    private Date createTime;
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/OptimizerConfigMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.mapper;
-
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 优化师配置信息表
- *
- * @author: jeecg-boot
- * @date: 2019-12-13
- * @cersion: V1.0
- */
-public interface OptimizerConfigMapper extends BaseMapper<OptimizerConfig> {
-
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/OptimizerRoleInfoMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.mapper;
-
-import cn.com.ctop.performanceappraisal.entity.OptimizerRoleInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 优化师角色关系表
- *
- * @author: jeecg-boot
- * @date: 2019-12-17
- * @cersion: V1.0
- */
-public interface OptimizerRoleInfoMapper extends BaseMapper<OptimizerRoleInfo> {
-
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/PerformanceConfigMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.mapper;
-
-import cn.com.ctop.performanceappraisal.entity.PerformanceConfig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 绩效配置文件表
- *
- * @author: jeecg-boot
- * @date: 2020-01-08
- * @cersion: V1.0
- */
-public interface PerformanceConfigMapper extends BaseMapper<PerformanceConfig> {
-
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/PerformanceOptimizerMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.mapper;
-
-import cn.com.ctop.performanceappraisal.entity.PerformanceOptimizer;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 优化师绩效信息
- *
- * @author: jeecg-boot
- * @date: 2019-12-13
- * @cersion: V1.0
- */
-public interface PerformanceOptimizerMapper extends BaseMapper<PerformanceOptimizer> {
-
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/RolePerformancRraiseMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.mapper;
-
-import cn.com.ctop.performanceappraisal.entity.RolePerformancRraise;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 角色提点比例
- *
- * @author: jeecg-boot
- * @date: 2019-12-10
- * @cersion: V1.0
- */
-public interface RolePerformancRraiseMapper extends BaseMapper<RolePerformancRraise> {
-
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/RolePerformanceCommissionMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.mapper;
-
-import cn.com.ctop.performanceappraisal.entity.RolePerformanceCommission;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 角色提成比例
- *
- * @author: jeecg-boot
- * @date: 2019-12-10
- * @cersion: V1.0
- */
-public interface RolePerformanceCommissionMapper extends BaseMapper<RolePerformanceCommission> {
-
-}

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.performanceappraisal.mapper.OptimizerConfigMapper">
-
-</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.performanceappraisal.mapper.OptimizerRoleInfoMapper">
-
-</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.performanceappraisal.mapper.PerformanceConfigMapper">
-
-</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.performanceappraisal.mapper.PerformanceOptimizerMapper">
-
-</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.performanceappraisal.mapper.RolePerformancRraiseMapper">
-
-</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.performanceappraisal.mapper.RolePerformanceCommissionMapper">
-
-</mapper>

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IOptimizerConfigService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.service;
-
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 优化师配置信息表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-13
- */
-public interface IOptimizerConfigService extends IService<OptimizerConfig> {
-    OptimizerConfig getEnabledConfigByMediaType(String mediaType, String orgCode);
-}

+ 0 - 18
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IOptimizerRoleInfoService.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.performanceappraisal.service;
-
-import cn.com.ctop.performanceappraisal.entity.OptimizerRoleInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Map;
-
-/**
- * 优化师角色关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-17
- */
-public interface IOptimizerRoleInfoService extends IService<OptimizerRoleInfo> {
-
-    Map<String, Object> getManagerDetail(String appType, String orgCode);
-}

+ 0 - 16
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IPerformanceConfigService.java

@@ -1,16 +0,0 @@
-package cn.com.ctop.performanceappraisal.service;
-
-import cn.com.ctop.performanceappraisal.entity.PerformanceConfig;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 绩效配置文件表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-01-08
- */
-public interface IPerformanceConfigService extends IService<PerformanceConfig> {
-
-    PerformanceConfig getNowConfig();
-}

+ 0 - 28
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IPerformanceOptimizerService.java

@@ -1,28 +0,0 @@
-package cn.com.ctop.performanceappraisal.service;
-
-import cn.com.ctop.performanceappraisal.entity.PerformanceOptimizer;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Map;
-
-/**
- * 优化师绩效信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-13
- */
-public interface IPerformanceOptimizerService extends IService<PerformanceOptimizer> {
-
-    Map<String, Object> getPerformanceDetail(String mediaType, Integer pageNo, Integer pageSize);
-
-    Map<String, Object> getRankingList(String mediaType, Integer pageNo, Integer pageSize, String orgCode);
-
-    Map<String, Object> getManagerPerformanceDetail(String mediaType, String orgCode);
-
-    Map<String, Object> kuaishouYunyingQuarterPerformance(Integer year, Integer quarter, String startDate, String endDate);
-
-    void kuaishouYunyingLeaderQuarterPerformance(Integer year, Integer quarter);
-
-    void toutiaoYunyingQuarterPerformance(Integer year, Integer quarter, String startDate, String endDate);
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IRolePerformancRraiseService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.service;
-
-import cn.com.ctop.performanceappraisal.entity.RolePerformancRraise;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 角色提点比例
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-public interface IRolePerformancRraiseService extends IService<RolePerformancRraise> {
-
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IRolePerformanceCommissionService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.service;
-
-import cn.com.ctop.performanceappraisal.entity.RolePerformanceCommission;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 角色提成比例
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-public interface IRolePerformanceCommissionService extends IService<RolePerformanceCommission> {
-
-}

+ 0 - 30
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/OptimizerConfigServiceImpl.java

@@ -1,30 +0,0 @@
-package cn.com.ctop.performanceappraisal.service.impl;
-
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import cn.com.ctop.performanceappraisal.mapper.OptimizerConfigMapper;
-import cn.com.ctop.performanceappraisal.service.IOptimizerConfigService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 优化师配置信息表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-13
- */
-@Service
-public class OptimizerConfigServiceImpl extends ServiceImpl<OptimizerConfigMapper, OptimizerConfig> implements IOptimizerConfigService {
-
-    @Override
-    public OptimizerConfig getEnabledConfigByMediaType(String mediaType, String orgCode) {
-        QueryWrapper<OptimizerConfig> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("enabled", "1")
-                .eq("app_type", mediaType)
-                .eq("org_code", orgCode)
-                .orderByDesc("id")
-                .last(" limit 1");
-        return this.getOne(queryWrapper);
-    }
-}

+ 0 - 50
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/OptimizerRoleInfoServiceImpl.java

@@ -1,50 +0,0 @@
-package cn.com.ctop.performanceappraisal.service.impl;
-
-import cn.com.ctop.common.module.utils.ResultMapUtils;
-import cn.com.ctop.common.module.utils.StatusCode;
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import cn.com.ctop.performanceappraisal.entity.OptimizerRoleInfo;
-import cn.com.ctop.performanceappraisal.mapper.OptimizerRoleInfoMapper;
-import cn.com.ctop.performanceappraisal.service.IOptimizerConfigService;
-import cn.com.ctop.performanceappraisal.service.IOptimizerRoleInfoService;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
-import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 优化师角色关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-17
- */
-@Service
-public class OptimizerRoleInfoServiceImpl extends ServiceImpl<OptimizerRoleInfoMapper, OptimizerRoleInfo> implements IOptimizerRoleInfoService {
-    @Autowired
-    private IPerformanceService performanceService;
-    @Autowired
-    private IOptimizerConfigService optimizerConfigService;
-
-    @Override
-    public Map<String, Object> getManagerDetail(String appType, String orgCode) {
-        Map<String, Object> result = new HashMap<>();
-        try {
-            //1:查询媒体任务
-            OptimizerCostDetailVO totalCostVo = performanceService.getOptimizerTotalCost(appType);
-            OptimizerConfig config = optimizerConfigService.getEnabledConfigByMediaType(appType, orgCode);
-            //查询经理所属人员任务完成信息列表
-            result = performanceService.getMemberPerformanceByUserId(config, totalCostVo);
-            ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-            return result;
-        } catch (Exception e) {
-            e.printStackTrace();
-            ResultMapUtils.setResultMap(result, StatusCode.COMMON_SERVER_ERROR.getCode());
-            return result;
-        }
-    }
-}

+ 0 - 34
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceConfigServiceImpl.java

@@ -1,34 +0,0 @@
-package cn.com.ctop.performanceappraisal.service.impl;
-
-import cn.com.ctop.performanceappraisal.entity.PerformanceConfig;
-import cn.com.ctop.performanceappraisal.mapper.PerformanceConfigMapper;
-import cn.com.ctop.performanceappraisal.service.IPerformanceConfigService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.common.util.DateUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-/**
- * 绩效配置文件表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-01-08
- */
-@Service
-public class PerformanceConfigServiceImpl extends ServiceImpl<PerformanceConfigMapper, PerformanceConfig> implements IPerformanceConfigService {
-
-    @Override
-    public PerformanceConfig getNowConfig() {
-        Integer year = DateUtils.getYear(new Date());
-        Integer quarter = DateUtils.getQuarter(new Date());
-        QueryWrapper<PerformanceConfig> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("year", year)
-                .eq("quarter", quarter)
-                .orderByDesc("id")
-                .last("limit 1");
-        return this.getOne(queryWrapper);
-    }
-}

+ 0 - 817
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceOptimizerServiceImpl.java

@@ -1,817 +0,0 @@
-package cn.com.ctop.performanceappraisal.service.impl;
-
-import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.common.module.utils.ResultMapUtils;
-import cn.com.ctop.common.module.utils.StatusCode;
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import cn.com.ctop.performanceaccount.mapper.PerformanceAccountMapper;
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import cn.com.ctop.performanceappraisal.entity.PerformanceConfig;
-import cn.com.ctop.performanceappraisal.entity.PerformanceOptimizer;
-import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
-import cn.com.ctop.performanceappraisal.mapper.PerformanceOptimizerMapper;
-import cn.com.ctop.performanceappraisal.service.IOptimizerConfigService;
-import cn.com.ctop.performanceappraisal.service.IPerformanceConfigService;
-import cn.com.ctop.performanceappraisal.service.IPerformanceOptimizerService;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
-import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
-import cn.com.ctop.performanceappraisal.vo.UserPerformanceDetailVO;
-import cn.com.ctop.userefficientvideomap.entity.TransferorAccountDTO;
-import cn.com.ctop.userefficientvideomap.entity.UserDto2;
-import cn.com.ctop.userefficientvideomap.mapper.UserEfficientVideoMapMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.vo.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 优化师绩效信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-13
- */
-@Service
-@Slf4j
-public class PerformanceOptimizerServiceImpl extends ServiceImpl<PerformanceOptimizerMapper, PerformanceOptimizer> implements IPerformanceOptimizerService {
-    @Autowired
-    IPerformanceService performanceService;
-    @Autowired
-    private IOptimizerConfigService optimizerConfigService;
-    @Autowired
-    private UserEfficientVideoMapMapper userEfficientVideoMapMapper;
-    @Autowired
-    private PerformanceMapper performanceMapper;
-    @Autowired
-    private PerformanceOptimizerMapper performanceOptimizerMapper;
-    @Autowired
-    private PerformanceAccountMapper performanceAccountMapper;
-
-
-    public void YunyingPerformance(Integer year, Integer quarter, String startDate, String endDate) {
-        //Map<String,String> map = DateUtils.quarterStartEndDate(year, quarter);
-
-
-    }
-
-
-    //快手运营季度绩效计算
-    public Map<String, Object> kuaishouYunyingQuarterPerformance(Integer year, Integer quarter, String startDate, String endDate) {
-        Map<String, Object> result = new HashMap<>();
-        //获取快手所有运营的数据
-        //List<UserDto2> userList = userEfficientVideoMapMapper.getAllKuaishouYunyingDepartUserInfo();
-        Integer mediaType = 2;
-        //华北
-        //查询当前媒体配置信息
-        OptimizerConfig config = optimizerConfigService.getEnabledConfigByMediaType(mediaType + "", CtopAdConstant.CTOP_ORGCODE_NORTH_CHINA_PREFIX);
-        if (null == config) {
-            ResultMapUtils.setResultMap(result, StatusCode.KUAISHOU_OPTINIZER_CONFIG_IS_NULL.getCode());
-            return result;
-        }
-
-        ///////////////方法2
-        //1。获取所有快手账户
-        //2。循环每个账户,然后查找每个账户下在本季度是否有转户的情况存在;
-
-        //创建map,Map<String人,Map<String账户,时间段List<Map<String开始时间,String结束时间>>>>
-        Map<String, Map<String, List<Map<String, String>>>> userAccountMap = new HashMap<>();
-
-        //获取所有快手的账户
-        List<String> accountList = userEfficientVideoMapMapper.getAccountListByMediaId(mediaType);
-        //循环所有账户
-        for (String account : accountList) {
-            String userId = userEfficientVideoMapMapper.getAccountUserId(account);
-            //判断本季度内是否有转户情况存在
-            List<TransferorAccountDTO> transferorAccountDTOList = userEfficientVideoMapMapper.accountTransforerListByUserId(account, startDate, endDate);
-
-            //如果此账户没有转户情况发生,则存入userAccountMap当中
-            if (transferorAccountDTOList.size() == 0) {
-                if (userAccountMap.get(userId) == null) {
-                    Map<String, List<Map<String, String>>> accountMap = new HashMap<>();
-                    List<Map<String, String>> dateList = new ArrayList<>();
-                    Map<String, String> dateMap = new HashMap<>();
-
-                    dateMap.put("startDate", startDate);
-                    dateMap.put("endDate", endDate);
-                    dateList.add(dateMap);
-                    accountMap.put(account, dateList);
-                    userAccountMap.put(userId, accountMap);
-                } else {
-                    Map<String, List<Map<String, String>>> accountMap = userAccountMap.get(userId);
-                    //如果此账户本季度没有转户行为,直接创建账户即可,不用再做判断
-                    Map<String, String> dateMap = new HashMap<>();
-                    dateMap.put("startDate", startDate);
-                    dateMap.put("endDate", endDate);
-                    if (accountMap.get(account) == null) {
-                        List<Map<String, String>> dateList = new ArrayList<>();
-                        dateList.add(dateMap);
-                        accountMap.put(account, dateList);
-                    } else {
-                        List<Map<String, String>> dateList = accountMap.get(account);
-                        dateList.add(dateMap);
-                    }
-                }
-            } else {//如果此账户有转户情况
-                //循环所有转户信息
-                for (int j = 0; j < transferorAccountDTOList.size(); j++) {
-                    if (j == 0) {
-                        Map<String, String> dateMap = new HashMap<>();
-                        dateMap.put("startDate", startDate);
-                        dateMap.put("endDate", transferorAccountDTOList.get(j).getTransferorDate());
-                        String transferorUserId = transferorAccountDTOList.get(j).getTransferor();
-                        //判断:如果userAccountMap中没有assigneeUserId,则直接创建;
-                        if (userAccountMap.get(transferorUserId) == null) {
-                            Map<String, List<Map<String, String>>> accountMap = new HashMap<>();
-                            List<Map<String, String>> dateList = new ArrayList<>();
-                            dateList.add(dateMap);
-                            accountMap.put(account, dateList);
-                            userAccountMap.put(transferorUserId, accountMap);
-                        } else {//如果已经有了这个userId,则需要判断是否有此账户
-                            if (userAccountMap.get(transferorUserId).get(account) == null) {
-                                Map<String, List<Map<String, String>>> accountMap = userAccountMap.get(transferorUserId);
-                                List<Map<String, String>> dateList = new ArrayList<>();
-                                dateList.add(dateMap);
-                                accountMap.put(account, dateList);
-                            } else {
-                                List<Map<String, String>> dateList = userAccountMap.get(transferorUserId).get(account);
-                                dateList.add(dateMap);
-                            }
-                        }
-
-                        if (j == transferorAccountDTOList.size() - 1) {
-                            Map<String, String> dateMap2 = new HashMap<>();
-                            dateMap2.put("startDate", transferorAccountDTOList.get(j).getAssigneeDate());
-                            dateMap2.put("endDate", endDate);
-                            String assigneeUserId = transferorAccountDTOList.get(j).getAssignee();
-                            //判断:如果userAccountMap中没有assigneeUserId,则直接创建;
-                            if (userAccountMap.get(assigneeUserId) == null) {
-                                Map<String, List<Map<String, String>>> accountMap = new HashMap<>();
-                                List<Map<String, String>> dateList = new ArrayList<>();
-                                dateList.add(dateMap2);
-                                accountMap.put(account, dateList);
-                                userAccountMap.put(assigneeUserId, accountMap);
-                            } else {//如果已经有了这个userId,则需要判断是否有此账户
-                                if (userAccountMap.get(assigneeUserId).get(account) == null) {
-                                    Map<String, List<Map<String, String>>> accountMap = userAccountMap.get(assigneeUserId);
-                                    List<Map<String, String>> dateList = new ArrayList<>();
-                                    dateList.add(dateMap2);
-                                    accountMap.put(account, dateList);
-                                } else {
-                                    List<Map<String, String>> dateList = userAccountMap.get(assigneeUserId).get(account);
-                                    dateList.add(dateMap2);
-                                }
-                            }
-                        }
-                    } else {
-                        Map<String, String> dateMap = new HashMap<>();
-                        dateMap.put("startDate", transferorAccountDTOList.get(j).getAssigneeDate());
-                        if (j == (transferorAccountDTOList.size() - 1)) {
-                            dateMap.put("endDate", endDate);
-                        } else {
-                            dateMap.put("endDate", transferorAccountDTOList.get(j + 1).getTransferorDate());
-                        }
-
-                        String assigneeUserId = transferorAccountDTOList.get(j).getAssignee();
-                        //判断:如果userAccountMap中没有assigneeUserId,则直接创建;
-                        if (userAccountMap.get(assigneeUserId) == null) {
-                            Map<String, List<Map<String, String>>> accountMap = new HashMap<>();
-                            List<Map<String, String>> dateList = new ArrayList<>();
-                            dateList.add(dateMap);
-                            accountMap.put(account, dateList);
-                            userAccountMap.put(assigneeUserId, accountMap);
-                        } else {//如果已经有了这个userId,则需要判断是否有此账户
-
-                            if (userAccountMap.get(assigneeUserId).get(account) == null) {
-                                Map<String, List<Map<String, String>>> accountMap = userAccountMap.get(assigneeUserId);
-                                List<Map<String, String>> dateList = new ArrayList<>();
-                                dateList.add(dateMap);
-                                accountMap.put(account, dateList);
-                            } else {
-                                List<Map<String, String>> dateList = userAccountMap.get(assigneeUserId).get(account);
-                                dateList.add(dateMap);
-                            }
-
-                        }
-
-                    }
-
-                } //转户列表循环结束
-            } //else判断
-
-        }//账户循环结束
-
-        for (Map.Entry<String, Map<String, List<Map<String, String>>>> entry : userAccountMap.entrySet()) {
-            String userAccountKey = entry.getKey();
-            Map<String, List<Map<String, String>>> userAccountValue = entry.getValue();
-            BigDecimal totalCharge = BigDecimal.ZERO;
-            BigDecimal totalPerformance = BigDecimal.ZERO;
-
-            for (Map.Entry<String, List<Map<String, String>>> entryAccount : userAccountValue.entrySet()) {
-                String acountKey = entryAccount.getKey();
-                List<Map<String, String>> accountValue = entryAccount.getValue();
-
-                for (Map<String, String> dateMap : accountValue) {
-                    //当前消耗
-                    BigDecimal charge = userEfficientVideoMapMapper.getAccountSumCharge(acountKey, dateMap.get("startDate"), dateMap.get("endDate")) == null ? BigDecimal.ZERO : userEfficientVideoMapMapper.getAccountSumCharge(acountKey, dateMap.get("startDate"), dateMap.get("endDate"));
-                    //此人总消耗
-                    totalCharge = totalCharge.add(charge);
-
-                    PerformanceAccount performanceAccount = new PerformanceAccount();
-                    performanceAccount.setAccountId(Long.parseLong(acountKey));
-                    performanceAccount.setCost(charge);
-                    performanceAccount.setYear(year);
-                    performanceAccount.setQuarter(quarter);
-                    performanceAccount.setMediaType(mediaType);
-                    performanceAccount.setUserId(userAccountKey);
-                    performanceAccount.setStartDate(dateMap.get("startDate"));
-                    performanceAccount.setEndDate(dateMap.get("endDate"));
-                    performanceAccountMapper.insert(performanceAccount);
-                }
-            }
-
-            //运营绩效数据入库
-            PerformanceOptimizer performance = new PerformanceOptimizer();
-            performance.setAppType(mediaType);
-            performance.setQuarter(quarter + "");
-            performance.setYear(year + "");
-            performance.setRealname(userEfficientVideoMapMapper.getrealnameByUserId(userAccountKey));
-            performance.setUserId(userAccountKey);
-            performance.setTotalCost(totalCharge);
-
-            //个人季度任务
-            BigDecimal personalTask = config.getPersonalTask();
-            //判断个人任务是否完成 ,如果完成则给到千分之5,如果未完成,则给到千分之3的绩效
-            String roleCode = userEfficientVideoMapMapper.getRoleCodeByUserId(userAccountKey);
-            if (!"operationAssistant".equals(roleCode)) {
-                if (totalCharge.compareTo(personalTask) > 0) {
-                    totalPerformance = totalCharge.multiply(config.getMediaTaskFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
-                } else {
-                    totalPerformance = totalCharge.multiply(config.getMediaTaskNoFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
-                }
-            }
-            performance.setTotalRoyalty(totalPerformance);
-            performanceOptimizerMapper.insert(performance);
-        }
-        return result;
-    }
-
-    //头条运营季度绩效计算
-    public void toutiaoYunyingQuarterPerformance(Integer year, Integer quarter, String startDate, String endDate) {
-        //方法
-        //1。获取所有头条账户
-        //2。循环每个账户,然后查找每个账户下在本季度是否有转户的情况存在;
-        Integer mediaType = 1;
-        //创建map,Map<String人,Map<String账户,时间段List<Map<String开始时间,String结束时间>>>>
-        Map<String, Map<String, List<Map<String, String>>>> userAccountMap = new HashMap<>();
-        OptimizerConfig config = optimizerConfigService.getEnabledConfigByMediaType(mediaType + "", CtopAdConstant.CTOP_ORGCODE_NORTH_CHINA_PREFIX);
-        //获取所有头条的账户
-        List<String> accountList = userEfficientVideoMapMapper.getAccountListByMediaId(mediaType);
-
-        //循环所有账户
-        for (String account : accountList) {
-            String userId = userEfficientVideoMapMapper.getAccountUserId(account);
-            //判断本季度内是否有转户情况存在
-            List<TransferorAccountDTO> transferorAccountDTOList = userEfficientVideoMapMapper.accountTransforerListByUserId(account, startDate, endDate);
-
-            //如果此账户没有转户情况发生,则存入userAccountMap当中
-            if (transferorAccountDTOList.size() == 0) {
-                if (userAccountMap.get(userId) == null) {
-                    Map<String, List<Map<String, String>>> accountMap = new HashMap<>();
-                    List<Map<String, String>> dateList = new ArrayList<>();
-                    Map<String, String> dateMap = new HashMap<>();
-
-                    dateMap.put("startDate", startDate);
-                    dateMap.put("endDate", endDate);
-                    dateList.add(dateMap);
-                    accountMap.put(account, dateList);
-                    userAccountMap.put(userId, accountMap);
-                } else {
-                    Map<String, List<Map<String, String>>> accountMap = userAccountMap.get(userId);
-                    //如果此账户本季度没有转户行为,直接创建账户即可,不用再做判断
-                    Map<String, String> dateMap = new HashMap<>();
-                    dateMap.put("startDate", startDate);
-                    dateMap.put("endDate", endDate);
-                    if (accountMap.get(account) == null) {
-                        List<Map<String, String>> dateList = new ArrayList<>();
-                        dateList.add(dateMap);
-                        accountMap.put(account, dateList);
-                    } else {
-                        List<Map<String, String>> dateList = accountMap.get(account);
-                        dateList.add(dateMap);
-                    }
-                }
-            } else {//如果此账户有转户情况
-                //循环所有转户信息
-                for (int j = 0; j < transferorAccountDTOList.size(); j++) {
-                    if (j == 0) {
-                        Map<String, String> dateMap = new HashMap<>();
-                        dateMap.put("startDate", startDate);
-                        dateMap.put("endDate", transferorAccountDTOList.get(j).getTransferorDate());
-                        String transferorUserId = transferorAccountDTOList.get(j).getTransferor();
-                        //判断:如果userAccountMap中没有assigneeUserId,则直接创建;
-                        if (userAccountMap.get(transferorUserId) == null) {
-                            Map<String, List<Map<String, String>>> accountMap = new HashMap<>();
-                            List<Map<String, String>> dateList = new ArrayList<>();
-                            dateList.add(dateMap);
-                            accountMap.put(account, dateList);
-                            userAccountMap.put(transferorUserId, accountMap);
-                        } else {//如果已经有了这个userId,则需要判断是否有此账户
-                            if (userAccountMap.get(transferorUserId).get(account) == null) {
-                                Map<String, List<Map<String, String>>> accountMap = userAccountMap.get(transferorUserId);
-                                List<Map<String, String>> dateList = new ArrayList<>();
-                                dateList.add(dateMap);
-                                accountMap.put(account, dateList);
-                            } else {
-                                List<Map<String, String>> dateList = userAccountMap.get(transferorUserId).get(account);
-                                dateList.add(dateMap);
-                            }
-                        }
-
-                        if (j == transferorAccountDTOList.size() - 1) {
-                            Map<String, String> dateMap2 = new HashMap<>();
-                            dateMap2.put("startDate", transferorAccountDTOList.get(j).getAssigneeDate());
-                            dateMap2.put("endDate", endDate);
-                            String assigneeUserId = transferorAccountDTOList.get(j).getAssignee();
-                            //判断:如果userAccountMap中没有assigneeUserId,则直接创建;
-                            if (userAccountMap.get(assigneeUserId) == null) {
-                                Map<String, List<Map<String, String>>> accountMap = new HashMap<>();
-                                List<Map<String, String>> dateList = new ArrayList<>();
-                                dateList.add(dateMap2);
-                                accountMap.put(account, dateList);
-                                userAccountMap.put(assigneeUserId, accountMap);
-                            } else {//如果已经有了这个userId,则需要判断是否有此账户
-                                if (userAccountMap.get(assigneeUserId).get(account) == null) {
-                                    Map<String, List<Map<String, String>>> accountMap = userAccountMap.get(transferorUserId);
-                                    List<Map<String, String>> dateList = new ArrayList<>();
-                                    dateList.add(dateMap2);
-                                    accountMap.put(account, dateList);
-                                } else {
-                                    List<Map<String, String>> dateList = userAccountMap.get(assigneeUserId).get(account);
-                                    dateList.add(dateMap2);
-                                }
-                            }
-                        }
-                    } else {
-                        Map<String, String> dateMap = new HashMap<>();
-                        dateMap.put("startDate", transferorAccountDTOList.get(j).getAssigneeDate());
-                        if (j == (transferorAccountDTOList.size() - 1)) {
-                            dateMap.put("endDate", endDate);
-                        } else {
-                            dateMap.put("endDate", transferorAccountDTOList.get(j + 1).getTransferorDate());
-                        }
-
-                        String assigneeUserId = transferorAccountDTOList.get(j).getAssignee();
-                        //判断:如果userAccountMap中没有assigneeUserId,则直接创建;
-                        if (userAccountMap.get(assigneeUserId) == null) {
-                            Map<String, List<Map<String, String>>> accountMap = new HashMap<>();
-                            List<Map<String, String>> dateList = new ArrayList<>();
-                            dateList.add(dateMap);
-                            accountMap.put(account, dateList);
-                            userAccountMap.put(assigneeUserId, accountMap);
-                        } else {//如果已经有了这个userId,则需要判断是否有此账户
-
-                            if (userAccountMap.get(assigneeUserId).get(account) == null) {
-                                Map<String, List<Map<String, String>>> accountMap = userAccountMap.get(assigneeUserId);
-                                List<Map<String, String>> dateList = new ArrayList<>();
-                                dateList.add(dateMap);
-                                accountMap.put(account, dateList);
-                            } else {
-                                List<Map<String, String>> dateList = userAccountMap.get(assigneeUserId).get(account);
-                                dateList.add(dateMap);
-                            }
-
-                        }
-
-                    }
-
-                } //转户列表循环结束
-            } //else判断
-
-        }//账户循环结束
-
-
-        for (Map.Entry<String, Map<String, List<Map<String, String>>>> entry : userAccountMap.entrySet()) {
-            String userAccountKey = entry.getKey();
-            Map<String, List<Map<String, String>>> userAccountValue = entry.getValue();
-            BigDecimal totalCharge = BigDecimal.ZERO;
-            BigDecimal totalPerformance = BigDecimal.ZERO;
-
-            for (Map.Entry<String, List<Map<String, String>>> entryAccount : userAccountValue.entrySet()) {
-                String acountKey = entryAccount.getKey();
-                List<Map<String, String>> accountValue = entryAccount.getValue();
-
-                for (Map<String, String> dateMap : accountValue) {
-                    //当前消耗
-                    BigDecimal charge = userEfficientVideoMapMapper.getToutiaoAccountSumCharge(acountKey, dateMap.get("startDate"), dateMap.get("endDate")) == null ? BigDecimal.ZERO : userEfficientVideoMapMapper.getToutiaoAccountSumCharge(acountKey, dateMap.get("startDate"), dateMap.get("endDate"));
-                    //此人总消耗
-                    totalCharge = totalCharge.add(charge);
-
-                    PerformanceAccount performanceAccount = new PerformanceAccount();
-                    performanceAccount.setAccountId(Long.parseLong(acountKey));
-                    performanceAccount.setCost(charge);
-                    performanceAccount.setYear(year);
-                    performanceAccount.setQuarter(quarter);
-                    performanceAccount.setMediaType(mediaType);
-                    performanceAccount.setUserId(userAccountKey);
-                    performanceAccount.setStartDate(dateMap.get("startDate"));
-                    performanceAccount.setEndDate(dateMap.get("endDate"));
-                    performanceAccountMapper.insert(performanceAccount);
-                }
-            }
-
-            //运营绩效数据入库
-            PerformanceOptimizer performance = new PerformanceOptimizer();
-            performance.setAppType(mediaType);
-            performance.setQuarter(quarter + "");
-            performance.setYear(year + "");
-            performance.setRealname(userEfficientVideoMapMapper.getrealnameByUserId(userAccountKey));
-            performance.setUserId(userAccountKey);
-            performance.setTotalCost(totalCharge);
-
-            //个人季度任务
-            BigDecimal personalTask = config.getPersonalTask();
-            //判断个人任务是否完成 ,如果完成则给到千分之5,如果未完成,则给到千分之3的绩效
-            String roleCode = userEfficientVideoMapMapper.getRoleCodeByUserId(userAccountKey);
-            if (!"operationAssistant".equals(roleCode)) {
-                if (totalCharge.compareTo(personalTask) > 0) {
-                    totalPerformance = totalCharge.multiply(config.getMediaTaskFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
-                } else {
-                    totalPerformance = totalCharge.multiply(config.getMediaTaskNoFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
-                }
-            }
-            performance.setTotalRoyalty(totalPerformance);
-            performanceOptimizerMapper.insert(performance);
-        }
-
-        return;
-    }
-
-    //快手运营leader绩效计算
-    public void kuaishouYunyingLeaderQuarterPerformance(Integer year, Integer quarter) {
-        Integer mediaType = 2;
-        //获取快手组下所有运营组长信息列表
-        List<UserDto2> yunyingLeaderList = userEfficientVideoMapMapper.getKuaishouYunyingLeaderUserInfo();
-        for (UserDto2 userDto2 : yunyingLeaderList) {
-            BigDecimal royalty = BigDecimal.ZERO;
-            List<UserDto2> userList = userEfficientVideoMapMapper.getYunyingLeaderMember(userDto2.getDepId());
-
-            for (UserDto2 user : userList) {
-                //增加判断:如果项目成员中包含自己的话,不将自己的消耗计算在内
-                if (user.getUserId().equals(userDto2.getUserId())) {
-                    continue;
-                }
-                BigDecimal userRoality = userEfficientVideoMapMapper.getYunyingRoyalty(user.getUserId(), year, quarter);
-                if (userRoality == null) {
-                    userRoality = BigDecimal.ZERO;
-                }
-                royalty = royalty.add(userRoality);
-            }
-            //运营leader绩效数据入库
-            PerformanceOptimizer performanceOptimizer = new PerformanceOptimizer();
-            performanceOptimizer.setAppType(mediaType);
-            performanceOptimizer.setQuarter(quarter + "");
-            performanceOptimizer.setYear(year + "");
-            performanceOptimizer.setRealname(userDto2.getRealname());
-            performanceOptimizer.setTotalCost(royalty);
-            performanceOptimizer.setTotalRoyalty(royalty.multiply(new BigDecimal("0.2")));
-            performanceOptimizer.setUserId(userDto2.getUserId());
-            performanceOptimizerMapper.insert(performanceOptimizer);
-        }
-    }
-
-    //TODO 头条运营leader绩效计算
-    public void toutiaoYunyingLeaderQuarterPerformance(Integer year, Integer quarter) {
-        Integer mediaType = 1;
-        //获取快手组下所有运营组长信息列表
-        List<UserDto2> yunyingLeaderList = userEfficientVideoMapMapper.getToutiaoYunyingLeaderUserInfo();
-        for (UserDto2 userDto2 : yunyingLeaderList) {
-            BigDecimal royalty = BigDecimal.ZERO;
-            List<UserDto2> userList = userEfficientVideoMapMapper.getYunyingLeaderMember(userDto2.getDepId());
-
-            for (UserDto2 user : userList) {
-                //增加判断:如果项目成员中包含自己的话,不将自己的消耗计算在内
-                if (user.getUserId().equals(userDto2.getUserId())) {
-                    continue;
-                }
-                BigDecimal userRoality = userEfficientVideoMapMapper.getYunyingRoyalty(user.getUserId(), year, quarter);
-                if (userRoality == null) {
-                    userRoality = BigDecimal.ZERO;
-                }
-                royalty = royalty.add(userRoality);
-            }
-            //运营leader绩效数据入库
-            PerformanceOptimizer performanceOptimizer = new PerformanceOptimizer();
-            performanceOptimizer.setAppType(mediaType);
-            performanceOptimizer.setQuarter(quarter + "");
-            performanceOptimizer.setYear(year + "");
-            performanceOptimizer.setRealname(userDto2.getRealname());
-            performanceOptimizer.setTotalCost(royalty);
-            performanceOptimizer.setTotalRoyalty(royalty.multiply(new BigDecimal("0.2")));
-            performanceOptimizer.setUserId(userDto2.getUserId());
-            performanceOptimizerMapper.insert(performanceOptimizer);
-        }
-
-    }
-
-
-    private List<OptimizerCostDetailVO> getOptimizerTotalCostDetailGroupByUserId(String mediaType, String userId, Integer year, Integer quarter, String startDate, String endDate) {
-        if (null != mediaType && mediaType.equals(CtopAdConstant.PLATFORM_TYPE_KUAISHOU)) {
-            //快手
-            return performanceMapper.getKuaishouOptimizerTotalCostDetailGroupByUserId(startDate, endDate, year+"", quarter+"", userId, null, null);
-        } else {
-            //头条
-            return performanceMapper.getBytedanceOptimizerTotalCostDetailGroupByUserId(startDate, endDate, year+"", quarter+"", userId, null, null);
-        }
-    }
-
-
-
-    @Override
-    public Map<String, Object> getPerformanceDetail(String mediaType, Integer pageNo, Integer pageSize) {
-        Map<String, Object> result = new HashMap<>();
-        Integer startIndex = (pageNo - 1) * pageSize;
-        //查询当前登录人信息
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String orgCode = sysUser.getOrgCode();
-        if (orgCode.startsWith(CtopAdConstant.CTOP_ORGCODE_NORTH_CHINA_PREFIX)) {
-            //华北
-            //查询当前媒体配置信息
-            OptimizerConfig config = optimizerConfigService.getEnabledConfigByMediaType(mediaType, CtopAdConstant.CTOP_ORGCODE_NORTH_CHINA_PREFIX);
-            if (null == config) {
-                ResultMapUtils.setResultMap(result, StatusCode.KUAISHOU_OPTINIZER_CONFIG_IS_NULL.getCode());
-                return result;
-            }
-            //:查询当前用户截止到目前当前季度的消耗统计数据
-            List<OptimizerCostDetailVO> vos = performanceService.getOptimizerTotalCostDetailGroupByUserId(mediaType, sysUser.getId(), startIndex, pageSize);
-            if (null == vos || vos.size() <= 0) {
-                ResultMapUtils.setResultMap(result, StatusCode.KUAISHOU_OPTINIZER_PERSONNAL_DATA_IS_NULL.getCode());
-                return result;
-            }
-            //2: 查询媒体季度任务完成情况
-            UserPerformanceDetailVO performanceDetailVO = getPerformanceDetailVO(mediaType, vos.get(0), config);
-            result.put("userDetail", performanceDetailVO);
-            ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-            return result;
-        } else if (orgCode.startsWith(CtopAdConstant.CTOP_ORGCODE_EAST_CHINA_PREFIX)) {
-            //华东
-            //查询当前媒体配置信息
-            OptimizerConfig kuaishouConfig = optimizerConfigService.getEnabledConfigByMediaType(CtopAdConstant.PLATFORM_TYPE_KUAISHOU, CtopAdConstant.CTOP_ORGCODE_EAST_CHINA_PREFIX);
-            OptimizerConfig bytedanceConfig = optimizerConfigService.getEnabledConfigByMediaType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE, CtopAdConstant.CTOP_ORGCODE_EAST_CHINA_PREFIX);
-            if (null == kuaishouConfig || null == bytedanceConfig) {
-                ResultMapUtils.setResultMap(result, StatusCode.KUAISHOU_OPTINIZER_CONFIG_IS_NULL.getCode());
-                return result;
-            }
-            //:查询当前用户截止到目前当前季度的消耗统计数据
-            List<OptimizerCostDetailVO> kuaishouVos = performanceService.getOptimizerTotalCostDetailGroupByUserId(CtopAdConstant.PLATFORM_TYPE_KUAISHOU, sysUser.getId(), startIndex, pageSize);
-            List<OptimizerCostDetailVO> bytedanceVos = performanceService.getOptimizerTotalCostDetailGroupByUserId(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE, sysUser.getId(), startIndex, pageSize);
-            boolean hasNoCost = (null == kuaishouVos || kuaishouVos.size() <= 0) && (null == bytedanceVos || bytedanceVos.size() <= 0);
-            if (hasNoCost) {
-                ResultMapUtils.setResultMap(result, StatusCode.OPTINIZER_PERSONNAL_DATA_IS_NULL.getCode());
-                return result;
-            }
-            if (null == kuaishouVos || kuaishouVos.size() <= 0) {
-                //快手消耗为0
-                //2: 查询头条媒体季度任务完成情况
-                UserPerformanceDetailVO performanceDetailVO = getPerformanceDetailVO(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE, bytedanceVos.get(0), bytedanceConfig);
-                result.put("userDetail", performanceDetailVO);
-                ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-                return result;
-            }
-            if (null == bytedanceVos || bytedanceVos.size() <= 0) {
-                //头条消耗为0
-                //2: 查询快手媒体季度任务完成情况
-                UserPerformanceDetailVO performanceDetailVO = getPerformanceDetailVO(CtopAdConstant.PLATFORM_TYPE_KUAISHOU, kuaishouVos.get(0), kuaishouConfig);
-                result.put("userDetail", performanceDetailVO);
-                ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-                return result;
-            }
-            //快手+头条
-            UserPerformanceDetailVO performanceDetailVO = getMultiPerformanceDetailVO(kuaishouVos.get(0), kuaishouConfig, bytedanceVos.get(0), bytedanceConfig);
-            result.put("userDetail", performanceDetailVO);
-            ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-            return result;
-        } else {
-            ResultMapUtils.setResultMap(result, StatusCode.CTOP_HAS_NO_PERFORMANCE_STATISTIC_LOGIC);
-            return result;
-        }
-    }
-
-    private UserPerformanceDetailVO getMultiPerformanceDetailVO(OptimizerCostDetailVO kuaishouQuarterCostVO, OptimizerConfig kuaishouConfig, OptimizerCostDetailVO bytedanceQuarterCostVO, OptimizerConfig bytedanceConfig) {
-        //1:获取个人各渠道消耗
-        OptimizerCostDetailVO kuaishouTotalCostVo = performanceService.getOptimizerTotalCost(CtopAdConstant.PLATFORM_TYPE_KUAISHOU);
-        OptimizerCostDetailVO bytedanceTotalCostVo = performanceService.getOptimizerTotalCost(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-
-        UserPerformanceDetailVO performanceDetailVO = new UserPerformanceDetailVO();
-        performanceDetailVO.setRealName(kuaishouTotalCostVo.getRealName());
-        //个人消耗
-        performanceDetailVO.setKuaishouPersonalCost(kuaishouTotalCostVo.getTotalCost());
-        performanceDetailVO.setBytedancePersonalCost(bytedanceTotalCostVo.getTotalCost());
-        performanceDetailVO.setTotalPersonalCost(kuaishouTotalCostVo.getTotalCost().add(bytedanceTotalCostVo.getTotalCost()).setScale(2, RoundingMode.HALF_UP));
-        //媒体消耗
-        performanceDetailVO.setKuaishouMediaCost(kuaishouQuarterCostVO.getTotalCost());
-        performanceDetailVO.setBytedanceMediaCost(bytedanceQuarterCostVO.getTotalCost());
-        performanceDetailVO.setTotalMediaCost(bytedanceQuarterCostVO.getTotalCost().add(kuaishouQuarterCostVO.getTotalCost()).setScale(2, RoundingMode.HALF_UP));
-
-        //媒体任务
-        performanceDetailVO.setKuaishouMediaTask(kuaishouConfig.getMediaTask());
-        performanceDetailVO.setBytedanceMediaTask(bytedanceConfig.getMediaTask());
-        performanceDetailVO.setTotalMediaCost(kuaishouConfig.getMediaTask().add(bytedanceConfig.getMediaTask()).setScale(2, RoundingMode.HALF_UP));
-
-        //个人任务
-        performanceDetailVO.setTotalPersonalTask(kuaishouConfig.getTotalPersonalTask());
-        performanceDetailVO.setKuaishouPersonalTask(kuaishouConfig.getPersonalTask());
-        performanceDetailVO.setBytedancePersonalTask(bytedanceConfig.getPersonalTask());
-
-        performanceDetailVO.setYear(kuaishouQuarterCostVO.getYear());
-        performanceDetailVO.setQuarter(kuaishouQuarterCostVO.getQuarter());
-
-        //快手提成
-        performanceDetailVO.setKuaishouRoyalty(getRoyalty(kuaishouConfig,
-                performanceDetailVO.getTotalPersonalCost(), performanceDetailVO.getTotalPersonalTask(),
-                performanceDetailVO.getKuaishouMediaCost(), performanceDetailVO.getKuaishouMediaTask(),
-                performanceDetailVO.getKuaishouPersonalCost()));
-        //头条提成
-        performanceDetailVO.setBytedanceRoyalty(getRoyalty(bytedanceConfig,
-                performanceDetailVO.getTotalPersonalCost(), performanceDetailVO.getTotalPersonalTask(),
-                performanceDetailVO.getBytedanceMediaCost(), performanceDetailVO.getBytedanceMediaTask(),
-                performanceDetailVO.getBytedancePersonalCost()));
-
-        //快手提成点
-        performanceDetailVO.setKuaishouRoyaltyRatio(getRoyaltyRatio(kuaishouConfig, performanceDetailVO.getTotalPersonalCost(), performanceDetailVO.getTotalPersonalTask(), performanceDetailVO.getKuaishouMediaCost(), performanceDetailVO.getKuaishouMediaTask()));
-        //头条提成点
-        performanceDetailVO.setBytedanceRoyaltyRatio(getRoyaltyRatio(bytedanceConfig, performanceDetailVO.getTotalPersonalCost(), performanceDetailVO.getTotalPersonalTask(), performanceDetailVO.getBytedanceMediaCost(), performanceDetailVO.getBytedanceMediaTask()));
-        //总提成
-        performanceDetailVO.setTotalRoyalty(performanceDetailVO.getBytedanceRoyalty().add(performanceDetailVO.getKuaishouRoyalty()).setScale(2, RoundingMode.HALF_UP));
-
-        return performanceDetailVO;
-    }
-
-    private BigDecimal getRoyalty(OptimizerConfig bytedanceConfig, BigDecimal totalPersonalCost, BigDecimal totalPersonalTask, BigDecimal bytedanceMediaCost, BigDecimal bytedanceMediaTask, BigDecimal bytedancePersonalCost) {
-        BigDecimal royalty = BigDecimal.ZERO;
-
-        //个人任务未完成
-        if (totalPersonalCost.compareTo(totalPersonalTask) < 0) {
-            return royalty;
-        }
-        //快手媒体任务未完成
-        if (bytedanceMediaCost.compareTo(bytedanceMediaTask) < 0) {
-            return bytedancePersonalCost.multiply(bytedanceConfig.getMediaTaskNoFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
-        }
-
-        PerformanceConfig performanceConfig = performanceConfigService.getNowConfig();
-        if (null != performanceConfig && performanceConfig.getMediaTaskRaise() == 1) {
-            //同意提高提成点
-            return bytedancePersonalCost.multiply(bytedanceConfig.getMediaTaskFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
-        } else {
-            return bytedancePersonalCost.multiply(bytedanceConfig.getMediaTaskFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
-        }
-    }
-
-    private BigDecimal getRoyaltyRatio(OptimizerConfig bytedanceConfig, BigDecimal totalPersonalCost, BigDecimal totalPersonalTask, BigDecimal mediaCost, BigDecimal mediaTask) {
-        BigDecimal royalty = BigDecimal.ZERO;
-
-        //个人任务未完成
-        if (totalPersonalCost.compareTo(totalPersonalTask) < 0) {
-            return royalty;
-        }
-        //快手媒体任务未完成
-        if (mediaCost.compareTo(mediaTask) < 0) {
-            return bytedanceConfig.getMediaTaskNoFinishRate().setScale(2, RoundingMode.HALF_UP);
-        }
-
-        PerformanceConfig performanceConfig = performanceConfigService.getNowConfig();
-        if (null != performanceConfig && performanceConfig.getMediaTaskRaise() == 1) {
-            //同意提高提成点
-            return bytedanceConfig.getMediaTaskFinishRate().setScale(2, RoundingMode.HALF_UP);
-        } else {
-            return bytedanceConfig.getMediaTaskNoFinishRate().setScale(2, RoundingMode.HALF_UP);
-        }
-    }
-
-    private UserPerformanceDetailVO getPerformanceDetailVO(String appType, OptimizerCostDetailVO kuaishouCostVo, OptimizerConfig kuaishouConfig) {
-        OptimizerCostDetailVO totalCostVo = performanceService.getOptimizerTotalCost(appType);
-        UserPerformanceDetailVO performanceDetailVO = new UserPerformanceDetailVO();
-        //计算绩效
-        kuaishouCostVo.setTotalRoyalty(getTotalRoyalty(kuaishouConfig, kuaishouCostVo, totalCostVo));
-        performanceDetailVO.setRealName(kuaishouCostVo.getRealName());
-        performanceDetailVO.setTotalPersonalCost(kuaishouCostVo.getTotalCost());
-        performanceDetailVO.setTotalRoyalty(kuaishouCostVo.getTotalRoyalty());
-        performanceDetailVO.setTotalMediaTask(kuaishouConfig.getMediaTask());
-        performanceDetailVO.setTotalPersonalTask(kuaishouConfig.getPersonalTask());
-
-        performanceDetailVO.setYear(kuaishouCostVo.getYear());
-        performanceDetailVO.setQuarter(kuaishouCostVo.getQuarter());
-        performanceDetailVO.setRoyaltyRatio(getRate(kuaishouConfig, kuaishouCostVo, totalCostVo).toString() + "‰");
-        return performanceDetailVO;
-    }
-
-    @Override
-    //TODO --先优先华北的逻辑
-    public Map<String, Object> getRankingList(String mediaType, Integer pageNo, Integer pageSize, String orgCode) {
-        Map<String, Object> result = new HashMap<>();
-        Integer startIndex = (pageNo - 1) * pageSize;
-        List<OptimizerCostDetailVO> vos = performanceService.getOptimizerTotalCostDetailGroupByUserId(mediaType, null, startIndex, pageSize);
-        if (null == vos || vos.size() <= 0) {
-            ResultMapUtils.setResultMap(result, StatusCode.KUAISHOU_CRAWLER_APP_ELEMENT_IS_NULL.getCode());
-            return result;
-        }
-        //查询优化师系统设置数据
-        OptimizerConfig config = optimizerConfigService.getEnabledConfigByMediaType(mediaType, orgCode);
-        //2: 查询媒体季度任务完成情况
-        OptimizerCostDetailVO totalCostVo = performanceService.getOptimizerTotalCost(mediaType);
-        //3:计算单个优化师提成总额
-        List<OptimizerCostDetailVO> getDetailVos = new ArrayList<>();
-        if (null != vos && vos.size() > 0) {
-            for (OptimizerCostDetailVO vo : vos) {
-                vo.setTotalRoyalty(getTotalRoyalty(config, vo, totalCostVo));
-                getDetailVos.add(vo);
-            }
-        }
-        result.put("data", getDetailVos);
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-        return result;
-    }
-
-    @Override
-    //TODO --优先华北
-    public Map<String, Object> getManagerPerformanceDetail(String mediaType, String orgCode) {
-        Map<String, Object> result = new HashMap<>();
-        //获取经理相关信息
-        //查询优化师系统设置数据
-        OptimizerConfig config = optimizerConfigService.getEnabledConfigByMediaType(mediaType, orgCode);
-        //2: 查询媒体季度任务完成情况
-        OptimizerCostDetailVO totalCostVo = performanceService.getOptimizerTotalCost(mediaType);
-        result.put("totalCost", totalCostVo.getTotalCost().toString());
-        if (totalCostVo.getTotalCost().compareTo(config.getMediaTask()) < 0) {
-            //当前消耗季度任务未完成
-            ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
-            result.put("totalRoyalty", totalCostVo.getTotalRoyalty().toString());
-            return result;
-        }
-        //3:查询经理手下所有优化师的总提成
-        result = performanceService.getMemberPerformanceByUserId(config, totalCostVo);
-        return result;
-    }
-
-    @Autowired
-    private IPerformanceConfigService performanceConfigService;
-    private BigDecimal getTotalRoyalty(OptimizerConfig config, OptimizerCostDetailVO vo, OptimizerCostDetailVO quarterCost) {
-        BigDecimal royalty = BigDecimal.ZERO;
-        //个人总消耗
-        BigDecimal totalCost = vo.getTotalCost();
-        //个人季度任务
-        BigDecimal personalTask = config.getPersonalTask();
-        //媒体季度任务
-        //BigDecimal mediaTask = config.getMediaTask();
-        //个人任务未完成
-        //if (totalCost.compareTo(personalTask) < 0) {
-        //    return royalty;
-        //}
-        //季度任务不在普通运营的业务范围内
-        //if (quarterCost.getTotalCost().compareTo(mediaTask) < 0) {
-        //    return totalCost.multiply(config.getMediaTaskNoFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
-        //}
-        PerformanceConfig performanceConfig = performanceConfigService.getNowConfig();
-        //判断个人任务是否完成 ,如果完成则给到千分之5,如果未完成,则给到千分之3的绩效
-        if (null != performanceConfig && performanceConfig.getMediaTaskRaise() == 1) {
-            return totalCost.multiply(config.getMediaTaskFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
-        } else {
-            return totalCost.multiply(config.getMediaTaskNoFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
-        }
-    }
-
-    private BigDecimal getRate(OptimizerConfig config, OptimizerCostDetailVO vo, OptimizerCostDetailVO quarterCost) {
-        BigDecimal royalty = BigDecimal.ZERO;
-        //个人总消耗
-        BigDecimal totalCost = vo.getTotalCost();
-        //个人季度任务
-        BigDecimal personalTask = config.getPersonalTask();
-        //媒体季度任务
-        BigDecimal mediaTask = config.getMediaTask();
-        //个人任务未完成
-        if (totalCost.compareTo(personalTask) < 0) {
-            return royalty;
-        }
-        //季度任务未完成
-        if (quarterCost.getTotalCost().compareTo(mediaTask) < 0) {
-            return config.getMediaTaskNoFinishRate().setScale(2, RoundingMode.HALF_UP);
-        }
-
-        PerformanceConfig performanceConfig = performanceConfigService.getNowConfig();
-        if (null != performanceConfig && performanceConfig.getMediaTaskRaise() == 1) {
-            return config.getMediaTaskFinishRate().setScale(2, RoundingMode.HALF_UP);
-        } else {
-            return config.getMediaTaskNoFinishRate().setScale(2, RoundingMode.HALF_UP);
-        }
-
-    }
-}

+ 0 - 19
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/RolePerformancRraiseServiceImpl.java

@@ -1,19 +0,0 @@
-package cn.com.ctop.performanceappraisal.service.impl;
-
-import cn.com.ctop.performanceappraisal.entity.RolePerformancRraise;
-import cn.com.ctop.performanceappraisal.mapper.RolePerformancRraiseMapper;
-import cn.com.ctop.performanceappraisal.service.IRolePerformancRraiseService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 角色提点比例
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-@Service
-public class RolePerformancRraiseServiceImpl extends ServiceImpl<RolePerformancRraiseMapper, RolePerformancRraise> implements IRolePerformancRraiseService {
-
-}

+ 0 - 19
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/RolePerformanceCommissionServiceImpl.java

@@ -1,19 +0,0 @@
-package cn.com.ctop.performanceappraisal.service.impl;
-
-import cn.com.ctop.performanceappraisal.entity.RolePerformanceCommission;
-import cn.com.ctop.performanceappraisal.mapper.RolePerformanceCommissionMapper;
-import cn.com.ctop.performanceappraisal.service.IRolePerformanceCommissionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 角色提成比例
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-@Service
-public class RolePerformanceCommissionServiceImpl extends ServiceImpl<RolePerformanceCommissionMapper, RolePerformanceCommission> implements IRolePerformanceCommissionService {
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/controller/PlaneProjectCostController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.planeprojectcost.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
-import cn.com.ctop.planeprojectcost.service.IPlaneProjectCostService;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 平面设计项目消耗表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-28
- */
-@Slf4j
-@Api(tags = "平面设计项目消耗表")
-@RestController
-@RequestMapping("/planeprojectcost/planeProjectCost")
-public class PlaneProjectCostController {
-    @Autowired
-    private IPlaneProjectCostService planeProjectCostService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param planeProjectCost
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "平面设计项目消耗表-分页列表查询")
-    @ApiOperation(value = "平面设计项目消耗表-分页列表查询", notes = "平面设计项目消耗表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<PlaneProjectCost>> queryPageList(PlaneProjectCost planeProjectCost,
-                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                         HttpServletRequest req) {
-        Result<IPage<PlaneProjectCost>> result = new Result<>();
-        QueryWrapper<PlaneProjectCost> queryWrapper = QueryGenerator.initQueryWrapper(planeProjectCost, req.getParameterMap());
-        Page<PlaneProjectCost> page = new Page<>(pageNo, pageSize);
-        IPage<PlaneProjectCost> pageList = planeProjectCostService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param planeProjectCost
-     * @return
-     */
-    @AutoLog(value = "平面设计项目消耗表-添加")
-    @ApiOperation(value = "平面设计项目消耗表-添加", notes = "平面设计项目消耗表-添加")
-    @PostMapping(value = "/add")
-    public Result<PlaneProjectCost> add(@RequestBody PlaneProjectCost planeProjectCost) {
-        Result<PlaneProjectCost> result = new Result<PlaneProjectCost>();
-        try {
-            planeProjectCostService.save(planeProjectCost);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param planeProjectCost
-     * @return
-     */
-    @AutoLog(value = "平面设计项目消耗表-编辑")
-    @ApiOperation(value = "平面设计项目消耗表-编辑", notes = "平面设计项目消耗表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<PlaneProjectCost> edit(@RequestBody PlaneProjectCost planeProjectCost) {
-        Result<PlaneProjectCost> result = new Result<PlaneProjectCost>();
-        PlaneProjectCost planeProjectCostEntity = planeProjectCostService.getById(planeProjectCost.getId());
-        if (planeProjectCostEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = planeProjectCostService.updateById(planeProjectCost);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "平面设计项目消耗表-通过id删除")
-    @ApiOperation(value = "平面设计项目消耗表-通过id删除", notes = "平面设计项目消耗表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            planeProjectCostService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "平面设计项目消耗表-批量删除")
-    @ApiOperation(value = "平面设计项目消耗表-批量删除", notes = "平面设计项目消耗表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<PlaneProjectCost> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<PlaneProjectCost> result = new Result<PlaneProjectCost>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.planeProjectCostService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "平面设计项目消耗表-通过id查询")
-    @ApiOperation(value = "平面设计项目消耗表-通过id查询", notes = "平面设计项目消耗表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<PlaneProjectCost> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<PlaneProjectCost> result = new Result<PlaneProjectCost>();
-        PlaneProjectCost planeProjectCost = planeProjectCostService.getById(id);
-        if (planeProjectCost == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(planeProjectCost);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<PlaneProjectCost> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                PlaneProjectCost planeProjectCost = JSON.parseObject(deString, PlaneProjectCost.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(planeProjectCost, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<PlaneProjectCost> pageList = planeProjectCostService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "平面设计项目消耗表列表");
-        mv.addObject(NormalExcelConstants.CLASS, PlaneProjectCost.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("平面设计项目消耗表列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<PlaneProjectCost> listPlaneProjectCosts = ExcelImportUtil.importExcel(file.getInputStream(), PlaneProjectCost.class, params);
-                planeProjectCostService.saveBatch(listPlaneProjectCosts);
-                return Result.ok("文件导入成功!数据行数:" + listPlaneProjectCosts.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-}

+ 0 - 100
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/entity/PlaneProjectCost.java

@@ -1,100 +0,0 @@
-package cn.com.ctop.planeprojectcost.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 平面设计项目消耗表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-28
- */
-@Data
-@TableName("ctop_plane_project_cost")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_plane_project_cost对象", description = "平面设计项目消耗表")
-public class PlaneProjectCost {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * ctop_project的id
-     */
-    @Excel(name = "ctop_project的id", width = 15)
-    @ApiModelProperty(value = "ctop_project的id")
-    private Long projectId;
-    /**
-     * sys_user的id
-     */
-    @Excel(name = "sys_user的id", width = 15)
-    @ApiModelProperty(value = "sys_user的id")
-    private String userId;
-    /**
-     * 项目消耗
-     */
-    @Excel(name = "项目消耗", width = 15)
-    @ApiModelProperty(value = "项目消耗")
-    private BigDecimal projectCost;
-    /**
-     * 1_头条2_快手
-     */
-    @Excel(name = "1_头条2_快手", width = 15)
-    @ApiModelProperty(value = "1_头条2_快手")
-    private Integer appType;
-    /**
-     * 项目总消耗
-     */
-    @Excel(name = "项目总消耗", width = 15)
-    @ApiModelProperty(value = "项目总消耗")
-    private BigDecimal projectTotalCost;
-    /**
-     * 所属年
-     */
-    @Excel(name = "所属年", width = 15)
-    @ApiModelProperty(value = "所属年")
-    private Integer year;
-    /**
-     * 所属季度
-     */
-    @Excel(name = "所属季度", width = 15)
-    @ApiModelProperty(value = "所属季度")
-    private Integer quarter;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-    /**
-     * projectPerformance
-     */
-    @ApiModelProperty(value = "projectPerformance")
-    private BigDecimal projectPerformance;
-    /**
-     * projectPlaneCount
-     */
-    @ApiModelProperty(value = "projectPlaneCount")
-    private Integer projectPlaneCount;
-
-    private Integer type;
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/mapper/PlaneProjectCostMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.planeprojectcost.mapper;
-
-import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 平面设计项目消耗表
- *
- * @author: jeecg-boot
- * @date: 2019-12-28
- * @cersion: V1.0
- */
-public interface PlaneProjectCostMapper extends BaseMapper<PlaneProjectCost> {
-
-}

+ 0 - 5
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/mapper/xml/PlaneProjectCostMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.planeprojectcost.mapper.PlaneProjectCostMapper">
-
-</mapper>

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/service/IPlaneProjectCostService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.planeprojectcost.service;
-
-import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 平面设计项目消耗表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-28
- */
-public interface IPlaneProjectCostService extends IService<PlaneProjectCost> {
-
-}

+ 0 - 20
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/service/impl/PlaneProjectCostServiceImpl.java

@@ -1,20 +0,0 @@
-package cn.com.ctop.planeprojectcost.service.impl;
-
-import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
-import cn.com.ctop.planeprojectcost.mapper.PlaneProjectCostMapper;
-import cn.com.ctop.planeprojectcost.service.IPlaneProjectCostService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 平面设计项目消耗表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-28
- */
-@Service
-public class PlaneProjectCostServiceImpl extends ServiceImpl<PlaneProjectCostMapper, PlaneProjectCost> implements IPlaneProjectCostService {
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/controller/UserEfficientVideoMapController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.userefficientvideomap.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.userefficientvideomap.entity.UserEfficientVideoMap;
-import cn.com.ctop.userefficientvideomap.service.IUserEfficientVideoMapService;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 有效视频与角色对应表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-16
- */
-@Slf4j
-@Api(tags = "有效视频与角色对应表")
-@RestController
-@RequestMapping("/userefficientvideomap/userEfficientVideoMap")
-public class UserEfficientVideoMapController {
-    @Autowired
-    private IUserEfficientVideoMapService userEfficientVideoMapService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param userEfficientVideoMap
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "有效视频与角色对应表-分页列表查询")
-    @ApiOperation(value = "有效视频与角色对应表-分页列表查询", notes = "有效视频与角色对应表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<UserEfficientVideoMap>> queryPageList(UserEfficientVideoMap userEfficientVideoMap,
-                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                              HttpServletRequest req) {
-        Result<IPage<UserEfficientVideoMap>> result = new Result<IPage<UserEfficientVideoMap>>();
-        QueryWrapper<UserEfficientVideoMap> queryWrapper = QueryGenerator.initQueryWrapper(userEfficientVideoMap, req.getParameterMap());
-        Page<UserEfficientVideoMap> page = new Page<UserEfficientVideoMap>(pageNo, pageSize);
-        IPage<UserEfficientVideoMap> pageList = userEfficientVideoMapService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param userEfficientVideoMap
-     * @return
-     */
-    @AutoLog(value = "有效视频与角色对应表-添加")
-    @ApiOperation(value = "有效视频与角色对应表-添加", notes = "有效视频与角色对应表-添加")
-    @PostMapping(value = "/add")
-    public Result<UserEfficientVideoMap> add(@RequestBody UserEfficientVideoMap userEfficientVideoMap) {
-        Result<UserEfficientVideoMap> result = new Result<UserEfficientVideoMap>();
-        try {
-            userEfficientVideoMapService.save(userEfficientVideoMap);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param userEfficientVideoMap
-     * @return
-     */
-    @AutoLog(value = "有效视频与角色对应表-编辑")
-    @ApiOperation(value = "有效视频与角色对应表-编辑", notes = "有效视频与角色对应表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<UserEfficientVideoMap> edit(@RequestBody UserEfficientVideoMap userEfficientVideoMap) {
-        Result<UserEfficientVideoMap> result = new Result<UserEfficientVideoMap>();
-        UserEfficientVideoMap userEfficientVideoMapEntity = userEfficientVideoMapService.getById(userEfficientVideoMap.getId());
-        if (userEfficientVideoMapEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = userEfficientVideoMapService.updateById(userEfficientVideoMap);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "有效视频与角色对应表-通过id删除")
-    @ApiOperation(value = "有效视频与角色对应表-通过id删除", notes = "有效视频与角色对应表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            userEfficientVideoMapService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "有效视频与角色对应表-批量删除")
-    @ApiOperation(value = "有效视频与角色对应表-批量删除", notes = "有效视频与角色对应表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<UserEfficientVideoMap> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<UserEfficientVideoMap> result = new Result<UserEfficientVideoMap>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.userEfficientVideoMapService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "有效视频与角色对应表-通过id查询")
-    @ApiOperation(value = "有效视频与角色对应表-通过id查询", notes = "有效视频与角色对应表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<UserEfficientVideoMap> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<UserEfficientVideoMap> result = new Result<UserEfficientVideoMap>();
-        UserEfficientVideoMap userEfficientVideoMap = userEfficientVideoMapService.getById(id);
-        if (userEfficientVideoMap == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(userEfficientVideoMap);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<UserEfficientVideoMap> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                UserEfficientVideoMap userEfficientVideoMap = JSON.parseObject(deString, UserEfficientVideoMap.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(userEfficientVideoMap, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<UserEfficientVideoMap> pageList = userEfficientVideoMapService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "有效视频与角色对应表列表");
-        mv.addObject(NormalExcelConstants.CLASS, UserEfficientVideoMap.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("有效视频与角色对应表列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<UserEfficientVideoMap> listUserEfficientVideoMaps = ExcelImportUtil.importExcel(file.getInputStream(), UserEfficientVideoMap.class, params);
-                userEfficientVideoMapService.saveBatch(listUserEfficientVideoMaps);
-                return Result.ok("文件导入成功!数据行数:" + listUserEfficientVideoMaps.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-}

+ 0 - 25
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/AccountDTO.java

@@ -1,25 +0,0 @@
-package cn.com.ctop.userefficientvideomap.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-
-@Data
-public class AccountDTO implements Serializable {
-    private Long projectId;
-    private String projectName;
-    private String totalCost;  //消耗
-    private String accountId;  //账户id
-    private String userName;  //优化师
-    private String advertiserName;  //广告主名称
-    private String authName;  //授权名称
-    private BigDecimal cost;
-    private String userId;
-    private Integer mediaId;
-    private Integer quarter;
-    private Integer year;
-    private String startDate;
-    private String endDate;
-}

+ 0 - 32
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/DesignMaterialInfo.java

@@ -1,32 +0,0 @@
-package cn.com.ctop.userefficientvideomap.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-@Data
-public class DesignMaterialInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    private String videoUrl;
-
-    private Integer pageExposureCount;
-
-    private Integer pageClickCount;
-
-    private Integer materialExposureCount;
-
-    private Integer behaviorCount;
-
-    private BigDecimal totalCost;
-
-    private String accountId;
-
-    private String accountName;
-
-    private String platform;
-
-}

+ 0 - 22
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/EffiVideoDTO.java

@@ -1,22 +0,0 @@
-package cn.com.ctop.userefficientvideomap.entity;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-@Data
-public class EffiVideoDTO {
-    private String signature;
-    private BigDecimal charge;
-    private String clipId;
-    private String clipName;
-    private String shotId;
-    private String shotName;
-    private String planId;
-    private String planName;
-    private String planeId;
-    private String planeName;
-
-
-}

+ 0 - 18
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/PerformanceTimeDTO.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.userefficientvideomap.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-
-@Data
-public class PerformanceTimeDTO implements Serializable {
-    private String startDate;
-    private String endDate;
-    private Integer year;
-    private Integer quarter;
-    private String userId;
-    private Integer appType;
-    private Long accountId;
-    private Integer projectId;
-}

+ 0 - 21
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/PlaneProjectCostDTO.java

@@ -1,21 +0,0 @@
-package cn.com.ctop.userefficientvideomap.entity;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class PlaneProjectCostDTO {
-
-    private Integer id;
-    private Long projectId;
-    private String userId;
-    private BigDecimal projectCost;
-    private Integer appType;
-    private BigDecimal projectTotalCost;
-    private Integer year;
-    private Integer quarter;
-    private BigDecimal projectPerformance;
-    private Integer projectPlaneCount;
-    private String projectName;
-}

+ 0 - 17
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/ProjectDTO.java

@@ -1,17 +0,0 @@
-package cn.com.ctop.userefficientvideomap.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-
-@Data
-public class ProjectDTO implements Serializable {
-    private Long projectId;
-    private String projectName;
-    private String advertiserName;
-    private String responsibleName;
-    private String designResponsibleName;
-    private BigDecimal totalCost;
-}

+ 0 - 34
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/TransferorAccountDTO.java

@@ -1,34 +0,0 @@
-package cn.com.ctop.userefficientvideomap.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-
-@Data
-public class TransferorAccountDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    private Long accountId;
-
-    private Long projectId;
-
-    private String transferor;
-
-    private String assignee;
-
-    private String transferorDate;
-
-    private String assigneeDate;
-
-    private String auditor;
-
-    private Integer status;
-
-    private String remarks;
-
-
-}

+ 0 - 42
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/UserDto2.java

@@ -1,42 +0,0 @@
-package cn.com.ctop.userefficientvideomap.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-@Data
-public class UserDto2 implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String userId;
-
-    private String realname;
-
-    private String roleId;
-
-    private String roleName;
-
-    private BigDecimal effiRate;
-
-    private String depId;
-
-    private Integer year;
-
-    private Integer quarter;
-
-    private String departName;
-
-    private String parentId;
-
-    private String roleCode;
-
-    private Integer effiVideoCount;
-
-    private Integer videoCount;
-
-    private BigDecimal cost;
-
-    private Integer appType;
-}

+ 0 - 104
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/UserEfficientVideoMap.java

@@ -1,104 +0,0 @@
-package cn.com.ctop.userefficientvideomap.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 有效视频与角色对应表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-16
- */
-@Data
-@TableName("ctop_user_efficient_video_map")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_user_efficient_video_map对象", description = "有效视频与角色对应表")
-public class UserEfficientVideoMap {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 有效视频md5
-     */
-    @Excel(name = "有效视频md5", width = 15)
-    @ApiModelProperty(value = "有效视频md5")
-    private String efficientVideoSignature;
-    /**
-     * 角色id
-     */
-    @Excel(name = "角色id", width = 15)
-    @ApiModelProperty(value = "角色id")
-    private String roleId;
-    /**
-     * 用户id
-     */
-    @Excel(name = "用户id", width = 15)
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-    /**
-     * 季度
-     */
-    @Excel(name = "季度", width = 15)
-    @ApiModelProperty(value = "季度")
-    private Integer quarter;
-    /**
-     * 年
-     */
-    @Excel(name = "年", width = 15)
-    @ApiModelProperty(value = "年")
-    private Integer year;
-    /**
-     * 月
-     */
-    @Excel(name = "月", width = 15)
-    @ApiModelProperty(value = "月")
-    private Integer month;
-    /**
-     * 计算日期_用于计算所属年月季的基础日期
-     */
-    @Excel(name = "计算日期", width = 15)
-    @ApiModelProperty(value = "计算日期")
-    private Date calcDate;
-    /**
-     * 媒体类型1_头条2_快手
-     */
-    @Excel(name = "媒体类型1_头条2_快手", width = 15)
-    @ApiModelProperty(value = "媒体类型1_头条2_快手")
-    private Integer appType;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    private String weekStart;
-
-    private String weekEnd;
-
-    private String companyId;
-
-    private BigDecimal cost;
-
-
-}

+ 0 - 31
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/VideoDTO.java

@@ -1,31 +0,0 @@
-package cn.com.ctop.userefficientvideomap.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-@Data
-public class VideoDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String signature;
-    private BigDecimal charge;
-    private String creativeUrl;
-    private String shot;
-    private String shotId;
-    private String plan;
-    private String planId;
-    private String plane;
-    private String planeId;
-    private String clip;
-    private String clipId;
-    private Integer appType;
-    private String weekStart;
-    private String weekEnd;
-    private Integer year;
-    private Integer quarter;
-    private String roleId;
-    private String roleCode;
-}

+ 0 - 261
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/UserEfficientVideoMapMapper.java

@@ -1,261 +0,0 @@
-package cn.com.ctop.userefficientvideomap.mapper;
-
-import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.common.module.entity.SysRole;
-import cn.com.ctop.common.module.entity.SysUser;
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import cn.com.ctop.userefficientvideomap.entity.*;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 有效视频与角色对应表
- *
- * @author: jeecg-boot
- * @date: 2019-12-16
- * @cersion: V1.0
- */
-@Component
-public interface UserEfficientVideoMapMapper extends BaseMapper<UserEfficientVideoMap> {
-
-    List<EffiVideoDTO> getUserVideoMap(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("startCalcDate") String startCalcDate, @Param("endCalcDate") String endCalcDate);
-
-    int getEffiVideoCountBySignature(@Param("signature") String signature, @Param("appType") Integer appType);
-
-    int getEffiVideoCountByUserId(@Param("appType") int appType, @Param("year") int year, @Param("quarter") int quarter, @Param("userId") String userId, @Param("roleId") String roleId);
-
-    int getQuarterMaterialCountByUserId(@Param("roleCode") String roleCode, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("userId") String userId);
-
-    int getVideoCountByUserId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getTotalCostByUserId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getTotalCostByClipId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getTotalCostByShotId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getTotalCostByPlanId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getTotalCostByPlaneId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getProjectTotalCostByUserId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    List<ProjectDTO> getProjectsByUserId(@Param("userId") String userId);
-
-    int getPlaneCountByProjectId(@Param("projectId") Long projectId);
-
-    int getPlaneCountByUserId(@Param("userId") String userId);
-
-    List<DesignMaterialInfo> designMaterialInfoList(@Param("roleCode") String roleCode, @Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    List<DesignMaterialInfo> getMaterialAccountInfoByMaterialId(@Param("materialId") String materialId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    List<ProjectDTO> getProjects(@Param("mediaId") String mediaId);
-
-    BigDecimal getProjectQuarterCostById(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("projectId") Long projectId);
-
-    BigDecimal getToutiaoProjectQuarterCostById(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("projectId") Long projectId);
-
-    List<UserDto2> getPlaneByProjectId(@Param("projectId") Long projectId);
-
-    List<UserDto2> getKuaishouDesignLeaderList();
-
-    List<UserDto2> getKuaishouPlanList();
-
-    List<UserDto2> getKuaishouShotList();
-
-    List<UserDto2> getKuaishouClipList();
-
-    List<UserDto2> getToutiaoPlanList();
-
-    List<UserDto2> getToutiaoShotList();
-
-    List<UserDto2> getToutiaoClipList();
-
-    List<UserDto2> getToutiaoDesignLeaderList();
-
-    List<String> getClip(@Param("depId") String depId);
-
-    BigDecimal getClipQuarterCost(@Param("appType") int appType, @Param("quarter") int quarter, @Param("year") int year, @Param("userId") String userId);
-
-    //头条有效视频计算sql
-    List<EffiVideoDTO> getToutiaoUserVideoMap(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("startCalcDate") String startCalcDate, @Param("endCalcDate") String endCalcDate);
-
-    BigDecimal toutiaoGetTotalCostByClipId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal toutiaoGetTotalCostByShotId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal toutiaoGetTotalCostByPlanId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getQuarterPerformance(@Param("userId") String userId, @Param("year") int year, @Param("quarter") int quarter, @Param("appType") int appType);
-
-    BigDecimal getQuarterCost(@Param("userId") String userId, @Param("year") int year, @Param("quarter") int quarter, @Param("appType") int appType);
-
-    String getOrgCodeByProjectId(@Param("projectId") Long projectId);
-
-    String getDepartIdByUserId(@Param("userId") String userId);
-
-    List<UserDto2> getUserListByDepartId(@Param("departId") String departId);
-
-    String getDepartNameByUserId(@Param("userId") String userId);
-
-    String getParentIdByDepartId(@Param("departId") String departId);
-
-    List<PlaneProjectCostDTO> getPlanePerformanceInfo(@Param("appType") int appType, @Param("year") int year, @Param("quarter") int quarter, @Param("userId") String userId);
-
-    List<UserDto2> getUserPerformanceList(@Param("appType") Integer appType, @Param("year") Integer year, @Param("quarter") Integer quarter);
-
-    List<String> getUserIdListByDepId(@Param("depId") String depId);
-
-    void updateKuaishouEffiType(@Param("kuaishouEffiType") Integer kuaishouEffiType, @Param("signature") String signature);
-
-    void updateToutiaoEffiType(@Param("toutiaoEffiType") Integer toutiaoEffiType, @Param("signature") String signature);
-
-    List<UserDto2> getKuaishouDepartUserInfo();
-
-    List<UserDto2> getKuaishouDepartAllUserInfo();
-
-    List<UserDto2> getToutiaoDepartUserInfo();
-
-    List<UserDto2> getToutiaoDepartAllUserInfo();
-
-    //根据天数的区间获取userId获取有效视频数量
-    Integer getEffiVideoCountByCalcDate(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("userId") String userId, @Param("appType") Integer appType);
-
-    List<MaterialInfo> getEffiVideoList(@Param("appType") Integer appType, @Param("year") Integer year, @Param("quarter") Integer quarter, @Param("userId") String userId);
-
-    List<UserDto2> getKuaishouYunyingDepartUserInfo();
-
-    List<UserDto2> getAllKuaishouYunyingDepartUserInfo();
-
-    List<UserDto2> getToutiaoYunyingDepartUserInfo();
-
-    List<UserDto2> getAllToutiaoYunyingDepartUserInfo();
-
-    //获取快手单个优化师当前账户下的总消耗
-    BigDecimal getKuaishouYunyingTotalCost(@Param("userId") String userId, @Param("appType") Integer appType, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    //获取快手单个优化师当前账户下的总消耗
-    BigDecimal getToutiaoYunyingTotalCost(@Param("userId") String userId, @Param("appType") Integer appType, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    //获取快手单个优化师其下所有的账户下当前的消耗
-    List<AccountDTO> getKuaishouAccountTotalCost(@Param("userId") String userId, @Param("appType") Integer appType, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    //获取头条单个优化师其下所有的账户下当前的消耗
-    List<AccountDTO> getToutiaoAccountTotalCost(@Param("userId") String userId, @Param("appType") Integer appType, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    List<MaterialInfo> getEffiWeekVideoList(@Param("appType") Integer appType, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("userId") String userId);
-
-    List<String> getWeekCostMd5(@Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    List<String> toutiaoGetWeekCostMd5(@Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    Integer beforeWeekCostCount(@Param("md5") String md5, @Param("date") String date);
-
-    Integer toutiaoBeforeWeekCostCount(@Param("md5") String md5, @Param("date") String date);
-
-    String getVideoEarlistCostDate(@Param("md5") String md5);
-
-    String getToutiaoVideoEarlistCostDate(@Param("md5") String md5);
-
-    BigDecimal videoTotalCostInDates(@Param("md5") String md5, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal toutiaoVideoTotalCostInDates(@Param("md5") String md5, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    EffiVideoDTO getDesignerInfoByCode(@Param("code") String code);
-
-    String getCompanyInfoByUserId(@Param("userId") String userId);
-
-    List<String> getVideoByDates(@Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    Integer getVideoCountByCode(@Param("signature") String signature, @Param("appType") Integer appType);
-
-    List<String> getTotalSignatureByUserId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getSumChargeBySignature(@Param("signature") String signature, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getToutiaoSumChargeBySignature(@Param("signature") String signature, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    List<MaterialInfo> getVideoList(@Param("appType") Integer appType, @Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    Integer kuaishouCreativeLtCount(@Param("signature") String signature, @Param("date") String date);
-
-    String kuaishouCreativeEarlistDate(@Param("signature") String singature);
-
-    List<String> getToutiaoVideoByDates(@Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    Integer toutiaoCreativeLtCount(@Param("signature") String signature, @Param("date") String date);
-
-    String toutiaoCreativeEarlistDate(@Param("signature") String singature);
-
-    List<String> getAccountIdByUserId(@Param("userId") String userId);
-
-    List<TransferorAccountDTO> accountTransforerListByUserId(@Param("accountId") String accountId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getAccountSumCharge(@Param("accountId") String accountId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    BigDecimal getToutiaoAccountSumCharge(@Param("accountId") String accountId, @Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    List<UserDto2> getKuaishouYunyingLeaderUserInfo();
-
-    List<UserDto2> getToutiaoYunyingLeaderUserInfo();
-
-    List<UserDto2> getYunyingLeaderMember(@Param("depId") String depId);
-
-    BigDecimal getYunyingRoyalty(@Param("userId") String userId, @Param("year") Integer year, @Param("quarter") Integer quarter);
-
-    List<String> getAccountListByMediaId(@Param("mediaId") Integer mediaId);
-
-    String getAccountUserId(@Param("accountId") String userId);
-
-    String getrealnameByUserId(@Param("userId") String userId);
-
-    String getRoleCodeByUserId(@Param("userId") String userId);
-
-    Integer getQuarterVideoCount(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("userId") String userId, @Param("appType") Integer appType);
-
-    Integer getQuarterEffiVideoCount(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("userId") String userId, @Param("appType") Integer appType);
-
-    BigDecimal getYunyingQuarterCost(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("userId") String userId, @Param("appType") Integer appType);
-
-    BigDecimal getYunyingQuarterPerformance(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("userId") String userId, @Param("appType") Integer appType);
-
-    List<PerformanceAccount> getYunyingQuarterDetailByUserId(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("userId") String userId, @Param("appType") Integer appType);
-
-    //按平台获取其下所有项目信息以及消耗
-    List<ProjectDTO> getProjcetListByMediaType(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("appType") Integer appType);
-
-    //根据projectId获取其下账户季度消耗信息
-    List<AccountDTO> getQuarterAccountDetail(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("projectId") Integer projectId, @Param("appType") Integer appType);
-
-    Integer getQuarterVideoCountByRoleCodeAndUserId(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("appType") Integer appType, @Param("userId") String userId, @Param("roleCode") String roleCode);
-
-    UserDto2 getProjectDesignResponsibleInfo(@Param("projectId") Long projectId);
-
-    List<VideoDTO> getKuaishouQuarterVideoInfoByAccountId(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("accountId") Long accountId);
-
-    List<VideoDTO> getToutiaoQuarterVideoInfoByAccountId(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("accountId") Long accountId);
-
-    SysUser getDesignLeaderInfoByDesignUserId(@Param("userId") String userId);
-
-    List<VideoDTO> getUserQuarterVideo(@Param("userId") String userId, @Param("year") Integer year, @Param("quarter") Integer quarter);
-
-    List<VideoDTO> getUserQuarterEffiVideo(@Param("userId") String userId, @Param("year") Integer year, @Param("quarter") Integer quarter);
-
-    BigDecimal getQuarterTotalCostByRoleCode(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("roleCode") String roleCode, @Param("userId") String userId);
-
-    List<String> getQuarterSignature(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("roleCode") String roleCode, @Param("userId") String userId);
-
-    BigDecimal getQuarterTotalCostByCode(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("signature") String signature);
-
-    BigDecimal getToutiaoQuarterTotalCostByCode(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("signature") String signature);
-
-    BigDecimal getToutiaoQuarterTotalCostByRoleCode(@Param("year") Integer year, @Param("quarter") Integer quarter, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("roleCode") String roleCode, @Param("userId") String userId);
-
-    List<AccountDTO> getAccountInfoByAppType(@Param("appType") Integer appType);
-}
-

文件差異過大導致無法顯示
+ 0 - 1774
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/xml/UserEfficientVideoMapMapper.xml


+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/service/IUserEfficientVideoMapService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.userefficientvideomap.service;
-
-import cn.com.ctop.userefficientvideomap.entity.UserEfficientVideoMap;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 有效视频与角色对应表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-16
- */
-public interface IUserEfficientVideoMapService extends IService<UserEfficientVideoMap> {
-
-}

+ 0 - 20
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/service/impl/UserEfficientVideoMapServiceImpl.java

@@ -1,20 +0,0 @@
-package cn.com.ctop.userefficientvideomap.service.impl;
-
-import cn.com.ctop.userefficientvideomap.entity.UserEfficientVideoMap;
-import cn.com.ctop.userefficientvideomap.mapper.UserEfficientVideoMapMapper;
-import cn.com.ctop.userefficientvideomap.service.IUserEfficientVideoMapService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 有效视频与角色对应表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-16
- */
-@Service
-public class UserEfficientVideoMapServiceImpl extends ServiceImpl<UserEfficientVideoMapMapper, UserEfficientVideoMap> implements IUserEfficientVideoMapService {
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/uservideomap/controller/UserVideoMapController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.uservideomap.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.uservideomap.entity.UserVideoMap;
-import cn.com.ctop.uservideomap.service.IUserVideoMapService;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 视频和设计师对应关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-03-17
- */
-@Slf4j
-@Api(tags = "视频和设计师对应关系表")
-@RestController
-@RequestMapping("/uservideomap/userVideoMap")
-public class UserVideoMapController {
-    @Autowired
-    private IUserVideoMapService userVideoMapService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param userVideoMap
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "视频和设计师对应关系表-分页列表查询")
-    @ApiOperation(value = "视频和设计师对应关系表-分页列表查询", notes = "视频和设计师对应关系表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<UserVideoMap>> queryPageList(UserVideoMap userVideoMap,
-                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                     HttpServletRequest req) {
-        Result<IPage<UserVideoMap>> result = new Result<>();
-        QueryWrapper<UserVideoMap> queryWrapper = QueryGenerator.initQueryWrapper(userVideoMap, req.getParameterMap());
-        Page<UserVideoMap> page = new Page<>(pageNo, pageSize);
-        IPage<UserVideoMap> pageList = userVideoMapService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param userVideoMap
-     * @return
-     */
-    @AutoLog(value = "视频和设计师对应关系表-添加")
-    @ApiOperation(value = "视频和设计师对应关系表-添加", notes = "视频和设计师对应关系表-添加")
-    @PostMapping(value = "/add")
-    public Result<UserVideoMap> add(@RequestBody UserVideoMap userVideoMap) {
-        Result<UserVideoMap> result = new Result<UserVideoMap>();
-        try {
-            userVideoMapService.save(userVideoMap);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param userVideoMap
-     * @return
-     */
-    @AutoLog(value = "视频和设计师对应关系表-编辑")
-    @ApiOperation(value = "视频和设计师对应关系表-编辑", notes = "视频和设计师对应关系表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<UserVideoMap> edit(@RequestBody UserVideoMap userVideoMap) {
-        Result<UserVideoMap> result = new Result<UserVideoMap>();
-        UserVideoMap userVideoMapEntity = userVideoMapService.getById(userVideoMap.getId());
-        if (userVideoMapEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = userVideoMapService.updateById(userVideoMap);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "视频和设计师对应关系表-通过id删除")
-    @ApiOperation(value = "视频和设计师对应关系表-通过id删除", notes = "视频和设计师对应关系表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            userVideoMapService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "视频和设计师对应关系表-批量删除")
-    @ApiOperation(value = "视频和设计师对应关系表-批量删除", notes = "视频和设计师对应关系表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<UserVideoMap> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<UserVideoMap> result = new Result<UserVideoMap>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.userVideoMapService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "视频和设计师对应关系表-通过id查询")
-    @ApiOperation(value = "视频和设计师对应关系表-通过id查询", notes = "视频和设计师对应关系表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<UserVideoMap> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<UserVideoMap> result = new Result<UserVideoMap>();
-        UserVideoMap userVideoMap = userVideoMapService.getById(id);
-        if (userVideoMap == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(userVideoMap);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<UserVideoMap> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                UserVideoMap userVideoMap = JSON.parseObject(deString, UserVideoMap.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(userVideoMap, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<UserVideoMap> pageList = userVideoMapService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "视频和设计师对应关系表列表");
-        mv.addObject(NormalExcelConstants.CLASS, UserVideoMap.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("视频和设计师对应关系表列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<UserVideoMap> listUserVideoMaps = ExcelImportUtil.importExcel(file.getInputStream(), UserVideoMap.class, params);
-                userVideoMapService.saveBatch(listUserVideoMaps);
-                return Result.ok("文件导入成功!数据行数:" + listUserVideoMaps.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-}

+ 0 - 117
performance-appraisal/src/main/java/cn/com/ctop/uservideomap/entity/UserVideoMap.java

@@ -1,117 +0,0 @@
-package cn.com.ctop.uservideomap.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 视频和设计师对应关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-03-17
- */
-@Data
-@TableName("ctop_user_video_map")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_user_video_map对象", description = "视频和设计师对应关系表")
-public class UserVideoMap {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * 有效视频md5
-     */
-    @Excel(name = "有效视频md5", width = 15)
-    @ApiModelProperty(value = "有效视频md5")
-    private String videoSignature;
-    /**
-     * 视频制作中担任的角色-不一定是自己原本的角色
-     */
-    @Excel(name = "视频制作中担任的角色-不一定是自己原本的角色", width = 15)
-    @ApiModelProperty(value = "视频制作中担任的角色-不一定是自己原本的角色")
-    private String roleId;
-    /**
-     * 用户id
-     */
-    @Excel(name = "用户id", width = 15)
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-    /**
-     * 季度
-     */
-    @Excel(name = "季度", width = 15)
-    @ApiModelProperty(value = "季度")
-    private Integer quarter;
-    /**
-     * 年
-     */
-    @Excel(name = "年", width = 15)
-    @ApiModelProperty(value = "年")
-    private Integer year;
-    /**
-     * 所属月
-     */
-    @Excel(name = "所属月", width = 15)
-    @ApiModelProperty(value = "所属月")
-    private Integer month;
-    /**
-     * 有效视频所属周开始时间
-     */
-    @Excel(name = "有效视频所属周开始时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "有效视频所属周开始时间")
-    private String weekStart;
-    /**
-     * 有效视频所属周结束时间
-     */
-    @Excel(name = "有效视频所属周结束时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "有效视频所属周结束时间")
-    private String weekEnd;
-    /**
-     * 用于计算所属年月季的基础日期
-     */
-    @Excel(name = "用于计算所属年月季的基础日期", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "用于计算所属年月季的基础日期")
-    private Date calcDate;
-    /**
-     * 视频所属分公司的id
-     */
-    @Excel(name = "视频所属分公司的id", width = 15)
-    @ApiModelProperty(value = "视频所属分公司的id")
-    private String companyId;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    private String creativeDate;
-
-    private Integer appType;
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/uservideomap/mapper/UserVideoMapMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.uservideomap.mapper;
-
-import cn.com.ctop.uservideomap.entity.UserVideoMap;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 视频和设计师对应关系表
- *
- * @author: jeecg-boot
- * @date: 2020-03-17
- * @cersion: V1.0
- */
-public interface UserVideoMapMapper extends BaseMapper<UserVideoMap> {
-
-}

+ 0 - 5
performance-appraisal/src/main/java/cn/com/ctop/uservideomap/mapper/xml/UserVideoMapMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.uservideomap.mapper.UserVideoMapMapper">
-
-</mapper>

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/uservideomap/service/IUserVideoMapService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.uservideomap.service;
-
-import cn.com.ctop.uservideomap.entity.UserVideoMap;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 视频和设计师对应关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-03-17
- */
-public interface IUserVideoMapService extends IService<UserVideoMap> {
-
-}

+ 0 - 20
performance-appraisal/src/main/java/cn/com/ctop/uservideomap/service/impl/UserVideoMapServiceImpl.java

@@ -1,20 +0,0 @@
-package cn.com.ctop.uservideomap.service.impl;
-
-import cn.com.ctop.uservideomap.entity.UserVideoMap;
-import cn.com.ctop.uservideomap.mapper.UserVideoMapMapper;
-import cn.com.ctop.uservideomap.service.IUserVideoMapService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 视频和设计师对应关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-03-17
- */
-@Service
-public class UserVideoMapServiceImpl extends ServiceImpl<UserVideoMapMapper, UserVideoMap> implements IUserVideoMapService {
-
-}

+ 0 - 2
pom.xml

@@ -21,9 +21,7 @@
         <module>module-toutiao</module>
         <module>module-shiwan</module>
         <module>module-alarm</module>
-        <module>module-media</module>
         <module>module-ctop</module>
-        <module>performance-appraisal</module>
         <module>module-check</module>
         <module>module-oa</module>
         <module>jeecg-boot-module-system</module>