Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/ExamineLevelEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 考核等级
+ */
+public enum ExamineLevelEnum {
+    好(1, "通过"),
+    较好(2, "不通过"),
+    一般(3, "通过"),
+    较差(4, "不通过");
+    private Integer value;
+    private String desc;
+
+    ExamineLevelEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static ExamineLevelEnum getByValue(Integer value) {
+        for (ExamineLevelEnum ExamineLevelEnum : ExamineLevelEnum.values()) {
+            if (ExamineLevelEnum.getValue() == value) {
+                return ExamineLevelEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取Map集合
+     *
+     * @param eItem 不包含项
+     * @return
+     */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (ExamineLevelEnum item : ExamineLevelEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/FillStatusEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 窗口考核存储状态
+ */
+public enum FillStatusEnum {
+    暂存(0, "暂存"),
+    提交(1, "提交");
+    private Integer value;
+    private String desc;
+
+    FillStatusEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static SelfLevelEnum getByValue(Integer value) {
+        for (SelfLevelEnum SelfLevelEnum : SelfLevelEnum.values()) {
+            if (SelfLevelEnum.getValue() == value) {
+                return SelfLevelEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取Map集合
+     *
+     * @param eItem 不包含项
+     * @return
+     */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (SelfLevelEnum item : SelfLevelEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/SelfLevelEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 自评等级
+ */
+public enum SelfLevelEnum {
+    红旗窗(1, "红旗窗"),
+    黑旗窗(2, "黑旗窗");
+    private Integer value;
+    private String desc;
+
+    SelfLevelEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static SelfLevelEnum getByValue(Integer value) {
+        for (SelfLevelEnum SelfLevelEnum : SelfLevelEnum.values()) {
+            if (SelfLevelEnum.getValue() == value) {
+                return SelfLevelEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取Map集合
+     *
+     * @param eItem 不包含项
+     * @return
+     */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (SelfLevelEnum item : SelfLevelEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/WindowCheckResultEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 窗口考核审查结果
+ */
+public enum WindowCheckResultEnum {
+    通过(1, "通过"),
+    不通过(2, "不通过");
+    private Integer value;
+    private String desc;
+
+    WindowCheckResultEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static WindowCheckResultEnum getByValue(Integer value) {
+        for (WindowCheckResultEnum WindowCheckResultEnum : WindowCheckResultEnum.values()) {
+            if (WindowCheckResultEnum.getValue() == value) {
+                return WindowCheckResultEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取Map集合
+     *
+     * @param eItem 不包含项
+     * @return
+     */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (WindowCheckResultEnum item : WindowCheckResultEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}

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

@@ -3,6 +3,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.attendance.dao.AttendanceRecordHikDao;
 import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity;
+import com.mortals.xhx.module.attendance.model.AttendanceRecordHikQuery;
 
 import java.util.List;
 
@@ -48,4 +49,11 @@ public interface AttendanceRecordHikService extends ICRUDService<AttendanceRecor
     void addAttendanceRecordList(List<AttendanceRecordHikEntity> hikEntityList, Context context) throws Exception;
 
 
+    /**
+     * 虚增未有考勤记录
+     * @param recordHikQuery
+     * @param context
+     */
+    void buildCustomHikRecord(AttendanceRecordHikQuery recordHikQuery,Context context);
+
 }

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.upload.service.UploadService;
+import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.attendance.model.*;
@@ -61,7 +62,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
     private StaffService staffService;
     @Autowired
     private AttendanceRecordErrorService errorService;
-
+    @Autowired
+    private AttendanceGroupFixedworkService groupFixedworkService;
     @Autowired
     private HolidayService holidayService;
 
@@ -81,7 +83,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
     @Override
     public void addAttendanceRecordByQueryCustom(AttendanceRecordHikEntity attendanceRecordHikQuery, Context context) throws Exception {
         List<AttendanceRecordHikEntity> hikEntityList = attendanceRecordHikService.find(attendanceRecordHikQuery);
-        hikEntityList=hikEntityList.stream().map(item->{
+        hikEntityList = hikEntityList.stream().map(item -> {
             String dateStr = DateUtil.formatDate(item.getAttendanceDate());
             Boolean checkWorkByHoliday = checkWorkByHoliday(dateStr);
             Boolean checkHolidayByWorkDay = checkHolidayByWorkDay(dateStr);
@@ -92,7 +94,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                 return null;
             }
             return item;
-        }).filter(f->f!=null).collect(Collectors.toList());
+        }).filter(f -> f != null).collect(Collectors.toList());
         addAttendanceOtherRecordList(hikEntityList, context);
     }
 
@@ -436,6 +438,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
         }
     }
 
+
     private void genErrorAttendRecord(Context context, String dateStr, AttendanceRecordEntity attendanceRecordEntity, List<AttendanceRecordDetailEntity> detailEntityList) {
         //处理异常打卡，所以异常打卡的 都新增一条记录
         List<AttendanceRecordErrorEntity> errorEntityList = new ArrayList<>();
@@ -517,10 +520,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
 
             //if(error.getStaffId()==checkError.getStaffId()&&error.getShiftsId()=)
 
-
         }
 
-
         return bool;
     }
 
@@ -716,6 +717,78 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
         return weekClassId;
     }
 
+
+    @Override
+    public void buildCustomHikRecord(AttendanceRecordHikQuery recordHikQuery, Context context) {
+
+        Set<Long> attendStaffSet = this.find(recordHikQuery).stream().map(i -> i.getStaffId()).distinct().collect(Collectors.toSet());
+        Map<Long, List<AttendanceGroupStaffEntity>> groupStaffCollect = attendanceGroupStaffService.find(new AttendanceGroupStaffQuery()).stream().collect(Collectors.groupingBy(x -> x.getGroupId()));
+        Iterator<Map.Entry<Long, List<AttendanceGroupStaffEntity>>> iterator = groupStaffCollect.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<Long, List<AttendanceGroupStaffEntity>> item = iterator.next();
+            //分组查看当前人
+            Long groupId = item.getKey();
+            AttendanceGroupFixedworkEntity attendanceGroupFixedworkEntity = groupFixedworkService.selectOne(new AttendanceGroupFixedworkQuery().groupId(groupId));
+            String week = this.getWeek(new Date());
+            Long weekClassId = this.getWeekClassId(attendanceGroupFixedworkEntity, week);
+            //weekClassId为-1 则不在考勤
+            //对于节假日 分两种情况。
+            // 1.当前是工作日，但是是节假日。则不做考勤continue;
+            // 2.当前是非工作日，但是由于节假日情况，需要补班，需要做考勤
+            //weekClassId == -1L 当日不需要考勤的 与节假日冲突的 以节假日为准
+            Boolean checkWorkByHoliday = checkWorkByHoliday(recordHikQuery.getAttendanceDateStart());
+            Boolean checkHolidayByWorkDay = checkHolidayByWorkDay(recordHikQuery.getAttendanceDateStart());
+            if (weekClassId == -1L) {
+                //跳过本次循环
+                log.info("当前日期不在考勤时间范围内，不做处理！");
+                if (!checkWorkByHoliday) {
+                    continue;
+                }
+            } else {
+                if (checkHolidayByWorkDay) {
+                    //本来当天是需要考勤的，但是是节假日，则不计算考勤
+                    continue;
+                }
+            }
+
+            List<AttendanceGroupStaffEntity> groupStaffList = item.getValue();
+            //查看当前需要考勤但是没有记录的人
+            List<Long> unAttendStaffIdList = groupStaffList.stream().filter(f -> !attendStaffSet.contains(f.getStaffId())).map(i -> i.getStaffId()).collect(Collectors.toList());
+            if (!ObjectUtils.isEmpty(unAttendStaffIdList)) {
+                for (Long staffId : unAttendStaffIdList) {
+                    StaffEntity staffCache = staffService.getCache(staffId.toString());
+                    if (!ObjectUtils.isEmpty(staffCache) && StaffSatusEnum.离职.getValue() != staffCache.getStatus()) {
+                        //构建考勤记录  判断当前人是否离职，如果非离职 构建记录
+
+                        AttendanceRecordHikEntity recordHikEntity = new AttendanceRecordHikEntity();
+                        recordHikEntity.initAttrValue();
+                        recordHikEntity.setStaffId(staffCache.getId());
+                        recordHikEntity.setStaffName(staffCache.getName());
+                        recordHikEntity.setWorkNum(staffCache.getWorkNum());
+                        recordHikEntity.setDeptId(staffCache.getDeptId());
+                        recordHikEntity.setDeptName(staffCache.getDeptName());
+                        recordHikEntity.setSalaId(staffCache.getSalaId());
+                        recordHikEntity.setSalaName(staffCache.getSalaName());
+                        recordHikEntity.setPositionId(staffCache.getPositionId());
+                        recordHikEntity.setPositionName(staffCache.getPositionName());
+                        recordHikEntity.setAttendanceGroupId(groupId);
+                        recordHikEntity.setAttendanceDate(DateUtil.parseDate(DateUtil.today()).toJdkDate());
+                        recordHikEntity.setAttendanceAddress("自定义地点");
+                        recordHikEntity.setEventSource("当日未有记录虚增考勤记录！");
+                        recordHikEntity.setCreateTime(new Date());
+                        recordHikEntity.setCreateUserId(1L);
+                        try {
+                            this.getDao().insert(recordHikEntity);
+                        } catch (Exception e) {
+                            log.error(e.getMessage());
+                        }
+                    } else {
+                        log.error("未找到当前员工，staffId:{}", staffId);
+                    }
+                }
+            }
+        }
+    }
 }
    /*  //map遍历.先把所有键取出来
         Set<String> workNumSet = listMap.keySet();

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

 package com.mortals.xhx.module.attendance.web;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.annotation.UnAuth;
@@ -16,10 +18,7 @@ import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.keys.RedisCacheKeys;
 import com.mortals.xhx.common.utils.AddAttendThread;
-import com.mortals.xhx.module.attendance.model.AttendanceClassEntity;
-import com.mortals.xhx.module.attendance.model.AttendanceExportRecordEntity;
-import com.mortals.xhx.module.attendance.model.AttendanceGroupEntity;
-import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity;
+import com.mortals.xhx.module.attendance.model.*;
 import com.mortals.xhx.module.attendance.service.AttendanceClassService;
 import com.mortals.xhx.module.attendance.service.AttendanceExportRecordService;
 import com.mortals.xhx.module.attendance.service.AttendanceGroupService;
@@ -30,9 +29,11 @@ import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.model.StaffQuery;
 import com.mortals.xhx.module.staff.service.StaffService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StopWatch;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,6 +53,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("attendance/record/hik")
+@Slf4j
 public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingController<AttendanceRecordHikService, AttendanceRecordHikEntity, Long> {
 
     @Autowired
@@ -164,19 +166,31 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
 
     }
 
-
-
     @PostMapping(value = "/addAttendanceRecordCustom")
     @UnAuth
-    public Rest<String> addAttendanceRecordCustom(@RequestBody AttendanceRecordHikEntity hikEntity) {
+    public Rest<String> addAttendanceRecordCustom(@RequestBody AttendanceRecordHikQuery hikEntity) {
         Rest<String> ret = new Rest();
         Map<String, Object> model = new HashMap();
         Context context = this.getContext();
         String busiDesc = "查询" + this.getModuleDesc();
         int code = 1;
         try {
-            //排除节假日
-            hikService.addAttendanceRecordByQuery(hikEntity, getContext());
+            //天数区间分段计算
+            DateTime attendStart = DateUtil.parseDate(hikEntity.getAttendanceDateStart());
+            DateTime attendEnd = DateUtil.parseDate(hikEntity.getAttendanceDateEnd());
+            Long compare = DateUtil.between(attendEnd, attendStart, DateUnit.DAY);
+            StopWatch stopWatch = new StopWatch("stopwatch attend1");
+            log.info("考勤计算天数区间：{}", compare);
+            for (int i = 0; i <= compare.intValue(); i++) {
+                DateTime curDate = DateUtil.offsetDay(attendStart, i);
+                log.info("考勤计算日期：{}", curDate.toDateStr());
+                stopWatch.start("执行本地方法");
+                hikEntity.setAttendanceDateStart(curDate.toDateStr());
+                hikEntity.setAttendanceDateEnd(curDate.toDateStr());
+                hikService.buildCustomHikRecord(hikEntity, context);
+                stopWatch.stop();
+                log.info("考勤计算日期：{} 完成,耗时：{}ms", curDate.toDateStr(), stopWatch.getLastTaskTimeMillis());
+            }
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception e) {

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

@@ -11,93 +11,97 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.vo.CheckWindowWorkmanPerformVo;
 import lombok.Data;
 /**
-* 窗口人员考核汇总核查实体对象
-*
-* @author zxfei
-* @date 2024-01-17
-*/
+ * 窗口人员考核汇总核查实体对象
+ *
+ * @author zxfei
+ * @date 2024-01-17
+ */
 @Data
 public class CheckWindowWorkmanPerformEntity extends CheckWindowWorkmanPerformVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 记录ID
-    */
+     * 记录ID
+     */
     private Long recordId;
     /**
-    * 考核年度
-    */
+     * 考核年度
+     */
     private Integer year;
     /**
-    * 考核月份
-    */
+     * 考核月份
+     */
     private Integer month;
     /**
-    * 窗口ID
-    */
+     * 窗口ID
+     */
     private Long windowId;
     /**
-    * 窗口名称
-    */
+     * 窗口名称
+     */
     private String windowName;
     /**
-    * 窗口负责人id
-    */
+     * 窗口负责人id
+     */
     private Long ownerId;
     /**
-    * 窗口负责人名称
-    */
+     * 窗口负责人名称
+     */
     private String ownerName;
     /**
-    * 所属部门id
-    */
+     * 所属部门id
+     */
     private Long deptId;
     /**
-    * 所属部门名称
-    */
+     * 所属部门名称
+     */
     private String deptName;
     /**
-    * 所属大厅
-    */
+     * 所属大厅
+     */
     private Long salaId;
     /**
-    * 所属大厅名称
-    */
+     * 所属大厅名称
+     */
     private String salaName;
     /**
-    * 考核表单名称
-    */
+     * 考核表单名称
+     */
     private String fromName;
     /**
-    * 提交时间
-    */
+     * 提交时间
+     */
     private Date submitDate;
     /**
-    * 管理组核查人员
-    */
+     * 管理组核查人员
+     */
     @Excel(name = "管理组核查人员")
     private String manageCheckPerson;
     /**
-    * 管理组核查时间
-    */
+     * 管理组核查时间
+     */
     private Date manageCheckTime;
     /**
-    * 管理组核查说明
-    */
+     * 管理组核查说明
+     */
     @Excel(name = "管理组核查说明")
     private String manageCheckDesc;
     /**
-    * 管理组核查结果(1.通过,2.不通过)
-    */
+     * 管理组核查结果(1.通过,2.不通过)
+     */
     @Excel(name = "管理组核查结果", readConverterExp = "1=通过,2=不通过")
     private String manageCheckResult;
     /**
-    * 备注
-    */
+     * 备注
+     */
     private String remark;
+    /**
+     * 处理状态(1.未处理,2.已处理)
+     */
+    private Integer checkStatus;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -105,30 +109,31 @@ public class CheckWindowWorkmanPerformEntity extends CheckWindowWorkmanPerformVo
         if (obj instanceof CheckWindowWorkmanPerformEntity) {
             CheckWindowWorkmanPerformEntity tmp = (CheckWindowWorkmanPerformEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.recordId = null;
-            this.year = DateUtil.year(new Date());
-            this.month = DateUtil.month(new Date())+1;
-            this.windowId = null;
-            this.windowName = "";
-            this.ownerId = null;
-            this.ownerName = "";
-            this.deptId = null;
-            this.deptName = "";
-            this.salaId = null;
-            this.salaName = "";
-            this.fromName = "";
-            this.submitDate = new Date();
-            this.manageCheckPerson = "";
-            this.manageCheckTime = new Date();
-            this.manageCheckDesc = "";
-            this.manageCheckResult = "";
-            this.remark = "";
+        this.recordId = null;
+        this.year = DateUtil.year(new Date());
+        this.month = DateUtil.month(new Date())+1;
+        this.windowId = null;
+        this.windowName = "";
+        this.ownerId = null;
+        this.ownerName = "";
+        this.deptId = null;
+        this.deptName = "";
+        this.salaId = null;
+        this.salaName = "";
+        this.fromName = "";
+        this.submitDate = new Date();
+        this.manageCheckPerson = "";
+        this.manageCheckTime = new Date();
+        this.manageCheckDesc = "";
+        this.manageCheckResult = "";
+        this.remark = "";
+        this.checkStatus = 1;
     }
 }
\ No newline at end of file

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

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.check.model.CheckWindowWorkmanPerformEntity;
 /**
-* 窗口人员考核汇总核查查询对象
-*
-* @author zxfei
-* @date 2024-01-17
-*/
+ * 窗口人员考核汇总核查查询对象
+ *
+ * @author zxfei
+ * @date 2024-01-17
+ */
 public class CheckWindowWorkmanPerformQuery extends CheckWindowWorkmanPerformEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -229,6 +229,21 @@ public class CheckWindowWorkmanPerformQuery extends CheckWindowWorkmanPerformEnt
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 开始 处理状态(1.未处理,2.已处理) */
+    private Integer checkStatusStart;
+
+    /** 结束 处理状态(1.未处理,2.已处理) */
+    private Integer checkStatusEnd;
+
+    /** 增加 处理状态(1.未处理,2.已处理) */
+    private Integer checkStatusIncrement;
+
+    /** 处理状态(1.未处理,2.已处理)列表 */
+    private List <Integer> checkStatusList;
+
+    /** 处理状态(1.未处理,2.已处理)排除列表 */
+    private List <Integer> checkStatusNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckWindowWorkmanPerformQuery> orConditionList;
 
@@ -238,1974 +253,2109 @@ public class CheckWindowWorkmanPerformQuery extends CheckWindowWorkmanPerformEnt
     public CheckWindowWorkmanPerformQuery(){}
 
     /**
-    * 获取 开始 序号，主键，自增长
-    * @return idStart
-    */
+     * 获取 开始 序号，主键，自增长
+     * @return idStart
+     */
     public Long getIdStart(){
         return this.idStart;
     }
 
     /**
-    * 设置 开始 序号，主键，自增长
-    * @param idStart
-    */
+     * 设置 开始 序号，主键，自增长
+     * @param idStart
+     */
     public void setIdStart(Long idStart){
         this.idStart = idStart;
     }
 
     /**
-    * 获取 结束 序号，主键，自增长
-    * @return $idEnd
-    */
+     * 获取 结束 序号，主键，自增长
+     * @return $idEnd
+     */
     public Long getIdEnd(){
         return this.idEnd;
     }
 
     /**
-    * 设置 结束 序号，主键，自增长
-    * @param idEnd
-    */
+     * 设置 结束 序号，主键，自增长
+     * @param idEnd
+     */
     public void setIdEnd(Long idEnd){
         this.idEnd = idEnd;
     }
 
     /**
-    * 获取 增加 序号，主键，自增长
-    * @return idIncrement
-    */
+     * 获取 增加 序号，主键，自增长
+     * @return idIncrement
+     */
     public Long getIdIncrement(){
         return this.idIncrement;
     }
 
     /**
-    * 设置 增加 序号，主键，自增长
-    * @param idIncrement
-    */
+     * 设置 增加 序号，主键，自增长
+     * @param idIncrement
+     */
     public void setIdIncrement(Long idIncrement){
         this.idIncrement = idIncrement;
     }
 
     /**
-    * 获取 序号，主键，自增长
-    * @return idList
-    */
+     * 获取 序号，主键，自增长
+     * @return idList
+     */
     public List<Long> getIdList(){
         return this.idList;
     }
 
     /**
-    * 设置 序号，主键，自增长
-    * @param idList
-    */
+     * 设置 序号，主键，自增长
+     * @param idList
+     */
     public void setIdList(List<Long> idList){
         this.idList = idList;
     }
 
     /**
-    * 获取 序号，主键，自增长
-    * @return idNotList
-    */
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
     public List<Long> getIdNotList(){
         return this.idNotList;
     }
 
     /**
-    * 设置 序号，主键，自增长
-    * @param idNotList
-    */
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
     public void setIdNotList(List<Long> idNotList){
         this.idNotList = idNotList;
     }
 
 
     /**
-    * 获取 开始 记录ID
-    * @return recordIdStart
-    */
+     * 获取 开始 记录ID
+     * @return recordIdStart
+     */
     public Long getRecordIdStart(){
         return this.recordIdStart;
     }
 
     /**
-    * 设置 开始 记录ID
-    * @param recordIdStart
-    */
+     * 设置 开始 记录ID
+     * @param recordIdStart
+     */
     public void setRecordIdStart(Long recordIdStart){
         this.recordIdStart = recordIdStart;
     }
 
     /**
-    * 获取 结束 记录ID
-    * @return $recordIdEnd
-    */
+     * 获取 结束 记录ID
+     * @return $recordIdEnd
+     */
     public Long getRecordIdEnd(){
         return this.recordIdEnd;
     }
 
     /**
-    * 设置 结束 记录ID
-    * @param recordIdEnd
-    */
+     * 设置 结束 记录ID
+     * @param recordIdEnd
+     */
     public void setRecordIdEnd(Long recordIdEnd){
         this.recordIdEnd = recordIdEnd;
     }
 
     /**
-    * 获取 增加 记录ID
-    * @return recordIdIncrement
-    */
+     * 获取 增加 记录ID
+     * @return recordIdIncrement
+     */
     public Long getRecordIdIncrement(){
         return this.recordIdIncrement;
     }
 
     /**
-    * 设置 增加 记录ID
-    * @param recordIdIncrement
-    */
+     * 设置 增加 记录ID
+     * @param recordIdIncrement
+     */
     public void setRecordIdIncrement(Long recordIdIncrement){
         this.recordIdIncrement = recordIdIncrement;
     }
 
     /**
-    * 获取 记录ID
-    * @return recordIdList
-    */
+     * 获取 记录ID
+     * @return recordIdList
+     */
     public List<Long> getRecordIdList(){
         return this.recordIdList;
     }
 
     /**
-    * 设置 记录ID
-    * @param recordIdList
-    */
+     * 设置 记录ID
+     * @param recordIdList
+     */
     public void setRecordIdList(List<Long> recordIdList){
         this.recordIdList = recordIdList;
     }
 
     /**
-    * 获取 记录ID
-    * @return recordIdNotList
-    */
+     * 获取 记录ID
+     * @return recordIdNotList
+     */
     public List<Long> getRecordIdNotList(){
         return this.recordIdNotList;
     }
 
     /**
-    * 设置 记录ID
-    * @param recordIdNotList
-    */
+     * 设置 记录ID
+     * @param recordIdNotList
+     */
     public void setRecordIdNotList(List<Long> recordIdNotList){
         this.recordIdNotList = recordIdNotList;
     }
 
 
     /**
-    * 获取 开始 考核年度
-    * @return yearStart
-    */
+     * 获取 开始 考核年度
+     * @return yearStart
+     */
     public Integer getYearStart(){
         return this.yearStart;
     }
 
     /**
-    * 设置 开始 考核年度
-    * @param yearStart
-    */
+     * 设置 开始 考核年度
+     * @param yearStart
+     */
     public void setYearStart(Integer yearStart){
         this.yearStart = yearStart;
     }
 
     /**
-    * 获取 结束 考核年度
-    * @return $yearEnd
-    */
+     * 获取 结束 考核年度
+     * @return $yearEnd
+     */
     public Integer getYearEnd(){
         return this.yearEnd;
     }
 
     /**
-    * 设置 结束 考核年度
-    * @param yearEnd
-    */
+     * 设置 结束 考核年度
+     * @param yearEnd
+     */
     public void setYearEnd(Integer yearEnd){
         this.yearEnd = yearEnd;
     }
 
     /**
-    * 获取 增加 考核年度
-    * @return yearIncrement
-    */
+     * 获取 增加 考核年度
+     * @return yearIncrement
+     */
     public Integer getYearIncrement(){
         return this.yearIncrement;
     }
 
     /**
-    * 设置 增加 考核年度
-    * @param yearIncrement
-    */
+     * 设置 增加 考核年度
+     * @param yearIncrement
+     */
     public void setYearIncrement(Integer yearIncrement){
         this.yearIncrement = yearIncrement;
     }
 
     /**
-    * 获取 考核年度
-    * @return yearList
-    */
+     * 获取 考核年度
+     * @return yearList
+     */
     public List<Integer> getYearList(){
         return this.yearList;
     }
 
     /**
-    * 设置 考核年度
-    * @param yearList
-    */
+     * 设置 考核年度
+     * @param yearList
+     */
     public void setYearList(List<Integer> yearList){
         this.yearList = yearList;
     }
 
     /**
-    * 获取 考核年度
-    * @return yearNotList
-    */
+     * 获取 考核年度
+     * @return yearNotList
+     */
     public List<Integer> getYearNotList(){
         return this.yearNotList;
     }
 
     /**
-    * 设置 考核年度
-    * @param yearNotList
-    */
+     * 设置 考核年度
+     * @param yearNotList
+     */
     public void setYearNotList(List<Integer> yearNotList){
         this.yearNotList = yearNotList;
     }
 
 
     /**
-    * 获取 开始 考核月份
-    * @return monthStart
-    */
+     * 获取 开始 考核月份
+     * @return monthStart
+     */
     public Integer getMonthStart(){
         return this.monthStart;
     }
 
     /**
-    * 设置 开始 考核月份
-    * @param monthStart
-    */
+     * 设置 开始 考核月份
+     * @param monthStart
+     */
     public void setMonthStart(Integer monthStart){
         this.monthStart = monthStart;
     }
 
     /**
-    * 获取 结束 考核月份
-    * @return $monthEnd
-    */
+     * 获取 结束 考核月份
+     * @return $monthEnd
+     */
     public Integer getMonthEnd(){
         return this.monthEnd;
     }
 
     /**
-    * 设置 结束 考核月份
-    * @param monthEnd
-    */
+     * 设置 结束 考核月份
+     * @param monthEnd
+     */
     public void setMonthEnd(Integer monthEnd){
         this.monthEnd = monthEnd;
     }
 
     /**
-    * 获取 增加 考核月份
-    * @return monthIncrement
-    */
+     * 获取 增加 考核月份
+     * @return monthIncrement
+     */
     public Integer getMonthIncrement(){
         return this.monthIncrement;
     }
 
     /**
-    * 设置 增加 考核月份
-    * @param monthIncrement
-    */
+     * 设置 增加 考核月份
+     * @param monthIncrement
+     */
     public void setMonthIncrement(Integer monthIncrement){
         this.monthIncrement = monthIncrement;
     }
 
     /**
-    * 获取 考核月份
-    * @return monthList
-    */
+     * 获取 考核月份
+     * @return monthList
+     */
     public List<Integer> getMonthList(){
         return this.monthList;
     }
 
     /**
-    * 设置 考核月份
-    * @param monthList
-    */
+     * 设置 考核月份
+     * @param monthList
+     */
     public void setMonthList(List<Integer> monthList){
         this.monthList = monthList;
     }
 
     /**
-    * 获取 考核月份
-    * @return monthNotList
-    */
+     * 获取 考核月份
+     * @return monthNotList
+     */
     public List<Integer> getMonthNotList(){
         return this.monthNotList;
     }
 
     /**
-    * 设置 考核月份
-    * @param monthNotList
-    */
+     * 设置 考核月份
+     * @param monthNotList
+     */
     public void setMonthNotList(List<Integer> monthNotList){
         this.monthNotList = monthNotList;
     }
 
 
     /**
-    * 获取 开始 窗口ID
-    * @return windowIdStart
-    */
+     * 获取 开始 窗口ID
+     * @return windowIdStart
+     */
     public Long getWindowIdStart(){
         return this.windowIdStart;
     }
 
     /**
-    * 设置 开始 窗口ID
-    * @param windowIdStart
-    */
+     * 设置 开始 窗口ID
+     * @param windowIdStart
+     */
     public void setWindowIdStart(Long windowIdStart){
         this.windowIdStart = windowIdStart;
     }
 
     /**
-    * 获取 结束 窗口ID
-    * @return $windowIdEnd
-    */
+     * 获取 结束 窗口ID
+     * @return $windowIdEnd
+     */
     public Long getWindowIdEnd(){
         return this.windowIdEnd;
     }
 
     /**
-    * 设置 结束 窗口ID
-    * @param windowIdEnd
-    */
+     * 设置 结束 窗口ID
+     * @param windowIdEnd
+     */
     public void setWindowIdEnd(Long windowIdEnd){
         this.windowIdEnd = windowIdEnd;
     }
 
     /**
-    * 获取 增加 窗口ID
-    * @return windowIdIncrement
-    */
+     * 获取 增加 窗口ID
+     * @return windowIdIncrement
+     */
     public Long getWindowIdIncrement(){
         return this.windowIdIncrement;
     }
 
     /**
-    * 设置 增加 窗口ID
-    * @param windowIdIncrement
-    */
+     * 设置 增加 窗口ID
+     * @param windowIdIncrement
+     */
     public void setWindowIdIncrement(Long windowIdIncrement){
         this.windowIdIncrement = windowIdIncrement;
     }
 
     /**
-    * 获取 窗口ID
-    * @return windowIdList
-    */
+     * 获取 窗口ID
+     * @return windowIdList
+     */
     public List<Long> getWindowIdList(){
         return this.windowIdList;
     }
 
     /**
-    * 设置 窗口ID
-    * @param windowIdList
-    */
+     * 设置 窗口ID
+     * @param windowIdList
+     */
     public void setWindowIdList(List<Long> windowIdList){
         this.windowIdList = windowIdList;
     }
 
     /**
-    * 获取 窗口ID
-    * @return windowIdNotList
-    */
+     * 获取 窗口ID
+     * @return windowIdNotList
+     */
     public List<Long> getWindowIdNotList(){
         return this.windowIdNotList;
     }
 
     /**
-    * 设置 窗口ID
-    * @param windowIdNotList
-    */
+     * 设置 窗口ID
+     * @param windowIdNotList
+     */
     public void setWindowIdNotList(List<Long> windowIdNotList){
         this.windowIdNotList = windowIdNotList;
     }
 
 
     /**
-    * 获取 窗口名称
-    * @return windowNameList
-    */
+     * 获取 窗口名称
+     * @return windowNameList
+     */
     public List<String> getWindowNameList(){
         return this.windowNameList;
     }
 
     /**
-    * 设置 窗口名称
-    * @param windowNameList
-    */
+     * 设置 窗口名称
+     * @param windowNameList
+     */
     public void setWindowNameList(List<String> windowNameList){
         this.windowNameList = windowNameList;
     }
 
     /**
-    * 获取 窗口名称
-    * @return windowNameNotList
-    */
+     * 获取 窗口名称
+     * @return windowNameNotList
+     */
     public List<String> getWindowNameNotList(){
         return this.windowNameNotList;
     }
 
     /**
-    * 设置 窗口名称
-    * @param windowNameNotList
-    */
+     * 设置 窗口名称
+     * @param windowNameNotList
+     */
     public void setWindowNameNotList(List<String> windowNameNotList){
         this.windowNameNotList = windowNameNotList;
     }
 
     /**
-    * 获取 开始 窗口负责人id
-    * @return ownerIdStart
-    */
+     * 获取 开始 窗口负责人id
+     * @return ownerIdStart
+     */
     public Long getOwnerIdStart(){
         return this.ownerIdStart;
     }
 
     /**
-    * 设置 开始 窗口负责人id
-    * @param ownerIdStart
-    */
+     * 设置 开始 窗口负责人id
+     * @param ownerIdStart
+     */
     public void setOwnerIdStart(Long ownerIdStart){
         this.ownerIdStart = ownerIdStart;
     }
 
     /**
-    * 获取 结束 窗口负责人id
-    * @return $ownerIdEnd
-    */
+     * 获取 结束 窗口负责人id
+     * @return $ownerIdEnd
+     */
     public Long getOwnerIdEnd(){
         return this.ownerIdEnd;
     }
 
     /**
-    * 设置 结束 窗口负责人id
-    * @param ownerIdEnd
-    */
+     * 设置 结束 窗口负责人id
+     * @param ownerIdEnd
+     */
     public void setOwnerIdEnd(Long ownerIdEnd){
         this.ownerIdEnd = ownerIdEnd;
     }
 
     /**
-    * 获取 增加 窗口负责人id
-    * @return ownerIdIncrement
-    */
+     * 获取 增加 窗口负责人id
+     * @return ownerIdIncrement
+     */
     public Long getOwnerIdIncrement(){
         return this.ownerIdIncrement;
     }
 
     /**
-    * 设置 增加 窗口负责人id
-    * @param ownerIdIncrement
-    */
+     * 设置 增加 窗口负责人id
+     * @param ownerIdIncrement
+     */
     public void setOwnerIdIncrement(Long ownerIdIncrement){
         this.ownerIdIncrement = ownerIdIncrement;
     }
 
     /**
-    * 获取 窗口负责人id
-    * @return ownerIdList
-    */
+     * 获取 窗口负责人id
+     * @return ownerIdList
+     */
     public List<Long> getOwnerIdList(){
         return this.ownerIdList;
     }
 
     /**
-    * 设置 窗口负责人id
-    * @param ownerIdList
-    */
+     * 设置 窗口负责人id
+     * @param ownerIdList
+     */
     public void setOwnerIdList(List<Long> ownerIdList){
         this.ownerIdList = ownerIdList;
     }
 
     /**
-    * 获取 窗口负责人id
-    * @return ownerIdNotList
-    */
+     * 获取 窗口负责人id
+     * @return ownerIdNotList
+     */
     public List<Long> getOwnerIdNotList(){
         return this.ownerIdNotList;
     }
 
     /**
-    * 设置 窗口负责人id
-    * @param ownerIdNotList
-    */
+     * 设置 窗口负责人id
+     * @param ownerIdNotList
+     */
     public void setOwnerIdNotList(List<Long> ownerIdNotList){
         this.ownerIdNotList = ownerIdNotList;
     }
 
 
     /**
-    * 获取 窗口负责人名称
-    * @return ownerNameList
-    */
+     * 获取 窗口负责人名称
+     * @return ownerNameList
+     */
     public List<String> getOwnerNameList(){
         return this.ownerNameList;
     }
 
     /**
-    * 设置 窗口负责人名称
-    * @param ownerNameList
-    */
+     * 设置 窗口负责人名称
+     * @param ownerNameList
+     */
     public void setOwnerNameList(List<String> ownerNameList){
         this.ownerNameList = ownerNameList;
     }
 
     /**
-    * 获取 窗口负责人名称
-    * @return ownerNameNotList
-    */
+     * 获取 窗口负责人名称
+     * @return ownerNameNotList
+     */
     public List<String> getOwnerNameNotList(){
         return this.ownerNameNotList;
     }
 
     /**
-    * 设置 窗口负责人名称
-    * @param ownerNameNotList
-    */
+     * 设置 窗口负责人名称
+     * @param ownerNameNotList
+     */
     public void setOwnerNameNotList(List<String> ownerNameNotList){
         this.ownerNameNotList = ownerNameNotList;
     }
 
     /**
-    * 获取 开始 所属部门id
-    * @return deptIdStart
-    */
+     * 获取 开始 所属部门id
+     * @return deptIdStart
+     */
     public Long getDeptIdStart(){
         return this.deptIdStart;
     }
 
     /**
-    * 设置 开始 所属部门id
-    * @param deptIdStart
-    */
+     * 设置 开始 所属部门id
+     * @param deptIdStart
+     */
     public void setDeptIdStart(Long deptIdStart){
         this.deptIdStart = deptIdStart;
     }
 
     /**
-    * 获取 结束 所属部门id
-    * @return $deptIdEnd
-    */
+     * 获取 结束 所属部门id
+     * @return $deptIdEnd
+     */
     public Long getDeptIdEnd(){
         return this.deptIdEnd;
     }
 
     /**
-    * 设置 结束 所属部门id
-    * @param deptIdEnd
-    */
+     * 设置 结束 所属部门id
+     * @param deptIdEnd
+     */
     public void setDeptIdEnd(Long deptIdEnd){
         this.deptIdEnd = deptIdEnd;
     }
 
     /**
-    * 获取 增加 所属部门id
-    * @return deptIdIncrement
-    */
+     * 获取 增加 所属部门id
+     * @return deptIdIncrement
+     */
     public Long getDeptIdIncrement(){
         return this.deptIdIncrement;
     }
 
     /**
-    * 设置 增加 所属部门id
-    * @param deptIdIncrement
-    */
+     * 设置 增加 所属部门id
+     * @param deptIdIncrement
+     */
     public void setDeptIdIncrement(Long deptIdIncrement){
         this.deptIdIncrement = deptIdIncrement;
     }
 
     /**
-    * 获取 所属部门id
-    * @return deptIdList
-    */
+     * 获取 所属部门id
+     * @return deptIdList
+     */
     public List<Long> getDeptIdList(){
         return this.deptIdList;
     }
 
     /**
-    * 设置 所属部门id
-    * @param deptIdList
-    */
+     * 设置 所属部门id
+     * @param deptIdList
+     */
     public void setDeptIdList(List<Long> deptIdList){
         this.deptIdList = deptIdList;
     }
 
     /**
-    * 获取 所属部门id
-    * @return deptIdNotList
-    */
+     * 获取 所属部门id
+     * @return deptIdNotList
+     */
     public List<Long> getDeptIdNotList(){
         return this.deptIdNotList;
     }
 
     /**
-    * 设置 所属部门id
-    * @param deptIdNotList
-    */
+     * 设置 所属部门id
+     * @param deptIdNotList
+     */
     public void setDeptIdNotList(List<Long> deptIdNotList){
         this.deptIdNotList = deptIdNotList;
     }
 
 
     /**
-    * 获取 所属部门名称
-    * @return deptNameList
-    */
+     * 获取 所属部门名称
+     * @return deptNameList
+     */
     public List<String> getDeptNameList(){
         return this.deptNameList;
     }
 
     /**
-    * 设置 所属部门名称
-    * @param deptNameList
-    */
+     * 设置 所属部门名称
+     * @param deptNameList
+     */
     public void setDeptNameList(List<String> deptNameList){
         this.deptNameList = deptNameList;
     }
 
     /**
-    * 获取 所属部门名称
-    * @return deptNameNotList
-    */
+     * 获取 所属部门名称
+     * @return deptNameNotList
+     */
     public List<String> getDeptNameNotList(){
         return this.deptNameNotList;
     }
 
     /**
-    * 设置 所属部门名称
-    * @param deptNameNotList
-    */
+     * 设置 所属部门名称
+     * @param deptNameNotList
+     */
     public void setDeptNameNotList(List<String> deptNameNotList){
         this.deptNameNotList = deptNameNotList;
     }
 
     /**
-    * 获取 开始 所属大厅
-    * @return salaIdStart
-    */
+     * 获取 开始 所属大厅
+     * @return salaIdStart
+     */
     public Long getSalaIdStart(){
         return this.salaIdStart;
     }
 
     /**
-    * 设置 开始 所属大厅
-    * @param salaIdStart
-    */
+     * 设置 开始 所属大厅
+     * @param salaIdStart
+     */
     public void setSalaIdStart(Long salaIdStart){
         this.salaIdStart = salaIdStart;
     }
 
     /**
-    * 获取 结束 所属大厅
-    * @return $salaIdEnd
-    */
+     * 获取 结束 所属大厅
+     * @return $salaIdEnd
+     */
     public Long getSalaIdEnd(){
         return this.salaIdEnd;
     }
 
     /**
-    * 设置 结束 所属大厅
-    * @param salaIdEnd
-    */
+     * 设置 结束 所属大厅
+     * @param salaIdEnd
+     */
     public void setSalaIdEnd(Long salaIdEnd){
         this.salaIdEnd = salaIdEnd;
     }
 
     /**
-    * 获取 增加 所属大厅
-    * @return salaIdIncrement
-    */
+     * 获取 增加 所属大厅
+     * @return salaIdIncrement
+     */
     public Long getSalaIdIncrement(){
         return this.salaIdIncrement;
     }
 
     /**
-    * 设置 增加 所属大厅
-    * @param salaIdIncrement
-    */
+     * 设置 增加 所属大厅
+     * @param salaIdIncrement
+     */
     public void setSalaIdIncrement(Long salaIdIncrement){
         this.salaIdIncrement = salaIdIncrement;
     }
 
     /**
-    * 获取 所属大厅
-    * @return salaIdList
-    */
+     * 获取 所属大厅
+     * @return salaIdList
+     */
     public List<Long> getSalaIdList(){
         return this.salaIdList;
     }
 
     /**
-    * 设置 所属大厅
-    * @param salaIdList
-    */
+     * 设置 所属大厅
+     * @param salaIdList
+     */
     public void setSalaIdList(List<Long> salaIdList){
         this.salaIdList = salaIdList;
     }
 
     /**
-    * 获取 所属大厅
-    * @return salaIdNotList
-    */
+     * 获取 所属大厅
+     * @return salaIdNotList
+     */
     public List<Long> getSalaIdNotList(){
         return this.salaIdNotList;
     }
 
     /**
-    * 设置 所属大厅
-    * @param salaIdNotList
-    */
+     * 设置 所属大厅
+     * @param salaIdNotList
+     */
     public void setSalaIdNotList(List<Long> salaIdNotList){
         this.salaIdNotList = salaIdNotList;
     }
 
 
     /**
-    * 获取 所属大厅名称
-    * @return salaNameList
-    */
+     * 获取 所属大厅名称
+     * @return salaNameList
+     */
     public List<String> getSalaNameList(){
         return this.salaNameList;
     }
 
     /**
-    * 设置 所属大厅名称
-    * @param salaNameList
-    */
+     * 设置 所属大厅名称
+     * @param salaNameList
+     */
     public void setSalaNameList(List<String> salaNameList){
         this.salaNameList = salaNameList;
     }
 
     /**
-    * 获取 所属大厅名称
-    * @return salaNameNotList
-    */
+     * 获取 所属大厅名称
+     * @return salaNameNotList
+     */
     public List<String> getSalaNameNotList(){
         return this.salaNameNotList;
     }
 
     /**
-    * 设置 所属大厅名称
-    * @param salaNameNotList
-    */
+     * 设置 所属大厅名称
+     * @param salaNameNotList
+     */
     public void setSalaNameNotList(List<String> salaNameNotList){
         this.salaNameNotList = salaNameNotList;
     }
 
     /**
-    * 获取 考核表单名称
-    * @return fromNameList
-    */
+     * 获取 考核表单名称
+     * @return fromNameList
+     */
     public List<String> getFromNameList(){
         return this.fromNameList;
     }
 
     /**
-    * 设置 考核表单名称
-    * @param fromNameList
-    */
+     * 设置 考核表单名称
+     * @param fromNameList
+     */
     public void setFromNameList(List<String> fromNameList){
         this.fromNameList = fromNameList;
     }
 
     /**
-    * 获取 考核表单名称
-    * @return fromNameNotList
-    */
+     * 获取 考核表单名称
+     * @return fromNameNotList
+     */
     public List<String> getFromNameNotList(){
         return this.fromNameNotList;
     }
 
     /**
-    * 设置 考核表单名称
-    * @param fromNameNotList
-    */
+     * 设置 考核表单名称
+     * @param fromNameNotList
+     */
     public void setFromNameNotList(List<String> fromNameNotList){
         this.fromNameNotList = fromNameNotList;
     }
 
     /**
-    * 获取 开始 提交时间
-    * @return submitDateStart
-    */
+     * 获取 开始 提交时间
+     * @return submitDateStart
+     */
     public String getSubmitDateStart(){
         return this.submitDateStart;
     }
 
     /**
-    * 设置 开始 提交时间
-    * @param submitDateStart
-    */
+     * 设置 开始 提交时间
+     * @param submitDateStart
+     */
     public void setSubmitDateStart(String submitDateStart){
         this.submitDateStart = submitDateStart;
     }
 
     /**
-    * 获取 结束 提交时间
-    * @return submitDateEnd
-    */
+     * 获取 结束 提交时间
+     * @return submitDateEnd
+     */
     public String getSubmitDateEnd(){
         return this.submitDateEnd;
     }
 
     /**
-    * 设置 结束 提交时间
-    * @param submitDateEnd
-    */
+     * 设置 结束 提交时间
+     * @param submitDateEnd
+     */
     public void setSubmitDateEnd(String submitDateEnd){
         this.submitDateEnd = submitDateEnd;
     }
 
     /**
-    * 获取 管理组核查人员
-    * @return manageCheckPersonList
-    */
+     * 获取 管理组核查人员
+     * @return manageCheckPersonList
+     */
     public List<String> getManageCheckPersonList(){
         return this.manageCheckPersonList;
     }
 
     /**
-    * 设置 管理组核查人员
-    * @param manageCheckPersonList
-    */
+     * 设置 管理组核查人员
+     * @param manageCheckPersonList
+     */
     public void setManageCheckPersonList(List<String> manageCheckPersonList){
         this.manageCheckPersonList = manageCheckPersonList;
     }
 
     /**
-    * 获取 管理组核查人员
-    * @return manageCheckPersonNotList
-    */
+     * 获取 管理组核查人员
+     * @return manageCheckPersonNotList
+     */
     public List<String> getManageCheckPersonNotList(){
         return this.manageCheckPersonNotList;
     }
 
     /**
-    * 设置 管理组核查人员
-    * @param manageCheckPersonNotList
-    */
+     * 设置 管理组核查人员
+     * @param manageCheckPersonNotList
+     */
     public void setManageCheckPersonNotList(List<String> manageCheckPersonNotList){
         this.manageCheckPersonNotList = manageCheckPersonNotList;
     }
 
     /**
-    * 获取 开始 管理组核查时间
-    * @return manageCheckTimeStart
-    */
+     * 获取 开始 管理组核查时间
+     * @return manageCheckTimeStart
+     */
     public String getManageCheckTimeStart(){
         return this.manageCheckTimeStart;
     }
 
     /**
-    * 设置 开始 管理组核查时间
-    * @param manageCheckTimeStart
-    */
+     * 设置 开始 管理组核查时间
+     * @param manageCheckTimeStart
+     */
     public void setManageCheckTimeStart(String manageCheckTimeStart){
         this.manageCheckTimeStart = manageCheckTimeStart;
     }
 
     /**
-    * 获取 结束 管理组核查时间
-    * @return manageCheckTimeEnd
-    */
+     * 获取 结束 管理组核查时间
+     * @return manageCheckTimeEnd
+     */
     public String getManageCheckTimeEnd(){
         return this.manageCheckTimeEnd;
     }
 
     /**
-    * 设置 结束 管理组核查时间
-    * @param manageCheckTimeEnd
-    */
+     * 设置 结束 管理组核查时间
+     * @param manageCheckTimeEnd
+     */
     public void setManageCheckTimeEnd(String manageCheckTimeEnd){
         this.manageCheckTimeEnd = manageCheckTimeEnd;
     }
 
     /**
-    * 获取 管理组核查说明
-    * @return manageCheckDescList
-    */
+     * 获取 管理组核查说明
+     * @return manageCheckDescList
+     */
     public List<String> getManageCheckDescList(){
         return this.manageCheckDescList;
     }
 
     /**
-    * 设置 管理组核查说明
-    * @param manageCheckDescList
-    */
+     * 设置 管理组核查说明
+     * @param manageCheckDescList
+     */
     public void setManageCheckDescList(List<String> manageCheckDescList){
         this.manageCheckDescList = manageCheckDescList;
     }
 
     /**
-    * 获取 管理组核查说明
-    * @return manageCheckDescNotList
-    */
+     * 获取 管理组核查说明
+     * @return manageCheckDescNotList
+     */
     public List<String> getManageCheckDescNotList(){
         return this.manageCheckDescNotList;
     }
 
     /**
-    * 设置 管理组核查说明
-    * @param manageCheckDescNotList
-    */
+     * 设置 管理组核查说明
+     * @param manageCheckDescNotList
+     */
     public void setManageCheckDescNotList(List<String> manageCheckDescNotList){
         this.manageCheckDescNotList = manageCheckDescNotList;
     }
 
     /**
-    * 获取 管理组核查结果(1.通过,2.不通过)
-    * @return manageCheckResultList
-    */
+     * 获取 管理组核查结果(1.通过,2.不通过)
+     * @return manageCheckResultList
+     */
     public List<String> getManageCheckResultList(){
         return this.manageCheckResultList;
     }
 
     /**
-    * 设置 管理组核查结果(1.通过,2.不通过)
-    * @param manageCheckResultList
-    */
+     * 设置 管理组核查结果(1.通过,2.不通过)
+     * @param manageCheckResultList
+     */
     public void setManageCheckResultList(List<String> manageCheckResultList){
         this.manageCheckResultList = manageCheckResultList;
     }
 
     /**
-    * 获取 管理组核查结果(1.通过,2.不通过)
-    * @return manageCheckResultNotList
-    */
+     * 获取 管理组核查结果(1.通过,2.不通过)
+     * @return manageCheckResultNotList
+     */
     public List<String> getManageCheckResultNotList(){
         return this.manageCheckResultNotList;
     }
 
     /**
-    * 设置 管理组核查结果(1.通过,2.不通过)
-    * @param manageCheckResultNotList
-    */
+     * 设置 管理组核查结果(1.通过,2.不通过)
+     * @param manageCheckResultNotList
+     */
     public void setManageCheckResultNotList(List<String> manageCheckResultNotList){
         this.manageCheckResultNotList = manageCheckResultNotList;
     }
 
     /**
-    * 获取 备注
-    * @return remarkList
-    */
+     * 获取 备注
+     * @return remarkList
+     */
     public List<String> getRemarkList(){
         return this.remarkList;
     }
 
     /**
-    * 设置 备注
-    * @param remarkList
-    */
+     * 设置 备注
+     * @param remarkList
+     */
     public void setRemarkList(List<String> remarkList){
         this.remarkList = remarkList;
     }
 
     /**
-    * 获取 备注
-    * @return remarkNotList
-    */
+     * 获取 备注
+     * @return remarkNotList
+     */
     public List<String> getRemarkNotList(){
         return this.remarkNotList;
     }
 
     /**
-    * 设置 备注
-    * @param remarkNotList
-    */
+     * 设置 备注
+     * @param remarkNotList
+     */
     public void setRemarkNotList(List<String> remarkNotList){
         this.remarkNotList = remarkNotList;
     }
 
     /**
-    * 获取 开始 创建用户
-    * @return createUserIdStart
-    */
+     * 获取 开始 创建用户
+     * @return createUserIdStart
+     */
     public Long getCreateUserIdStart(){
         return this.createUserIdStart;
     }
 
     /**
-    * 设置 开始 创建用户
-    * @param createUserIdStart
-    */
+     * 设置 开始 创建用户
+     * @param createUserIdStart
+     */
     public void setCreateUserIdStart(Long createUserIdStart){
         this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 获取 结束 创建用户
-    * @return $createUserIdEnd
-    */
+     * 获取 结束 创建用户
+     * @return $createUserIdEnd
+     */
     public Long getCreateUserIdEnd(){
         return this.createUserIdEnd;
     }
 
     /**
-    * 设置 结束 创建用户
-    * @param createUserIdEnd
-    */
+     * 设置 结束 创建用户
+     * @param createUserIdEnd
+     */
     public void setCreateUserIdEnd(Long createUserIdEnd){
         this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 获取 增加 创建用户
-    * @return createUserIdIncrement
-    */
+     * 获取 增加 创建用户
+     * @return createUserIdIncrement
+     */
     public Long getCreateUserIdIncrement(){
         return this.createUserIdIncrement;
     }
 
     /**
-    * 设置 增加 创建用户
-    * @param createUserIdIncrement
-    */
+     * 设置 增加 创建用户
+     * @param createUserIdIncrement
+     */
     public void setCreateUserIdIncrement(Long createUserIdIncrement){
         this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 获取 创建用户
-    * @return createUserIdList
-    */
+     * 获取 创建用户
+     * @return createUserIdList
+     */
     public List<Long> getCreateUserIdList(){
         return this.createUserIdList;
     }
 
     /**
-    * 设置 创建用户
-    * @param createUserIdList
-    */
+     * 设置 创建用户
+     * @param createUserIdList
+     */
     public void setCreateUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
     }
 
     /**
-    * 获取 创建用户
-    * @return createUserIdNotList
-    */
+     * 获取 创建用户
+     * @return createUserIdNotList
+     */
     public List<Long> getCreateUserIdNotList(){
         return this.createUserIdNotList;
     }
 
     /**
-    * 设置 创建用户
-    * @param createUserIdNotList
-    */
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
     public void setCreateUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
     }
 
 
     /**
-    * 获取 开始 创建时间
-    * @return createTimeStart
-    */
+     * 获取 开始 创建时间
+     * @return createTimeStart
+     */
     public String getCreateTimeStart(){
         return this.createTimeStart;
     }
 
     /**
-    * 设置 开始 创建时间
-    * @param createTimeStart
-    */
+     * 设置 开始 创建时间
+     * @param createTimeStart
+     */
     public void setCreateTimeStart(String createTimeStart){
         this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 获取 结束 创建时间
-    * @return createTimeEnd
-    */
+     * 获取 结束 创建时间
+     * @return createTimeEnd
+     */
     public String getCreateTimeEnd(){
         return this.createTimeEnd;
     }
 
     /**
-    * 设置 结束 创建时间
-    * @param createTimeEnd
-    */
+     * 设置 结束 创建时间
+     * @param createTimeEnd
+     */
     public void setCreateTimeEnd(String createTimeEnd){
         this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 获取 开始 更新用户
-    * @return updateUserIdStart
-    */
+     * 获取 开始 更新用户
+     * @return updateUserIdStart
+     */
     public Long getUpdateUserIdStart(){
         return this.updateUserIdStart;
     }
 
     /**
-    * 设置 开始 更新用户
-    * @param updateUserIdStart
-    */
+     * 设置 开始 更新用户
+     * @param updateUserIdStart
+     */
     public void setUpdateUserIdStart(Long updateUserIdStart){
         this.updateUserIdStart = updateUserIdStart;
     }
 
     /**
-    * 获取 结束 更新用户
-    * @return $updateUserIdEnd
-    */
+     * 获取 结束 更新用户
+     * @return $updateUserIdEnd
+     */
     public Long getUpdateUserIdEnd(){
         return this.updateUserIdEnd;
     }
 
     /**
-    * 设置 结束 更新用户
-    * @param updateUserIdEnd
-    */
+     * 设置 结束 更新用户
+     * @param updateUserIdEnd
+     */
     public void setUpdateUserIdEnd(Long updateUserIdEnd){
         this.updateUserIdEnd = updateUserIdEnd;
     }
 
     /**
-    * 获取 增加 更新用户
-    * @return updateUserIdIncrement
-    */
+     * 获取 增加 更新用户
+     * @return updateUserIdIncrement
+     */
     public Long getUpdateUserIdIncrement(){
         return this.updateUserIdIncrement;
     }
 
     /**
-    * 设置 增加 更新用户
-    * @param updateUserIdIncrement
-    */
+     * 设置 增加 更新用户
+     * @param updateUserIdIncrement
+     */
     public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
         this.updateUserIdIncrement = updateUserIdIncrement;
     }
 
     /**
-    * 获取 更新用户
-    * @return updateUserIdList
-    */
+     * 获取 更新用户
+     * @return updateUserIdList
+     */
     public List<Long> getUpdateUserIdList(){
         return this.updateUserIdList;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdList
-    */
+     * 设置 更新用户
+     * @param updateUserIdList
+     */
     public void setUpdateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
     }
 
     /**
-    * 获取 更新用户
-    * @return updateUserIdNotList
-    */
+     * 获取 更新用户
+     * @return updateUserIdNotList
+     */
     public List<Long> getUpdateUserIdNotList(){
         return this.updateUserIdNotList;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdNotList
-    */
+     * 设置 更新用户
+     * @param updateUserIdNotList
+     */
     public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
         this.updateUserIdNotList = updateUserIdNotList;
     }
 
 
     /**
-    * 获取 开始 更新时间
-    * @return updateTimeStart
-    */
+     * 获取 开始 更新时间
+     * @return updateTimeStart
+     */
     public String getUpdateTimeStart(){
         return this.updateTimeStart;
     }
 
     /**
-    * 设置 开始 更新时间
-    * @param updateTimeStart
-    */
+     * 设置 开始 更新时间
+     * @param updateTimeStart
+     */
     public void setUpdateTimeStart(String updateTimeStart){
         this.updateTimeStart = updateTimeStart;
     }
 
     /**
-    * 获取 结束 更新时间
-    * @return updateTimeEnd
-    */
+     * 获取 结束 更新时间
+     * @return updateTimeEnd
+     */
     public String getUpdateTimeEnd(){
         return this.updateTimeEnd;
     }
 
     /**
-    * 设置 结束 更新时间
-    * @param updateTimeEnd
-    */
+     * 设置 结束 更新时间
+     * @param updateTimeEnd
+     */
     public void setUpdateTimeEnd(String updateTimeEnd){
         this.updateTimeEnd = updateTimeEnd;
     }
 
     /**
-    * 设置  序号，主键，自增长
-    * @param id
-    */
+     * 获取 开始 处理状态(1.未处理,2.已处理)
+     * @return checkStatusStart
+     */
+    public Integer getCheckStatusStart(){
+        return this.checkStatusStart;
+    }
+
+    /**
+     * 设置 开始 处理状态(1.未处理,2.已处理)
+     * @param checkStatusStart
+     */
+    public void setCheckStatusStart(Integer checkStatusStart){
+        this.checkStatusStart = checkStatusStart;
+    }
+
+    /**
+     * 获取 结束 处理状态(1.未处理,2.已处理)
+     * @return $checkStatusEnd
+     */
+    public Integer getCheckStatusEnd(){
+        return this.checkStatusEnd;
+    }
+
+    /**
+     * 设置 结束 处理状态(1.未处理,2.已处理)
+     * @param checkStatusEnd
+     */
+    public void setCheckStatusEnd(Integer checkStatusEnd){
+        this.checkStatusEnd = checkStatusEnd;
+    }
+
+    /**
+     * 获取 增加 处理状态(1.未处理,2.已处理)
+     * @return checkStatusIncrement
+     */
+    public Integer getCheckStatusIncrement(){
+        return this.checkStatusIncrement;
+    }
+
+    /**
+     * 设置 增加 处理状态(1.未处理,2.已处理)
+     * @param checkStatusIncrement
+     */
+    public void setCheckStatusIncrement(Integer checkStatusIncrement){
+        this.checkStatusIncrement = checkStatusIncrement;
+    }
+
+    /**
+     * 获取 处理状态(1.未处理,2.已处理)
+     * @return checkStatusList
+     */
+    public List<Integer> getCheckStatusList(){
+        return this.checkStatusList;
+    }
+
+    /**
+     * 设置 处理状态(1.未处理,2.已处理)
+     * @param checkStatusList
+     */
+    public void setCheckStatusList(List<Integer> checkStatusList){
+        this.checkStatusList = checkStatusList;
+    }
+
+    /**
+     * 获取 处理状态(1.未处理,2.已处理)
+     * @return checkStatusNotList
+     */
+    public List<Integer> getCheckStatusNotList(){
+        return this.checkStatusNotList;
+    }
+
+    /**
+     * 设置 处理状态(1.未处理,2.已处理)
+     * @param checkStatusNotList
+     */
+    public void setCheckStatusNotList(List<Integer> checkStatusNotList){
+        this.checkStatusNotList = checkStatusNotList;
+    }
+
+
+    /**
+     * 设置  序号，主键，自增长
+     * @param id
+     */
     public CheckWindowWorkmanPerformQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 序号，主键，自增长
-    * @param idStart
-    */
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 序号，主键，自增长
+     * @param idStart
+     */
     public CheckWindowWorkmanPerformQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
+        this.idStart = idStart;
+        return this;
     }
 
     /**
-    * 设置 结束 序号，主键，自增长
-    * @param idEnd
-    */
+     * 设置 结束 序号，主键，自增长
+     * @param idEnd
+     */
     public CheckWindowWorkmanPerformQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
+        this.idEnd = idEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 序号，主键，自增长
-    * @param idIncrement
-    */
+     * 设置 增加 序号，主键，自增长
+     * @param idIncrement
+     */
     public CheckWindowWorkmanPerformQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
+        this.idIncrement = idIncrement;
+        return this;
     }
 
     /**
-    * 设置 序号，主键，自增长
-    * @param idList
-    */
+     * 设置 序号，主键，自增长
+     * @param idList
+     */
     public CheckWindowWorkmanPerformQuery idList(List<Long> idList){
         this.idList = idList;
-		return this;
-        }
-
-        /**
-        * 设置 序号，主键，自增长
-        * @param idNotList
-        */
-        public CheckWindowWorkmanPerformQuery idNotList(List<Long> idNotList){
+        return this;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public CheckWindowWorkmanPerformQuery idNotList(List<Long> idNotList){
         this.idNotList = idNotList;
         return this;
-        }
+    }
 
     /**
-    * 设置  记录ID
-    * @param recordId
-    */
+     * 设置  记录ID
+     * @param recordId
+     */
     public CheckWindowWorkmanPerformQuery recordId(Long recordId){
-	    setRecordId(recordId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 记录ID
-    * @param recordIdStart
-    */
+        setRecordId(recordId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 记录ID
+     * @param recordIdStart
+     */
     public CheckWindowWorkmanPerformQuery recordIdStart(Long recordIdStart){
-		this.recordIdStart = recordIdStart;
-		return this;
+        this.recordIdStart = recordIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 记录ID
-    * @param recordIdEnd
-    */
+     * 设置 结束 记录ID
+     * @param recordIdEnd
+     */
     public CheckWindowWorkmanPerformQuery recordIdEnd(Long recordIdEnd){
-		this.recordIdEnd = recordIdEnd;
-		return this;
+        this.recordIdEnd = recordIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 记录ID
-    * @param recordIdIncrement
-    */
+     * 设置 增加 记录ID
+     * @param recordIdIncrement
+     */
     public CheckWindowWorkmanPerformQuery recordIdIncrement(Long recordIdIncrement){
-		this.recordIdIncrement = recordIdIncrement;
-		return this;
+        this.recordIdIncrement = recordIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 记录ID
-    * @param recordIdList
-    */
+     * 设置 记录ID
+     * @param recordIdList
+     */
     public CheckWindowWorkmanPerformQuery recordIdList(List<Long> recordIdList){
         this.recordIdList = recordIdList;
-		return this;
-        }
-
-        /**
-        * 设置 记录ID
-        * @param recordIdNotList
-        */
-        public CheckWindowWorkmanPerformQuery recordIdNotList(List<Long> recordIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 记录ID
+     * @param recordIdNotList
+     */
+    public CheckWindowWorkmanPerformQuery recordIdNotList(List<Long> recordIdNotList){
         this.recordIdNotList = recordIdNotList;
         return this;
-        }
+    }
 
     /**
-    * 设置  考核年度
-    * @param year
-    */
+     * 设置  考核年度
+     * @param year
+     */
     public CheckWindowWorkmanPerformQuery year(Integer year){
-	    setYear(year);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 考核年度
-    * @param yearStart
-    */
+        setYear(year);
+        return this;
+    }
+
+    /**
+     * 设置 开始 考核年度
+     * @param yearStart
+     */
     public CheckWindowWorkmanPerformQuery yearStart(Integer yearStart){
-		this.yearStart = yearStart;
-		return this;
+        this.yearStart = yearStart;
+        return this;
     }
 
     /**
-    * 设置 结束 考核年度
-    * @param yearEnd
-    */
+     * 设置 结束 考核年度
+     * @param yearEnd
+     */
     public CheckWindowWorkmanPerformQuery yearEnd(Integer yearEnd){
-		this.yearEnd = yearEnd;
-		return this;
+        this.yearEnd = yearEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 考核年度
-    * @param yearIncrement
-    */
+     * 设置 增加 考核年度
+     * @param yearIncrement
+     */
     public CheckWindowWorkmanPerformQuery yearIncrement(Integer yearIncrement){
-		this.yearIncrement = yearIncrement;
-		return this;
+        this.yearIncrement = yearIncrement;
+        return this;
     }
 
     /**
-    * 设置 考核年度
-    * @param yearList
-    */
+     * 设置 考核年度
+     * @param yearList
+     */
     public CheckWindowWorkmanPerformQuery yearList(List<Integer> yearList){
         this.yearList = yearList;
-		return this;
-        }
-
-        /**
-        * 设置 考核年度
-        * @param yearNotList
-        */
-        public CheckWindowWorkmanPerformQuery yearNotList(List<Integer> yearNotList){
+        return this;
+    }
+
+    /**
+     * 设置 考核年度
+     * @param yearNotList
+     */
+    public CheckWindowWorkmanPerformQuery yearNotList(List<Integer> yearNotList){
         this.yearNotList = yearNotList;
         return this;
-        }
+    }
 
     /**
-    * 设置  考核月份
-    * @param month
-    */
+     * 设置  考核月份
+     * @param month
+     */
     public CheckWindowWorkmanPerformQuery month(Integer month){
-	    setMonth(month);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 考核月份
-    * @param monthStart
-    */
+        setMonth(month);
+        return this;
+    }
+
+    /**
+     * 设置 开始 考核月份
+     * @param monthStart
+     */
     public CheckWindowWorkmanPerformQuery monthStart(Integer monthStart){
-		this.monthStart = monthStart;
-		return this;
+        this.monthStart = monthStart;
+        return this;
     }
 
     /**
-    * 设置 结束 考核月份
-    * @param monthEnd
-    */
+     * 设置 结束 考核月份
+     * @param monthEnd
+     */
     public CheckWindowWorkmanPerformQuery monthEnd(Integer monthEnd){
-		this.monthEnd = monthEnd;
-		return this;
+        this.monthEnd = monthEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 考核月份
-    * @param monthIncrement
-    */
+     * 设置 增加 考核月份
+     * @param monthIncrement
+     */
     public CheckWindowWorkmanPerformQuery monthIncrement(Integer monthIncrement){
-		this.monthIncrement = monthIncrement;
-		return this;
+        this.monthIncrement = monthIncrement;
+        return this;
     }
 
     /**
-    * 设置 考核月份
-    * @param monthList
-    */
+     * 设置 考核月份
+     * @param monthList
+     */
     public CheckWindowWorkmanPerformQuery monthList(List<Integer> monthList){
         this.monthList = monthList;
-		return this;
-        }
-
-        /**
-        * 设置 考核月份
-        * @param monthNotList
-        */
-        public CheckWindowWorkmanPerformQuery monthNotList(List<Integer> monthNotList){
+        return this;
+    }
+
+    /**
+     * 设置 考核月份
+     * @param monthNotList
+     */
+    public CheckWindowWorkmanPerformQuery monthNotList(List<Integer> monthNotList){
         this.monthNotList = monthNotList;
         return this;
-        }
+    }
 
     /**
-    * 设置  窗口ID
-    * @param windowId
-    */
+     * 设置  窗口ID
+     * @param windowId
+     */
     public CheckWindowWorkmanPerformQuery windowId(Long windowId){
-	    setWindowId(windowId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 窗口ID
-    * @param windowIdStart
-    */
+        setWindowId(windowId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 窗口ID
+     * @param windowIdStart
+     */
     public CheckWindowWorkmanPerformQuery windowIdStart(Long windowIdStart){
-		this.windowIdStart = windowIdStart;
-		return this;
+        this.windowIdStart = windowIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 窗口ID
-    * @param windowIdEnd
-    */
+     * 设置 结束 窗口ID
+     * @param windowIdEnd
+     */
     public CheckWindowWorkmanPerformQuery windowIdEnd(Long windowIdEnd){
-		this.windowIdEnd = windowIdEnd;
-		return this;
+        this.windowIdEnd = windowIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 窗口ID
-    * @param windowIdIncrement
-    */
+     * 设置 增加 窗口ID
+     * @param windowIdIncrement
+     */
     public CheckWindowWorkmanPerformQuery windowIdIncrement(Long windowIdIncrement){
-		this.windowIdIncrement = windowIdIncrement;
-		return this;
+        this.windowIdIncrement = windowIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 窗口ID
-    * @param windowIdList
-    */
+     * 设置 窗口ID
+     * @param windowIdList
+     */
     public CheckWindowWorkmanPerformQuery windowIdList(List<Long> windowIdList){
         this.windowIdList = windowIdList;
-		return this;
-        }
-
-        /**
-        * 设置 窗口ID
-        * @param windowIdNotList
-        */
-        public CheckWindowWorkmanPerformQuery windowIdNotList(List<Long> windowIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 窗口ID
+     * @param windowIdNotList
+     */
+    public CheckWindowWorkmanPerformQuery windowIdNotList(List<Long> windowIdNotList){
         this.windowIdNotList = windowIdNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 设置 窗口名称
-    * @param windowName
-    */
+    /**
+     * 设置 窗口名称
+     * @param windowName
+     */
     public CheckWindowWorkmanPerformQuery windowName(String windowName){
         setWindowName(windowName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 窗口名称
-    * @param windowNameList
-    */
+     * 设置 窗口名称
+     * @param windowNameList
+     */
     public CheckWindowWorkmanPerformQuery windowNameList(List<String> windowNameList){
         this.windowNameList = windowNameList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  窗口负责人id
-    * @param ownerId
-    */
+     * 设置  窗口负责人id
+     * @param ownerId
+     */
     public CheckWindowWorkmanPerformQuery ownerId(Long ownerId){
-	    setOwnerId(ownerId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 窗口负责人id
-    * @param ownerIdStart
-    */
+        setOwnerId(ownerId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 窗口负责人id
+     * @param ownerIdStart
+     */
     public CheckWindowWorkmanPerformQuery ownerIdStart(Long ownerIdStart){
-		this.ownerIdStart = ownerIdStart;
-		return this;
+        this.ownerIdStart = ownerIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 窗口负责人id
-    * @param ownerIdEnd
-    */
+     * 设置 结束 窗口负责人id
+     * @param ownerIdEnd
+     */
     public CheckWindowWorkmanPerformQuery ownerIdEnd(Long ownerIdEnd){
-		this.ownerIdEnd = ownerIdEnd;
-		return this;
+        this.ownerIdEnd = ownerIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 窗口负责人id
-    * @param ownerIdIncrement
-    */
+     * 设置 增加 窗口负责人id
+     * @param ownerIdIncrement
+     */
     public CheckWindowWorkmanPerformQuery ownerIdIncrement(Long ownerIdIncrement){
-		this.ownerIdIncrement = ownerIdIncrement;
-		return this;
+        this.ownerIdIncrement = ownerIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 窗口负责人id
-    * @param ownerIdList
-    */
+     * 设置 窗口负责人id
+     * @param ownerIdList
+     */
     public CheckWindowWorkmanPerformQuery ownerIdList(List<Long> ownerIdList){
         this.ownerIdList = ownerIdList;
-		return this;
-        }
-
-        /**
-        * 设置 窗口负责人id
-        * @param ownerIdNotList
-        */
-        public CheckWindowWorkmanPerformQuery ownerIdNotList(List<Long> ownerIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 窗口负责人id
+     * @param ownerIdNotList
+     */
+    public CheckWindowWorkmanPerformQuery ownerIdNotList(List<Long> ownerIdNotList){
         this.ownerIdNotList = ownerIdNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 设置 窗口负责人名称
-    * @param ownerName
-    */
+    /**
+     * 设置 窗口负责人名称
+     * @param ownerName
+     */
     public CheckWindowWorkmanPerformQuery ownerName(String ownerName){
         setOwnerName(ownerName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 窗口负责人名称
-    * @param ownerNameList
-    */
+     * 设置 窗口负责人名称
+     * @param ownerNameList
+     */
     public CheckWindowWorkmanPerformQuery ownerNameList(List<String> ownerNameList){
         this.ownerNameList = ownerNameList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  所属部门id
-    * @param deptId
-    */
+     * 设置  所属部门id
+     * @param deptId
+     */
     public CheckWindowWorkmanPerformQuery deptId(Long deptId){
-	    setDeptId(deptId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 所属部门id
-    * @param deptIdStart
-    */
+        setDeptId(deptId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 所属部门id
+     * @param deptIdStart
+     */
     public CheckWindowWorkmanPerformQuery deptIdStart(Long deptIdStart){
-		this.deptIdStart = deptIdStart;
-		return this;
+        this.deptIdStart = deptIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 所属部门id
-    * @param deptIdEnd
-    */
+     * 设置 结束 所属部门id
+     * @param deptIdEnd
+     */
     public CheckWindowWorkmanPerformQuery deptIdEnd(Long deptIdEnd){
-		this.deptIdEnd = deptIdEnd;
-		return this;
+        this.deptIdEnd = deptIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 所属部门id
-    * @param deptIdIncrement
-    */
+     * 设置 增加 所属部门id
+     * @param deptIdIncrement
+     */
     public CheckWindowWorkmanPerformQuery deptIdIncrement(Long deptIdIncrement){
-		this.deptIdIncrement = deptIdIncrement;
-		return this;
+        this.deptIdIncrement = deptIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 所属部门id
-    * @param deptIdList
-    */
+     * 设置 所属部门id
+     * @param deptIdList
+     */
     public CheckWindowWorkmanPerformQuery deptIdList(List<Long> deptIdList){
         this.deptIdList = deptIdList;
-		return this;
-        }
-
-        /**
-        * 设置 所属部门id
-        * @param deptIdNotList
-        */
-        public CheckWindowWorkmanPerformQuery deptIdNotList(List<Long> deptIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 所属部门id
+     * @param deptIdNotList
+     */
+    public CheckWindowWorkmanPerformQuery deptIdNotList(List<Long> deptIdNotList){
         this.deptIdNotList = deptIdNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 设置 所属部门名称
-    * @param deptName
-    */
+    /**
+     * 设置 所属部门名称
+     * @param deptName
+     */
     public CheckWindowWorkmanPerformQuery deptName(String deptName){
         setDeptName(deptName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 所属部门名称
-    * @param deptNameList
-    */
+     * 设置 所属部门名称
+     * @param deptNameList
+     */
     public CheckWindowWorkmanPerformQuery deptNameList(List<String> deptNameList){
         this.deptNameList = deptNameList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  所属大厅
-    * @param salaId
-    */
+     * 设置  所属大厅
+     * @param salaId
+     */
     public CheckWindowWorkmanPerformQuery salaId(Long salaId){
-	    setSalaId(salaId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 所属大厅
-    * @param salaIdStart
-    */
+        setSalaId(salaId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 所属大厅
+     * @param salaIdStart
+     */
     public CheckWindowWorkmanPerformQuery salaIdStart(Long salaIdStart){
-		this.salaIdStart = salaIdStart;
-		return this;
+        this.salaIdStart = salaIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 所属大厅
-    * @param salaIdEnd
-    */
+     * 设置 结束 所属大厅
+     * @param salaIdEnd
+     */
     public CheckWindowWorkmanPerformQuery salaIdEnd(Long salaIdEnd){
-		this.salaIdEnd = salaIdEnd;
-		return this;
+        this.salaIdEnd = salaIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 所属大厅
-    * @param salaIdIncrement
-    */
+     * 设置 增加 所属大厅
+     * @param salaIdIncrement
+     */
     public CheckWindowWorkmanPerformQuery salaIdIncrement(Long salaIdIncrement){
-		this.salaIdIncrement = salaIdIncrement;
-		return this;
+        this.salaIdIncrement = salaIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 所属大厅
-    * @param salaIdList
-    */
+     * 设置 所属大厅
+     * @param salaIdList
+     */
     public CheckWindowWorkmanPerformQuery salaIdList(List<Long> salaIdList){
         this.salaIdList = salaIdList;
-		return this;
-        }
-
-        /**
-        * 设置 所属大厅
-        * @param salaIdNotList
-        */
-        public CheckWindowWorkmanPerformQuery salaIdNotList(List<Long> salaIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 所属大厅
+     * @param salaIdNotList
+     */
+    public CheckWindowWorkmanPerformQuery salaIdNotList(List<Long> salaIdNotList){
         this.salaIdNotList = salaIdNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 设置 所属大厅名称
-    * @param salaName
-    */
+    /**
+     * 设置 所属大厅名称
+     * @param salaName
+     */
     public CheckWindowWorkmanPerformQuery salaName(String salaName){
         setSalaName(salaName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 所属大厅名称
-    * @param salaNameList
-    */
+     * 设置 所属大厅名称
+     * @param salaNameList
+     */
     public CheckWindowWorkmanPerformQuery salaNameList(List<String> salaNameList){
         this.salaNameList = salaNameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 考核表单名称
-    * @param fromName
-    */
+    /**
+     * 设置 考核表单名称
+     * @param fromName
+     */
     public CheckWindowWorkmanPerformQuery fromName(String fromName){
         setFromName(fromName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 考核表单名称
-    * @param fromNameList
-    */
+     * 设置 考核表单名称
+     * @param fromNameList
+     */
     public CheckWindowWorkmanPerformQuery fromNameList(List<String> fromNameList){
         this.fromNameList = fromNameList;
-		return this;
+        return this;
     }
 
 
 
-	/**
-    * 设置 管理组核查人员
-    * @param manageCheckPerson
-    */
+    /**
+     * 设置 管理组核查人员
+     * @param manageCheckPerson
+     */
     public CheckWindowWorkmanPerformQuery manageCheckPerson(String manageCheckPerson){
         setManageCheckPerson(manageCheckPerson);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 管理组核查人员
-    * @param manageCheckPersonList
-    */
+     * 设置 管理组核查人员
+     * @param manageCheckPersonList
+     */
     public CheckWindowWorkmanPerformQuery manageCheckPersonList(List<String> manageCheckPersonList){
         this.manageCheckPersonList = manageCheckPersonList;
-		return this;
+        return this;
     }
 
 
 
-	/**
-    * 设置 管理组核查说明
-    * @param manageCheckDesc
-    */
+    /**
+     * 设置 管理组核查说明
+     * @param manageCheckDesc
+     */
     public CheckWindowWorkmanPerformQuery manageCheckDesc(String manageCheckDesc){
         setManageCheckDesc(manageCheckDesc);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 管理组核查说明
-    * @param manageCheckDescList
-    */
+     * 设置 管理组核查说明
+     * @param manageCheckDescList
+     */
     public CheckWindowWorkmanPerformQuery manageCheckDescList(List<String> manageCheckDescList){
         this.manageCheckDescList = manageCheckDescList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 管理组核查结果(1.通过,2.不通过)
-    * @param manageCheckResult
-    */
+    /**
+     * 设置 管理组核查结果(1.通过,2.不通过)
+     * @param manageCheckResult
+     */
     public CheckWindowWorkmanPerformQuery manageCheckResult(String manageCheckResult){
         setManageCheckResult(manageCheckResult);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 管理组核查结果(1.通过,2.不通过)
-    * @param manageCheckResultList
-    */
+     * 设置 管理组核查结果(1.通过,2.不通过)
+     * @param manageCheckResultList
+     */
     public CheckWindowWorkmanPerformQuery manageCheckResultList(List<String> manageCheckResultList){
         this.manageCheckResultList = manageCheckResultList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 备注
-    * @param remark
-    */
+    /**
+     * 设置 备注
+     * @param remark
+     */
     public CheckWindowWorkmanPerformQuery remark(String remark){
         setRemark(remark);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 备注
-    * @param remarkList
-    */
+     * 设置 备注
+     * @param remarkList
+     */
     public CheckWindowWorkmanPerformQuery remarkList(List<String> remarkList){
         this.remarkList = remarkList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  创建用户
-    * @param createUserId
-    */
+     * 设置  创建用户
+     * @param createUserId
+     */
     public CheckWindowWorkmanPerformQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 创建用户
-    * @param createUserIdStart
-    */
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 创建用户
+     * @param createUserIdStart
+     */
     public CheckWindowWorkmanPerformQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
+        this.createUserIdStart = createUserIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 创建用户
-    * @param createUserIdEnd
-    */
+     * 设置 结束 创建用户
+     * @param createUserIdEnd
+     */
     public CheckWindowWorkmanPerformQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 创建用户
-    * @param createUserIdIncrement
-    */
+     * 设置 增加 创建用户
+     * @param createUserIdIncrement
+     */
     public CheckWindowWorkmanPerformQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 创建用户
-    * @param createUserIdList
-    */
+     * 设置 创建用户
+     * @param createUserIdList
+     */
     public CheckWindowWorkmanPerformQuery createUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
-		return this;
-        }
-
-        /**
-        * 设置 创建用户
-        * @param createUserIdNotList
-        */
-        public CheckWindowWorkmanPerformQuery createUserIdNotList(List<Long> createUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public CheckWindowWorkmanPerformQuery createUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
         return this;
-        }
+    }
 
 
     /**
-    * 设置  更新用户
-    * @param updateUserId
-    */
+     * 设置  更新用户
+     * @param updateUserId
+     */
     public CheckWindowWorkmanPerformQuery updateUserId(Long updateUserId){
-	    setUpdateUserId(updateUserId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 更新用户
-    * @param updateUserIdStart
-    */
+        setUpdateUserId(updateUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 更新用户
+     * @param updateUserIdStart
+     */
     public CheckWindowWorkmanPerformQuery updateUserIdStart(Long updateUserIdStart){
-		this.updateUserIdStart = updateUserIdStart;
-		return this;
+        this.updateUserIdStart = updateUserIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 更新用户
-    * @param updateUserIdEnd
-    */
+     * 设置 结束 更新用户
+     * @param updateUserIdEnd
+     */
     public CheckWindowWorkmanPerformQuery updateUserIdEnd(Long updateUserIdEnd){
-		this.updateUserIdEnd = updateUserIdEnd;
-		return this;
+        this.updateUserIdEnd = updateUserIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 更新用户
-    * @param updateUserIdIncrement
-    */
+     * 设置 增加 更新用户
+     * @param updateUserIdIncrement
+     */
     public CheckWindowWorkmanPerformQuery updateUserIdIncrement(Long updateUserIdIncrement){
-		this.updateUserIdIncrement = updateUserIdIncrement;
-		return this;
+        this.updateUserIdIncrement = updateUserIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdList
-    */
+     * 设置 更新用户
+     * @param updateUserIdList
+     */
     public CheckWindowWorkmanPerformQuery updateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
-		return this;
-        }
-
-        /**
-        * 设置 更新用户
-        * @param updateUserIdNotList
-        */
-        public CheckWindowWorkmanPerformQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 更新用户
+     * @param updateUserIdNotList
+     */
+    public CheckWindowWorkmanPerformQuery updateUserIdNotList(List<Long> updateUserIdNotList){
         this.updateUserIdNotList = updateUserIdNotList;
         return this;
-        }
+    }
+
 
+    /**
+     * 设置  处理状态(1.未处理,2.已处理)
+     * @param checkStatus
+     */
+    public CheckWindowWorkmanPerformQuery checkStatus(Integer checkStatus){
+        setCheckStatus(checkStatus);
+        return this;
+    }
+
+    /**
+     * 设置 开始 处理状态(1.未处理,2.已处理)
+     * @param checkStatusStart
+     */
+    public CheckWindowWorkmanPerformQuery checkStatusStart(Integer checkStatusStart){
+        this.checkStatusStart = checkStatusStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 处理状态(1.未处理,2.已处理)
+     * @param checkStatusEnd
+     */
+    public CheckWindowWorkmanPerformQuery checkStatusEnd(Integer checkStatusEnd){
+        this.checkStatusEnd = checkStatusEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 处理状态(1.未处理,2.已处理)
+     * @param checkStatusIncrement
+     */
+    public CheckWindowWorkmanPerformQuery checkStatusIncrement(Integer checkStatusIncrement){
+        this.checkStatusIncrement = checkStatusIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 处理状态(1.未处理,2.已处理)
+     * @param checkStatusList
+     */
+    public CheckWindowWorkmanPerformQuery checkStatusList(List<Integer> checkStatusList){
+        this.checkStatusList = checkStatusList;
+        return this;
+    }
+
+    /**
+     * 设置 处理状态(1.未处理,2.已处理)
+     * @param checkStatusNotList
+     */
+    public CheckWindowWorkmanPerformQuery checkStatusNotList(List<Integer> checkStatusNotList){
+        this.checkStatusNotList = checkStatusNotList;
+        return this;
+    }
 
     /**
-    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
+     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
     public List<CheckWindowWorkmanPerformQuery> getOrConditionList(){
-    return this.orConditionList;
+        return this.orConditionList;
     }
 
     /**
-    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
+     * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
     public void setOrConditionList(List<CheckWindowWorkmanPerformQuery> orConditionList){
         this.orConditionList = orConditionList;
     }
 
     /**
-    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
+     * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
     public List<CheckWindowWorkmanPerformQuery> getAndConditionList(){
         return this.andConditionList;
     }
 
     /**
-    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
+     * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
     public void setAndConditionList(List<CheckWindowWorkmanPerformQuery> andConditionList){
         this.andConditionList = andConditionList;
     }

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

@@ -43,9 +43,9 @@ public class CheckWindowPerformController extends BaseCRUDJsonBodyMappingControl
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-//                this.addDict(model, "manageCheckResult", ManageCheckResultEnum.getEnumMap());
-//                this.addDict(model, "leaderCheckResult", LeaderCheckResultEnum.getEnumMap());
-                this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "manageCheckResult", WindowCheckResultEnum.getEnumMap());
+        this.addDict(model, "leaderCheckResult", WindowCheckResultEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
         super.init(model, context);
     }
 

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

@@ -43,7 +43,8 @@ public class CheckWindowWorkmanPerformController extends BaseCRUDJsonBodyMapping
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-//                this.addDict(model, "manageCheckResult", ManageCheckResultEnum.getEnumMap());
+        this.addDict(model, "manageCheckResult", WindowCheckResultEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
         super.init(model, context);
     }
 

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

@@ -278,7 +278,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
     @Override
     public List<DeptEntity> getDeptBySalaId(Long salaId) throws AppException {
         DeptQuery query = new DeptQuery();
-        if(salaId == null){
+        if(salaId == null || salaId == -1l){
             List<DeptEntity> allSala = dao.getList(new DeptQuery().parentId(71l));
             List<Long> salaList = new ArrayList<>();
             for(DeptEntity item:allSala){

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

 package com.mortals.xhx.module.dept.web;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
@@ -142,11 +145,60 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
         return super.doListAfter(query, model, context);
     }
 
+    /**
+     * 查询大厅列表
+     * @return
+     */
+    @GetMapping({"getSalaList"})
+    public Rest<Object> getAllSala() {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "查询大厅列表";
+        int code = 1;
+        try {
+            List<DeptEntity> allSala = this.getService().getAllSala();
+            model.put("data", allSala);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, var9);
+        }
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
 
-
-
-
-
-
+    /**
+     * 查询大厅列表
+     * @return
+     */
+    @GetMapping({"getDeptBySalaId"})
+    public Rest<Object> getDeptBySalaId(Long salaId) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "查询大厅对应的部门列表";
+        int code = 1;
+        try {
+            List<DeptEntity> allDept = this.getService().getDeptBySalaId(salaId);
+            model.put("data", allDept);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, var9);
+        }
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
 
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowWorkmanPerformVo.java

 package com.mortals.xhx.module.window.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.window.model.WindowWorkmanPerformEntity;
-import java.util.ArrayList;
-import java.util.List;
+import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailEntity;
 import lombok.Data;
-import com.mortals.framework.annotation.Excel;
-import java.math.BigDecimal;
-import java.util.Date;
+
+import java.util.List;
 /**
 * 窗口人员考核汇总登记视图对象
 *
@@ -19,5 +17,5 @@ public class WindowWorkmanPerformVo extends BaseEntityLong {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
-
+    private List <WindowWorkmanPerformDetailEntity> workmanPerformDetailList;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/WindowOwnerDetailService.java

 package com.mortals.xhx.module.window.service;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.common.pdu.window.WindowPdu;
 import com.mortals.xhx.module.window.model.WindowOwnerDetailEntity;
 import com.mortals.xhx.module.window.dao.WindowOwnerDetailDao;
+
+import java.util.List;
+
 /**
 * WindowOwnerDetailService
 *
@@ -13,4 +17,11 @@ import com.mortals.xhx.module.window.dao.WindowOwnerDetailDao;
 public interface WindowOwnerDetailService extends ICRUDService<WindowOwnerDetailEntity,Long>{
 
     WindowOwnerDetailDao getDao();
+
+    /**
+     * 获取基础平台与考勤绩效系统已分配的窗口差集列表
+     * @param pdu
+     * @return
+     */
+    List<WindowPdu> subWindowPduList(WindowPdu pdu);
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.window.service.impl;
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.window.WindowPdu;
+import com.mortals.xhx.feign.window.IWindowFeign;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -7,6 +14,13 @@ import com.mortals.xhx.module.window.dao.WindowOwnerDetailDao;
 import com.mortals.xhx.module.window.model.WindowOwnerDetailEntity;
 import com.mortals.xhx.module.window.service.WindowOwnerDetailService;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
 * WindowOwnerDetailService
 * 窗口负责人详细 service实现
@@ -17,5 +31,30 @@ import lombok.extern.slf4j.Slf4j;
 @Service("windowOwnerDetailService")
 @Slf4j
 public class WindowOwnerDetailServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerDetailDao, WindowOwnerDetailEntity, Long> implements WindowOwnerDetailService {
-    
+
+    @Autowired
+    private IWindowFeign windowFeign;
+
+    @Override
+    public List<WindowPdu> subWindowPduList(WindowPdu pdu) {
+        List<WindowPdu> subList = new ArrayList<>();
+        if(pdu.getSiteId()==null){
+            pdu.setSiteId(1l); //默认只查宜宾市民中心
+        }
+        pdu.setSize(-1);
+        Rest<RespData<List<WindowPdu>>> respDataRest = windowFeign.list(pdu);
+        if (respDataRest.getCode() == YesNoEnum.YES.getValue()) {
+            List<WindowOwnerDetailEntity> ownerDetail = this.getAllList();
+            if(!CollectionUtils.isEmpty(ownerDetail)){
+                Map<Long,List<WindowOwnerDetailEntity>> windowMap = ownerDetail.stream().collect(Collectors.groupingBy(WindowOwnerDetailEntity::getWindowId));
+                List<WindowPdu> allWindow = respDataRest.getData().getData();
+                for(WindowPdu item:allWindow){
+                    if(!windowMap.containsKey(item.getId())){
+                        subList.add(item);
+                    }
+                }
+            }
+        }
+        return subList;
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.window.service.impl;
+import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailEntity;
+import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailQuery;
+import com.mortals.xhx.module.window.service.WindowWorkmanPerformDetailService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -7,6 +12,11 @@ import com.mortals.xhx.module.window.dao.WindowWorkmanPerformDao;
 import com.mortals.xhx.module.window.model.WindowWorkmanPerformEntity;
 import com.mortals.xhx.module.window.service.WindowWorkmanPerformService;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
 /**
 * WindowWorkmanPerformService
 * 窗口人员考核汇总登记 service实现
@@ -17,5 +27,45 @@ import lombok.extern.slf4j.Slf4j;
 @Service("windowWorkmanPerformService")
 @Slf4j
 public class WindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImpl<WindowWorkmanPerformDao, WindowWorkmanPerformEntity, Long> implements WindowWorkmanPerformService {
-    
+
+    @Autowired
+    private WindowWorkmanPerformDetailService windowWorkmanPerformDetailService;
+
+
+    @Override
+    protected void saveAfter(WindowWorkmanPerformEntity entity, Context context) throws AppException {
+        if(CollectionUtils.isNotEmpty(entity.getWorkmanPerformDetailList())){
+            entity.getWorkmanPerformDetailList().forEach(item->{
+                item.setPerformId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+            });
+            windowWorkmanPerformDetailService.save(entity.getWorkmanPerformDetailList());
+        }
+        super.saveAfter(entity, context);
+    }
+
+    @Override
+    protected void updateAfter(WindowWorkmanPerformEntity entity, Context context) throws AppException {
+        if(CollectionUtils.isNotEmpty(entity.getWorkmanPerformDetailList())){
+            Long[] detailList = windowWorkmanPerformDetailService.find(new WindowWorkmanPerformDetailQuery().performId(entity.getId())).stream().map(WindowWorkmanPerformDetailEntity::getId).toArray(Long[]::new);
+            windowWorkmanPerformDetailService.remove(detailList,context);
+            entity.getWorkmanPerformDetailList().forEach(item->{
+                item.setPerformId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+                item.setUpdateUserId(this.getContextUserId(context));
+                item.setUpdateTime(new Date());
+            });
+            windowWorkmanPerformDetailService.save(entity.getWorkmanPerformDetailList());
+        }
+        super.updateAfter(entity, context);
+    }
+
+    @Override
+    protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
+        List<WindowWorkmanPerformDetailEntity> detailEntities = windowWorkmanPerformDetailService.find(new WindowWorkmanPerformDetailQuery().performIdList(Arrays.asList(ids)));
+        windowWorkmanPerformDetailService.removeList(detailEntities, context);
+        super.removeAfter(ids, context, result);
+    }
 }
\ No newline at end of file

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

@@ -59,10 +59,11 @@ public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<Win
     @Override
     protected void init(Map<String, Object> model, Context context) {
 
-        Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
-                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
-        this.addDict(model, "updateUserId", collect);
-        this.addDict(model, "deptName", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
+//        Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
+//                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
+//        this.addDict(model, "updateUserId", collect);
+        this.addDict(model, "deptId", deptService.getDeptBySalaId(-1l).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
+        this.addDict(model, "salaId", deptService.getAllSala().stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
 
         super.init(model, context);
     }

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

 package com.mortals.xhx.module.window.web;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
+
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.common.pdu.window.WindowPdu;
 import com.mortals.xhx.module.window.model.WindowOwnerDetailEntity;
 import com.mortals.xhx.module.window.service.WindowOwnerDetailService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
 /**
 *
 * 窗口负责人详细
@@ -33,9 +25,6 @@ import static com.mortals.framework.ap.SysConstains.*;
 @RequestMapping("window/owner/detail")
 public class WindowOwnerDetailController extends BaseCRUDJsonBodyMappingController<WindowOwnerDetailService,WindowOwnerDetailEntity,Long> {
 
-    @Autowired
-    private ParamService paramService;
-
     public WindowOwnerDetailController(){
         super.setModuleDesc( "窗口负责人详细");
     }
@@ -46,4 +35,29 @@ public class WindowOwnerDetailController extends BaseCRUDJsonBodyMappingControll
     }
 
 
+    @PostMapping({"subWindowList"})
+    public Rest<Object> subWindowList(@RequestBody WindowPdu query) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "查询待分配的窗口列表";
+
+        int code = 1;
+        try {
+            List<WindowPdu> result = this.getService().subWindowPduList(query);
+            model.put("data", result);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, var9);
+        }
+
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.window.web;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
+
 import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.common.code.FillStatusEnum;
+import com.mortals.xhx.common.code.SelfLevelEnum;
 import com.mortals.xhx.module.window.model.WindowPerformEntity;
 import com.mortals.xhx.module.window.service.WindowPerformService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import java.util.Map;
-import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
-import com.mortals.xhx.common.code.*;
 /**
 *
-* 大厅窗口信息
+* 大厅窗口考核登记信息
 *
 * @author zxfei
 * @date 2024-01-17
@@ -34,15 +21,15 @@ import com.mortals.xhx.common.code.*;
 @RequestMapping("window/perform")
 public class WindowPerformController extends BaseCRUDJsonBodyMappingController<WindowPerformService,WindowPerformEntity,Long> {
 
-    @Autowired
-    private ParamService paramService;
 
     public WindowPerformController(){
-        super.setModuleDesc( "大厅窗口信息");
+        super.setModuleDesc( "大厅窗口考核登记信息");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "selfLevel", SelfLevelEnum.getEnumMap());
+        this.addDict(model, "fillStatus", FillStatusEnum.getEnumMap());
         super.init(model, context);
     }
 

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

 package com.mortals.xhx.module.window.web;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
+
 import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.common.code.ExamineLevelEnum;
+import com.mortals.xhx.common.code.FillStatusEnum;
 import com.mortals.xhx.module.window.model.WindowWorkmanPerformEntity;
 import com.mortals.xhx.module.window.service.WindowWorkmanPerformService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import java.util.Map;
-import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
-import com.mortals.xhx.common.code.*;
 /**
 *
 * 窗口人员考核汇总登记
@@ -34,8 +21,6 @@ import com.mortals.xhx.common.code.*;
 @RequestMapping("window/workman/perform")
 public class WindowWorkmanPerformController extends BaseCRUDJsonBodyMappingController<WindowWorkmanPerformService,WindowWorkmanPerformEntity,Long> {
 
-    @Autowired
-    private ParamService paramService;
 
     public WindowWorkmanPerformController(){
         super.setModuleDesc( "窗口人员考核汇总登记");
@@ -43,6 +28,8 @@ public class WindowWorkmanPerformController extends BaseCRUDJsonBodyMappingContr
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "examineLevel", ExamineLevelEnum.getEnumMap());
+        this.addDict(model, "fillStatus", FillStatusEnum.getEnumMap());
         super.init(model, context);
     }
 

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

 package com.mortals.xhx.module.window.web;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
+
 import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.common.code.ExamineLevelEnum;
 import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailEntity;
 import com.mortals.xhx.module.window.service.WindowWorkmanPerformDetailService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import java.util.Map;
-import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
-import com.mortals.xhx.common.code.*;
 /**
 *
 * 窗口人员考核汇总明细
@@ -34,15 +20,13 @@ import com.mortals.xhx.common.code.*;
 @RequestMapping("window/workman/perform/detail")
 public class WindowWorkmanPerformDetailController extends BaseCRUDJsonBodyMappingController<WindowWorkmanPerformDetailService,WindowWorkmanPerformDetailEntity,Long> {
 
-    @Autowired
-    private ParamService paramService;
-
     public WindowWorkmanPerformDetailController(){
         super.setModuleDesc( "窗口人员考核汇总明细");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "examineLevel", ExamineLevelEnum.getEnumMap());
         super.init(model, context);
     }
 

attendance-performance-manager/src/main/resources/sqlmap/module/window/WindowOwnerMapper.xml

@@ -86,7 +86,7 @@
     <!-- 子表所有列 -->
     <sql id="_columns_sub">
         <trim suffixOverrides="," suffix="">
-            b.id,b.ownerId,b.staffId,b.remark,b.createTime,b.createUserId,b.updateUserId,b.updateTime,
+            b.id,b.performId,b.staffId,b.staffName,b.discipline,b.specification,b.management,b.evaluation,b.efficiency,b.bonusScore,b.sumScore,b.vexamineLevel,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->

attendance-performance-manager/src/main/resources/sqlmap/module/window/WindowWorkmanPerformMapper.xml

@@ -25,9 +25,28 @@
             <result property="createTime" column="createTime" />
             <result property="updateUserId" column="updateUserId" />
             <result property="updateTime" column="updateTime" />
-            
+        <collection property="workmanPerformDetailList" column="id" ofType="WindowWorkmanPerformDetailEntity" javaType="ArrayList" select="getWorkmanPerformDetailByPerformId"></collection>
     </resultMap>
+    <resultMap type="WindowWorkmanPerformDetailEntity" id="WindowWorkmanPerformDetailEntity-Map">
+        <id  property="id" column="id" />
+        <result property="performId" column="performId" />
+        <result property="staffId" column="staffId" />
+        <result property="staffName" column="staffName" />
+        <result property="discipline" column="discipline" />
+        <result property="specification" column="specification" />
+        <result property="management" column="management" />
+        <result property="evaluation" column="evaluation" />
+        <result property="efficiency" column="efficiency" />
+        <result property="bonusScore" column="bonusScore" />
+        <result property="sumScore" column="sumScore" />
+        <result property="examineLevel" column="examineLevel" />
+        <result property="remark" column="remark" />
+        <result property="createUserId" column="createUserId" />
+        <result property="createTime" column="createTime" />
+        <result property="updateUserId" column="updateUserId" />
+        <result property="updateTime" column="updateTime" />
 
+    </resultMap>
 
     <!-- 表所有列 -->
     <sql id="_columns">
@@ -94,6 +113,12 @@
                 </if>
         </trim>
     </sql>
+    <!-- 子表所有列 -->
+    <sql id="_columns_sub">
+        <trim suffixOverrides="," suffix="">
+            b.id,b.ownerId,b.staffId,b.remark,b.createTime,b.createUserId,b.updateUserId,b.updateTime,
+        </trim>
+    </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="WindowWorkmanPerformEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_window_workman_perform
@@ -453,7 +478,14 @@
         <include refid="_orderCols_"/>
     </select>
 
-
+    <!-- 获取子列表 -->
+    <select id="getWorkmanPerformDetailByPerformId" parameterType="java.lang.Long" resultMap="WindowWorkmanPerformDetailEntity-Map">
+        select <include refid="_columns_sub"/>
+        from mortals_xhx_window_workman_perform_detail as b
+        <trim suffixOverrides="where" suffix="">
+            where b.performId = #{id}
+        </trim>
+    </select>
 
     <!-- 获取 -->
     <select id="getListCount" parameterType="paramDto" resultType="int">

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -5,7 +5,7 @@ Content-Type: application/json
 
 {
   "loginName":"admin",
-  "password":"xhxADMIN8@a",
+  "password":"admin",
   "securityCode":"admin"
 }
 
@@ -30,8 +30,8 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "attendanceDateStart":"2023-12-01",
-  "attendanceDateEnd":"2024-01-15"
+  "attendanceDateStart":"2024-12-01",
+  "attendanceDateEnd":"2024-01-20"
 }
 
 ###海康考勤打卡记录计算1