自测问题部分修改

service-manager/src/main/java/com/winsun/controller/LzKpiController.java

@@ -278,11 +278,11 @@ public class LzKpiController extends BaseController {
             }
             }
             list.add(map);
             list.add(map);
         }
         }
-
         if(lzKpis.size() < pageSize) {
         if(lzKpis.size() < pageSize) {
             dataList = list;
             dataList = list;
         }else {
         }else {
-            dataList = list.subList((pageNo-1)*pageSize, pageNo*pageSize);
+            Integer endpageSize = (pageNo-1) == lzKpis.size()/10?(pageNo-1)*pageSize+lzKpis.size()%10:pageNo*pageSize;
+            dataList = list.subList((pageNo-1)*pageSize, endpageSize);
         }
         }
 
 
         page.setRecords(dataList);
         page.setRecords(dataList);

service-manager/src/main/java/com/winsun/controller/LzSalaryController.java

@@ -387,7 +387,8 @@ public class LzSalaryController extends BaseController {
         if(lzWages.size() < pageSize) {
         if(lzWages.size() < pageSize) {
             dataList = list;
             dataList = list;
         }else {
         }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);
         page.setRecords(dataList);

service-manager/src/main/java/com/winsun/controller/ManagerKpiController.java

@@ -213,6 +213,18 @@ public class ManagerKpiController extends BaseController {
         ShiroUser user = getShiroUser();
         ShiroUser user = getShiroUser();
 
 
         Wrapper<ManagerKpi> managerKpiWrapper = new EntityWrapper<>();
         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<ManagerKpi> managerKpiList = managerKpiMapper.selectList(managerKpiWrapper);
         List<Map<String, Object>> list = new LinkedList<>();
         List<Map<String, Object>> list = new LinkedList<>();
         for (ManagerKpi managerKpi : managerKpiList) {
         for (ManagerKpi managerKpi : managerKpiList) {
@@ -345,6 +357,7 @@ public class ManagerKpiController extends BaseController {
         if (!hasDataPermission) {
         if (!hasDataPermission) {
             return ResponseData.error("无数据权限！");
             return ResponseData.error("无数据权限！");
         }
         }
+
         ImportExcel importExcel = null;
         ImportExcel importExcel = null;
         try {
         try {
             importExcel = new ImportExcel(file, HEADER_NUM, SHEET_INDEX);
             importExcel = new ImportExcel(file, HEADER_NUM, SHEET_INDEX);
@@ -471,10 +484,7 @@ public class ManagerKpiController extends BaseController {
             log.error("楼长总经理KPI信息导入异常", e.getMessage());
             log.error("楼长总经理KPI信息导入异常", e.getMessage());
             return ResponseData.error("导入异常！");
             return ResponseData.error("导入异常！");
         }
         }
-        Wrapper<ManagerKpi> managerKpiWrapper = new EntityWrapper<>();
-        managerKpiMapper.delete(managerKpiWrapper);
         Integer number = 0;
         Integer number = 0;
-        Date acceptDate = new Date();
         for (int i = 1; i < listMap.size(); i++) {
         for (int i = 1; i < listMap.size(); i++) {
             Map<String, Object> map = listMap.get(i);
             Map<String, Object> map = listMap.get(i);
             ManagerKpi managerKpi = new ManagerKpi();
             ManagerKpi managerKpi = new ManagerKpi();
@@ -528,8 +538,19 @@ public class ManagerKpiController extends BaseController {
             //绩效佣金= 应发绩效+累计分成
             //绩效佣金= 应发绩效+累计分成
             managerKpi.setTotalPerformance((yfPerformance+totalFund)+"");
             managerKpi.setTotalPerformance((yfPerformance+totalFund)+"");
 
 
+            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);
                 number  += managerKpiMapper.insert(managerKpi);
             }
             }
+        }
         return ResponseData.success(error.toString(), "导入完成");
         return ResponseData.success(error.toString(), "导入完成");
     }
     }
 }
 }

service-manager/src/main/java/com/winsun/controller/YxtOrderController.java

@@ -263,7 +263,8 @@ public class YxtOrderController extends BaseController {
         if (yxtOrders.size() < pageSize) {
         if (yxtOrders.size() < pageSize) {
             dataList = list;
             dataList = list;
         } else {
         } 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);
         page.setRecords(dataList);