绩效申诉增加处理时间，处理人字段

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

@@ -265,6 +265,15 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
      * 申诉人姓名
      */
     private String appealPerson;
+    /**
+     * 处理时间
+     */
+    private Date processTime;
+    /**
+     * 处理人员
+     */
+    @Excel(name = "处理人员")
+    private String processPerson;
     /**
      * 绩效记录申诉附件信息信息
      */
@@ -405,5 +414,9 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
         this.appealPersonId = null;
 
         this.appealPerson = "";
+
+        this.processTime = null;
+
+        this.processPerson = "";
     }
 }
\ No newline at end of file

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

@@ -526,6 +526,18 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
     /** 申诉人姓名排除列表 */
     private List <String> appealPersonNotList;
 
+    /** 开始 处理时间 */
+    private String processTimeStart;
+
+    /** 结束 处理时间 */
+    private String processTimeEnd;
+
+    /** 处理人员 */
+    private List<String> processPersonList;
+
+    /** 处理人员排除列表 */
+    private List <String> processPersonNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformAttendAppealQuery> orConditionList;
 
@@ -3336,6 +3348,70 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
         this.salaNameNotList = salaNameNotList;
     }
 
+    /**
+     * 获取 开始 处理时间
+     * @return processTimeStart
+     */
+    public String getProcessTimeStart(){
+        return this.processTimeStart;
+    }
+
+    /**
+     * 设置 开始 处理时间
+     * @param processTimeStart
+     */
+    public void setProcessTimeStart(String processTimeStart){
+        this.processTimeStart = processTimeStart;
+    }
+
+    /**
+     * 获取 结束 处理时间
+     * @return processTimeEnd
+     */
+    public String getProcessTimeEnd(){
+        return this.processTimeEnd;
+    }
+
+    /**
+     * 设置 结束 处理时间
+     * @param processTimeEnd
+     */
+    public void setProcessTimeEnd(String processTimeEnd){
+        this.processTimeEnd = processTimeEnd;
+    }
+
+    /**
+     * 获取 处理人员
+     * @return processPersonList
+     */
+    public List<String> getProcessPersonList(){
+        return this.processPersonList;
+    }
+
+    /**
+     * 设置 处理人员
+     * @param processPersonList
+     */
+    public void setProcessPersonList(List<String> processPersonList){
+        this.processPersonList = processPersonList;
+    }
+
+    /**
+     * 获取 处理人员
+     * @return processPersonNotList
+     */
+    public List<String> getProcessPersonNotList(){
+        return this.processPersonNotList;
+    }
+
+    /**
+     * 设置 处理人员
+     * @param processPersonNotList
+     */
+    public void setProcessPersonNotList(List<String> processPersonNotList){
+        this.processPersonNotList = processPersonNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -4945,6 +5021,23 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
         return this;
     }
 
+    /**
+     * 设置 处理人员
+     * @param processPerson
+     */
+    public PerformAttendAppealQuery processPerson(String processPerson){
+        setProcessPerson(processPerson);
+        return this;
+    }
+
+    /**
+     * 设置 处理人员
+     * @param processPersonList
+     */
+    public PerformAttendAppealQuery processPersonList(List<String> processPersonList){
+        this.processPersonList = processPersonList;
+        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

@@ -110,6 +110,8 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
         }
 
         appealEntity.setProcessStatus(ProcessStatusEnum.已处理.getValue());
+        appealEntity.setProcessTime(new Date());
+        appealEntity.setProcessPerson(context.getUser().getRealName());
         appealEntity.setAppealDesc(appeal.getAppealDesc());
         appealEntity.setAppealResult(appeal.getAppealResult());
         appealEntity.setAppealTime(new Date());

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

@@ -67,6 +67,8 @@
         <result property="salaName" column="salaName" />
         <result property="appealPersonId" column="appealPersonId" />
         <result property="appealPerson" column="appealPerson" />
+        <result property="processTime" column="processTime" />
+        <result property="processPerson" column="processPerson" />
         <collection property="performAttendAppealFilesList" column="id" ofType="PerformAttendAppealFilesEntity" javaType="ArrayList" select="getPerformAttendAppealFilesByAppealId"></collection>
     </resultMap>
     <resultMap type="PerformAttendAppealFilesEntity" id="PerformAttendAppealFilesEntity-Map">
