diff --git a/base-manager/db/add.sql b/base-manager/db/add.sql
index e6198041c0cfcfb19f8eea4fdb1b8f848ee29a74..beaed64eec0befebe62420f01cf82b7e4b7c6611 100644
--- a/base-manager/db/add.sql
+++ b/base-manager/db/add.sql
@@ -235,4 +235,10 @@ ALTER TABLE mortals_sys_site_matter ADD COLUMN `agentPost` varchar(64) CO
UPDATE mortals_sys_skin_base SET imageResolution="1920x1080" WHERE imageResolution="1";
UPDATE mortals_sys_skin_base SET imageResolution="1080x1920" WHERE imageResolution="2";
-UPDATE mortals_sys_skin_base SET imageResolution="1280x1280" WHERE imageResolution="3";
\ No newline at end of file
+UPDATE mortals_sys_skin_base SET imageResolution="1280x1280" WHERE imageResolution="3";
+
+
+-- ----------------------------
+2024-03-08
+-- ----------------------------
+ALTER TABLE mortals_sys_site_matter ADD COLUMN `hallCheckIn` tinyint(2) DEFAULT '0' COMMENT '澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)' AFTER agentPost;
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java b/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java
index ec5e9bd6b7755bceaf6b3a3b75701b064929086c..3f48b6a2c8f5745213ec5149d9a95e14d0fbdee0 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java
@@ -13,7 +13,7 @@ import lombok.Data;
* 绔欑偣浜嬮」瀹炰綋瀵硅薄
*
* @author zxfei
- * @date 2024-01-04
+ * @date 2024-03-09
*/
@Data
public class SiteMatterEntity extends SiteMatterVo {
@@ -35,6 +35,10 @@ public class SiteMatterEntity extends SiteMatterVo {
* 浜嬮」鍚嶇О
*/
private String matterName;
+ /**
+ * 浜嬮」缂栫爜
+ */
+ private String matterCode;
/**
* 閮ㄩ棬ID
*/
@@ -43,10 +47,6 @@ public class SiteMatterEntity extends SiteMatterVo {
* 閮ㄩ棬鍚嶇О
*/
private String deptName;
- /**
- * 浜嬮」缂栫爜
- */
- private String matterCode;
/**
* 浜嬮」绫诲瀷
*/
@@ -83,6 +83,10 @@ public class SiteMatterEntity extends SiteMatterVo {
* 鑱屽姟
*/
private String agentPost;
+ /**
+ * 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ */
+ private Integer hallCheckIn;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -104,9 +108,9 @@ public class SiteMatterEntity extends SiteMatterVo {
this.siteName = "";
this.matterId = null;
this.matterName = "";
+ this.matterCode = "";
this.deptId = null;
this.deptName = "";
- this.matterCode = "";
this.eventTypeShow = "";
this.source = 0;
this.hot = 0;
@@ -116,5 +120,6 @@ public class SiteMatterEntity extends SiteMatterVo {
this.agentName = "";
this.agentPhone = "";
this.agentPost = "";
+ this.hallCheckIn = 0;
}
}
\ No newline at end of file
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java b/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java
index cd238960756f632be2a4c46a2fdbd1b01ff50b41..68836ebf7229dec566943081f85ffd76d6e0d253 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java
@@ -6,7 +6,7 @@ import com.mortals.xhx.module.site.model.SiteMatterEntity;
* 绔欑偣浜嬮」鏌ヨ瀵硅薄
*
* @author zxfei
- * @date 2024-01-04
+ * @date 2024-03-09
*/
public class SiteMatterQuery extends SiteMatterEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -64,33 +64,11 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 浜嬮」鍚嶇О鎺掗櫎鍒楄〃 */
private List <String> matterNameNotList;
- /** 寮€濮� 鍒涘缓鏃堕棿 */
- private String createTimeStart;
-
- /** 缁撴潫 鍒涘缓鏃堕棿 */
- private String createTimeEnd;
-
- /** 寮€濮� 鍒涘缓鐢ㄦ埛 */
- private Long createUserIdStart;
-
- /** 缁撴潫 鍒涘缓鐢ㄦ埛 */
- private Long createUserIdEnd;
-
- /** 澧炲姞 鍒涘缓鐢ㄦ埛 */
- private Long createUserIdIncrement;
-
- /** 鍒涘缓鐢ㄦ埛鍒楄〃 */
- private List <Long> createUserIdList;
-
- /** 鍒涘缓鐢ㄦ埛鎺掗櫎鍒楄〃 */
- private List <Long> createUserIdNotList;
-
- /** 寮€濮� 淇敼鏃堕棿 */
- private String updateTimeStart;
-
- /** 缁撴潫 淇敼鏃堕棿 */
- private String updateTimeEnd;
+ /** 浜嬮」缂栫爜 */
+ private List<String> matterCodeList;
+ /** 浜嬮」缂栫爜鎺掗櫎鍒楄〃 */
+ private List <String> matterCodeNotList;
/** 寮€濮� 閮ㄩ棬ID */
private Long deptIdStart;
@@ -111,11 +89,6 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 閮ㄩ棬鍚嶇О鎺掗櫎鍒楄〃 */
private List <String> deptNameNotList;
- /** 浜嬮」缂栫爜 */
- private List<String> matterCodeList;
-
- /** 浜嬮」缂栫爜鎺掗櫎鍒楄〃 */
- private List <String> matterCodeNotList;
/** 浜嬮」绫诲瀷 */
private List<String> eventTypeShowList;
@@ -201,6 +174,48 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 鑱屽姟鎺掗櫎鍒楄〃 */
private List <String> agentPostNotList;
+ /** 寮€濮� 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�) */
+ private Integer hallCheckInStart;
+
+ /** 缁撴潫 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�) */
+ private Integer hallCheckInEnd;
+
+ /** 澧炲姞 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�) */
+ private Integer hallCheckInIncrement;
+
+ /** 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)鍒楄〃 */
+ private List <Integer> hallCheckInList;
+
+ /** 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)鎺掗櫎鍒楄〃 */
+ private List <Integer> hallCheckInNotList;
+
+ /** 寮€濮� 鍒涘缓鏃堕棿 */
+ private String createTimeStart;
+
+ /** 缁撴潫 鍒涘缓鏃堕棿 */
+ private String createTimeEnd;
+
+ /** 寮€濮� 鍒涘缓鐢ㄦ埛 */
+ private Long createUserIdStart;
+
+ /** 缁撴潫 鍒涘缓鐢ㄦ埛 */
+ private Long createUserIdEnd;
+
+ /** 澧炲姞 鍒涘缓鐢ㄦ埛 */
+ private Long createUserIdIncrement;
+
+ /** 鍒涘缓鐢ㄦ埛鍒楄〃 */
+ private List <Long> createUserIdList;
+
+ /** 鍒涘缓鐢ㄦ埛鎺掗櫎鍒楄〃 */
+ private List <Long> createUserIdNotList;
+
+ /** 寮€濮� 淇敼鏃堕棿 */
+ private String updateTimeStart;
+
+ /** 缁撴潫 淇敼鏃堕棿 */
+ private String updateTimeEnd;
+
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<SiteMatterQuery> orConditionList;
@@ -517,148 +532,35 @@ public class SiteMatterQuery extends SiteMatterEntity {
}
/**
- * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
- * @return createTimeStart
- */
- public String getCreateTimeStart(){
- return this.createTimeStart;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
- * @param createTimeStart
- */
- public void setCreateTimeStart(String createTimeStart){
- this.createTimeStart = createTimeStart;
- }
-
- /**
- * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
- * @return createTimeEnd
- */
- public String getCreateTimeEnd(){
- return this.createTimeEnd;
- }
-
- /**
- * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
- * @param createTimeEnd
- */
- public void setCreateTimeEnd(String createTimeEnd){
- this.createTimeEnd = createTimeEnd;
- }
-
- /**
- * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
- * @return createUserIdStart
- */
- public Long getCreateUserIdStart(){
- return this.createUserIdStart;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
- * @param createUserIdStart
- */
- public void setCreateUserIdStart(Long createUserIdStart){
- this.createUserIdStart = createUserIdStart;
- }
-
- /**
- * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
- * @return $createUserIdEnd
- */
- public Long getCreateUserIdEnd(){
- return this.createUserIdEnd;
- }
-
- /**
- * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
- * @param createUserIdEnd
- */
- public void setCreateUserIdEnd(Long createUserIdEnd){
- this.createUserIdEnd = createUserIdEnd;
- }
-
- /**
- * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
- * @return createUserIdIncrement
- */
- public Long getCreateUserIdIncrement(){
- return this.createUserIdIncrement;
- }
-
- /**
- * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
- * @param createUserIdIncrement
- */
- public void setCreateUserIdIncrement(Long createUserIdIncrement){
- this.createUserIdIncrement = createUserIdIncrement;
- }
-
- /**
- * 鑾峰彇 鍒涘缓鐢ㄦ埛
- * @return createUserIdList
- */
- public List<Long> getCreateUserIdList(){
- return this.createUserIdList;
- }
-
- /**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
- * @param createUserIdList
- */
- public void setCreateUserIdList(List<Long> createUserIdList){
- this.createUserIdList = createUserIdList;
- }
-
- /**
- * 鑾峰彇 鍒涘缓鐢ㄦ埛
- * @return createUserIdNotList
- */
- public List<Long> getCreateUserIdNotList(){
- return this.createUserIdNotList;
- }
-
- /**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
- * @param createUserIdNotList
- */
- public void setCreateUserIdNotList(List<Long> createUserIdNotList){
- this.createUserIdNotList = createUserIdNotList;
- }
-
-
- /**
- * 鑾峰彇 寮€濮� 淇敼鏃堕棿
- * @return updateTimeStart
+ * 鑾峰彇 浜嬮」缂栫爜
+ * @return matterCodeList
*/
- public String getUpdateTimeStart(){
- return this.updateTimeStart;
+ public List<String> getMatterCodeList(){
+ return this.matterCodeList;
}
/**
- * 璁剧疆 寮€濮� 淇敼鏃堕棿
- * @param updateTimeStart
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCodeList
*/
- public void setUpdateTimeStart(String updateTimeStart){
- this.updateTimeStart = updateTimeStart;
+ public void setMatterCodeList(List<String> matterCodeList){
+ this.matterCodeList = matterCodeList;
}
/**
- * 鑾峰彇 缁撴潫 淇敼鏃堕棿
- * @return updateTimeEnd
+ * 鑾峰彇 浜嬮」缂栫爜
+ * @return matterCodeNotList
*/
- public String getUpdateTimeEnd(){
- return this.updateTimeEnd;
+ public List<String> getMatterCodeNotList(){
+ return this.matterCodeNotList;
}
/**
- * 璁剧疆 缁撴潫 淇敼鏃堕棿
- * @param updateTimeEnd
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCodeNotList
*/
- public void setUpdateTimeEnd(String updateTimeEnd){
- this.updateTimeEnd = updateTimeEnd;
+ public void setMatterCodeNotList(List<String> matterCodeNotList){
+ this.matterCodeNotList = matterCodeNotList;
}
/**
@@ -774,38 +676,6 @@ public class SiteMatterQuery extends SiteMatterEntity {
this.deptNameNotList = deptNameNotList;
}
- /**
- * 鑾峰彇 浜嬮」缂栫爜
- * @return matterCodeList
- */
- public List<String> getMatterCodeList(){
- return this.matterCodeList;
- }
-
- /**
- * 璁剧疆 浜嬮」缂栫爜
- * @param matterCodeList
- */
- public void setMatterCodeList(List<String> matterCodeList){
- this.matterCodeList = matterCodeList;
- }
-
- /**
- * 鑾峰彇 浜嬮」缂栫爜
- * @return matterCodeNotList
- */
- public List<String> getMatterCodeNotList(){
- return this.matterCodeNotList;
- }
-
- /**
- * 璁剧疆 浜嬮」缂栫爜
- * @param matterCodeNotList
- */
- public void setMatterCodeNotList(List<String> matterCodeNotList){
- this.matterCodeNotList = matterCodeNotList;
- }
-
/**
* 鑾峰彇 浜嬮」绫诲瀷
* @return eventTypeShowList
@@ -1291,26 +1161,252 @@ public class SiteMatterQuery extends SiteMatterEntity {
}
/**
- * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
- * @param id
+ * 鑾峰彇 寮€濮� 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @return hallCheckInStart
*/
- public SiteMatterQuery id(Long id){
- setId(id);
- return this;
+ public Integer getHallCheckInStart(){
+ return this.hallCheckInStart;
}
/**
- * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
- * @param idStart
+ * 璁剧疆 寮€濮� 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckInStart
*/
- public SiteMatterQuery idStart(Long idStart){
- this.idStart = idStart;
- return this;
+ public void setHallCheckInStart(Integer hallCheckInStart){
+ this.hallCheckInStart = hallCheckInStart;
}
/**
- * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
- * @param idEnd
+ * 鑾峰彇 缁撴潫 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @return $hallCheckInEnd
+ */
+ public Integer getHallCheckInEnd(){
+ return this.hallCheckInEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckInEnd
+ */
+ public void setHallCheckInEnd(Integer hallCheckInEnd){
+ this.hallCheckInEnd = hallCheckInEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @return hallCheckInIncrement
+ */
+ public Integer getHallCheckInIncrement(){
+ return this.hallCheckInIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckInIncrement
+ */
+ public void setHallCheckInIncrement(Integer hallCheckInIncrement){
+ this.hallCheckInIncrement = hallCheckInIncrement;
+ }
+
+ /**
+ * 鑾峰彇 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @return hallCheckInList
+ */
+ public List<Integer> getHallCheckInList(){
+ return this.hallCheckInList;
+ }
+
+ /**
+ * 璁剧疆 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckInList
+ */
+ public void setHallCheckInList(List<Integer> hallCheckInList){
+ this.hallCheckInList = hallCheckInList;
+ }
+
+ /**
+ * 鑾峰彇 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @return hallCheckInNotList
+ */
+ public List<Integer> getHallCheckInNotList(){
+ return this.hallCheckInNotList;
+ }
+
+ /**
+ * 璁剧疆 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckInNotList
+ */
+ public void setHallCheckInNotList(List<Integer> hallCheckInNotList){
+ this.hallCheckInNotList = hallCheckInNotList;
+ }
+
+
+ /**
+ * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+ * @return createTimeStart
+ */
+ public String getCreateTimeStart(){
+ return this.createTimeStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
+ * @param createTimeStart
+ */
+ public void setCreateTimeStart(String createTimeStart){
+ this.createTimeStart = createTimeStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
+ * @return createTimeEnd
+ */
+ public String getCreateTimeEnd(){
+ return this.createTimeEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
+ * @param createTimeEnd
+ */
+ public void setCreateTimeEnd(String createTimeEnd){
+ this.createTimeEnd = createTimeEnd;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @return createUserIdStart
+ */
+ public Long getCreateUserIdStart(){
+ return this.createUserIdStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @param createUserIdStart
+ */
+ public void setCreateUserIdStart(Long createUserIdStart){
+ this.createUserIdStart = createUserIdStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @return $createUserIdEnd
+ */
+ public Long getCreateUserIdEnd(){
+ return this.createUserIdEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @param createUserIdEnd
+ */
+ public void setCreateUserIdEnd(Long createUserIdEnd){
+ this.createUserIdEnd = createUserIdEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @return createUserIdIncrement
+ */
+ public Long getCreateUserIdIncrement(){
+ return this.createUserIdIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @param createUserIdIncrement
+ */
+ public void setCreateUserIdIncrement(Long createUserIdIncrement){
+ this.createUserIdIncrement = createUserIdIncrement;
+ }
+
+ /**
+ * 鑾峰彇 鍒涘缓鐢ㄦ埛
+ * @return createUserIdList
+ */
+ public List<Long> getCreateUserIdList(){
+ return this.createUserIdList;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdList
+ */
+ public void setCreateUserIdList(List<Long> createUserIdList){
+ this.createUserIdList = createUserIdList;
+ }
+
+ /**
+ * 鑾峰彇 鍒涘缓鐢ㄦ埛
+ * @return createUserIdNotList
+ */
+ public List<Long> getCreateUserIdNotList(){
+ return this.createUserIdNotList;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdNotList
+ */
+ public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+ this.createUserIdNotList = createUserIdNotList;
+ }
+
+
+ /**
+ * 鑾峰彇 寮€濮� 淇敼鏃堕棿
+ * @return updateTimeStart
+ */
+ public String getUpdateTimeStart(){
+ return this.updateTimeStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 淇敼鏃堕棿
+ * @param updateTimeStart
+ */
+ public void setUpdateTimeStart(String updateTimeStart){
+ this.updateTimeStart = updateTimeStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 淇敼鏃堕棿
+ * @return updateTimeEnd
+ */
+ public String getUpdateTimeEnd(){
+ return this.updateTimeEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 淇敼鏃堕棿
+ * @param updateTimeEnd
+ */
+ public void setUpdateTimeEnd(String updateTimeEnd){
+ this.updateTimeEnd = updateTimeEnd;
+ }
+
+ /**
+ * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+ * @param id
+ */
+ public SiteMatterQuery id(Long id){
+ setId(id);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+ * @param idStart
+ */
+ public SiteMatterQuery idStart(Long idStart){
+ this.idStart = idStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+ * @param idEnd
*/
public SiteMatterQuery idEnd(Long idEnd){
this.idEnd = idEnd;
@@ -1492,60 +1588,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
/**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
- * @param createUserId
- */
- public SiteMatterQuery createUserId(Long createUserId){
- setCreateUserId(createUserId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
- * @param createUserIdStart
- */
- public SiteMatterQuery createUserIdStart(Long createUserIdStart){
- this.createUserIdStart = createUserIdStart;
- return this;
- }
-
- /**
- * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
- * @param createUserIdEnd
- */
- public SiteMatterQuery createUserIdEnd(Long createUserIdEnd){
- this.createUserIdEnd = createUserIdEnd;
- return this;
- }
-
- /**
- * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
- * @param createUserIdIncrement
- */
- public SiteMatterQuery createUserIdIncrement(Long createUserIdIncrement){
- this.createUserIdIncrement = createUserIdIncrement;
- return this;
- }
-
- /**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
- * @param createUserIdList
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCode
*/
- public SiteMatterQuery createUserIdList(List<Long> createUserIdList){
- this.createUserIdList = createUserIdList;
+ public SiteMatterQuery matterCode(String matterCode){
+ setMatterCode(matterCode);
return this;
}
/**
- * 璁剧疆 鍒涘缓鐢ㄦ埛
- * @param createUserIdNotList
+ * 璁剧疆 浜嬮」缂栫爜
+ * @param matterCodeList
*/
- public SiteMatterQuery createUserIdNotList(List<Long> createUserIdNotList){
- this.createUserIdNotList = createUserIdNotList;
+ public SiteMatterQuery matterCodeList(List<String> matterCodeList){
+ this.matterCodeList = matterCodeList;
return this;
}
-
/**
* 璁剧疆 閮ㄩ棬ID
* @param deptId
@@ -1620,25 +1679,6 @@ public class SiteMatterQuery extends SiteMatterEntity {
}
- /**
- * 璁剧疆 浜嬮」缂栫爜
- * @param matterCode
- */
- public SiteMatterQuery matterCode(String matterCode){
- setMatterCode(matterCode);
- return this;
- }
-
- /**
- * 璁剧疆 浜嬮」缂栫爜
- * @param matterCodeList
- */
- public SiteMatterQuery matterCodeList(List<String> matterCodeList){
- this.matterCodeList = matterCodeList;
- return this;
- }
-
-
/**
* 璁剧疆 浜嬮」绫诲瀷
* @param eventTypeShow
@@ -1949,6 +1989,116 @@ public class SiteMatterQuery extends SiteMatterEntity {
return this;
}
+ /**
+ * 璁剧疆 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckIn
+ */
+ public SiteMatterQuery hallCheckIn(Integer hallCheckIn){
+ setHallCheckIn(hallCheckIn);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckInStart
+ */
+ public SiteMatterQuery hallCheckInStart(Integer hallCheckInStart){
+ this.hallCheckInStart = hallCheckInStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckInEnd
+ */
+ public SiteMatterQuery hallCheckInEnd(Integer hallCheckInEnd){
+ this.hallCheckInEnd = hallCheckInEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckInIncrement
+ */
+ public SiteMatterQuery hallCheckInIncrement(Integer hallCheckInIncrement){
+ this.hallCheckInIncrement = hallCheckInIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckInList
+ */
+ public SiteMatterQuery hallCheckInList(List<Integer> hallCheckInList){
+ this.hallCheckInList = hallCheckInList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澶у巺浜嬮」鍏ラ┗(0.鍚�,1.鏄�)
+ * @param hallCheckInNotList
+ */
+ public SiteMatterQuery hallCheckInNotList(List<Integer> hallCheckInNotList){
+ this.hallCheckInNotList = hallCheckInNotList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserId
+ */
+ public SiteMatterQuery createUserId(Long createUserId){
+ setCreateUserId(createUserId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @param createUserIdStart
+ */
+ public SiteMatterQuery createUserIdStart(Long createUserIdStart){
+ this.createUserIdStart = createUserIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @param createUserIdEnd
+ */
+ public SiteMatterQuery createUserIdEnd(Long createUserIdEnd){
+ this.createUserIdEnd = createUserIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @param createUserIdIncrement
+ */
+ public SiteMatterQuery createUserIdIncrement(Long createUserIdIncrement){
+ this.createUserIdIncrement = createUserIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdList
+ */
+ public SiteMatterQuery createUserIdList(List<Long> createUserIdList){
+ this.createUserIdList = createUserIdList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdNotList
+ */
+ public SiteMatterQuery createUserIdNotList(List<Long> createUserIdNotList){
+ this.createUserIdNotList = createUserIdNotList;
+ 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/base-manager/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml b/base-manager/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml
index 9f9bddd22408582259a58086436cf4f33b3fa982..4877ead88d749e86afac628abd2c788d79b6124b 100644
--- a/base-manager/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml
+++ b/base-manager/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml
@@ -10,12 +10,9 @@
<result property="siteName" column="siteName" />
<result property="matterId" column="matterId" />
<result property="matterName" column="matterName" />
- <result property="createTime" column="createTime" />
- <result property="createUserId" column="createUserId" />
- <result property="updateTime" column="updateTime" />
+ <result property="matterCode" column="matterCode" />
<result property="deptId" column="deptId" />
<result property="deptName" column="deptName" />
- <result property="matterCode" column="matterCode" />
<result property="eventTypeShow" column="eventTypeShow" />
<result property="source" column="source" />
<result property="hot" column="hot" />
@@ -25,6 +22,10 @@
<result property="agentName" column="agentName" />
<result property="agentPhone" column="agentPhone" />
<result property="agentPost" column="agentPost" />
+ <result property="hallCheckIn" column="hallCheckIn" />
+ <result property="createTime" column="createTime" />
+ <result property="createUserId" column="createUserId" />
+ <result property="updateTime" column="updateTime" />
</resultMap>
@@ -47,14 +48,8 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
a.matterName,
</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('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
- a.createUserId,
- </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 test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))">
+ a.matterCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
a.deptId,
@@ -62,9 +57,6 @@
<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('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))">
- a.matterCode,
- </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eventTypeShow') or colPickMode == 1 and data.containsKey('eventTypeShow')))">
a.eventTypeShow,
</if>
@@ -92,23 +84,35 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('agentPost') or colPickMode == 1 and data.containsKey('agentPost')))">
a.agentPost,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallCheckIn') or colPickMode == 1 and data.containsKey('hallCheckIn')))">
+ a.hallCheckIn,
+ </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('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+ a.createUserId,
+ </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>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="SiteMatterEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site_matter
- (siteId,siteName,matterId,matterName,createTime,createUserId,updateTime,deptId,deptName,matterCode,eventTypeShow,source,hot,display,deptCode,agent,agentName,agentPhone,agentPost)
+ (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,eventTypeShow,source,hot,display,deptCode,agent,agentName,agentPhone,agentPost,hallCheckIn,createTime,createUserId,updateTime)
VALUES
- (#{siteId},#{siteName},#{matterId},#{matterName},#{createTime},#{createUserId},#{updateTime},#{deptId},#{deptName},#{matterCode},#{eventTypeShow},#{source},#{hot},#{display},#{deptCode},#{agent},#{agentName},#{agentPhone},#{agentPost})
+ (#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{eventTypeShow},#{source},#{hot},#{display},#{deptCode},#{agent},#{agentName},#{agentPhone},#{agentPost},#{hallCheckIn},#{createTime},#{createUserId},#{updateTime})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site_matter
- (siteId,siteName,matterId,matterName,createTime,createUserId,updateTime,deptId,deptName,matterCode,eventTypeShow,source,hot,display,deptCode,agent,agentName,agentPhone,agentPost)
+ (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,eventTypeShow,source,hot,display,deptCode,agent,agentName,agentPhone,agentPost,hallCheckIn,createTime,createUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.deptId},#{item.deptName},#{item.matterCode},#{item.eventTypeShow},#{item.source},#{item.hot},#{item.display},#{item.deptCode},#{item.agent},#{item.agentName},#{item.agentPhone},#{item.agentPost})
+ (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.eventTypeShow},#{item.source},#{item.hot},#{item.display},#{item.deptCode},#{item.agent},#{item.agentName},#{item.agentPhone},#{item.agentPost},#{item.hallCheckIn},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach>
</insert>
@@ -136,17 +140,8 @@
<if test="(colPickMode==0 and data.containsKey('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
a.matterName=#{data.matterName},
</if>
- <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
- a.createTime=#{data.createTime},
- </if>
- <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
- a.createUserId=#{data.createUserId},
- </if>
- <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
- a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
- </if>
- <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
- a.updateTime=#{data.updateTime},
+ <if test="(colPickMode==0 and data.containsKey('matterCode')) or (colPickMode==1 and !data.containsKey('matterCode'))">
+ a.matterCode=#{data.matterCode},
</if>
<if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
a.deptId=#{data.deptId},
@@ -157,9 +152,6 @@
<if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
a.deptName=#{data.deptName},
</if>
- <if test="(colPickMode==0 and data.containsKey('matterCode')) or (colPickMode==1 and !data.containsKey('matterCode'))">
- a.matterCode=#{data.matterCode},
- </if>
<if test="(colPickMode==0 and data.containsKey('eventTypeShow')) or (colPickMode==1 and !data.containsKey('eventTypeShow'))">
a.eventTypeShow=#{data.eventTypeShow},
</if>
@@ -199,6 +191,24 @@
<if test="(colPickMode==0 and data.containsKey('agentPost')) or (colPickMode==1 and !data.containsKey('agentPost'))">
a.agentPost=#{data.agentPost},
</if>
+ <if test="(colPickMode==0 and data.containsKey('hallCheckIn')) or (colPickMode==1 and !data.containsKey('hallCheckIn'))">
+ a.hallCheckIn=#{data.hallCheckIn},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('hallCheckInIncrement')) or (colPickMode==1 and !data.containsKey('hallCheckInIncrement'))">
+ a.hallCheckIn=ifnull(a.hallCheckIn,0) + #{data.hallCheckInIncrement},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+ a.createTime=#{data.createTime},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+ a.createUserId=#{data.createUserId},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+ a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+ a.updateTime=#{data.updateTime},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -249,29 +259,10 @@
</if>
</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="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="updateTime=(case" suffix="ELSE updateTime end),">
+ <trim prefix="matterCode=(case" suffix="ELSE matterCode 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 test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))">
+ when a.id=#{item.id} then #{item.matterCode}
</if>
</foreach>
</trim>
@@ -294,13 +285,6 @@
</if>
</foreach>
</trim>
- <trim prefix="matterCode=(case" suffix="ELSE matterCode end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))">
- when a.id=#{item.id} then #{item.matterCode}
- </if>
- </foreach>
- </trim>
<trim prefix="eventTypeShow=(case" suffix="ELSE eventTypeShow end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('eventTypeShow')) or (colPickMode==1 and !item.containsKey('eventTypeShow'))">
@@ -384,6 +368,44 @@
</if>
</foreach>
</trim>
+ <trim prefix="hallCheckIn=(case" suffix="ELSE hallCheckIn end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('hallCheckIn')) or (colPickMode==1 and !item.containsKey('hallCheckIn'))">
+ when a.id=#{item.id} then #{item.hallCheckIn}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('hallCheckInIncrement')) or (colPickMode==1 and !item.containsKey('hallCheckInIncrement'))">
+ when a.id=#{item.id} then ifnull(a.hallCheckIn,0) + #{item.hallCheckInIncrement}
+ </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="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="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>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -624,62 +646,26 @@
</foreach>
</if>
- <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.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('createUserId')">
- <if test="conditionParamRef.createUserId != null ">
- ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+ <if test="conditionParamRef.containsKey('matterCode')">
+ <if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
+ ${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode}
</if>
- <if test="conditionParamRef.createUserId == null">
- ${_conditionType_} a.createUserId is null
+ <if test="conditionParamRef.matterCode == null">
+ ${_conditionType_} a.matterCode is null
</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=",">
+ <if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0">
+ ${_conditionType_} a.matterCode in
+ <foreach collection="conditionParamRef.matterCodeList" 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=",">
+ <if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0">
+ ${_conditionType_} a.matterCode not in
+ <foreach collection="conditionParamRef.matterCodeNotList" 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('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.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('deptId')">
<if test="conditionParamRef.deptId != null ">
${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
@@ -729,27 +715,6 @@
</foreach>
</if>
- <if test="conditionParamRef.containsKey('matterCode')">
- <if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
- ${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode}
- </if>
- <if test="conditionParamRef.matterCode == null">
- ${_conditionType_} a.matterCode is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0">
- ${_conditionType_} a.matterCode in
- <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0">
- ${_conditionType_} a.matterCode not in
- <foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
-
<if test="conditionParamRef.containsKey('eventTypeShow')">
<if test="conditionParamRef.eventTypeShow != null and conditionParamRef.eventTypeShow != ''">
${_conditionType_} a.eventTypeShow like #{${_conditionParam_}.eventTypeShow}
@@ -962,6 +927,90 @@
#{item}
</foreach>
</if>
+ <if test="conditionParamRef.containsKey('hallCheckIn')">
+ <if test="conditionParamRef.hallCheckIn != null ">
+ ${_conditionType_} a.hallCheckIn = #{${_conditionParam_}.hallCheckIn}
+ </if>
+ <if test="conditionParamRef.hallCheckIn == null">
+ ${_conditionType_} a.hallCheckIn is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('hallCheckInList') and conditionParamRef.hallCheckInList.size() > 0">
+ ${_conditionType_} a.hallCheckIn in
+ <foreach collection="conditionParamRef.hallCheckInList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('hallCheckInNotList') and conditionParamRef.hallCheckInNotList.size() > 0">
+ ${_conditionType_} a.hallCheckIn not in
+ <foreach collection="conditionParamRef.hallCheckInNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('hallCheckInStart') and conditionParamRef.hallCheckInStart != null">
+ ${_conditionType_} a.hallCheckIn <![CDATA[ >= ]]> #{${_conditionParam_}.hallCheckInStart}
+ </if>
+ <if test="conditionParamRef.containsKey('hallCheckInEnd') and conditionParamRef.hallCheckInEnd != null">
+ ${_conditionType_} a.hallCheckIn <![CDATA[ <= ]]> #{${_conditionParam_}.hallCheckInEnd}
+ </if>
+
+
+ <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.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('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.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('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.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>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -987,13 +1036,6 @@
</foreach>
,
</if>
- <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
- field(a.createUserId,
- <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- ,
- </if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
@@ -1029,6 +1071,20 @@
</foreach>
,
</if>
+ <if test="conditionParamRef.containsKey('hallCheckInList') and conditionParamRef.hallCheckInList.size() > 0">
+ field(a.hallCheckIn,
+ <foreach collection="conditionParamRef.hallCheckInList" open="" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ ,
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+ field(a.createUserId,
+ <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ ,
+ </if>
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
a.${item.colName} ${item.sortKind}
@@ -1058,13 +1114,6 @@
</foreach>
,
</if>
- <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
- field(a.createUserId,
- <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- ,
- </if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
@@ -1100,6 +1149,20 @@
</foreach>
,
</if>
+ <if test="conditionParamRef.containsKey('hallCheckInList') and conditionParamRef.hallCheckInList.size() > 0">
+ field(a.hallCheckIn,
+ <foreach collection="conditionParamRef.hallCheckInList" open="" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ ,
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+ field(a.createUserId,
+ <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ ,
+ </if>
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
@@ -1126,19 +1189,9 @@
<if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>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('createUserId')">
- a.createUserId
- <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('updateTime')">
- a.updateTime
- <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+ <if test="orderCol.containsKey('matterCode')">
+ a.matterCode
+ <if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deptId')">
@@ -1151,11 +1204,6 @@
<if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
,
</if>
- <if test="orderCol.containsKey('matterCode')">
- a.matterCode
- <if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if>
- ,
- </if>
<if test="orderCol.containsKey('eventTypeShow')">
a.eventTypeShow
<if test='orderCol.eventTypeShow != null and "DESC".equalsIgnoreCase(orderCol.eventTypeShow)'>DESC</if>
@@ -1201,6 +1249,26 @@
<if test='orderCol.agentPost != null and "DESC".equalsIgnoreCase(orderCol.agentPost)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('hallCheckIn')">
+ a.hallCheckIn
+ <if test='orderCol.hallCheckIn != null and "DESC".equalsIgnoreCase(orderCol.hallCheckIn)'>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('createUserId')">
+ a.createUserId
+ <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('updateTime')">
+ a.updateTime
+ <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+ ,
+ </if>
</trim>
</if>