Commit 415c5c9c authored by daijunxiong's avatar daijunxiong

新增员工信息字段---同时修改同步任务员工信息存储

parent 5f575e90
...@@ -104,7 +104,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -104,7 +104,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
} }
staffEntity1.setName(list.getPersonName()); staffEntity1.setName(list.getPersonName());
staffEntity1.setRemarkId(list.getPersonId()); staffEntity1.setRemarkId(list.getPersonId());
staffEntity1.setPhotoPath(list.getPersonPhoto().getPicUri()); staffEntity1.setPicUri(list.getPersonPhoto().getPicUri());
staffEntity1.setServerIndexCode(list.getPersonPhoto().getServerIndexCode());
staffEntity1.setDeptName(list.getOrgName()); staffEntity1.setDeptName(list.getOrgName());
staffEntity1.setSource(1); staffEntity1.setSource(1);
staffEntity1.setStatus(1); staffEntity1.setStatus(1);
...@@ -145,7 +146,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService { ...@@ -145,7 +146,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
} }
staffEntity1.setName(list.getPersonName()); staffEntity1.setName(list.getPersonName());
staffEntity1.setRemarkId(list.getPersonId()); staffEntity1.setRemarkId(list.getPersonId());
staffEntity1.setPhotoPath(list.getPersonPhoto().getPicUri()); staffEntity1.setPicUri(list.getPersonPhoto().getPicUri());
staffEntity1.setServerIndexCode(list.getPersonPhoto().getServerIndexCode());
staffEntity1.setDeptName(list.getOrgName()); staffEntity1.setDeptName(list.getOrgName());
staffEntity1.setGender(list.getGender()); staffEntity1.setGender(list.getGender());
staffEntity1.setWorkNum(list.getJobNo()); staffEntity1.setWorkNum(list.getJobNo());
......
...@@ -7,7 +7,7 @@ import java.util.Date; ...@@ -7,7 +7,7 @@ import java.util.Date;
* 员工基本信息实体对象 * 员工基本信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-14
*/ */
public class StaffEntity extends StaffVo { public class StaffEntity extends StaffVo {
...@@ -97,6 +97,14 @@ public class StaffEntity extends StaffVo { ...@@ -97,6 +97,14 @@ public class StaffEntity extends StaffVo {
* 员工来源(1.外部,2.内部) * 员工来源(1.外部,2.内部)
*/ */
private Integer source; private Integer source;
/**
* 相对图片pic
*/
private String picUri;
/**
* 图片资源唯一标识
*/
private String serverIndexCode;
...@@ -395,6 +403,34 @@ public class StaffEntity extends StaffVo { ...@@ -395,6 +403,34 @@ public class StaffEntity extends StaffVo {
public void setSource(Integer source){ public void setSource(Integer source){
this.source = source; this.source = source;
} }
/**
* 获取 相对图片pic
* @return String
*/
public String getPicUri(){
return picUri;
}
/**
* 设置 相对图片pic
* @param picUri
*/
public void setPicUri(String picUri){
this.picUri = picUri;
}
/**
* 获取 图片资源唯一标识
* @return String
*/
public String getServerIndexCode(){
return serverIndexCode;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCode
*/
public void setServerIndexCode(String serverIndexCode){
this.serverIndexCode = serverIndexCode;
}
...@@ -438,6 +474,8 @@ public class StaffEntity extends StaffVo { ...@@ -438,6 +474,8 @@ public class StaffEntity extends StaffVo {
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",remarkId:").append(getRemarkId()); sb.append(",remarkId:").append(getRemarkId());
sb.append(",source:").append(getSource()); sb.append(",source:").append(getSource());
sb.append(",picUri:").append(getPicUri());
sb.append(",serverIndexCode:").append(getServerIndexCode());
return sb.toString(); return sb.toString();
} }
...@@ -483,6 +521,10 @@ public class StaffEntity extends StaffVo { ...@@ -483,6 +521,10 @@ public class StaffEntity extends StaffVo {
this.remarkId = ""; this.remarkId = "";
this.source = 2; this.source = 1;
this.picUri = "";
this.serverIndexCode = "";
} }
} }
\ No newline at end of file
...@@ -5,7 +5,7 @@ import java.util.List; ...@@ -5,7 +5,7 @@ import java.util.List;
* 员工基本信息查询对象 * 员工基本信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-10 * @date 2023-04-14
*/ */
public class StaffQuery extends StaffEntity { public class StaffQuery extends StaffEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -244,6 +244,16 @@ public class StaffQuery extends StaffEntity { ...@@ -244,6 +244,16 @@ public class StaffQuery extends StaffEntity {
/** 员工来源(1.外部,2.内部)排除列表 */ /** 员工来源(1.外部,2.内部)排除列表 */
private List <Integer> sourceNotList; private List <Integer> sourceNotList;
/** 相对图片pic */
private List<String> picUriList;
/** 相对图片pic排除列表 */
private List <String> picUriNotList;
/** 图片资源唯一标识 */
private List<String> serverIndexCodeList;
/** 图片资源唯一标识排除列表 */
private List <String> serverIndexCodeNotList;
/** 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<StaffQuery> orConditionList; private List<StaffQuery> orConditionList;
...@@ -1574,6 +1584,70 @@ public class StaffQuery extends StaffEntity { ...@@ -1574,6 +1584,70 @@ public class StaffQuery extends StaffEntity {
} }
/**
* 获取 相对图片pic
* @return picUriList
*/
public List<String> getPicUriList(){
return this.picUriList;
}
/**
* 设置 相对图片pic
* @param picUriList
*/
public void setPicUriList(List<String> picUriList){
this.picUriList = picUriList;
}
/**
* 获取 相对图片pic
* @return picUriNotList
*/
public List<String> getPicUriNotList(){
return this.picUriNotList;
}
/**
* 设置 相对图片pic
* @param picUriNotList
*/
public void setPicUriNotList(List<String> picUriNotList){
this.picUriNotList = picUriNotList;
}
/**
* 获取 图片资源唯一标识
* @return serverIndexCodeList
*/
public List<String> getServerIndexCodeList(){
return this.serverIndexCodeList;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeList
*/
public void setServerIndexCodeList(List<String> serverIndexCodeList){
this.serverIndexCodeList = serverIndexCodeList;
}
/**
* 获取 图片资源唯一标识
* @return serverIndexCodeNotList
*/
public List<String> getServerIndexCodeNotList(){
return this.serverIndexCodeNotList;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeNotList
*/
public void setServerIndexCodeNotList(List<String> serverIndexCodeNotList){
this.serverIndexCodeNotList = serverIndexCodeNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -2310,6 +2384,44 @@ public class StaffQuery extends StaffEntity { ...@@ -2310,6 +2384,44 @@ public class StaffQuery extends StaffEntity {
return this; return this;
} }
/**
* 设置 相对图片pic
* @param picUri
*/
public StaffQuery picUri(String picUri){
setPicUri(picUri);
return this;
}
/**
* 设置 相对图片pic
* @param picUriList
*/
public StaffQuery picUriList(List<String> picUriList){
this.picUriList = picUriList;
return this;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCode
*/
public StaffQuery serverIndexCode(String serverIndexCode){
setServerIndexCode(serverIndexCode);
return this;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeList
*/
public StaffQuery serverIndexCodeList(List<String> serverIndexCodeList){
this.serverIndexCodeList = serverIndexCodeList;
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
......
...@@ -54,6 +54,8 @@ CREATE TABLE mortals_xhx_staff( ...@@ -54,6 +54,8 @@ CREATE TABLE mortals_xhx_staff(
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
`remarkId` varchar(255) COMMENT '备注id', `remarkId` varchar(255) COMMENT '备注id',
`source` tinyint(2) DEFAULT '1' COMMENT '员工来源(1.外部,2.内部)', `source` tinyint(2) DEFAULT '1' COMMENT '员工来源(1.外部,2.内部)',
`picUri` varchar(255) COMMENT '相对图片pic',
`serverIndexCode` varchar(255) COMMENT '图片资源唯一标识',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工基本信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工基本信息';
......
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