Merge remote-tracking branch 'origin/master'

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

 package com.mortals.xhx.daemon.applicationservice;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.springcloud.service.IApplicationStartedService;
 import com.mortals.framework.util.StringUtils;
@@ -56,6 +57,8 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                                 Date date = DateUtil.parse(query.getCheckTimeStart(),"yyyy-MM-dd");
                                 query.setCheckTimeStart(DateUtil.beginOfMonth(date).toDateStr());
                                 query.setCheckTimeEnd(DateUtil.endOfMonth(date).toDateStr());
+                                query.setYear(DateUtil.year(date));
+                                query.setMonth(DateUtil.month(date)+1);
                             }
                             if(query.getCheckType() == CheckTypeEnum.考勤绩效.getValue()){
                                 checkAttendRecordService.summaryCheck(query);
@@ -77,7 +80,7 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                                 checkOtherRecordService.summaryCheck(query);
                             }
                             if(query.getCheckType()==null){
-                                log.info("绩效分数汇总开始");
+                                log.info("绩效分数汇总开始:"+ JSONObject.toJSONString(query));
                                 checkAttendRecordService.summaryCheck(query);
                                 checkEffectRecordService.summaryCheck(query);
                                 checkGoworkRecordService.summaryCheck(query);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckWindowWorkmanPerformServiceImpl.java

@@ -92,6 +92,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
 
     @Override
     public List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) throws AppException {
+        log.info("汇总自评:"+JSONObject.toJSONString(query));
         if (query.getYear()==null || query.getMonth()==null) {
             Calendar calendar = Calendar.getInstance();
             query.setYear(calendar.get(Calendar.YEAR));
@@ -156,7 +157,6 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
                     }
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
-                    erro = erro.add(staffPerformSummaryEntity.getComplainScore());
                     staffPerformSummaryEntity.setErrorScore(erro);
                     StaffPerformUtil.computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setId(temp.getId());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformSummaryEntity.java

@@ -35,12 +35,12 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 工号
      */
-    @Excel(name = "工号")
+    @Excel(name = "工号",sort = 2)
     private String workNum;
     /**
      * 人员名称
      */
-    @Excel(name = "人员名称")
+    @Excel(name = "姓名",sort = 1)
     private String staffName;
     /**
      * 所属大厅
@@ -49,7 +49,7 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 所属大厅名称
      */
-    @Excel(name = "大厅名称")
+    @Excel(name = "所属大厅",sort = 4)
     private String salaName;
     /**
      * 部门id号
@@ -58,37 +58,37 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 部门名称
      */
-    @Excel(name = "部门名称")
+    @Excel(name = "所属部门",sort = 5)
     private String deptName;
     /**
      * 考勤绩效指标分数
      */
-    @Excel(name = "考勤绩效指标分数")
+    @Excel(name = "服务规范(考勤绩效)",sort = 7)
     private BigDecimal attendScore;
     /**
      * 评价绩效指标分数
      */
-    @Excel(name = "评价绩效指标分数")
+    @Excel(name = "群众评议",sort = 9)
     private BigDecimal reviewScore;
     /**
      * 投诉绩效指标分数
      */
-    @Excel(name = "自评绩效分数")
+    @Excel(name = "综合管理(自评绩效)",sort = 8)
     private BigDecimal complainScore;
     /**
      * 办件绩效分数
      */
-    @Excel(name = "办件绩效分数")
+    @Excel(name = "工作效能(办件绩效)",sort = 10)
     private BigDecimal goworkScore;
     /**
      * 效能绩效分数
      */
-    @Excel(name = "效能绩效分数")
+    @Excel(name = "工作纪律(效能绩效)",sort = 6)
     private BigDecimal effectScore;
     /**
      * 其它绩效分数 加分项
      */
-    @Excel(name = "其它绩效分数")
+    @Excel(name = "加分(其它绩效)",sort = 11)
     private BigDecimal otherScore;
     /**
      * 累计异常分数
@@ -98,7 +98,7 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 当月得分数
      */
-    @Excel(name = "当月得分数")
+    @Excel(name = "本月得分数",sort = 12)
     private BigDecimal totalScore;
     /**
      * 备注
@@ -107,12 +107,12 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 年
      */
-    @Excel(name = "年")
+    @Excel(name = "年",sort = 13)
     private Integer year;
     /**
      * 月
      */
-    @Excel(name = "月")
+    @Excel(name = "月",sort = 14)
     private Integer month;
     @Override
     public int hashCode() {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffPerformSummaryVo.java

@@ -18,5 +18,8 @@ public class StaffPerformSummaryVo extends BaseEntityLong {
     /**
      * 联系电话
      */
+    @Excel(name = "手机号码",sort = 3)
     private String phoneNumber;
+
+    private Integer sortKind;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformSummaryController.java

@@ -81,9 +81,16 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
     @Override
     protected void doListBefore(StaffPerformSummaryEntity query, Map<String, Object> model, Context context) throws AppException {
         if (!ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.getOrderColList().add(new OrderCol("year",OrderCol.DESCENDING));
-            query.getOrderColList().add(new OrderCol("month",OrderCol.DESCENDING));
+//            query.getOrderColList().add(new OrderCol("year",OrderCol.DESCENDING));
+//            query.getOrderColList().add(new OrderCol("month",OrderCol.DESCENDING));
         }
+        List<OrderCol> orderColList = new ArrayList();
+        if(query.getSortKind()!=null && query.getSortKind()==1){
+            orderColList.add(new OrderCol("totalScore",OrderCol.DESCENDING));
+        }else {
+            orderColList.add(new OrderCol("totalScore",OrderCol.ASCENDING));
+        }
+        query.setOrderColList(orderColList);
     }
 
     @Override
@@ -134,6 +141,7 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
                 staffPerformSummaryEntity.setAttendScore(BigDecimal.ZERO);
                 staffPerformSummaryEntity.setTotalScore(StaffPerformUtil.SCORE100);
                 staffPerformSummaryEntity.setErrorScore(BigDecimal.ZERO);
+                staffPerformSummaryEntity.setUpdateTime(new Date());
                 Map<String,Object> condition = new HashMap<>();
                 condition.put("year",year);
                 condition.put("month",month);