diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
index c734b6ab27af7d2923ab9248ec5eab72bb307b0f..eef23a063352d4b37681e1e6e8627168816b7dc8 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
@@ -86,6 +86,11 @@ public class UserEntity extends UserVo implements IUser {
*/
private String lastLoginAddress;
+ /**
+ * 鍛樺伐id
+ */
+ private Long customerId;
+
public UserEntity(){}
@@ -253,7 +258,7 @@ public class UserEntity extends UserVo implements IUser {
@Override
public Long getCustomerId() {
- return null;
+ return this.customerId;
}
@Override
@@ -358,7 +363,9 @@ public class UserEntity extends UserVo implements IUser {
}
-
+ public void setCustomerId(Long customerId) {
+ this.customerId = customerId;
+ }
@Override
public int hashCode() {
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/FeedbackReq.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/FeedbackReq.java
new file mode 100644
index 0000000000000000000000000000000000000000..f6aa3647b3a0508c2362a772ff484684d4c91551
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/FeedbackReq.java
@@ -0,0 +1,21 @@
+package com.mortals.xhx.busiz.req;
+
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+
+@Data
+public class FeedbackReq extends BaseReq {
+
+ //鍙嶉寮€濮嬫椂闂�
+ private String feedBackStartDate;
+ //鍙嶉缁撴潫鏃堕棿
+ private String feedBackEndDate;
+
+ //鍙嶉鐘舵€侊紙1.鏈弽棣堬紝2.宸插弽棣堬級
+ private Integer feedbackStatus;
+ //璇︾粏
+ private Long Id;
+
+
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformInfo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformInfo.java
index 1e5c3fe68975ba46d75878ea5799aed169f41a76..f86a3708e68522131a20e7e9a1a3b93c51334cea 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformInfo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformInfo.java
@@ -55,5 +55,10 @@ public class PerformInfo {
*/
private BigDecimal score;
+ /**
+ * 绫诲瀷
+ */
+ private String performType;
+
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiLoginController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiLoginController.java
index 5d4325b3df3707909e1e66b13b7a67a9927fc183..f541783b0ab71fb101d64d151a1c8cd2610a855f 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiLoginController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiLoginController.java
@@ -40,7 +40,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
@RestController
@Slf4j
-@RequestMapping("/api/v1/")
+@RequestMapping("/api/v1/login")
public class ApiLoginController extends BaseJsonBodyController {
@Autowired
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java
index 51f1990a8fa4ef735e0eab633c28d0eed1ab8a37..c1d88e716952d74f414769e06062be25838f8947 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java
@@ -33,7 +33,7 @@ import java.util.List;
*/
@RestController
@Slf4j
-@RequestMapping("/api/v1/")
+@RequestMapping("/api/v1/appeal")
public class AppealApiController extends BaseJsonBodyController {
@Autowired
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c5d88ffd3d68d65407615b18d88842f55d37917
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java
@@ -0,0 +1,114 @@
+package com.mortals.xhx.busiz.web;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.busiz.req.AppealReq;
+import com.mortals.xhx.busiz.req.FeedbackReq;
+import com.mortals.xhx.busiz.rsp.AppealStatInfo;
+import com.mortals.xhx.module.check.service.*;
+import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * h5 鐢宠瘔
+ *
+ * @author: zxfei
+ * @date: 2023/7/7 15:08
+ */
+@RestController
+@Slf4j
+@RequestMapping("/api/v1/feedback")
+public class FeedbackApiController extends BaseJsonBodyController {
+
+ @Autowired
+ private CheckAttendRecordService checkAttendRecordService;
+ @Autowired
+ private CheckReviewRecordService checkReviewRecordService;
+ @Autowired
+ private CheckComplainRecordService checkComplainRecordService;
+ @Autowired
+ private CheckEffectRecordService checkEffectRecordService;
+ @Autowired
+ private CheckGoworkRecordService checkGoworkRecordService;
+ @Autowired
+ private CheckOtherRecordService checkOtherRecordService;
+
+ /**
+ * 鍙嶉鍒楄〃
+ */
+ @PostMapping(value = "feedback/list")
+ public Rest<List<PerformAttendAppealEntity>> feedbackList(@RequestBody FeedbackReq feedbackReq) {
+ String busiDesc = "涓汉鍙嶉鍒楄〃";
+ Rest<List<PerformAttendAppealEntity>> rest = Rest.ok(busiDesc + " 銆愭垚鍔熴€�");
+ try {
+ if (ObjectUtils.isEmpty(feedbackReq.getFeedbackStatus())) {
+ //鏈缃椂闂寸殑鎯呭喌锛岄粯璁や负褰撴湀
+ feedbackReq.setFeedBackStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
+ feedbackReq.setFeedBackEndDate(DateUtil.today());
+ }
+
+ recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception e) {
+ log.error(busiDesc, e);
+ rest = Rest.fail(super.convertException(e));
+ }
+ return rest;
+ }
+
+
+ /**
+ * 鍙嶉璇︾粏
+ */
+ @PostMapping(value = "feedback/question")
+ public Rest<PerformAttendAppealEntity> performDetail(@RequestBody AppealReq appealReq) {
+ String busiDesc = "涓汉鐢宠瘔璇︾粏";
+ Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 銆愭垚鍔熴€�");
+ try {
+ if (ObjectUtils.isEmpty(appealReq.getId())) {
+ throw new AppException("璇︾粏鏌ヨid涓嶈兘涓虹┖!");
+ }
+
+ recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception e) {
+ log.error(busiDesc, e);
+ rest = Rest.fail(super.convertException(e));
+ }
+ return rest;
+ }
+
+
+ /**
+ * 鐢宠瘔鏂板
+ */
+ @PostMapping(value = "appeal/save")
+ public Rest<String> appealSave(@RequestBody PerformAttendAppealEntity appealEntity) {
+ String busiDesc = "涓汉鐢宠瘔鏂板";
+ Rest<String> rest = Rest.ok(busiDesc + " 銆愭垚鍔熴€�");
+ try {
+
+ recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception e) {
+ log.error(busiDesc, e);
+ rest = Rest.fail(super.convertException(e));
+ }
+ return rest;
+ }
+
+
+ public static void main(String[] args) {
+
+ }
+
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java
index a3426ecf961f25e828fa42bdeae07a39576ae442..23afe323ea4040d307d7f7eb60cdad678ba31971 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@RestController
@Slf4j
-@RequestMapping("/api/v1/")
+@RequestMapping("/api/v1/perform")
public class PerformApiController extends BaseJsonBodyController {
@Autowired
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckTypeEnum.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckTypeEnum.java
new file mode 100644
index 0000000000000000000000000000000000000000..fc2d86a038eb7b31ceb2b642e0720fda2c85e195
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckTypeEnum.java
@@ -0,0 +1,68 @@
+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/***
+ * 鏍告煡绫诲瀷鏋氫妇(1.鑰冨嫟缁╂晥,2.鏁堣兘缁╂晥,3.璇勪环缁╂晥,4.鍔炰欢缁╂晥,5.璇勪环宸瘎缁╂晥,6.鍏跺畠缁╂晥)
+ */
+public enum CheckTypeEnum {
+ 鑰冨嫟缁╂晥(1, "鑰冨嫟缁╂晥"),
+ 鏁堣兘缁╂晥(2, "鏁堣兘缁╂晥"),
+ 璇勪环缁╂晥(3, "璇勪环缁╂晥"),
+ 鍔炰欢缁╂晥(4, "鍔炰欢缁╂晥"),
+ 宸瘎缁╂晥(5, "宸瘎缁╂晥"),
+ 鍏跺畠缁╂晥(6, "鍏跺畠缁╂晥"),
+ ;
+ private Integer value;
+ private String desc;
+
+ CheckTypeEnum(Integer value, String desc) {
+ this.value = value;
+ this.desc = desc;
+ }
+
+ public Integer getValue() {
+ return this.value;
+ }
+
+ public String getDesc() {
+ return this.desc;
+ }
+
+ public static CheckTypeEnum getByValue(Integer value) {
+ for (CheckTypeEnum checkTypeEnum : CheckTypeEnum.values()) {
+ if (checkTypeEnum.getValue() == value) {
+ return checkTypeEnum;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇Map闆嗗悎
+ *
+ * @param eItem 涓嶅寘鍚」
+ * @return
+ */
+ public static Map<String, String> getEnumMap(Integer... eItem) {
+ Map<String, String> resultMap = new LinkedHashMap<>();
+ for (CheckTypeEnum item : CheckTypeEnum.values()) {
+ try {
+ boolean hasE = false;
+ for (Integer e : eItem) {
+ if (item.getValue() == e) {
+ hasE = true;
+ break;
+ }
+ }
+ if (!hasE) {
+ resultMap.put(item.getValue() + "", item.getDesc());
+ }
+ } catch (Exception ex) {
+
+ }
+ }
+ return resultMap;
+ }
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckAllRecordDao.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckAllRecordDao.java
new file mode 100644
index 0000000000000000000000000000000000000000..176911cf994734c5b5449b6a29c3caec7c4480ef
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckAllRecordDao.java
@@ -0,0 +1,14 @@
+package com.mortals.xhx.module.check.dao;
+
+import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
+
+import java.util.List;
+
+/**
+ * 鍏ㄩ儴绫诲瀷鏍告煡淇℃伅Dao
+ */
+public interface CheckAllRecordDao {
+
+ List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query);
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckAllRecordDaoImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckAllRecordDaoImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..fdb50dd7c585f19bb9ea08d61d8f52f566e579ca
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckAllRecordDaoImpl.java
@@ -0,0 +1,34 @@
+package com.mortals.xhx.module.check.dao.ibatis;
+
+import com.mortals.xhx.module.check.dao.CheckAllRecordDao;
+import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.support.SqlSessionDaoSupport;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 鍏ㄩ儴绫诲瀷鏍告煡淇℃伅Dao
+ */
+@Repository("checkAllRecordDao")
+public class CheckAllRecordDaoImpl extends SqlSessionDaoSupport implements CheckAllRecordDao {
+
+ protected String namespace = this.getClass().getName();
+
+ @Autowired
+ public void setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
+ super.setSqlSessionFactory(sqlSessionFactory);
+ }
+
+ protected String getSqlId(String id) {
+ return this.namespace + "." + id;
+ }
+
+ @Override
+ public List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query) {
+ return this.getSqlSession().selectList(this.getSqlId("getList"), query);
+ }
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAllRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAllRecordQuery.java
new file mode 100644
index 0000000000000000000000000000000000000000..b68ce9f178748fd1174b4a7bb13693574012243f
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAllRecordQuery.java
@@ -0,0 +1,21 @@
+package com.mortals.xhx.module.check.model;
+
+import lombok.Data;
+
+@Data
+public class CheckAllRecordQuery {
+ /**
+ * 鍛樺伐ID
+ */
+ private Long staffId;
+ /**
+ * 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ */
+ private Integer checkStatus;
+
+ private String createTimeStart;
+
+ private String createTimeEnd;
+
+ private Long createUserId;
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
index d7164c28cfda4d023e5e0111e68748684ba942cc..75054ba4a1616abb747eb0f8f86bed3dd48b44d6 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
@@ -9,113 +9,128 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo;
import lombok.Data;
/**
- * 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅瀹炰綋瀵硅薄
- *
- * @author zxfei
- * @date 2023-07-07
- */
+* 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅瀹炰綋瀵硅薄
+*
+* @author zxfei
+* @date 2023-07-08
+*/
@Data
public class CheckAttendRecordEntity extends CheckAttendRecordVo {
private static final long serialVersionUID = 1L;
/**
- * 璁板綍ID
- */
+ * 璁板綍ID
+ */
private Long recordId;
/**
- * 鍛樺伐ID
- */
+ * 鍛樺伐ID
+ */
private Long staffId;
/**
- * 鍛樺伐濮撳悕
- */
+ * 鍛樺伐濮撳悕
+ */
private String staffName;
/**
- * 宸ュ彿
- */
+ * 宸ュ彿
+ */
private String workNum;
/**
- * 鎵€灞為儴闂�
- */
+ * 鎵€灞為儴闂�
+ */
private Long deptId;
/**
- * 鎵€灞為儴闂ㄥ悕绉�
- */
+ * 鎵€灞為儴闂ㄥ悕绉�
+ */
private String deptName;
/**
- * 鎵€灞炶€冨嫟缁処D
- */
+ * 鎵€灞炶€冨嫟缁処D
+ */
private Long attendanceGroupId;
/**
- * 鎵€灞炶€冨嫟缁勫悕绉�
- */
+ * 鎵€灞炶€冨嫟缁勫悕绉�
+ */
private String attendanceGroupName;
/**
- * 鑰冨嫟鏃堕棿
- */
+ * 鑰冨嫟鏃堕棿
+ */
private Date attendanceDate;
/**
- * 缁╂晥瑙勫垯id
- */
+ * 缁╂晥瑙勫垯id
+ */
private Long ruleId;
/**
- * 瑙勫垯鍚嶇О
- */
+ * 瑙勫垯鍚嶇О
+ */
private String ruleName;
/**
- * 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- */
+ * 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ */
private Integer subAddType;
/**
- * 鎵ｅ垎鎴栧鍔犲垎鍊�
- */
+ * 鎵ｅ垎鎴栧鍔犲垎鍊�
+ */
private BigDecimal score;
/**
- * 涓婁笅鐝椂闂�
- */
+ * 涓婁笅鐝椂闂�
+ */
private String goOffTimeStr;
/**
- * 寮傚父鏃堕棿
- */
+ * 寮傚父鏃堕棿
+ */
private Date errorTime;
/**
- * 瀹為檯鎵撳崱鏃堕棿
- */
+ * 瀹為檯鎵撳崱鏃堕棿
+ */
private Date actualAttendTime;
/**
- * 寮傚父澶勭悊缁撴灉
- */
+ * 寮傚父澶勭悊缁撴灉
+ */
private String errorResult;
/**
- * 鏍告煡浜哄憳
- */
+ * 鏍告煡浜哄憳
+ */
@Excel(name = "鏍告煡浜哄憳")
private String checkPerson;
/**
- * 鏍告煡鏃堕棿
- */
+ * 鏍告煡鏃堕棿
+ */
private Date checkTime;
/**
- * 鏍告煡璇存槑
- */
+ * 鏍告煡璇存槑
+ */
@Excel(name = "鏍告煡璇存槑")
private String checkDesc;
/**
- * 鏍告煡缁撴灉
- */
+ * 鏍告煡缁撴灉
+ */
@Excel(name = "鏍告煡缁撴灉")
private String checkResult;
/**
- * 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- */
+ * 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ */
private Integer checkStatus;
/**
- * 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- */
+ * 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ */
private Integer subMethod;
+ /**
+ * 璇存槑
+ */
+ @Excel(name = "璇存槑")
+ private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
- return this.getId().hashCode();
+ return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
@@ -123,7 +138,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
if (obj instanceof CheckAttendRecordEntity) {
CheckAttendRecordEntity tmp = (CheckAttendRecordEntity) obj;
if (this.getId() == tmp.getId()) {
- return true;
+ return true;
}
}
return false;
@@ -131,50 +146,56 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
public void initAttrValue(){
- this.recordId = -1L;
+ this.recordId = -1L;
+
+ this.staffId = -1L;
+
+ this.staffName = "";
+
+ this.workNum = "";
- this.staffId = -1L;
+ this.deptId = -1L;
- this.staffName = "";
+ this.deptName = "";
- this.workNum = "";
+ this.attendanceGroupId = -1L;
- this.deptId = -1L;
+ this.attendanceGroupName = "";
- this.deptName = "";
+ this.attendanceDate = null;
- this.attendanceGroupId = -1L;
+ this.ruleId = -1L;
- this.attendanceGroupName = "";
+ this.ruleName = "";
- this.attendanceDate = null;
+ this.subAddType = 1;
- this.ruleId = -1L;
+ this.score = BigDecimal.valueOf(0.00);
- this.ruleName = "";
+ this.goOffTimeStr = "";
- this.subAddType = 1;
+ this.errorTime = null;
- this.score = BigDecimal.valueOf(0.00);
+ this.actualAttendTime = null;
- this.goOffTimeStr = "";
+ this.errorResult = "";
- this.errorTime = null;
+ this.checkPerson = "";
- this.actualAttendTime = null;
+ this.checkTime = null;
- this.errorResult = "";
+ this.checkDesc = "";
- this.checkPerson = "";
+ this.checkResult = "";
- this.checkTime = null;
+ this.checkStatus = 1;
- this.checkDesc = "";
+ this.subMethod = 1;
- this.checkResult = "";
+ this.remark = "";
- this.checkStatus = 1;
+ this.fileNames = "";
- this.subMethod = 1;
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java
index e162dd8c396a7b05f8a38b281ed1f5955ce9e4f6..d3b7f2d02c0e41a128750dbd0243214e5ee16f4e 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java
@@ -5,11 +5,11 @@ import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
/**
- * 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅鏌ヨ瀵硅薄
- *
- * @author zxfei
- * @date 2023-07-07
- */
+* 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅鏌ヨ瀵硅薄
+*
+* @author zxfei
+* @date 2023-07-08
+*/
public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
private Long idStart;
@@ -277,6 +277,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)鎺掗櫎鍒楄〃 */
private List <Integer> subMethodNotList;
+ /** 璇存槑 */
+ private List<String> remarkList;
+
+ /** 璇存槑鎺掗櫎鍒楄〃 */
+ private List <String> remarkNotList;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckAttendRecordQuery> orConditionList;
@@ -286,2361 +301,2514 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
public CheckAttendRecordQuery(){}
/**
- * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
- * @return idStart
- */
+ * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+ * @return idStart
+ */
public Long getIdStart(){
return this.idStart;
}
/**
- * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
- * @param idStart
- */
+ * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+ * @param idStart
+ */
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
- * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
- * @return $idEnd
- */
+ * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+ * @return $idEnd
+ */
public Long getIdEnd(){
return this.idEnd;
}
/**
- * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
- * @param idEnd
- */
+ * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+ * @param idEnd
+ */
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
- * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
- * @return idIncrement
- */
+ * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+ * @return idIncrement
+ */
public Long getIdIncrement(){
return this.idIncrement;
}
/**
- * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
- * @param idIncrement
- */
+ * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+ * @param idIncrement
+ */
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
- * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
- * @return idList
- */
+ * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
+ * @return idList
+ */
public List<Long> getIdList(){
return this.idList;
}
/**
- * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
- * @param idList
- */
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param idList
+ */
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
- * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
- * @return idNotList
- */
+ * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
+ * @return idNotList
+ */
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
- * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
- * @param idNotList
- */
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param idNotList
+ */
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
- * 鑾峰彇 寮€濮� 璁板綍ID
- * @return recordIdStart
- */
+ * 鑾峰彇 寮€濮� 璁板綍ID
+ * @return recordIdStart
+ */
public Long getRecordIdStart(){
return this.recordIdStart;
}
/**
- * 璁剧疆 寮€濮� 璁板綍ID
- * @param recordIdStart
- */
+ * 璁剧疆 寮€濮� 璁板綍ID
+ * @param recordIdStart
+ */
public void setRecordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart;
}
/**
- * 鑾峰彇 缁撴潫 璁板綍ID
- * @return $recordIdEnd
- */
+ * 鑾峰彇 缁撴潫 璁板綍ID
+ * @return $recordIdEnd
+ */
public Long getRecordIdEnd(){
return this.recordIdEnd;
}
/**
- * 璁剧疆 缁撴潫 璁板綍ID
- * @param recordIdEnd
- */
+ * 璁剧疆 缁撴潫 璁板綍ID
+ * @param recordIdEnd
+ */
public void setRecordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 璁板綍ID
- * @return recordIdIncrement
- */
+ * 鑾峰彇 澧炲姞 璁板綍ID
+ * @return recordIdIncrement
+ */
public Long getRecordIdIncrement(){
return this.recordIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 璁板綍ID
- * @param recordIdIncrement
- */
+ * 璁剧疆 澧炲姞 璁板綍ID
+ * @param recordIdIncrement
+ */
public void setRecordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement;
}
/**
- * 鑾峰彇 璁板綍ID
- * @return recordIdList
- */
+ * 鑾峰彇 璁板綍ID
+ * @return recordIdList
+ */
public List<Long> getRecordIdList(){
return this.recordIdList;
}
/**
- * 璁剧疆 璁板綍ID
- * @param recordIdList
- */
+ * 璁剧疆 璁板綍ID
+ * @param recordIdList
+ */
public void setRecordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList;
}
/**
- * 鑾峰彇 璁板綍ID
- * @return recordIdNotList
- */
+ * 鑾峰彇 璁板綍ID
+ * @return recordIdNotList
+ */
public List<Long> getRecordIdNotList(){
return this.recordIdNotList;
}
/**
- * 璁剧疆 璁板綍ID
- * @param recordIdNotList
- */
+ * 璁剧疆 璁板綍ID
+ * @param recordIdNotList
+ */
public void setRecordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList;
}
/**
- * 鑾峰彇 寮€濮� 鍛樺伐ID
- * @return staffIdStart
- */
+ * 鑾峰彇 寮€濮� 鍛樺伐ID
+ * @return staffIdStart
+ */
public Long getStaffIdStart(){
return this.staffIdStart;
}
/**
- * 璁剧疆 寮€濮� 鍛樺伐ID
- * @param staffIdStart
- */
+ * 璁剧疆 寮€濮� 鍛樺伐ID
+ * @param staffIdStart
+ */
public void setStaffIdStart(Long staffIdStart){
this.staffIdStart = staffIdStart;
}
/**
- * 鑾峰彇 缁撴潫 鍛樺伐ID
- * @return $staffIdEnd
- */
+ * 鑾峰彇 缁撴潫 鍛樺伐ID
+ * @return $staffIdEnd
+ */
public Long getStaffIdEnd(){
return this.staffIdEnd;
}
/**
- * 璁剧疆 缁撴潫 鍛樺伐ID
- * @param staffIdEnd
- */
+ * 璁剧疆 缁撴潫 鍛樺伐ID
+ * @param staffIdEnd
+ */
public void setStaffIdEnd(Long staffIdEnd){
this.staffIdEnd = staffIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 鍛樺伐ID
- * @return staffIdIncrement
- */
+ * 鑾峰彇 澧炲姞 鍛樺伐ID
+ * @return staffIdIncrement
+ */
public Long getStaffIdIncrement(){
return this.staffIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 鍛樺伐ID
- * @param staffIdIncrement
- */
+ * 璁剧疆 澧炲姞 鍛樺伐ID
+ * @param staffIdIncrement
+ */
public void setStaffIdIncrement(Long staffIdIncrement){
this.staffIdIncrement = staffIdIncrement;
}
/**
- * 鑾峰彇 鍛樺伐ID
- * @return staffIdList
- */
+ * 鑾峰彇 鍛樺伐ID
+ * @return staffIdList
+ */
public List<Long> getStaffIdList(){
return this.staffIdList;
}
/**
- * 璁剧疆 鍛樺伐ID
- * @param staffIdList
- */
+ * 璁剧疆 鍛樺伐ID
+ * @param staffIdList
+ */
public void setStaffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList;
}
/**
- * 鑾峰彇 鍛樺伐ID
- * @return staffIdNotList
- */
+ * 鑾峰彇 鍛樺伐ID
+ * @return staffIdNotList
+ */
public List<Long> getStaffIdNotList(){
return this.staffIdNotList;
}
/**
- * 璁剧疆 鍛樺伐ID
- * @param staffIdNotList
- */
+ * 璁剧疆 鍛樺伐ID
+ * @param staffIdNotList
+ */
public void setStaffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList;
}
/**
- * 鑾峰彇 鍛樺伐濮撳悕
- * @return staffNameList
- */
+ * 鑾峰彇 鍛樺伐濮撳悕
+ * @return staffNameList
+ */
public List<String> getStaffNameList(){
return this.staffNameList;
}
/**
- * 璁剧疆 鍛樺伐濮撳悕
- * @param staffNameList
- */
+ * 璁剧疆 鍛樺伐濮撳悕
+ * @param staffNameList
+ */
public void setStaffNameList(List<String> staffNameList){
this.staffNameList = staffNameList;
}
/**
- * 鑾峰彇 鍛樺伐濮撳悕
- * @return staffNameNotList
- */
+ * 鑾峰彇 鍛樺伐濮撳悕
+ * @return staffNameNotList
+ */
public List<String> getStaffNameNotList(){
return this.staffNameNotList;
}
/**
- * 璁剧疆 鍛樺伐濮撳悕
- * @param staffNameNotList
- */
+ * 璁剧疆 鍛樺伐濮撳悕
+ * @param staffNameNotList
+ */
public void setStaffNameNotList(List<String> staffNameNotList){
this.staffNameNotList = staffNameNotList;
}
/**
- * 鑾峰彇 宸ュ彿
- * @return workNumList
- */
+ * 鑾峰彇 宸ュ彿
+ * @return workNumList
+ */
public List<String> getWorkNumList(){
return this.workNumList;
}
/**
- * 璁剧疆 宸ュ彿
- * @param workNumList
- */
+ * 璁剧疆 宸ュ彿
+ * @param workNumList
+ */
public void setWorkNumList(List<String> workNumList){
this.workNumList = workNumList;
}
/**
- * 鑾峰彇 宸ュ彿
- * @return workNumNotList
- */
+ * 鑾峰彇 宸ュ彿
+ * @return workNumNotList
+ */
public List<String> getWorkNumNotList(){
return this.workNumNotList;
}
/**
- * 璁剧疆 宸ュ彿
- * @param workNumNotList
- */
+ * 璁剧疆 宸ュ彿
+ * @param workNumNotList
+ */
public void setWorkNumNotList(List<String> workNumNotList){
this.workNumNotList = workNumNotList;
}
/**
- * 鑾峰彇 寮€濮� 鎵€灞為儴闂�
- * @return deptIdStart
- */
+ * 鑾峰彇 寮€濮� 鎵€灞為儴闂�
+ * @return deptIdStart
+ */
public Long getDeptIdStart(){
return this.deptIdStart;
}
/**
- * 璁剧疆 寮€濮� 鎵€灞為儴闂�
- * @param deptIdStart
- */
+ * 璁剧疆 寮€濮� 鎵€灞為儴闂�
+ * @param deptIdStart
+ */
public void setDeptIdStart(Long deptIdStart){
this.deptIdStart = deptIdStart;
}
/**
- * 鑾峰彇 缁撴潫 鎵€灞為儴闂�
- * @return $deptIdEnd
- */
+ * 鑾峰彇 缁撴潫 鎵€灞為儴闂�
+ * @return $deptIdEnd
+ */
public Long getDeptIdEnd(){
return this.deptIdEnd;
}
/**
- * 璁剧疆 缁撴潫 鎵€灞為儴闂�
- * @param deptIdEnd
- */
+ * 璁剧疆 缁撴潫 鎵€灞為儴闂�
+ * @param deptIdEnd
+ */
public void setDeptIdEnd(Long deptIdEnd){
this.deptIdEnd = deptIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 鎵€灞為儴闂�
- * @return deptIdIncrement
- */
+ * 鑾峰彇 澧炲姞 鎵€灞為儴闂�
+ * @return deptIdIncrement
+ */
public Long getDeptIdIncrement(){
return this.deptIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 鎵€灞為儴闂�
- * @param deptIdIncrement
- */
+ * 璁剧疆 澧炲姞 鎵€灞為儴闂�
+ * @param deptIdIncrement
+ */
public void setDeptIdIncrement(Long deptIdIncrement){
this.deptIdIncrement = deptIdIncrement;
}
/**
- * 鑾峰彇 鎵€灞為儴闂�
- * @return deptIdList
- */
+ * 鑾峰彇 鎵€灞為儴闂�
+ * @return deptIdList
+ */
public List<Long> getDeptIdList(){
return this.deptIdList;
}
/**
- * 璁剧疆 鎵€灞為儴闂�
- * @param deptIdList
- */
+ * 璁剧疆 鎵€灞為儴闂�
+ * @param deptIdList
+ */
public void setDeptIdList(List<Long> deptIdList){
this.deptIdList = deptIdList;
}
/**
- * 鑾峰彇 鎵€灞為儴闂�
- * @return deptIdNotList
- */
+ * 鑾峰彇 鎵€灞為儴闂�
+ * @return deptIdNotList
+ */
public List<Long> getDeptIdNotList(){
return this.deptIdNotList;
}
/**
- * 璁剧疆 鎵€灞為儴闂�
- * @param deptIdNotList
- */
+ * 璁剧疆 鎵€灞為儴闂�
+ * @param deptIdNotList
+ */
public void setDeptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
}
/**
- * 鑾峰彇 鎵€灞為儴闂ㄥ悕绉�
- * @return deptNameList
- */
+ * 鑾峰彇 鎵€灞為儴闂ㄥ悕绉�
+ * @return deptNameList
+ */
public List<String> getDeptNameList(){
return this.deptNameList;
}
/**
- * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
- * @param deptNameList
- */
+ * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
+ * @param deptNameList
+ */
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
- * 鑾峰彇 鎵€灞為儴闂ㄥ悕绉�
- * @return deptNameNotList
- */
+ * 鑾峰彇 鎵€灞為儴闂ㄥ悕绉�
+ * @return deptNameNotList
+ */
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
- * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
- * @param deptNameNotList
- */
+ * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
+ * @param deptNameNotList
+ */
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/**
- * 鑾峰彇 寮€濮� 鎵€灞炶€冨嫟缁処D
- * @return attendanceGroupIdStart
- */
+ * 鑾峰彇 寮€濮� 鎵€灞炶€冨嫟缁処D
+ * @return attendanceGroupIdStart
+ */
public Long getAttendanceGroupIdStart(){
return this.attendanceGroupIdStart;
}
/**
- * 璁剧疆 寮€濮� 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupIdStart
- */
+ * 璁剧疆 寮€濮� 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupIdStart
+ */
public void setAttendanceGroupIdStart(Long attendanceGroupIdStart){
this.attendanceGroupIdStart = attendanceGroupIdStart;
}
/**
- * 鑾峰彇 缁撴潫 鎵€灞炶€冨嫟缁処D
- * @return $attendanceGroupIdEnd
- */
+ * 鑾峰彇 缁撴潫 鎵€灞炶€冨嫟缁処D
+ * @return $attendanceGroupIdEnd
+ */
public Long getAttendanceGroupIdEnd(){
return this.attendanceGroupIdEnd;
}
/**
- * 璁剧疆 缁撴潫 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupIdEnd
- */
+ * 璁剧疆 缁撴潫 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupIdEnd
+ */
public void setAttendanceGroupIdEnd(Long attendanceGroupIdEnd){
this.attendanceGroupIdEnd = attendanceGroupIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 鎵€灞炶€冨嫟缁処D
- * @return attendanceGroupIdIncrement
- */
+ * 鑾峰彇 澧炲姞 鎵€灞炶€冨嫟缁処D
+ * @return attendanceGroupIdIncrement
+ */
public Long getAttendanceGroupIdIncrement(){
return this.attendanceGroupIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupIdIncrement
- */
+ * 璁剧疆 澧炲姞 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupIdIncrement
+ */
public void setAttendanceGroupIdIncrement(Long attendanceGroupIdIncrement){
this.attendanceGroupIdIncrement = attendanceGroupIdIncrement;
}
/**
- * 鑾峰彇 鎵€灞炶€冨嫟缁処D
- * @return attendanceGroupIdList
- */
+ * 鑾峰彇 鎵€灞炶€冨嫟缁処D
+ * @return attendanceGroupIdList
+ */
public List<Long> getAttendanceGroupIdList(){
return this.attendanceGroupIdList;
}
/**
- * 璁剧疆 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupIdList
- */
+ * 璁剧疆 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupIdList
+ */
public void setAttendanceGroupIdList(List<Long> attendanceGroupIdList){
this.attendanceGroupIdList = attendanceGroupIdList;
}
/**
- * 鑾峰彇 鎵€灞炶€冨嫟缁処D
- * @return attendanceGroupIdNotList
- */
+ * 鑾峰彇 鎵€灞炶€冨嫟缁処D
+ * @return attendanceGroupIdNotList
+ */
public List<Long> getAttendanceGroupIdNotList(){
return this.attendanceGroupIdNotList;
}
/**
- * 璁剧疆 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupIdNotList
- */
+ * 璁剧疆 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupIdNotList
+ */
public void setAttendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){
this.attendanceGroupIdNotList = attendanceGroupIdNotList;
}
/**
- * 鑾峰彇 鎵€灞炶€冨嫟缁勫悕绉�
- * @return attendanceGroupNameList
- */
+ * 鑾峰彇 鎵€灞炶€冨嫟缁勫悕绉�
+ * @return attendanceGroupNameList
+ */
public List<String> getAttendanceGroupNameList(){
return this.attendanceGroupNameList;
}
/**
- * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
- * @param attendanceGroupNameList
- */
+ * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
+ * @param attendanceGroupNameList
+ */
public void setAttendanceGroupNameList(List<String> attendanceGroupNameList){
this.attendanceGroupNameList = attendanceGroupNameList;
}
/**
- * 鑾峰彇 鎵€灞炶€冨嫟缁勫悕绉�
- * @return attendanceGroupNameNotList
- */
+ * 鑾峰彇 鎵€灞炶€冨嫟缁勫悕绉�
+ * @return attendanceGroupNameNotList
+ */
public List<String> getAttendanceGroupNameNotList(){
return this.attendanceGroupNameNotList;
}
/**
- * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
- * @param attendanceGroupNameNotList
- */
+ * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
+ * @param attendanceGroupNameNotList
+ */
public void setAttendanceGroupNameNotList(List<String> attendanceGroupNameNotList){
this.attendanceGroupNameNotList = attendanceGroupNameNotList;
}
/**
- * 鑾峰彇 寮€濮� 鑰冨嫟鏃堕棿
- * @return attendanceDateStart
- */
+ * 鑾峰彇 寮€濮� 鑰冨嫟鏃堕棿
+ * @return attendanceDateStart
+ */
public String getAttendanceDateStart(){
return this.attendanceDateStart;
}
/**
- * 璁剧疆 寮€濮� 鑰冨嫟鏃堕棿
- * @param attendanceDateStart
- */
+ * 璁剧疆 寮€濮� 鑰冨嫟鏃堕棿
+ * @param attendanceDateStart
+ */
public void setAttendanceDateStart(String attendanceDateStart){
this.attendanceDateStart = attendanceDateStart;
}
/**
- * 鑾峰彇 缁撴潫 鑰冨嫟鏃堕棿
- * @return attendanceDateEnd
- */
+ * 鑾峰彇 缁撴潫 鑰冨嫟鏃堕棿
+ * @return attendanceDateEnd
+ */
public String getAttendanceDateEnd(){
return this.attendanceDateEnd;
}
/**
- * 璁剧疆 缁撴潫 鑰冨嫟鏃堕棿
- * @param attendanceDateEnd
- */
+ * 璁剧疆 缁撴潫 鑰冨嫟鏃堕棿
+ * @param attendanceDateEnd
+ */
public void setAttendanceDateEnd(String attendanceDateEnd){
this.attendanceDateEnd = attendanceDateEnd;
}
/**
- * 鑾峰彇 寮€濮� 缁╂晥瑙勫垯id
- * @return ruleIdStart
- */
+ * 鑾峰彇 寮€濮� 缁╂晥瑙勫垯id
+ * @return ruleIdStart
+ */
public Long getRuleIdStart(){
return this.ruleIdStart;
}
/**
- * 璁剧疆 寮€濮� 缁╂晥瑙勫垯id
- * @param ruleIdStart
- */
+ * 璁剧疆 寮€濮� 缁╂晥瑙勫垯id
+ * @param ruleIdStart
+ */
public void setRuleIdStart(Long ruleIdStart){
this.ruleIdStart = ruleIdStart;
}
/**
- * 鑾峰彇 缁撴潫 缁╂晥瑙勫垯id
- * @return $ruleIdEnd
- */
+ * 鑾峰彇 缁撴潫 缁╂晥瑙勫垯id
+ * @return $ruleIdEnd
+ */
public Long getRuleIdEnd(){
return this.ruleIdEnd;
}
/**
- * 璁剧疆 缁撴潫 缁╂晥瑙勫垯id
- * @param ruleIdEnd
- */
+ * 璁剧疆 缁撴潫 缁╂晥瑙勫垯id
+ * @param ruleIdEnd
+ */
public void setRuleIdEnd(Long ruleIdEnd){
this.ruleIdEnd = ruleIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 缁╂晥瑙勫垯id
- * @return ruleIdIncrement
- */
+ * 鑾峰彇 澧炲姞 缁╂晥瑙勫垯id
+ * @return ruleIdIncrement
+ */
public Long getRuleIdIncrement(){
return this.ruleIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 缁╂晥瑙勫垯id
- * @param ruleIdIncrement
- */
+ * 璁剧疆 澧炲姞 缁╂晥瑙勫垯id
+ * @param ruleIdIncrement
+ */
public void setRuleIdIncrement(Long ruleIdIncrement){
this.ruleIdIncrement = ruleIdIncrement;
}
/**
- * 鑾峰彇 缁╂晥瑙勫垯id
- * @return ruleIdList
- */
+ * 鑾峰彇 缁╂晥瑙勫垯id
+ * @return ruleIdList
+ */
public List<Long> getRuleIdList(){
return this.ruleIdList;
}
/**
- * 璁剧疆 缁╂晥瑙勫垯id
- * @param ruleIdList
- */
+ * 璁剧疆 缁╂晥瑙勫垯id
+ * @param ruleIdList
+ */
public void setRuleIdList(List<Long> ruleIdList){
this.ruleIdList = ruleIdList;
}
/**
- * 鑾峰彇 缁╂晥瑙勫垯id
- * @return ruleIdNotList
- */
+ * 鑾峰彇 缁╂晥瑙勫垯id
+ * @return ruleIdNotList
+ */
public List<Long> getRuleIdNotList(){
return this.ruleIdNotList;
}
/**
- * 璁剧疆 缁╂晥瑙勫垯id
- * @param ruleIdNotList
- */
+ * 璁剧疆 缁╂晥瑙勫垯id
+ * @param ruleIdNotList
+ */
public void setRuleIdNotList(List<Long> ruleIdNotList){
this.ruleIdNotList = ruleIdNotList;
}
/**
- * 鑾峰彇 瑙勫垯鍚嶇О
- * @return ruleNameList
- */
+ * 鑾峰彇 瑙勫垯鍚嶇О
+ * @return ruleNameList
+ */
public List<String> getRuleNameList(){
return this.ruleNameList;
}
/**
- * 璁剧疆 瑙勫垯鍚嶇О
- * @param ruleNameList
- */
+ * 璁剧疆 瑙勫垯鍚嶇О
+ * @param ruleNameList
+ */
public void setRuleNameList(List<String> ruleNameList){
this.ruleNameList = ruleNameList;
}
/**
- * 鑾峰彇 瑙勫垯鍚嶇О
- * @return ruleNameNotList
- */
+ * 鑾峰彇 瑙勫垯鍚嶇О
+ * @return ruleNameNotList
+ */
public List<String> getRuleNameNotList(){
return this.ruleNameNotList;
}
/**
- * 璁剧疆 瑙勫垯鍚嶇О
- * @param ruleNameNotList
- */
+ * 璁剧疆 瑙勫垯鍚嶇О
+ * @param ruleNameNotList
+ */
public void setRuleNameNotList(List<String> ruleNameNotList){
this.ruleNameNotList = ruleNameNotList;
}
/**
- * 鑾峰彇 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @return subAddTypeStart
- */
+ * 鑾峰彇 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @return subAddTypeStart
+ */
public Integer getSubAddTypeStart(){
return this.subAddTypeStart;
}
/**
- * 璁剧疆 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddTypeStart
- */
+ * 璁剧疆 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddTypeStart
+ */
public void setSubAddTypeStart(Integer subAddTypeStart){
this.subAddTypeStart = subAddTypeStart;
}
/**
- * 鑾峰彇 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @return $subAddTypeEnd
- */
+ * 鑾峰彇 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @return $subAddTypeEnd
+ */
public Integer getSubAddTypeEnd(){
return this.subAddTypeEnd;
}
/**
- * 璁剧疆 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddTypeEnd
- */
+ * 璁剧疆 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddTypeEnd
+ */
public void setSubAddTypeEnd(Integer subAddTypeEnd){
this.subAddTypeEnd = subAddTypeEnd;
}
/**
- * 鑾峰彇 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @return subAddTypeIncrement
- */
+ * 鑾峰彇 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @return subAddTypeIncrement
+ */
public Integer getSubAddTypeIncrement(){
return this.subAddTypeIncrement;
}
/**
- * 璁剧疆 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddTypeIncrement
- */
+ * 璁剧疆 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddTypeIncrement
+ */
public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
this.subAddTypeIncrement = subAddTypeIncrement;
}
/**
- * 鑾峰彇 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @return subAddTypeList
- */
+ * 鑾峰彇 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @return subAddTypeList
+ */
public List<Integer> getSubAddTypeList(){
return this.subAddTypeList;
}
/**
- * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddTypeList
- */
+ * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddTypeList
+ */
public void setSubAddTypeList(List<Integer> subAddTypeList){
this.subAddTypeList = subAddTypeList;
}
/**
- * 鑾峰彇 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @return subAddTypeNotList
- */
+ * 鑾峰彇 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @return subAddTypeNotList
+ */
public List<Integer> getSubAddTypeNotList(){
return this.subAddTypeNotList;
}
/**
- * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddTypeNotList
- */
+ * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddTypeNotList
+ */
public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
this.subAddTypeNotList = subAddTypeNotList;
}
/**
- * 鑾峰彇 寮€濮� 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @return scoreStart
- */
+ * 鑾峰彇 寮€濮� 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @return scoreStart
+ */
public BigDecimal getScoreStart(){
return this.scoreStart;
}
/**
- * 璁剧疆 寮€濮� 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param scoreStart
- */
+ * 璁剧疆 寮€濮� 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param scoreStart
+ */
public void setScoreStart(BigDecimal scoreStart){
this.scoreStart = scoreStart;
}
/**
- * 鑾峰彇 缁撴潫 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @return $scoreEnd
- */
+ * 鑾峰彇 缁撴潫 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @return $scoreEnd
+ */
public BigDecimal getScoreEnd(){
return this.scoreEnd;
}
/**
- * 璁剧疆 缁撴潫 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param scoreEnd
- */
+ * 璁剧疆 缁撴潫 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param scoreEnd
+ */
public void setScoreEnd(BigDecimal scoreEnd){
this.scoreEnd = scoreEnd;
}
/**
- * 鑾峰彇 澧炲姞 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @return scoreIncrement
- */
+ * 鑾峰彇 澧炲姞 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @return scoreIncrement
+ */
public BigDecimal getScoreIncrement(){
return this.scoreIncrement;
}
/**
- * 璁剧疆 澧炲姞 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param scoreIncrement
- */
+ * 璁剧疆 澧炲姞 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param scoreIncrement
+ */
public void setScoreIncrement(BigDecimal scoreIncrement){
this.scoreIncrement = scoreIncrement;
}
/**
- * 鑾峰彇 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @return scoreList
- */
+ * 鑾峰彇 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @return scoreList
+ */
public List<BigDecimal> getScoreList(){
return this.scoreList;
}
/**
- * 璁剧疆 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param scoreList
- */
+ * 璁剧疆 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param scoreList
+ */
public void setScoreList(List<BigDecimal> scoreList){
this.scoreList = scoreList;
}
/**
- * 鑾峰彇 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @return scoreNotList
- */
+ * 鑾峰彇 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @return scoreNotList
+ */
public List<BigDecimal> getScoreNotList(){
return this.scoreNotList;
}
/**
- * 璁剧疆 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param scoreNotList
- */
+ * 璁剧疆 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param scoreNotList
+ */
public void setScoreNotList(List<BigDecimal> scoreNotList){
this.scoreNotList = scoreNotList;
}
/**
- * 鑾峰彇 涓婁笅鐝椂闂�
- * @return goOffTimeStrList
- */
+ * 鑾峰彇 涓婁笅鐝椂闂�
+ * @return goOffTimeStrList
+ */
public List<String> getGoOffTimeStrList(){
return this.goOffTimeStrList;
}
/**
- * 璁剧疆 涓婁笅鐝椂闂�
- * @param goOffTimeStrList
- */
+ * 璁剧疆 涓婁笅鐝椂闂�
+ * @param goOffTimeStrList
+ */
public void setGoOffTimeStrList(List<String> goOffTimeStrList){
this.goOffTimeStrList = goOffTimeStrList;
}
/**
- * 鑾峰彇 涓婁笅鐝椂闂�
- * @return goOffTimeStrNotList
- */
+ * 鑾峰彇 涓婁笅鐝椂闂�
+ * @return goOffTimeStrNotList
+ */
public List<String> getGoOffTimeStrNotList(){
return this.goOffTimeStrNotList;
}
/**
- * 璁剧疆 涓婁笅鐝椂闂�
- * @param goOffTimeStrNotList
- */
+ * 璁剧疆 涓婁笅鐝椂闂�
+ * @param goOffTimeStrNotList
+ */
public void setGoOffTimeStrNotList(List<String> goOffTimeStrNotList){
this.goOffTimeStrNotList = goOffTimeStrNotList;
}
/**
- * 鑾峰彇 寮€濮� 寮傚父鏃堕棿
- * @return errorTimeStart
- */
+ * 鑾峰彇 寮€濮� 寮傚父鏃堕棿
+ * @return errorTimeStart
+ */
public String getErrorTimeStart(){
return this.errorTimeStart;
}
/**
- * 璁剧疆 寮€濮� 寮傚父鏃堕棿
- * @param errorTimeStart
- */
+ * 璁剧疆 寮€濮� 寮傚父鏃堕棿
+ * @param errorTimeStart
+ */
public void setErrorTimeStart(String errorTimeStart){
this.errorTimeStart = errorTimeStart;
}
/**
- * 鑾峰彇 缁撴潫 寮傚父鏃堕棿
- * @return errorTimeEnd
- */
+ * 鑾峰彇 缁撴潫 寮傚父鏃堕棿
+ * @return errorTimeEnd
+ */
public String getErrorTimeEnd(){
return this.errorTimeEnd;
}
/**
- * 璁剧疆 缁撴潫 寮傚父鏃堕棿
- * @param errorTimeEnd
- */
+ * 璁剧疆 缁撴潫 寮傚父鏃堕棿
+ * @param errorTimeEnd
+ */
public void setErrorTimeEnd(String errorTimeEnd){
this.errorTimeEnd = errorTimeEnd;
}
/**
- * 鑾峰彇 寮€濮� 瀹為檯鎵撳崱鏃堕棿
- * @return actualAttendTimeStart
- */
+ * 鑾峰彇 寮€濮� 瀹為檯鎵撳崱鏃堕棿
+ * @return actualAttendTimeStart
+ */
public String getActualAttendTimeStart(){
return this.actualAttendTimeStart;
}
/**
- * 璁剧疆 寮€濮� 瀹為檯鎵撳崱鏃堕棿
- * @param actualAttendTimeStart
- */
+ * 璁剧疆 寮€濮� 瀹為檯鎵撳崱鏃堕棿
+ * @param actualAttendTimeStart
+ */
public void setActualAttendTimeStart(String actualAttendTimeStart){
this.actualAttendTimeStart = actualAttendTimeStart;
}
/**
- * 鑾峰彇 缁撴潫 瀹為檯鎵撳崱鏃堕棿
- * @return actualAttendTimeEnd
- */
+ * 鑾峰彇 缁撴潫 瀹為檯鎵撳崱鏃堕棿
+ * @return actualAttendTimeEnd
+ */
public String getActualAttendTimeEnd(){
return this.actualAttendTimeEnd;
}
/**
- * 璁剧疆 缁撴潫 瀹為檯鎵撳崱鏃堕棿
- * @param actualAttendTimeEnd
- */
+ * 璁剧疆 缁撴潫 瀹為檯鎵撳崱鏃堕棿
+ * @param actualAttendTimeEnd
+ */
public void setActualAttendTimeEnd(String actualAttendTimeEnd){
this.actualAttendTimeEnd = actualAttendTimeEnd;
}
/**
- * 鑾峰彇 寮傚父澶勭悊缁撴灉
- * @return errorResultList
- */
+ * 鑾峰彇 寮傚父澶勭悊缁撴灉
+ * @return errorResultList
+ */
public List<String> getErrorResultList(){
return this.errorResultList;
}
/**
- * 璁剧疆 寮傚父澶勭悊缁撴灉
- * @param errorResultList
- */
+ * 璁剧疆 寮傚父澶勭悊缁撴灉
+ * @param errorResultList
+ */
public void setErrorResultList(List<String> errorResultList){
this.errorResultList = errorResultList;
}
/**
- * 鑾峰彇 寮傚父澶勭悊缁撴灉
- * @return errorResultNotList
- */
+ * 鑾峰彇 寮傚父澶勭悊缁撴灉
+ * @return errorResultNotList
+ */
public List<String> getErrorResultNotList(){
return this.errorResultNotList;
}
/**
- * 璁剧疆 寮傚父澶勭悊缁撴灉
- * @param errorResultNotList
- */
+ * 璁剧疆 寮傚父澶勭悊缁撴灉
+ * @param errorResultNotList
+ */
public void setErrorResultNotList(List<String> errorResultNotList){
this.errorResultNotList = errorResultNotList;
}
/**
- * 鑾峰彇 鏍告煡浜哄憳
- * @return checkPersonList
- */
+ * 鑾峰彇 鏍告煡浜哄憳
+ * @return checkPersonList
+ */
public List<String> getCheckPersonList(){
return this.checkPersonList;
}
/**
- * 璁剧疆 鏍告煡浜哄憳
- * @param checkPersonList
- */
+ * 璁剧疆 鏍告煡浜哄憳
+ * @param checkPersonList
+ */
public void setCheckPersonList(List<String> checkPersonList){
this.checkPersonList = checkPersonList;
}
/**
- * 鑾峰彇 鏍告煡浜哄憳
- * @return checkPersonNotList
- */
+ * 鑾峰彇 鏍告煡浜哄憳
+ * @return checkPersonNotList
+ */
public List<String> getCheckPersonNotList(){
return this.checkPersonNotList;
}
/**
- * 璁剧疆 鏍告煡浜哄憳
- * @param checkPersonNotList
- */
+ * 璁剧疆 鏍告煡浜哄憳
+ * @param checkPersonNotList
+ */
public void setCheckPersonNotList(List<String> checkPersonNotList){
this.checkPersonNotList = checkPersonNotList;
}
/**
- * 鑾峰彇 寮€濮� 鏍告煡鏃堕棿
- * @return checkTimeStart
- */
+ * 鑾峰彇 寮€濮� 鏍告煡鏃堕棿
+ * @return checkTimeStart
+ */
public String getCheckTimeStart(){
return this.checkTimeStart;
}
/**
- * 璁剧疆 寮€濮� 鏍告煡鏃堕棿
- * @param checkTimeStart
- */
+ * 璁剧疆 寮€濮� 鏍告煡鏃堕棿
+ * @param checkTimeStart
+ */
public void setCheckTimeStart(String checkTimeStart){
this.checkTimeStart = checkTimeStart;
}
/**
- * 鑾峰彇 缁撴潫 鏍告煡鏃堕棿
- * @return checkTimeEnd
- */
+ * 鑾峰彇 缁撴潫 鏍告煡鏃堕棿
+ * @return checkTimeEnd
+ */
public String getCheckTimeEnd(){
return this.checkTimeEnd;
}
/**
- * 璁剧疆 缁撴潫 鏍告煡鏃堕棿
- * @param checkTimeEnd
- */
+ * 璁剧疆 缁撴潫 鏍告煡鏃堕棿
+ * @param checkTimeEnd
+ */
public void setCheckTimeEnd(String checkTimeEnd){
this.checkTimeEnd = checkTimeEnd;
}
/**
- * 鑾峰彇 鏍告煡璇存槑
- * @return checkDescList
- */
+ * 鑾峰彇 鏍告煡璇存槑
+ * @return checkDescList
+ */
public List<String> getCheckDescList(){
return this.checkDescList;
}
/**
- * 璁剧疆 鏍告煡璇存槑
- * @param checkDescList
- */
+ * 璁剧疆 鏍告煡璇存槑
+ * @param checkDescList
+ */
public void setCheckDescList(List<String> checkDescList){
this.checkDescList = checkDescList;
}
/**
- * 鑾峰彇 鏍告煡璇存槑
- * @return checkDescNotList
- */
+ * 鑾峰彇 鏍告煡璇存槑
+ * @return checkDescNotList
+ */
public List<String> getCheckDescNotList(){
return this.checkDescNotList;
}
/**
- * 璁剧疆 鏍告煡璇存槑
- * @param checkDescNotList
- */
+ * 璁剧疆 鏍告煡璇存槑
+ * @param checkDescNotList
+ */
public void setCheckDescNotList(List<String> checkDescNotList){
this.checkDescNotList = checkDescNotList;
}
/**
- * 鑾峰彇 鏍告煡缁撴灉
- * @return checkResultList
- */
+ * 鑾峰彇 鏍告煡缁撴灉
+ * @return checkResultList
+ */
public List<String> getCheckResultList(){
return this.checkResultList;
}
/**
- * 璁剧疆 鏍告煡缁撴灉
- * @param checkResultList
- */
+ * 璁剧疆 鏍告煡缁撴灉
+ * @param checkResultList
+ */
public void setCheckResultList(List<String> checkResultList){
this.checkResultList = checkResultList;
}
/**
- * 鑾峰彇 鏍告煡缁撴灉
- * @return checkResultNotList
- */
+ * 鑾峰彇 鏍告煡缁撴灉
+ * @return checkResultNotList
+ */
public List<String> getCheckResultNotList(){
return this.checkResultNotList;
}
/**
- * 璁剧疆 鏍告煡缁撴灉
- * @param checkResultNotList
- */
+ * 璁剧疆 鏍告煡缁撴灉
+ * @param checkResultNotList
+ */
public void setCheckResultNotList(List<String> checkResultNotList){
this.checkResultNotList = checkResultNotList;
}
/**
- * 鑾峰彇 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @return checkStatusStart
- */
+ * 鑾峰彇 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @return checkStatusStart
+ */
public Integer getCheckStatusStart(){
return this.checkStatusStart;
}
/**
- * 璁剧疆 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatusStart
- */
+ * 璁剧疆 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatusStart
+ */
public void setCheckStatusStart(Integer checkStatusStart){
this.checkStatusStart = checkStatusStart;
}
/**
- * 鑾峰彇 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @return $checkStatusEnd
- */
+ * 鑾峰彇 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @return $checkStatusEnd
+ */
public Integer getCheckStatusEnd(){
return this.checkStatusEnd;
}
/**
- * 璁剧疆 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatusEnd
- */
+ * 璁剧疆 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatusEnd
+ */
public void setCheckStatusEnd(Integer checkStatusEnd){
this.checkStatusEnd = checkStatusEnd;
}
/**
- * 鑾峰彇 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @return checkStatusIncrement
- */
+ * 鑾峰彇 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @return checkStatusIncrement
+ */
public Integer getCheckStatusIncrement(){
return this.checkStatusIncrement;
}
/**
- * 璁剧疆 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatusIncrement
- */
+ * 璁剧疆 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatusIncrement
+ */
public void setCheckStatusIncrement(Integer checkStatusIncrement){
this.checkStatusIncrement = checkStatusIncrement;
}
/**
- * 鑾峰彇 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @return checkStatusList
- */
+ * 鑾峰彇 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @return checkStatusList
+ */
public List<Integer> getCheckStatusList(){
return this.checkStatusList;
}
/**
- * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatusList
- */
+ * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatusList
+ */
public void setCheckStatusList(List<Integer> checkStatusList){
this.checkStatusList = checkStatusList;
}
/**
- * 鑾峰彇 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @return checkStatusNotList
- */
+ * 鑾峰彇 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @return checkStatusNotList
+ */
public List<Integer> getCheckStatusNotList(){
return this.checkStatusNotList;
}
/**
- * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatusNotList
- */
+ * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatusNotList
+ */
public void setCheckStatusNotList(List<Integer> checkStatusNotList){
this.checkStatusNotList = checkStatusNotList;
}
/**
- * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
- * @return createUserIdStart
- */
+ * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @return createUserIdStart
+ */
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
- * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
- * @param createUserIdStart
- */
+ * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @param createUserIdStart
+ */
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
- * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
- * @return $createUserIdEnd
- */
+ * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @return $createUserIdEnd
+ */
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
- * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
- * @param createUserIdEnd
- */
+ * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @param createUserIdEnd
+ */
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
- * @return createUserIdIncrement
- */
+ * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @return createUserIdIncrement
+ */
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
- * @param createUserIdIncrement
- */
+ * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @param createUserIdIncrement
+ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
- * 鑾峰彇 鍒涘缓鐢ㄦ埛
- * @return createUserIdList
- */
+ * 鑾峰彇 鍒涘缓鐢ㄦ埛
+ * @return createUserIdList
+ */
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
- * @param createUserIdList
- */
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdList
+ */
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
- * 鑾峰彇 鍒涘缓鐢ㄦ埛
- * @return createUserIdNotList
- */
+ * 鑾峰彇 鍒涘缓鐢ㄦ埛
+ * @return createUserIdNotList
+ */
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
- * @param createUserIdNotList
- */
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdNotList
+ */
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
- * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
- * @return createTimeStart
- */
+ * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+ * @return createTimeStart
+ */
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
- * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
- * @param createTimeStart
- */
+ * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
+ * @param createTimeStart
+ */
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
- * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
- * @return createTimeEnd
- */
+ * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
+ * @return createTimeEnd
+ */
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
- * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
- * @param createTimeEnd
- */
+ * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
+ * @param createTimeEnd
+ */
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
- * 鑾峰彇 寮€濮� 鏇存柊鐢ㄦ埛
- * @return updateUserIdStart
- */
+ * 鑾峰彇 寮€濮� 鏇存柊鐢ㄦ埛
+ * @return updateUserIdStart
+ */
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
- * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
- * @param updateUserIdStart
- */
+ * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
+ * @param updateUserIdStart
+ */
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
- * 鑾峰彇 缁撴潫 鏇存柊鐢ㄦ埛
- * @return $updateUserIdEnd
- */
+ * 鑾峰彇 缁撴潫 鏇存柊鐢ㄦ埛
+ * @return $updateUserIdEnd
+ */
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
- * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
- * @param updateUserIdEnd
- */
+ * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
+ * @param updateUserIdEnd
+ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 鏇存柊鐢ㄦ埛
- * @return updateUserIdIncrement
- */
+ * 鑾峰彇 澧炲姞 鏇存柊鐢ㄦ埛
+ * @return updateUserIdIncrement
+ */
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
- * @param updateUserIdIncrement
- */
+ * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
+ * @param updateUserIdIncrement
+ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
- * 鑾峰彇 鏇存柊鐢ㄦ埛
- * @return updateUserIdList
- */
+ * 鑾峰彇 鏇存柊鐢ㄦ埛
+ * @return updateUserIdList
+ */
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
- * 璁剧疆 鏇存柊鐢ㄦ埛
- * @param updateUserIdList
- */
+ * 璁剧疆 鏇存柊鐢ㄦ埛
+ * @param updateUserIdList
+ */
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
- * 鑾峰彇 鏇存柊鐢ㄦ埛
- * @return updateUserIdNotList
- */
+ * 鑾峰彇 鏇存柊鐢ㄦ埛
+ * @return updateUserIdNotList
+ */
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
- * 璁剧疆 鏇存柊鐢ㄦ埛
- * @param updateUserIdNotList
- */
+ * 璁剧疆 鏇存柊鐢ㄦ埛
+ * @param updateUserIdNotList
+ */
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/**
- * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿
- * @return updateTimeStart
- */
+ * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿
+ * @return updateTimeStart
+ */
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
- * 璁剧疆 寮€濮� 鏇存柊鏃堕棿
- * @param updateTimeStart
- */
+ * 璁剧疆 寮€濮� 鏇存柊鏃堕棿
+ * @param updateTimeStart
+ */
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
- * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿
- * @return updateTimeEnd
- */
+ * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿
+ * @return updateTimeEnd
+ */
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
- * 璁剧疆 缁撴潫 鏇存柊鏃堕棿
- * @param updateTimeEnd
- */
+ * 璁剧疆 缁撴潫 鏇存柊鏃堕棿
+ * @param updateTimeEnd
+ */
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
- * 鑾峰彇 寮€濮� 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @return subMethodStart
- */
+ * 鑾峰彇 寮€濮� 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @return subMethodStart
+ */
public Integer getSubMethodStart(){
return this.subMethodStart;
}
/**
- * 璁剧疆 寮€濮� 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethodStart
- */
+ * 璁剧疆 寮€濮� 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethodStart
+ */
public void setSubMethodStart(Integer subMethodStart){
this.subMethodStart = subMethodStart;
}
/**
- * 鑾峰彇 缁撴潫 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @return $subMethodEnd
- */
+ * 鑾峰彇 缁撴潫 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @return $subMethodEnd
+ */
public Integer getSubMethodEnd(){
return this.subMethodEnd;
}
/**
- * 璁剧疆 缁撴潫 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethodEnd
- */
+ * 璁剧疆 缁撴潫 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethodEnd
+ */
public void setSubMethodEnd(Integer subMethodEnd){
this.subMethodEnd = subMethodEnd;
}
/**
- * 鑾峰彇 澧炲姞 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @return subMethodIncrement
- */
+ * 鑾峰彇 澧炲姞 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @return subMethodIncrement
+ */
public Integer getSubMethodIncrement(){
return this.subMethodIncrement;
}
/**
- * 璁剧疆 澧炲姞 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethodIncrement
- */
+ * 璁剧疆 澧炲姞 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethodIncrement
+ */
public void setSubMethodIncrement(Integer subMethodIncrement){
this.subMethodIncrement = subMethodIncrement;
}
/**
- * 鑾峰彇 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @return subMethodList
- */
+ * 鑾峰彇 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @return subMethodList
+ */
public List<Integer> getSubMethodList(){
return this.subMethodList;
}
/**
- * 璁剧疆 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethodList
- */
+ * 璁剧疆 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethodList
+ */
public void setSubMethodList(List<Integer> subMethodList){
this.subMethodList = subMethodList;
}
/**
- * 鑾峰彇 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @return subMethodNotList
- */
+ * 鑾峰彇 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @return subMethodNotList
+ */
public List<Integer> getSubMethodNotList(){
return this.subMethodNotList;
}
/**
- * 璁剧疆 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethodNotList
- */
+ * 璁剧疆 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethodNotList
+ */
public void setSubMethodNotList(List<Integer> subMethodNotList){
this.subMethodNotList = subMethodNotList;
}
/**
- * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
- * @param id
- */
- public CheckAttendRecordQuery id(Long id){
- setId(id);
- return this;
+ * 鑾峰彇 璇存槑
+ * @return remarkList
+ */
+ public List<String> getRemarkList(){
+ return this.remarkList;
+ }
+
+ /**
+ * 璁剧疆 璇存槑
+ * @param remarkList
+ */
+ public void setRemarkList(List<String> remarkList){
+ this.remarkList = remarkList;
+ }
+
+ /**
+ * 鑾峰彇 璇存槑
+ * @return remarkNotList
+ */
+ public List<String> getRemarkNotList(){
+ return this.remarkNotList;
+ }
+
+ /**
+ * 璁剧疆 璇存槑
+ * @param remarkNotList
+ */
+ public void setRemarkNotList(List<String> remarkNotList){
+ this.remarkNotList = remarkNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
}
/**
- * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
- * @param idStart
- */
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param id
+ */
+ public CheckAttendRecordQuery id(Long id){
+ setId(id);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+ * @param idStart
+ */
public CheckAttendRecordQuery idStart(Long idStart){
- this.idStart = idStart;
- return this;
+ this.idStart = idStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
- * @param idEnd
- */
+ * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+ * @param idEnd
+ */
public CheckAttendRecordQuery idEnd(Long idEnd){
- this.idEnd = idEnd;
- return this;
+ this.idEnd = idEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
- * @param idIncrement
- */
+ * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+ * @param idIncrement
+ */
public CheckAttendRecordQuery idIncrement(Long idIncrement){
- this.idIncrement = idIncrement;
- return this;
+ this.idIncrement = idIncrement;
+ return this;
}
/**
- * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
- * @param idList
- */
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param idList
+ */
public CheckAttendRecordQuery idList(List<Long> idList){
this.idList = idList;
- return this;
- }
-
- /**
- * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
- * @param idNotList
- */
- public CheckAttendRecordQuery idNotList(List<Long> idNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param idNotList
+ */
+ public CheckAttendRecordQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
- }
+ }
/**
- * 璁剧疆 璁板綍ID
- * @param recordId
- */
+ * 璁剧疆 璁板綍ID
+ * @param recordId
+ */
public CheckAttendRecordQuery recordId(Long recordId){
- setRecordId(recordId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 璁板綍ID
- * @param recordIdStart
- */
+ setRecordId(recordId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 璁板綍ID
+ * @param recordIdStart
+ */
public CheckAttendRecordQuery recordIdStart(Long recordIdStart){
- this.recordIdStart = recordIdStart;
- return this;
+ this.recordIdStart = recordIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 璁板綍ID
- * @param recordIdEnd
- */
+ * 璁剧疆 缁撴潫 璁板綍ID
+ * @param recordIdEnd
+ */
public CheckAttendRecordQuery recordIdEnd(Long recordIdEnd){
- this.recordIdEnd = recordIdEnd;
- return this;
+ this.recordIdEnd = recordIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 璁板綍ID
- * @param recordIdIncrement
- */
+ * 璁剧疆 澧炲姞 璁板綍ID
+ * @param recordIdIncrement
+ */
public CheckAttendRecordQuery recordIdIncrement(Long recordIdIncrement){
- this.recordIdIncrement = recordIdIncrement;
- return this;
+ this.recordIdIncrement = recordIdIncrement;
+ return this;
}
/**
- * 璁剧疆 璁板綍ID
- * @param recordIdList
- */
+ * 璁剧疆 璁板綍ID
+ * @param recordIdList
+ */
public CheckAttendRecordQuery recordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList;
- return this;
- }
-
- /**
- * 璁剧疆 璁板綍ID
- * @param recordIdNotList
- */
- public CheckAttendRecordQuery recordIdNotList(List<Long> recordIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 璁板綍ID
+ * @param recordIdNotList
+ */
+ public CheckAttendRecordQuery recordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鍛樺伐ID
- * @param staffId
- */
+ * 璁剧疆 鍛樺伐ID
+ * @param staffId
+ */
public CheckAttendRecordQuery staffId(Long staffId){
- setStaffId(staffId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍛樺伐ID
- * @param staffIdStart
- */
+ setStaffId(staffId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍛樺伐ID
+ * @param staffIdStart
+ */
public CheckAttendRecordQuery staffIdStart(Long staffIdStart){
- this.staffIdStart = staffIdStart;
- return this;
+ this.staffIdStart = staffIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鍛樺伐ID
- * @param staffIdEnd
- */
+ * 璁剧疆 缁撴潫 鍛樺伐ID
+ * @param staffIdEnd
+ */
public CheckAttendRecordQuery staffIdEnd(Long staffIdEnd){
- this.staffIdEnd = staffIdEnd;
- return this;
+ this.staffIdEnd = staffIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鍛樺伐ID
- * @param staffIdIncrement
- */
+ * 璁剧疆 澧炲姞 鍛樺伐ID
+ * @param staffIdIncrement
+ */
public CheckAttendRecordQuery staffIdIncrement(Long staffIdIncrement){
- this.staffIdIncrement = staffIdIncrement;
- return this;
+ this.staffIdIncrement = staffIdIncrement;
+ return this;
}
/**
- * 璁剧疆 鍛樺伐ID
- * @param staffIdList
- */
+ * 璁剧疆 鍛樺伐ID
+ * @param staffIdList
+ */
public CheckAttendRecordQuery staffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList;
- return this;
- }
-
- /**
- * 璁剧疆 鍛樺伐ID
- * @param staffIdNotList
- */
- public CheckAttendRecordQuery staffIdNotList(List<Long> staffIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍛樺伐ID
+ * @param staffIdNotList
+ */
+ public CheckAttendRecordQuery staffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList;
return this;
- }
+ }
- /**
- * 璁剧疆 鍛樺伐濮撳悕
- * @param staffName
- */
+ /**
+ * 璁剧疆 鍛樺伐濮撳悕
+ * @param staffName
+ */
public CheckAttendRecordQuery staffName(String staffName){
setStaffName(staffName);
- return this;
+ return this;
}
/**
- * 璁剧疆 鍛樺伐濮撳悕
- * @param staffNameList
- */
+ * 璁剧疆 鍛樺伐濮撳悕
+ * @param staffNameList
+ */
public CheckAttendRecordQuery staffNameList(List<String> staffNameList){
this.staffNameList = staffNameList;
- return this;
+ return this;
}
- /**
- * 璁剧疆 宸ュ彿
- * @param workNum
- */
+ /**
+ * 璁剧疆 宸ュ彿
+ * @param workNum
+ */
public CheckAttendRecordQuery workNum(String workNum){
setWorkNum(workNum);
- return this;
+ return this;
}
/**
- * 璁剧疆 宸ュ彿
- * @param workNumList
- */
+ * 璁剧疆 宸ュ彿
+ * @param workNumList
+ */
public CheckAttendRecordQuery workNumList(List<String> workNumList){
this.workNumList = workNumList;
- return this;
+ return this;
}
/**
- * 璁剧疆 鎵€灞為儴闂�
- * @param deptId
- */
+ * 璁剧疆 鎵€灞為儴闂�
+ * @param deptId
+ */
public CheckAttendRecordQuery deptId(Long deptId){
- setDeptId(deptId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鎵€灞為儴闂�
- * @param deptIdStart
- */
+ setDeptId(deptId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鎵€灞為儴闂�
+ * @param deptIdStart
+ */
public CheckAttendRecordQuery deptIdStart(Long deptIdStart){
- this.deptIdStart = deptIdStart;
- return this;
+ this.deptIdStart = deptIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鎵€灞為儴闂�
- * @param deptIdEnd
- */
+ * 璁剧疆 缁撴潫 鎵€灞為儴闂�
+ * @param deptIdEnd
+ */
public CheckAttendRecordQuery deptIdEnd(Long deptIdEnd){
- this.deptIdEnd = deptIdEnd;
- return this;
+ this.deptIdEnd = deptIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鎵€灞為儴闂�
- * @param deptIdIncrement
- */
+ * 璁剧疆 澧炲姞 鎵€灞為儴闂�
+ * @param deptIdIncrement
+ */
public CheckAttendRecordQuery deptIdIncrement(Long deptIdIncrement){
- this.deptIdIncrement = deptIdIncrement;
- return this;
+ this.deptIdIncrement = deptIdIncrement;
+ return this;
}
/**
- * 璁剧疆 鎵€灞為儴闂�
- * @param deptIdList
- */
+ * 璁剧疆 鎵€灞為儴闂�
+ * @param deptIdList
+ */
public CheckAttendRecordQuery deptIdList(List<Long> deptIdList){
this.deptIdList = deptIdList;
- return this;
- }
-
- /**
- * 璁剧疆 鎵€灞為儴闂�
- * @param deptIdNotList
- */
- public CheckAttendRecordQuery deptIdNotList(List<Long> deptIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎵€灞為儴闂�
+ * @param deptIdNotList
+ */
+ public CheckAttendRecordQuery deptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
return this;
- }
+ }
- /**
- * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
- * @param deptName
- */
+ /**
+ * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
+ * @param deptName
+ */
public CheckAttendRecordQuery deptName(String deptName){
setDeptName(deptName);
- return this;
+ return this;
}
/**
- * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
- * @param deptNameList
- */
+ * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
+ * @param deptNameList
+ */
public CheckAttendRecordQuery deptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
- return this;
+ return this;
}
/**
- * 璁剧疆 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupId
- */
+ * 璁剧疆 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupId
+ */
public CheckAttendRecordQuery attendanceGroupId(Long attendanceGroupId){
- setAttendanceGroupId(attendanceGroupId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupIdStart
- */
+ setAttendanceGroupId(attendanceGroupId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupIdStart
+ */
public CheckAttendRecordQuery attendanceGroupIdStart(Long attendanceGroupIdStart){
- this.attendanceGroupIdStart = attendanceGroupIdStart;
- return this;
+ this.attendanceGroupIdStart = attendanceGroupIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupIdEnd
- */
+ * 璁剧疆 缁撴潫 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupIdEnd
+ */
public CheckAttendRecordQuery attendanceGroupIdEnd(Long attendanceGroupIdEnd){
- this.attendanceGroupIdEnd = attendanceGroupIdEnd;
- return this;
+ this.attendanceGroupIdEnd = attendanceGroupIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupIdIncrement
- */
+ * 璁剧疆 澧炲姞 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupIdIncrement
+ */
public CheckAttendRecordQuery attendanceGroupIdIncrement(Long attendanceGroupIdIncrement){
- this.attendanceGroupIdIncrement = attendanceGroupIdIncrement;
- return this;
+ this.attendanceGroupIdIncrement = attendanceGroupIdIncrement;
+ return this;
}
/**
- * 璁剧疆 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupIdList
- */
+ * 璁剧疆 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupIdList
+ */
public CheckAttendRecordQuery attendanceGroupIdList(List<Long> attendanceGroupIdList){
this.attendanceGroupIdList = attendanceGroupIdList;
- return this;
- }
-
- /**
- * 璁剧疆 鎵€灞炶€冨嫟缁処D
- * @param attendanceGroupIdNotList
- */
- public CheckAttendRecordQuery attendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎵€灞炶€冨嫟缁処D
+ * @param attendanceGroupIdNotList
+ */
+ public CheckAttendRecordQuery attendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){
this.attendanceGroupIdNotList = attendanceGroupIdNotList;
return this;
- }
+ }
- /**
- * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
- * @param attendanceGroupName
- */
+ /**
+ * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
+ * @param attendanceGroupName
+ */
public CheckAttendRecordQuery attendanceGroupName(String attendanceGroupName){
setAttendanceGroupName(attendanceGroupName);
- return this;
+ return this;
}
/**
- * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
- * @param attendanceGroupNameList
- */
+ * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
+ * @param attendanceGroupNameList
+ */
public CheckAttendRecordQuery attendanceGroupNameList(List<String> attendanceGroupNameList){
this.attendanceGroupNameList = attendanceGroupNameList;
- return this;
+ return this;
}
/**
- * 璁剧疆 缁╂晥瑙勫垯id
- * @param ruleId
- */
+ * 璁剧疆 缁╂晥瑙勫垯id
+ * @param ruleId
+ */
public CheckAttendRecordQuery ruleId(Long ruleId){
- setRuleId(ruleId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 缁╂晥瑙勫垯id
- * @param ruleIdStart
- */
+ setRuleId(ruleId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 缁╂晥瑙勫垯id
+ * @param ruleIdStart
+ */
public CheckAttendRecordQuery ruleIdStart(Long ruleIdStart){
- this.ruleIdStart = ruleIdStart;
- return this;
+ this.ruleIdStart = ruleIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 缁╂晥瑙勫垯id
- * @param ruleIdEnd
- */
+ * 璁剧疆 缁撴潫 缁╂晥瑙勫垯id
+ * @param ruleIdEnd
+ */
public CheckAttendRecordQuery ruleIdEnd(Long ruleIdEnd){
- this.ruleIdEnd = ruleIdEnd;
- return this;
+ this.ruleIdEnd = ruleIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 缁╂晥瑙勫垯id
- * @param ruleIdIncrement
- */
+ * 璁剧疆 澧炲姞 缁╂晥瑙勫垯id
+ * @param ruleIdIncrement
+ */
public CheckAttendRecordQuery ruleIdIncrement(Long ruleIdIncrement){
- this.ruleIdIncrement = ruleIdIncrement;
- return this;
+ this.ruleIdIncrement = ruleIdIncrement;
+ return this;
}
/**
- * 璁剧疆 缁╂晥瑙勫垯id
- * @param ruleIdList
- */
+ * 璁剧疆 缁╂晥瑙勫垯id
+ * @param ruleIdList
+ */
public CheckAttendRecordQuery ruleIdList(List<Long> ruleIdList){
this.ruleIdList = ruleIdList;
- return this;
- }
-
- /**
- * 璁剧疆 缁╂晥瑙勫垯id
- * @param ruleIdNotList
- */
- public CheckAttendRecordQuery ruleIdNotList(List<Long> ruleIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁╂晥瑙勫垯id
+ * @param ruleIdNotList
+ */
+ public CheckAttendRecordQuery ruleIdNotList(List<Long> ruleIdNotList){
this.ruleIdNotList = ruleIdNotList;
return this;
- }
+ }
- /**
- * 璁剧疆 瑙勫垯鍚嶇О
- * @param ruleName
- */
+ /**
+ * 璁剧疆 瑙勫垯鍚嶇О
+ * @param ruleName
+ */
public CheckAttendRecordQuery ruleName(String ruleName){
setRuleName(ruleName);
- return this;
+ return this;
}
/**
- * 璁剧疆 瑙勫垯鍚嶇О
- * @param ruleNameList
- */
+ * 璁剧疆 瑙勫垯鍚嶇О
+ * @param ruleNameList
+ */
public CheckAttendRecordQuery ruleNameList(List<String> ruleNameList){
this.ruleNameList = ruleNameList;
- return this;
+ return this;
}
/**
- * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddType
- */
+ * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddType
+ */
public CheckAttendRecordQuery subAddType(Integer subAddType){
- setSubAddType(subAddType);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddTypeStart
- */
+ setSubAddType(subAddType);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddTypeStart
+ */
public CheckAttendRecordQuery subAddTypeStart(Integer subAddTypeStart){
- this.subAddTypeStart = subAddTypeStart;
- return this;
+ this.subAddTypeStart = subAddTypeStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddTypeEnd
- */
+ * 璁剧疆 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddTypeEnd
+ */
public CheckAttendRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
- this.subAddTypeEnd = subAddTypeEnd;
- return this;
+ this.subAddTypeEnd = subAddTypeEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddTypeIncrement
- */
+ * 璁剧疆 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddTypeIncrement
+ */
public CheckAttendRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
- this.subAddTypeIncrement = subAddTypeIncrement;
- return this;
+ this.subAddTypeIncrement = subAddTypeIncrement;
+ return this;
}
/**
- * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddTypeList
- */
+ * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddTypeList
+ */
public CheckAttendRecordQuery subAddTypeList(List<Integer> subAddTypeList){
this.subAddTypeList = subAddTypeList;
- return this;
- }
-
- /**
- * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
- * @param subAddTypeNotList
- */
- public CheckAttendRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ * @param subAddTypeNotList
+ */
+ public CheckAttendRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
this.subAddTypeNotList = subAddTypeNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param score
- */
+ * 璁剧疆 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param score
+ */
public CheckAttendRecordQuery score(BigDecimal score){
- setScore(score);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param scoreStart
- */
+ setScore(score);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param scoreStart
+ */
public CheckAttendRecordQuery scoreStart(BigDecimal scoreStart){
- this.scoreStart = scoreStart;
- return this;
+ this.scoreStart = scoreStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param scoreEnd
- */
+ * 璁剧疆 缁撴潫 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param scoreEnd
+ */
public CheckAttendRecordQuery scoreEnd(BigDecimal scoreEnd){
- this.scoreEnd = scoreEnd;
- return this;
+ this.scoreEnd = scoreEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param scoreIncrement
- */
+ * 璁剧疆 澧炲姞 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param scoreIncrement
+ */
public CheckAttendRecordQuery scoreIncrement(BigDecimal scoreIncrement){
- this.scoreIncrement = scoreIncrement;
- return this;
+ this.scoreIncrement = scoreIncrement;
+ return this;
}
/**
- * 璁剧疆 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param scoreList
- */
+ * 璁剧疆 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param scoreList
+ */
public CheckAttendRecordQuery scoreList(List<BigDecimal> scoreList){
this.scoreList = scoreList;
- return this;
- }
-
- /**
- * 璁剧疆 鎵ｅ垎鎴栧鍔犲垎鍊�
- * @param scoreNotList
- */
- public CheckAttendRecordQuery scoreNotList(List<BigDecimal> scoreNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎵ｅ垎鎴栧鍔犲垎鍊�
+ * @param scoreNotList
+ */
+ public CheckAttendRecordQuery scoreNotList(List<BigDecimal> scoreNotList){
this.scoreNotList = scoreNotList;
return this;
- }
+ }
- /**
- * 璁剧疆 涓婁笅鐝椂闂�
- * @param goOffTimeStr
- */
+ /**
+ * 璁剧疆 涓婁笅鐝椂闂�
+ * @param goOffTimeStr
+ */
public CheckAttendRecordQuery goOffTimeStr(String goOffTimeStr){
setGoOffTimeStr(goOffTimeStr);
- return this;
+ return this;
}
/**
- * 璁剧疆 涓婁笅鐝椂闂�
- * @param goOffTimeStrList
- */
+ * 璁剧疆 涓婁笅鐝椂闂�
+ * @param goOffTimeStrList
+ */
public CheckAttendRecordQuery goOffTimeStrList(List<String> goOffTimeStrList){
this.goOffTimeStrList = goOffTimeStrList;
- return this;
+ return this;
}
- /**
- * 璁剧疆 寮傚父澶勭悊缁撴灉
- * @param errorResult
- */
+ /**
+ * 璁剧疆 寮傚父澶勭悊缁撴灉
+ * @param errorResult
+ */
public CheckAttendRecordQuery errorResult(String errorResult){
setErrorResult(errorResult);
- return this;
+ return this;
}
/**
- * 璁剧疆 寮傚父澶勭悊缁撴灉
- * @param errorResultList
- */
+ * 璁剧疆 寮傚父澶勭悊缁撴灉
+ * @param errorResultList
+ */
public CheckAttendRecordQuery errorResultList(List<String> errorResultList){
this.errorResultList = errorResultList;
- return this;
+ return this;
}
- /**
- * 璁剧疆 鏍告煡浜哄憳
- * @param checkPerson
- */
+ /**
+ * 璁剧疆 鏍告煡浜哄憳
+ * @param checkPerson
+ */
public CheckAttendRecordQuery checkPerson(String checkPerson){
setCheckPerson(checkPerson);
- return this;
+ return this;
}
/**
- * 璁剧疆 鏍告煡浜哄憳
- * @param checkPersonList
- */
+ * 璁剧疆 鏍告煡浜哄憳
+ * @param checkPersonList
+ */
public CheckAttendRecordQuery checkPersonList(List<String> checkPersonList){
this.checkPersonList = checkPersonList;
- return this;
+ return this;
}
- /**
- * 璁剧疆 鏍告煡璇存槑
- * @param checkDesc
- */
+ /**
+ * 璁剧疆 鏍告煡璇存槑
+ * @param checkDesc
+ */
public CheckAttendRecordQuery checkDesc(String checkDesc){
setCheckDesc(checkDesc);
- return this;
+ return this;
}
/**
- * 璁剧疆 鏍告煡璇存槑
- * @param checkDescList
- */
+ * 璁剧疆 鏍告煡璇存槑
+ * @param checkDescList
+ */
public CheckAttendRecordQuery checkDescList(List<String> checkDescList){
this.checkDescList = checkDescList;
- return this;
+ return this;
}
- /**
- * 璁剧疆 鏍告煡缁撴灉
- * @param checkResult
- */
+ /**
+ * 璁剧疆 鏍告煡缁撴灉
+ * @param checkResult
+ */
public CheckAttendRecordQuery checkResult(String checkResult){
setCheckResult(checkResult);
- return this;
+ return this;
}
/**
- * 璁剧疆 鏍告煡缁撴灉
- * @param checkResultList
- */
+ * 璁剧疆 鏍告煡缁撴灉
+ * @param checkResultList
+ */
public CheckAttendRecordQuery checkResultList(List<String> checkResultList){
this.checkResultList = checkResultList;
- return this;
+ return this;
}
/**
- * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatus
- */
+ * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatus
+ */
public CheckAttendRecordQuery checkStatus(Integer checkStatus){
- setCheckStatus(checkStatus);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatusStart
- */
+ setCheckStatus(checkStatus);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatusStart
+ */
public CheckAttendRecordQuery checkStatusStart(Integer checkStatusStart){
- this.checkStatusStart = checkStatusStart;
- return this;
+ this.checkStatusStart = checkStatusStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatusEnd
- */
+ * 璁剧疆 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatusEnd
+ */
public CheckAttendRecordQuery checkStatusEnd(Integer checkStatusEnd){
- this.checkStatusEnd = checkStatusEnd;
- return this;
+ this.checkStatusEnd = checkStatusEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatusIncrement
- */
+ * 璁剧疆 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatusIncrement
+ */
public CheckAttendRecordQuery checkStatusIncrement(Integer checkStatusIncrement){
- this.checkStatusIncrement = checkStatusIncrement;
- return this;
+ this.checkStatusIncrement = checkStatusIncrement;
+ return this;
}
/**
- * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatusList
- */
+ * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatusList
+ */
public CheckAttendRecordQuery checkStatusList(List<Integer> checkStatusList){
this.checkStatusList = checkStatusList;
- return this;
- }
-
- /**
- * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
- * @param checkStatusNotList
- */
- public CheckAttendRecordQuery checkStatusNotList(List<Integer> checkStatusNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+ * @param checkStatusNotList
+ */
+ public CheckAttendRecordQuery checkStatusNotList(List<Integer> checkStatusNotList){
this.checkStatusNotList = checkStatusNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
- * @param createUserId
- */
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserId
+ */
public CheckAttendRecordQuery createUserId(Long createUserId){
- setCreateUserId(createUserId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
- * @param createUserIdStart
- */
+ setCreateUserId(createUserId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @param createUserIdStart
+ */
public CheckAttendRecordQuery createUserIdStart(Long createUserIdStart){
- this.createUserIdStart = createUserIdStart;
- return this;
+ this.createUserIdStart = createUserIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
- * @param createUserIdEnd
- */
+ * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @param createUserIdEnd
+ */
public CheckAttendRecordQuery createUserIdEnd(Long createUserIdEnd){
- this.createUserIdEnd = createUserIdEnd;
- return this;
+ this.createUserIdEnd = createUserIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
- * @param createUserIdIncrement
- */
+ * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @param createUserIdIncrement
+ */
public CheckAttendRecordQuery createUserIdIncrement(Long createUserIdIncrement){
- this.createUserIdIncrement = createUserIdIncrement;
- return this;
+ this.createUserIdIncrement = createUserIdIncrement;
+ return this;
}
/**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
- * @param createUserIdList
- */
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdList
+ */
public CheckAttendRecordQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
- return this;
- }
-
- /**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
- * @param createUserIdNotList
- */
- public CheckAttendRecordQuery createUserIdNotList(List<Long> createUserIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdNotList
+ */
+ public CheckAttendRecordQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鏇存柊鐢ㄦ埛
- * @param updateUserId
- */
+ * 璁剧疆 鏇存柊鐢ㄦ埛
+ * @param updateUserId
+ */
public CheckAttendRecordQuery updateUserId(Long updateUserId){
- setUpdateUserId(updateUserId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
- * @param updateUserIdStart
- */
+ setUpdateUserId(updateUserId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
+ * @param updateUserIdStart
+ */
public CheckAttendRecordQuery updateUserIdStart(Long updateUserIdStart){
- this.updateUserIdStart = updateUserIdStart;
- return this;
+ this.updateUserIdStart = updateUserIdStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
- * @param updateUserIdEnd
- */
+ * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
+ * @param updateUserIdEnd
+ */
public CheckAttendRecordQuery updateUserIdEnd(Long updateUserIdEnd){
- this.updateUserIdEnd = updateUserIdEnd;
- return this;
+ this.updateUserIdEnd = updateUserIdEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
- * @param updateUserIdIncrement
- */
+ * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
+ * @param updateUserIdIncrement
+ */
public CheckAttendRecordQuery updateUserIdIncrement(Long updateUserIdIncrement){
- this.updateUserIdIncrement = updateUserIdIncrement;
- return this;
+ this.updateUserIdIncrement = updateUserIdIncrement;
+ return this;
}
/**
- * 璁剧疆 鏇存柊鐢ㄦ埛
- * @param updateUserIdList
- */
+ * 璁剧疆 鏇存柊鐢ㄦ埛
+ * @param updateUserIdList
+ */
public CheckAttendRecordQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
- return this;
- }
-
- /**
- * 璁剧疆 鏇存柊鐢ㄦ埛
- * @param updateUserIdNotList
- */
- public CheckAttendRecordQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏇存柊鐢ㄦ埛
+ * @param updateUserIdNotList
+ */
+ public CheckAttendRecordQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethod
- */
+ * 璁剧疆 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethod
+ */
public CheckAttendRecordQuery subMethod(Integer subMethod){
- setSubMethod(subMethod);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethodStart
- */
+ setSubMethod(subMethod);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethodStart
+ */
public CheckAttendRecordQuery subMethodStart(Integer subMethodStart){
- this.subMethodStart = subMethodStart;
- return this;
+ this.subMethodStart = subMethodStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethodEnd
- */
+ * 璁剧疆 缁撴潫 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethodEnd
+ */
public CheckAttendRecordQuery subMethodEnd(Integer subMethodEnd){
- this.subMethodEnd = subMethodEnd;
- return this;
+ this.subMethodEnd = subMethodEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethodIncrement
- */
+ * 璁剧疆 澧炲姞 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethodIncrement
+ */
public CheckAttendRecordQuery subMethodIncrement(Integer subMethodIncrement){
- this.subMethodIncrement = subMethodIncrement;
- return this;
+ this.subMethodIncrement = subMethodIncrement;
+ return this;
}
/**
- * 璁剧疆 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethodList
- */
+ * 璁剧疆 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethodList
+ */
public CheckAttendRecordQuery subMethodList(List<Integer> subMethodList){
this.subMethodList = subMethodList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ * @param subMethodNotList
+ */
+ public CheckAttendRecordQuery subMethodNotList(List<Integer> subMethodNotList){
+ this.subMethodNotList = subMethodNotList;
return this;
+ }
+
+
+ /**
+ * 璁剧疆 璇存槑
+ * @param remark
+ */
+ public CheckAttendRecordQuery remark(String remark){
+ setRemark(remark);
+ return this;
}
/**
- * 璁剧疆 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
- * @param subMethodNotList
- */
- public CheckAttendRecordQuery subMethodNotList(List<Integer> subMethodNotList){
- this.subMethodNotList = subMethodNotList;
- return this;
+ * 璁剧疆 璇存槑
+ * @param remarkList
+ */
+ public CheckAttendRecordQuery remarkList(List<String> remarkList){
+ this.remarkList = remarkList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public CheckAttendRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public CheckAttendRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public CheckAttendRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public CheckAttendRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
}
/**
- * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
- * @return orConditionList
- */
+ * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @return orConditionList
+ */
public List<CheckAttendRecordQuery> getOrConditionList(){
- return this.orConditionList;
+ return this.orConditionList;
}
/**
- * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
- * @param orConditionList
- */
+ * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @param orConditionList
+ */
public void setOrConditionList(List<CheckAttendRecordQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
- * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
- * @return andConditionList
- */
+ * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @return andConditionList
+ */
public List<CheckAttendRecordQuery> getAndConditionList(){
return this.andConditionList;
}
/**
- * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
- * @param andConditionList
- */
+ * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @param andConditionList
+ */
public void setAndConditionList(List<CheckAttendRecordQuery> andConditionList){
this.andConditionList = andConditionList;
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java
index 8fd1b4686f570b3c568c4509d251a580f2462d30..c9dcb2815df811277048559f83849dada49c646e 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 璇勪环缁╂晥鎶曡瘔鏍告煡淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckComplainRecordEntity extends CheckComplainRecordVo {
@@ -29,14 +29,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/**
* 鍛樺伐濮撳悕
*/
+ @Excel(name = "鍛樺伐濮撳悕")
private String staffName;
/**
* 宸ュ彿
*/
+ @Excel(name = "宸ュ彿")
private String workNum;
/**
* 绐楀彛缂栧彿
*/
+ @Excel(name = "绐楀彛缂栧彿")
private String windowNum;
/**
* 鎵€灞為儴闂�
@@ -45,14 +48,17 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/**
* 鎵€灞為儴闂ㄥ悕绉�
*/
+ @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
private String deptName;
/**
* 鎶曡瘔鏍囬
*/
+ @Excel(name = "鎶曡瘔鏍囬")
private String complainTitle;
/**
* 鎶曡瘔鍐呭
*/
+ @Excel(name = "鎶曡瘔鍐呭")
private String complainContent;
/**
* 鎶曡瘔浜虹湡瀹炲鍚�
@@ -61,6 +67,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/**
* 鑱旂郴鐢佃瘽
*/
+ @Excel(name = "鑱旂郴鐢佃瘽")
private String contact;
/**
* 鎶曡瘔鏃堕棿
@@ -89,6 +96,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/**
* 鎵ｅ垎浜哄憳
*/
+ @Excel(name = "鎵ｅ垎浜哄憳")
private String deductPerson;
/**
* 鎵ｅ垎鏃堕棿
@@ -101,6 +109,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/**
* 鏍告煡浜哄憳
*/
+ @Excel(name = "鏍告煡浜哄憳")
private String checkPerson;
/**
* 鏍告煡鏃堕棿
@@ -109,10 +118,12 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
/**
* 鏍告煡璇存槑
*/
+ @Excel(name = "鏍告煡璇存槑")
private String checkDesc;
/**
* 鏍告煡缁撴灉
*/
+ @Excel(name = "鏍告煡缁撴灉")
private String checkResult;
/**
* 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
@@ -122,6 +133,16 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -191,5 +212,9 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
this.checkStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordQuery.java
index 6bdca2238cf28194f0418b9be90edee4765f6806..6317d7cea4243ebcf717a88ad47fabb903c2b4b3 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
* 璇勪环缁╂晥鎶曡瘔鏍告煡淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -271,6 +271,16 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckComplainRecordQuery> orConditionList;
@@ -1761,6 +1771,70 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2610,6 +2684,44 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public CheckComplainRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public CheckComplainRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public CheckComplainRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public CheckComplainRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java
index 9dbd6306f3a2dbca757e28e4339ca813067e75b9..49432ee48b4f23560b84aee2b35cfbbafd94f1c5 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 鏁堣兘缁╂晥鏍告煡淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckEffectRecordEntity extends CheckEffectRecordVo {
@@ -29,14 +29,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/**
* 鍛樺伐濮撳悕
*/
+ @Excel(name = "鍛樺伐濮撳悕")
private String staffName;
/**
* 宸ュ彿
*/
+ @Excel(name = "宸ュ彿")
private String workNum;
/**
* 绐楀彛缂栧彿
*/
+ @Excel(name = "绐楀彛缂栧彿")
private String windowNum;
/**
* 鎵€灞為儴闂�
@@ -45,14 +48,17 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/**
* 鎵€灞為儴闂ㄥ悕绉�
*/
+ @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
private String deptName;
/**
* 杩濊绫诲瀷(1.鑴卞矖,2.绂诲矖,3.鐜╂墜鏈�,4.鐫¤)
*/
+ @Excel(name = "杩濊绫诲瀷", readConverterExp = "1=鑴卞矖,2.绂诲矖,3.鐜╂墜鏈�,4.鐫¤")
private Integer irregularType;
/**
* 鍙戠敓鏃堕棿
*/
+ @Excel(name = "鍙戠敓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime;
/**
* 鎸佺画鏃堕棿锛岀
@@ -81,6 +87,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/**
* 鎵ｅ垎浜哄憳
*/
+ @Excel(name = "鎵ｅ垎浜哄憳")
private String deductPerson;
/**
* 鎵ｅ垎鏃堕棿
@@ -93,6 +100,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/**
* 鏍告煡浜哄憳
*/
+ @Excel(name = "鏍告煡浜哄憳")
private String checkPerson;
/**
* 鏍告煡鏃堕棿
@@ -101,10 +109,12 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
/**
* 鏍告煡璇存槑
*/
+ @Excel(name = "鏍告煡璇存槑")
private String checkDesc;
/**
* 鏍告煡缁撴灉
*/
+ @Excel(name = "鏍告煡缁撴灉")
private String checkResult;
/**
* 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
@@ -114,6 +124,16 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -179,5 +199,9 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
this.checkStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordQuery.java
index d6c3d43fba4b833dd36acf36036f95f8c943df67..69ec6bc7fe6fca29a666db8dcfa2a8748482afd5 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
* 鏁堣兘缁╂晥鏍告煡淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -282,6 +282,16 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckEffectRecordQuery> orConditionList;
@@ -1806,6 +1816,70 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2669,6 +2743,44 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public CheckEffectRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public CheckEffectRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public CheckEffectRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public CheckEffectRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java
index 80d436c4432158a2d970fc09b394ac78bd6c1287..5d9f931e2faa8291593e1c6aa188f9287ef9ab26 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 鍔炰欢缁╂晥鏍告煡淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
@@ -29,6 +29,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/**
* 鍛樺伐濮撳悕
*/
+ @Excel(name = "鍛樺伐濮撳悕")
private String staffName;
/**
* 宸ュ彿
@@ -37,6 +38,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/**
* 绐楀彛缂栧彿
*/
+ @Excel(name = "绐楀彛缂栧彿")
private String windowNum;
/**
* 鎵€灞為儴闂�
@@ -45,22 +47,27 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/**
* 鎵€灞為儴闂ㄥ悕绉�
*/
+ @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
private String deptName;
/**
* 鍔炰欢缂栫爜
*/
+ @Excel(name = "鍔炰欢缂栫爜")
private String goworkCode;
/**
* 鍔炰欢鎵€灞為儴闂�
*/
+ @Excel(name = "鍔炰欢鎵€灞為儴闂�")
private String goworkDepts;
/**
* 浜嬮」鍚嶇О
*/
+ @Excel(name = "浜嬮」鍚嶇О")
private String matterlName;
/**
* 鍔炵悊鏃堕棿
*/
+ @Excel(name = "鍔炵悊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime;
/**
* 缁╂晥瑙勫垯id
@@ -69,6 +76,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/**
* 瑙勫垯鍚嶇О
*/
+ @Excel(name = "瑙勫垯鍚嶇О")
private String ruleName;
/**
* 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞)
@@ -77,6 +85,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/**
* 鎵ｅ垎浜哄憳
*/
+ @Excel(name = "鎵ｅ垎浜哄憳")
private String deductPerson;
/**
* 鎵ｅ垎鏃堕棿
@@ -85,10 +94,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/**
* 鎵ｅ垎鎴栧鍔犲垎鍊�
*/
+ @Excel(name = "鎵ｅ垎鎴栧鍔犲垎鍊�")
private BigDecimal score;
/**
* 鏍告煡浜哄憳
*/
+ @Excel(name = "鏍告煡浜哄憳")
private String checkPerson;
/**
* 鏍告煡鏃堕棿
@@ -97,10 +108,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/**
* 鏍告煡璇存槑
*/
+ @Excel(name = "鏍告煡璇存槑")
private String checkDesc;
/**
* 鏍告煡缁撴灉
*/
+ @Excel(name = "鏍告煡缁撴灉")
private String checkResult;
/**
* 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
@@ -110,6 +123,16 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -173,5 +196,9 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
this.checkStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordQuery.java
index 7a625efa089c4ac0256886d8c2938d51bc427bd7..a31d5d84d5ea6eb44c5c31d2340f31b9b3f678be 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
* 鍔炰欢缁╂晥鏍告煡淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -256,6 +256,16 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckGoworkRecordQuery> orConditionList;
@@ -1650,6 +1660,70 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2442,6 +2516,44 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public CheckGoworkRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public CheckGoworkRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public CheckGoworkRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public CheckGoworkRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java
index ceb7819652768d55df2033c0039625b775c0be5b..69c8657cd6f6766e2774727de89229aa8235f231 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 鍏跺畠缁╂晥鏍告煡淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckOtherRecordEntity extends CheckOtherRecordVo {
@@ -89,6 +89,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
/**
* 鏍告煡浜哄憳
*/
+ @Excel(name = "鏍告煡浜哄憳")
private String checkPerson;
/**
* 鏍告煡鏃堕棿
@@ -97,10 +98,12 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
/**
* 鏍告煡璇存槑
*/
+ @Excel(name = "鏍告煡璇存槑")
private String checkDesc;
/**
* 鏍告煡缁撴灉
*/
+ @Excel(name = "鏍告煡缁撴灉")
private String checkResult;
/**
* 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
@@ -110,6 +113,16 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -173,5 +186,9 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
this.checkStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordQuery.java
index 26c4de82040dc855f418d70fb18e043a7245c361..b59aca795367dc78e3e4e3e91306b577aece6051 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
* 鍏跺畠缁╂晥鏍告煡淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -276,6 +276,16 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckOtherRecordQuery> orConditionList;
@@ -1768,6 +1778,70 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2630,6 +2704,44 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public CheckOtherRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public CheckOtherRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public CheckOtherRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public CheckOtherRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java
index fe9ffb843c3951e0b3c5d0bc7aef935f413e9892..b760687b1cd60e8380db0122c79c375916e2773a 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 璇勪环宸瘎缁╂晥鏍告煡淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckReviewRecordEntity extends CheckReviewRecordVo {
@@ -29,14 +29,17 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/**
* 鍛樺伐濮撳悕
*/
+ @Excel(name = "鍛樺伐濮撳悕")
private String staffName;
/**
* 宸ュ彿
*/
+ @Excel(name = "宸ュ彿")
private String workNum;
/**
* 绐楀彛缂栧彿
*/
+ @Excel(name = "绐楀彛缂栧彿")
private String windowNum;
/**
* 鎵€灞為儴闂�
@@ -57,6 +60,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/**
* 璇勪环鏉ユ簮(绐楀彛璇勪环绯荤粺,瀵艰绯荤粺,鑷姪鏈嶅姟绯荤粺,寰畼缃�,鍏跺畠)
*/
+ @Excel(name = "璇勪环鏉ユ簮", readConverterExp = "璇勪环鏉ユ簮(绐楀彛璇勪环绯荤粺,瀵艰绯荤粺,鑷姪鏈嶅姟绯荤粺,寰畼缃�,鍏跺畠)")
private String reviewSource;
/**
* 璇勪环璁惧
@@ -69,6 +73,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/**
* 瑙勫垯鍚嶇О
*/
+ @Excel(name = "瑙勫垯鍚嶇О")
private String ruleName;
/**
* 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞)
@@ -77,6 +82,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/**
* 鎵ｅ垎浜哄憳
*/
+ @Excel(name = "鎵ｅ垎浜哄憳")
private String deductPerson;
/**
* 鎵ｅ垎鏃堕棿
@@ -85,10 +91,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/**
* 鎵ｅ垎鎴栧鍔犲垎鍊�
*/
+ @Excel(name = "鎵ｅ垎鎴栧鍔犲垎鍊�")
private BigDecimal score;
/**
* 鏍告煡浜哄憳
*/
+ @Excel(name = "鏍告煡浜哄憳")
private String checkPerson;
/**
* 鏍告煡鏃堕棿
@@ -97,10 +105,12 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/**
* 鏍告煡璇存槑
*/
+ @Excel(name = "鏍告煡璇存槑")
private String checkDesc;
/**
* 鏍告煡缁撴灉
*/
+ @Excel(name = "鏍告煡缁撴灉")
private String checkResult;
/**
* 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
@@ -110,6 +120,16 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -173,5 +193,9 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
this.checkStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordQuery.java
index cae0cf166ff04b040fd52f84a76d70be63fde5e7..47c49ca19b78ae5400204b9751b98b5d664b7776 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
* 璇勪环宸瘎缁╂晥鏍告煡淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -266,6 +266,16 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckReviewRecordQuery> orConditionList;
@@ -1709,6 +1719,70 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2536,6 +2610,44 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public CheckReviewRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public CheckReviewRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public CheckReviewRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public CheckReviewRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
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
new file mode 100644
index 0000000000000000000000000000000000000000..bfb2239b8d18cfc472c84dfb0583759ab0e91f70
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java
@@ -0,0 +1,72 @@
+package com.mortals.xhx.module.check.model.vo;
+
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鍏ㄩ儴绫诲瀷鏍告煡淇℃伅瑙嗗浘瀵硅薄
+ */
+@Data
+public class CheckAllRecordVo extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 璁板綍ID
+ */
+ private Long recordId;
+ /**
+ * 鍛樺伐ID
+ */
+ private Long staffId;
+ /**
+ * 鍛樺伐濮撳悕
+ */
+ private String staffName;
+ /**
+ * 宸ュ彿
+ */
+ private String workNum;
+ /**
+ * 鎵€灞為儴闂�
+ */
+ private Long deptId;
+ /**
+ * 鎵€灞為儴闂ㄥ悕绉�
+ */
+ private String deptName;
+ /**
+ * 缁╂晥瑙勫垯id
+ */
+ private Long ruleId;
+ /**
+ * 瑙勫垯鍚嶇О
+ */
+ private String ruleName;
+ /**
+ * 澧炲噺绫诲瀷(1.澧炲姞,2.鎵ｉ櫎)
+ */
+ private Integer subAddType;
+ /**
+ * 鎵ｅ垎鎴栧鍔犲垎鍊�
+ */
+ private BigDecimal score;
+ /**
+ * 鏍告煡鏃堕棿
+ */
+ private Date checkTime;
+ /**
+ * 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+ */
+ private Integer subMethod;
+ /**
+ * 鎵ｅ垎鏃堕棿
+ */
+ private Date deductTime;
+ /**
+ * 鏍告煡绫诲瀷(1.鑰冨嫟缁╂晥,2.鏁堣兘缁╂晥,3.璇勪环缁╂晥,4.鍔炰欢缁╂晥,5.璇勪环宸瘎缁╂晥,6.鍏跺畠缁╂晥)
+ */
+ private Integer checkType;
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java
index 70e7962a2b6b992508ccce122ca1e81b7a412439..9cbd2a93ddd491e8cf704a8297f0fa168b54555f 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java
@@ -1,34 +1,19 @@
package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckAttendRecordVo extends BaseEntityLong {
- /**
- * 鏍告煡浜哄憳
- */
- @Excel(name = "鏍告煡浜哄憳")
- private String checkPerson;
- /**
- * 鏍告煡璇存槑
- */
- @Excel(name = "鏍告煡璇存槑")
- private String checkDesc;
- /**
- * 鏍告煡缁撴灉
- */
- @Excel(name = "鏍告煡缁撴灉")
- private String checkResult;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java
index 9a6584c1fd969b50b33c06b7f46629a7675edf6c..109c55981fc3eaf4768765514e6b9ffa2b13b17f 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java
@@ -1,74 +1,19 @@
package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 璇勪环缁╂晥鎶曡瘔鏍告煡淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckComplainRecordVo extends BaseEntityLong {
- /**
- * 鍛樺伐濮撳悕
- */
- @Excel(name = "鍛樺伐濮撳悕")
- private String staffName;
- /**
- * 宸ュ彿
- */
- @Excel(name = "宸ュ彿")
- private String workNum;
- /**
- * 绐楀彛缂栧彿
- */
- @Excel(name = "绐楀彛缂栧彿")
- private String windowNum;
- /**
- * 鎵€灞為儴闂ㄥ悕绉�
- */
- @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
- private String deptName;
- /**
- * 鎶曡瘔鏍囬
- */
- @Excel(name = "鎶曡瘔鏍囬")
- private String complainTitle;
- /**
- * 鎶曡瘔鍐呭
- */
- @Excel(name = "鎶曡瘔鍐呭")
- private String complainContent;
- /**
- * 鑱旂郴鐢佃瘽
- */
- @Excel(name = "鑱旂郴鐢佃瘽")
- private String contact;
- /**
- * 鎵ｅ垎浜哄憳
- */
- @Excel(name = "鎵ｅ垎浜哄憳")
- private String deductPerson;
- /**
- * 鏍告煡浜哄憳
- */
- @Excel(name = "鏍告煡浜哄憳")
- private String checkPerson;
- /**
- * 鏍告煡璇存槑
- */
- @Excel(name = "鏍告煡璇存槑")
- private String checkDesc;
- /**
- * 鏍告煡缁撴灉
- */
- @Excel(name = "鏍告煡缁撴灉")
- private String checkResult;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
index c39bc92514f3eb8efb54d66dc09a1e4cf84ee6fd..857fc306783b3d81d2c237339201e2d9deade7c4 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
@@ -1,70 +1,19 @@
package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鏁堣兘缁╂晥鏍告煡淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckEffectRecordVo extends BaseEntityLong {
- /**
- * 鍛樺伐濮撳悕
- */
- @Excel(name = "鍛樺伐濮撳悕")
- private String staffName;
- /**
- * 宸ュ彿
- */
- @Excel(name = "宸ュ彿")
- private String workNum;
- /**
- * 绐楀彛缂栧彿
- */
- @Excel(name = "绐楀彛缂栧彿")
- private String windowNum;
- /**
- * 鎵€灞為儴闂ㄥ悕绉�
- */
- @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
- private String deptName;
- /**
- * 杩濊绫诲瀷(1.鑴卞矖,2.绂诲矖,3.鐜╂墜鏈�,4.鐫¤)
- */
- @Excel(name = "杩濊绫诲瀷", readConverterExp = "1=鑴卞矖,2.绂诲矖,3.鐜╂墜鏈�,4.鐫¤")
- private Integer irregularType;
- /**
- * 鍙戠敓鏃堕棿
- */
- @Excel(name = "鍙戠敓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
- private Date happenTime;
- /**
- * 鎵ｅ垎浜哄憳
- */
- @Excel(name = "鎵ｅ垎浜哄憳")
- private String deductPerson;
- /**
- * 鏍告煡浜哄憳
- */
- @Excel(name = "鏍告煡浜哄憳")
- private String checkPerson;
- /**
- * 鏍告煡璇存槑
- */
- @Excel(name = "鏍告煡璇存槑")
- private String checkDesc;
- /**
- * 鏍告煡缁撴灉
- */
- @Excel(name = "鏍告煡缁撴灉")
- private String checkResult;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
index 9c8e2a0ee473a1af941009e601e415ed8a1dbc50..b7e6aae4931229201e4307083072b4f1ce4ac086 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
@@ -1,87 +1,19 @@
package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
-
-import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鍔炰欢缁╂晥鏍告煡淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckGoworkRecordVo extends BaseEntityLong {
- /**
- * 鍛樺伐濮撳悕
- */
- @Excel(name = "鍛樺伐濮撳悕")
- private String staffName;
- /**
- * 绐楀彛缂栧彿
- */
- @Excel(name = "绐楀彛缂栧彿")
- private String windowNum;
- /**
- * 鎵€灞為儴闂ㄥ悕绉�
- */
- @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
- private String deptName;
- /**
- * 鍔炰欢缂栫爜
- */
- @Excel(name = "鍔炰欢缂栫爜")
- private String goworkCode;
- /**
- * 鍔炰欢鎵€灞為儴闂�
- */
- @Excel(name = "鍔炰欢鎵€灞為儴闂�")
- private String goworkDepts;
- /**
- * 浜嬮」鍚嶇О
- */
- @Excel(name = "浜嬮」鍚嶇О")
- private String matterlName;
- /**
- * 鍔炵悊鏃堕棿
- */
- @Excel(name = "鍔炵悊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
- private Date goworkTime;
- /**
- * 瑙勫垯鍚嶇О
- */
- @Excel(name = "瑙勫垯鍚嶇О")
- private String ruleName;
- /**
- * 鎵ｅ垎浜哄憳
- */
- @Excel(name = "鎵ｅ垎浜哄憳")
- private String deductPerson;
- /**
- * 鎵ｅ垎鎴栧鍔犲垎鍊�
- */
- @Excel(name = "鎵ｅ垎鎴栧鍔犲垎鍊�")
- private BigDecimal score;
- /**
- * 鏍告煡浜哄憳
- */
- @Excel(name = "鏍告煡浜哄憳")
- private String checkPerson;
- /**
- * 鏍告煡璇存槑
- */
- @Excel(name = "鏍告煡璇存槑")
- private String checkDesc;
- /**
- * 鏍告煡缁撴灉
- */
- @Excel(name = "鏍告煡缁撴灉")
- private String checkResult;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java
index 0b194a9e95ad442099989b2753da1f756848bb74..b739cfe12c42784c6c0849e7c7b179aaf6e3c19f 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java
@@ -1,34 +1,19 @@
package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鍏跺畠缁╂晥鏍告煡淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckOtherRecordVo extends BaseEntityLong {
- /**
- * 鏍告煡浜哄憳
- */
- @Excel(name = "鏍告煡浜哄憳")
- private String checkPerson;
- /**
- * 鏍告煡璇存槑
- */
- @Excel(name = "鏍告煡璇存槑")
- private String checkDesc;
- /**
- * 鏍告煡缁撴灉
- */
- @Excel(name = "鏍告煡缁撴灉")
- private String checkResult;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java
index 8459fe5385e5c63cbb3d49932a07cedd8f43d537..2dbf40ababe9aec178d21d843fb9a5e119317db2 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java
@@ -1,71 +1,19 @@
package com.mortals.xhx.module.check.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
-
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 璇勪环宸瘎缁╂晥鏍告煡淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class CheckReviewRecordVo extends BaseEntityLong {
- /**
- * 鍛樺伐濮撳悕
- */
- @Excel(name = "鍛樺伐濮撳悕")
- private String staffName;
- /**
- * 宸ュ彿
- */
- @Excel(name = "宸ュ彿")
- private String workNum;
- /**
- * 绐楀彛缂栧彿
- */
- @Excel(name = "绐楀彛缂栧彿")
- private String windowNum;
- /**
- * 璇勪环鏉ユ簮(绐楀彛璇勪环绯荤粺,瀵艰绯荤粺,鑷姪鏈嶅姟绯荤粺,寰畼缃�,鍏跺畠)
- */
- @Excel(name = "璇勪环鏉ユ簮", readConverterExp = "璇勪环鏉ユ簮(绐楀彛璇勪环绯荤粺,瀵艰绯荤粺,鑷姪鏈嶅姟绯荤粺,寰畼缃�,鍏跺畠)")
- private String reviewSource;
- /**
- * 瑙勫垯鍚嶇О
- */
- @Excel(name = "瑙勫垯鍚嶇О")
- private String ruleName;
- /**
- * 鎵ｅ垎浜哄憳
- */
- @Excel(name = "鎵ｅ垎浜哄憳")
- private String deductPerson;
- /**
- * 鎵ｅ垎鎴栧鍔犲垎鍊�
- */
- @Excel(name = "鎵ｅ垎鎴栧鍔犲垎鍊�")
- private BigDecimal score;
- /**
- * 鏍告煡浜哄憳
- */
- @Excel(name = "鏍告煡浜哄憳")
- private String checkPerson;
- /**
- * 鏍告煡璇存槑
- */
- @Excel(name = "鏍告煡璇存槑")
- private String checkDesc;
- /**
- * 鏍告煡缁撴灉
- */
- @Excel(name = "鏍告煡缁撴灉")
- private String checkResult;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckAllRecordService.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckAllRecordService.java
new file mode 100644
index 0000000000000000000000000000000000000000..514fae2f72009cd88efca629585e62c733cbf679
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckAllRecordService.java
@@ -0,0 +1,14 @@
+package com.mortals.xhx.module.check.service;
+
+import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
+
+import java.util.List;
+
+/**
+ * 鍏ㄩ儴绫诲瀷鏍告煡淇℃伅Dao
+ */
+public interface CheckAllRecordService {
+
+ List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query);
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAllRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAllRecordServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..94b802d949a4a901141fef122eb7c7f786e52fa5
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAllRecordServiceImpl.java
@@ -0,0 +1,24 @@
+package com.mortals.xhx.module.check.service.impl;
+
+import com.mortals.xhx.module.check.dao.CheckAllRecordDao;
+import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
+import com.mortals.xhx.module.check.service.CheckAllRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("checkAllRecordService")
+@Slf4j
+public class CheckAllRecordServiceImpl implements CheckAllRecordService {
+
+ @Autowired
+ private CheckAllRecordDao checkAllRecordDao;
+
+ @Override
+ public List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query) {
+ return checkAllRecordDao.getAllCheckRecord(query);
+ }
+}
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
new file mode 100644
index 0000000000000000000000000000000000000000..6a89dbf73210a4e366c539e74e4d1c4944d2fbe7
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAllRecordController.java
@@ -0,0 +1,73 @@
+package com.mortals.xhx.module.check.web;
+
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
+import com.mortals.xhx.module.check.model.CheckAllRecordQuery;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
+import com.mortals.xhx.module.check.service.CheckAllRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鍏ㄩ儴绫诲瀷鏍告煡淇℃伅Dao
+ */
+@RestController
+@RequestMapping("check/all/record")
+public class CheckAllRecordController extends BaseJsonBodyController {
+
+ @Autowired
+ private CheckAllRecordService checkAllRecordService;
+
+ protected void init(Map<String, Object> model, Context context) {
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+ }
+
+ @PostMapping({"list"})
+ @UnAuth
+ public Rest<Object> list(@RequestBody CheckAllRecordQuery query) {
+ Rest<Object> ret = new Rest();
+ Map<String, Object> model = new HashMap();
+ Context context = this.getContext();
+ String busiDesc = "鏌ヨ鎵€浠ョ被鍨嬬哗鏁堟牳鏌ヤ俊鎭�";
+
+ int code=1;
+ try {
+
+ List<CheckAllRecordVo> result = checkAllRecordService.getAllCheckRecord(query);
+
+ model.put("data", result);
+
+ model.put("message_info", busiDesc + "鎴愬姛");
+ if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
+ this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
+ }
+ } catch (Exception var9) {
+ code = -1;
+ this.doException(this.request, busiDesc, model, var9);
+ }
+
+ this.init(model, context);
+ ret.setCode(code);
+ ret.setData(model);
+ ret.setDict(model.get("dict"));
+ ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+ return ret;
+ }
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordEntity.java
index e7a9f034483afc51379486dae570c232aafd19d6..3a13c600ea9cf3300f9d150b61db8c66b3bd745e 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 鑰冨嫟缁╂晥璁板綍淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformAttendRecordEntity extends PerformAttendRecordVo {
@@ -81,6 +81,7 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
/**
* 鎵ｅ垎浜哄憳
*/
+ @Excel(name = "鎵ｅ垎浜哄憳")
private String deductPerson;
/**
* 鎵ｅ垎鏃堕棿
@@ -102,6 +103,16 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -161,5 +172,9 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
this.processStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordQuery.java
index f4f78849e1890f3049e4b586579b4b1da1ff4249..5064e618f47f50405557c103c64a117128d7e681 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
* 鑰冨嫟缁╂晥璁板綍淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -257,6 +257,16 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformAttendRecordQuery> orConditionList;
@@ -1636,6 +1646,70 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2407,6 +2481,44 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public PerformAttendRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public PerformAttendRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public PerformAttendRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public PerformAttendRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordEntity.java
index c510f978fbb3cdf0fd118e12eb964a0e3b6d325d..dfe17aaccf917f19d0321d74337c48d056fb4aca 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 璇勪环缁╂晥鎶曡瘔璁板綍淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformComplainRecordEntity extends PerformComplainRecordVo {
@@ -25,14 +25,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/**
* 鍛樺伐濮撳悕
*/
+ @Excel(name = "鍛樺伐濮撳悕")
private String staffName;
/**
* 宸ュ彿
*/
+ @Excel(name = "宸ュ彿")
private String workNum;
/**
* 绐楀彛缂栧彿
*/
+ @Excel(name = "绐楀彛缂栧彿")
private String windowNum;
/**
* 鎵€灞為儴闂�
@@ -41,14 +44,17 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/**
* 鎵€灞為儴闂ㄥ悕绉�
*/
+ @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
private String deptName;
/**
* 鎶曡瘔鏍囬
*/
+ @Excel(name = "鎶曡瘔鏍囬")
private String complainTitle;
/**
* 鎶曡瘔鍐呭
*/
+ @Excel(name = "鎶曡瘔鍐呭")
private String complainContent;
/**
* 鎶曡瘔浜虹湡瀹炲鍚�
@@ -57,6 +63,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/**
* 鑱旂郴鐢佃瘽
*/
+ @Excel(name = "鑱旂郴鐢佃瘽")
private String contact;
/**
* 鎶曡瘔鏃堕棿
@@ -85,6 +92,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/**
* 鎵ｅ垎浜哄憳
*/
+ @Excel(name = "鎵ｅ垎浜哄憳")
private String deductPerson;
/**
* 鎵ｅ垎鏃堕棿
@@ -97,11 +105,22 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
/**
* 澶勭悊鐘舵€�(1.鏈牳鏌�,2.宸叉牳鏌�)
*/
+ @Excel(name = "澶勭悊鐘舵€�", readConverterExp = "1=鏈牳鏌�,2.宸叉牳鏌�")
private Integer processStatus;
/**
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -161,5 +180,9 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
this.processStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordQuery.java
index 1cd3d9afcf671bfc83c9e3a3bf989c6770534830..5bdd9542d3f033090de99ac473a7154ea5817546 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
* 璇勪环缁╂晥鎶曡瘔璁板綍淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -235,6 +235,16 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformComplainRecordQuery> orConditionList;
@@ -1516,6 +1526,70 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2253,6 +2327,44 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public PerformComplainRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public PerformComplainRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public PerformComplainRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public PerformComplainRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordEntity.java
index 674334b2d6e35767345006b6ce8ede2f93baa60f..b7cdc54ae10c784df30346871fe549eb790258ee 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 鏁堣兘缁╂晥璁板綍淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformEffectRecordEntity extends PerformEffectRecordVo {
@@ -25,14 +25,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/**
* 鍛樺伐濮撳悕
*/
+ @Excel(name = "鍛樺伐濮撳悕")
private String staffName;
/**
* 宸ュ彿
*/
+ @Excel(name = "宸ュ彿")
private String workNum;
/**
* 绐楀彛缂栧彿
*/
+ @Excel(name = "绐楀彛缂栧彿")
private String windowNum;
/**
* 鎵€灞為儴闂�
@@ -41,14 +44,17 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/**
* 鎵€灞為儴闂ㄥ悕绉�
*/
+ @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
private String deptName;
/**
* 杩濊绫诲瀷(1.鑴卞矖,2.绂诲矖,3.鐜╂墜鏈�,4.鐫¤)
*/
+ @Excel(name = "杩濊绫诲瀷", readConverterExp = "1=鑴卞矖,2.绂诲矖,3.鐜╂墜鏈�,4.鐫¤")
private Integer irregularType;
/**
* 鍙戠敓鏃堕棿
*/
+ @Excel(name = "鍙戠敓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime;
/**
* 鎸佺画鏃堕棿锛岀
@@ -77,6 +83,7 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/**
* 鎵ｅ垎浜哄憳
*/
+ @Excel(name = "鎵ｅ垎浜哄憳")
private String deductPerson;
/**
* 鎵ｅ垎鏃堕棿
@@ -89,11 +96,22 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
/**
* 澶勭悊鐘舵€�(1.鏈牳鏌�,2.宸叉牳鏌�)
*/
+ @Excel(name = "澶勭悊鐘舵€�", readConverterExp = "1=鏈牳鏌�,2.宸叉牳鏌�")
private Integer processStatus;
/**
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -149,5 +167,9 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
this.processStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordQuery.java
index d743fdb65f447d6d013aaf0a355f04b3045a5be6..c71d4b4c4e5c2d8f777f4a871663510b70461411 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
* 鏁堣兘缁╂晥璁板綍淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -246,6 +246,16 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformEffectRecordQuery> orConditionList;
@@ -1561,6 +1571,70 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2312,6 +2386,44 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public PerformEffectRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public PerformEffectRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public PerformEffectRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public PerformEffectRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordEntity.java
index 551417efcbeae4a9368df9047e70e9a40b3ac2ef..b065879c1bb4f878d7d5ee590b2734f803945c6b 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 鍔炰欢缁╂晥璁板綍淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
@@ -25,6 +25,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/**
* 鍛樺伐濮撳悕
*/
+ @Excel(name = "鍛樺伐濮撳悕")
private String staffName;
/**
* 宸ュ彿
@@ -33,6 +34,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/**
* 绐楀彛缂栧彿
*/
+ @Excel(name = "绐楀彛缂栧彿")
private String windowNum;
/**
* 鎵€灞為儴闂�
@@ -41,22 +43,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/**
* 鎵€灞為儴闂ㄥ悕绉�
*/
+ @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
private String deptName;
/**
* 鍔炰欢缂栫爜
*/
+ @Excel(name = "鍔炰欢缂栫爜")
private String goworkCode;
/**
* 鍔炰欢鎵€灞為儴闂�
*/
+ @Excel(name = "鍔炰欢鎵€灞為儴闂�")
private String goworkDepts;
/**
* 浜嬮」鍚嶇О
*/
+ @Excel(name = "浜嬮」鍚嶇О")
private String matterlName;
/**
* 鍔炵悊鏃堕棿
*/
+ @Excel(name = "鍔炵悊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date goworkTime;
/**
* 缁╂晥瑙勫垯id
@@ -65,6 +72,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/**
* 瑙勫垯鍚嶇О
*/
+ @Excel(name = "瑙勫垯鍚嶇О")
private String ruleName;
/**
* 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞)
@@ -73,6 +81,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/**
* 鎵ｅ垎浜哄憳
*/
+ @Excel(name = "鎵ｅ垎浜哄憳")
private String deductPerson;
/**
* 鎵ｅ垎鏃堕棿
@@ -81,15 +90,27 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
/**
* 鎵ｅ垎鎴栧鍔犲垎鍊�
*/
+ @Excel(name = "鎵ｅ垎鎴栧鍔犲垎鍊�")
private BigDecimal score;
/**
* 澶勭悊鐘舵€�(1.鏈牳鏌�,2.宸叉牳鏌�)
*/
+ @Excel(name = "澶勭悊鐘舵€�", readConverterExp = "1=鏈牳鏌�,2.宸叉牳鏌�")
private Integer processStatus;
/**
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -143,5 +164,9 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
this.processStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordQuery.java
index e5840cde28008b8b8d04d0165425c600e020c0fc..6095e7800403b63ed05bfe181425bd9e45e69c65 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
* 鍔炰欢缁╂晥璁板綍淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -220,6 +220,16 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformGoworkRecordQuery> orConditionList;
@@ -1405,6 +1415,70 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2085,6 +2159,44 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public PerformGoworkRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public PerformGoworkRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public PerformGoworkRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public PerformGoworkRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordEntity.java
index 1225a6c1b711ad209080bada5fd8df24fb31457f..c6be169009010cf437d35ff7690108b9281cbc19 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 鍏跺畠缁╂晥璁板綍淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformOtherRecordEntity extends PerformOtherRecordVo {
@@ -90,6 +90,16 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -143,5 +153,9 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
this.processStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordQuery.java
index 1d7f0f943d5704435baab98863e8809a19a15170..6da4b5ef76edd8ee01420d86c7ef20b9b6316e65 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
* 鍏跺畠缁╂晥璁板綍淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -240,6 +240,16 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformOtherRecordQuery> orConditionList;
@@ -1523,6 +1533,70 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2273,6 +2347,44 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public PerformOtherRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public PerformOtherRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public PerformOtherRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public PerformOtherRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordEntity.java
index d2cdfd6e2bfae99b82fcc1829aaadb72238302cc..fcf9ccc941eb448eab14ea4b599ac283da0b0a48 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
* 璇勪环宸瘎缁╂晥璁板綍淇℃伅瀹炰綋瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformReviewRecordEntity extends PerformReviewRecordVo {
@@ -25,14 +25,17 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/**
* 鍛樺伐濮撳悕
*/
+ @Excel(name = "鍛樺伐濮撳悕")
private String staffName;
/**
* 宸ュ彿
*/
+ @Excel(name = "宸ュ彿")
private String workNum;
/**
* 绐楀彛缂栧彿
*/
+ @Excel(name = "绐楀彛缂栧彿")
private String windowNum;
/**
* 鎵€灞為儴闂�
@@ -53,6 +56,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/**
* 璇勪环鏉ユ簮(绐楀彛璇勪环绯荤粺,瀵艰绯荤粺,鑷姪鏈嶅姟绯荤粺,寰畼缃�,鍏跺畠)
*/
+ @Excel(name = "璇勪环鏉ユ簮", readConverterExp = "璇勪环鏉ユ簮(绐楀彛璇勪环绯荤粺,瀵艰绯荤粺,鑷姪鏈嶅姟绯荤粺,寰畼缃�,鍏跺畠)")
private String reviewSource;
/**
* 璇勪环璁惧
@@ -65,6 +69,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/**
* 瑙勫垯鍚嶇О
*/
+ @Excel(name = "瑙勫垯鍚嶇О")
private String ruleName;
/**
* 鎵ｅ垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞)
@@ -73,6 +78,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/**
* 鎵ｅ垎浜哄憳
*/
+ @Excel(name = "鎵ｅ垎浜哄憳")
private String deductPerson;
/**
* 鎵ｅ垎鏃堕棿
@@ -81,6 +87,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
/**
* 鎵ｅ垎鎴栧鍔犲垎鍊�
*/
+ @Excel(name = "鎵ｅ垎鎴栧鍔犲垎鍊�")
private BigDecimal score;
/**
* 澶勭悊鐘舵€�(1.鏈牳鏌�,2.宸叉牳鏌�)
@@ -90,6 +97,16 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
* 澶囨敞
*/
private String remark;
+ /**
+ * 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊")
+ private String fileNames;
+ /**
+ * 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ */
+ @Excel(name = "闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊")
+ private String filePaths;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -143,5 +160,9 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
this.processStatus = 1;
this.remark = "";
+
+ this.fileNames = "";
+
+ this.filePaths = "";
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordQuery.java
index 43d62ee6c93a69af1f4a7d3b5674018820950fd4..269105adccbc0cbb2754ec1b8a7e934545561cbe 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordQuery.java
@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
* 璇勪环宸瘎缁╂晥璁板綍淇℃伅鏌ヨ瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -230,6 +230,16 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊 */
+ private List<String> fileNamesList;
+
+ /** 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> fileNamesNotList;
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊 */
+ private List<String> filePathsList;
+
+ /** 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊鎺掗櫎鍒楄〃 */
+ private List <String> filePathsNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformReviewRecordQuery> orConditionList;
@@ -1464,6 +1474,70 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesList
+ */
+ public List<String> getFileNamesList(){
+ return this.fileNamesList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public void setFileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @return fileNamesNotList
+ */
+ public List<String> getFileNamesNotList(){
+ return this.fileNamesNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesNotList
+ */
+ public void setFileNamesNotList(List<String> fileNamesNotList){
+ this.fileNamesNotList = fileNamesNotList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsList
+ */
+ public List<String> getFilePathsList(){
+ return this.filePathsList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public void setFilePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ }
+
+ /**
+ * 鑾峰彇 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @return filePathsNotList
+ */
+ public List<String> getFilePathsNotList(){
+ return this.filePathsNotList;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsNotList
+ */
+ public void setFilePathsNotList(List<String> filePathsNotList){
+ this.filePathsNotList = filePathsNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2179,6 +2253,44 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
}
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNames
+ */
+ public PerformReviewRecordQuery fileNames(String fileNames){
+ setFileNames(fileNames);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊
+ * @param fileNamesList
+ */
+ public PerformReviewRecordQuery fileNamesList(List<String> fileNamesList){
+ this.fileNamesList = fileNamesList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePaths
+ */
+ public PerformReviewRecordQuery filePaths(String filePaths){
+ setFilePaths(filePaths);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊
+ * @param filePathsList
+ */
+ public PerformReviewRecordQuery filePathsList(List<String> filePathsList){
+ this.filePathsList = filePathsList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java
index bf19d7e1d673ec9abd8f7514ac37944d63944409..80d956441977dac97aaad3ee903355c097e16919 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java
@@ -1,24 +1,19 @@
package com.mortals.xhx.module.perform.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鑰冨嫟缁╂晥璁板綍淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformAttendRecordVo extends BaseEntityLong {
- /**
- * 鎵ｅ垎浜哄憳
- */
- @Excel(name = "鎵ｅ垎浜哄憳")
- private String deductPerson;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java
index e7b2c0f58b97860e477578fd98f8a10cc1d8f004..382785db1dd7f80a73eefbd5f1ff63a461e43849 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java
@@ -1,64 +1,19 @@
package com.mortals.xhx.module.perform.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 璇勪环缁╂晥鎶曡瘔璁板綍淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformComplainRecordVo extends BaseEntityLong {
- /**
- * 鍛樺伐濮撳悕
- */
- @Excel(name = "鍛樺伐濮撳悕")
- private String staffName;
- /**
- * 宸ュ彿
- */
- @Excel(name = "宸ュ彿")
- private String workNum;
- /**
- * 绐楀彛缂栧彿
- */
- @Excel(name = "绐楀彛缂栧彿")
- private String windowNum;
- /**
- * 鎵€灞為儴闂ㄥ悕绉�
- */
- @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
- private String deptName;
- /**
- * 鎶曡瘔鏍囬
- */
- @Excel(name = "鎶曡瘔鏍囬")
- private String complainTitle;
- /**
- * 鎶曡瘔鍐呭
- */
- @Excel(name = "鎶曡瘔鍐呭")
- private String complainContent;
- /**
- * 鑱旂郴鐢佃瘽
- */
- @Excel(name = "鑱旂郴鐢佃瘽")
- private String contact;
- /**
- * 鎵ｅ垎浜哄憳
- */
- @Excel(name = "鎵ｅ垎浜哄憳")
- private String deductPerson;
- /**
- * 澶勭悊鐘舵€�(1.鏈牳鏌�,2.宸叉牳鏌�)
- */
- @Excel(name = "澶勭悊鐘舵€�", readConverterExp = "1=鏈牳鏌�,2.宸叉牳鏌�")
- private Integer processStatus;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java
index a6a996636ca7a6e62c4b016bd3a3ff02ff4080e0..d63decd6392d1242555befc0f075568ae4882735 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java
@@ -1,60 +1,19 @@
package com.mortals.xhx.module.perform.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鏁堣兘缁╂晥璁板綍淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformEffectRecordVo extends BaseEntityLong {
- /**
- * 鍛樺伐濮撳悕
- */
- @Excel(name = "鍛樺伐濮撳悕")
- private String staffName;
- /**
- * 宸ュ彿
- */
- @Excel(name = "宸ュ彿")
- private String workNum;
- /**
- * 绐楀彛缂栧彿
- */
- @Excel(name = "绐楀彛缂栧彿")
- private String windowNum;
- /**
- * 鎵€灞為儴闂ㄥ悕绉�
- */
- @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
- private String deptName;
- /**
- * 杩濊绫诲瀷(1.鑴卞矖,2.绂诲矖,3.鐜╂墜鏈�,4.鐫¤)
- */
- @Excel(name = "杩濊绫诲瀷", readConverterExp = "1=鑴卞矖,2.绂诲矖,3.鐜╂墜鏈�,4.鐫¤")
- private Integer irregularType;
- /**
- * 鍙戠敓鏃堕棿
- */
- @Excel(name = "鍙戠敓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
- private Date happenTime;
- /**
- * 鎵ｅ垎浜哄憳
- */
- @Excel(name = "鎵ｅ垎浜哄憳")
- private String deductPerson;
- /**
- * 澶勭悊鐘舵€�(1.鏈牳鏌�,2.宸叉牳鏌�)
- */
- @Excel(name = "澶勭悊鐘舵€�", readConverterExp = "1=鏈牳鏌�,2.宸叉牳鏌�")
- private Integer processStatus;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
index be581648fbe94450b19191a266488b4cf7d7055c..59904bb30fbbea687ef26fae6fcb00fc839239b9 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java
@@ -1,77 +1,19 @@
package com.mortals.xhx.module.perform.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
-
-import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鍔炰欢缁╂晥璁板綍淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformGoworkRecordVo extends BaseEntityLong {
- /**
- * 鍛樺伐濮撳悕
- */
- @Excel(name = "鍛樺伐濮撳悕")
- private String staffName;
- /**
- * 绐楀彛缂栧彿
- */
- @Excel(name = "绐楀彛缂栧彿")
- private String windowNum;
- /**
- * 鎵€灞為儴闂ㄥ悕绉�
- */
- @Excel(name = "鎵€灞為儴闂ㄥ悕绉�")
- private String deptName;
- /**
- * 鍔炰欢缂栫爜
- */
- @Excel(name = "鍔炰欢缂栫爜")
- private String goworkCode;
- /**
- * 鍔炰欢鎵€灞為儴闂�
- */
- @Excel(name = "鍔炰欢鎵€灞為儴闂�")
- private String goworkDepts;
- /**
- * 浜嬮」鍚嶇О
- */
- @Excel(name = "浜嬮」鍚嶇О")
- private String matterlName;
- /**
- * 鍔炵悊鏃堕棿
- */
- @Excel(name = "鍔炵悊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
- private Date goworkTime;
- /**
- * 瑙勫垯鍚嶇О
- */
- @Excel(name = "瑙勫垯鍚嶇О")
- private String ruleName;
- /**
- * 鎵ｅ垎浜哄憳
- */
- @Excel(name = "鎵ｅ垎浜哄憳")
- private String deductPerson;
- /**
- * 鎵ｅ垎鎴栧鍔犲垎鍊�
- */
- @Excel(name = "鎵ｅ垎鎴栧鍔犲垎鍊�")
- private BigDecimal score;
- /**
- * 澶勭悊鐘舵€�(1.鏈牳鏌�,2.宸叉牳鏌�)
- */
- @Excel(name = "澶勭悊鐘舵€�", readConverterExp = "1=鏈牳鏌�,2.宸叉牳鏌�")
- private Integer processStatus;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java
index e6bb7ee0296e751adf3bb32f099696c1e856a93a..6ac2164801543bad8b974343d1e57623740a6eb9 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java
@@ -4,15 +4,16 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鍏跺畠缁╂晥璁板綍淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformOtherRecordVo extends BaseEntityLong {
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java
index 2381e4b8713f7582ab31f0fb87ae5bdfb95b3598..2d05032e5f2fb0b44e8f22cf5ad17ce329cf6bfb 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java
@@ -1,56 +1,19 @@
package com.mortals.xhx.module.perform.model.vo;
-import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
-
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 璇勪环宸瘎缁╂晥璁板綍淇℃伅瑙嗗浘瀵硅薄
*
* @author zxfei
-* @date 2023-05-18
+* @date 2023-07-08
*/
@Data
public class PerformReviewRecordVo extends BaseEntityLong {
- /**
- * 鍛樺伐濮撳悕
- */
- @Excel(name = "鍛樺伐濮撳悕")
- private String staffName;
- /**
- * 宸ュ彿
- */
- @Excel(name = "宸ュ彿")
- private String workNum;
- /**
- * 绐楀彛缂栧彿
- */
- @Excel(name = "绐楀彛缂栧彿")
- private String windowNum;
- /**
- * 璇勪环鏉ユ簮(绐楀彛璇勪环绯荤粺,瀵艰绯荤粺,鑷姪鏈嶅姟绯荤粺,寰畼缃�,鍏跺畠)
- */
- @Excel(name = "璇勪环鏉ユ簮", readConverterExp = "璇勪环鏉ユ簮(绐楀彛璇勪环绯荤粺,瀵艰绯荤粺,鑷姪鏈嶅姟绯荤粺,寰畼缃�,鍏跺畠)")
- private String reviewSource;
- /**
- * 瑙勫垯鍚嶇О
- */
- @Excel(name = "瑙勫垯鍚嶇О")
- private String ruleName;
- /**
- * 鎵ｅ垎浜哄憳
- */
- @Excel(name = "鎵ｅ垎浜哄憳")
- private String deductPerson;
- /**
- * 鎵ｅ垎鎴栧鍔犲垎鍊�
- */
- @Excel(name = "鎵ｅ垎鎴栧鍔犲垎鍊�")
- private BigDecimal score;
-
-
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/base/system/user.xml b/attendance-performance-manager/src/main/resources/sqlmap/base/system/user.xml
index fb3579127af0ff7c92076d1fdbeb1b21d0f210bb..94f55d43c4a32c7147c0bd97a73382142bb76945 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/base/system/user.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/base/system/user.xml
@@ -20,6 +20,7 @@
<result property="siteIds" column="siteIds" />
<result property="areaCodes" column="areaCodes" />
<result property="status" column="status" />
+ <result property="customerId" column="customerId" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="createUserName" column="createUserName" />
@@ -77,6 +78,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('customerId') or colPickMode == 1 and data.containsKey('customerId')))">
+ a.customerId,
+ </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
@@ -97,18 +101,18 @@
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_user
- (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
+ (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
VALUES
- (#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{deptId},#{deptName},#{siteIds},#{areaCodes},#{status},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress})
+ (#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{deptId},#{deptName},#{siteIds},#{areaCodes},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_user
- (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
+ (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,deptId,deptName,siteIds,areaCodes,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.deptId},#{item.deptName},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress})
+ (#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.deptId},#{item.deptName},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.customerId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress})
</foreach>
</insert>
@@ -169,6 +173,12 @@
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if>
+ <if test="(colPickMode==0 and data.containsKey('customerId')) or (colPickMode==1 and !data.containsKey('customerId'))">
+ a.customerId=#{data.customerId},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('customerIdIncrement')) or (colPickMode==1 and !data.containsKey('customerIdIncrement'))">
+ a.customerId=ifnull(a.customerId,0) + #{data.customerIdIncrement},
+ </if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
@@ -312,6 +322,18 @@
</choose>
</foreach>
</trim>
+ <trim prefix="customerId=(case" suffix="ELSE customerId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('customerId')) or (colPickMode==1 and !item.containsKey('customerId'))">
+ when a.id=#{item.id} then #{item.customerId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('customerIdIncrement')) or (colPickMode==1 and !item.containsKey('customerIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.customerId,0) + #{item.customerIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
@@ -807,6 +829,33 @@
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
+ <if test="conditionParamRef.containsKey('customerId')">
+ <if test="conditionParamRef.customerId != null ">
+ ${_conditionType_} a.customerId = #{${_conditionParam_}.customerId}
+ </if>
+ <if test="conditionParamRef.customerId == null">
+ ${_conditionType_} a.customerId is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('customerIdList') and conditionParamRef.customerIdList.size() > 0">
+ ${_conditionType_} a.customerId in
+ <foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('customerIdNotList') and conditionParamRef.customerIdNotList.size() > 0">
+ ${_conditionType_} a.customerId not in
+ <foreach collection="conditionParamRef.customerIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null">
+ ${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('customerIdEnd') and conditionParamRef.customerIdEnd != null">
+ ${_conditionType_} a.customerId <![CDATA[ <= ]]> #{${_conditionParam_}.customerIdEnd}
+ </if>
+
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
@@ -994,6 +1043,11 @@
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('customerId')">
+ a.customerId
+ <if test='orderCol.customerId != null and "DESC".equalsIgnoreCase(orderCol.customerId)'>DESC</if>
+ ,
+ </if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
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
new file mode 100644
index 0000000000000000000000000000000000000000..c6df8f914c6bc2776467a9e7c9c258909923eb55
--- /dev/null
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckAllRecordDaoImpl">
+
+ <select id="getList" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllRecordVo">
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType FROM mortals_xhx_check_attend_record WHERE 1=1
+ <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+ <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+ <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+ <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType FROM mortals_xhx_check_effect_record WHERE 1=1
+ <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+ <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+ <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+ <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType FROM mortals_xhx_check_complain_record WHERE 1=1
+ <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+ <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+ <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+ <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType FROM mortals_xhx_check_gowork_record WHERE 1=1
+ <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+ <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+ <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+ <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType FROM mortals_xhx_check_review_record WHERE 1=1
+ <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+ <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+ <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+ <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType FROM mortals_xhx_check_other_record WHERE 1=1
+ <if test="checkStatus != null and !checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
+ <if test="staffId != null and !staffId!=''"> AND staffId = #{staffId} </if>
+ <if test="createTimeStart != null and !createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+ <if test="createTimeEnd != null and !createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+ <if test="createUserId != null and !createUserId!=''"> AND createUserId = #{createUserId} </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml
index c949160b0daa2c31b8210ac7471f3364c99b41d5..eaa5919dcca894a5f91793ba6acf139a33a003e1 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml
@@ -1,146 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "mybatis-3-mapper.dtd">
+"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckAttendRecordDaoImpl">
<!-- 瀛楁鍜屽睘鎬ф槧灏� -->
<resultMap type="CheckAttendRecordEntity" id="CheckAttendRecordEntity-Map">
- <id property="id" column="id" />
- <result property="recordId" column="recordId" />
- <result property="staffId" column="staffId" />
- <result property="staffName" column="staffName" />
- <result property="workNum" column="workNum" />
- <result property="deptId" column="deptId" />
- <result property="deptName" column="deptName" />
- <result property="attendanceGroupId" column="attendanceGroupId" />
- <result property="attendanceGroupName" column="attendanceGroupName" />
- <result property="attendanceDate" column="attendanceDate" />
- <result property="ruleId" column="ruleId" />
- <result property="ruleName" column="ruleName" />
- <result property="subAddType" column="subAddType" />
- <result property="score" column="score" />
- <result property="goOffTimeStr" column="goOffTimeStr" />
- <result property="errorTime" column="errorTime" />
- <result property="actualAttendTime" column="actualAttendTime" />
- <result property="errorResult" column="errorResult" />
- <result property="checkPerson" column="checkPerson" />
- <result property="checkTime" column="checkTime" />
- <result property="checkDesc" column="checkDesc" />
- <result property="checkResult" column="checkResult" />
- <result property="checkStatus" column="checkStatus" />
- <result property="createUserId" column="createUserId" />
- <result property="createTime" column="createTime" />
- <result property="updateUserId" column="updateUserId" />
- <result property="updateTime" column="updateTime" />
- <result property="subMethod" column="subMethod" />
-
+ <id property="id" column="id" />
+ <result property="recordId" column="recordId" />
+ <result property="staffId" column="staffId" />
+ <result property="staffName" column="staffName" />
+ <result property="workNum" column="workNum" />
+ <result property="deptId" column="deptId" />
+ <result property="deptName" column="deptName" />
+ <result property="attendanceGroupId" column="attendanceGroupId" />
+ <result property="attendanceGroupName" column="attendanceGroupName" />
+ <result property="attendanceDate" column="attendanceDate" />
+ <result property="ruleId" column="ruleId" />
+ <result property="ruleName" column="ruleName" />
+ <result property="subAddType" column="subAddType" />
+ <result property="score" column="score" />
+ <result property="goOffTimeStr" column="goOffTimeStr" />
+ <result property="errorTime" column="errorTime" />
+ <result property="actualAttendTime" column="actualAttendTime" />
+ <result property="errorResult" column="errorResult" />
+ <result property="checkPerson" column="checkPerson" />
+ <result property="checkTime" column="checkTime" />
+ <result property="checkDesc" column="checkDesc" />
+ <result property="checkResult" column="checkResult" />
+ <result property="checkStatus" column="checkStatus" />
+ <result property="createUserId" column="createUserId" />
+ <result property="createTime" column="createTime" />
+ <result property="updateUserId" column="updateUserId" />
+ <result property="updateTime" column="updateTime" />
+ <result property="subMethod" column="subMethod" />
+ <result property="remark" column="remark" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
+
</resultMap>
<!-- 琛ㄦ墍鏈夊垪 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
- a.id,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
- a.recordId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffId') or colPickMode == 1 and data.containsKey('staffId')))">
- a.staffId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffName') or colPickMode == 1 and data.containsKey('staffName')))">
- a.staffName,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workNum') or colPickMode == 1 and data.containsKey('workNum')))">
- a.workNum,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
- a.deptId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
- a.deptName,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendanceGroupId') or colPickMode == 1 and data.containsKey('attendanceGroupId')))">
- a.attendanceGroupId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendanceGroupName') or colPickMode == 1 and data.containsKey('attendanceGroupName')))">
- a.attendanceGroupName,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendanceDate') or colPickMode == 1 and data.containsKey('attendanceDate')))">
- a.attendanceDate,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleId') or colPickMode == 1 and data.containsKey('ruleId')))">
- a.ruleId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleName') or colPickMode == 1 and data.containsKey('ruleName')))">
- a.ruleName,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subAddType') or colPickMode == 1 and data.containsKey('subAddType')))">
- a.subAddType,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('score') or colPickMode == 1 and data.containsKey('score')))">
- a.score,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goOffTimeStr') or colPickMode == 1 and data.containsKey('goOffTimeStr')))">
- a.goOffTimeStr,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('errorTime') or colPickMode == 1 and data.containsKey('errorTime')))">
- a.errorTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('actualAttendTime') or colPickMode == 1 and data.containsKey('actualAttendTime')))">
- a.actualAttendTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('errorResult') or colPickMode == 1 and data.containsKey('errorResult')))">
- a.errorResult,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkPerson') or colPickMode == 1 and data.containsKey('checkPerson')))">
- a.checkPerson,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkTime') or colPickMode == 1 and data.containsKey('checkTime')))">
- a.checkTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkDesc') or colPickMode == 1 and data.containsKey('checkDesc')))">
- a.checkDesc,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkResult') or colPickMode == 1 and data.containsKey('checkResult')))">
- a.checkResult,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkStatus') or colPickMode == 1 and data.containsKey('checkStatus')))">
- a.checkStatus,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
- a.createUserId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
- a.createTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
- a.updateUserId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
- a.updateTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subMethod') or colPickMode == 1 and data.containsKey('subMethod')))">
- a.subMethod,
- </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+ a.id,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
+ a.recordId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffId') or colPickMode == 1 and data.containsKey('staffId')))">
+ a.staffId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffName') or colPickMode == 1 and data.containsKey('staffName')))">
+ a.staffName,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workNum') or colPickMode == 1 and data.containsKey('workNum')))">
+ a.workNum,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
+ a.deptId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
+ a.deptName,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendanceGroupId') or colPickMode == 1 and data.containsKey('attendanceGroupId')))">
+ a.attendanceGroupId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendanceGroupName') or colPickMode == 1 and data.containsKey('attendanceGroupName')))">
+ a.attendanceGroupName,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendanceDate') or colPickMode == 1 and data.containsKey('attendanceDate')))">
+ a.attendanceDate,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleId') or colPickMode == 1 and data.containsKey('ruleId')))">
+ a.ruleId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleName') or colPickMode == 1 and data.containsKey('ruleName')))">
+ a.ruleName,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subAddType') or colPickMode == 1 and data.containsKey('subAddType')))">
+ a.subAddType,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('score') or colPickMode == 1 and data.containsKey('score')))">
+ a.score,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goOffTimeStr') or colPickMode == 1 and data.containsKey('goOffTimeStr')))">
+ a.goOffTimeStr,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('errorTime') or colPickMode == 1 and data.containsKey('errorTime')))">
+ a.errorTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('actualAttendTime') or colPickMode == 1 and data.containsKey('actualAttendTime')))">
+ a.actualAttendTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('errorResult') or colPickMode == 1 and data.containsKey('errorResult')))">
+ a.errorResult,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkPerson') or colPickMode == 1 and data.containsKey('checkPerson')))">
+ a.checkPerson,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkTime') or colPickMode == 1 and data.containsKey('checkTime')))">
+ a.checkTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkDesc') or colPickMode == 1 and data.containsKey('checkDesc')))">
+ a.checkDesc,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkResult') or colPickMode == 1 and data.containsKey('checkResult')))">
+ a.checkResult,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkStatus') or colPickMode == 1 and data.containsKey('checkStatus')))">
+ a.checkStatus,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+ a.createUserId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+ a.createTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+ a.updateUserId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+ a.updateTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subMethod') or colPickMode == 1 and data.containsKey('subMethod')))">
+ a.subMethod,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+ a.remark,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="CheckAttendRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_attend_record
- (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod)
+ (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths)
VALUES
- (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{subMethod})
+ (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{subMethod},#{remark},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_attend_record
- (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod)
+ (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.subMethod})
+ (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.subMethod},#{item.remark},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -264,6 +276,15 @@
<if test="(colPickMode==0 and data.containsKey('subMethodIncrement')) or (colPickMode==1 and !data.containsKey('subMethodIncrement'))">
a.subMethod=ifnull(a.subMethod,0) + #{data.subMethodIncrement},
</if>
+ <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+ a.remark=#{data.remark},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -276,250 +297,271 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_check_attend_record as a
<trim prefix="set" suffixOverrides=",">
- <trim prefix="recordId=(case" suffix="ELSE recordId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('recordId')) or (colPickMode==1 and !item.containsKey('recordId'))">
- when a.id=#{item.id} then #{item.recordId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('recordIdIncrement')) or (colPickMode==1 and !item.containsKey('recordIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.recordId,0) + #{item.recordIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="staffId=(case" suffix="ELSE staffId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('staffId')) or (colPickMode==1 and !item.containsKey('staffId'))">
- when a.id=#{item.id} then #{item.staffId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('staffIdIncrement')) or (colPickMode==1 and !item.containsKey('staffIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.staffId,0) + #{item.staffIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="staffName=(case" suffix="ELSE staffName end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('staffName')) or (colPickMode==1 and !item.containsKey('staffName'))">
- when a.id=#{item.id} then #{item.staffName}
- </if>
- </foreach>
- </trim>
- <trim prefix="workNum=(case" suffix="ELSE workNum end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('workNum')) or (colPickMode==1 and !item.containsKey('workNum'))">
- when a.id=#{item.id} then #{item.workNum}
- </if>
- </foreach>
- </trim>
- <trim prefix="deptId=(case" suffix="ELSE deptId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
- when a.id=#{item.id} then #{item.deptId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="deptName=(case" suffix="ELSE deptName end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
- when a.id=#{item.id} then #{item.deptName}
- </if>
- </foreach>
- </trim>
- <trim prefix="attendanceGroupId=(case" suffix="ELSE attendanceGroupId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('attendanceGroupId')) or (colPickMode==1 and !item.containsKey('attendanceGroupId'))">
- when a.id=#{item.id} then #{item.attendanceGroupId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('attendanceGroupIdIncrement')) or (colPickMode==1 and !item.containsKey('attendanceGroupIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.attendanceGroupId,0) + #{item.attendanceGroupIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="attendanceGroupName=(case" suffix="ELSE attendanceGroupName end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('attendanceGroupName')) or (colPickMode==1 and !item.containsKey('attendanceGroupName'))">
- when a.id=#{item.id} then #{item.attendanceGroupName}
- </if>
- </foreach>
- </trim>
- <trim prefix="attendanceDate=(case" suffix="ELSE attendanceDate end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('attendanceDate')) or (colPickMode==1 and !item.containsKey('attendanceDate'))">
- when a.id=#{item.id} then #{item.attendanceDate}
- </if>
- </foreach>
- </trim>
- <trim prefix="ruleId=(case" suffix="ELSE ruleId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('ruleId')) or (colPickMode==1 and !item.containsKey('ruleId'))">
- when a.id=#{item.id} then #{item.ruleId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('ruleIdIncrement')) or (colPickMode==1 and !item.containsKey('ruleIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.ruleId,0) + #{item.ruleIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="ruleName=(case" suffix="ELSE ruleName end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('ruleName')) or (colPickMode==1 and !item.containsKey('ruleName'))">
- when a.id=#{item.id} then #{item.ruleName}
- </if>
- </foreach>
- </trim>
- <trim prefix="subAddType=(case" suffix="ELSE subAddType end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('subAddType')) or (colPickMode==1 and !item.containsKey('subAddType'))">
- when a.id=#{item.id} then #{item.subAddType}
- </when>
- <when test="(colPickMode==0 and item.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !item.containsKey('subAddTypeIncrement'))">
- when a.id=#{item.id} then ifnull(a.subAddType,0) + #{item.subAddTypeIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="score=(case" suffix="ELSE score end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('score')) or (colPickMode==1 and !item.containsKey('score'))">
- when a.id=#{item.id} then #{item.score}
- </when>
- <when test="(colPickMode==0 and item.containsKey('scoreIncrement')) or (colPickMode==1 and !item.containsKey('scoreIncrement'))">
- when a.id=#{item.id} then ifnull(a.score,0) + #{item.scoreIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="goOffTimeStr=(case" suffix="ELSE goOffTimeStr end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('goOffTimeStr')) or (colPickMode==1 and !item.containsKey('goOffTimeStr'))">
- when a.id=#{item.id} then #{item.goOffTimeStr}
- </if>
- </foreach>
- </trim>
- <trim prefix="errorTime=(case" suffix="ELSE errorTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('errorTime')) or (colPickMode==1 and !item.containsKey('errorTime'))">
- when a.id=#{item.id} then #{item.errorTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="actualAttendTime=(case" suffix="ELSE actualAttendTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('actualAttendTime')) or (colPickMode==1 and !item.containsKey('actualAttendTime'))">
- when a.id=#{item.id} then #{item.actualAttendTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="errorResult=(case" suffix="ELSE errorResult end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('errorResult')) or (colPickMode==1 and !item.containsKey('errorResult'))">
- when a.id=#{item.id} then #{item.errorResult}
- </if>
- </foreach>
- </trim>
- <trim prefix="checkPerson=(case" suffix="ELSE checkPerson end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('checkPerson')) or (colPickMode==1 and !item.containsKey('checkPerson'))">
- when a.id=#{item.id} then #{item.checkPerson}
- </if>
- </foreach>
- </trim>
- <trim prefix="checkTime=(case" suffix="ELSE checkTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('checkTime')) or (colPickMode==1 and !item.containsKey('checkTime'))">
- when a.id=#{item.id} then #{item.checkTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="checkDesc=(case" suffix="ELSE checkDesc end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('checkDesc')) or (colPickMode==1 and !item.containsKey('checkDesc'))">
- when a.id=#{item.id} then #{item.checkDesc}
- </if>
- </foreach>
- </trim>
- <trim prefix="checkResult=(case" suffix="ELSE checkResult end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('checkResult')) or (colPickMode==1 and !item.containsKey('checkResult'))">
- when a.id=#{item.id} then #{item.checkResult}
- </if>
- </foreach>
- </trim>
- <trim prefix="checkStatus=(case" suffix="ELSE checkStatus end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('checkStatus')) or (colPickMode==1 and !item.containsKey('checkStatus'))">
- when a.id=#{item.id} then #{item.checkStatus}
- </when>
- <when test="(colPickMode==0 and item.containsKey('checkStatusIncrement')) or (colPickMode==1 and !item.containsKey('checkStatusIncrement'))">
- when a.id=#{item.id} then ifnull(a.checkStatus,0) + #{item.checkStatusIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
- when a.id=#{item.id} then #{item.createUserId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="createTime=(case" suffix="ELSE createTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
- when a.id=#{item.id} then #{item.createTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
- when a.id=#{item.id} then #{item.updateUserId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
- when a.id=#{item.id} then #{item.updateTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="subMethod=(case" suffix="ELSE subMethod end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('subMethod')) or (colPickMode==1 and !item.containsKey('subMethod'))">
- when a.id=#{item.id} then #{item.subMethod}
- </when>
- <when test="(colPickMode==0 and item.containsKey('subMethodIncrement')) or (colPickMode==1 and !item.containsKey('subMethodIncrement'))">
- when a.id=#{item.id} then ifnull(a.subMethod,0) + #{item.subMethodIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
+ <trim prefix="recordId=(case" suffix="ELSE recordId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('recordId')) or (colPickMode==1 and !item.containsKey('recordId'))">
+ when a.id=#{item.id} then #{item.recordId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('recordIdIncrement')) or (colPickMode==1 and !item.containsKey('recordIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.recordId,0) + #{item.recordIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="staffId=(case" suffix="ELSE staffId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('staffId')) or (colPickMode==1 and !item.containsKey('staffId'))">
+ when a.id=#{item.id} then #{item.staffId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('staffIdIncrement')) or (colPickMode==1 and !item.containsKey('staffIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.staffId,0) + #{item.staffIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="staffName=(case" suffix="ELSE staffName end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('staffName')) or (colPickMode==1 and !item.containsKey('staffName'))">
+ when a.id=#{item.id} then #{item.staffName}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="workNum=(case" suffix="ELSE workNum end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('workNum')) or (colPickMode==1 and !item.containsKey('workNum'))">
+ when a.id=#{item.id} then #{item.workNum}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="deptId=(case" suffix="ELSE deptId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
+ when a.id=#{item.id} then #{item.deptId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="deptName=(case" suffix="ELSE deptName end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
+ when a.id=#{item.id} then #{item.deptName}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="attendanceGroupId=(case" suffix="ELSE attendanceGroupId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('attendanceGroupId')) or (colPickMode==1 and !item.containsKey('attendanceGroupId'))">
+ when a.id=#{item.id} then #{item.attendanceGroupId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('attendanceGroupIdIncrement')) or (colPickMode==1 and !item.containsKey('attendanceGroupIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.attendanceGroupId,0) + #{item.attendanceGroupIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="attendanceGroupName=(case" suffix="ELSE attendanceGroupName end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('attendanceGroupName')) or (colPickMode==1 and !item.containsKey('attendanceGroupName'))">
+ when a.id=#{item.id} then #{item.attendanceGroupName}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="attendanceDate=(case" suffix="ELSE attendanceDate end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('attendanceDate')) or (colPickMode==1 and !item.containsKey('attendanceDate'))">
+ when a.id=#{item.id} then #{item.attendanceDate}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="ruleId=(case" suffix="ELSE ruleId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('ruleId')) or (colPickMode==1 and !item.containsKey('ruleId'))">
+ when a.id=#{item.id} then #{item.ruleId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('ruleIdIncrement')) or (colPickMode==1 and !item.containsKey('ruleIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.ruleId,0) + #{item.ruleIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="ruleName=(case" suffix="ELSE ruleName end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('ruleName')) or (colPickMode==1 and !item.containsKey('ruleName'))">
+ when a.id=#{item.id} then #{item.ruleName}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="subAddType=(case" suffix="ELSE subAddType end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('subAddType')) or (colPickMode==1 and !item.containsKey('subAddType'))">
+ when a.id=#{item.id} then #{item.subAddType}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !item.containsKey('subAddTypeIncrement'))">
+ when a.id=#{item.id} then ifnull(a.subAddType,0) + #{item.subAddTypeIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="score=(case" suffix="ELSE score end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('score')) or (colPickMode==1 and !item.containsKey('score'))">
+ when a.id=#{item.id} then #{item.score}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('scoreIncrement')) or (colPickMode==1 and !item.containsKey('scoreIncrement'))">
+ when a.id=#{item.id} then ifnull(a.score,0) + #{item.scoreIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="goOffTimeStr=(case" suffix="ELSE goOffTimeStr end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('goOffTimeStr')) or (colPickMode==1 and !item.containsKey('goOffTimeStr'))">
+ when a.id=#{item.id} then #{item.goOffTimeStr}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="errorTime=(case" suffix="ELSE errorTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('errorTime')) or (colPickMode==1 and !item.containsKey('errorTime'))">
+ when a.id=#{item.id} then #{item.errorTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="actualAttendTime=(case" suffix="ELSE actualAttendTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('actualAttendTime')) or (colPickMode==1 and !item.containsKey('actualAttendTime'))">
+ when a.id=#{item.id} then #{item.actualAttendTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="errorResult=(case" suffix="ELSE errorResult end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('errorResult')) or (colPickMode==1 and !item.containsKey('errorResult'))">
+ when a.id=#{item.id} then #{item.errorResult}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="checkPerson=(case" suffix="ELSE checkPerson end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('checkPerson')) or (colPickMode==1 and !item.containsKey('checkPerson'))">
+ when a.id=#{item.id} then #{item.checkPerson}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="checkTime=(case" suffix="ELSE checkTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('checkTime')) or (colPickMode==1 and !item.containsKey('checkTime'))">
+ when a.id=#{item.id} then #{item.checkTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="checkDesc=(case" suffix="ELSE checkDesc end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('checkDesc')) or (colPickMode==1 and !item.containsKey('checkDesc'))">
+ when a.id=#{item.id} then #{item.checkDesc}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="checkResult=(case" suffix="ELSE checkResult end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('checkResult')) or (colPickMode==1 and !item.containsKey('checkResult'))">
+ when a.id=#{item.id} then #{item.checkResult}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="checkStatus=(case" suffix="ELSE checkStatus end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('checkStatus')) or (colPickMode==1 and !item.containsKey('checkStatus'))">
+ when a.id=#{item.id} then #{item.checkStatus}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('checkStatusIncrement')) or (colPickMode==1 and !item.containsKey('checkStatusIncrement'))">
+ when a.id=#{item.id} then ifnull(a.checkStatus,0) + #{item.checkStatusIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+ when a.id=#{item.id} then #{item.createUserId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+ when a.id=#{item.id} then #{item.createTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+ when a.id=#{item.id} then #{item.updateUserId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+ when a.id=#{item.id} then #{item.updateTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="subMethod=(case" suffix="ELSE subMethod end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('subMethod')) or (colPickMode==1 and !item.containsKey('subMethod'))">
+ when a.id=#{item.id} then #{item.subMethod}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('subMethodIncrement')) or (colPickMode==1 and !item.containsKey('subMethodIncrement'))">
+ when a.id=#{item.id} then ifnull(a.subMethod,0) + #{item.subMethodIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="remark=(case" suffix="ELSE remark end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+ when a.id=#{item.id} then #{item.remark}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -636,783 +678,861 @@
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
- <if test="conditionParamRef.containsKey('id')">
- <if test="conditionParamRef.id != null ">
- ${_conditionType_} a.id = #{${_conditionParam_}.id}
+ <if test="conditionParamRef.containsKey('id')">
+ <if test="conditionParamRef.id != null ">
+ ${_conditionType_} a.id = #{${_conditionParam_}.id}
+ </if>
+ <if test="conditionParamRef.id == null">
+ ${_conditionType_} a.id is null
+ </if>
</if>
- <if test="conditionParamRef.id == null">
- ${_conditionType_} a.id is null
+ <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+ ${_conditionType_} a.id in
+ <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+ ${_conditionType_} a.id not in
+ <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+ ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+ </if>
+ <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+ ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
- ${_conditionType_} a.id in
- <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
- ${_conditionType_} a.id not in
- <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
- ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
- </if>
- <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
- ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
- </if>
- <if test="conditionParamRef.containsKey('recordId')">
- <if test="conditionParamRef.recordId != null ">
- ${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
+ <if test="conditionParamRef.containsKey('recordId')">
+ <if test="conditionParamRef.recordId != null ">
+ ${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
+ </if>
+ <if test="conditionParamRef.recordId == null">
+ ${_conditionType_} a.recordId is null
+ </if>
</if>
- <if test="conditionParamRef.recordId == null">
- ${_conditionType_} a.recordId is null
+ <if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
+ ${_conditionType_} a.recordId in
+ <foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('recordIdNotList') and conditionParamRef.recordIdNotList.size() > 0">
+ ${_conditionType_} a.recordId not in
+ <foreach collection="conditionParamRef.recordIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null">
+ ${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('recordIdEnd') and conditionParamRef.recordIdEnd != null">
+ ${_conditionType_} a.recordId <![CDATA[ <= ]]> #{${_conditionParam_}.recordIdEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
- ${_conditionType_} a.recordId in
- <foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('recordIdNotList') and conditionParamRef.recordIdNotList.size() > 0">
- ${_conditionType_} a.recordId not in
- <foreach collection="conditionParamRef.recordIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null">
- ${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart}
- </if>
- <if test="conditionParamRef.containsKey('recordIdEnd') and conditionParamRef.recordIdEnd != null">
- ${_conditionType_} a.recordId <![CDATA[ <= ]]> #{${_conditionParam_}.recordIdEnd}
- </if>
- <if test="conditionParamRef.containsKey('staffId')">
- <if test="conditionParamRef.staffId != null ">
- ${_conditionType_} a.staffId = #{${_conditionParam_}.staffId}
+ <if test="conditionParamRef.containsKey('staffId')">
+ <if test="conditionParamRef.staffId != null ">
+ ${_conditionType_} a.staffId = #{${_conditionParam_}.staffId}
+ </if>
+ <if test="conditionParamRef.staffId == null">
+ ${_conditionType_} a.staffId is null
+ </if>
</if>
- <if test="conditionParamRef.staffId == null">
- ${_conditionType_} a.staffId is null
+ <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
+ ${_conditionType_} a.staffId in
+ <foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
+ ${_conditionType_} a.staffId not in
+ <foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('staffIdStart') and conditionParamRef.staffIdStart != null">
+ ${_conditionType_} a.staffId <![CDATA[ >= ]]> #{${_conditionParam_}.staffIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('staffIdEnd') and conditionParamRef.staffIdEnd != null">
+ ${_conditionType_} a.staffId <![CDATA[ <= ]]> #{${_conditionParam_}.staffIdEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
- ${_conditionType_} a.staffId in
- <foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
- ${_conditionType_} a.staffId not in
- <foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('staffIdStart') and conditionParamRef.staffIdStart != null">
- ${_conditionType_} a.staffId <![CDATA[ >= ]]> #{${_conditionParam_}.staffIdStart}
- </if>
- <if test="conditionParamRef.containsKey('staffIdEnd') and conditionParamRef.staffIdEnd != null">
- ${_conditionType_} a.staffId <![CDATA[ <= ]]> #{${_conditionParam_}.staffIdEnd}
- </if>
- <if test="conditionParamRef.containsKey('staffName')">
- <if test="conditionParamRef.staffName != null and conditionParamRef.staffName != ''">
- ${_conditionType_} a.staffName like #{${_conditionParam_}.staffName}
+ <if test="conditionParamRef.containsKey('staffName')">
+ <if test="conditionParamRef.staffName != null and conditionParamRef.staffName != ''">
+ ${_conditionType_} a.staffName like #{${_conditionParam_}.staffName}
+ </if>
+ <if test="conditionParamRef.staffName == null">
+ ${_conditionType_} a.staffName is null
+ </if>
</if>
- <if test="conditionParamRef.staffName == null">
- ${_conditionType_} a.staffName is null
+ <if test="conditionParamRef.containsKey('staffNameList') and conditionParamRef.staffNameList.size() > 0">
+ ${_conditionType_} a.staffName in
+ <foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('staffNameNotList') and conditionParamRef.staffNameNotList.size() > 0">
+ ${_conditionType_} a.staffName not in
+ <foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- </if>
- <if test="conditionParamRef.containsKey('staffNameList') and conditionParamRef.staffNameList.size() > 0">
- ${_conditionType_} a.staffName in
- <foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('staffNameNotList') and conditionParamRef.staffNameNotList.size() > 0">
- ${_conditionType_} a.staffName not in
- <foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('workNum')">
- <if test="conditionParamRef.workNum != null and conditionParamRef.workNum != ''">
- ${_conditionType_} a.workNum like #{${_conditionParam_}.workNum}
+ <if test="conditionParamRef.containsKey('workNum')">
+ <if test="conditionParamRef.workNum != null and conditionParamRef.workNum != ''">
+ ${_conditionType_} a.workNum like #{${_conditionParam_}.workNum}
+ </if>
+ <if test="conditionParamRef.workNum == null">
+ ${_conditionType_} a.workNum is null
+ </if>
</if>
- <if test="conditionParamRef.workNum == null">
- ${_conditionType_} a.workNum is null
+ <if test="conditionParamRef.containsKey('workNumList') and conditionParamRef.workNumList.size() > 0">
+ ${_conditionType_} a.workNum in
+ <foreach collection="conditionParamRef.workNumList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- </if>
- <if test="conditionParamRef.containsKey('workNumList') and conditionParamRef.workNumList.size() > 0">
- ${_conditionType_} a.workNum in
- <foreach collection="conditionParamRef.workNumList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('workNumNotList') and conditionParamRef.workNumNotList.size() > 0">
- ${_conditionType_} a.workNum not in
- <foreach collection="conditionParamRef.workNumNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('deptId')">
- <if test="conditionParamRef.deptId != null ">
- ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
+ <if test="conditionParamRef.containsKey('workNumNotList') and conditionParamRef.workNumNotList.size() > 0">
+ ${_conditionType_} a.workNum not in
+ <foreach collection="conditionParamRef.workNumNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- <if test="conditionParamRef.deptId == null">
- ${_conditionType_} a.deptId is null
+ <if test="conditionParamRef.containsKey('deptId')">
+ <if test="conditionParamRef.deptId != null ">
+ ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
+ </if>
+ <if test="conditionParamRef.deptId == null">
+ ${_conditionType_} a.deptId is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
+ ${_conditionType_} a.deptId in
+ <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
+ ${_conditionType_} a.deptId not in
+ <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
+ ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
+ ${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
- ${_conditionType_} a.deptId in
- <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
- ${_conditionType_} a.deptId not in
- <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
- ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
- </if>
- <if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
- ${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
- </if>
- <if test="conditionParamRef.containsKey('deptName')">
- <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
- ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
+ <if test="conditionParamRef.containsKey('deptName')">
+ <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
+ ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
+ </if>
+ <if test="conditionParamRef.deptName == null">
+ ${_conditionType_} a.deptName is null
+ </if>
</if>
- <if test="conditionParamRef.deptName == null">
- ${_conditionType_} a.deptName is null
+ <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
+ ${_conditionType_} a.deptName in
+ <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- </if>
- <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
- ${_conditionType_} a.deptName in
- <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
- ${_conditionType_} a.deptName not in
- <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('attendanceGroupId')">
- <if test="conditionParamRef.attendanceGroupId != null ">
- ${_conditionType_} a.attendanceGroupId = #{${_conditionParam_}.attendanceGroupId}
+ <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
+ ${_conditionType_} a.deptName not in
+ <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- <if test="conditionParamRef.attendanceGroupId == null">
- ${_conditionType_} a.attendanceGroupId is null
+ <if test="conditionParamRef.containsKey('attendanceGroupId')">
+ <if test="conditionParamRef.attendanceGroupId != null ">
+ ${_conditionType_} a.attendanceGroupId = #{${_conditionParam_}.attendanceGroupId}
+ </if>
+ <if test="conditionParamRef.attendanceGroupId == null">
+ ${_conditionType_} a.attendanceGroupId is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('attendanceGroupIdList') and conditionParamRef.attendanceGroupIdList.size() > 0">
+ ${_conditionType_} a.attendanceGroupId in
+ <foreach collection="conditionParamRef.attendanceGroupIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('attendanceGroupIdNotList') and conditionParamRef.attendanceGroupIdNotList.size() > 0">
+ ${_conditionType_} a.attendanceGroupId not in
+ <foreach collection="conditionParamRef.attendanceGroupIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('attendanceGroupIdStart') and conditionParamRef.attendanceGroupIdStart != null">
+ ${_conditionType_} a.attendanceGroupId <![CDATA[ >= ]]> #{${_conditionParam_}.attendanceGroupIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('attendanceGroupIdEnd') and conditionParamRef.attendanceGroupIdEnd != null">
+ ${_conditionType_} a.attendanceGroupId <![CDATA[ <= ]]> #{${_conditionParam_}.attendanceGroupIdEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('attendanceGroupIdList') and conditionParamRef.attendanceGroupIdList.size() > 0">
- ${_conditionType_} a.attendanceGroupId in
- <foreach collection="conditionParamRef.attendanceGroupIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('attendanceGroupIdNotList') and conditionParamRef.attendanceGroupIdNotList.size() > 0">
- ${_conditionType_} a.attendanceGroupId not in
- <foreach collection="conditionParamRef.attendanceGroupIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('attendanceGroupIdStart') and conditionParamRef.attendanceGroupIdStart != null">
- ${_conditionType_} a.attendanceGroupId <![CDATA[ >= ]]> #{${_conditionParam_}.attendanceGroupIdStart}
- </if>
- <if test="conditionParamRef.containsKey('attendanceGroupIdEnd') and conditionParamRef.attendanceGroupIdEnd != null">
- ${_conditionType_} a.attendanceGroupId <![CDATA[ <= ]]> #{${_conditionParam_}.attendanceGroupIdEnd}
- </if>
- <if test="conditionParamRef.containsKey('attendanceGroupName')">
- <if test="conditionParamRef.attendanceGroupName != null and conditionParamRef.attendanceGroupName != ''">
- ${_conditionType_} a.attendanceGroupName like #{${_conditionParam_}.attendanceGroupName}
+ <if test="conditionParamRef.containsKey('attendanceGroupName')">
+ <if test="conditionParamRef.attendanceGroupName != null and conditionParamRef.attendanceGroupName != ''">
+ ${_conditionType_} a.attendanceGroupName like #{${_conditionParam_}.attendanceGroupName}
+ </if>
+ <if test="conditionParamRef.attendanceGroupName == null">
+ ${_conditionType_} a.attendanceGroupName is null
+ </if>
</if>
- <if test="conditionParamRef.attendanceGroupName == null">
- ${_conditionType_} a.attendanceGroupName is null
+ <if test="conditionParamRef.containsKey('attendanceGroupNameList') and conditionParamRef.attendanceGroupNameList.size() > 0">
+ ${_conditionType_} a.attendanceGroupName in
+ <foreach collection="conditionParamRef.attendanceGroupNameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('attendanceGroupNameNotList') and conditionParamRef.attendanceGroupNameNotList.size() > 0">
+ ${_conditionType_} a.attendanceGroupName not in
+ <foreach collection="conditionParamRef.attendanceGroupNameNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- </if>
- <if test="conditionParamRef.containsKey('attendanceGroupNameList') and conditionParamRef.attendanceGroupNameList.size() > 0">
- ${_conditionType_} a.attendanceGroupName in
- <foreach collection="conditionParamRef.attendanceGroupNameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('attendanceGroupNameNotList') and conditionParamRef.attendanceGroupNameNotList.size() > 0">
- ${_conditionType_} a.attendanceGroupName not in
- <foreach collection="conditionParamRef.attendanceGroupNameNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('attendanceDate')">
- <if test="conditionParamRef.attendanceDate != null ">
- ${_conditionType_} a.attendanceDate = #{${_conditionParam_}.attendanceDate}
+ <if test="conditionParamRef.containsKey('attendanceDate')">
+ <if test="conditionParamRef.attendanceDate != null ">
+ ${_conditionType_} a.attendanceDate = #{${_conditionParam_}.attendanceDate}
+ </if>
+ <if test="conditionParamRef.attendanceDate == null">
+ ${_conditionType_} a.attendanceDate is null
+ </if>
</if>
- <if test="conditionParamRef.attendanceDate == null">
- ${_conditionType_} a.attendanceDate is null
+ <if test="conditionParamRef.containsKey('attendanceDateStart') and conditionParamRef.attendanceDateStart != null and conditionParamRef.attendanceDateStart!=''">
+ ${_conditionType_} a.attendanceDate <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.attendanceDateStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
- </if>
- <if test="conditionParamRef.containsKey('attendanceDateStart') and conditionParamRef.attendanceDateStart != null and conditionParamRef.attendanceDateStart!=''">
- ${_conditionType_} a.attendanceDate <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.attendanceDateStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('attendanceDateEnd') and conditionParamRef.attendanceDateEnd != null and conditionParamRef.attendanceDateEnd!=''">
- ${_conditionType_} a.attendanceDate <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.attendanceDateEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('ruleId')">
- <if test="conditionParamRef.ruleId != null ">
- ${_conditionType_} a.ruleId = #{${_conditionParam_}.ruleId}
+ <if test="conditionParamRef.containsKey('attendanceDateEnd') and conditionParamRef.attendanceDateEnd != null and conditionParamRef.attendanceDateEnd!=''">
+ ${_conditionType_} a.attendanceDate <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.attendanceDateEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
- <if test="conditionParamRef.ruleId == null">
- ${_conditionType_} a.ruleId is null
+ <if test="conditionParamRef.containsKey('ruleId')">
+ <if test="conditionParamRef.ruleId != null ">
+ ${_conditionType_} a.ruleId = #{${_conditionParam_}.ruleId}
+ </if>
+ <if test="conditionParamRef.ruleId == null">
+ ${_conditionType_} a.ruleId is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('ruleIdList') and conditionParamRef.ruleIdList.size() > 0">
+ ${_conditionType_} a.ruleId in
+ <foreach collection="conditionParamRef.ruleIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('ruleIdNotList') and conditionParamRef.ruleIdNotList.size() > 0">
+ ${_conditionType_} a.ruleId not in
+ <foreach collection="conditionParamRef.ruleIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('ruleIdStart') and conditionParamRef.ruleIdStart != null">
+ ${_conditionType_} a.ruleId <![CDATA[ >= ]]> #{${_conditionParam_}.ruleIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('ruleIdEnd') and conditionParamRef.ruleIdEnd != null">
+ ${_conditionType_} a.ruleId <![CDATA[ <= ]]> #{${_conditionParam_}.ruleIdEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('ruleIdList') and conditionParamRef.ruleIdList.size() > 0">
- ${_conditionType_} a.ruleId in
- <foreach collection="conditionParamRef.ruleIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('ruleIdNotList') and conditionParamRef.ruleIdNotList.size() > 0">
- ${_conditionType_} a.ruleId not in
- <foreach collection="conditionParamRef.ruleIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('ruleIdStart') and conditionParamRef.ruleIdStart != null">
- ${_conditionType_} a.ruleId <![CDATA[ >= ]]> #{${_conditionParam_}.ruleIdStart}
- </if>
- <if test="conditionParamRef.containsKey('ruleIdEnd') and conditionParamRef.ruleIdEnd != null">
- ${_conditionType_} a.ruleId <![CDATA[ <= ]]> #{${_conditionParam_}.ruleIdEnd}
- </if>
- <if test="conditionParamRef.containsKey('ruleName')">
- <if test="conditionParamRef.ruleName != null and conditionParamRef.ruleName != ''">
- ${_conditionType_} a.ruleName like #{${_conditionParam_}.ruleName}
+ <if test="conditionParamRef.containsKey('ruleName')">
+ <if test="conditionParamRef.ruleName != null and conditionParamRef.ruleName != ''">
+ ${_conditionType_} a.ruleName like #{${_conditionParam_}.ruleName}
+ </if>
+ <if test="conditionParamRef.ruleName == null">
+ ${_conditionType_} a.ruleName is null
+ </if>
</if>
- <if test="conditionParamRef.ruleName == null">
- ${_conditionType_} a.ruleName is null
+ <if test="conditionParamRef.containsKey('ruleNameList') and conditionParamRef.ruleNameList.size() > 0">
+ ${_conditionType_} a.ruleName in
+ <foreach collection="conditionParamRef.ruleNameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- </if>
- <if test="conditionParamRef.containsKey('ruleNameList') and conditionParamRef.ruleNameList.size() > 0">
- ${_conditionType_} a.ruleName in
- <foreach collection="conditionParamRef.ruleNameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('ruleNameNotList') and conditionParamRef.ruleNameNotList.size() > 0">
- ${_conditionType_} a.ruleName not in
- <foreach collection="conditionParamRef.ruleNameNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('subAddType')">
- <if test="conditionParamRef.subAddType != null ">
- ${_conditionType_} a.subAddType = #{${_conditionParam_}.subAddType}
+ <if test="conditionParamRef.containsKey('ruleNameNotList') and conditionParamRef.ruleNameNotList.size() > 0">
+ ${_conditionType_} a.ruleName not in
+ <foreach collection="conditionParamRef.ruleNameNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- <if test="conditionParamRef.subAddType == null">
- ${_conditionType_} a.subAddType is null
+ <if test="conditionParamRef.containsKey('subAddType')">
+ <if test="conditionParamRef.subAddType != null ">
+ ${_conditionType_} a.subAddType = #{${_conditionParam_}.subAddType}
+ </if>
+ <if test="conditionParamRef.subAddType == null">
+ ${_conditionType_} a.subAddType is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('subAddTypeList') and conditionParamRef.subAddTypeList.size() > 0">
+ ${_conditionType_} a.subAddType in
+ <foreach collection="conditionParamRef.subAddTypeList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('subAddTypeNotList') and conditionParamRef.subAddTypeNotList.size() > 0">
+ ${_conditionType_} a.subAddType not in
+ <foreach collection="conditionParamRef.subAddTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('subAddTypeStart') and conditionParamRef.subAddTypeStart != null">
+ ${_conditionType_} a.subAddType <![CDATA[ >= ]]> #{${_conditionParam_}.subAddTypeStart}
+ </if>
+ <if test="conditionParamRef.containsKey('subAddTypeEnd') and conditionParamRef.subAddTypeEnd != null">
+ ${_conditionType_} a.subAddType <![CDATA[ <= ]]> #{${_conditionParam_}.subAddTypeEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('subAddTypeList') and conditionParamRef.subAddTypeList.size() > 0">
- ${_conditionType_} a.subAddType in
- <foreach collection="conditionParamRef.subAddTypeList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('subAddTypeNotList') and conditionParamRef.subAddTypeNotList.size() > 0">
- ${_conditionType_} a.subAddType not in
- <foreach collection="conditionParamRef.subAddTypeNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('subAddTypeStart') and conditionParamRef.subAddTypeStart != null">
- ${_conditionType_} a.subAddType <![CDATA[ >= ]]> #{${_conditionParam_}.subAddTypeStart}
- </if>
- <if test="conditionParamRef.containsKey('subAddTypeEnd') and conditionParamRef.subAddTypeEnd != null">
- ${_conditionType_} a.subAddType <![CDATA[ <= ]]> #{${_conditionParam_}.subAddTypeEnd}
- </if>
- <if test="conditionParamRef.containsKey('score')">
- <if test="conditionParamRef.score != null ">
- ${_conditionType_} a.score = #{${_conditionParam_}.score}
+ <if test="conditionParamRef.containsKey('score')">
+ <if test="conditionParamRef.score != null ">
+ ${_conditionType_} a.score = #{${_conditionParam_}.score}
+ </if>
+ <if test="conditionParamRef.score == null">
+ ${_conditionType_} a.score is null
+ </if>
</if>
- <if test="conditionParamRef.score == null">
- ${_conditionType_} a.score is null
+ <if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0">
+ ${_conditionType_} a.score in
+ <foreach collection="conditionParamRef.scoreList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('scoreNotList') and conditionParamRef.scoreNotList.size() > 0">
+ ${_conditionType_} a.score not in
+ <foreach collection="conditionParamRef.scoreNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('scoreStart') and conditionParamRef.scoreStart != null">
+ ${_conditionType_} a.score <![CDATA[ >= ]]> #{${_conditionParam_}.scoreStart}
+ </if>
+ <if test="conditionParamRef.containsKey('scoreEnd') and conditionParamRef.scoreEnd != null">
+ ${_conditionType_} a.score <![CDATA[ <= ]]> #{${_conditionParam_}.scoreEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0">
- ${_conditionType_} a.score in
- <foreach collection="conditionParamRef.scoreList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('scoreNotList') and conditionParamRef.scoreNotList.size() > 0">
- ${_conditionType_} a.score not in
- <foreach collection="conditionParamRef.scoreNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('scoreStart') and conditionParamRef.scoreStart != null">
- ${_conditionType_} a.score <![CDATA[ >= ]]> #{${_conditionParam_}.scoreStart}
- </if>
- <if test="conditionParamRef.containsKey('scoreEnd') and conditionParamRef.scoreEnd != null">
- ${_conditionType_} a.score <![CDATA[ <= ]]> #{${_conditionParam_}.scoreEnd}
- </if>
- <if test="conditionParamRef.containsKey('goOffTimeStr')">
- <if test="conditionParamRef.goOffTimeStr != null and conditionParamRef.goOffTimeStr != ''">
- ${_conditionType_} a.goOffTimeStr like #{${_conditionParam_}.goOffTimeStr}
+ <if test="conditionParamRef.containsKey('goOffTimeStr')">
+ <if test="conditionParamRef.goOffTimeStr != null and conditionParamRef.goOffTimeStr != ''">
+ ${_conditionType_} a.goOffTimeStr like #{${_conditionParam_}.goOffTimeStr}
+ </if>
+ <if test="conditionParamRef.goOffTimeStr == null">
+ ${_conditionType_} a.goOffTimeStr is null
+ </if>
</if>
- <if test="conditionParamRef.goOffTimeStr == null">
- ${_conditionType_} a.goOffTimeStr is null
+ <if test="conditionParamRef.containsKey('goOffTimeStrList') and conditionParamRef.goOffTimeStrList.size() > 0">
+ ${_conditionType_} a.goOffTimeStr in
+ <foreach collection="conditionParamRef.goOffTimeStrList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('goOffTimeStrNotList') and conditionParamRef.goOffTimeStrNotList.size() > 0">
+ ${_conditionType_} a.goOffTimeStr not in
+ <foreach collection="conditionParamRef.goOffTimeStrNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- </if>
- <if test="conditionParamRef.containsKey('goOffTimeStrList') and conditionParamRef.goOffTimeStrList.size() > 0">
- ${_conditionType_} a.goOffTimeStr in
- <foreach collection="conditionParamRef.goOffTimeStrList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('goOffTimeStrNotList') and conditionParamRef.goOffTimeStrNotList.size() > 0">
- ${_conditionType_} a.goOffTimeStr not in
- <foreach collection="conditionParamRef.goOffTimeStrNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('errorTime')">
- <if test="conditionParamRef.errorTime != null ">
- ${_conditionType_} a.errorTime = #{${_conditionParam_}.errorTime}
+ <if test="conditionParamRef.containsKey('errorTime')">
+ <if test="conditionParamRef.errorTime != null ">
+ ${_conditionType_} a.errorTime = #{${_conditionParam_}.errorTime}
+ </if>
+ <if test="conditionParamRef.errorTime == null">
+ ${_conditionType_} a.errorTime is null
+ </if>
</if>
- <if test="conditionParamRef.errorTime == null">
- ${_conditionType_} a.errorTime is null
+ <if test="conditionParamRef.containsKey('errorTimeStart') and conditionParamRef.errorTimeStart != null and conditionParamRef.errorTimeStart!=''">
+ ${_conditionType_} a.errorTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.errorTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('errorTimeEnd') and conditionParamRef.errorTimeEnd != null and conditionParamRef.errorTimeEnd!=''">
+ ${_conditionType_} a.errorTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.errorTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
- </if>
- <if test="conditionParamRef.containsKey('errorTimeStart') and conditionParamRef.errorTimeStart != null and conditionParamRef.errorTimeStart!=''">
- ${_conditionType_} a.errorTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.errorTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('errorTimeEnd') and conditionParamRef.errorTimeEnd != null and conditionParamRef.errorTimeEnd!=''">
- ${_conditionType_} a.errorTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.errorTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('actualAttendTime')">
- <if test="conditionParamRef.actualAttendTime != null ">
- ${_conditionType_} a.actualAttendTime = #{${_conditionParam_}.actualAttendTime}
+ <if test="conditionParamRef.containsKey('actualAttendTime')">
+ <if test="conditionParamRef.actualAttendTime != null ">
+ ${_conditionType_} a.actualAttendTime = #{${_conditionParam_}.actualAttendTime}
+ </if>
+ <if test="conditionParamRef.actualAttendTime == null">
+ ${_conditionType_} a.actualAttendTime is null
+ </if>
</if>
- <if test="conditionParamRef.actualAttendTime == null">
- ${_conditionType_} a.actualAttendTime is null
+ <if test="conditionParamRef.containsKey('actualAttendTimeStart') and conditionParamRef.actualAttendTimeStart != null and conditionParamRef.actualAttendTimeStart!=''">
+ ${_conditionType_} a.actualAttendTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.actualAttendTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('actualAttendTimeEnd') and conditionParamRef.actualAttendTimeEnd != null and conditionParamRef.actualAttendTimeEnd!=''">
+ ${_conditionType_} a.actualAttendTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.actualAttendTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
- </if>
- <if test="conditionParamRef.containsKey('actualAttendTimeStart') and conditionParamRef.actualAttendTimeStart != null and conditionParamRef.actualAttendTimeStart!=''">
- ${_conditionType_} a.actualAttendTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.actualAttendTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('actualAttendTimeEnd') and conditionParamRef.actualAttendTimeEnd != null and conditionParamRef.actualAttendTimeEnd!=''">
- ${_conditionType_} a.actualAttendTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.actualAttendTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('errorResult')">
- <if test="conditionParamRef.errorResult != null and conditionParamRef.errorResult != ''">
- ${_conditionType_} a.errorResult like #{${_conditionParam_}.errorResult}
+ <if test="conditionParamRef.containsKey('errorResult')">
+ <if test="conditionParamRef.errorResult != null and conditionParamRef.errorResult != ''">
+ ${_conditionType_} a.errorResult like #{${_conditionParam_}.errorResult}
+ </if>
+ <if test="conditionParamRef.errorResult == null">
+ ${_conditionType_} a.errorResult is null
+ </if>
</if>
- <if test="conditionParamRef.errorResult == null">
- ${_conditionType_} a.errorResult is null
+ <if test="conditionParamRef.containsKey('errorResultList') and conditionParamRef.errorResultList.size() > 0">
+ ${_conditionType_} a.errorResult in
+ <foreach collection="conditionParamRef.errorResultList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('errorResultNotList') and conditionParamRef.errorResultNotList.size() > 0">
+ ${_conditionType_} a.errorResult not in
+ <foreach collection="conditionParamRef.errorResultNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- </if>
- <if test="conditionParamRef.containsKey('errorResultList') and conditionParamRef.errorResultList.size() > 0">
- ${_conditionType_} a.errorResult in
- <foreach collection="conditionParamRef.errorResultList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('errorResultNotList') and conditionParamRef.errorResultNotList.size() > 0">
- ${_conditionType_} a.errorResult not in
- <foreach collection="conditionParamRef.errorResultNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('checkPerson')">
- <if test="conditionParamRef.checkPerson != null and conditionParamRef.checkPerson != ''">
- ${_conditionType_} a.checkPerson like #{${_conditionParam_}.checkPerson}
+ <if test="conditionParamRef.containsKey('checkPerson')">
+ <if test="conditionParamRef.checkPerson != null and conditionParamRef.checkPerson != ''">
+ ${_conditionType_} a.checkPerson like #{${_conditionParam_}.checkPerson}
+ </if>
+ <if test="conditionParamRef.checkPerson == null">
+ ${_conditionType_} a.checkPerson is null
+ </if>
</if>
- <if test="conditionParamRef.checkPerson == null">
- ${_conditionType_} a.checkPerson is null
+ <if test="conditionParamRef.containsKey('checkPersonList') and conditionParamRef.checkPersonList.size() > 0">
+ ${_conditionType_} a.checkPerson in
+ <foreach collection="conditionParamRef.checkPersonList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('checkPersonNotList') and conditionParamRef.checkPersonNotList.size() > 0">
+ ${_conditionType_} a.checkPerson not in
+ <foreach collection="conditionParamRef.checkPersonNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- </if>
- <if test="conditionParamRef.containsKey('checkPersonList') and conditionParamRef.checkPersonList.size() > 0">
- ${_conditionType_} a.checkPerson in
- <foreach collection="conditionParamRef.checkPersonList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('checkPersonNotList') and conditionParamRef.checkPersonNotList.size() > 0">
- ${_conditionType_} a.checkPerson not in
- <foreach collection="conditionParamRef.checkPersonNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('checkTime')">
- <if test="conditionParamRef.checkTime != null ">
- ${_conditionType_} a.checkTime = #{${_conditionParam_}.checkTime}
+ <if test="conditionParamRef.containsKey('checkTime')">
+ <if test="conditionParamRef.checkTime != null ">
+ ${_conditionType_} a.checkTime = #{${_conditionParam_}.checkTime}
+ </if>
+ <if test="conditionParamRef.checkTime == null">
+ ${_conditionType_} a.checkTime is null
+ </if>
</if>
- <if test="conditionParamRef.checkTime == null">
- ${_conditionType_} a.checkTime is null
+ <if test="conditionParamRef.containsKey('checkTimeStart') and conditionParamRef.checkTimeStart != null and conditionParamRef.checkTimeStart!=''">
+ ${_conditionType_} a.checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('checkTimeEnd') and conditionParamRef.checkTimeEnd != null and conditionParamRef.checkTimeEnd!=''">
+ ${_conditionType_} a.checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
- </if>
- <if test="conditionParamRef.containsKey('checkTimeStart') and conditionParamRef.checkTimeStart != null and conditionParamRef.checkTimeStart!=''">
- ${_conditionType_} a.checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('checkTimeEnd') and conditionParamRef.checkTimeEnd != null and conditionParamRef.checkTimeEnd!=''">
- ${_conditionType_} a.checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('checkDesc')">
- <if test="conditionParamRef.checkDesc != null and conditionParamRef.checkDesc != ''">
- ${_conditionType_} a.checkDesc like #{${_conditionParam_}.checkDesc}
+ <if test="conditionParamRef.containsKey('checkDesc')">
+ <if test="conditionParamRef.checkDesc != null and conditionParamRef.checkDesc != ''">
+ ${_conditionType_} a.checkDesc like #{${_conditionParam_}.checkDesc}
+ </if>
+ <if test="conditionParamRef.checkDesc == null">
+ ${_conditionType_} a.checkDesc is null
+ </if>
</if>
- <if test="conditionParamRef.checkDesc == null">
- ${_conditionType_} a.checkDesc is null
+ <if test="conditionParamRef.containsKey('checkDescList') and conditionParamRef.checkDescList.size() > 0">
+ ${_conditionType_} a.checkDesc in
+ <foreach collection="conditionParamRef.checkDescList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('checkDescNotList') and conditionParamRef.checkDescNotList.size() > 0">
+ ${_conditionType_} a.checkDesc not in
+ <foreach collection="conditionParamRef.checkDescNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- </if>
- <if test="conditionParamRef.containsKey('checkDescList') and conditionParamRef.checkDescList.size() > 0">
- ${_conditionType_} a.checkDesc in
- <foreach collection="conditionParamRef.checkDescList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('checkDescNotList') and conditionParamRef.checkDescNotList.size() > 0">
- ${_conditionType_} a.checkDesc not in
- <foreach collection="conditionParamRef.checkDescNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('checkResult')">
- <if test="conditionParamRef.checkResult != null and conditionParamRef.checkResult != ''">
- ${_conditionType_} a.checkResult like #{${_conditionParam_}.checkResult}
+ <if test="conditionParamRef.containsKey('checkResult')">
+ <if test="conditionParamRef.checkResult != null and conditionParamRef.checkResult != ''">
+ ${_conditionType_} a.checkResult like #{${_conditionParam_}.checkResult}
+ </if>
+ <if test="conditionParamRef.checkResult == null">
+ ${_conditionType_} a.checkResult is null
+ </if>
</if>
- <if test="conditionParamRef.checkResult == null">
- ${_conditionType_} a.checkResult is null
+ <if test="conditionParamRef.containsKey('checkResultList') and conditionParamRef.checkResultList.size() > 0">
+ ${_conditionType_} a.checkResult in
+ <foreach collection="conditionParamRef.checkResultList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- </if>
- <if test="conditionParamRef.containsKey('checkResultList') and conditionParamRef.checkResultList.size() > 0">
- ${_conditionType_} a.checkResult in
- <foreach collection="conditionParamRef.checkResultList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('checkResultNotList') and conditionParamRef.checkResultNotList.size() > 0">
- ${_conditionType_} a.checkResult not in
- <foreach collection="conditionParamRef.checkResultNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('checkStatus')">
- <if test="conditionParamRef.checkStatus != null ">
- ${_conditionType_} a.checkStatus = #{${_conditionParam_}.checkStatus}
+ <if test="conditionParamRef.containsKey('checkResultNotList') and conditionParamRef.checkResultNotList.size() > 0">
+ ${_conditionType_} a.checkResult not in
+ <foreach collection="conditionParamRef.checkResultNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
</if>
- <if test="conditionParamRef.checkStatus == null">
- ${_conditionType_} a.checkStatus is null
+ <if test="conditionParamRef.containsKey('checkStatus')">
+ <if test="conditionParamRef.checkStatus != null ">
+ ${_conditionType_} a.checkStatus = #{${_conditionParam_}.checkStatus}
+ </if>
+ <if test="conditionParamRef.checkStatus == null">
+ ${_conditionType_} a.checkStatus is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('checkStatusList') and conditionParamRef.checkStatusList.size() > 0">
+ ${_conditionType_} a.checkStatus in
+ <foreach collection="conditionParamRef.checkStatusList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('checkStatusNotList') and conditionParamRef.checkStatusNotList.size() > 0">
+ ${_conditionType_} a.checkStatus not in
+ <foreach collection="conditionParamRef.checkStatusNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('checkStatusStart') and conditionParamRef.checkStatusStart != null">
+ ${_conditionType_} a.checkStatus <![CDATA[ >= ]]> #{${_conditionParam_}.checkStatusStart}
+ </if>
+ <if test="conditionParamRef.containsKey('checkStatusEnd') and conditionParamRef.checkStatusEnd != null">
+ ${_conditionType_} a.checkStatus <![CDATA[ <= ]]> #{${_conditionParam_}.checkStatusEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('checkStatusList') and conditionParamRef.checkStatusList.size() > 0">
- ${_conditionType_} a.checkStatus in
- <foreach collection="conditionParamRef.checkStatusList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('checkStatusNotList') and conditionParamRef.checkStatusNotList.size() > 0">
- ${_conditionType_} a.checkStatus not in
- <foreach collection="conditionParamRef.checkStatusNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('checkStatusStart') and conditionParamRef.checkStatusStart != null">
- ${_conditionType_} a.checkStatus <![CDATA[ >= ]]> #{${_conditionParam_}.checkStatusStart}
- </if>
- <if test="conditionParamRef.containsKey('checkStatusEnd') and conditionParamRef.checkStatusEnd != null">
- ${_conditionType_} a.checkStatus <![CDATA[ <= ]]> #{${_conditionParam_}.checkStatusEnd}
- </if>
- <if test="conditionParamRef.containsKey('createUserId')">
- <if test="conditionParamRef.createUserId != null ">
- ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+ <if test="conditionParamRef.containsKey('createUserId')">
+ <if test="conditionParamRef.createUserId != null ">
+ ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+ </if>
+ <if test="conditionParamRef.createUserId == null">
+ ${_conditionType_} a.createUserId is null
+ </if>
</if>
- <if test="conditionParamRef.createUserId == null">
- ${_conditionType_} a.createUserId is null
+ <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+ ${_conditionType_} a.createUserId in
+ <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+ ${_conditionType_} a.createUserId not in
+ <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+ ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+ ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
- ${_conditionType_} a.createUserId in
- <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
- ${_conditionType_} a.createUserId not in
- <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
- ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
- </if>
- <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
- ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
- </if>
- <if test="conditionParamRef.containsKey('createTime')">
- <if test="conditionParamRef.createTime != null ">
- ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+ <if test="conditionParamRef.containsKey('createTime')">
+ <if test="conditionParamRef.createTime != null ">
+ ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+ </if>
+ <if test="conditionParamRef.createTime == null">
+ ${_conditionType_} a.createTime is null
+ </if>
</if>
- <if test="conditionParamRef.createTime == null">
- ${_conditionType_} a.createTime is null
+ <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+ ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
- </if>
- <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
- ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
- ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('updateUserId')">
- <if test="conditionParamRef.updateUserId != null ">
- ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+ <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+ ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
- <if test="conditionParamRef.updateUserId == null">
- ${_conditionType_} a.updateUserId is null
+ <if test="conditionParamRef.containsKey('updateUserId')">
+ <if test="conditionParamRef.updateUserId != null ">
+ ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+ </if>
+ <if test="conditionParamRef.updateUserId == null">
+ ${_conditionType_} a.updateUserId is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+ ${_conditionType_} a.updateUserId in
+ <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+ ${_conditionType_} a.updateUserId not in
+ <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+ ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+ ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
- ${_conditionType_} a.updateUserId in
- <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
- ${_conditionType_} a.updateUserId not in
- <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
- ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
- </if>
- <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
- ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
- </if>
- <if test="conditionParamRef.containsKey('updateTime')">
- <if test="conditionParamRef.updateTime != null ">
- ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+ <if test="conditionParamRef.containsKey('updateTime')">
+ <if test="conditionParamRef.updateTime != null ">
+ ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+ </if>
+ <if test="conditionParamRef.updateTime == null">
+ ${_conditionType_} a.updateTime is null
+ </if>
</if>
- <if test="conditionParamRef.updateTime == null">
- ${_conditionType_} a.updateTime is null
+ <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+ ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
- </if>
- <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
- ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
- ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('subMethod')">
- <if test="conditionParamRef.subMethod != null ">
- ${_conditionType_} a.subMethod = #{${_conditionParam_}.subMethod}
+ <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+ ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
- <if test="conditionParamRef.subMethod == null">
- ${_conditionType_} a.subMethod is null
+ <if test="conditionParamRef.containsKey('subMethod')">
+ <if test="conditionParamRef.subMethod != null ">
+ ${_conditionType_} a.subMethod = #{${_conditionParam_}.subMethod}
+ </if>
+ <if test="conditionParamRef.subMethod == null">
+ ${_conditionType_} a.subMethod is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('subMethodList') and conditionParamRef.subMethodList.size() > 0">
+ ${_conditionType_} a.subMethod in
+ <foreach collection="conditionParamRef.subMethodList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('subMethodNotList') and conditionParamRef.subMethodNotList.size() > 0">
+ ${_conditionType_} a.subMethod not in
+ <foreach collection="conditionParamRef.subMethodNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('subMethodStart') and conditionParamRef.subMethodStart != null">
+ ${_conditionType_} a.subMethod <![CDATA[ >= ]]> #{${_conditionParam_}.subMethodStart}
+ </if>
+ <if test="conditionParamRef.containsKey('subMethodEnd') and conditionParamRef.subMethodEnd != null">
+ ${_conditionType_} a.subMethod <![CDATA[ <= ]]> #{${_conditionParam_}.subMethodEnd}
</if>
- </if>
- <if test="conditionParamRef.containsKey('subMethodList') and conditionParamRef.subMethodList.size() > 0">
- ${_conditionType_} a.subMethod in
- <foreach collection="conditionParamRef.subMethodList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('subMethodNotList') and conditionParamRef.subMethodNotList.size() > 0">
- ${_conditionType_} a.subMethod not in
- <foreach collection="conditionParamRef.subMethodNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('subMethodStart') and conditionParamRef.subMethodStart != null">
- ${_conditionType_} a.subMethod <![CDATA[ >= ]]> #{${_conditionParam_}.subMethodStart}
- </if>
- <if test="conditionParamRef.containsKey('subMethodEnd') and conditionParamRef.subMethodEnd != null">
- ${_conditionType_} a.subMethod <![CDATA[ <= ]]> #{${_conditionParam_}.subMethodEnd}
- </if>
+
+ <if test="conditionParamRef.containsKey('remark')">
+ <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+ ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
+ </if>
+ <if test="conditionParamRef.remark == null">
+ ${_conditionType_} a.remark is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+ ${_conditionType_} a.remark in
+ <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+ ${_conditionType_} a.remark not in
+ <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
- ${item.colName} ${item.sortKind}
+ ${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
- <if test="orderCol.containsKey('id')">
- a.id
- <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('recordId')">
- a.recordId
- <if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('staffId')">
- a.staffId
- <if test='orderCol.staffId != null and "DESC".equalsIgnoreCase(orderCol.staffId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('staffName')">
- a.staffName
- <if test='orderCol.staffName != null and "DESC".equalsIgnoreCase(orderCol.staffName)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('workNum')">
- a.workNum
- <if test='orderCol.workNum != null and "DESC".equalsIgnoreCase(orderCol.workNum)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('deptId')">
- a.deptId
- <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('deptName')">
- a.deptName
- <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('attendanceGroupId')">
- a.attendanceGroupId
- <if test='orderCol.attendanceGroupId != null and "DESC".equalsIgnoreCase(orderCol.attendanceGroupId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('attendanceGroupName')">
- a.attendanceGroupName
- <if test='orderCol.attendanceGroupName != null and "DESC".equalsIgnoreCase(orderCol.attendanceGroupName)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('attendanceDate')">
- a.attendanceDate
- <if test='orderCol.attendanceDate != null and "DESC".equalsIgnoreCase(orderCol.attendanceDate)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('ruleId')">
- a.ruleId
- <if test='orderCol.ruleId != null and "DESC".equalsIgnoreCase(orderCol.ruleId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('ruleName')">
- a.ruleName
- <if test='orderCol.ruleName != null and "DESC".equalsIgnoreCase(orderCol.ruleName)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('subAddType')">
- a.subAddType
- <if test='orderCol.subAddType != null and "DESC".equalsIgnoreCase(orderCol.subAddType)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('score')">
- a.score
- <if test='orderCol.score != null and "DESC".equalsIgnoreCase(orderCol.score)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('goOffTimeStr')">
- a.goOffTimeStr
- <if test='orderCol.goOffTimeStr != null and "DESC".equalsIgnoreCase(orderCol.goOffTimeStr)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('errorTime')">
- a.errorTime
- <if test='orderCol.errorTime != null and "DESC".equalsIgnoreCase(orderCol.errorTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('actualAttendTime')">
- a.actualAttendTime
- <if test='orderCol.actualAttendTime != null and "DESC".equalsIgnoreCase(orderCol.actualAttendTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('errorResult')">
- a.errorResult
- <if test='orderCol.errorResult != null and "DESC".equalsIgnoreCase(orderCol.errorResult)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('checkPerson')">
- a.checkPerson
- <if test='orderCol.checkPerson != null and "DESC".equalsIgnoreCase(orderCol.checkPerson)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('checkTime')">
- a.checkTime
- <if test='orderCol.checkTime != null and "DESC".equalsIgnoreCase(orderCol.checkTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('checkDesc')">
- a.checkDesc
- <if test='orderCol.checkDesc != null and "DESC".equalsIgnoreCase(orderCol.checkDesc)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('checkResult')">
- a.checkResult
- <if test='orderCol.checkResult != null and "DESC".equalsIgnoreCase(orderCol.checkResult)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('checkStatus')">
- a.checkStatus
- <if test='orderCol.checkStatus != null and "DESC".equalsIgnoreCase(orderCol.checkStatus)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('createUserId')">
- a.createUserId
- <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('createTime')">
- a.createTime
- <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('updateUserId')">
- a.updateUserId
- <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('updateTime')">
- a.updateTime
- <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('subMethod')">
- a.subMethod
- <if test='orderCol.subMethod != null and "DESC".equalsIgnoreCase(orderCol.subMethod)'>DESC</if>
- ,
- </if>
+ <if test="orderCol.containsKey('id')">
+ a.id
+ <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('recordId')">
+ a.recordId
+ <if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('staffId')">
+ a.staffId
+ <if test='orderCol.staffId != null and "DESC".equalsIgnoreCase(orderCol.staffId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('staffName')">
+ a.staffName
+ <if test='orderCol.staffName != null and "DESC".equalsIgnoreCase(orderCol.staffName)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('workNum')">
+ a.workNum
+ <if test='orderCol.workNum != null and "DESC".equalsIgnoreCase(orderCol.workNum)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('deptId')">
+ a.deptId
+ <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('deptName')">
+ a.deptName
+ <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('attendanceGroupId')">
+ a.attendanceGroupId
+ <if test='orderCol.attendanceGroupId != null and "DESC".equalsIgnoreCase(orderCol.attendanceGroupId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('attendanceGroupName')">
+ a.attendanceGroupName
+ <if test='orderCol.attendanceGroupName != null and "DESC".equalsIgnoreCase(orderCol.attendanceGroupName)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('attendanceDate')">
+ a.attendanceDate
+ <if test='orderCol.attendanceDate != null and "DESC".equalsIgnoreCase(orderCol.attendanceDate)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('ruleId')">
+ a.ruleId
+ <if test='orderCol.ruleId != null and "DESC".equalsIgnoreCase(orderCol.ruleId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('ruleName')">
+ a.ruleName
+ <if test='orderCol.ruleName != null and "DESC".equalsIgnoreCase(orderCol.ruleName)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('subAddType')">
+ a.subAddType
+ <if test='orderCol.subAddType != null and "DESC".equalsIgnoreCase(orderCol.subAddType)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('score')">
+ a.score
+ <if test='orderCol.score != null and "DESC".equalsIgnoreCase(orderCol.score)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('goOffTimeStr')">
+ a.goOffTimeStr
+ <if test='orderCol.goOffTimeStr != null and "DESC".equalsIgnoreCase(orderCol.goOffTimeStr)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('errorTime')">
+ a.errorTime
+ <if test='orderCol.errorTime != null and "DESC".equalsIgnoreCase(orderCol.errorTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('actualAttendTime')">
+ a.actualAttendTime
+ <if test='orderCol.actualAttendTime != null and "DESC".equalsIgnoreCase(orderCol.actualAttendTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('errorResult')">
+ a.errorResult
+ <if test='orderCol.errorResult != null and "DESC".equalsIgnoreCase(orderCol.errorResult)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('checkPerson')">
+ a.checkPerson
+ <if test='orderCol.checkPerson != null and "DESC".equalsIgnoreCase(orderCol.checkPerson)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('checkTime')">
+ a.checkTime
+ <if test='orderCol.checkTime != null and "DESC".equalsIgnoreCase(orderCol.checkTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('checkDesc')">
+ a.checkDesc
+ <if test='orderCol.checkDesc != null and "DESC".equalsIgnoreCase(orderCol.checkDesc)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('checkResult')">
+ a.checkResult
+ <if test='orderCol.checkResult != null and "DESC".equalsIgnoreCase(orderCol.checkResult)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('checkStatus')">
+ a.checkStatus
+ <if test='orderCol.checkStatus != null and "DESC".equalsIgnoreCase(orderCol.checkStatus)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('createUserId')">
+ a.createUserId
+ <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('createTime')">
+ a.createTime
+ <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('updateUserId')">
+ a.updateUserId
+ <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('updateTime')">
+ a.updateTime
+ <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('subMethod')">
+ a.subMethod
+ <if test='orderCol.subMethod != null and "DESC".equalsIgnoreCase(orderCol.subMethod)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('remark')">
+ a.remark
+ <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckComplainRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckComplainRecordMapper.xml
index b6b6fda5d4bec3c2ad7f3402751e4673db5c191f..dce646653bdbfc51bdb1262459e5f090c24e93db 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckComplainRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckComplainRecordMapper.xml
@@ -36,6 +36,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -136,23 +138,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="CheckComplainRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_complain_record
- (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_complain_record
- (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -279,6 +287,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -546,6 +560,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1343,6 +1371,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1511,6 +1581,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckEffectRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckEffectRecordMapper.xml
index 688a7b8b45a7732a7ea9c2ef3d8555d03f83e46d..6c55a8b2dd5bcb9e813f77763a0953dbb36e5529 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckEffectRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckEffectRecordMapper.xml
@@ -34,6 +34,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -128,23 +130,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="CheckEffectRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_effect_record
- (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_effect_record
- (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -271,6 +279,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -534,6 +548,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1295,6 +1323,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1453,6 +1523,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapper.xml
index 14739cd9bdc9944cdec36dfee24bbf9538bc459a..13a9e229dca17ac446ce775427ef34de3ea1d7c9 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapper.xml
@@ -33,6 +33,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -124,23 +126,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="CheckGoworkRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_gowork_record
- (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_gowork_record
- (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -258,6 +266,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -504,6 +518,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1238,6 +1266,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1391,6 +1461,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckOtherRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckOtherRecordMapper.xml
index 5ffbd2616defe0d8596cb57923b79b86d7377764..4bbc88e097a3eb1face119bc96cfcdca74d2b729 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckOtherRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckOtherRecordMapper.xml
@@ -33,6 +33,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -124,23 +126,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="CheckOtherRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_other_record
- (recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{windowNum},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{windowNum},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_other_record
- (recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.windowNum},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.windowNum},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -264,6 +272,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -520,6 +534,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1266,6 +1294,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1419,6 +1489,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckReviewRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckReviewRecordMapper.xml
index 2e70d83eadd4b82c071b137c4c027c0a41741607..97295a999e7e7efba66e56959f7aeb4d37b9a98f 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckReviewRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckReviewRecordMapper.xml
@@ -33,6 +33,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -124,23 +126,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="CheckReviewRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_review_record
- (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_review_record
- (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -261,6 +269,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -512,6 +526,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1252,6 +1280,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1405,6 +1475,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformAttendRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformAttendRecordMapper.xml
index 4d14099243b6f77a6532c54810a048c51fe23838..5445d22ebefd931a2a9b0f0a3c49ab771e5dbe3c 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformAttendRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformAttendRecordMapper.xml
@@ -31,6 +31,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -116,23 +118,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="PerformAttendRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_attend_record
- (staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleNme},#{errorTime},#{goOffTimeStr},#{actualAttendTime},#{errorResult},#{subMethod},#{deductPerson},#{deductTime},#{subAddType},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleNme},#{errorTime},#{goOffTimeStr},#{actualAttendTime},#{errorResult},#{subMethod},#{deductPerson},#{deductTime},#{subAddType},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_attend_record
- (staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleNme},#{item.errorTime},#{item.goOffTimeStr},#{item.actualAttendTime},#{item.errorResult},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.subAddType},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleNme},#{item.errorTime},#{item.goOffTimeStr},#{item.actualAttendTime},#{item.errorResult},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.subAddType},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -247,6 +255,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -484,6 +498,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1176,6 +1204,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1319,6 +1389,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformComplainRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformComplainRecordMapper.xml
index e08202f991250820874359a2781c279e8c33e8e8..5bfd96ce6aa28071005b96c06c30f079b92164b9 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformComplainRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformComplainRecordMapper.xml
@@ -31,6 +31,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -116,23 +118,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="PerformComplainRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_complain_record
- (staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_complain_record
- (staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -241,6 +249,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -468,6 +482,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1160,6 +1188,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1303,6 +1373,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformEffectRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformEffectRecordMapper.xml
index a000f0de43d3dda0924573c708362e15ba416799..b5905a8bf1df370716512ba3b642651698d613db 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformEffectRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformEffectRecordMapper.xml
@@ -29,6 +29,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -108,23 +110,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="PerformEffectRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_effect_record
- (staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_effect_record
- (staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -233,6 +241,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -456,6 +470,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1112,6 +1140,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1245,6 +1315,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformGoworkRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformGoworkRecordMapper.xml
index 192eeb8f78f0c7d1e69e340ec7fd16d1d30a794f..c5b5099b2c3fee4a50e1610f3bb2a675080ed6b7 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformGoworkRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformGoworkRecordMapper.xml
@@ -28,6 +28,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -104,23 +106,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="PerformGoworkRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_gowork_record
- (staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_gowork_record
- (staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -220,6 +228,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -426,6 +440,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1055,6 +1083,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1183,6 +1253,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformOtherRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformOtherRecordMapper.xml
index b368db4ea13d0d4b3452538b78478cad0dffcad0..cc74d14449773bcfd672239efc8db4d6a160f0ea 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformOtherRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformOtherRecordMapper.xml
@@ -28,6 +28,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -104,23 +106,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="PerformOtherRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_other_record
- (staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_other_record
- (staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -226,6 +234,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -442,6 +456,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1083,6 +1111,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1211,6 +1281,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformReviewRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformReviewRecordMapper.xml
index 6f2f77e1dedeee8e203b26ccacd411e2d5fc3d44..ad38a949774db1874aca8df9615e8b2595a93983 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformReviewRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformReviewRecordMapper.xml
@@ -28,6 +28,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="fileNames" column="fileNames" />
+ <result property="filePaths" column="filePaths" />
</resultMap>
@@ -104,23 +106,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileNames') or colPickMode == 1 and data.containsKey('fileNames')))">
+ a.fileNames,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
+ a.filePaths,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="PerformReviewRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_perform_review_record
- (staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
- (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_perform_review_record
- (staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime)
+ (staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
</foreach>
</insert>
@@ -223,6 +231,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('fileNames')) or (colPickMode==1 and !data.containsKey('fileNames'))">
+ a.fileNames=#{data.fileNames},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
+ a.filePaths=#{data.filePaths},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -434,6 +448,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="fileNames=(case" suffix="ELSE fileNames end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('fileNames')) or (colPickMode==1 and !item.containsKey('fileNames'))">
+ when a.id=#{item.id} then #{item.fileNames}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="filePaths=(case" suffix="ELSE filePaths end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('filePaths')) or (colPickMode==1 and !item.containsKey('filePaths'))">
+ when a.id=#{item.id} then #{item.filePaths}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1069,6 +1097,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('fileNames')">
+ <if test="conditionParamRef.fileNames != null and conditionParamRef.fileNames != ''">
+ ${_conditionType_} a.fileNames like #{${_conditionParam_}.fileNames}
+ </if>
+ <if test="conditionParamRef.fileNames == null">
+ ${_conditionType_} a.fileNames is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesList') and conditionParamRef.fileNamesList.size() > 0">
+ ${_conditionType_} a.fileNames in
+ <foreach collection="conditionParamRef.fileNamesList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('fileNamesNotList') and conditionParamRef.fileNamesNotList.size() > 0">
+ ${_conditionType_} a.fileNames not in
+ <foreach collection="conditionParamRef.fileNamesNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('filePaths')">
+ <if test="conditionParamRef.filePaths != null and conditionParamRef.filePaths != ''">
+ ${_conditionType_} a.filePaths like #{${_conditionParam_}.filePaths}
+ </if>
+ <if test="conditionParamRef.filePaths == null">
+ ${_conditionType_} a.filePaths is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsList') and conditionParamRef.filePathsList.size() > 0">
+ ${_conditionType_} a.filePaths in
+ <foreach collection="conditionParamRef.filePathsList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('filePathsNotList') and conditionParamRef.filePathsNotList.size() > 0">
+ ${_conditionType_} a.filePaths not in
+ <foreach collection="conditionParamRef.filePathsNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1197,6 +1267,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('fileNames')">
+ a.fileNames
+ <if test='orderCol.fileNames != null and "DESC".equalsIgnoreCase(orderCol.fileNames)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('filePaths')">
+ a.filePaths
+ <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/db/add.sql b/db/add.sql
index 7bb2232fa820500816d07402f36304be1738ec4c..b611feb6b07520b2c9d54254117a7dd4a8a8b2ba 100644
--- a/db/add.sql
+++ b/db/add.sql
@@ -278,3 +278,54 @@ PRIMARY KEY (`id`)
-- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '鍛樺伐鍙嶉闂嵎-鑿滃崟绠＄悊-鏌ョ湅', '/feedback/staff/list,/feedback/staff/view,/feedback/staff/info,/feedback/staff/export,/feedback/staff/exportExcel,/feedback/staff/downloadTemplate,/feedback/staff/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '鍛樺伐鍙嶉闂嵎-鑿滃崟绠＄悊-缁存姢', '/feedback/staff/add,/feedback/staff/edit,/feedback/staff/delete,/feedback/staff/logicDelete,/feedback/staff/save,/feedback/staff/importData', 3, 0, NULL, NULL, NULL, 0);
+
+
+
+-- ----------------------------
+2023-7-08
+-- ----------------------------
+
+ALTER TABLE mortals_xhx_user ADD COLUMN `customerId` bigint(20) DEFAULT -1 COMMENT '鍛樺伐id' AFTER status;
+
+
+ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `remark` varchar(256) DEFAULT '' COMMENT '澶囨敞' AFTER checkStatus;
+ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_perform_review_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_perform_review_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+
+ALTER TABLE mortals_xhx_perform_complain_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_perform_complain_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+
+ALTER TABLE mortals_xhx_perform_gowork_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_perform_gowork_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+
+ALTER TABLE mortals_xhx_perform_effect_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_perform_effect_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+
+ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
+ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `fileNames` varchar(256) DEFAULT '' COMMENT '闄勪欢鍚嶇О锛屽涓€楀彿鍒嗗壊' AFTER remark;
+ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `filePaths` varchar(256) DEFAULT '' COMMENT '闄勪欢涓嬭浇鍦板潃锛屽涓€楀彿鍒嗗壊' AFTER fileNames;
+
diff --git "a/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" "b/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx"
index 8e79bfe153dcdef13e2aa9cb54d4d9c64cffe215..1e110f326a54e3da991d0d5aa76b3c0cbc0d7d82 100644
Binary files "a/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" and "b/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" differ