绩效申诉增加申述人字段

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

@@ -556,6 +556,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
             query.setAppealStatusList(appeal);
             int appealCount = performErrorMessageService.count(query,null);
             model.put("appealCount", appealCount);
+            ret.put("data", model);
             ret.put("code", 1);
             ret.put("msg", model.remove("message_info"));
             ret.put("dict", model.remove("dict"));

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

@@ -257,6 +257,14 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
      * 窗口编号
      */
     private String windowNum;
+    /**
+     * 申诉人id
+     */
+    private Long appealPersonId;
+    /**
+     * 申诉人姓名
+     */
+    private String appealPerson;
     /**
      * 绩效记录申诉附件信息信息
      */
@@ -393,5 +401,9 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
         this.salaId = null;
 
         this.salaName = "";
+
+        this.appealPersonId = null;
+
+        this.appealPerson = "";
     }
 }
\ No newline at end of file

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

@@ -504,6 +504,28 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
 
     /** 所属大厅名称排除列表 */
     private List <String> salaNameNotList;
+
+    /** 开始 申诉人id */
+    private Long appealPersonIdStart;
+
+    /** 结束 申诉人id */
+    private Long appealPersonIdEnd;
+
+    /** 增加 申诉人id */
+    private Long appealPersonIdIncrement;
+
+    /** 申诉人id列表 */
+    private List <Long> appealPersonIdList;
+
+    /** 申诉人id排除列表 */
+    private List <Long> appealPersonIdNotList;
+
+    /** 申诉人姓名 */
+    private List<String> appealPersonList;
+
+    /** 申诉人姓名排除列表 */
+    private List <String> appealPersonNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformAttendAppealQuery> orConditionList;
 
@@ -4850,6 +4872,79 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
         return this;
     }
 
