Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -231,8 +231,10 @@ export default {
         ) : (
           <p>{content ? content : "--"}</p>
         )
-      ) : (
+      ) : val ? (
         val
+      ) : (
+        "--"
       );
     },
 

attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue

@@ -238,7 +238,6 @@ export default {
 
           {
             label: "图片凭证",
-            width: 150,
             formatter: (row) => {
               let src = "";
               if (row.snapPath && row.filePaths) {

attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue

@@ -240,7 +240,6 @@ export default {
 
           {
             label: "图片凭证",
-            width: 150,
             formatter: (row) => {
               let src = "";
               if (row.snapPath && row.filePaths) {

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
-      <el-button slot="table-head-left2" style="margin-left: 10px" icon="el-icon-tickets" size="mini" @click="doExport"
-        :disabled="isExport">导出</el-button>
+      <el-button
+        slot="table-head-left2"
+        style="margin-left: 10px"
+        icon="el-icon-tickets"
+        size="mini"
+        @click="doExport"
+        :disabled="isExport"
+        >导出</el-button
+      >
     </LayoutTable>
 
     <dialog-show ref="dialogform" @ok="getData" />
@@ -19,7 +26,7 @@ export default {
     dialogShow,
   },
   mixins: [table],
-  created() { },
+  created() {},
   methods: {
     /** 导出Excel */
     doExport() {
@@ -82,13 +89,13 @@ export default {
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "工号", prop: "workNum" },
+          { label: "工号", prop: "workNum", formatter: this.formatter },
 
-          { label: "手机号", prop: "phoneNumber" },
+          { label: "手机号", prop: "phoneNumber", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
           {
             label: "所属中心",
             formatter: (row) => {
@@ -96,16 +103,34 @@ export default {
             },
           },
 
-          { label: "考勤绩效指标分数", prop: "attendScore",  },
+          {
+            label: "考勤绩效指标分数",
+            prop: "attendScore",
+          },
 
-          { label: "评价绩效指标分数", prop: "reviewScore", },
-          { label: "投诉绩效指标分数", prop: "complainScore", },
+          {
+            label: "评价绩效指标分数",
+            prop: "reviewScore",
+          },
+          {
+            label: "投诉绩效指标分数",
+            prop: "complainScore",
+          },
 
-          { label: "办件绩效分数", prop: "goworkScore",  },
+          {
+            label: "办件绩效分数",
+            prop: "goworkScore",
+          },
 
-          { label: "效能绩效分数", prop: "effectScore", },
+          {
+            label: "效能绩效分数",
+            prop: "effectScore",
+          },
 
-          { label: "其它绩效分数", prop: "otherScore", },
+          {
+            label: "其它绩效分数",
+            prop: "otherScore",
+          },
 
           {
             label: "累计异常分数",

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/InspectSaveReq.java

@@ -159,6 +159,8 @@ public class InspectSaveReq extends BaseReq {
 
     private String windowNum;
 
+    private String workNum;
+
 
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventAfterTaskImpl.java

@@ -51,7 +51,7 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
     public void excuteTask(ITask task) throws AppException {
         syncDoorEvents();
 
-        //calculateAttendByDay();
+        calculateAttendByDay();
     }
 
     private void calculateAttendByDay() {
@@ -65,8 +65,8 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
 
         // Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
         //  recordHikEntity.setAttendanceDateStart(DateUtils.getCurrStrDate());
-        recordHikEntity.setAttendanceDateStart(DateUtil.offsetHour(new Date(), -5).toString());
-        recordHikEntity.setAttendanceDateEnd(DateUtils.getCurrStrDate());
+        recordHikEntity.setAttendanceDateStart(DateUtil.today());
+        recordHikEntity.setAttendanceDateEnd(DateUtil.today());
         try {
             recordHikService.addAttendanceRecordByQuery(recordHikEntity, context);
         } catch (Exception e) {

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

@@ -40,6 +40,7 @@ public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreewor
     /**
      * 特殊时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Date specialTime;
     /**
      * 备注
@@ -48,10 +49,12 @@ public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreewor
     /**
      * 时间段时候开始时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Date specialStartTime;
     /**
      * 时间段结束时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Date specialEndTime;
 
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FreedomWorkAttendance.java

@@ -4,12 +4,10 @@ import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.xhx.common.code.GoWorkResultEnum;
+import com.mortals.xhx.common.code.MustEnum;
 import com.mortals.xhx.common.code.TypeEnum;
 import com.mortals.xhx.module.attendance.model.*;
-import com.mortals.xhx.module.attendance.service.AttendanceClassService;
-import com.mortals.xhx.module.attendance.service.AttendanceGroupFreeworkService;
-import com.mortals.xhx.module.attendance.service.AttendanceRecordHikService;
-import com.mortals.xhx.module.attendance.service.AttendanceRecordService;
+import com.mortals.xhx.module.attendance.service.*;
 import com.mortals.xhx.utils.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +16,8 @@ import org.springframework.util.ObjectUtils;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 自由排班
@@ -33,6 +33,9 @@ public class FreedomWorkAttendance extends AttendanceWorkAbstract {
 
     private AttendanceRecordService attendanceRecordService;
 
+    private AttendanceGroupFreeworkSpecialService specialService;
+
+
     @Autowired
     private AttendanceRecordHikService recordHikService;
 
@@ -42,6 +45,7 @@ public class FreedomWorkAttendance extends AttendanceWorkAbstract {
         this.freeworkService = SpringUtils.getBean(AttendanceGroupFreeworkService.class);
         this.attendanceClassService = SpringUtils.getBean(AttendanceClassService.class);
         this.attendanceRecordService = SpringUtils.getBean(AttendanceRecordService.class);
+        this.specialService = SpringUtils.getBean(AttendanceGroupFreeworkSpecialService.class);
     }
 
     @Override
@@ -112,6 +116,28 @@ public class FreedomWorkAttendance extends AttendanceWorkAbstract {
                 commonData.getDetailEntityList().add(recordDetailEntity);
             }
         }
+        //特殊日期考勤配置
+        List<AttendanceGroupFreeworkSpecialEntity> specialEntities = specialService.find(new AttendanceGroupFreeworkSpecialQuery().freeWorkId(attendanceGroupFreeworkEntity.getId()));
+        if (!ObjectUtils.isEmpty(specialEntities)) {
+            //分组 需要考勤与不需要考勤
+            Map<Boolean, List<AttendanceGroupFreeworkSpecialEntity>> collect = specialEntities.stream().collect(Collectors.partitioningBy(item -> item.getMust() == MustEnum.是.getValue()));
+            List<AttendanceGroupFreeworkSpecialEntity> mustList = collect.get(true);
+            
+            if(!ObjectUtils.isEmpty(mustList)){
+                //需要打卡
+                for (AttendanceGroupFreeworkSpecialEntity specialEntity : mustList) {
+                    
+                }
+                
+                
+            }
+            
+            
+            List<AttendanceGroupFreeworkSpecialEntity> mustNotList = collect.get(false);
+            
+
+        }
+
 
     }
 

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

@@ -131,7 +131,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
                 checkDingMsg.setUserIds(personRest.getData());
                 checkDingMsg.setDateTime(DateUtil.formatDateTime(entity.getHappenTime() == null ? new Date() : entity.getHappenTime()));
                 checkDingMsg.setRuleStr(ruleStr);
-                checkDingMsg.setPerformTypeStr(PerformTypeEnum.评价差评绩效.getDesc());
+                checkDingMsg.setPerformTypeStr(PerformTypeEnum.其它绩效.getDesc());
                 checkDingMsg.setScore(entity.getScore().toString());
                 checkDingMsg.setSubAddType(entity.getSubAddType());
                 checkDingMsg.setPath(String.format("#/appealinfo?id=%s&&performType=%s&subAddType=%s", entity.getId(), PerformTypeEnum.其它绩效.getValue(), entity.getSubAddType()));

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

@@ -81,6 +81,8 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "updateUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
         this.addDict(model, "ruleId", rulesService.find(new PerformRulesQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        //this.addDict(model, "checkResult", CheckResultAddEnum.getEnumMap());
+
         this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());

attendance-performance-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -20,7 +20,7 @@
 
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
 			<property name="enableExecutorTime" value="true" />
-			<property name="showSql" value="false" />
+			<property name="showSql" value="true" />
 		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file