diff --git a/base-manager/db/add.sql b/base-manager/db/add.sql
index b295affc642e4a8f91b4ebc35548530791b13a2d..bd43fee79e3fc6ee4952e10c0fad71e44aafa357 100644
--- a/base-manager/db/add.sql
+++ b/base-manager/db/add.sql
@@ -97,3 +97,8 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '澶у巺绐楀彛-鑿滃崟绠＄悊-鏌�
INSERT INTO `mortals_xhx_resource` VALUES (null, '澶у巺绐楀彛-鑿滃崟绠＄悊-缁存姢', '/window/hall/add,/window/hall/edit,/window/hall/delete,/window/hall/logicDelete,/window/hall/save,/window/hall/importData', 3, 0, NULL, NULL, NULL, 0);
+-- ----------------------------
+2023-5-04
+-- ----------------------------
+ALTER TABLE mortals_sys_window ADD COLUMN `nameDesc` varchar (256) default "" COMMENT '鍚嶇О鎻忚堪' AFTER englishName;
+ALTER TABLE mortals_sys_window ADD COLUMN `englishNameDesc` varchar (256) default "" COMMENT '鑻辨枃鍚嶇О鎻忚堪' AFTER nameDesc;
diff --git a/base-manager/doc/api.md b/base-manager/doc/api.md
index 0494d950eeac01b60bd07c2a211f38ff4ef6e91d..e84af2405b78a4a62557172df4e825e61718a337 100644
--- a/base-manager/doc/api.md
+++ b/base-manager/doc/api.md
@@ -6036,6 +6036,8 @@ data|object|鏁版嵁瀵硅薄|-
  createTime|Date|鍒涘缓鏃堕棿|-
  createUserId|Long|鍒涘缓鐢ㄦ埛|-
  updateTime|Date|淇敼鏃堕棿|-
+  nameDesc|String|鍚嶇О鎻忚堪
+  englishNameDesc|String|鑻辨枃鍚嶇О鎻忚堪
dict|object|瀛楀吀瀵硅薄|-
 hongqi|object|瀛楀吀灞炴€у璞★紝璇﹁闄勫綍|-
@@ -6106,6 +6108,8 @@ data|object|鏁版嵁瀵硅薄|-
 createTime|Date|鍒涘缓鏃堕棿|-
 createUserId|Long|鍒涘缓鐢ㄦ埛|-
 updateTime|Date|淇敼鏃堕棿|-
+ nameDesc|String|鍚嶇О鎻忚堪
+ englishNameDesc|String|鑻辨枃鍚嶇О鎻忚堪
dict|object|瀛楀吀瀵硅薄|-
 hongqi|object|瀛楀吀灞炴€у璞★紝璇﹁闄勫綍|-
