Commit 63c8a378 authored by 赵啸非's avatar 赵啸非

添加公司背景图片字段

parent 234af950
-- ---------------------------- -- ----------------------------
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 '背景图片';
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,
......
...@@ -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
...@@ -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
......
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