@@ -269,6 +271,12 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appealPerson') or colPickMode == 1 and data.containsKey('appealPerson')))">
                 a.appealPerson,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('processTime') or colPickMode == 1 and data.containsKey('processTime')))">
+                a.processTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('processPerson') or colPickMode == 1 and data.containsKey('processPerson')))">
+                a.processPerson,
+            </if>
         </trim>
     </sql>
     <!-- 子表所有列 -->
@@ -280,18 +288,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PerformAttendAppealEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_perform_attend_appeal
-        (checkRecordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,violationType,ruleId,ruleName,subMethod,deductPerson,deductTime,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,processStatus,appealDesc,appealTime,appealResult,remark,reviewResult,reviewTime,reviewSource,reviewDevice,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,goworkCode,goworkDepts,matterlName,goworkTime,irregularType,happenTime,duration,alarmTime,snapPath,irregularOtherType,performType,windowNum,createUserId,createTime,updateUserId,updateTime,salaId,salaName,appealPersonId,appealPerson)
+        (checkRecordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,violationType,ruleId,ruleName,subMethod,deductPerson,deductTime,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,processStatus,appealDesc,appealTime,appealResult,remark,reviewResult,reviewTime,reviewSource,reviewDevice,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,goworkCode,goworkDepts,matterlName,goworkTime,irregularType,happenTime,duration,alarmTime,snapPath,irregularOtherType,performType,windowNum,createUserId,createTime,updateUserId,updateTime,salaId,salaName,appealPersonId,appealPerson,processTime,processPerson)
         VALUES
