|
@@ -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");
|