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

attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue

@@ -22,9 +22,13 @@
 
                     <Field label="手机号码" :maxLength="11" prop="phoneNumber" v-model="form.phoneNumber" placeholder="请输入联系电话"/>
 
-                    <Field label="所属部门" :maxLength="10" prop="deptName" v-model="form.deptName" placeholder="请选择所属部门" @focus="ishowBumen = true"/>
-                    
-                    <Field label="职位" prop="positionId" v-model="form.positionId" :enumData="dict.positionId" type="select" placeholder="请选择职位" />
+<!--                    <Field label="所属部门" :maxLength="10" prop="deptName" v-model="form.deptName" placeholder="请选择所属部门" @focus="ishowBumen = true"/>
+                    -->
+
+                  <Field label="所属部门" prop="deptId" v-model="form.deptId" :enumData="dict.deptId" type="select" placeholder="请选择所属部门" />
+
+
+                  <Field label="职位" prop="positionId" v-model="form.positionId" :enumData="dict.positionId" type="select" placeholder="请选择职位" />
 
                     <Field label="工号" :maxLength="15" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/>
 
@@ -73,7 +77,7 @@
                           <i class="el-icon-close"></i>
                       </div>
                   </div>
-                  
+
               </el-col>
             </el-row>
             <div class="mt20">
@@ -278,4 +282,4 @@
   display: inline-block;
   margin-right: 10px;
 }
-</style>
\ No newline at end of file
+</style>

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

@@ -33,6 +33,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
     /**
      * 所属部门
      */
+    @Excel(name = "所属部门")
     private String deptName;
     /**
      * 电话号码
@@ -71,6 +72,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
     /**
      * 审批负责人
      */
+    @Excel(name = "审批负责人")
     private String approver;
     /**
      * 附件
@@ -87,6 +89,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
     /**
      * 申请时间
      */
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date appealTime;
     /**
      * 审核结果(1.申请通过,2.申请不通过)
@@ -106,6 +109,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
     /**
      * 处理状态
      */
+    @Excel(name = "处理状态", readConverterExp = "1=待处理,2=已处理")
     private Integer processStatus;
     @Override
     public int hashCode() {

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

 package com.mortals.xhx.module.attendance.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
 /**
@@ -9,6 +11,8 @@ import java.util.List;
 * @author zxfei
 * @date 2023-04-07
 */
+@Data
 public class AttendanceLeaveRecordVo extends BaseEntityLong {
-
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class CheckAttendRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class CheckComplainRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class CheckEffectRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class CheckGoworkRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class CheckOtherRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class CheckReviewRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.check.web;
 
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -7,6 +8,8 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,7 +54,8 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
     private ParamService paramService;
     @Autowired
     private UserService userService;
-
+    @Autowired
+    private DeptService deptService;
     public CheckAttendRecordController() {
         super.setModuleDesc("考勤绩效记录核查信息");
     }
@@ -66,6 +70,8 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
 
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
+
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
 
@@ -82,6 +88,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+               query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+               query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
         super.doListBefore(query, model, context);
     }
 

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

 package com.mortals.xhx.module.check.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -6,6 +7,8 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,7 +46,8 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
     private ParamService paramService;
     @Autowired
     private UserService userService;
-
+    @Autowired
+    private DeptService deptService;
     public CheckComplainRecordController(){
         super.setModuleDesc( "评价绩效投诉核查信息");
     }
@@ -60,6 +64,9 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "complainSource", ReviewSourceEnum.getEnumMap());
 
 
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
+
+
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
 
@@ -74,6 +81,11 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 
     /**

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

 package com.mortals.xhx.module.check.web;
+
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -6,52 +8,63 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 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.check.model.CheckEffectRecordEntity;
 import com.mortals.xhx.module.check.service.CheckEffectRecordService;
 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-07-11
-*/
+ * 效能绩效核查信息
+ *
+ * @author zxfei
+ * @date 2023-07-11
+ */
 @RestController
 @RequestMapping("check/effect/record")