+    /**
+     * 设置  申诉人id
+     * @param appealPersonId
+     */
+    public PerformAttendAppealQuery appealPersonId(Long appealPersonId){
+        setAppealPersonId(appealPersonId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 申诉人id
+     * @param appealPersonIdStart
+     */
+    public PerformAttendAppealQuery appealPersonIdStart(Long appealPersonIdStart){
+        this.appealPersonIdStart = appealPersonIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 申诉人id
+     * @param appealPersonIdEnd
+     */
+    public PerformAttendAppealQuery appealPersonIdEnd(Long appealPersonIdEnd){
+        this.appealPersonIdEnd = appealPersonIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 申诉人id
+     * @param appealPersonIdIncrement
+     */
+    public PerformAttendAppealQuery appealPersonIdIncrement(Long appealPersonIdIncrement){
+        this.appealPersonIdIncrement = appealPersonIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 申诉人id
+     * @param appealPersonIdList
+     */
+    public PerformAttendAppealQuery appealPersonIdList(List<Long> appealPersonIdList){
+        this.appealPersonIdList = appealPersonIdList;
+        return this;
+    }
+
+    /**
+     * 设置 申诉人id
+     * @param appealPersonIdNotList
+     */
+    public PerformAttendAppealQuery appealPersonIdNotList(List<Long> appealPersonIdNotList){
+        this.appealPersonIdNotList = appealPersonIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 申诉人姓名
+     * @param appealPerson
+     */
+    public PerformAttendAppealQuery appealPerson(String appealPerson){
+        setAppealPerson(appealPerson);
+        return this;
+    }
+
+    /**
+     * 设置 申诉人姓名
+     * @param appealPersonList
+     */
+    public PerformAttendAppealQuery appealPersonList(List<String> appealPersonList){
+        this.appealPersonList = appealPersonList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

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

@@ -293,7 +293,13 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
         if(count>0){
             throw  new AppException("已存在相同的通过申诉，不要重复申诉！");
         }
-
+        if(context!=null && context.getUser()!=null){
+            StaffEntity staffEntity = staffService.getCache(String.valueOf(context.getUser().getCustomerId()));
+            if(staffEntity!=null){
+                entity.setAppealPersonId(staffEntity.getId());
+                entity.setAppealPerson(staffEntity.getName());
+            }
+        }
     }
 
     @Override

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

@@ -97,7 +97,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "irregularType", IrregularTypeEnum.getEnumMap());
         this.addDict(model, "irregularOtherType", IrregularOtherTypeEnum.getEnumMap());
         this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
-        this.addDict(model, "createUserId", windowOwnerService.find(new WindowOwnerQuery()).stream().collect(toMap(x -> x.getStaffId().toString(), y -> y.getStaffName(), (o, n) -> n)));
+        this.addDict(model, "appealPersonId", windowOwnerService.find(new WindowOwnerQuery()).stream().collect(toMap(x -> x.getStaffId().toString(), y -> y.getStaffName(), (o, n) -> n)));
 
         super.init(model, context);
     }

attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformAttendAppealMapperExt.xml

@@ -80,6 +80,8 @@
         <result property="updateTime" column="updateTime" />
         <result property="salaId" column="salaId" />
         <result property="salaName" column="salaName" />
+        <result property="appealPersonId" column="appealPersonId" />
+        <result property="appealPerson" column="appealPerson" />
         <result property="checkStatus" column="checkStatus" />
     </resultMap>
     <!-- 获取列表 -->
@@ -1488,5 +1490,53 @@
         <if test="conditionParamRef.containsKey('checkStatusEnd') and conditionParamRef.checkStatusEnd != null">
             ${_conditionType_} a.checkStatus <![CDATA[ <= ]]> #{${_conditionParam_}.checkStatusEnd}
         </if>
+        <if test="conditionParamRef.containsKey('appealPersonId')">
+            <if test="conditionParamRef.appealPersonId != null ">
+                ${_conditionType_} a.appealPersonId = #{${_conditionParam_}.appealPersonId}
+            </if>
+            <if test="conditionParamRef.appealPersonId == null">
+                ${_conditionType_} a.appealPersonId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('appealPersonIdList') and conditionParamRef.appealPersonIdList.size() > 0">
+            ${_conditionType_} a.appealPersonId in
+            <foreach collection="conditionParamRef.appealPersonIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('appealPersonIdNotList') and conditionParamRef.appealPersonIdNotList.size() > 0">
+            ${_conditionType_} a.appealPersonId not in
+            <foreach collection="conditionParamRef.appealPersonIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('appealPersonIdStart') and conditionParamRef.appealPersonIdStart != null">
+            ${_conditionType_} a.appealPersonId <![CDATA[ >= ]]> #{${_conditionParam_}.appealPersonIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('appealPersonIdEnd') and conditionParamRef.appealPersonIdEnd != null">
+            ${_conditionType_} a.appealPersonId <![CDATA[ <= ]]> #{${_conditionParam_}.appealPersonIdEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('appealPerson')">
+            <if test="conditionParamRef.appealPerson != null and conditionParamRef.appealPerson != ''">
+                ${_conditionType_} a.appealPerson like #{${_conditionParam_}.appealPerson}
+            </if>
+            <if test="conditionParamRef.appealPerson == null">
+                ${_conditionType_} a.appealPerson is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('appealPersonList') and conditionParamRef.appealPersonList.size() > 0">
+            ${_conditionType_} a.appealPerson in
+            <foreach collection="conditionParamRef.appealPersonList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('appealPersonNotList') and conditionParamRef.appealPersonNotList.size() > 0">
+            ${_conditionType_} a.appealPerson not in
+            <foreach collection="conditionParamRef.appealPersonNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
 </mapper>
\ No newline at end of file

db/add.sql

@@ -1319,3 +1319,7 @@ CREATE TABLE `mortals_xhx_perform_error_message` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效异常信息';
 
+ALTER TABLE `mortals_xhx_perform_attend_appeal` ADD COLUMN `appealPersonId` bigint(20) COMMENT '申诉人id' AFTER `performType`,
+ADD COLUMN `appealPerson` varchar(64) COMMENT '申诉人姓名' AFTER `appealPersonId`,
+ADD KEY `appealPerson` (`appealPerson`) USING BTREE;
+