Merge remote-tracking branch 'origin/master'

common/src/main/java/com/winsun/bean/ManagerKpi.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 〈总经理KPI信息类〉
+ *
+ * @author PXL
+ * @create 2020/4/30 15:40
+ */
+@Data
+@TableName("hhr_manager_kpi")
+public class ManagerKpi implements Serializable {
+    /**
+     *日期月份
+     */
+    @TableField("month")
+    private String month;
+    /**
+     *县分
+     */
+    @TableField("county")
+    private String county;
+    /**
+     *督导
+     */
+    @TableField("name")
+    private String name;
+    /**
+     * 绩效奖金合计
+     */
+    @TableField("total_performance")
+    private String totalPerformance;
+    /**
+     * 绩效基数
+     */
+    @TableField("performance_base")
+    private Integer performanceBase;
+    /**
+     *应发绩效
+     */
+    @TableField("yf_performance")
+    private double yfPerformance;
+    /**
+     *kpi总分
+     */
+    @TableField("kpi")
+    private Integer kpi;
+    /**
+     *移动入网kpi
+     */
+    @TableField("rw_kpi")
+    private Integer rwKpi;
+    /**
+     *存量维系kpi
+     */
+    @TableField("wx_kpi")
+    private Integer wxKpi;
+    /**
+     *团队运营kpi
+     */
+    @TableField("yy_kpi")
+    private Integer yyKpi;
+    /**
+     *每月工作kpi
+     */
+    @TableField("work_kpi")
+    private Integer workKpi;
+    /**
+     * 2018年5月至今累计佣金
+     */
+    @TableField("total_bonus")
+    private double totalBonus;
+    /**
+     * 2018年5月至今累计分成
+     */
+    @TableField("total_fund")
+    private double totalFund;
+    /**
+     *秋营达标奖
+     */
+    @TableField("autumn_bonus")
+    private double autumnBonus;
+    /**
+     *应发提成
+     */
+    @TableField("yf_bonus")
+    private double yfBonus;
+
+}

common/src/main/java/com/winsun/mapper/ManagerKpiMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.ManagerKpi;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * 〈总经理KPI Mapper〉
+ *
+ * @author PXL
+ * @create 2020/4/30 15:55
+ */
+@Mapper
+@Component
+public interface ManagerKpiMapper extends BaseMapper<ManagerKpi> {
+}

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

@@ -41,7 +41,7 @@ import java.io.IOException;
 import java.util.*;
 
 /**
- * 正则校检
+ * 楼长KPI校检
  * @Author: xiangli
  * @Date:
  */