-public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingController<CheckEffectRecordService,CheckEffectRecordEntity,Long> {
+public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingController<CheckEffectRecordService, CheckEffectRecordEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
     @Autowired
     private UserService userService;
+    @Autowired
+    private DeptService deptService;
 
-    public CheckEffectRecordController(){
-        super.setModuleDesc( "效能绩效核查信息");
+    public CheckEffectRecordController() {
+        super.setModuleDesc("效能绩效核查信息");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("CheckEffectRecord","irregularType"));
+        this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("CheckEffectRecord", "irregularType"));
         this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
         this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
@@ -59,6 +72,10 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+
+
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
 
 
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
@@ -75,10 +92,16 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 
     /**
      * 审核
+     *
      * @param entity
      * @return
      */

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

 package com.mortals.xhx.module.check.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -6,6 +7,8 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,7 +47,8 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
 
     @Autowired
     private UserService userService;
-
+    @Autowired
+    private DeptService deptService;
     public CheckGoworkRecordController(){
         super.setModuleDesc( "办件绩效核查信息");
     }
@@ -60,6 +64,7 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
 
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
 
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
@@ -75,6 +80,11 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
+
     }
 
     /**

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

 package com.mortals.xhx.module.check.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -6,6 +7,8 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,7 +47,8 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
 
     @Autowired
     private UserService userService;
-
+    @Autowired
+    private DeptService deptService;
     public CheckOtherRecordController(){
         super.setModuleDesc( "其它绩效核查信息");
     }
@@ -60,6 +64,7 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
 
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
 
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
@@ -75,6 +80,11 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 
     /**

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

 package com.mortals.xhx.module.check.web;
 
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -7,6 +8,8 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,7 +55,8 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
 
     @Autowired
     private UserService userService;
-
+    @Autowired
+    private DeptService deptService;
     public CheckReviewRecordController() {
         super.setModuleDesc("评价差评绩效核查信息");
     }
@@ -73,6 +77,7 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
 
         this.addDict(model, "reviewSource", ReviewSourceEnum.getEnumMap());
 
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
 
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
@@ -88,6 +93,11 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 
     /**

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

@@ -26,4 +26,10 @@ public class PerformAttendAppealVo extends BaseEntityLong {
 
     private String performTypeStr;
 
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformAttendRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformComplainRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformEffectRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformGoworkRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformOtherRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformReviewRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
 
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
@@ -95,6 +96,10 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 
     /**

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

 package com.mortals.xhx.module.perform.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -6,6 +7,8 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,6 +46,8 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
     private ParamService paramService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private DeptService deptService;
 
     public PerformAttendRecordController(){
         super.setModuleDesc( "考勤绩效记录信息");
@@ -55,6 +60,8 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
+
 
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
@@ -71,5 +78,10 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
 
+import cn.hutool.core.date.DateUtil;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformComplainRecordService;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -30,6 +37,9 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private DeptService deptService;
+
     public PerformComplainRecordController() {
         super.setModuleDesc("评价绩效投诉记录信息");
     }
@@ -41,6 +51,8 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
         this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
+
 
         this.addDict(model, "complainSource", ReviewSourceEnum.getEnumMap());
 
@@ -51,5 +63,18 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(PerformComplainRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
 
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -6,6 +7,8 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,6 +46,8 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
     private ParamService paramService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private DeptService deptService;
 
     public PerformEffectRecordController(){
         super.setModuleDesc( "效能绩效记录信息");
@@ -56,6 +61,7 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
 
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
@@ -71,5 +77,10 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -6,6 +7,8 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,7 +46,8 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
     private ParamService paramService;
     @Autowired
     private UserService userService;
-
+    @Autowired
+    private DeptService deptService;
     public PerformGoworkRecordController(){
         super.setModuleDesc( "办件绩效记录信息");
     }
@@ -55,6 +59,8 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
+
 
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
@@ -71,5 +77,10 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -6,6 +7,8 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,7 +46,8 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
     private ParamService paramService;
     @Autowired
     private UserService userService;
-
+    @Autowired
+    private DeptService deptService;
     public PerformOtherRecordController(){
         super.setModuleDesc( "其它绩效记录信息");
     }
@@ -56,6 +60,8 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
         this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
+
 
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
@@ -72,5 +78,10 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -6,6 +7,8 @@ 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 com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,7 +46,8 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
     private ParamService paramService;
     @Autowired
     private UserService userService;
-
+    @Autowired
+    private DeptService deptService;
     public PerformReviewRecordController(){
         super.setModuleDesc( "评价差评绩效记录信息");
     }
@@ -57,6 +61,8 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
+
 
         this.addDict(model, "reviewSource", ReviewSourceEnum.getEnumMap());
 
@@ -74,5 +80,11 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 }
\ No newline at end of file

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

@@ -57,6 +57,10 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
         List<DeptEntity> list = deptService.find(new DeptQuery());
         List<DeptTreeSelect> treeSelects = deptService.buildDeptTreeSelect(list);
         this.addDict(model,"deptPerson",treeSelects);
+
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
+
+
         super.init(model, context);
     }