-        (#{checkRecordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{violationType},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{processStatus},#{appealDesc},#{appealTime},#{appealResult},#{remark},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{irregularOtherType},#{performType},#{windowNum},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{salaId},#{salaName},#{appealPersonId},#{appealPerson})
+        (#{checkRecordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{violationType},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{processStatus},#{appealDesc},#{appealTime},#{appealResult},#{remark},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{irregularOtherType},#{performType},#{windowNum},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{salaId},#{salaName},#{appealPersonId},#{appealPerson},#{processTime},#{processPerson})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_perform_attend_appeal
-        (checkRecordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,violationType,ruleId,ruleName,subMethod,deductPerson,deductTime,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,processStatus,appealDesc,appealTime,appealResult,remark,reviewResult,reviewTime,reviewSource,reviewDevice,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,goworkCode,goworkDepts,matterlName,goworkTime,irregularType,happenTime,duration,alarmTime,snapPath,irregularOtherType,performType,windowNum,createUserId,createTime,updateUserId,updateTime,salaId,salaName,appealPersonId,appealPerson)
+        (checkRecordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,violationType,ruleId,ruleName,subMethod,deductPerson,deductTime,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,processStatus,appealDesc,appealTime,appealResult,remark,reviewResult,reviewTime,reviewSource,reviewDevice,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,goworkCode,goworkDepts,matterlName,goworkTime,irregularType,happenTime,duration,alarmTime,snapPath,irregularOtherType,performType,windowNum,createUserId,createTime,updateUserId,updateTime,salaId,salaName,appealPersonId,appealPerson,processTime,processPerson)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.checkRecordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.violationType},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.processStatus},#{item.appealDesc},#{item.appealTime},#{item.appealResult},#{item.remark},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.irregularOtherType},#{item.performType},#{item.windowNum},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.salaId},#{item.salaName},#{item.appealPersonId},#{item.appealPerson})
+            (#{item.checkRecordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.violationType},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.processStatus},#{item.appealDesc},#{item.appealTime},#{item.appealResult},#{item.remark},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.irregularOtherType},#{item.performType},#{item.windowNum},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.salaId},#{item.salaName},#{item.appealPersonId},#{item.appealPerson},#{item.processTime},#{item.processPerson})
         </foreach>
     </insert>
 
@@ -537,6 +545,12 @@
             <if test="(colPickMode==0 and data.containsKey('appealPerson')) or (colPickMode==1 and !data.containsKey('appealPerson'))">
                 a.appealPerson=#{data.appealPerson},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('processTime')) or (colPickMode==1 and !data.containsKey('processTime'))">
+                a.processTime=#{data.processTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('processPerson')) or (colPickMode==1 and !data.containsKey('processPerson'))">
+                a.processPerson=#{data.processPerson},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -1066,6 +1080,20 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="processTime=(case" suffix="ELSE processTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('processTime')) or (colPickMode==1 and !item.containsKey('processTime'))">
+                        when a.id=#{item.id} then #{item.processTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="processPerson=(case" suffix="ELSE processPerson end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('processPerson')) or (colPickMode==1 and !item.containsKey('processPerson'))">
+                        when a.id=#{item.id} then #{item.processPerson}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -2528,6 +2556,42 @@
                 #{item}
             </foreach>
         </if>
+
+        <if test="conditionParamRef.containsKey('processTime')">
+            <if test="conditionParamRef.processTime != null ">
+                ${_conditionType_} a.processTime = #{${_conditionParam_}.processTime}
+            </if>
+            <if test="conditionParamRef.processTime == null">
+                ${_conditionType_} a.processTime is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('processTimeStart') and conditionParamRef.processTimeStart != null and conditionParamRef.processTimeStart!=''">
+            ${_conditionType_} a.processTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.processTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('processTimeEnd') and conditionParamRef.processTimeEnd != null and conditionParamRef.processTimeEnd!=''">
+            ${_conditionType_} a.processTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.processTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+
+        <if test="conditionParamRef.containsKey('processPerson')">
+            <if test="conditionParamRef.processPerson != null and conditionParamRef.processPerson != ''">
+                ${_conditionType_} a.processPerson like #{${_conditionParam_}.processPerson}
+            </if>
+            <if test="conditionParamRef.processPerson == null">
+                ${_conditionType_} a.processPerson is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('processPersonList') and conditionParamRef.processPersonList.size() > 0">
+            ${_conditionType_} a.processPerson in
+            <foreach collection="conditionParamRef.processPersonList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('processPersonNotList') and conditionParamRef.processPersonNotList.size() > 0">
+            ${_conditionType_} a.processPerson not in
+            <foreach collection="conditionParamRef.processPersonNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -3117,6 +3181,16 @@
                     <if test='orderCol.appealPerson != null and "DESC".equalsIgnoreCase(orderCol.appealPerson)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('processTime')">
+                    a.processTime
+                    <if test='orderCol.processTime != null and "DESC".equalsIgnoreCase(orderCol.processTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('processPerson')">
+                    a.processPerson
+                    <if test='orderCol.processPerson != null and "DESC".equalsIgnoreCase(orderCol.processPerson)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
 

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

@@ -82,6 +82,8 @@
         <result property="salaName" column="salaName" />
         <result property="appealPersonId" column="appealPersonId" />
         <result property="appealPerson" column="appealPerson" />
+        <result property="processTime" column="processTime" />
+        <result property="processPerson" column="processPerson" />
         <result property="checkStatus" column="checkStatus" />
     </resultMap>
     <!-- 获取列表 -->
@@ -1538,5 +1540,40 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('processTime')">
+            <if test="conditionParamRef.processTime != null ">
+                ${_conditionType_} a.processTime = #{${_conditionParam_}.processTime}
+            </if>
+            <if test="conditionParamRef.processTime == null">
+                ${_conditionType_} a.processTime is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('processTimeStart') and conditionParamRef.processTimeStart != null and conditionParamRef.processTimeStart!=''">
+            ${_conditionType_} a.processTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.processTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('processTimeEnd') and conditionParamRef.processTimeEnd != null and conditionParamRef.processTimeEnd!=''">
+            ${_conditionType_} a.processTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.processTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+
+        <if test="conditionParamRef.containsKey('processPerson')">
+            <if test="conditionParamRef.processPerson != null and conditionParamRef.processPerson != ''">
+                ${_conditionType_} a.processPerson like #{${_conditionParam_}.processPerson}
+            </if>
+            <if test="conditionParamRef.processPerson == null">
+                ${_conditionType_} a.processPerson is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('processPersonList') and conditionParamRef.processPersonList.size() > 0">
+            ${_conditionType_} a.processPerson in
+            <foreach collection="conditionParamRef.processPersonList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('processPersonNotList') and conditionParamRef.processPersonNotList.size() > 0">
+            ${_conditionType_} a.processPerson not in
+            <foreach collection="conditionParamRef.processPersonNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
 </mapper>
\ No newline at end of file

db/add.sql

@@ -1324,5 +1324,7 @@ PRIMARY KEY  (`id`)
 
 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 COLUMN `processTime` datetime      COMMENT '处理时间' AFTER `processStatus`,
+ADD COLUMN `processPerson` varchar(128)      COMMENT '处理人员' AFTER `processTime`,
 ADD KEY `appealPerson` (`appealPerson`) USING BTREE;