@@ -81,12 +81,12 @@ public class LzKpiController extends BaseController {
     @Qualifier("redisStringTemplate")
     private RedisTemplate redisTemplate;
     /**
-     * 正则添加
+     * 楼长KPI添加
      *
      * @param lzKpi 添加对象json字符串
      * @return
      */
-    @Permission(menuname = "添加正则信息", value = "insert", method = RequestMethod.POST)
+    @Permission(menuname = "添加楼长KPI信息", value = "insert", method = RequestMethod.POST)
     public ResponseData<String> insertProduct(@RequestParam("lzKpi") String lzKpi) {
         ShiroUser user = getShiroUser();
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
@@ -121,7 +121,7 @@ public class LzKpiController extends BaseController {
      * @param id 需要删除的id
      * @return
      */
-    @Permission(menuname = "删除正则信息", value = "delete", method = RequestMethod.POST)
+    @Permission(menuname = "删除楼长KPI信息", value = "delete", method = RequestMethod.POST)
     public ResponseData<String> deleteProduct(@RequestParam(name="id", required = false) String id,@RequestParam(name="isdel", required = false) String isdel) {
         ShiroUser user = getShiroUser();
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
@@ -140,12 +140,12 @@ public class LzKpiController extends BaseController {
     }
 
     /**
-     * 正则信息编辑
+     * 楼长KPI信息编辑
      *
      * @param lzKpi 编辑对象json字符串
      * @return
      */
-    @Permission(menuname = "修改正则信息", value = "update", method = RequestMethod.POST)
+    @Permission(menuname = "修改楼长KPI信息", value = "update", method = RequestMethod.POST)
     public ResponseData<String> updateProduct(@RequestParam("lzKpi") String lzKpi) {
         ShiroUser user = getShiroUser();
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
@@ -206,7 +206,7 @@ public class LzKpiController extends BaseController {
      * @param pageSize
      * @return
      */
-    @Permission(menuname = "查询KPI信息", value = "list", method = RequestMethod.POST)
+    @Permission(menuname = "查询楼长KPI信息", value = "list", method = RequestMethod.POST)
     public ResponseData<Page<Map<String,Object>>> listProduct(
             @RequestParam(name = "userName", required = false) String userName,@RequestParam(name = "substName", required = false) String substName,
             @RequestParam(name = "schoolName", required = false) String schoolName,@RequestParam(name = "month", required = false) String month,
@@ -330,7 +330,7 @@ public class LzKpiController extends BaseController {
      * @param pageSize
      * @return
      */
-    @Permission(menuname = "导出KPI信息", value = "excelOut", method = RequestMethod.POST)
+    @Permission(menuname = "导出楼长KPI信息", value = "excelOut", method = RequestMethod.POST)
     public void excelOut(
             @RequestParam(name = "userName", required = false) String userName,@RequestParam(name = "substName", required = false) String substName,
             @RequestParam(name = "schoolName", required = false) String schoolName,@RequestParam(name = "month", required = false) String month,
@@ -441,7 +441,7 @@ public class LzKpiController extends BaseController {
      *
      * @return
      */
-    @Permission(menuname = "楼长KPI管理信息导入模板", method = RequestMethod.POST, value = "downloadMoBan")
+    @Permission(menuname = "楼长KPI信息导入模板", method = RequestMethod.POST, value = "downloadMoBan")
     public ResponseData downloadMoBan() {
         ArrayList<String> columns = new ArrayList<>();
         columns.add(SL_reportDaily);
@@ -459,7 +459,7 @@ public class LzKpiController extends BaseController {
         XSSFWorkbook workbook = new XSSFWorkbook();
         try {
             //创建工作表
-            XSSFSheet sheet = workbook.createSheet("楼长KPI管理信息");
+            XSSFSheet sheet = workbook.createSheet("楼长KPI信息");
             sheet.setColumnWidth(0, 3000);
             sheet.setColumnWidth(1, 3000);
             sheet.setColumnWidth(2, 3000);
@@ -493,11 +493,11 @@ public class LzKpiController extends BaseController {
             workbook.write(os);
             os.flush();
         } catch (IOException e) {
-            log.error("楼长KPI管理信息模板文件出错！" + e.getMessage(), e);
+            log.error("楼长KPI信息模板文件出错！" + e.getMessage(), e);
         } finally {
             IOUtils.closeQuite(workbook, os);
         }
-        return ResponseData.error("楼长KPI管理信息模板出错");
+        return ResponseData.error("楼长KPI信息模板出错");
     }
 
     XSSFSheet getXSSFSheet(XSSFSheet sheet, List<String> datas, int firstcol, int lastcol) {
@@ -538,7 +538,7 @@ public class LzKpiController extends BaseController {
         try {
             importExcel = new ImportExcel(file, HEADER_NUM, SHEET_INDEX);
         } catch (Exception e) {
-            log.error("楼长KPI管理信息导入异常", e.getMessage());
+            log.error("楼长KPI信息导入异常", e.getMessage());
             return ResponseData.error("导入异常！");
         }
         List<Map<String, Object>> listMap = importExcel.getDataListMap();
@@ -684,7 +684,7 @@ public class LzKpiController extends BaseController {
                 return ResponseData.error("文件中有重复的用户账号，请确认用户账号不能重复!");
             }*/
         } catch (Exception e) {
-            log.error("楼长KPI管理信息导入异常", e.getMessage());
+            log.error("楼长KPI信息导入异常", e.getMessage());
             return ResponseData.error("导入异常！");
         }
 

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

@@ -35,7 +35,7 @@ import java.io.IOException;
 import java.util.*;
 
 /**
- * 楼长薪水管理
+ * 楼长薪酬管理
  * @Author: pxl
  * @create 2020/4/29 14:08
  */
@@ -49,7 +49,7 @@ public class LzSalaryController extends BaseController {
     private static final int HEADER_NUM = -1;
     private static final int SHEET_INDEX = 0;
     /**
-     * 楼长薪水信息模板列名
+     * 楼长薪酬信息模板列名
      */
     private static String SL_month = "KPI月份";
     private static String SL_substName = "县分";
@@ -79,12 +79,12 @@ public class LzSalaryController extends BaseController {
     @Qualifier("redisStringTemplate")
     private RedisTemplate redisTemplate;
     /**
-     * 正则添加
+     * 楼长薪酬添加
      *
      * @param lzKpi 添加对象json字符串
      * @return
      */
-    @Permission(menuname = "添加楼长薪水信息", value = "insert", method = RequestMethod.POST)
+    @Permission(menuname = "添加楼长薪酬信息", value = "insert", method = RequestMethod.POST)
     public ResponseData<String> insertProduct(@RequestParam("lzKpi") String lzKpi) {
         ShiroUser user = getShiroUser();
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
@@ -113,11 +113,11 @@ public class LzSalaryController extends BaseController {
     }
 
     /**
-     * 楼长薪水删除
+     * 楼长薪酬删除
      * @param id 需要删除的id
      * @return
      */
-    @Permission(menuname = "删除正则信息", value = "delete", method = RequestMethod.POST)
+    @Permission(menuname = "删除楼长薪酬信息", value = "delete", method = RequestMethod.POST)
     public ResponseData<String> deleteProduct(@RequestParam(name="id", required = false) String id,@RequestParam(name="isdel", required = false) String isdel) {
         ShiroUser user = getShiroUser();
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
@@ -136,11 +136,11 @@ public class LzSalaryController extends BaseController {
     }
 
     /**
-     * 修改楼长薪水信息
+     * 修改楼长薪酬信息
      * @param lzKpi 编辑对象json字符串
      * @return
      */
-    @Permission(menuname = "修改楼长薪水信息", value = "update", method = RequestMethod.POST)
+    @Permission(menuname = "修改楼长薪酬信息", value = "update", method = RequestMethod.POST)
     public ResponseData<String> updateProduct(@RequestParam("lzKpi") String lzKpi) {
         ShiroUser user = getShiroUser();
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
@@ -315,7 +315,7 @@ public class LzSalaryController extends BaseController {
      * @param pageSize
      * @return
      */
-    @Permission(menuname = "查询楼长薪水信息", value = "list", method = RequestMethod.POST)
+    @Permission(menuname = "查询楼长薪酬信息", value = "list", method = RequestMethod.POST)
     public ResponseData<Page<Map<String,Object>>> listProduct(
             @RequestParam(name = "userName", required = false) String userName,@RequestParam(name = "substName", required = false) String substName,
             @RequestParam(name = "schoolName", required = false) String schoolName,@RequestParam(name = "month", required = false) String month,
@@ -437,7 +437,7 @@ public class LzSalaryController extends BaseController {
      * @param pageSize
      * @return
      */
-    @Permission(menuname = "导出楼长薪水信息", value = "excelOut", method = RequestMethod.POST)
+    @Permission(menuname = "导出楼长薪酬信息", value = "excelOut", method = RequestMethod.POST)
     public void excelOut(
             @RequestParam(name = "userName", required = false) String userName,@RequestParam(name = "substName", required = false) String substName,
             @RequestParam(name = "schoolName", required = false) String schoolName,@RequestParam(name = "month", required = false) String month,
@@ -526,7 +526,7 @@ public class LzSalaryController extends BaseController {
             list.add(map);
         }
         ServletOutputStream os = null;
-        XSSFWorkbook workbook = ExcelDealUtils.getWorkBook(ExcelDealUtils.wageExcel("楼长楼长薪水清单"), list);
+        XSSFWorkbook workbook = ExcelDealUtils.getWorkBook(ExcelDealUtils.wageExcel("楼长楼长薪酬清单"), list);
         try {
             HttpServletResponse response = getHttpServletResponse();
             response.reset();
@@ -547,7 +547,7 @@ public class LzSalaryController extends BaseController {
      *
      * @return
      */
-    @Permission(menuname = "楼长楼长薪水管理信息导入模板", method = RequestMethod.POST, value = "downloadMoBan")
+    @Permission(menuname = "楼长楼长薪酬管理信息导入模板", method = RequestMethod.POST, value = "downloadMoBan")
     public ResponseData downloadMoBan() {
         ArrayList<String> columns = new ArrayList<>();
         columns.add(SL_month);
@@ -563,7 +563,7 @@ public class LzSalaryController extends BaseController {
         XSSFWorkbook workbook = new XSSFWorkbook();
         try {
             //创建工作表
-            XSSFSheet sheet = workbook.createSheet("楼长楼长薪水管理信息");
+            XSSFSheet sheet = workbook.createSheet("楼长楼长薪酬管理信息");
             sheet.setColumnWidth(0, 3000);
             sheet.setColumnWidth(1, 3000);
             sheet.setColumnWidth(2, 5000);
@@ -595,11 +595,11 @@ public class LzSalaryController extends BaseController {
             workbook.write(os);
             os.flush();
         } catch (IOException e) {
-            log.error("楼长楼长薪水管理信息模板文件出错！" + e.getMessage(), e);
+            log.error("楼长楼长薪酬管理信息模板文件出错！" + e.getMessage(), e);
         } finally {
             IOUtils.closeQuite(workbook, os);
         }
-        return ResponseData.error("楼长楼长薪水管理信息模板出错");
+        return ResponseData.error("楼长楼长薪酬管理信息模板出错");
     }
 
     XSSFSheet getXSSFSheet(XSSFSheet sheet, List<String> datas, int firstcol, int lastcol) {
@@ -640,7 +640,7 @@ public class LzSalaryController extends BaseController {
         try {
             importExcel = new ImportExcel(file, HEADER_NUM, SHEET_INDEX);
         } catch (Exception e) {
-            log.error("楼长楼长薪水管理信息导入异常", e.getMessage());
+            log.error("楼长楼长薪酬管理信息导入异常", e.getMessage());
             return ResponseData.error("导入异常！");
         }
         List<Map<String, Object>> listMap = importExcel.getDataListMap();
@@ -778,7 +778,7 @@ public class LzSalaryController extends BaseController {
                 return ResponseData.error("文件中有重复的用户账号，请确认用户账号不能重复!");
             }*/
         } catch (Exception e) {
-            log.error("楼长楼长薪水管理信息导入异常", e.getMessage());
+            log.error("楼长楼长薪酬管理信息导入异常", e.getMessage());
             return ResponseData.error("导入异常！");
         }