From 6beb8da5696df6abf76b49b492b55f2e7eafa700 Mon Sep 17 00:00:00 2001
From: liaoxuwei <5789413@qq.com>
Date: Wed, 17 Jul 2024 15:18:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E6=B1=87=E6=80=BB=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E6=9C=80=E8=BF=91=E4=B8=80=E6=AC=A1=E6=B1=87=E6=80=BB?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B1=95=E7=A4=BA=EF=BC=8C=E7=BB=A9=E6=95=88?=
=?UTF-8?q?=E5=88=86=E6=95=B0=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA=E8=80=83?=
=?UTF-8?q?=E5=8B=A4=E5=BC=82=E5=B8=B8=E6=97=B6=E9=97=B4=EF=BC=8C=E7=BB=A9?=
=?UTF-8?q?=E6=95=88=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E4=B8=BA?=
=?UTF-8?q?=E6=9C=80=E8=BF=91=E4=B8=80=E6=AC=A1=E6=B1=87=E6=80=BB=E6=97=B6?=
=?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/mortals/xhx/common/key/RedisKey.java | 3 ++-
.../StaffCheckSummaryService.java | 3 +++
.../AttendanceLeaveRecordServiceImpl.java | 10 ++++++++
.../AttendanceRecordErrorServiceImpl.java | 13 +++++-----
.../check/model/vo/CheckAllRecordVo.java | 6 ++++-
.../check/web/CheckAllRecordController.java | 12 +++++++++-
.../impl/PerformAttendRecordServiceImpl.java | 1 +
.../web/StaffPerformSummaryController.java | 7 ++++--
.../module/check/CheckAllRecordMapper.xml | 24 +++++++++----------
9 files changed, 56 insertions(+), 23 deletions(-)
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java
index ef81e201..fcef9496 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java
@@ -31,5 +31,6 @@ public class RedisKey {
/** 缁╂晥鏍告煡姹囨€� **/
public static final String KEY_CHECK_SUMMARY_CACHE = "staff:check:summary";
-
+ /** 缁╂晥鏍告煡姹囨€绘椂闂� **/
+ public static final String STAFF_PERFORM_SUMMARY = "staffPerformSummaryTime";
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java
index d703da6a..67cc8333 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.service.ICacheService;
import com.mortals.framework.springcloud.service.IApplicationStartedService;
+import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
@@ -16,6 +17,7 @@ import org.springframework.util.ObjectUtils;
import java.util.Date;
import static com.mortals.xhx.common.key.RedisKey.KEY_CHECK_SUMMARY_CACHE;
+import static com.mortals.xhx.common.key.RedisKey.STAFF_PERFORM_SUMMARY;
/***
* 缁╂晥姹囨€讳换鍔℃墽琛�
@@ -89,6 +91,7 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
checkWindowWorkmanPerformService.summaryCheck(query);
checkOtherRecordService.summaryCheck(query);
log.info("缁╂晥鍒嗘暟姹囨€诲畬鎴�");
+ cacheService.set(STAFF_PERFORM_SUMMARY, DateUtils.getCurrStrDateTime());
}
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java
index 63739961..7759f520 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java
@@ -20,6 +20,7 @@ import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery;
import com.mortals.xhx.module.attendance.service.AttendanceGroupStaffService;
import com.mortals.xhx.module.attendance.service.AttendanceRecordHikService;
import com.mortals.xhx.module.attendance.service.AttendanceStatService;
+import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
import com.mortals.xhx.module.dingding.personal.service.IDingPersonService;
import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
import com.mortals.xhx.module.perform.model.PerformAttendRecordQuery;
@@ -47,6 +48,7 @@ import java.util.List;
import java.util.stream.Collectors;
import static com.mortals.xhx.common.key.RedisKey.KEY_ATTENDANCE_STAT_CACHE;
+import static com.mortals.xhx.common.key.RedisKey.KEY_CHECK_SUMMARY_CACHE;
/**
* AttendanceLeaveRecordService
@@ -243,6 +245,14 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
performAttendRecordService.save(recordEntity, context);
}
}
+
+ //姹囨€昏€冨嫟缁╂晥鍒嗘暟
+ StaffCheckSummaryQuery checkSummaryQuery = new StaffCheckSummaryQuery();
+ checkSummaryQuery.setStaffId(entity.getLeavePersonId());
+ checkSummaryQuery.setCheckTimeStart(DateUtils.getStrDate(entity.getStartTime()));
+ checkSummaryQuery.setCheckTimeEnd(checkSummaryQuery.getCheckTimeStart());
+ checkSummaryQuery.setCheckType(CheckTypeEnum.鑰冨嫟缁╂晥.getValue());
+ cacheService.lpush(KEY_CHECK_SUMMARY_CACHE, checkSummaryQuery);
}
} catch (Exception e) {
log.error("鍒涘缓鍋囨湡鑰冨嫟寮傚父",e.getMessage());
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
index 54320d00..b1faa12b 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
@@ -115,12 +115,6 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
checkAttendUpdate.setUpdateTime(new Date());
checkAttendUpdate.setCheckStatus(CheckStatusEnum.宸插鐞�.getValue());
checkAttendRecordService.update(checkAttendUpdate,context);
- StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
- query.setStaffId(checkAttendRecord.getStaffId());
- query.setCheckTimeStart(DateUtils.getStrDate(checkAttendRecord.getCheckTime()));
- query.setCheckTimeEnd(query.getCheckTimeStart());
- query.setCheckType(CheckTypeEnum.鑰冨嫟缁╂晥.getValue());
- cacheService.lpush(KEY_CHECK_SUMMARY_CACHE, query);
}
}
//寮傚父澶勭悊鍚庨噸鏂版眹鎬昏€冨嫟 context!=null鏃惰〃绀洪〉闈㈣皟鐢ㄧ殑淇敼锛岃嚜鍔ㄦ墽琛屽鐞嗕换鍔¤皟鐢ㄦ椂context涓簄ull锛屾棤闇€绔嬪嵆姹囨€�
@@ -131,6 +125,13 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
// AttendSummaryThread summaryThread = new AttendSummaryThread(attendanceStatService, query);
// ThreadPool.getInstance().execute(summaryThread);
cacheService.lpush(KEY_ATTENDANCE_STAT_CACHE, query);
+ //绔嬪嵆姹囨€昏€冨嫟缁╂晥鍒嗘暟
+ StaffCheckSummaryQuery checkSummaryQuery = new StaffCheckSummaryQuery();
+ checkSummaryQuery.setStaffId(entity.getStaffId());
+ checkSummaryQuery.setCheckTimeStart(DateUtils.getStrDate(entity.getErrorDateTime()));
+ checkSummaryQuery.setCheckTimeEnd(checkSummaryQuery.getCheckTimeStart());
+ checkSummaryQuery.setCheckType(CheckTypeEnum.鑰冨嫟缁╂晥.getValue());
+ cacheService.lpush(KEY_CHECK_SUMMARY_CACHE, checkSummaryQuery);
}
}
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java
index 9cf40a0d..6548ee08 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java
@@ -1,5 +1,6 @@
package com.mortals.xhx.module.check.model.vo;
+import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import lombok.Data;
@@ -88,5 +89,8 @@ public class CheckAllRecordVo extends BaseEntityLong {
private Integer auditStatus;
private Date updateTime;
-
+ /**
+ * 澶囨敞
+ */
+ private String remark;
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAllRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAllRecordController.java
index 2140e637..9cb9d522 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAllRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAllRecordController.java
@@ -6,6 +6,7 @@ import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
+import com.mortals.framework.service.ICacheService;
import com.mortals.framework.util.DataUtil;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.StringUtils;
@@ -31,6 +32,8 @@ import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
+import static com.mortals.xhx.common.key.RedisKey.STAFF_PERFORM_SUMMARY;
+
/**
* 鍏ㄩ儴绫诲瀷鏍告煡淇℃伅Dao
*/
@@ -40,6 +43,8 @@ public class CheckAllRecordController extends BaseJsonBodyController {
@Autowired
private CheckAllRecordService checkAllRecordService;
+ @Autowired
+ private ICacheService cacheService;
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
@@ -68,7 +73,12 @@ public class CheckAllRecordController extends BaseJsonBodyController {
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
String endTime = format.format(calendar.getTime());
query.setCheckTimeStart(startTime);
- query.setCheckTimeEnd(endTime);
+ String summaryTime = cacheService.get(STAFF_PERFORM_SUMMARY);
+ if(StringUtils.isNotEmpty(summaryTime)){
+ query.setCheckTimeEnd(summaryTime);
+ }else {
+ query.setCheckTimeEnd(endTime);
+ }
}
Result<CheckAllRecordVo> result = checkAllRecordService.getAllCheckRecord(query, pageInfo);
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java
index 5473ab5e..8979389a 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java
@@ -191,6 +191,7 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
BeanUtils.copyProperties(entity, checkAttendRecordEntity, BeanUtil.getNullPropertyNames(entity));
checkAttendRecordEntity.setId(null);
checkAttendRecordEntity.setRecordId(entity.getId());
+ checkAttendRecordEntity.setCheckTime(entity.getErrorTime());
if(performStaffConfService.checkRules(entity.getStaffId(),entity.getDeptId(),entity.getRuleId())){
checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.宸插鐞�.getValue());
if(checkAttendRecordEntity.getSubAddType()==SubAddTypeEnum.澧炲姞.getValue()){
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformSummaryController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformSummaryController.java
index be6ad2c3..ac430b49 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformSummaryController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformSummaryController.java
@@ -44,8 +44,7 @@ import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
import static com.mortals.xhx.common.key.ParamKey.SYS_PARAM_WEIGHT;
-import static com.mortals.xhx.common.key.RedisKey.KEY_ATTENDANCE_STAT_CACHE;
-import static com.mortals.xhx.common.key.RedisKey.KEY_CHECK_SUMMARY_CACHE;
+import static com.mortals.xhx.common.key.RedisKey.*;
/**
* 鍛樺伐缁╂晥缁熻
@@ -104,6 +103,10 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
weightPdu = JSONObject.parseObject(value,WeightPdu.class);
}
this.addDict(model,"weightPdu",weightPdu);
+ String summaryTime = cacheService.get(STAFF_PERFORM_SUMMARY);
+ if(StringUtils.isNotEmpty(summaryTime)){
+ this.addDict(model,"summaryTime",summaryTime);
+ }
return super.doListAfter(query,model,context);
}
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
index 353b5c17..e58a0f41 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
@@ -5,7 +5,7 @@
<select id="getList" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllRecordVo">
SELECT * FROM (
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime,deductTime,1 AS checkType ,'attend' AS performType,updateTime FROM mortals_xhx_check_attend_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime,deductTime,1 AS checkType ,'attend' AS performType,updateTime,DATE_FORMAT(errorTime,'%Y-%m-%d %k:%i:%s') as remark FROM mortals_xhx_check_attend_record WHERE score>0
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -17,7 +17,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND errorTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime,deductTime,4 AS checkType ,'effect' AS performType,updateTime FROM mortals_xhx_check_effect_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime,deductTime,4 AS checkType ,'effect' AS performType,updateTime,remark FROM mortals_xhx_check_effect_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -28,7 +28,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND happenTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,2 AS checkType ,'complain' AS performType,updateTime FROM mortals_xhx_check_complain_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,2 AS checkType ,'complain' AS performType,updateTime,remark FROM mortals_xhx_check_complain_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -39,7 +39,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND complainTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName, subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,3 AS checkType ,'gowork' AS performType,updateTime FROM mortals_xhx_check_gowork_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName, subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,3 AS checkType ,'gowork' AS performType,updateTime,remark FROM mortals_xhx_check_gowork_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -50,7 +50,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND goworkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,2 AS checkType ,'review' AS performType,updateTime FROM mortals_xhx_check_review_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,2 AS checkType ,'review' AS performType,updateTime,remark FROM mortals_xhx_check_review_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -62,7 +62,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND reviewTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,5 AS checkType ,'other' AS performType,updateTime FROM mortals_xhx_check_other_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,5 AS checkType ,'other' AS performType,updateTime,remark FROM mortals_xhx_check_other_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -94,7 +94,7 @@
<select id="getListCount" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="int">
SELECT count(1) FROM (
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime,deductTime,1 AS checkType ,'attend' AS performType,updateTime FROM mortals_xhx_check_attend_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime,deductTime,1 AS checkType ,'attend' AS performType,updateTime,remark FROM mortals_xhx_check_attend_record WHERE score>0
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -106,7 +106,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND errorTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime,deductTime,4 AS checkType ,'effect' AS performType,updateTime FROM mortals_xhx_check_effect_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime,deductTime,4 AS checkType ,'effect' AS performType,updateTime,remark FROM mortals_xhx_check_effect_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -117,7 +117,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND happenTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,6 AS checkType ,'complain' AS performType,updateTime FROM mortals_xhx_check_complain_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,6 AS checkType ,'complain' AS performType,updateTime,remark FROM mortals_xhx_check_complain_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -128,7 +128,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND complainTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName, subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,3 AS checkType ,'gowork' AS performType,updateTime FROM mortals_xhx_check_gowork_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName, subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,3 AS checkType ,'gowork' AS performType,updateTime,remark FROM mortals_xhx_check_gowork_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -139,7 +139,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND goworkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,2 AS checkType ,'review' AS performType,updateTime FROM mortals_xhx_check_review_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,2 AS checkType ,'review' AS performType,updateTime,remark FROM mortals_xhx_check_review_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
@@ -151,7 +151,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND reviewTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,5 AS checkType ,'other' AS performType,updateTime FROM mortals_xhx_check_other_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,checkStatus,checkResult,auditStatus,createTime,score,subMethod,checkTime, deductTime,5 AS checkType ,'other' AS performType,updateTime,remark FROM mortals_xhx_check_other_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="subAddType != null and subAddType!=''"> AND subAddType = #{subAddType} </if>
--
2.24.3