Преглед на файлове

运营绩效功能,初版

zhaoxian преди 2 години
родител
ревизия
9439474196

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/AccountCompensationMapper.java

@@ -22,4 +22,6 @@ public interface AccountCompensationMapper extends BaseMapper<AccountCompensatio
     BigDecimal getCompMoney(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
     JSONObject getAccountUser(@Param("accountId") Long accountId);
+
+    List<JSONObject> queryAccountCompensation(AccountCompensation accountCompensation);
 }

+ 19 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/xml/AccountCompensationMapper.xml

@@ -41,4 +41,23 @@
                  LEFT JOIN sys_user t2 ON t1.user_id = t2.id
         WHERE t1.account_id = #{accountId}
     </select>
+
+    <select id="queryAccountCompensation" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            t1.user_id as 'userId',
+            t1.start_date as 'startDate',
+            t1.end_date as 'endDate',
+            t1.account_id as 'accountId',
+            t1.project_id as 'projectId',
+            t1.comp_money as 'compMoney',
+            t1.media_id as 'mediaId',
+            t1.create_by as 'createBy',
+            t1.create_time as 'createTime',
+            t2.realname,
+            t3.auth_name
+        FROM `ctop_account_compensation` t1
+                 LEFT JOIN sys_user t2 ON t1.user_id = t2.id
+                 LEFT JOIN ctop_user_allocation t3 ON t1.account_id = t3.account_id
+        ORDER BY t1.create_time desc
+    </select>
 </mapper>

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/IAccountCompensationService.java

@@ -21,4 +21,6 @@ public interface IAccountCompensationService extends IService<AccountCompensatio
     BigDecimal getCompMoney(String userId, String startDate, String endDate);
 
     JSONObject getAccountUser(Long account);
+
+    List<JSONObject> queryAccountCompensation(AccountCompensation accountCompensation);
 }

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/AccountCompensationServiceImpl.java

@@ -34,4 +34,9 @@ public class AccountCompensationServiceImpl extends ServiceImpl<AccountCompensat
     public JSONObject getAccountUser(Long accountId) {
         return baseMapper.getAccountUser(accountId);
     }
+
+    @Override
+    public List<JSONObject> queryAccountCompensation(AccountCompensation accountCompensation) {
+        return baseMapper.queryAccountCompensation(accountCompensation);
+    }
 }

+ 14 - 22
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KuaishouOperationReportController.java

@@ -6,15 +6,14 @@ import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouOperationReport;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouOperationReportService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 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.entity.SysUser;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.system.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -198,18 +196,12 @@ public class KuaishouOperationReportController {
     }
 
     @PostMapping(value = "/queryAccountCompensation")
-    public Result<IPage<AccountCompensation>> queryAccountCompensation(AccountCompensation accountCompensation,
-                                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                       HttpServletRequest req) {
-        Result<IPage<AccountCompensation>> result = new Result<>();
-        QueryWrapper<AccountCompensation> queryWrapper = QueryGenerator.initQueryWrapper(accountCompensation, req.getParameterMap());
-        Page<AccountCompensation> page = new Page<AccountCompensation>(pageNo, pageSize);
-        queryWrapper.orderByDesc("create_time");
-        IPage<AccountCompensation> pageList = compensationService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
+    public Result<Object> queryAccountCompensation(AccountCompensation accountCompensation,
+                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        PageHelper.startPage(pageNo, pageSize);
+        List<JSONObject> pageList = compensationService.queryAccountCompensation(accountCompensation);
+        return Result.ok(new PageInfo<>(pageList));
     }
 
     @GetMapping(value = "/getAllOperatorList")
@@ -241,18 +233,18 @@ public class KuaishouOperationReportController {
      * 修改运营绩效发放系数
      */
     @GetMapping(value = "/updateUserSalary")
-    public Result<Object> updateUserSalaryRatio(String userId, String putSalaryRatio, String putSalary) {
+    public Result<Object> updateUserSalaryRatio(String userId, String paySalaryRatio, String paySalary) {
         try {
             SysUser user = new SysUser();
             user.setId(userId);
             if (Check.isNull(userId)) {
                 Result.error("请选择人员");
             }
-            if (!Check.isNull(putSalaryRatio)) {
-                user.setPaySalaryRatio(putSalaryRatio);
+            if (!Check.isNull(paySalaryRatio)) {
+                user.setPaySalaryRatio(paySalaryRatio);
             }
-            if (!Check.isNull(putSalary)) {
-                user.setPaySalary(putSalary);
+            if (!Check.isNull(paySalary)) {
+                user.setPaySalary(paySalary);
             }
             sysUserService.updateById(user);
             return Result.ok("success");