Skip to content

E
enterprise-platform
Commit 63c8a378 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加公司背景图片字段

parent 234af950
Show whitespace changes
Inline Side-by-side
Showing with 2693 additions and 2498 deletions
db/add.sql
View file @ 63c8a378
-- ---------------------------- -- ----------------------------
2023-9-11 -- 2023-9-11
-- ---------------------------- -- ----------------------------
ALTER TABLE mortals_xhx_user ADD COLUMN `staffId` varchar(64) COMMENT '员工Id，关联用户员工表'; ALTER TABLE mortals_xhx_user ADD COLUMN `staffId` varchar(64) COMMENT '员工Id，关联用户员工表';
ALTER TABLE mortals_xhx_user ADD COLUMN `openId` varchar(64) COMMENT '微信openId'; ALTER TABLE mortals_xhx_user ADD COLUMN `openId` varchar(64) COMMENT '微信openId';
...@@ -108,3 +108,10 @@ CREATE TABLE mortals_xhx_news_up( ...@@ -108,3 +108,10 @@ CREATE TABLE mortals_xhx_news_up(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
,KEY `upName` (`upName`) USING BTREE ,KEY `upName` (`upName`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='新闻点赞记录信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='新闻点赞记录信息';
-- ----------------------------
-- 2024-12-5
-- ----------------------------
ALTER TABLE mortals_xhx_company ADD COLUMN `background` varchar(256) default '' COMMENT '背景图片';
enterprise-manager/src/main/java/com/mortals/xhx/busiz/controller/TestIdempotentController.java
View file @ 63c8a378
package com.mortals.xhx.busiz.controller; package com.mortals.xhx.busiz.controller;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.idempotent.helper.IdempotentHelper; import com.mortals.framework.idempotent.helper.IdempotentHelper;
import com.mortals.xhx.busiz.service.TestIdempotentService; import com.mortals.xhx.busiz.service.TestIdempotentService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -28,6 +29,7 @@ public class TestIdempotentController { ...@@ -28,6 +29,7 @@ public class TestIdempotentController {
* url: localhost:12345/v1/idempotent/test-with-result?source=taobao&operationType=publish_product&businessKey=pd_20230105007&name=lisi * url: localhost:12345/v1/idempotent/test-with-result?source=taobao&operationType=publish_product&businessKey=pd_20230105007&name=lisi
*/ */
@GetMapping("/test-with-result") @GetMapping("/test-with-result")
@UnAuth
public String testWithResult(String source, public String testWithResult(String source,
String operationType, String operationType,
String businessKey, String businessKey,
...@@ -44,6 +46,7 @@ public class TestIdempotentController { ...@@ -44,6 +46,7 @@ public class TestIdempotentController {
* url : localhost:12345/v1/idempotent/test-with-no-result?source=taobao&operationType=publish_product&businessKey=pd_20230105008&name=zhangsan * url : localhost:12345/v1/idempotent/test-with-no-result?source=taobao&operationType=publish_product&businessKey=pd_20230105008&name=zhangsan
*/ */
@GetMapping("/test-with-no-result") @GetMapping("/test-with-no-result")
@UnAuth
public String testWithNoResult(String source, public String testWithNoResult(String source,
String operationType, String operationType,
String businessKey, String businessKey,
......
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyEntity.java
View file @ 63c8a378
...@@ -13,11 +13,11 @@ import com.mortals.xhx.module.company.model.vo.CompanyVo; ...@@ -13,11 +13,11 @@ import com.mortals.xhx.module.company.model.vo.CompanyVo;
import com.mortals.xhx.module.company.model.CompanyLabelsEntity; import com.mortals.xhx.module.company.model.CompanyLabelsEntity;
import lombok.Data; import lombok.Data;
/** /**
* 公司实体对象 * 公司实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-09-18 * @date 2024-12-05
*/ */
@Data @Data
public class CompanyEntity extends CompanyVo { public class CompanyEntity extends CompanyVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -151,6 +151,10 @@ public class CompanyEntity extends CompanyVo { ...@@ -151,6 +151,10 @@ public class CompanyEntity extends CompanyVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 背景图片
*/
private String background;
/** /**
* 公司标注信息 * 公司标注信息
*/ */
...@@ -209,7 +213,8 @@ public class CompanyEntity extends CompanyVo { ...@@ -209,7 +213,8 @@ public class CompanyEntity extends CompanyVo {
this.companyIntroduction = ""; this.companyIntroduction = "";
this.companyCulture = ""; this.companyCulture = "";
this.sort = 0; this.sort = 0;
this.establishDate = new Date(); this.establishDate = null;
this.remark = ""; this.remark = "";
this.background = "";
} }
} }
\ No newline at end of file
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyQuery.java
View file @ 63c8a378
...@@ -5,11 +5,11 @@ import java.util.Date; ...@@ -5,11 +5,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.company.model.CompanyEntity; import com.mortals.xhx.module.company.model.CompanyEntity;
/** /**
* 公司查询对象 * 公司查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-09-18 * @date 2024-12-05
*/ */
public class CompanyQuery extends CompanyEntity { public class CompanyQuery extends CompanyEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -269,6 +269,11 @@ public class CompanyQuery extends CompanyEntity { ...@@ -269,6 +269,11 @@ public class CompanyQuery extends CompanyEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 背景图片 */
private List<String> backgroundList;
/** 背景图片排除列表 */
private List <String> backgroundNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CompanyQuery> orConditionList; private List<CompanyQuery> orConditionList;
...@@ -1804,6 +1809,38 @@ public class CompanyQuery extends CompanyEntity { ...@@ -1804,6 +1809,38 @@ public class CompanyQuery extends CompanyEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 背景图片
* @return backgroundList
*/
public List<String> getBackgroundList(){
return this.backgroundList;
}
/**
* 设置 背景图片
* @param backgroundList
*/
public void setBackgroundList(List<String> backgroundList){
this.backgroundList = backgroundList;
}
/**
* 获取 背景图片
* @return backgroundNotList
*/
public List<String> getBackgroundNotList(){
return this.backgroundNotList;
}
/**
* 设置 背景图片
* @param backgroundNotList
*/
public void setBackgroundNotList(List<String> backgroundNotList){
this.backgroundNotList = backgroundNotList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -2698,6 +2735,25 @@ public class CompanyQuery extends CompanyEntity { ...@@ -2698,6 +2735,25 @@ public class CompanyQuery extends CompanyEntity {
} }
/**
* 设置 背景图片
* @param background
*/
public CompanyQuery background(String background){
setBackground(background);
return this;
}
/**
* 设置 背景图片
* @param backgroundList
*/
public CompanyQuery backgroundList(List<String> backgroundList){
this.backgroundList = backgroundList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
enterprise-manager/src/main/resources/sqlmap/module/company/CompanyMapper.xml
View file @ 63c8a378
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.company.dao.ibatis.CompanyDaoImpl"> <mapper namespace="com.mortals.xhx.module.company.dao.ibatis.CompanyDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -42,20 +42,8 @@ ...@@ -42,20 +42,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<collection property="companyLabelsList" column="id" ofType="CompanyLabelsEntity" javaType="ArrayList" select="getCompanyLabelsByCompanyId"></collection> <result property="background" column="background" />
</resultMap> </resultMap>
<resultMap type="CompanyLabelsEntity" id="CompanyLabelsEntity-Map">
<result property="id" column="id" />
<result property="labelId" column="labelId" />
<result property="companyId" column="companyId" />
<result property="labelName" column="labelName" />
<result property="remark" column="remark" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
...@@ -171,29 +159,32 @@ ...@@ -171,29 +159,32 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('background') or colPickMode == 1 and data.containsKey('background')))">
a.background,
</if>
</trim> </trim>
</sql> </sql>
<!-- 子表所有列 --> <!-- 子表所有列 -->
<sql id="_columns_sub"> <sql id="_columns_sub">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
b.id,b.labelId,b.companyId,b.labelName,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime, b.id,b.labelId,b.labelName,b.companyId,b.companyName,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CompanyEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CompanyEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_company insert into mortals_xhx_company
(companyName,companyCode,registrationNumber,legalRepresentative,registeredCapital,companyType,businessScope,businessAdress,location,areaCode,areaName,contactPhone,email,website,taxRegistrationNumber,socialCreditCode,trademarkInfo,websiteRegistrationInfo,totalEmployees,softNum,patentNum,hisDevelop,lon,lati,logoPath,companyVideoPath,companyPicPath,companyIntroduction,companyCulture,sort,establishDate,remark,createUserId,createTime,updateUserId,updateTime) (companyName,companyCode,registrationNumber,legalRepresentative,registeredCapital,companyType,businessScope,businessAdress,location,areaCode,areaName,contactPhone,email,website,taxRegistrationNumber,socialCreditCode,trademarkInfo,websiteRegistrationInfo,totalEmployees,softNum,patentNum,hisDevelop,lon,lati,logoPath,companyVideoPath,companyPicPath,companyIntroduction,companyCulture,sort,establishDate,remark,createUserId,createTime,updateUserId,updateTime,background)
VALUES VALUES
(#{companyName},#{companyCode},#{registrationNumber},#{legalRepresentative},#{registeredCapital},#{companyType},#{businessScope},#{businessAdress},#{location},#{areaCode},#{areaName},#{contactPhone},#{email},#{website},#{taxRegistrationNumber},#{socialCreditCode},#{trademarkInfo},#{websiteRegistrationInfo},#{totalEmployees},#{softNum},#{patentNum},#{hisDevelop},#{lon},#{lati},#{logoPath},#{companyVideoPath},#{companyPicPath},#{companyIntroduction},#{companyCulture},#{sort},#{establishDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{companyName},#{companyCode},#{registrationNumber},#{legalRepresentative},#{registeredCapital},#{companyType},#{businessScope},#{businessAdress},#{location},#{areaCode},#{areaName},#{contactPhone},#{email},#{website},#{taxRegistrationNumber},#{socialCreditCode},#{trademarkInfo},#{websiteRegistrationInfo},#{totalEmployees},#{softNum},#{patentNum},#{hisDevelop},#{lon},#{lati},#{logoPath},#{companyVideoPath},#{companyPicPath},#{companyIntroduction},#{companyCulture},#{sort},#{establishDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{background})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_company insert into mortals_xhx_company
(companyName,companyCode,registrationNumber,legalRepresentative,registeredCapital,companyType,businessScope,businessAdress,location,areaCode,areaName,contactPhone,email,website,taxRegistrationNumber,socialCreditCode,trademarkInfo,websiteRegistrationInfo,totalEmployees,softNum,patentNum,hisDevelop,lon,lati,logoPath,companyVideoPath,companyPicPath,companyIntroduction,companyCulture,sort,establishDate,remark,createUserId,createTime,updateUserId,updateTime) (companyName,companyCode,registrationNumber,legalRepresentative,registeredCapital,companyType,businessScope,businessAdress,location,areaCode,areaName,contactPhone,email,website,taxRegistrationNumber,socialCreditCode,trademarkInfo,websiteRegistrationInfo,totalEmployees,softNum,patentNum,hisDevelop,lon,lati,logoPath,companyVideoPath,companyPicPath,companyIntroduction,companyCulture,sort,establishDate,remark,createUserId,createTime,updateUserId,updateTime,background)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.companyName},#{item.companyCode},#{item.registrationNumber},#{item.legalRepresentative},#{item.registeredCapital},#{item.companyType},#{item.businessScope},#{item.businessAdress},#{item.location},#{item.areaCode},#{item.areaName},#{item.contactPhone},#{item.email},#{item.website},#{item.taxRegistrationNumber},#{item.socialCreditCode},#{item.trademarkInfo},#{item.websiteRegistrationInfo},#{item.totalEmployees},#{item.softNum},#{item.patentNum},#{item.hisDevelop},#{item.lon},#{item.lati},#{item.logoPath},#{item.companyVideoPath},#{item.companyPicPath},#{item.companyIntroduction},#{item.companyCulture},#{item.sort},#{item.establishDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.companyName},#{item.companyCode},#{item.registrationNumber},#{item.legalRepresentative},#{item.registeredCapital},#{item.companyType},#{item.businessScope},#{item.businessAdress},#{item.location},#{item.areaCode},#{item.areaName},#{item.contactPhone},#{item.email},#{item.website},#{item.taxRegistrationNumber},#{item.socialCreditCode},#{item.trademarkInfo},#{item.websiteRegistrationInfo},#{item.totalEmployees},#{item.softNum},#{item.patentNum},#{item.hisDevelop},#{item.lon},#{item.lati},#{item.logoPath},#{item.companyVideoPath},#{item.companyPicPath},#{item.companyIntroduction},#{item.companyCulture},#{item.sort},#{item.establishDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.background})
</foreach> </foreach>
</insert> </insert>
...@@ -329,6 +320,9 @@ ...@@ -329,6 +320,9 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('background')) or (colPickMode==1 and !data.containsKey('background'))">
a.background=#{data.background},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -623,6 +617,13 @@ ...@@ -623,6 +617,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="background=(case" suffix="ELSE background end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('background')) or (colPickMode==1 and !item.containsKey('background'))">
when a.id=#{item.id} then #{item.background}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -684,13 +685,6 @@ ...@@ -684,13 +685,6 @@
<include refid="_orderCols_"/> <include refid="_orderCols_"/>
</select> </select>
<!-- 获取子列表 --> <!-- 获取子列表 -->
<select id="getCompanyLabelsByCompanyId" parameterType="java.lang.Long" resultMap="CompanyLabelsEntity-Map">
select <include refid="_columns_sub"/>
from mortals_xhx_company_labels as b
<trim suffixOverrides="where" suffix="">
where b.companyId = #{id}
</trim>
</select>
...@@ -742,6 +736,10 @@ ...@@ -742,6 +736,10 @@
<!-- 条件映射-代参数 --> <!-- 条件映射-代参数 -->
<sql id="_condition_param_"> <sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/> <bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="permissionSql != null and permissionSql != ''">
${permissionSql}
</if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null"> <if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
...@@ -1548,18 +1546,137 @@ ...@@ -1548,18 +1546,137 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <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') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('background')">
<if test="conditionParamRef.background != null and conditionParamRef.background != ''">
${_conditionType_} a.background like #{${_conditionParam_}.background}
</if>
<if test="conditionParamRef.background == null">
${_conditionType_} a.background is null
</if>
</if>
<if test="conditionParamRef.containsKey('backgroundList') and conditionParamRef.backgroundList.size() > 0">
${_conditionType_} a.background in
<foreach collection="conditionParamRef.backgroundList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('backgroundNotList') and conditionParamRef.backgroundNotList.size() > 0">
${_conditionType_} a.background not in
<foreach collection="conditionParamRef.backgroundNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('totalEmployeesList') and conditionParamRef.totalEmployeesList.size() > 0">
field(a.totalEmployees,
<foreach collection="conditionParamRef.totalEmployeesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('softNumList') and conditionParamRef.softNumList.size() > 0">
field(a.softNum,
<foreach collection="conditionParamRef.softNumList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('patentNumList') and conditionParamRef.patentNumList.size() > 0">
field(a.patentNum,
<foreach collection="conditionParamRef.patentNumList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
field(a.sort,
<foreach collection="conditionParamRef.sortList" 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>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('totalEmployeesList') and conditionParamRef.totalEmployeesList.size() > 0">
field(a.totalEmployees,
<foreach collection="conditionParamRef.totalEmployeesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('softNumList') and conditionParamRef.softNumList.size() > 0">
field(a.softNum,
<foreach collection="conditionParamRef.softNumList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('patentNumList') and conditionParamRef.patentNumList.size() > 0">
field(a.patentNum,
<foreach collection="conditionParamRef.patentNumList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
field(a.sort,
<foreach collection="conditionParamRef.sortList" 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>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -1746,8 +1863,15 @@ ...@@ -1746,8 +1863,15 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('background')">
a.background
<if test='orderCol.background != null and "DESC".equalsIgnoreCase(orderCol.background)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
<sql id="_group_by_"> <sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()"> <if test="groupList != null and !groupList.isEmpty()">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment