Merge remote-tracking branch 'origin/master'

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

@@ -127,7 +127,11 @@ export default {
       const dataCopy = Object.assign({}, data);
       array.forEach((item) => {
         dataCopy[item] =
-          dataCopy[item] === undefined ? [] : dataCopy[item].split(",");
+          dataCopy[item] === undefined
+            ? []
+            : Array.isArray(dataCopy[item])
+            ? dataCopy[item]
+            : dataCopy[item].split(",");
       });
       return dataCopy;
     },

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

@@ -298,7 +298,7 @@ export default {
           {
             prop: "roleIds",
             label: "所属角色",
-            formatter: this.formatters,
+            formatter: this.formatter,
             align: "center",
           },
 

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

@@ -17,6 +17,7 @@ import com.mortals.framework.utils.ReflectUtils;
 import com.mortals.framework.utils.poi.ExcelUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.utils.DynamicColExcelUtil;
 import com.mortals.xhx.module.attendance.model.AttendanceClassQuery;
 import com.mortals.xhx.module.attendance.model.AttendanceGroupQuery;
 import com.mortals.xhx.module.attendance.model.AttendanceStaffStatEntity;
@@ -41,6 +42,7 @@ import com.mortals.xhx.module.attendance.service.AttendanceStatService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
 
+import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -200,7 +202,7 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
             PageInfo pageInfo = new PageInfo(-1);
             List<AttendanceStatEntity> list = this.getService().findExt(query, pageInfo, context).getList();
             Class<AttendanceStatEntity> tClass = ReflectUtils.getClassGenricType(this.getClass(), 1);
-            ExcelUtil<AttendanceStatEntity, Long> util = new ExcelUtil(tClass);
+            DynamicColExcelUtil<AttendanceStatEntity, Long> util = new DynamicColExcelUtil(tClass);
             this.doExportAfter(context, list);
             DateTime startDate = DateUtil.parse(query.getSummaryTimeStart());
             DateTime endDate = DateUtil.parse(query.getSummaryTimeEnd());
@@ -210,7 +212,7 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
             final String[] weekStr={"星期日","星期一","星期二","星期三","星期四","星期五","星期六"};
             //由于1表示周日，2表示周一所以需要-1后对应上数组下标
             List<List<Map<String, Object>>> lists = list.stream().map(item -> {
-
+                attendanceStatExport(item);
                 List<AttendanceStaffStatEntity> attendanceStaffStatEntities = item.getAttendanceStaffStatEntities();
                 Map<Integer, String> collect = new HashMap<>();
                 if (!ObjectUtils.isEmpty(attendanceStaffStatEntities)) {
@@ -244,7 +246,7 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
             }).collect(Collectors.toList());
 
             // byte[] data = util.exportExcel(list, properties, name);
-            byte[] data = util.exportExcel(list, properties, lists, name);
+            byte[] data = util.exportExcel(list, properties, lists, name,6);
             this.responseStream(this.response, data, fileName);
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var12) {
@@ -252,4 +254,98 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
         }
 
     }
+
+    private void attendanceStatExport(AttendanceStatEntity entity){
+        if(isNull(entity.getBackToUnit())){
+            entity.setBackToUnit(null);
+        }
+        if(isNull(entity.getOnDutyLeave())){
+            entity.setOnDutyLeave(null);
+        }
+        if(isNull(entity.getOutOfOffice())){
+            entity.setOutOfOffice(null);
+        }
+        if(isNull(entity.getShiftCompensation())){
+            entity.setShiftCompensation(null);
+        }
+        if(isNull(entity.getPhysicalExamination())){
+            entity.setPhysicalExamination(null);
+        }
+        if(isNull(entity.getQuarantine())){
+            entity.setQuarantine(null);
+        }
+        if(isNull(entity.getBusinessTrip())){
+            entity.setBusinessTrip(null);
+        }
+        if(isNull(entity.getPublicHoliday())){
+            entity.setPublicHoliday(null);
+        }
+        if(isNull(entity.getSickLeave())){
+            entity.setSickLeave(null);
+        }
+        if(isNull(entity.getFuneralLeave())){
+            entity.setFuneralLeave(null);
+        }
+        if(isNull(entity.getMarriageLeave())){
+            entity.setMarriageLeave(null);
+        }
+        if(isNull(entity.getChildRearingLeave())){
+            entity.setChildRearingLeave(null);
+        }
+        if(isNull(entity.getMaternityLeave())){
+            entity.setMaternityLeave(null);
+        }
+        if(isNull(entity.getTransferBack())){
+            entity.setTransferBack(null);
+        }
+        if(isNull(entity.getHomeLeave())){
+            entity.setHomeLeave(null);
+        }
+        if(isNull(entity.getPersonalLeave())){
+            entity.setPersonalLeave(null);
+        }
+        if(isNull(entity.getAbsenteeismDays())){
+            entity.setAbsenteeismDays(null);
+        }
+        if(isNull(entity.getOtherDays())){
+            entity.setOtherDays(null);
+        }
+        if(isNull(entity.getNonCompliancePunch())){
+            entity.setNonCompliancePunch(null);
+        }
+        if(entity.getLateTimes()!=null && entity.getLateTimes()==0){
+            entity.setLateTimes(null);
+        }
+        if(entity.getSurfingMobileTimes()!=null && entity.getSurfingMobileTimes()==0){
+            entity.setSurfingMobileTimes(null);
+        }
+        if(entity.getOvertimeTimes()!=null && entity.getOvertimeTimes()==0){
+            entity.setOvertimeTimes(null);
+        }
+        if(isNull(entity.getVacancy())){
+            entity.setVacancy(null);
+        }
+        if(entity.getNonStandardDressTimes()!=null && entity.getNonStandardDressTimes()==0){
+            entity.setNonStandardDressTimes(null);
+        }
+        if(isNull(entity.getUnexcusedMeetingAbsence())){
+            entity.setUnexcusedMeetingAbsence(null);
+        }
+        if(isNull(entity.getEarlyLeaveMeeting())){
+            entity.setEarlyLeaveMeeting(null);
+        }
+    }
+
+    private boolean isNull(BigDecimal bigDecimal){
+        if (ObjectUtils.isEmpty(bigDecimal)){
+            return true;
+        }else {
+            BigDecimal zero = new BigDecimal("0");
+            if(bigDecimal.compareTo(zero) > 0){
+                return false;
+            }else {
+                return true;
+            }
+        }
+    }
 }