绩效申诉增加核查字段

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

@@ -131,6 +131,7 @@ public class ApiLoginController extends BaseJsonBodyController {
 //            }
 
             data.put("id", userEntity.getId());
+            data.put("staffId", userEntity.getCustomerId());
             data.put("userType", userEntity.getUserType());
             userEntity.setLoginTime(System.currentTimeMillis());
             userEntity.setToken(IdUtil.fastSimpleUUID());

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

@@ -139,6 +139,7 @@ public class DingTalkLoginController extends BaseCRUDJsonBodyMappingController<U
                     }
                 }
             }
+            data.put("staffId", userEntity.getCustomerId());
             data.put("userType", userEntity.getUserType());
             userEntity.setLoginTime(System.currentTimeMillis());
             userEntity.setToken(IdUtil.fastSimpleUUID());
@@ -264,6 +265,7 @@ public class DingTalkLoginController extends BaseCRUDJsonBodyMappingController<U
                 }
             }
         }
+        data.put("staffId", userEntity.getCustomerId());
         data.put("userType", userEntity.getUserType());
         ret.put(KEY_RESULT_DATA, data);
         ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);

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

@@ -12,7 +12,8 @@ public enum IrregularTypeEnum {
     脱岗(1, "脱岗"),
     离岗(2, "离岗"),
     玩手机(3, "玩手机"),
-    睡觉(4, "睡觉");
+    睡觉(4, "睡觉"),
+    其他(5, "其他");
     private Integer value;
     private String desc;
 

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

@@ -65,9 +65,9 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("CheckEffectRecord", "irregularType"));
+        this.addDict(model, "irregularType", IrregularTypeEnum.getEnumMap());
         this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
-        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap(SubMethodEnum.大厅巡查.getValue(),SubMethodEnum.申诉冲销.getValue()));
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformAttendAppealDao.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.perform.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
 import com.mortals.xhx.module.perform.model.vo.AppealInfo;
 import com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery;
@@ -27,4 +28,6 @@ public interface  PerformAttendAppealDao extends ICRUDDao<PerformAttendAppealEnt
      * @return
      */
     List<PerformAttendAppealEntity> getAppealSummaryList(AppealSummaryQuery query);
+
+    Result<PerformAttendAppealEntity> getListExt(PerformAttendAppealEntity params, PageInfo pageInfo);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformAttendAppealDaoImpl.java

@@ -3,12 +3,15 @@ package com.mortals.xhx.module.perform.dao.ibatis;
 
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.ParamDto;
+import com.mortals.framework.model.Result;
 import com.mortals.xhx.module.perform.model.vo.AppealInfo;
 import com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.perform.dao.PerformAttendAppealDao;
 import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
+
+import java.util.ArrayList;
 import java.util.Date;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import java.util.List;
@@ -37,4 +40,39 @@ public class PerformAttendAppealDaoImpl extends BaseCRUDDaoMybatis<PerformAttend
     public List<PerformAttendAppealEntity> getAppealSummaryList(AppealSummaryQuery query) {
         return getSqlSession().selectList(getSqlId("getAppealSummaryList"),query);
     }
+
+    @Override
+    public Result<PerformAttendAppealEntity> getListExt(PerformAttendAppealEntity params, PageInfo pageInfo) {
+        ParamDto paramDto = this.getQueryParam(params);
+        Result result = new Result();
+        List list = null;
+        if (pageInfo.isCountPage()) {
+            int count = this.getCount(paramDto,"getListCountExt");
+            if (count == 0) {
+                list = new ArrayList();
+            } else if (pageInfo.getPrePageResult() == -1) {
+                list = this.getSqlSession().selectList(this.getSqlId("getListExt"), paramDto);
+            } else {
+                RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
+                list = this.getSqlSession().selectList(this.getSqlId("getListExt"), this.cpyQueryParamDto(paramDto), rowBounds);
+            }
+
+            pageInfo.setTotalResult(count);
+            result.setPageInfo(pageInfo);
+            result.setList((List)list);
+        } else {
+            if (pageInfo.getPrePageResult() == -1) {
+                list = this.getSqlSession().selectList(this.getSqlId("getListExt"), paramDto);
+            } else {
+                RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
+                list = this.getSqlSession().selectList(this.getSqlId("getListExt"), this.cpyQueryParamDto(paramDto), rowBounds);
+            }
+
+            pageInfo.setTotalResult(-1);
+            result.setPageInfo(pageInfo);
+            result.setList(list);
+        }
+
+        return result;
+    }
 }

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

@@ -35,4 +35,9 @@ public class PerformAttendAppealVo extends BaseEntityLong {
 
     private String windowNum;
 
+    /**
+     * 处理状态(1.未处理,2.已处理)
+     */
+    private Integer checkStatus;
+
 }
\ No newline at end of file

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

@@ -6,6 +6,7 @@ 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.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.ThreadPool;
@@ -317,4 +318,12 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
         super.removeAfter(ids, context, result);
     }
 