@@ -6142,6 +6146,8 @@ hongqi|Integer|绾㈡棗绐楀彛 (1.鏄紝0.鍚�)|鏄瘄-
summary|String|澶囨敞|鏄瘄-
building|Integer|妤兼爧|鏄瘄-
level|Integer|妤煎眰|鏄瘄-
+nameDesc|String|鍚鍚嶇О鎻忚堪
+englishNameDesc|String|鍚鑻辨枃鍚嶇О鎻忚堪
**璇锋眰鏍蜂緥:**
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java b/base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java
index 80b79435867daed945e13682a18691b51a848981..17f0301a0f5c265d9bfc044afc801dbbba19b53b 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java
@@ -1,20 +1,18 @@
package com.mortals.xhx.module.window.model;
-
import java.util.List;
import java.util.ArrayList;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.window.model.vo.WindowVo;
-
+import lombok.Data;
/**
* 绔欑偣閮ㄩ棬绐楀彛瀹炰綋瀵硅薄
*
* @author zxfei
- * @date 2023-02-21
+ * @date 2023-05-04
*/
-
+@Data
public class WindowEntity extends WindowVo {
private static final long serialVersionUID = 1L;
@@ -82,305 +80,18 @@ public class WindowEntity extends WindowVo {
* 妤煎眰
*/
private Integer level;
-
-
- public WindowEntity() {
- }
-
- /**
- * 鑾峰彇 绔欑偣ID
- *
- * @return Long
- */
- public Long getSiteId() {
- return siteId;
- }
-
- /**
- * 璁剧疆 绔欑偣ID
- *
- * @param siteId
- */
- public void setSiteId(Long siteId) {
- this.siteId = siteId;
- }
-
- /**
- * 鑾峰彇 绔欑偣鍚嶇О
- *
- * @return String
- */
- public String getSiteName() {
- return siteName;
- }
-
- /**
- * 璁剧疆 绔欑偣鍚嶇О
- *
- * @param siteName
- */
- public void setSiteName(String siteName) {
- this.siteName = siteName;
- }
-
- /**
- * 鑾峰彇 閮ㄩ棬ID
- *
- * @return Long
- */
- public Long getDeptId() {
- return deptId;
- }
-
- /**
- * 璁剧疆 閮ㄩ棬ID
- *
- * @param deptId
- */
- public void setDeptId(Long deptId) {
- this.deptId = deptId;
- }
-
- /**
- * 鑾峰彇 閮ㄩ棬鍚嶇О
- *
- * @return String
- */
- public String getDeptName() {
- return deptName;
- }
-
- /**
- * 璁剧疆 閮ㄩ棬鍚嶇О
- *
- * @param deptName
- */
- public void setDeptName(String deptName) {
- this.deptName = deptName;
- }
-
- /**
- * 鑾峰彇 绐楀彛鍚嶇О
- *
- * @return String
- */
- public String getName() {
- return name;
- }
-
- /**
- * 璁剧疆 绐楀彛鍚嶇О
- *
- * @param name
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * 鑾峰彇 鑻辫绐楀彛鍚�
- *
- * @return String
- */
- public String getEnglishName() {
- return englishName;
- }
-
- /**
- * 璁剧疆 鑻辫绐楀彛鍚�
- *
- * @param englishName
- */
- public void setEnglishName(String englishName) {
- this.englishName = englishName;
- }
-
- /**
- * 鑾峰彇 鍖哄煙
- *
- * @return String
- */
- public String getRegion() {
- return region;
- }
-
- /**
- * 璁剧疆 鍖哄煙
- *
- * @param region
- */
- public void setRegion(String region) {
- this.region = region;
- }
-
- /**
- * 鑾峰彇 鑻辫鍖哄煙
- *
- * @return String
- */
- public String getEnglishRegion() {
- return englishRegion;
- }
-
- /**
- * 璁剧疆 鑻辫鍖哄煙
- *
- * @param englishRegion
- */
- public void setEnglishRegion(String englishRegion) {
- this.englishRegion = englishRegion;
- }
-
- /**
- * 鑾峰彇 绐楀彛缂栧彿
- *
- * @return String
- */
- public String getFromnum() {
- return fromnum;
- }
-
- /**
- * 璁剧疆 绐楀彛缂栧彿
- *
- * @param fromnum
- */
- public void setFromnum(String fromnum) {
- this.fromnum = fromnum;
- }
-
/**
- * 鑾峰彇 绾㈡棗绐楀彛 (1.鏄紝0.鍚�)
- *
- * @return Integer
+ * 鍚嶇О鎻忚堪
*/
- public Integer getHongqi() {
- return hongqi;
- }
-
+ private String nameDesc;
/**
- * 璁剧疆 绾㈡棗绐楀彛 (1.鏄紝0.鍚�)
- *
- * @param hongqi
+ * 鑻辨枃鍚嶇О鎻忚堪
*/
- public void setHongqi(Integer hongqi) {
- this.hongqi = hongqi;
- }
-
- /**
- * 鑾峰彇 鏃犱汉鍊煎畧(1.鏄紝)
- *
- * @return Integer
- */
- public Integer getDuty() {
- return duty;
- }
-
- /**
- * 璁剧疆 鏃犱汉鍊煎畧(1.鏄紝)
- *
- * @param duty
- */
- public void setDuty(Integer duty) {
- this.duty = duty;
- }
-
- /**
- * 鑾峰彇 鏄剧ず鍐呭
- *
- * @return String
- */
- public String getDutyContent() {
- return dutyContent;
- }
-
- /**
- * 璁剧疆 鏄剧ず鍐呭
- *
- * @param dutyContent
- */
- public void setDutyContent(String dutyContent) {
- this.dutyContent = dutyContent;
- }
-
- /**
- * 鑾峰彇 鏄剧ず鑻辨枃
- *
- * @return String
- */
- public String getDutyEnglish() {
- return dutyEnglish;
- }
-
- /**
- * 璁剧疆 鏄剧ず鑻辨枃
- *
- * @param dutyEnglish
- */
- public void setDutyEnglish(String dutyEnglish) {
- this.dutyEnglish = dutyEnglish;
- }
-
- /**
- * 鑾峰彇 澶囨敞
- *
- * @return String
- */
- public String getSummary() {
- return summary;
- }
-
- /**
- * 璁剧疆 澶囨敞
- *
- * @param summary
- */
- public void setSummary(String summary) {
- this.summary = summary;
- }
-
- /**
- * 鑾峰彇 妤兼爧
- *
- * @return Integer
- */
- public Integer getBuilding() {
- return building;
- }
-
- /**
- * 璁剧疆 妤兼爧
- *
- * @param building
- */
- public void setBuilding(Integer building) {
- this.building = building;
- }
-
- /**
- * 鑾峰彇 妤煎眰
- *
- * @return Integer
- */
- public Integer getLevel() {
- return level;
- }
-
- /**
- * 璁剧疆 妤煎眰
- *
- * @param level
- */
- public void setLevel(Integer level) {
- this.level = level;
- }
-
-
+ private String englishNameDesc;
@Override
public int hashCode() {
return this.getId().hashCode();
}
-
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -393,59 +104,42 @@ public class WindowEntity extends WindowVo {
return false;
}
- public String toString() {
- StringBuilder sb = new StringBuilder("");
- sb.append(",siteId:").append(getSiteId());
- sb.append(",siteName:").append(getSiteName());
- sb.append(",deptId:").append(getDeptId());
- sb.append(",deptName:").append(getDeptName());
- sb.append(",name:").append(getName());
- sb.append(",englishName:").append(getEnglishName());
- sb.append(",region:").append(getRegion());
- sb.append(",englishRegion:").append(getEnglishRegion());
- sb.append(",fromnum:").append(getFromnum());
- sb.append(",hongqi:").append(getHongqi());
- sb.append(",duty:").append(getDuty());
- sb.append(",dutyContent:").append(getDutyContent());
- sb.append(",dutyEnglish:").append(getDutyEnglish());
- sb.append(",summary:").append(getSummary());
- sb.append(",building:").append(getBuilding());
- sb.append(",level:").append(getLevel());
- return sb.toString();
- }
-
- public void initAttrValue() {
+ public void initAttrValue(){
- this.siteId = 0L;
+ this.siteId = null;
- this.siteName = "";
+ this.siteName = null;
this.deptId = null;
- this.deptName = "";
+ this.deptName = null;
- this.name = "";
+ this.name = null;
- this.englishName = "";
+ this.englishName = null;
- this.region = "";
+ this.region = null;
- this.englishRegion = "";
+ this.englishRegion = null;
- this.fromnum = "";
+ this.fromnum = null;
this.hongqi = 1;
- this.duty = 0;
+ this.duty = null;
this.dutyContent = "";
this.dutyEnglish = "";
- this.summary = "";
+ this.summary = null;
this.building = 1;
this.level = 1;
+
+ this.nameDesc = "";
+
+ this.englishNameDesc = "";
}
}
\ No newline at end of file
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowQuery.java b/base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowQuery.java
index b4a6070687d8b0628d9c294f7d51c844a426d58d..cc0eec721e9216f2f25290a05cf8ff7dd219a942 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowQuery.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowQuery.java
@@ -6,7 +6,7 @@ import com.mortals.xhx.module.window.model.WindowEntity;
* 绔欑偣閮ㄩ棬绐楀彛鏌ヨ瀵硅薄
*
* @author zxfei
- * @date 2023-02-21
+ * @date 2023-05-04
*/
public class WindowQuery extends WindowEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -191,6 +191,16 @@ public class WindowQuery extends WindowEntity {
/** 缁撴潫 淇敼鏃堕棿 */
private String updateTimeEnd;
+ /** 鍚嶇О鎻忚堪 */
+ private List<String> nameDescList;
+
+ /** 鍚嶇О鎻忚堪鎺掗櫎鍒楄〃 */
+ private List <String> nameDescNotList;
+ /** 鑻辨枃鍚嶇О鎻忚堪 */
+ private List<String> englishNameDescList;
+
+ /** 鑻辨枃鍚嶇О鎻忚堪鎺掗櫎鍒楄〃 */
+ private List <String> englishNameDescNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<WindowQuery> orConditionList;
@@ -1231,6 +1241,70 @@ public class WindowQuery extends WindowEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 鍚嶇О鎻忚堪
+ * @return nameDescList
+ */
+ public List<String> getNameDescList(){
+ return this.nameDescList;
+ }
+
+ /**
+ * 璁剧疆 鍚嶇О鎻忚堪
+ * @param nameDescList
+ */
+ public void setNameDescList(List<String> nameDescList){
+ this.nameDescList = nameDescList;
+ }
+
+ /**
+ * 鑾峰彇 鍚嶇О鎻忚堪
+ * @return nameDescNotList
+ */
+ public List<String> getNameDescNotList(){
+ return this.nameDescNotList;
+ }
+
+ /**
+ * 璁剧疆 鍚嶇О鎻忚堪
+ * @param nameDescNotList
+ */
+ public void setNameDescNotList(List<String> nameDescNotList){
+ this.nameDescNotList = nameDescNotList;
+ }
+
+ /**
+ * 鑾峰彇 鑻辨枃鍚嶇О鎻忚堪
+ * @return englishNameDescList
+ */
+ public List<String> getEnglishNameDescList(){
+ return this.englishNameDescList;
+ }
+
+ /**
+ * 璁剧疆 鑻辨枃鍚嶇О鎻忚堪
+ * @param englishNameDescList
+ */
+ public void setEnglishNameDescList(List<String> englishNameDescList){
+ this.englishNameDescList = englishNameDescList;
+ }
+
+ /**
+ * 鑾峰彇 鑻辨枃鍚嶇О鎻忚堪
+ * @return englishNameDescNotList
+ */
+ public List<String> getEnglishNameDescNotList(){
+ return this.englishNameDescNotList;
+ }
+
+ /**
+ * 璁剧疆 鑻辨枃鍚嶇О鎻忚堪
+ * @param englishNameDescNotList
+ */
+ public void setEnglishNameDescNotList(List<String> englishNameDescNotList){
+ this.englishNameDescNotList = englishNameDescNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -1855,6 +1929,44 @@ public class WindowQuery extends WindowEntity {
}
+
+ /**
+ * 璁剧疆 鍚嶇О鎻忚堪
+ * @param nameDesc
+ */
+ public WindowQuery nameDesc(String nameDesc){
+ setNameDesc(nameDesc);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍚嶇О鎻忚堪
+ * @param nameDescList
+ */
+ public WindowQuery nameDescList(List<String> nameDescList){
+ this.nameDescList = nameDescList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鑻辨枃鍚嶇О鎻忚堪
+ * @param englishNameDesc
+ */
+ public WindowQuery englishNameDesc(String englishNameDesc){
+ setEnglishNameDesc(englishNameDesc);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鑻辨枃鍚嶇О鎻忚堪
+ * @param englishNameDescList
+ */
+ public WindowQuery englishNameDescList(List<String> englishNameDescList){
+ this.englishNameDescList = englishNameDescList;
+ 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/window/WindowMapper.xml b/base-manager/src/main/resources/sqlmap/module/window/WindowMapper.xml
index cea91de44a635854d22f3d3473a60848c77325a0..e216c2b19aaca7f6f94ff299496688f9ad75c1d1 100644
--- a/base-manager/src/main/resources/sqlmap/module/window/WindowMapper.xml
+++ b/base-manager/src/main/resources/sqlmap/module/window/WindowMapper.xml
@@ -25,6 +25,8 @@
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="nameDesc" column="nameDesc" />
+ <result property="englishNameDesc" column="englishNameDesc" />
</resultMap>
@@ -92,23 +94,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('nameDesc') or colPickMode == 1 and data.containsKey('nameDesc')))">
+ a.nameDesc,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishNameDesc') or colPickMode == 1 and data.containsKey('englishNameDesc')))">
+ a.englishNameDesc,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="WindowEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_window
- (siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime)
+ (siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime,nameDesc,englishNameDesc)
VALUES
- (#{siteId},#{siteName},#{deptId},#{deptName},#{name},#{englishName},#{region},#{englishRegion},#{fromnum},#{hongqi},#{duty},#{dutyContent},#{dutyEnglish},#{summary},#{building},#{level},#{createTime},#{createUserId},#{updateTime})
+ (#{siteId},#{siteName},#{deptId},#{deptName},#{name},#{englishName},#{region},#{englishRegion},#{fromnum},#{hongqi},#{duty},#{dutyContent},#{dutyEnglish},#{summary},#{building},#{level},#{createTime},#{createUserId},#{updateTime},#{nameDesc},#{englishNameDesc})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_window
- (siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime)
+ (siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime,nameDesc,englishNameDesc)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.siteId},#{item.siteName},#{item.deptId},#{item.deptName},#{item.name},#{item.englishName},#{item.region},#{item.englishRegion},#{item.fromnum},#{item.hongqi},#{item.duty},#{item.dutyContent},#{item.dutyEnglish},#{item.summary},#{item.building},#{item.level},#{item.createTime},#{item.createUserId},#{item.updateTime})
+ (#{item.siteId},#{item.siteName},#{item.deptId},#{item.deptName},#{item.name},#{item.englishName},#{item.region},#{item.englishRegion},#{item.fromnum},#{item.hongqi},#{item.duty},#{item.dutyContent},#{item.dutyEnglish},#{item.summary},#{item.building},#{item.level},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.nameDesc},#{item.englishNameDesc})
</foreach>
</insert>
@@ -196,6 +204,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('nameDesc')) or (colPickMode==1 and !data.containsKey('nameDesc'))">
+ a.nameDesc=#{data.nameDesc},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('englishNameDesc')) or (colPickMode==1 and !data.containsKey('englishNameDesc'))">
+ a.englishNameDesc=#{data.englishNameDesc},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -376,6 +390,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="nameDesc=(case" suffix="ELSE nameDesc end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('nameDesc')) or (colPickMode==1 and !item.containsKey('nameDesc'))">
+ when a.id=#{item.id} then #{item.nameDesc}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="englishNameDesc=(case" suffix="ELSE englishNameDesc end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('englishNameDesc')) or (colPickMode==1 and !item.containsKey('englishNameDesc'))">
+ when a.id=#{item.id} then #{item.englishNameDesc}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -500,13 +528,13 @@
${_conditionType_} a.id is null
</if>
</if>
- <if test="conditionParamRef.containsKey('idList')">
+ <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')">
+ <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}
@@ -527,13 +555,13 @@
${_conditionType_} a.siteId is null
</if>
</if>
- <if test="conditionParamRef.containsKey('siteIdList')">
+ <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('siteIdNotList')">
+ <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -555,13 +583,13 @@
${_conditionType_} a.siteName is null
</if>
</if>
- <if test="conditionParamRef.containsKey('siteNameList')">
+ <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
${_conditionType_} a.siteName in
<foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('siteNameNotList')">
+ <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
${_conditionType_} a.siteName not in
<foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -575,13 +603,13 @@
${_conditionType_} a.deptId is null
</if>
</if>
- <if test="conditionParamRef.containsKey('deptIdList')">
+ <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')">
+ <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}
@@ -603,13 +631,13 @@
${_conditionType_} a.deptName is null
</if>
</if>
- <if test="conditionParamRef.containsKey('deptNameList')">
+ <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')">
+ <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}
@@ -624,13 +652,13 @@
${_conditionType_} a.name is null
</if>
</if>
- <if test="conditionParamRef.containsKey('nameList')">
+ <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
${_conditionType_} a.name in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('nameNotList')">
+ <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
${_conditionType_} a.name not in
<foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -645,13 +673,13 @@
${_conditionType_} a.englishName is null
</if>
</if>
- <if test="conditionParamRef.containsKey('englishNameList')">
+ <if test="conditionParamRef.containsKey('englishNameList') and conditionParamRef.englishNameList.size() > 0">
${_conditionType_} a.englishName in
<foreach collection="conditionParamRef.englishNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('englishNameNotList')">
+ <if test="conditionParamRef.containsKey('englishNameNotList') and conditionParamRef.englishNameNotList.size() > 0">
${_conditionType_} a.englishName not in
<foreach collection="conditionParamRef.englishNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -666,13 +694,13 @@
${_conditionType_} a.region is null
</if>
</if>
- <if test="conditionParamRef.containsKey('regionList')">
+ <if test="conditionParamRef.containsKey('regionList') and conditionParamRef.regionList.size() > 0">
${_conditionType_} a.region in
<foreach collection="conditionParamRef.regionList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('regionNotList')">
+ <if test="conditionParamRef.containsKey('regionNotList') and conditionParamRef.regionNotList.size() > 0">
${_conditionType_} a.region not in
<foreach collection="conditionParamRef.regionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -687,13 +715,13 @@
${_conditionType_} a.englishRegion is null
</if>
</if>
- <if test="conditionParamRef.containsKey('englishRegionList')">
+ <if test="conditionParamRef.containsKey('englishRegionList') and conditionParamRef.englishRegionList.size() > 0">
${_conditionType_} a.englishRegion in
<foreach collection="conditionParamRef.englishRegionList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('englishRegionNotList')">
+ <if test="conditionParamRef.containsKey('englishRegionNotList') and conditionParamRef.englishRegionNotList.size() > 0">
${_conditionType_} a.englishRegion not in
<foreach collection="conditionParamRef.englishRegionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -708,13 +736,13 @@
${_conditionType_} a.fromnum is null
</if>
</if>
- <if test="conditionParamRef.containsKey('fromnumList')">
+ <if test="conditionParamRef.containsKey('fromnumList') and conditionParamRef.fromnumList.size() > 0">
${_conditionType_} a.fromnum in
<foreach collection="conditionParamRef.fromnumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('fromnumNotList')">
+ <if test="conditionParamRef.containsKey('fromnumNotList') and conditionParamRef.fromnumNotList.size() > 0">
${_conditionType_} a.fromnum not in
<foreach collection="conditionParamRef.fromnumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -728,13 +756,13 @@
${_conditionType_} a.hongqi is null
</if>
</if>
- <if test="conditionParamRef.containsKey('hongqiList')">
+ <if test="conditionParamRef.containsKey('hongqiList') and conditionParamRef.hongqiList.size() > 0">
${_conditionType_} a.hongqi in
<foreach collection="conditionParamRef.hongqiList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('hongqiNotList')">
+ <if test="conditionParamRef.containsKey('hongqiNotList') and conditionParamRef.hongqiNotList.size() > 0">
${_conditionType_} a.hongqi not in
<foreach collection="conditionParamRef.hongqiNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -755,13 +783,13 @@
${_conditionType_} a.duty is null
</if>
</if>
- <if test="conditionParamRef.containsKey('dutyList')">
+ <if test="conditionParamRef.containsKey('dutyList') and conditionParamRef.dutyList.size() > 0">
${_conditionType_} a.duty in
<foreach collection="conditionParamRef.dutyList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('dutyNotList')">
+ <if test="conditionParamRef.containsKey('dutyNotList') and conditionParamRef.dutyNotList.size() > 0">
${_conditionType_} a.duty not in
<foreach collection="conditionParamRef.dutyNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -783,13 +811,13 @@
${_conditionType_} a.dutyContent is null
</if>
</if>
- <if test="conditionParamRef.containsKey('dutyContentList')">
+ <if test="conditionParamRef.containsKey('dutyContentList') and conditionParamRef.dutyContentList.size() > 0">
${_conditionType_} a.dutyContent in
<foreach collection="conditionParamRef.dutyContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('dutyContentNotList')">
+ <if test="conditionParamRef.containsKey('dutyContentNotList') and conditionParamRef.dutyContentNotList.size() > 0">
${_conditionType_} a.dutyContent not in
<foreach collection="conditionParamRef.dutyContentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -804,13 +832,13 @@
${_conditionType_} a.dutyEnglish is null
</if>
</if>
- <if test="conditionParamRef.containsKey('dutyEnglishList')">
+ <if test="conditionParamRef.containsKey('dutyEnglishList') and conditionParamRef.dutyEnglishList.size() > 0">
${_conditionType_} a.dutyEnglish in
<foreach collection="conditionParamRef.dutyEnglishList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('dutyEnglishNotList')">
+ <if test="conditionParamRef.containsKey('dutyEnglishNotList') and conditionParamRef.dutyEnglishNotList.size() > 0">
${_conditionType_} a.dutyEnglish not in
<foreach collection="conditionParamRef.dutyEnglishNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -825,13 +853,13 @@
${_conditionType_} a.summary is null
</if>
</if>
- <if test="conditionParamRef.containsKey('summaryList')">
+ <if test="conditionParamRef.containsKey('summaryList') and conditionParamRef.summaryList.size() > 0">
${_conditionType_} a.summary in
<foreach collection="conditionParamRef.summaryList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('summaryNotList')">
+ <if test="conditionParamRef.containsKey('summaryNotList') and conditionParamRef.summaryNotList.size() > 0">
${_conditionType_} a.summary not in
<foreach collection="conditionParamRef.summaryNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -845,13 +873,13 @@
${_conditionType_} a.building is null
</if>
</if>
- <if test="conditionParamRef.containsKey('buildingList')">
+ <if test="conditionParamRef.containsKey('buildingList') and conditionParamRef.buildingList.size() > 0">
${_conditionType_} a.building in
<foreach collection="conditionParamRef.buildingList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('buildingNotList')">
+ <if test="conditionParamRef.containsKey('buildingNotList') and conditionParamRef.buildingNotList.size() > 0">
${_conditionType_} a.building not in
<foreach collection="conditionParamRef.buildingNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -872,13 +900,13 @@
${_conditionType_} a.level is null
</if>
</if>
- <if test="conditionParamRef.containsKey('levelList')">
+ <if test="conditionParamRef.containsKey('levelList') and conditionParamRef.levelList.size() > 0">
${_conditionType_} a.level in
<foreach collection="conditionParamRef.levelList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
- <if test="conditionParamRef.containsKey('levelNotList')">
+ <if test="conditionParamRef.containsKey('levelNotList') and conditionParamRef.levelNotList.size() > 0">
${_conditionType_} a.level not in
<foreach collection="conditionParamRef.levelNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
@@ -914,13 +942,13 @@
${_conditionType_} a.createUserId is null
</if>
</if>
- <if test="conditionParamRef.containsKey('createUserIdList')">
+ <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')">
+ <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}
@@ -948,6 +976,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('nameDesc')">
+ <if test="conditionParamRef.nameDesc != null and conditionParamRef.nameDesc != ''">
+ ${_conditionType_} a.nameDesc like #{${_conditionParam_}.nameDesc}
+ </if>
+ <if test="conditionParamRef.nameDesc == null">
+ ${_conditionType_} a.nameDesc is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('nameDescList') and conditionParamRef.nameDescList.size() > 0">
+ ${_conditionType_} a.nameDesc in
+ <foreach collection="conditionParamRef.nameDescList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('nameDescNotList') and conditionParamRef.nameDescNotList.size() > 0">
+ ${_conditionType_} a.nameDesc not in
+ <foreach collection="conditionParamRef.nameDescNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('englishNameDesc')">
+ <if test="conditionParamRef.englishNameDesc != null and conditionParamRef.englishNameDesc != ''">
+ ${_conditionType_} a.englishNameDesc like #{${_conditionParam_}.englishNameDesc}
+ </if>
+ <if test="conditionParamRef.englishNameDesc == null">
+ ${_conditionType_} a.englishNameDesc is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('englishNameDescList') and conditionParamRef.englishNameDescList.size() > 0">
+ ${_conditionType_} a.englishNameDesc in
+ <foreach collection="conditionParamRef.englishNameDescList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('englishNameDescNotList') and conditionParamRef.englishNameDescNotList.size() > 0">
+ ${_conditionType_} a.englishNameDesc not in
+ <foreach collection="conditionParamRef.englishNameDescNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1061,6 +1131,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('nameDesc')">
+ a.nameDesc
+ <if test='orderCol.nameDesc != null and "DESC".equalsIgnoreCase(orderCol.nameDesc)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('englishNameDesc')">
+ a.englishNameDesc
+ <if test='orderCol.englishNameDesc != null and "DESC".equalsIgnoreCase(orderCol.englishNameDesc)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/base-manager/src/test/java/com/mortals/httpclient/site/SiteMatterController.http b/base-manager/src/test/java/com/mortals/httpclient/site/SiteMatterController.http
index 8cf83fbf1fc84d1a9e78d37b979d157471a4f375..a5d6eb1f6c6813dd58123eccfddf8dadc5066ec9 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/site/SiteMatterController.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/site/SiteMatterController.http
@@ -6,8 +6,9 @@ Content-Type: application/json
{
"siteId":1,
"page":1,
- "deptCode":"214125125245",
+ "deptCode":"008702197",
"display": 1,
+ "source": 1,
"size":10
}