Merge remote-tracking branch 'origin/master'

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

@@ -16,6 +16,15 @@ export default {
           },
         ];
       }
+
+      data.entity.userType
+        ? (data.entity.userType = Number(data.entity.userType))
+        : "";
+      data.entity.roleIds
+        ? (data.entity.roleIds = data.entity.roleIds.map((v) => String(v)))
+        : "";
+      console.log(data);
+      this.$forceUpdate(data);
       return data;
     },
     // 渲染后置处理

attendance-performance-manager-ui/admin/src/views/system/user/dialogshow.vue

@@ -46,8 +46,14 @@
           v-model="form.mobile"
           :maxLength="11"
         />
-         <Field label="用户类型" prop="userType" v-model="form.userType" :enumData='dict.userType' type='select' />
-<!--        <Field label="用户状态" prop="status" v-model="form.status" :enumData='dict.status' type='select' />-->
+        <Field
+          label="用户类型"
+          prop="userType"
+          v-model="form.userType"
+          :enumData="dict.userType"
+          type="select"
+        />
+        <!--        <Field label="用户状态" prop="status" v-model="form.status" :enumData='dict.status' type='select' />-->
         <Field
           label="角色分配"
           :span="24"
@@ -86,14 +92,14 @@ export default {
       title: "用户",
       // 是否显示弹出层
       open: false,
-      toString: ["status", "userType"],
+      toString: ["status"],
       toArrays: ["roleIds"],
       // 表单校验
       rules: {
         loginName: [
           { required: true, message: "请输入英文的用户名", trigger: "blur" },
           {
-            validator: function (rule, value, callback) {
+            validator: function(rule, value, callback) {
               //  校验英文的正则
               if (/[A-Za-z0-9]$/.test(value) == false) {
                 callback(new Error("请输入英文"));
@@ -145,15 +151,19 @@ export default {
     },
     /**获取数据后弹框 */
     afterRender(data) {
+      // data.entity.userType = Number(data.entity.userType);
+      // data.entity.roleIds = data.entity.roleIds.map((v) => String(v));
+      // console.log(data);
+      // this.$forceUpdate(data);
       this.open = true;
     },
 
     beforeSubmit(data) {
-      data.roleIds = data.roleIds
-        .filter((item) => {
-          return item !== "";
-        })
-        .join(",");
+      // data.roleIds = data.roleIds
+      //   .filter((item) => {
+      //     return item !== "";
+      //   })
+      //   .join(",");
       return data;
     },
     afterSubmit(data) {
@@ -162,7 +172,7 @@ export default {
     },
     // 表单重置
     reset() {
-      this.form = {roleIds:""};
+      this.form = {};
       this.resetForm("form");
     },
 
@@ -193,5 +203,3 @@ export default {
   },
 };
 </script>
-
-

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

@@ -210,7 +210,14 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
             Calendar cal = Calendar.getInstance();
             cal.setTime(summaryDate);
             int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
+            if(dayOfWeek==1||dayOfWeek==7){
+                //节假日周末补班
+                if(!isReturn){
+                    query.setDayOfWeek(2);
+                }
+            }else {
                 query.setDayOfWeek(dayOfWeek);
+            }
             int y = cal.get(Calendar.YEAR);
             int m = cal.get(Calendar.MONTH)+1;
             int d = cal.get(Calendar.DATE);
@@ -236,6 +243,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                 log.info("考勤人数:"+vacationBalanceSummaryVoList.size());
                 List<AttendanceStatEntity> insertList = new ArrayList<>();
                 List<AttendanceStatEntity> updateList = new ArrayList<>();
+                List<AttendanceStaffStatEntity> addStaffStat = new ArrayList<>();
+                List<AttendanceStaffStatEntity> updateStaffStat = new ArrayList<>();
                 for (VacationBalanceSummaryVo item : vacationBalanceSummaryVoList) {
                     if(item.getStatus() == StaffSatusEnum.离职.getValue()){
                         //离职状态时判断当前汇总日期是否在离职后
@@ -291,6 +300,20 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                         attendanceStatEntity.setUpdateTime(new Date());
                         updateList.add(attendanceStatEntity);
                     }
+                    AttendanceStaffStatEntity staffStat = new AttendanceStaffStatEntity();
+                    staffStat.initAttrValue();
+                    BeanUtils.copyProperties(item, staffStat, BeanUtil.getNullPropertyNames(item));
+                    staffStat.setAttendanceSummary("正常");
+                    AttendanceStaffStatEntity staffStatTemp = attendanceStaffStatService.selectOne(new AttendanceStaffStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
+                    if (staffStatTemp != null) {
+                        staffStat.setId(staffStatTemp.getId());
+                        staffStat.setUpdateTime(new Date());
+                        updateStaffStat.add(staffStat);
+                    } else {
+                        staffStat.setCreateTime(DateUtils.StrToDate(query.getSummaryTime()));
+                        staffStat.setCreateUserId(1l);
+                        addStaffStat.add(staffStat);
+                    }
                 }
                 if(insertList.size()>0){
                     this.dao.insertBatch(insertList);
@@ -298,6 +321,12 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                 if(updateList.size()>0){
                     this.dao.updateBatch(updateList);
                 }
+                if(addStaffStat.size()>0){
+                    attendanceStaffStatService.save(addStaffStat);
+                }
+                if(updateStaffStat.size()>0){
+                    attendanceStaffStatService.update(updateStaffStat);
+                }
             }
             log.info("完成汇总当前日期假期余额.....");