Skip to content

E
enterprise-platform
Commit e61384fd authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

员工名片增加名片背景图片字段

parent ed572324
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 7 deletions
db/add.sql
View file @ e61384fd
...@@ -84,4 +84,6 @@ PRIMARY KEY (`id`) ...@@ -84,4 +84,6 @@ PRIMARY KEY (`id`)
ALTER TABLE `mortals_xhx_user` ADD COLUMN `photoPath` varchar(255) COMMENT '头像地址'; ALTER TABLE `mortals_xhx_user` ADD COLUMN `photoPath` varchar(255) COMMENT '头像地址';
ALTER TABLE `mortals_xhx_user` ADD COLUMN `companyAdress` varchar(512) COMMENT '单位地址'; ALTER TABLE `mortals_xhx_user` ADD COLUMN `companyAdress` varchar(512) COMMENT '单位地址';
INSERT INTO `mortals_xhx_task` (`name`, `taskKey`, `status`, `excuteService`, `excuteParam`, `excuteHost`, `excuteStrategy`, `excuteDate`, `excuteTime`, `remark`, `lastExcuteHost`, `lastExcuteTime`, `interimExcuteStatus`, `createTime`, `createUserId`, `createUserName`) VALUES ('员工名片日访问数初始化', 'StaffViewsByDayInit', '0', 'StaffViewsByDayInit', NULL, NULL, '1', '0', '00:00', NULL, NULL, NULL, '0', NULL, '1', '系统管理员'); INSERT INTO `mortals_xhx_task` (`name`, `taskKey`, `status`, `excuteService`, `excuteParam`, `excuteHost`, `excuteStrategy`, `excuteDate`, `excuteTime`, `remark`, `lastExcuteHost`, `lastExcuteTime`, `interimExcuteStatus`, `createTime`, `createUserId`, `createUserName`) VALUES ('员工名片日访问数初始化', 'StaffViewsByDayInit', '0', 'StaffViewsByDayInit', NULL, NULL, '1', '0', '00:00', NULL, NULL, NULL, '0', NULL, '1', '系统管理员');
\ No newline at end of file
ALTER TABLE `mortals_xhx_bussinesscard` ADD COLUMN `backdrop` varchar(256) COMMENT '名片背景';
\ No newline at end of file
enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/model/BussinesscardEntity.java
View file @ e61384fd
...@@ -108,6 +108,10 @@ public class BussinesscardEntity extends BussinesscardVo { ...@@ -108,6 +108,10 @@ public class BussinesscardEntity extends BussinesscardVo {
* 公司地址 * 公司地址
*/ */
private String companyAdress; private String companyAdress;
/**
* 名片背景
*/
private String backdrop;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -147,5 +151,6 @@ public class BussinesscardEntity extends BussinesscardVo { ...@@ -147,5 +151,6 @@ public class BussinesscardEntity extends BussinesscardVo {
this.sendBusinessCardTimes = 0; this.sendBusinessCardTimes = 0;
this.setting = ""; this.setting = "";
this.companyAdress = ""; this.companyAdress = "";
this.backdrop = "";
} }
} }
\ No newline at end of file
enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/model/BussinesscardQuery.java
View file @ e61384fd
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.bussinesscard.model.BussinesscardEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.bussinesscard.model.BussinesscardEntity;
* 名片基本信息查询对象 * 名片基本信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-11-20 * @date 2024-12-02
*/ */
public class BussinesscardQuery extends BussinesscardEntity { public class BussinesscardQuery extends BussinesscardEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -248,6 +248,11 @@ public class BussinesscardQuery extends BussinesscardEntity { ...@@ -248,6 +248,11 @@ public class BussinesscardQuery extends BussinesscardEntity {
/** 公司地址排除列表 */ /** 公司地址排除列表 */
private List <String> companyAdressNotList; private List <String> companyAdressNotList;
/** 名片背景 */
private List<String> backdropList;
/** 名片背景排除列表 */
private List <String> backdropNotList;
/** 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<BussinesscardQuery> orConditionList; private List<BussinesscardQuery> orConditionList;
...@@ -1610,6 +1615,38 @@ public class BussinesscardQuery extends BussinesscardEntity { ...@@ -1610,6 +1615,38 @@ public class BussinesscardQuery extends BussinesscardEntity {
this.companyAdressNotList = companyAdressNotList; this.companyAdressNotList = companyAdressNotList;
} }
/**
* 获取 名片背景
* @return backdropList
*/
public List<String> getBackdropList(){
return this.backdropList;
}
/**
* 设置 名片背景
* @param backdropList
*/
public void setBackdropList(List<String> backdropList){
this.backdropList = backdropList;
}
/**
* 获取 名片背景
* @return backdropNotList
*/
public List<String> getBackdropNotList(){
return this.backdropNotList;
}
/**
* 设置 名片背景
* @param backdropNotList
*/
public void setBackdropNotList(List<String> backdropNotList){
this.backdropNotList = backdropNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2419,6 +2456,25 @@ public class BussinesscardQuery extends BussinesscardEntity { ...@@ -2419,6 +2456,25 @@ public class BussinesscardQuery extends BussinesscardEntity {
return this; return this;
} }
/**
* 设置 名片背景
* @param backdrop
*/
public BussinesscardQuery backdrop(String backdrop){
setBackdrop(backdrop);
return this;
}
/**
* 设置 名片背景
* @param backdropList
*/
public BussinesscardQuery backdropList(List<String> backdropList){
this.backdropList = backdropList;
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/bussinesscard/BussinesscardMapper.xml
View file @ e61384fd
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="setting" column="setting" /> <result property="setting" column="setting" />
<result property="companyAdress" column="companyAdress" /> <result property="companyAdress" column="companyAdress" />
<result property="backdrop" column="backdrop" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -118,23 +119,26 @@ ...@@ -118,23 +119,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('companyAdress') or colPickMode == 1 and data.containsKey('companyAdress')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('companyAdress') or colPickMode == 1 and data.containsKey('companyAdress')))">
a.companyAdress, a.companyAdress,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('backdrop') or colPickMode == 1 and data.containsKey('backdrop')))">
a.backdrop,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="BussinesscardEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="BussinesscardEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_bussinesscard insert into mortals_xhx_bussinesscard
(staffId,staffName,name,gender,birthday,photoPath,email,phoneNumber,idCard,companyId,companyName,positionId,positionName,bio,socialMedia,qRCode,remark,sumViews,viewsByDay,sendBusinessCardTimes,createUserId,createTime,updateUserId,updateTime,setting,companyAdress) (staffId,staffName,name,gender,birthday,photoPath,email,phoneNumber,idCard,companyId,companyName,positionId,positionName,bio,socialMedia,qRCode,remark,sumViews,viewsByDay,sendBusinessCardTimes,createUserId,createTime,updateUserId,updateTime,setting,companyAdress,backdrop)
VALUES VALUES
(#{staffId},#{staffName},#{name},#{gender},#{birthday},#{photoPath},#{email},#{phoneNumber},#{idCard},#{companyId},#{companyName},#{positionId},#{positionName},#{bio},#{socialMedia},#{qRCode},#{remark},#{sumViews},#{viewsByDay},#{sendBusinessCardTimes},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{setting},#{companyAdress}) (#{staffId},#{staffName},#{name},#{gender},#{birthday},#{photoPath},#{email},#{phoneNumber},#{idCard},#{companyId},#{companyName},#{positionId},#{positionName},#{bio},#{socialMedia},#{qRCode},#{remark},#{sumViews},#{viewsByDay},#{sendBusinessCardTimes},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{setting},#{companyAdress},#{backdrop})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_bussinesscard insert into mortals_xhx_bussinesscard
(staffId,staffName,name,gender,birthday,photoPath,email,phoneNumber,idCard,companyId,companyName,positionId,positionName,bio,socialMedia,qRCode,remark,sumViews,viewsByDay,sendBusinessCardTimes,createUserId,createTime,updateUserId,updateTime,setting,companyAdress) (staffId,staffName,name,gender,birthday,photoPath,email,phoneNumber,idCard,companyId,companyName,positionId,positionName,bio,socialMedia,qRCode,remark,sumViews,viewsByDay,sendBusinessCardTimes,createUserId,createTime,updateUserId,updateTime,setting,companyAdress,backdrop)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.email},#{item.phoneNumber},#{item.idCard},#{item.companyId},#{item.companyName},#{item.positionId},#{item.positionName},#{item.bio},#{item.socialMedia},#{item.qRCode},#{item.remark},#{item.sumViews},#{item.viewsByDay},#{item.sendBusinessCardTimes},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.setting},#{item.companyAdress}) (#{item.staffId},#{item.staffName},#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.email},#{item.phoneNumber},#{item.idCard},#{item.companyId},#{item.companyName},#{item.positionId},#{item.positionName},#{item.bio},#{item.socialMedia},#{item.qRCode},#{item.remark},#{item.sumViews},#{item.viewsByDay},#{item.sendBusinessCardTimes},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.setting},#{item.companyAdress},#{item.backdrop})
</foreach> </foreach>
</insert> </insert>
...@@ -249,6 +253,9 @@ ...@@ -249,6 +253,9 @@
<if test="(colPickMode==0 and data.containsKey('companyAdress')) or (colPickMode==1 and !data.containsKey('companyAdress'))"> <if test="(colPickMode==0 and data.containsKey('companyAdress')) or (colPickMode==1 and !data.containsKey('companyAdress'))">
a.companyAdress=#{data.companyAdress}, a.companyAdress=#{data.companyAdress},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('backdrop')) or (colPickMode==1 and !data.containsKey('backdrop'))">
a.backdrop=#{data.backdrop},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -488,6 +495,13 @@ ...@@ -488,6 +495,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="backdrop=(case" suffix="ELSE backdrop end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('backdrop')) or (colPickMode==1 and !item.containsKey('backdrop'))">
when a.id=#{item.id} then #{item.backdrop}
</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=")">
...@@ -1217,6 +1231,27 @@ ...@@ -1217,6 +1231,27 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('backdrop')">
<if test="conditionParamRef.backdrop != null and conditionParamRef.backdrop != ''">
${_conditionType_} a.backdrop like #{${_conditionParam_}.backdrop}
</if>
<if test="conditionParamRef.backdrop == null">
${_conditionType_} a.backdrop is null
</if>
</if>
<if test="conditionParamRef.containsKey('backdropList') and conditionParamRef.backdropList.size() > 0">
${_conditionType_} a.backdrop in
<foreach collection="conditionParamRef.backdropList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('backdropNotList') and conditionParamRef.backdropNotList.size() > 0">
${_conditionType_} a.backdrop not in
<foreach collection="conditionParamRef.backdropNotList" 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()">
...@@ -1505,6 +1540,11 @@ ...@@ -1505,6 +1540,11 @@
<if test='orderCol.companyAdress != null and "DESC".equalsIgnoreCase(orderCol.companyAdress)'>DESC</if> <if test='orderCol.companyAdress != null and "DESC".equalsIgnoreCase(orderCol.companyAdress)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('backdrop')">
a.backdrop
<if test='orderCol.backdrop != null and "DESC".equalsIgnoreCase(orderCol.backdrop)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
enterprise-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml
View file @ e61384fd
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
<result property="sendBusinessCardTimes" column="sendBusinessCardTimes" /> <result property="sendBusinessCardTimes" column="sendBusinessCardTimes" />
<result property="setting" column="setting" /> <result property="setting" column="setting" />
<result property="companyAdress" column="companyAdress" /> <result property="companyAdress" column="companyAdress" />
<result property="backdrop" column="backdrop" />
</resultMap> </resultMap>
...@@ -158,7 +159,7 @@ ...@@ -158,7 +159,7 @@
<!-- 子表所有列 --> <!-- 子表所有列 -->
<sql id="_columns_sub"> <sql id="_columns_sub">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
b.id,b.staffId,b.staffName,b.name,b.gender,b.birthday,b.photoPath,b.email,b.phoneNumber,b.idCard,b.companyId,b.companyName,b.positionId,b.positionName,b.bio,b.socialMedia,b.qRCode,b.remark,b.sumViews,b.viewsByDay,b.createUserId,b.createTime,b.updateUserId,b.updateTime,b.sendBusinessCardTimes,b.setting,b.companyAdress, b.id,b.staffId,b.staffName,b.name,b.gender,b.birthday,b.photoPath,b.email,b.phoneNumber,b.idCard,b.companyId,b.companyName,b.positionId,b.positionName,b.bio,b.socialMedia,b.qRCode,b.remark,b.sumViews,b.viewsByDay,b.createUserId,b.createTime,b.updateUserId,b.updateTime,b.sendBusinessCardTimes,b.setting,b.companyAdress,b.backdrop,
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
......
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