Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -458,10 +458,16 @@ export default {
         this.form.month = undefined;
       }
       if (this.form.createTimeMonth) {
-        this.form.createTimeStart = this.form.createTimeMonth + "-01";
-        this.form.createTimeEnd = this.form.createTimeMonth + "-31";
+        // this.form.createTimeStart = this.form.createTimeMonth + "-01";
+        // this.form.createTimeEnd = this.form.createTimeMonth + "-31";
         this.form.errorTimeStart = this.form.createTimeMonth + "-01";
         this.form.errorTimeEnd = this.form.createTimeMonth + "-31";
+        this.form.reviewTimeStart = this.form.createTimeMonth + "-01";
+        this.form.reviewTimeEnd = this.form.createTimeMonth + "-31";
+        this.form.complainTimeStart = this.form.createTimeMonth + "-01";
+        this.form.complainTimeEnd = this.form.createTimeMonth + "-31";
+        this.form.goworkTimeStart = this.form.createTimeMonth + "-01";
+        this.form.goworkTimeEnd = this.form.createTimeMonth + "-31";
       } else if (this.form.createTimeStart1 || this.form.createTimeEnd1) {
         this.form.createTimeStart = this.form.createTimeStart1;
         this.form.createTimeEnd = this.form.createTimeEnd1;

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue

@@ -9,7 +9,7 @@
         <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
         </LayoutTable>
       </el-tab-pane>
-      <el-tab-pane label="数据分析" name="3">
+      <!-- <el-tab-pane label="数据分析" name="3">
         <div class="content">
           <div class="search_box">
             <div class="search">
@@ -61,7 +61,7 @@
             </div>
           </div>
         </div>
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
     <!-- <bar-charts
       :title="'部门扣分排名TOP10'"
@@ -112,6 +112,12 @@ export default {
             processStatus: this.activeName,
             page: this.query.page,
             size: this.query.size,
+            appealTimeStart: this.query.yearmonth
+              ? this.query.yearmonth + "-01"
+              : "",
+            appealTimeEnd: this.query.yearmonth
+              ? this.query.yearmonth + "-31"
+              : "",
           }).then((res) => {
             if (res.code == 1) {
               this.tableData = res.data;
@@ -200,9 +206,9 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "datetime",
-            label: "请选择日期",
+            name: "yearmonth",
+            type: "month",
+            label: "请选择申诉时间",
             fuzzy: false,
           },
           {
@@ -302,55 +308,55 @@ export default {
       activeName: "1",
       optionsMonths: [
         {
-          value: "2023-01-01 00:00:00",
+          value: "2024-01-01 00:00:00",
           label: "1月",
         },
         {
-          value: "2023-02-01 00:00:00",
+          value: "2024-02-01 00:00:00",
           label: "2月",
         },
         {
-          value: "2023-03-01 00:00:00",
+          value: "2024-03-01 00:00:00",
           label: "3月",
         },
         {
-          value: "2023-04-01 00:00:00",
+          value: "2024-04-01 00:00:00",
           label: "4月",
         },
         {
-          value: "2023-05-01 00:00:00",
+          value: "2024-05-01 00:00:00",
           label: "5月",
         },
         {
-          value: "2023-06-01 00:00:00",
+          value: "2024-06-01 00:00:00",
           label: "6月",
         },
         {
-          value: "2023-07-01 00:00:00",
+          value: "2024-07-01 00:00:00",
           label: "7月",
         },
         {
-          value: "2023-08-01 00:00:00",
+          value: "2024-08-01 00:00:00",
           label: "8月",
         },
         {
-          value: "2023-09-01 00:00:00",
+          value: "2024-09-01 00:00:00",
           label: "9月",
         },
         {
-          value: "2023-10-01 00:00:00",
+          value: "2024-10-01 00:00:00",
           label: "10月",
         },
         {
-          value: "2023-11-01 00:00:00",
+          value: "2024-11-01 00:00:00",
           label: "11月",
         },
         {
-          value: "2023-12-01 00:00:00",
+          value: "2024-12-01 00:00:00",
           label: "12月",
         },
       ],
-      dateValue: "2023-07-01 00:00:00",
+      dateValue: "2024-03-01 00:00:00",
     };
   },
 };

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue

@@ -17,7 +17,7 @@
         <el-row style="width: 100%;margin-bottom: 10px;">
           <el-form-item label="选择部门">
             <el-col :span="23">
-              <el-select v-model="form.deptId" style="width: 100%;">
+              <el-select v-model="form.deptId" filterable style="width: 100%;">
                 <el-option
                   v-for="item in deptArr"
                   :key="item.id"
@@ -361,7 +361,7 @@ export default {
 
           { label: "评分标准", prop: "content" },
 
-          { label: "分值", prop: "score" },
+          { label: "分值", prop: "score", formatter: this.formatter },
 
           {
             label: "操作",

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/drawershow.vue

@@ -400,7 +400,7 @@ export default {
 
           { label: "评分标准", prop: "content" },
 
-          { label: "分值", prop: "score" },
+          { label: "分值", prop: "score", formatter: this.formatter },
 
           {
             label: "操作",

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java

@@ -59,7 +59,7 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                             if(query.getCheckType() == CheckTypeEnum.其它绩效.getValue()){
                                 checkWindowWorkmanPerformService.summaryCheck(query);
                             }
-                            if(query.getCheckType()!=null){
+                            if(query.getCheckType()==null){
                                 log.info("绩效分数汇总开始");
                                 checkAttendRecordService.summaryCheck(query);
                                 checkEffectRecordService.summaryCheck(query);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/StaffCheckSummaryVo.java

 package com.mortals.xhx.module.check.model.vo;
 
+import com.mortals.framework.annotation.Excel;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -41,4 +42,13 @@ public class StaffCheckSummaryVo {
      * 月
      */
     private Integer month;
+
+    /**
+     * 所属大厅
+     */
+    private Long salaId;
+    /**
+     * 所属大厅名称
+     */
+    private String salaName;
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendAppealVo.java

@@ -13,10 +13,11 @@ import java.util.Date;
 @Data
 public class PerformAttendAppealVo extends BaseEntityLong {
 
-    /**
-     * 时间
-     */
+    /** 开始 申诉时间 */
     private String appealTimeStart;
+
+    /** 结束 申诉时间 */
+    private String appealTimeEnd;
     /**
      * 统计类型(1.申诉次数部门排名,2.申诉次数个人排名,3.申诉次数规则排名)
      */

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java

@@ -20,4 +20,10 @@ public class PerformAttendRecordVo extends BaseEntityLong {
 
     /** 结束 创建时间 */
     private String createTimeEnd;
+
+    /** 开始 异常时间 */
+    private String errorTimeStart;
+
+    /** 结束 异常时间 */
+    private String errorTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java

@@ -20,4 +20,9 @@ public class PerformComplainRecordVo extends BaseEntityLong {
 
     /** 结束 创建时间 */
     private String createTimeEnd;
+    /** 开始 投诉时间 */
+    private String complainTimeStart;
+
+    /** 结束 投诉时间 */
+    private String complainTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java

@@ -20,4 +20,9 @@ public class PerformEffectRecordVo extends BaseEntityLong {
 
     /** 结束 创建时间 */
     private String createTimeEnd;
+    /** 开始 发生时间 */
+    private String happenTimeStart;
+
+    /** 结束 发生时间 */
+    private String happenTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java

@@ -20,4 +20,9 @@ public class PerformGoworkRecordVo extends BaseEntityLong {
 
     /** 结束 创建时间 */
     private String createTimeEnd;
+    /** 开始 办理时间 */
+    private String goworkTimeStart;
+
+    /** 结束 办理时间 */
+    private String goworkTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java

@@ -20,4 +20,9 @@ public class PerformOtherRecordVo extends BaseEntityLong {
 
     /** 结束 创建时间 */
     private String createTimeEnd;
+    /** 开始 发生时间 */
+    private String happenTimeStart;
+
+    /** 结束 发生时间 */
+    private String happenTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java

@@ -20,4 +20,9 @@ public class PerformReviewRecordVo extends BaseEntityLong {
 
     /** 结束 创建时间 */
     private String createTimeEnd;
+    /** 开始 评价时间 */
+    private String reviewTimeStart;
+
+    /** 结束 评价时间 */
+    private String reviewTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java

@@ -35,6 +35,7 @@ import com.mortals.xhx.module.perform.service.PerformAttendAppealService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -100,13 +101,15 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
     @Override
     protected void doListBefore(PerformAttendAppealEntity query, Map<String, Object> model, Context context) throws AppException {
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("appealTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("appealTime", OrderCol.DESCENDING));
         }
-        if (!ObjectUtils.isEmpty(query.getCreateTime())) {
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getAppealTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+            query.setAppealTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+            //query.setAppealTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java

@@ -22,6 +22,8 @@ import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformAttendRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -74,14 +76,16 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
     protected void doListBefore(PerformAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         super.doListBefore(query, model, context);
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("errorTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("errorTime", OrderCol.DESCENDING));
         }
 
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getErrorTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+            query.setErrorTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+            //query.setErrorTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java

@@ -18,6 +18,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformComplainRecordService;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -66,15 +67,16 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
     @Override
     protected void doListBefore(PerformComplainRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("complainTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("complainTime", OrderCol.DESCENDING));
         }
 
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getComplainTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+            query.setComplainTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+            //query.setComplainTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
-
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java

@@ -22,6 +22,8 @@ import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformEffectRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,14 +75,16 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
     @Override
     protected void doListBefore(PerformEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("happenTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("happenTime", OrderCol.DESCENDING));
         }
 
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getHappenTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+            query.setHappenTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+            //query.setHappenTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java

@@ -22,6 +22,8 @@ import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformGoworkRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,14 +75,20 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
     @Override
     protected void doListBefore(PerformGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("goworkTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("goworkTime", OrderCol.DESCENDING));
         }
 
         if(!ObjectUtils.isEmpty(query.getCreateTime())){
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
             query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
+        if(ObjectUtils.isEmpty(query.getGoworkTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+            query.setGoworkTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+            //query.setGoworkTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        }
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java

@@ -22,6 +22,8 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformOtherRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -74,14 +76,16 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
     @Override
     protected void doListBefore(PerformOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("happenTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("happenTime", OrderCol.DESCENDING));
         }
 
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getHappenTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+            query.setHappenTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+            //query.setHappenTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java

@@ -22,6 +22,8 @@ import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformReviewRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -81,10 +83,12 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
 
-
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getReviewTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+            query.setReviewTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+            //query.setReviewTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
+
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffPerformSummaryServiceImpl.java

 package com.mortals.xhx.module.staff.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.pdu.WeightPdu;
 import com.mortals.xhx.module.staff.dao.StaffPerformSummaryDao;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.model.StaffPerformSummaryEntity;
@@ -13,10 +16,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
+import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.List;
 
+import static com.mortals.xhx.common.key.ParamKey.SYS_PARAM_WEIGHT;
+
 /**
 * StaffPerformSummaryService
 * 员工绩效统计 service实现
@@ -30,6 +37,8 @@ public class StaffPerformSummaryServiceImpl extends AbstractCRUDServiceImpl<Staf
 
     @Autowired
     private StaffService staffService;
+    @Autowired
+    private ParamService paramService;
 
     @Override
     protected StaffPerformSummaryEntity findBefore(StaffPerformSummaryEntity params, PageInfo pageInfo, Context context) throws AppException {
@@ -48,13 +57,44 @@ public class StaffPerformSummaryServiceImpl extends AbstractCRUDServiceImpl<Staf
     @Override
     protected void findAfter(StaffPerformSummaryEntity params, PageInfo pageInfo, Context context, List<StaffPerformSummaryEntity> list) throws AppException {
         if(CollectionUtils.isNotEmpty(list)){
+            String value = paramService.getValueByKey(SYS_PARAM_WEIGHT);
+            WeightPdu weightPdu;
+            if (ObjectUtils.isEmpty(value)){
+                weightPdu = new WeightPdu();
+            }else {
+                weightPdu = JSONObject.parseObject(value,WeightPdu.class);
+            }
             for(StaffPerformSummaryEntity item:list) {
                 StaffEntity staffEntity = staffService.get(item.getStaffId());
                 if(staffEntity!=null){
                     item.setWorkNum(staffEntity.getWorkNum());
                     item.setPhoneNumber(staffEntity.getPhoneNumber());
                 }
+                computeSummary(item,weightPdu);
             }
         }
     }
+
+    private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu){
+        BigDecimal total = new BigDecimal(100);
+        BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore());  //评价
+        reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
+        staffPerformSummaryEntity.setReviewScore(reviewScore.setScale(2,BigDecimal.ROUND_DOWN));
+        BigDecimal attendScore = total.add(staffPerformSummaryEntity.getAttendScore()); //考勤
+        attendScore = attendScore.multiply(weightPdu.attendWeight());
+        staffPerformSummaryEntity.setAttendScore(attendScore.setScale(2,BigDecimal.ROUND_DOWN));
+        BigDecimal otherScore = staffPerformSummaryEntity.getOtherScore();  //自评不用加100
+        if(otherScore.compareTo(BigDecimal.ZERO)==0){
+            otherScore = new BigDecimal(100);
+        }
+        otherScore = otherScore.multiply(weightPdu.selfWeight());
+        staffPerformSummaryEntity.setOtherScore(otherScore.setScale(2,BigDecimal.ROUND_DOWN));
+        BigDecimal goworkScore = total.add(staffPerformSummaryEntity.getGoworkScore());  //办件
+        goworkScore = goworkScore.multiply(weightPdu.goworkWeight());
+        staffPerformSummaryEntity.setGoworkScore(goworkScore.setScale(2,BigDecimal.ROUND_DOWN));
+        BigDecimal effectScore = total.add(staffPerformSummaryEntity.getEffectScore());  //效能
+        effectScore = effectScore.multiply(weightPdu.effectWeight());
+        staffPerformSummaryEntity.setEffectScore(effectScore.setScale(2,BigDecimal.ROUND_DOWN));
+
+    }
 }

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_attend_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
         FROM
         mortals_xhx_check_attend_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
         FROM
         mortals_xhx_check_attend_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckComplainRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_complain_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
         FROM
         mortals_xhx_check_complain_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
         FROM
         mortals_xhx_check_complain_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckEffectRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_effect_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
         FROM
         mortals_xhx_check_effect_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
         FROM
         mortals_xhx_check_effect_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_gowork_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as goworkScoreSub
         FROM
         mortals_xhx_check_gowork_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as goworkScoreSub
         FROM
         mortals_xhx_check_gowork_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckOtherRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_other_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
         FROM
         mortals_xhx_check_other_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
         FROM
         mortals_xhx_check_other_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckReviewRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_review_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
         FROM
         mortals_xhx_check_review_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
         FROM
         mortals_xhx_check_review_record
-        WHERE checkStatus = 2 and auditStatus = 1
+        WHERE 1 = 1 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>