Skip to content

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

名片收藏字段修改

parent 35c38f60
Show whitespace changes
Inline Side-by-side
Showing with 134 additions and 143 deletions
db/add.sql
View file @ 61762e91
...@@ -114,4 +114,5 @@ PRIMARY KEY (`id`) ...@@ -114,4 +114,5 @@ PRIMARY KEY (`id`)
-- 2024-12-5 -- 2024-12-5
-- ---------------------------- -- ----------------------------
ALTER TABLE mortals_xhx_company ADD COLUMN `background` varchar(256) default '' COMMENT '背景图片'; ALTER TABLE mortals_xhx_company ADD COLUMN `background` varchar(256) default '' COMMENT '背景图片';
ALTER TABLE `mortals_xhx_favorites_businesscard` CHANGE `staffId` `bussinesscardId` bigint(20) NOT NULL COMMENT '名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏';
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/req/FavoriteReq.java
View file @ 61762e91
...@@ -25,7 +25,7 @@ public class FavoriteReq extends BaseReq { ...@@ -25,7 +25,7 @@ public class FavoriteReq extends BaseReq {
/** /**
* 名片id * 名片id
*/ */
private long staffId; private long bussinesscardId;
/** /**
* 分类Id * 分类Id
......
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/FavoriteApiController.java
View file @ 61762e91
...@@ -94,10 +94,10 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{ ...@@ -94,10 +94,10 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
rest.setMsg("收藏新闻成功"); rest.setMsg("收藏新闻成功");
} }
if(!ObjectUtils.isEmpty(favoriteReq.getStaffId()) && favoriteReq.getStaffId() != 0){ if(!ObjectUtils.isEmpty(favoriteReq.getBussinesscardId()) && favoriteReq.getBussinesscardId() != 0){
FavoritesBusinesscardEntity favoritesBusinesscardEntity = new FavoritesBusinesscardEntity(); FavoritesBusinesscardEntity favoritesBusinesscardEntity = new FavoritesBusinesscardEntity();
favoritesBusinesscardEntity.setUserId(iUser.getId()); favoritesBusinesscardEntity.setUserId(iUser.getId());
favoritesBusinesscardEntity.setStaffId(favoriteReq.getStaffId()); favoritesBusinesscardEntity.setBussinesscardId(favoriteReq.getBussinesscardId());
favoritesBusinesscardEntity.setCreateTime(new Date()); favoritesBusinesscardEntity.setCreateTime(new Date());
favoritesBusinesscardEntity.setCreateUserId(iUser.getId()); favoritesBusinesscardEntity.setCreateUserId(iUser.getId());
favoritesBusinesscardEntity.setFavoriteTime(new Date()); favoritesBusinesscardEntity.setFavoriteTime(new Date());
...@@ -146,11 +146,11 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{ ...@@ -146,11 +146,11 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
} }
rest.setMsg("取消收藏新闻成功"); rest.setMsg("取消收藏新闻成功");
} }
if(!ObjectUtils.isEmpty(favoriteReq.getStaffId()) && favoriteReq.getStaffId() != 0){ if(!ObjectUtils.isEmpty(favoriteReq.getBussinesscardId()) && favoriteReq.getBussinesscardId() != 0){
FavoritesBusinesscardEntity query = new FavoritesBusinesscardEntity(); FavoritesBusinesscardEntity query = new FavoritesBusinesscardEntity();
query.setUserId(iUser.getId()); query.setUserId(iUser.getId());
query.setStaffId(favoriteReq.getStaffId()); query.setBussinesscardId(favoriteReq.getBussinesscardId());
FavoritesBusinesscardEntity favoritesBusinesscardEntity = favoritesBusinesscardService.selectOne(query); FavoritesBusinesscardEntity favoritesBusinesscardEntity = favoritesBusinesscardService.selectOne(query);
if(favoritesBusinesscardEntity!=null) { if(favoritesBusinesscardEntity!=null) {
favoritesBusinesscardService.remove(favoritesBusinesscardEntity.getId(), context); favoritesBusinesscardService.remove(favoritesBusinesscardEntity.getId(), context);
...@@ -210,7 +210,7 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{ ...@@ -210,7 +210,7 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
if(!ObjectUtils.isEmpty(favoriteReq) && favoriteReq.getTypeId() != 0){ if(!ObjectUtils.isEmpty(favoriteReq) && favoriteReq.getTypeId() != 0){
switch (favoriteReq.getTypeId()){ switch (favoriteReq.getTypeId()){
case 1: //产品收藏 case 1: //产品收藏
List<FavoritesProductEntity> productList = favoritesProductService.find(new FavoritesProductQuery().id(userId)); List<FavoritesProductEntity> productList = favoritesProductService.find(new FavoritesProductQuery().userId(userId));
if(!ObjectUtils.isEmpty(productList)){ if(!ObjectUtils.isEmpty(productList)){
List<ProductEntity> list = new ArrayList<>(); List<ProductEntity> list = new ArrayList<>();
for (int i = 0; i < productList.size(); i++) { for (int i = 0; i < productList.size(); i++) {
...@@ -227,7 +227,7 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{ ...@@ -227,7 +227,7 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
} }
break; break;
case 2: //新闻收藏 case 2: //新闻收藏
List<FavoritesNewsEntity> newsList = favoritesNewsService.find(new FavoritesNewsQuery().id(userId)); List<FavoritesNewsEntity> newsList = favoritesNewsService.find(new FavoritesNewsQuery().userId(userId));
if(!ObjectUtils.isEmpty(newsList)){ if(!ObjectUtils.isEmpty(newsList)){
List<NewsEntity> list = new ArrayList<>(); List<NewsEntity> list = new ArrayList<>();
for (int i = 0; i < newsList.size(); i++) { for (int i = 0; i < newsList.size(); i++) {
...@@ -244,11 +244,11 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{ ...@@ -244,11 +244,11 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
} }
break; break;
case 3: //名片收藏 case 3: //名片收藏
List<FavoritesBusinesscardEntity> cardList = favoritesBusinesscardService.find(new FavoritesBusinesscardQuery().id(userId)); List<FavoritesBusinesscardEntity> cardList = favoritesBusinesscardService.find(new FavoritesBusinesscardQuery().userId(userId));
if(!ObjectUtils.isEmpty(cardList)){ if(!ObjectUtils.isEmpty(cardList)){
List<BussinesscardEntity> list = new ArrayList<>(); List<BussinesscardEntity> list = new ArrayList<>();
for (int i = 0; i < cardList.size(); i++) { for (int i = 0; i < cardList.size(); i++) {
long id = cardList.get(i).getStaffId(); long id = cardList.get(i).getBussinesscardId();
BussinesscardEntity bussinesscardEntity = bussinesscardService.selectOne(new BussinesscardQuery().id(id)); BussinesscardEntity bussinesscardEntity = bussinesscardService.selectOne(new BussinesscardQuery().id(id));
if(!ObjectUtils.isEmpty(bussinesscardEntity)){ if(!ObjectUtils.isEmpty(bussinesscardEntity)){
list.add(bussinesscardEntity); list.add(bussinesscardEntity);
......
enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/impl/BussinesscardServiceImpl.java
View file @ 61762e91
...@@ -82,7 +82,7 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc ...@@ -82,7 +82,7 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
BussinesscardEntity entity = this.dao.get(key); BussinesscardEntity entity = this.dao.get(key);
if(entity!=null){ if(entity!=null){
if(context!=null && context.getUser()!=null) { if(context!=null && context.getUser()!=null) {
FavoritesBusinesscardEntity favoritesBusinesscardEntity = favoritesBusinesscardService.selectOne(new FavoritesBusinesscardQuery().staffId(entity.getStaffId()).userId(context.getUser().getId())); FavoritesBusinesscardEntity favoritesBusinesscardEntity = favoritesBusinesscardService.selectOne(new FavoritesBusinesscardQuery().bussinesscardId(entity.getId()).userId(context.getUser().getId()));
if(favoritesBusinesscardEntity!=null){ if(favoritesBusinesscardEntity!=null){
entity.setFavoriteStatus(1); entity.setFavoriteStatus(1);
}else { }else {
......
enterprise-manager/src/main/java/com/mortals/xhx/module/favorites/model/FavoritesBusinesscardEntity.java
View file @ 61762e91
...@@ -14,7 +14,7 @@ import lombok.Data; ...@@ -14,7 +14,7 @@ import lombok.Data;
* 收藏名片实体对象 * 收藏名片实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-10-10 * @date 2024-12-10
*/ */
@Data @Data
public class FavoritesBusinesscardEntity extends FavoritesBusinesscardVo { public class FavoritesBusinesscardEntity extends FavoritesBusinesscardVo {
...@@ -25,9 +25,9 @@ public class FavoritesBusinesscardEntity extends FavoritesBusinesscardVo { ...@@ -25,9 +25,9 @@ public class FavoritesBusinesscardEntity extends FavoritesBusinesscardVo {
*/ */
private Long userId; private Long userId;
/** /**
* 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
*/ */
private Long staffId; private Long bussinesscardId;
/** /**
* 备注 * 备注
*/ */
...@@ -54,7 +54,7 @@ public class FavoritesBusinesscardEntity extends FavoritesBusinesscardVo { ...@@ -54,7 +54,7 @@ public class FavoritesBusinesscardEntity extends FavoritesBusinesscardVo {
public void initAttrValue(){ public void initAttrValue(){
this.userId = null; this.userId = null;
this.staffId = null; this.bussinesscardId = null;
this.remark = ""; this.remark = "";
this.favoriteTime = new Date(); this.favoriteTime = new Date();
} }
......
enterprise-manager/src/main/java/com/mortals/xhx/module/favorites/model/FavoritesBusinesscardQuery.java
View file @ 61762e91
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.favorites.model.FavoritesBusinesscardEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.favorites.model.FavoritesBusinesscardEntity;
* 收藏名片查询对象 * 收藏名片查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-10-10 * @date 2024-12-10
*/ */
public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity { public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -40,20 +40,20 @@ public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity { ...@@ -40,20 +40,20 @@ public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity {
/** 用户ID,排除列表 */ /** 用户ID,排除列表 */
private List <Long> userIdNotList; private List <Long> userIdNotList;
/** 开始 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 */ /** 开始 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏 */
private Long staffIdStart; private Long bussinesscardIdStart;
/** 结束 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 */ /** 结束 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏 */
private Long staffIdEnd; private Long bussinesscardIdEnd;
/** 增加 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 */ /** 增加 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏 */
private Long staffIdIncrement; private Long bussinesscardIdIncrement;
/** 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏列表 */ /** 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏列表 */
private List <Long> staffIdList; private List <Long> bussinesscardIdList;
/** 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏排除列表 */ /** 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏排除列表 */
private List <Long> staffIdNotList; private List <Long> bussinesscardIdNotList;
/** 备注 */ /** 备注 */
private List<String> remarkList; private List<String> remarkList;
...@@ -279,83 +279,83 @@ public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity { ...@@ -279,83 +279,83 @@ public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity {
/** /**
* 获取 开始 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 获取 开始 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @return staffIdStart * @return bussinesscardIdStart
*/ */
public Long getStaffIdStart(){ public Long getBussinesscardIdStart(){
return this.staffIdStart; return this.bussinesscardIdStart;
} }
/** /**
* 设置 开始 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 开始 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffIdStart * @param bussinesscardIdStart
*/ */
public void setStaffIdStart(Long staffIdStart){ public void setBussinesscardIdStart(Long bussinesscardIdStart){
this.staffIdStart = staffIdStart; this.bussinesscardIdStart = bussinesscardIdStart;
} }
/** /**
* 获取 结束 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 获取 结束 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @return $staffIdEnd * @return $bussinesscardIdEnd
*/ */
public Long getStaffIdEnd(){ public Long getBussinesscardIdEnd(){
return this.staffIdEnd; return this.bussinesscardIdEnd;
} }
/** /**
* 设置 结束 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 结束 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffIdEnd * @param bussinesscardIdEnd
*/ */
public void setStaffIdEnd(Long staffIdEnd){ public void setBussinesscardIdEnd(Long bussinesscardIdEnd){
this.staffIdEnd = staffIdEnd; this.bussinesscardIdEnd = bussinesscardIdEnd;
} }
/** /**
* 获取 增加 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 获取 增加 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @return staffIdIncrement * @return bussinesscardIdIncrement
*/ */
public Long getStaffIdIncrement(){ public Long getBussinesscardIdIncrement(){
return this.staffIdIncrement; return this.bussinesscardIdIncrement;
} }
/** /**
* 设置 增加 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 增加 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffIdIncrement * @param bussinesscardIdIncrement
*/ */
public void setStaffIdIncrement(Long staffIdIncrement){ public void setBussinesscardIdIncrement(Long bussinesscardIdIncrement){
this.staffIdIncrement = staffIdIncrement; this.bussinesscardIdIncrement = bussinesscardIdIncrement;
} }
/** /**
* 获取 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 获取 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @return staffIdList * @return bussinesscardIdList
*/ */
public List<Long> getStaffIdList(){ public List<Long> getBussinesscardIdList(){
return this.staffIdList; return this.bussinesscardIdList;
} }
/** /**
* 设置 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffIdList * @param bussinesscardIdList
*/ */
public void setStaffIdList(List<Long> staffIdList){ public void setBussinesscardIdList(List<Long> bussinesscardIdList){
this.staffIdList = staffIdList; this.bussinesscardIdList = bussinesscardIdList;
} }
/** /**
* 获取 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 获取 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @return staffIdNotList * @return bussinesscardIdNotList
*/ */
public List<Long> getStaffIdNotList(){ public List<Long> getBussinesscardIdNotList(){
return this.staffIdNotList; return this.bussinesscardIdNotList;
} }
/** /**
* 设置 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffIdNotList * @param bussinesscardIdNotList
*/ */
public void setStaffIdNotList(List<Long> staffIdNotList){ public void setBussinesscardIdNotList(List<Long> bussinesscardIdNotList){
this.staffIdNotList = staffIdNotList; this.bussinesscardIdNotList = bussinesscardIdNotList;
} }
...@@ -758,56 +758,56 @@ public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity { ...@@ -758,56 +758,56 @@ public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity {
} }
/** /**
* 设置 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffId * @param bussinesscardId
*/ */
public FavoritesBusinesscardQuery staffId(Long staffId){ public FavoritesBusinesscardQuery bussinesscardId(Long bussinesscardId){
setStaffId(staffId); setBussinesscardId(bussinesscardId);
return this; return this;
} }
/** /**
* 设置 开始 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 开始 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffIdStart * @param bussinesscardIdStart
*/ */
public FavoritesBusinesscardQuery staffIdStart(Long staffIdStart){ public FavoritesBusinesscardQuery bussinesscardIdStart(Long bussinesscardIdStart){
this.staffIdStart = staffIdStart; this.bussinesscardIdStart = bussinesscardIdStart;
return this; return this;
} }
/** /**
* 设置 结束 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 结束 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffIdEnd * @param bussinesscardIdEnd
*/ */
public FavoritesBusinesscardQuery staffIdEnd(Long staffIdEnd){ public FavoritesBusinesscardQuery bussinesscardIdEnd(Long bussinesscardIdEnd){
this.staffIdEnd = staffIdEnd; this.bussinesscardIdEnd = bussinesscardIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 增加 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffIdIncrement * @param bussinesscardIdIncrement
*/ */
public FavoritesBusinesscardQuery staffIdIncrement(Long staffIdIncrement){ public FavoritesBusinesscardQuery bussinesscardIdIncrement(Long bussinesscardIdIncrement){
this.staffIdIncrement = staffIdIncrement; this.bussinesscardIdIncrement = bussinesscardIdIncrement;
return this; return this;
} }
/** /**
* 设置 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffIdList * @param bussinesscardIdList
*/ */
public FavoritesBusinesscardQuery staffIdList(List<Long> staffIdList){ public FavoritesBusinesscardQuery bussinesscardIdList(List<Long> bussinesscardIdList){
this.staffIdList = staffIdList; this.bussinesscardIdList = bussinesscardIdList;
return this; return this;
} }
/** /**
* 设置 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 * 设置 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
* @param staffIdNotList * @param bussinesscardIdNotList
*/ */
public FavoritesBusinesscardQuery staffIdNotList(List<Long> staffIdNotList){ public FavoritesBusinesscardQuery bussinesscardIdNotList(List<Long> bussinesscardIdNotList){
this.staffIdNotList = staffIdNotList; this.bussinesscardIdNotList = bussinesscardIdNotList;
return this; return this;
} }
......
enterprise-manager/src/main/java/com/mortals/xhx/module/favorites/service/impl/FavoritesBusinesscardServiceImpl.java
View file @ 61762e91
...@@ -36,14 +36,6 @@ public class FavoritesBusinesscardServiceImpl extends AbstractCRUDServiceImpl<Fa ...@@ -36,14 +36,6 @@ public class FavoritesBusinesscardServiceImpl extends AbstractCRUDServiceImpl<Fa
@Override @Override
protected void findAfter(FavoritesBusinesscardEntity params, PageInfo pageInfo, Context context, List<FavoritesBusinesscardEntity> list) throws AppException { protected void findAfter(FavoritesBusinesscardEntity params, PageInfo pageInfo, Context context, List<FavoritesBusinesscardEntity> list) throws AppException {
list.forEach(item->{
StaffEntity staffCache = staffService.getCache(item.getStaffId().toString());
});
} }
} }
\ No newline at end of file
enterprise-manager/src/main/java/com/mortals/xhx/module/favorites/web/FavoritesBusinesscardController.java
View file @ 61762e91
...@@ -53,13 +53,9 @@ public class FavoritesBusinesscardController extends BaseCRUDJsonBodyMappingCont ...@@ -53,13 +53,9 @@ public class FavoritesBusinesscardController extends BaseCRUDJsonBodyMappingCont
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
super.init(model, context); super.init(model, context);
this.addDict(model, "userId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n))); this.addDict(model, "userId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
this.addDict(model, "staffId", staffService.find(new StaffQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n))); this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
} }
......
enterprise-manager/src/main/resources/sqlmap/module/favorites/FavoritesBusinesscardMapper.xml
View file @ 61762e91
...@@ -7,17 +7,15 @@ ...@@ -7,17 +7,15 @@
<resultMap type="FavoritesBusinesscardEntity" id="FavoritesBusinesscardEntity-Map"> <resultMap type="FavoritesBusinesscardEntity" id="FavoritesBusinesscardEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="userId" column="userId" /> <result property="userId" column="userId" />
<result property="staffId" column="staffId" /> <result property="bussinesscardId" column="bussinesscardId" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="favoriteTime" column="favoriteTime" /> <result property="favoriteTime" column="favoriteTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<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" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
...@@ -27,8 +25,8 @@ ...@@ -27,8 +25,8 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userId') or colPickMode == 1 and data.containsKey('userId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userId') or colPickMode == 1 and data.containsKey('userId')))">
a.userId, a.userId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffId') or colPickMode == 1 and data.containsKey('staffId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('bussinesscardId') or colPickMode == 1 and data.containsKey('bussinesscardId')))">
a.staffId, a.bussinesscardId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark, a.remark,
...@@ -53,18 +51,18 @@ ...@@ -53,18 +51,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="FavoritesBusinesscardEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="FavoritesBusinesscardEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_favorites_businesscard insert into mortals_xhx_favorites_businesscard
(userId,staffId,remark,favoriteTime,createUserId,createTime,updateUserId,updateTime) (userId,bussinesscardId,remark,favoriteTime,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{userId},#{staffId},#{remark},#{favoriteTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{userId},#{bussinesscardId},#{remark},#{favoriteTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_favorites_businesscard insert into mortals_xhx_favorites_businesscard
(userId,staffId,remark,favoriteTime,createUserId,createTime,updateUserId,updateTime) (userId,bussinesscardId,remark,favoriteTime,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.userId},#{item.staffId},#{item.remark},#{item.favoriteTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.userId},#{item.bussinesscardId},#{item.remark},#{item.favoriteTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -80,11 +78,11 @@ ...@@ -80,11 +78,11 @@
<if test="(colPickMode==0 and data.containsKey('userIdIncrement')) or (colPickMode==1 and !data.containsKey('userIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('userIdIncrement')) or (colPickMode==1 and !data.containsKey('userIdIncrement'))">
a.userId=ifnull(a.userId,0) + #{data.userIdIncrement}, a.userId=ifnull(a.userId,0) + #{data.userIdIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('staffId')) or (colPickMode==1 and !data.containsKey('staffId'))"> <if test="(colPickMode==0 and data.containsKey('bussinesscardId')) or (colPickMode==1 and !data.containsKey('bussinesscardId'))">
a.staffId=#{data.staffId}, a.bussinesscardId=#{data.bussinesscardId},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('staffIdIncrement')) or (colPickMode==1 and !data.containsKey('staffIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('bussinesscardIdIncrement')) or (colPickMode==1 and !data.containsKey('bussinesscardIdIncrement'))">
a.staffId=ifnull(a.staffId,0) + #{data.staffIdIncrement}, a.bussinesscardId=ifnull(a.bussinesscardId,0) + #{data.bussinesscardIdIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))"> <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark}, a.remark=#{data.remark},
...@@ -134,14 +132,14 @@ ...@@ -134,14 +132,14 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="staffId=(case" suffix="ELSE staffId end),"> <trim prefix="bussinesscardId=(case" suffix="ELSE bussinesscardId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('staffId')) or (colPickMode==1 and !item.containsKey('staffId'))"> <when test="(colPickMode==0 and item.containsKey('bussinesscardId')) or (colPickMode==1 and !item.containsKey('bussinesscardId'))">
when a.id=#{item.id} then #{item.staffId} when a.id=#{item.id} then #{item.bussinesscardId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('staffIdIncrement')) or (colPickMode==1 and !item.containsKey('staffIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('bussinesscardIdIncrement')) or (colPickMode==1 and !item.containsKey('bussinesscardIdIncrement'))">
when a.id=#{item.id} then ifnull(a.staffId,0) + #{item.staffIdIncrement} when a.id=#{item.id} then ifnull(a.bussinesscardId,0) + #{item.bussinesscardIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -309,6 +307,10 @@ ...@@ -309,6 +307,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}
...@@ -368,31 +370,31 @@ ...@@ -368,31 +370,31 @@
${_conditionType_} a.userId <![CDATA[ <= ]]> #{${_conditionParam_}.userIdEnd} ${_conditionType_} a.userId <![CDATA[ <= ]]> #{${_conditionParam_}.userIdEnd}
</if> </if>
<if test="conditionParamRef.containsKey('staffId')"> <if test="conditionParamRef.containsKey('bussinesscardId')">
<if test="conditionParamRef.staffId != null "> <if test="conditionParamRef.bussinesscardId != null ">
${_conditionType_} a.staffId = #{${_conditionParam_}.staffId} ${_conditionType_} a.bussinesscardId = #{${_conditionParam_}.bussinesscardId}
</if> </if>
<if test="conditionParamRef.staffId == null"> <if test="conditionParamRef.bussinesscardId == null">
${_conditionType_} a.staffId is null ${_conditionType_} a.bussinesscardId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0"> <if test="conditionParamRef.containsKey('bussinesscardIdList') and conditionParamRef.bussinesscardIdList.size() > 0">
${_conditionType_} a.staffId in ${_conditionType_} a.bussinesscardId in
<foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.bussinesscardIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0"> <if test="conditionParamRef.containsKey('bussinesscardIdNotList') and conditionParamRef.bussinesscardIdNotList.size() > 0">
${_conditionType_} a.staffId not in ${_conditionType_} a.bussinesscardId not in
<foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.bussinesscardIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('staffIdStart') and conditionParamRef.staffIdStart != null"> <if test="conditionParamRef.containsKey('bussinesscardIdStart') and conditionParamRef.bussinesscardIdStart != null">
${_conditionType_} a.staffId <![CDATA[ >= ]]> #{${_conditionParam_}.staffIdStart} ${_conditionType_} a.bussinesscardId <![CDATA[ >= ]]> #{${_conditionParam_}.bussinesscardIdStart}
</if> </if>
<if test="conditionParamRef.containsKey('staffIdEnd') and conditionParamRef.staffIdEnd != null"> <if test="conditionParamRef.containsKey('bussinesscardIdEnd') and conditionParamRef.bussinesscardIdEnd != null">
${_conditionType_} a.staffId <![CDATA[ <= ]]> #{${_conditionParam_}.staffIdEnd} ${_conditionType_} a.bussinesscardId <![CDATA[ <= ]]> #{${_conditionParam_}.bussinesscardIdEnd}
</if> </if>
...@@ -533,9 +535,9 @@ ...@@ -533,9 +535,9 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0"> <if test="conditionParamRef.containsKey('bussinesscardIdList') and conditionParamRef.bussinesscardIdList.size() > 0">
field(a.staffId, field(a.bussinesscardId,
<foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.bussinesscardIdList" open="" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
, ,
...@@ -576,9 +578,9 @@ ...@@ -576,9 +578,9 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0"> <if test="conditionParamRef.containsKey('bussinesscardIdList') and conditionParamRef.bussinesscardIdList.size() > 0">
field(a.staffId, field(a.bussinesscardId,
<foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.bussinesscardIdList" open="" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
, ,
...@@ -608,9 +610,9 @@ ...@@ -608,9 +610,9 @@
<if test='orderCol.userId != null and "DESC".equalsIgnoreCase(orderCol.userId)'>DESC</if> <if test='orderCol.userId != null and "DESC".equalsIgnoreCase(orderCol.userId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('staffId')"> <if test="orderCol.containsKey('bussinesscardId')">
a.staffId a.bussinesscardId
<if test='orderCol.staffId != null and "DESC".equalsIgnoreCase(orderCol.staffId)'>DESC</if> <if test='orderCol.bussinesscardId != null and "DESC".equalsIgnoreCase(orderCol.bussinesscardId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('remark')"> <if test="orderCol.containsKey('remark')">
......
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