+    @Override
+    public Result<PerformAttendAppealEntity> find(PerformAttendAppealEntity entity, PageInfo pageInfo, Context context) throws AppException {
+        PerformAttendAppealEntity newParams = this.findBefore(entity, pageInfo, context);
+        Result<PerformAttendAppealEntity> result = this.dao.getListExt(newParams, pageInfo);
+        this.findAfter(entity, pageInfo, context, result.getList());
+        return result;
+    }
+
 }
\ No newline at end of file

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

@@ -73,10 +73,10 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("PerformEffectRecord", "irregularType"));
+        this.addDict(model, "irregularType", IrregularTypeEnum.getEnumMap());
         this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
         this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
-        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap(SubMethodEnum.大厅巡查.getValue(),SubMethodEnum.申诉冲销.getValue()));
         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())));

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

@@ -43,10 +43,11 @@ public class PerformErrorRecordController extends BaseCRUDJsonBodyMappingControl
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-                this.addDict(model, "irregularType", IrregularTypeEnum.getEnumMap());
-                this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
-                this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
-                this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "irregularType", IrregularTypeEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "performType", PerformTypeEnum.getEnumMap(PerformTypeEnum.全部.getValue()));
         super.init(model, context);
     }
 

db/add.sql

@@ -1292,28 +1292,30 @@ ADD COLUMN `staffIds` varchar(255) COMMENT '管辖人员' AFTER `inspect`;
 -- 绩效异常信息表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_perform_error_message`;
-CREATE TABLE mortals_xhx_perform_error_message(
-    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
-    `checkRecordId` bigint(20)      COMMENT '核查记录Id',
-    `deptId` bigint(20)    DEFAULT '0'  COMMENT '部门id号',
-    `deptName` varchar(64)      COMMENT '部门名称',
-    `salaId` bigint(20)      COMMENT '所属大厅',
-    `salaName` varchar(128)      COMMENT '所属大厅名称',
-    `staffId` bigint(20)      COMMENT '绩效责任人id',
-    `staffName` varchar(64)      COMMENT '绩效负责人名称',
-    `workNum` varchar(64)      COMMENT '工号',
-    `errorTime` datetime      COMMENT '异常时间',
-    `ruleId` bigint(20)      COMMENT '绩效规则id',
-    `ruleName` varchar(128)      COMMENT '规则名称',
-    `subAddType` tinyint(1)    DEFAULT '1'  COMMENT '增减类型(1.增加,2.扣除)',
-    `score` decimal(10,2)    DEFAULT '0.00'  COMMENT '扣分或增加分值',
-    `readStatus` tinyint(1)    DEFAULT '0'  COMMENT '阅读状态0未读1已读',
-    `checkStatus` tinyint(1)    DEFAULT '0'  COMMENT '核查处理状态1.未处理,2.已处理',
-    `appealStatus` tinyint(1)    DEFAULT '0'  COMMENT '申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)',
-    `remark` varchar(255)      COMMENT '备注',
-    `createTime` datetime      COMMENT '创建时间',
-    `createUserId` bigint(20)      COMMENT '创建用户',
-    `updateUserId` bigint(20)      COMMENT '更新用户',
-    `updateTime` datetime      COMMENT '修改时间',
-PRIMARY KEY  (`id`)
+CREATE TABLE `mortals_xhx_perform_error_message` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
+  `checkRecordId` bigint(20) DEFAULT NULL COMMENT '核查记录Id',
+  `deptId` bigint(20) DEFAULT '0' COMMENT '部门id号',
+  `deptName` varchar(64) DEFAULT NULL COMMENT '部门名称',
+  `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅',
+  `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称',
+  `staffId` bigint(20) DEFAULT NULL COMMENT '绩效责任人id',
+  `staffName` varchar(64) DEFAULT NULL COMMENT '绩效负责人名称',
+  `workNum` varchar(64) DEFAULT NULL COMMENT '工号',
+  `errorTime` datetime DEFAULT NULL COMMENT '异常时间',
+  `ruleId` bigint(20) DEFAULT NULL COMMENT '绩效规则id',
+  `ruleName` varchar(128) DEFAULT NULL COMMENT '规则名称',
+  `subAddType` tinyint(1) DEFAULT '1' COMMENT '增减类型(1.增加,2.扣除)',
+  `score` decimal(10,2) DEFAULT '0.00' COMMENT '扣分或增加分值',
+  `readStatus` tinyint(1) DEFAULT '0' COMMENT '阅读状态0未读1已读',
+  `checkStatus` tinyint(1) DEFAULT '0' COMMENT '核查处理状态1.未处理,2.已处理',
+  `appealStatus` tinyint(1) DEFAULT '0' COMMENT '申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)',
+  `performType` varchar(64) DEFAULT NULL COMMENT '绩效类型【attend:考勤绩效,review:评价差评绩效,complain:评价投诉绩效,gowork:办件绩效,effect:效能绩效,other:其它绩效】',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  `createTime` datetime DEFAULT NULL COMMENT '创建时间',
+  `createUserId` bigint(20) DEFAULT NULL COMMENT '创建用户',
+  `updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
+  `updateTime` datetime DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效异常信息';
+