核查列表添加

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformInfo.java

@@ -60,5 +60,10 @@ public class PerformInfo {
      */
     private String performType;
 
+    /**
+     * 申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)
+     */
+    private Integer appealStatus;
+
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java

@@ -16,13 +16,20 @@ import com.mortals.xhx.busiz.req.PerformReq;
 import com.mortals.xhx.busiz.rsp.PerformDetailInfo;
 import com.mortals.xhx.busiz.rsp.PerformInfo;
 import com.mortals.xhx.busiz.rsp.PerformStatInfo;
+import com.mortals.xhx.common.code.AppealResultEnum;
+import com.mortals.xhx.common.code.AppealStatusEnum;
 import com.mortals.xhx.common.code.PerformTypeEnum;
+import com.mortals.xhx.common.code.ProcessStatusEnum;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity;
 import com.mortals.xhx.module.attendance.model.AttendanceRecordQuery;
 import com.mortals.xhx.module.attendance.service.AttendanceRecordService;
 import com.mortals.xhx.module.check.model.*;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
 import com.mortals.xhx.module.check.service.*;
+import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
+import com.mortals.xhx.module.perform.model.PerformAttendAppealQuery;
+import com.mortals.xhx.module.perform.service.PerformAttendAppealService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
@@ -65,6 +72,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
     private CheckGoworkRecordService checkGoworkRecordService;
     @Autowired
     private CheckOtherRecordService checkOtherRecordService;
+    @Autowired
+    private CheckAllRecordService checkAllRecordService;
+
+    @Autowired
+    private PerformAttendAppealService appealService;
 
 
     /**
@@ -119,6 +131,24 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
             PageInfo pageInfo = buildPageInfo(performReq);
             //todo 查询全部扣分绩效
             if (PerformTypeEnum.全部.getValue().equals(performReq.getPerformType())) {
+                CheckAllRecordQuery query = new CheckAllRecordQuery();
+                query.setCheckTimeStart(performReq.getPerformStartDate());
+                query.setCheckTimeEnd(performReq.getPerformEndDate());
+                query.setStaffId(context.getUser().getCustomerId());
+
+                List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
+                List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
+                    PerformInfo performInfo = new PerformInfo();
+                    BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
+                    return performInfo;
+                }).collect(Collectors.toList());
+                model.put(KEY_RESULT_DATA, collect);
+                PageInfo pageAllInfo = new PageInfo();
+                pageAllInfo.setTotalResult(collect.size());
+                pageAllInfo.setCurrPage(1);
+                pageAllInfo.setPrePageResult(-1);
+                model.put(PAGEINFO_KEY, pageAllInfo);
+                parsePageInfo(model, pageAllInfo);
 
             } else if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
                 CheckAttendRecordQuery query = new CheckAttendRecordQuery();
@@ -131,8 +161,15 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformInfo performInfo = new PerformInfo();
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.考勤绩效.getValue());
+                    //判断是否存在申诉
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    Boolean bool = entity.newEntity();
+                    updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+
                     return performInfo;
                 }).collect(Collectors.toList());
+
+
                 model.put(KEY_RESULT_DATA, collect);
                 model.put(PAGEINFO_KEY, result.getPageInfo());
                 parsePageInfo(model, result.getPageInfo());
@@ -147,6 +184,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformInfo performInfo = new PerformInfo();
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.评价差评绩效.getValue());
+                    //判断是否存在申诉
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    Boolean bool = entity.newEntity();
+                    updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -163,6 +205,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformInfo performInfo = new PerformInfo();
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.评价投诉绩效.getValue());
+
+                    //判断是否存在申诉
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    Boolean bool = entity.newEntity();
+                    updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -179,6 +226,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformInfo performInfo = new PerformInfo();
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.办件绩效.getValue());
+                    //判断是否存在申诉
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    Boolean bool = entity.newEntity();
+                    updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -195,6 +246,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformInfo performInfo = new PerformInfo();
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.效能绩效.getValue());
+                    //判断是否存在申诉
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    Boolean bool = entity.newEntity();
+                    updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -211,6 +266,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     PerformInfo performInfo = new PerformInfo();
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.其它绩效.getValue());
+                    //判断是否存在申诉
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    Boolean bool = entity.newEntity();
+                    updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -221,7 +280,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
             }
 
             rest.setData(model);
-
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
             log.error(busiDesc, e);
@@ -230,6 +288,22 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
         return rest;
     }
 
+    private static void updateAppealStatus(PerformInfo performInfo, Boolean bool, Integer processStatus, Integer appealResult) {
+        if (!bool) {
+            performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+        } else {
+            if (ProcessStatusEnum.未处理.getValue() == processStatus) {
+                performInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
+            } else {
+                if (AppealResultEnum.通过.getValue() == appealResult) {
+                    performInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
+                } else if (AppealResultEnum.不通过.getValue() == appealResult) {
+                    performInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
+                }
+            }
+        }
+    }
+
 
     /**
      * 详细
@@ -278,7 +352,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
     }
 
 
-
     public static void main(String[] args) {
 
     }

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

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)
+*
+* @author zxfei
+*/
+public enum AppealStatusEnum {
+    未申诉(0, "未申诉"),
+    申诉中(1, "申诉中"),
+    申诉拒绝(2, "申诉拒绝"),
+    申诉通过(3, "申诉通过");
+    private Integer value;
+    private String desc;
+
+    AppealStatusEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static AppealStatusEnum getByValue(Integer value) {
+        for (AppealStatusEnum deviceStatusEnum : AppealStatusEnum.values()) {
+            if (deviceStatusEnum.getValue() == value) {
+                return deviceStatusEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (AppealStatusEnum item : AppealStatusEnum.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;
+    }
+}
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.model;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
+
+import cn.hutool.core.date.DateUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
@@ -111,9 +114,9 @@ public class PerformPerposeEntity extends PerformPerposeVo {
 
         this.periodType = 1;
 
-        this.year = -1;
+        this.year = DateUtil.year(new Date());
 
-        this.month = -1;
+        this.month =DateUtil.month(new Date())+1;
 
         this.halfYear = 1;
 

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

 package com.mortals.xhx.module.window.web;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 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.module.window.model.WindowOwnerEntity;
 import com.mortals.xhx.module.window.service.WindowOwnerService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 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.*;
+
 /**
-*
-* 窗口负责人
-*
-* @author zxfei
-* @date 2023-05-16
-*/
+ * 窗口负责人
+ *
+ * @author zxfei
+ * @date 2023-05-16
+ */
 @RestController
 @RequestMapping("window/owner")
-public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<WindowOwnerService,WindowOwnerEntity,Long> {
+public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<WindowOwnerService, WindowOwnerEntity, Long> {
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
+
 
-    public WindowOwnerController(){
-        super.setModuleDesc( "窗口负责人");
+    public WindowOwnerController() {
+        super.setModuleDesc("窗口负责人");
     }
 
     @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);
+
+
         super.init(model, context);
     }