细节修改

ddbebabf · 董有沛 · 1be4d0ed · 99b73392 · ddbebabf · ddbebabf
Commit ddbebabf authored Jun 01, 2020 by 董有沛
9 changed files
--- a/service-manager/src/main/java/com/winsun/controller/LzKpiController.java
+++ b/service-manager/src/main/java/com/winsun/controller/LzKpiController.java
--- a/service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
+++ b/service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
@@ -293,9 +293,6 @@ public class LzSalaryController extends BaseController {
            @RequestParam(name = "schoolName", required = false) String schoolName,@RequestParam(name = "month", required = false) String month,
            @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
        ShiroUser user = getShiroUser();
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
-            return ResponseData.error("无数据权限");
-        }
        Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
        List<Map<String,Object>> dataList = new ArrayList<>();
@@ -312,7 +309,7 @@ public class LzSalaryController extends BaseController {
        if(sysUserList.size()==0){
            page.setRecords(null);
            page.setTotal(0);
-            return ResponseData.success(page, "查询成功！");
+            return ResponseData.success(page);
        }
        List<Integer> schoolIds = new ArrayList<>();
        Wrapper<School> schoolWrapper = new EntityWrapper<>();
@@ -325,7 +322,7 @@ public class LzSalaryController extends BaseController {
        if(schoolList.size()==0){
            page.setRecords(null);
            page.setTotal(0);
-            return ResponseData.success(page, "查询成功！");
+            return ResponseData.success(page);
        }
        List<String> userIds2 = new ArrayList<>();
        Wrapper<UserSchool> usWrapper = new EntityWrapper<>();
@@ -353,7 +350,7 @@ public class LzSalaryController extends BaseController {
        if(lzWages.size()==0){
            page.setRecords(null);
            page.setTotal(0);
-            return ResponseData.success(page, "查询成功！");
+            return ResponseData.success(page);
        }
        for (LzWage lzWage : lzWages) {
            Map<String,Object> map = new HashMap<>();
@@ -390,7 +387,8 @@ public class LzSalaryController extends BaseController {
        if(lzWages.size() < pageSize) {
            dataList = list;
        }else {
-            dataList = list.subList((pageNo-1)*pageSize, pageNo*pageSize);
+            Integer endpageSize = (pageNo-1) == lzWages.size()/10?(pageNo-1)*pageSize+lzWages.size()%10:pageNo*pageSize;
+            dataList = list.subList((pageNo-1)*pageSize, endpageSize);
        }
        page.setRecords(dataList);

--- a/service-manager/src/main/java/com/winsun/controller/ManagerKpiController.java
+++ b/service-manager/src/main/java/com/winsun/controller/ManagerKpiController.java
@@ -178,9 +178,7 @@ public class ManagerKpiController extends BaseController {
            @RequestParam(name = "name", required = false) String name,@RequestParam(name = "month", required = false) String month,
            @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
        ShiroUser user = getShiroUser();
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
-            return ResponseData.error("无数据权限");
-        }
        Page<ManagerKpi> page = new Page<>(pageNo, pageSize);
        Wrapper<ManagerKpi> managerKpiWrapper = new EntityWrapper<>();
        managerKpiWrapper.like(StringUtils.isNotBlank(name),"name",name, SqlLike.DEFAULT);
@@ -215,6 +213,18 @@ public class ManagerKpiController extends BaseController {
        ShiroUser user = getShiroUser();
        Wrapper<ManagerKpi> managerKpiWrapper = new EntityWrapper<>();
+        managerKpiWrapper.like(StringUtils.isNotBlank(name),"name",name, SqlLike.DEFAULT);
+        if(StringUtils.isNotBlank(month)){
+            String[] months = month.split("\\,");
+            if(!month.equals(",") && StringUtils.isNotEmpty(month)){
+                String m1 = months[0].substring(0,7);
+                String month1 = m1.substring(0,4) + m1.substring(5);
+                String m2 = months[1].substring(0,7);
+                String month2 = m2.substring(0,4) + m2.substring(5);
+                managerKpiWrapper.ge(StringUtils.isNotBlank(month1),"month",month1);
+                managerKpiWrapper.le(StringUtils.isNotBlank(month2),"month",month2);
+            }
+        }
        List<ManagerKpi> managerKpiList = managerKpiMapper.selectList(managerKpiWrapper);
        List<Map<String, Object>> list = new LinkedList<>();
        for (ManagerKpi managerKpi : managerKpiList) {
@@ -347,6 +357,7 @@ public class ManagerKpiController extends BaseController {
        if (!hasDataPermission) {
            return ResponseData.error("无数据权限！");
        }
        ImportExcel importExcel = null;
        try {
            importExcel = new ImportExcel(file, HEADER_NUM, SHEET_INDEX);
@@ -473,10 +484,7 @@ public class ManagerKpiController extends BaseController {
            log.error("楼长总经理KPI信息导入异常", e.getMessage());
            return ResponseData.error("导入异常！");
        }
-        Wrapper<ManagerKpi> managerKpiWrapper = new EntityWrapper<>();
-        managerKpiMapper.delete(managerKpiWrapper);
        Integer number = 0;
-        Date acceptDate = new Date();
        for (int i = 1; i < listMap.size(); i++) {
            Map<String, Object> map = listMap.get(i);
            ManagerKpi managerKpi = new ManagerKpi();
@@ -530,7 +538,18 @@ public class ManagerKpiController extends BaseController {
            //绩效佣金= 应发绩效+累计分成
            managerKpi.setTotalPerformance((yfPerformance+totalFund)+"");
-            number  += managerKpiMapper.insert(managerKpi);
+            Wrapper<ManagerKpi> managerKpiWrapper = new EntityWrapper<>();
+            managerKpiWrapper.eq("name",managerKpi.getName());
+            managerKpiWrapper.eq("month",managerKpi.getMonth());
+            List<ManagerKpi> list = managerKpiMapper.selectList(managerKpiWrapper);
+            if(list.size() > 0){
+                Wrapper<ManagerKpi> kpiWrapper = new EntityWrapper<>();
+                kpiWrapper.eq("name",managerKpi.getName());
+                kpiWrapper.eq("month",managerKpi.getMonth());
+                number  += managerKpiMapper.update(managerKpi,kpiWrapper);
+            }else{
+                number  += managerKpiMapper.insert(managerKpi);
+            }
        }
        return ResponseData.success(error.toString(), "导入完成");
    }

--- a/service-manager/src/main/java/com/winsun/controller/NewUserController.java
+++ b/service-manager/src/main/java/com/winsun/controller/NewUserController.java
@@ -138,7 +138,9 @@ public class NewUserController extends BaseController {
        }
        List<SysUser> sysUserList = sysUserMapper.selectList(sysUserWrapper);
        if(sysUserList.size()==0){
-            return ResponseData.error("未找到数据！！！");
+            page.setRecords(null);
+            page.setTotal(0);
+            return ResponseData.success(page);
        }
        List<String> userIds0 = new ArrayList<>();
        for (SysUser sysUser : sysUserList) {
@@ -149,7 +151,9 @@ public class NewUserController extends BaseController {
        userSchoolWrapper.groupBy("user_id");
        List<UserSchool> userSchools = userSchoolMapper.selectList(userSchoolWrapper);
        if(userSchools.size()==0){
-            return ResponseData.error("未找到数据！！！");
+            page.setRecords(null);
+            page.setTotal(0);
+            return ResponseData.success(page);
        }
        List<String> schoolIds = new ArrayList<>();
        for (UserSchool userSchool : userSchools) {
@@ -161,7 +165,9 @@ public class NewUserController extends BaseController {
        schoolWrapper.eq(StringUtils.isNotBlank(salesSchool),"school_name",salesSchool);
        List<School> schoolList = schoolMapper.selectList(schoolWrapper);
        if(schoolList.size()==0){
-            return ResponseData.error("未找到数据！！！");
+            page.setRecords(null);
+            page.setTotal(0);
+            return ResponseData.success(page);
        }
        List<Integer> schoolIds0 = new ArrayList<>();
        List<String> userIds = new ArrayList<>();
@@ -180,7 +186,9 @@ public class NewUserController extends BaseController {
        hhrUserWrapper.in("id",userIds);
        List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
        if(hhrUserList.size()==0){
-            return ResponseData.error("未找到数据！！！");
+            page.setRecords(null);
+            page.setTotal(0);
+            return ResponseData.success(page);
        }
        /*List<String> userIds = new ArrayList<>();
        for (HhrUser hhrUser : hhrUserList) {

--- a/service-manager/src/main/java/com/winsun/controller/RegularController.java
+++ b/service-manager/src/main/java/com/winsun/controller/RegularController.java
@@ -78,9 +78,7 @@ public class RegularController extends BaseController {
    @Permission(menuname = "修改正则信息", value = "update", method = RequestMethod.POST)
    public ResponseData<String> updateProduct(@RequestParam("regular") String regular) {
        ShiroUser user = getShiroUser();
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
-            return ResponseData.error("无数据权限");
-        }
        Regular pro = JSON.parseObject(regular, Regular.class);
        Wrapper wrapper = new EntityWrapper<>();
        wrapper.eq("regular_id", pro.getRegularId());

--- a/service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java
+++ b/service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java
@@ -230,9 +230,7 @@ public class StudentCardVerifyController extends BaseController {
            @RequestParam(name = "pageNo") int pageNo,
            @RequestParam(name = "pageSize") int pageSize) {
        ShiroUser user = getShiroUser();
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
-            return ResponseData.error("无数据权限");
-        }
        Page<StudentCard> page = new Page<>(pageNo, pageSize);
        Wrapper<StudentCard> studentCardWrapper = new EntityWrapper<>();
        studentCardWrapper.like(StringUtils.isNotBlank(userName),"user_name",userName, SqlLike.DEFAULT);

--- a/service-manager/src/main/java/com/winsun/controller/YxtCouponController.java
+++ b/service-manager/src/main/java/com/winsun/controller/YxtCouponController.java
@@ -149,9 +149,6 @@ public class YxtCouponController extends BaseController {
            @RequestParam(name = "shelfState", required = false) String shelfState,
            @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
        ShiroUser user = getShiroUser();
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
-            return ResponseData.error("无数据权限");
-        }
        Page<YxtCoupon> page = new Page<>(pageNo, pageSize);

--- a/service-manager/src/main/java/com/winsun/controller/YxtOrderController.java
+++ b/service-manager/src/main/java/com/winsun/controller/YxtOrderController.java
@@ -165,6 +165,7 @@ public class YxtOrderController extends BaseController {
            @RequestParam(name = "orderNum", required = false) String orderNum,
            @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
        ShiroUser user = getShiroUser();
        String month1 = "";
        String month2 = "";
        if (StringUtils.isNotBlank(month)) {
@@ -262,7 +263,8 @@ public class YxtOrderController extends BaseController {
        if (yxtOrders.size() < pageSize) {
            dataList = list;
        } else {
-            dataList = list.subList((pageNo - 1) * pageSize, pageNo * pageSize);
+            Integer endpageSize = (pageNo-1) == yxtOrders.size()/10?(pageNo-1)*pageSize+yxtOrders.size()%10:pageNo*pageSize;
+            dataList = list.subList((pageNo-1)*pageSize, endpageSize);
        }
        page.setRecords(dataList);

--- a/service-manager/src/main/java/com/winsun/controller/zjlSalaryController.java
+++ b/service-manager/src/main/java/com/winsun/controller/zjlSalaryController.java
@@ -176,9 +176,6 @@ public class zjlSalaryController extends BaseController {
            @RequestParam(name = "name", required = false) String name,@RequestParam(name = "month", required = false) String month,
            @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
        ShiroUser user = getShiroUser();
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
-            return ResponseData.error("无数据权限");
-        }
        Page<ZjlWage> page = new Page<>(pageNo, pageSize);
        List<ZjlWage> dataList = new LinkedList<>();