[task-2866] 人员档案功能重构 / 【后端】人员档案外部信息接口开发

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/api/IEmployeeInfoService.java

@@ -2,6 +2,8 @@ package com.lc.ibps.components.employee.api;
 
 import java.util.List;
 
+import com.lc.ibps.base.framework.persistence.entity.AbstractPo;
+import io.swagger.annotations.ApiParam;
 import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.validation.annotation.Validated;
@@ -55,8 +57,7 @@ public interface IEmployeeInfoService {
 	@RequestMapping(value = "/get", method = { RequestMethod.GET })
 	public APIResult<EmployeeInfoPo> get(
 //			@NotBlank(message = "{com.lc.ibps.components.provider.EmployeeInfoProvider.id}") 
-			@RequestParam(name = "id", required = true) String id,
-			@RequestParam(name = "tableCode", required = false) String tableCode);
+			@RequestParam(name = "id", required = true) String id);
 	
 	/**
 	 * 
@@ -80,4 +81,8 @@ public interface IEmployeeInfoService {
 	@RequestMapping(value = "/save", method = { RequestMethod.POST })
 	public APIResult<Void> save(
  			@RequestBody(required = true) @Valid EmployeeInfoPo employeeInfoPo);
+	@RequestMapping(value = "/queryResearches", method = RequestMethod.POST)
+	public APIResult<APIPageList<AbstractPo>> queryResearches(
+			@ApiParam(name = "request", value = "传入查询请求json字符串", required = true)
+			@RequestBody(required = true) APIRequest request);
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/api/IScienceActivitiesService.java

@@ -0,0 +1,82 @@
+package com.lc.ibps.components.employee.api;
+
+import java.util.List;
+
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.lc.ibps.cloud.entity.APIPageList;
+import com.lc.ibps.cloud.entity.APIRequest;
+import com.lc.ibps.cloud.entity.APIResult;
+import javax.validation.Valid;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+
+
+
+/**
+ * 科普活动 接口
+ *
+ *<pre> 
+ * 构建组：ibps-provider-scienceActivities-api
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:57
+ *</pre>
+ */
+@Validated
+@RequestMapping(value = "/employee/scienceActivities")
+@RestController
+public interface IScienceActivitiesService {
+
+	/**
+	 * 
+	 * 【科普活动】列表(分页条件查询)数据
+	 *
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value = "/query", method = RequestMethod.POST)
+	public APIResult<APIPageList<ScienceActivitiesPo>> query(
+			@RequestBody(required = true) APIRequest request);
+	
+	/**
+	 * 
+	 * 根据id查询【科普活动】
+	 *
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/get", method = { RequestMethod.GET })
+	public APIResult<ScienceActivitiesPo> get(
+//			@NotBlank(message = "{com.lc.ibps.components.provider.ScienceActivitiesProvider.id}") 
+			@RequestParam(name = "id", required = true) String id);
+	
+	/**
+	 * 
+	 * 批量删除【科普活动】记录
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@RequestMapping(value = "/remove", method = { RequestMethod.POST })
+	public APIResult<Void> remove(
+//			@NotEmpty(message = "{com.lc.ibps.components.provider.ScienceActivitiesProvider.ids}")
+			@RequestParam(name = "ids", required = true) String[] ids);
+	
+	/**
+	 * 
+	 * 保存【科普活动】记录
+	 *
+	 * @param scienceActivitiesPo
+	 * @return
+	 */
+	@RequestMapping(value = "/save", method = { RequestMethod.POST })
+	public APIResult<Void> save(
+ 			@RequestBody(required = true) @Valid ScienceActivitiesPo scienceActivitiesPo);
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/domain/ScienceActivities.java

@@ -0,0 +1,63 @@
+package com.lc.ibps.components.employee.domain;
+
+
+import javax.annotation.Resource;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+
+import com.lc.ibps.base.core.util.BeanUtils;
+import com.lc.ibps.base.core.util.string.StringUtil;
+import com.lc.ibps.base.core.util.AppUtil;
+import com.lc.ibps.base.framework.domain.AbstractDomain;
+import com.lc.ibps.base.framework.persistence.dao.IDao;
+import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
+import com.lc.ibps.components.employee.persistence.dao.ScienceActivitiesDao;
+import com.lc.ibps.components.employee.persistence.dao.ScienceActivitiesQueryDao;
+import com.lc.ibps.components.employee.repository.ScienceActivitiesRepository;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+
+/**
+ * 科普活动 领域对象实体
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:57
+ *</pre>
+ */
+@SuppressWarnings("serial")
+@Service
+@Transactional
+@Scope("prototype")
+public class ScienceActivities extends AbstractDomain<String, ScienceActivitiesPo>{
+	
+	@Resource
+	private ScienceActivitiesDao scienceActivitiesDao;
+	@Resource
+	private ScienceActivitiesQueryDao scienceActivitiesQueryDao;
+	@Resource
+	private ScienceActivitiesRepository scienceActivitiesRepository;
+
+
+	protected void init(){
+		//
+	}
+	
+	@Override
+	protected IQueryDao<String, ScienceActivitiesPo> getInternalQueryDao() {
+		return scienceActivitiesQueryDao;
+	}
+	
+	@Override
+	protected IDao<String, ScienceActivitiesPo> getInternalDao() {
+		return scienceActivitiesDao;
+	}
+	
+	@Override
+	public String getInternalCacheName() {
+		return "scienceActivities";
+	}
+
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/dto/ScienceActivitiesDTO.java

@@ -0,0 +1,23 @@
+package com.lc.ibps.components.employee.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lc.ibps.base.core.constants.StringPool;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+public class ScienceActivitiesDTO extends ScienceActivitiesPo {
+
+    @ApiModelProperty(value = "参与时间")
+    @JsonFormat(pattern = StringPool.DATE_FORMAT_DATETIME, timezone = "GMT+8")
+    private Date joinedTime;
+
+    public Date getJoinedTime() {
+        return joinedTime;
+    }
+
+    public void setJoinedTime(Date joinedTime) {
+        this.joinedTime = joinedTime;
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/dao/ScienceActivitiesDao.java

@@ -0,0 +1,16 @@
+package com.lc.ibps.components.employee.persistence.dao;
+
+import com.lc.ibps.base.framework.persistence.dao.IDao;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+
+/**
+ * 科普活动 Dao接口
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:55
+ *</pre>
+ */
+public interface ScienceActivitiesDao extends IDao<String, ScienceActivitiesPo> {
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/dao/ScienceActivitiesQueryDao.java

@@ -0,0 +1,20 @@
+package com.lc.ibps.components.employee.persistence.dao;
+
+import com.lc.ibps.api.base.page.Page;
+import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+
+import java.util.List;
+
+/**
+ * 科普活动 查询Dao接口
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:55
+ *</pre>
+ */
+public interface ScienceActivitiesQueryDao extends IQueryDao<String, ScienceActivitiesPo> {
+    public List<ScienceActivitiesPo> findByEmployeeId(String employeeId, Page page);
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/dao/impl/ScienceActivitiesDaoImpl.java

@@ -0,0 +1,30 @@
+package com.lc.ibps.components.employee.persistence.dao.impl;
+
+import org.springframework.stereotype.Repository;
+
+import com.lc.ibps.base.db.ddd.dao.MyBatisDaoImpl;
+import com.lc.ibps.components.employee.persistence.dao.ScienceActivitiesDao;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+
+import java.util.List;
+
+/**
+ * 科普活动 Dao接口的实现类
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:55
+ *</pre>
+ */
+@SuppressWarnings("serial")
+@Repository
+public class ScienceActivitiesDaoImpl extends MyBatisDaoImpl<String, ScienceActivitiesPo> implements ScienceActivitiesDao{
+
+    @Override
+    public String getNamespace() {
+        return ScienceActivitiesPo.class.getName();
+    }
+
+
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/dao/impl/ScienceActivitiesQueryDaoImpl.java

@@ -0,0 +1,33 @@
+package com.lc.ibps.components.employee.persistence.dao.impl;
+
+
+import com.lc.ibps.api.base.page.Page;
+import org.springframework.stereotype.Repository;
+
+import com.lc.ibps.base.db.ddd.dao.MyBatisQueryDaoImpl;
+import com.lc.ibps.components.employee.persistence.dao.ScienceActivitiesQueryDao;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+
+import java.util.List;
+
+/**
+ *科普活动 查询Dao的实现类
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:55
+ *</pre>
+ */
+ @SuppressWarnings("serial")
+@Repository
+public class ScienceActivitiesQueryDaoImpl extends MyBatisQueryDaoImpl<String, ScienceActivitiesPo> implements ScienceActivitiesQueryDao{
+
+    @Override
+    public String getNamespace() {
+        return ScienceActivitiesPo.class.getName();
+    }
+    public List<ScienceActivitiesPo> findByEmployeeId(String employeeId, Page page) {
+        return findByKey("findByEmployeeId", b().a("employeeId", employeeId).p(),page);
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/EmployeeInfoPo.java

@@ -58,62 +58,7 @@ public class EmployeeInfoPo extends EmployeeInfoTbl{
 	public void setCertificateInfoPoList(List<CertificateInfoPo> certificateInfoPoList) {
 		this.certificateInfoPoList = certificateInfoPoList;
 	}
-	
-	private List<ScientificProjectPo> scientificProjectPoList = new ArrayList<ScientificProjectPo>();
-	public List<ScientificProjectPo> getScientificProjectPoList() {
-		return scientificProjectPoList;
-	}
-	public void setScientificProjectPoList(List<ScientificProjectPo> scientificProjectPoList) {
-		this.scientificProjectPoList = scientificProjectPoList;
-	}
-	
-	private List<TechnologyAwardPo> technologyAwardPoList = new ArrayList<TechnologyAwardPo>();
-	public List<TechnologyAwardPo> getTechnologyAwardPoList() {
-		return technologyAwardPoList;
-	}
-	public void setTechnologyAwardPoList(List<TechnologyAwardPo> technologyAwardPoList) {
-		this.technologyAwardPoList = technologyAwardPoList;
-	}
-	
-	private List<SciArticlePo> sciArticlePoList = new ArrayList<SciArticlePo>();
-	public List<SciArticlePo> getSciArticlePoList() {
-		return sciArticlePoList;
-	}
-	public void setSciArticlePoList(List<SciArticlePo> sciArticlePoList) {
-		this.sciArticlePoList = sciArticlePoList;
-	}
-
-	private List<ChinesePapersPo> chinesePapersPoList = new ArrayList<ChinesePapersPo>();
-	public List<ChinesePapersPo> getChinesePapersPoList() {
-		return chinesePapersPoList;
-	}
-	public void setChinesePapersPoList(List<ChinesePapersPo> chinesePapersPoList) {
-		this.chinesePapersPoList = chinesePapersPoList;
-	}
-
-	private List<ResearchMonographPo> researchMonographPoList = new ArrayList<ResearchMonographPo>();
-	public List<ResearchMonographPo> getResearchMonographPoList() {
-		return researchMonographPoList;
-	}
-	public void setResearchMonographPoList(List<ResearchMonographPo> researchMonographPoList) {
-		this.researchMonographPoList = researchMonographPoList;
-	}
 
-	private List<ResearchPatentPo> researchPatentPoList = new ArrayList<ResearchPatentPo>();
-	public List<ResearchPatentPo> getResearchPatentPoList() {
-		return researchPatentPoList;
-	}
-	public void setResearchPatentPoList(List<ResearchPatentPo> researchPatentPoList) {
-		this.researchPatentPoList = researchPatentPoList;
-	}
-
-	private List<AcademicActivitiesPo> academicActivitiesPoList = new ArrayList<AcademicActivitiesPo>();
-	public List<AcademicActivitiesPo> getAcademicActivitiesPoList() {
-		return academicActivitiesPoList;
-	}
-	public void setAcademicActivitiesPoList(List<AcademicActivitiesPo> academicActivitiesPoList) {
-		this.academicActivitiesPoList = academicActivitiesPoList;
-	}
 
 	public static EmployeeInfoPo fromJsonString(String data){
 		if(JacksonUtil.isNotJsonObject(data)){

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/ScienceActivitiesPo.java

@@ -0,0 +1,44 @@
+package com.lc.ibps.components.employee.persistence.entity;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import com.lc.ibps.base.core.util.JacksonUtil;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 科普活动 实体对象
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:54
+ *</pre>
+ */
+@SuppressWarnings("serial")
+@ApiModel(value = "科普活动对象")
+public class ScienceActivitiesPo extends ScienceActivitiesTbl{
+	private boolean delBeforeSave = true;
+	public boolean isDelBeforeSave() {
+		return delBeforeSave;
+	}
+	public void setDelBeforeSave(boolean delBeforeSave) {
+		this.delBeforeSave = delBeforeSave;
+	}	
+	
+
+	public static ScienceActivitiesPo fromJsonString(String data){
+		if(JacksonUtil.isNotJsonObject(data)){
+			return null;
+		}
+		return JacksonUtil.getDTO(data, ScienceActivitiesPo.class);
+	}
+	
+	public static List<ScienceActivitiesPo> fromJsonArrayString(String listData){
+		if(JacksonUtil.isNotJsonArray(listData)){
+			return Collections.emptyList();
+		}
+		return JacksonUtil.getDTOList(listData, ScienceActivitiesPo.class);
+	}
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/ScienceActivitiesTbl.java

@@ -0,0 +1,233 @@
+package com.lc.ibps.components.employee.persistence.entity;
+
+import java.util.Date;
+
+import com.lc.ibps.base.framework.persistence.entity.AbstractPo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 科普活动 表对象
+ * 
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:54
+ *</pre>
+ */
+@SuppressWarnings("serial")
+@ApiModel(value = "科普活动对象")
+public class ScienceActivitiesTbl extends AbstractPo<String>{
+	@ApiModelProperty(value = "主键")
+	protected String  id; 		/*主键*/
+	@ApiModelProperty(value = "租户ID")
+	protected String  tenantId; 		/*租户ID*/
+	@ApiModelProperty(value = "IP地址")
+	protected String  ip; 		/*IP地址*/
+	@ApiModelProperty(value = "是否过审")
+	protected String  shiFouGuoShen; 		/*是否过审*/
+	@ApiModelProperty(value = "地点")
+	protected String  diDian; 		/*地点*/
+	@ApiModelProperty(value = "编制人")
+	protected String  bianZhiRen; 		/*编制人*/
+	@ApiModelProperty(value = "编制部门")
+	protected String  bianZhiBuMen; 		/*编制部门*/
+	@ApiModelProperty(value = "编制时间")
+	protected String  bianZhiShiJian; 		/*编制时间*/
+	@ApiModelProperty(value = "快照")
+	protected String  kuaiZhao; 		/*快照*/
+	@ApiModelProperty(value = "姓名")
+	protected String  xingMing; 		/*姓名*/
+	@ApiModelProperty(value = "活动时间")
+	protected String  huoDongShiJian; 		/*活动时间*/
+	@ApiModelProperty(value = "科普形式")
+	protected String  kePuXingShi; 		/*科普形式*/
+	@ApiModelProperty(value = "附件")
+	protected String  fuJian; 		/*附件*/
+	@ApiModelProperty(value = "备注")
+	protected String  beiZhu; 		/*备注*/
+	@ApiModelProperty(value = "科普编号")
+	protected String  kePuBianHao; 		/*科普编号*/
+
+	public void setId(String id) 
+	{
+		this.id = id;
+	}
+	/**
+	 * 返回 主键
+	 * @return
+	 */
+	public String getId() 
+	{
+		return this.id;
+	}
+	public void setTenantId(String tenantId) 
+	{
+		this.tenantId = tenantId;
+	}
+	/**
+	 * 返回 租户ID
+	 * @return
+	 */
+	public String getTenantId() 
+	{
+		return this.tenantId;
+	}
+	public void setIp(String ip) 
+	{
+		this.ip = ip;
+	}
+	/**
+	 * 返回 IP地址
+	 * @return
+	 */
+	public String getIp() 
+	{
+		return this.ip;
+	}
+	public void setShiFouGuoShen(String shiFouGuoShen) 
+	{
+		this.shiFouGuoShen = shiFouGuoShen;
+	}
+	/**
+	 * 返回 是否过审
+	 * @return
+	 */
+	public String getShiFouGuoShen() 
+	{
+		return this.shiFouGuoShen;
+	}
+	public void setDiDian(String diDian) 
+	{
+		this.diDian = diDian;
+	}
+	/**
+	 * 返回 地点
+	 * @return
+	 */
+	public String getDiDian() 
+	{
+		return this.diDian;
+	}
+	public void setBianZhiRen(String bianZhiRen) 
+	{
+		this.bianZhiRen = bianZhiRen;
+	}
+	/**
+	 * 返回 编制人
+	 * @return
+	 */
+	public String getBianZhiRen() 
+	{
+		return this.bianZhiRen;
+	}
+	public void setBianZhiBuMen(String bianZhiBuMen) 
+	{
+		this.bianZhiBuMen = bianZhiBuMen;
+	}
+	/**
+	 * 返回 编制部门
+	 * @return
+	 */
+	public String getBianZhiBuMen() 
+	{
+		return this.bianZhiBuMen;
+	}
+	public void setBianZhiShiJian(String bianZhiShiJian) 
+	{
+		this.bianZhiShiJian = bianZhiShiJian;
+	}
+	/**
+	 * 返回 编制时间
+	 * @return
+	 */
+	public String getBianZhiShiJian() 
+	{
+		return this.bianZhiShiJian;
+	}
+	public void setKuaiZhao(String kuaiZhao) 
+	{
+		this.kuaiZhao = kuaiZhao;
+	}
+	/**
+	 * 返回 快照
+	 * @return
+	 */
+	public String getKuaiZhao() 
+	{
+		return this.kuaiZhao;
+	}
+	public void setXingMing(String xingMing) 
+	{
+		this.xingMing = xingMing;
+	}
+	/**
+	 * 返回 姓名
+	 * @return
+	 */
+	public String getXingMing() 
+	{
+		return this.xingMing;
+	}
+	public void setHuoDongShiJian(String huoDongShiJian) 
+	{
+		this.huoDongShiJian = huoDongShiJian;
+	}
+	/**
+	 * 返回 活动时间
+	 * @return
+	 */
+	public String getHuoDongShiJian() 
+	{
+		return this.huoDongShiJian;
+	}
+	public void setKePuXingShi(String kePuXingShi) 
+	{
+		this.kePuXingShi = kePuXingShi;
+	}
+	/**
+	 * 返回 科普形式
+	 * @return
+	 */
+	public String getKePuXingShi() 
+	{
+		return this.kePuXingShi;
+	}
+	public void setFuJian(String fuJian) 
+	{
+		this.fuJian = fuJian;
+	}
+	/**
+	 * 返回 附件
+	 * @return
+	 */
+	public String getFuJian() 
+	{
+		return this.fuJian;
+	}
+	public void setBeiZhu(String beiZhu) 
+	{
+		this.beiZhu = beiZhu;
+	}
+	/**
+	 * 返回 备注
+	 * @return
+	 */
+	public String getBeiZhu() 
+	{
+		return this.beiZhu;
+	}
+	public void setKePuBianHao(String kePuBianHao) 
+	{
+		this.kePuBianHao = kePuBianHao;
+	}
+	/**
+	 * 返回 科普编号
+	 * @return
+	 */
+	public String getKePuBianHao() 
+	{
+		return this.kePuBianHao;
+	}
+	
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/provider/EmployeeInfoProvider.java

@@ -2,9 +2,12 @@ package com.lc.ibps.components.employee.provider;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.lc.ibps.base.framework.persistence.entity.AbstractPo;
+import com.lc.ibps.cloud.utils.QueryFilterUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -62,17 +65,37 @@ public class EmployeeInfoProvider extends GenericProvider implements IEmployeeIn
 		return result;
 	}
 
+	public APIResult<APIPageList<AbstractPo>> queryResearches(
+			@ApiParam(name = "request", value = "传入查询请求json字符串", required = true)
+			@RequestBody(required = true) APIRequest request) {
+		APIResult<APIPageList<AbstractPo>> result = new APIResult<>();
+		try {
+			Map<String, Object> customs = request.getCustoms();
+			if(customs.get("id") == null){
+				setWarnResult(result, StateEnum.ERROR.getCode(), "id 不能为空");
+			} else if(customs.get("type") == null){
+				setWarnResult(result, StateEnum.ERROR.getCode(), "type 不能为空");
+			}else {
+				List<AbstractPo> data = employeeInfoRepository.queryResearches((String) customs.get("id"), (String) customs.get("type"),
+						QueryFilterUtil.getQueryFilterPage(request.getRequestPage()));
+				APIPageList<AbstractPo> apiPageData = getAPIPageList(data);
+				result.setData(apiPageData);
+			}
+		} catch (Exception e) {
+			// TODO ERROR => other error message
+			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
+		}
+		return result;
+	}
+
 	@ApiOperation(value = "根据id查询人员信息表", notes = "根据id查询人员信息表")
 	@Override
 	public APIResult<EmployeeInfoPo> get(
 			@ApiParam(name = "id", value = "查询id", required = true) 
-			@RequestParam(name = "id", required = true) String id,
-			@ApiParam(name = "tableCode", value = "数据表编码", required = false)
-			@RequestParam(name = "tableCode", required = false) String tableCode) {
+			@RequestParam(name = "id", required = true) String id) {
 		APIResult<EmployeeInfoPo> result = new APIResult<>();
 		try {
-			tableCode = tableCode == null ? "" : tableCode;
-			EmployeeInfoPo employeeInfoPo = employeeInfoRepository.loadCascade(id,tableCode);
+			EmployeeInfoPo employeeInfoPo = employeeInfoRepository.loadCascade(id);
 			result.setData(employeeInfoPo);
 		} catch (Exception e) {
 			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/provider/ScienceActivitiesProvider.java

@@ -0,0 +1,123 @@
+package com.lc.ibps.components.employee.provider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.lc.ibps.api.base.constants.StateEnum;
+import com.lc.ibps.api.base.query.QueryFilter;
+import com.lc.ibps.base.core.constants.StringPool;
+import com.lc.ibps.base.core.util.BeanUtils;
+import com.lc.ibps.cloud.entity.APIPageList;
+import com.lc.ibps.cloud.entity.APIRequest;
+import com.lc.ibps.cloud.entity.APIResult;
+import com.lc.ibps.cloud.provider.GenericProvider;
+import com.lc.ibps.components.employee.api.IScienceActivitiesService;
+import com.lc.ibps.components.employee.domain.ScienceActivities;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+import com.lc.ibps.components.employee.repository.ScienceActivitiesRepository;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.Extension;
+import io.swagger.annotations.ExtensionProperty;
+
+/**
+ * 科普活动 服务类
+ * <pre>
+ * 构建组：ibps-provider-scienceActivities
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:58
+ *</pre>
+ */
+@Api(tags = "科普活动管理", value = "科普活动数据")
+@Service
+public class ScienceActivitiesProvider extends GenericProvider implements IScienceActivitiesService{
+
+	@Resource
+	private ScienceActivitiesRepository scienceActivitiesRepository;
+
+	@ApiOperation(value = "科普活动列表(分页条件查询)数据", notes = "科普活动列表(分页条件查询)数据")
+	@Override
+	public APIResult<APIPageList<ScienceActivitiesPo>> query(
+			@ApiParam(name = "request", value = "传入查询请求json字符串", required = true) 
+			@RequestBody(required = true) APIRequest request) {
+		APIResult<APIPageList<ScienceActivitiesPo>> result = new APIResult<>();
+		try {
+			QueryFilter queryFilter = getQueryFilter(request);
+			List<ScienceActivitiesPo> data = scienceActivitiesRepository.query(queryFilter);
+			APIPageList<ScienceActivitiesPo> apiPageData = getAPIPageList(data);
+			result.setData(apiPageData);
+		} catch (Exception e) {
+			// TODO ERROR => other error message
+			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
+		}
+		return result;
+	}
+
+	@ApiOperation(value = "根据id查询科普活动", notes = "根据id查询科普活动")
+	@Override
+	public APIResult<ScienceActivitiesPo> get(
+			@ApiParam(name = "id", value = "查询id", required = true) 
+			@RequestParam(name = "id", required = true) String id) {
+		APIResult<ScienceActivitiesPo> result = new APIResult<>();
+		try {
+			ScienceActivitiesPo scienceActivitiesPo = scienceActivitiesRepository.get(id);
+			result.setData(scienceActivitiesPo);
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
+		}
+		return result;
+	}
+	
+	@ApiOperation(value = "保存", notes = "保存科普活动信息", 
+			extensions = {
+					@Extension(properties = {
+							@ExtensionProperty(name = "submitCtrl", value = StringPool.Y)
+					})
+			})
+	@Override
+	public APIResult<Void> save(
+			@ApiParam(name = "scienceActivitiesPo", value = "科普活动对象", required = true)  
+			@RequestBody(required = true) ScienceActivitiesPo scienceActivitiesPo) {
+		APIResult<Void> result = new APIResult<Void>();
+		try {
+			logger.info(" com.lc.ibps.components.provider.ScienceActivitiesProvider.save()--->scienceActivitiesPo: {}", scienceActivitiesPo.toString());
+			ScienceActivities domain = scienceActivitiesRepository.newInstance(scienceActivitiesPo);
+			domain.save();
+			result.setMessage("保存科普活动成功");
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
+		}
+		return result;
+	}
+
+	@ApiOperation(value = "删除", notes = "删除科普活动", 
+			extensions = {
+					@Extension(properties = {
+							@ExtensionProperty(name = "submitCtrl", value = StringPool.Y)
+					})
+			})
+	@Override
+	public APIResult<Void> remove(
+			@ApiParam(name = "ids", value = "科普活动ID数组", required = true)  
+			@RequestParam(name = "ids", required = true) String[] ids) {
+		APIResult<Void> result = new APIResult<Void>();
+		try {
+			ScienceActivities domain = scienceActivitiesRepository.newInstance();
+			domain.deleteByIds(ids);
+			result.setMessage("删除科普活动成功");
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
+		}
+		return result;
+	}
+	
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/repository/EmployeeInfoRepository.java

@@ -1,9 +1,14 @@
 package com.lc.ibps.components.employee.repository;
 
+import com.lc.ibps.api.base.page.Page;
+import com.lc.ibps.api.base.query.QueryFilter;
+import com.lc.ibps.base.framework.persistence.entity.AbstractPo;
 import com.lc.ibps.base.framework.repository.IRepository;
 import com.lc.ibps.components.employee.domain.EmployeeInfo;
 import com.lc.ibps.components.employee.persistence.entity.EmployeeInfoPo;
 
+import java.util.List;
+
 /**
  * 人员信息表 仓库接口
  *
@@ -19,5 +24,6 @@ public interface EmployeeInfoRepository extends IRepository<String, EmployeeInfo
 	 * 查询全部子表的数据，并设置到主表Po中 
 	 * void
 	 */
-	public EmployeeInfoPo loadCascade(String id,String tableCode);
+	public EmployeeInfoPo loadCascade(String id);
+	public List<AbstractPo> queryResearches(String employeeId, String type, Page page);
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/repository/ScienceActivitiesRepository.java

@@ -0,0 +1,23 @@
+package com.lc.ibps.components.employee.repository;
+
+import com.lc.ibps.api.base.page.Page;
+import com.lc.ibps.base.framework.repository.IRepository;
+import com.lc.ibps.components.employee.domain.ScienceActivities;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+
+import java.util.List;
+
+/**
+ * 科普活动 仓库接口
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:56
+ *</pre>
+ */
+public interface ScienceActivitiesRepository extends IRepository<String, ScienceActivitiesPo,ScienceActivities>{
+
+
+	public List<ScienceActivitiesPo> findByEmployeeId(String employeeId, Page page);
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/repository/impl/EmployeeInfoRepositoryImpl.java

@@ -4,6 +4,9 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import com.lc.ibps.api.base.page.Page;
+import com.lc.ibps.api.base.query.QueryFilter;
+import com.lc.ibps.base.framework.persistence.entity.AbstractPo;
 import com.lc.ibps.components.employee.persistence.entity.*;
 import com.lc.ibps.components.employee.repository.*;
 import org.springframework.stereotype.Repository;
@@ -38,20 +41,10 @@ public class EmployeeInfoRepositoryImpl extends AbstractRepository<String, Emplo
 	private  WorkInfoRepository workInfoRepository;
 	@Resource
 	private  CertificateInfoRepository certificateInfoRepository;
+
 	@Resource
-	private  ScientificProjectRepository scientificProjectRepository;
-	@Resource
-	private  TechnologyAwardRepository technologyAwardRepository;
-	@Resource
-	private  SciArticleRepository sciArticleRepository;
-	@Resource
-	private ChinesePapersRepository chinesePapersRepository;
-	@Resource
-	private  ResearchMonographRepository researchMonographRepository;
-	@Resource
-	private  ResearchPatentRepository researchPatentRepository;
-	@Resource
-	private  AcademicActivitiesRepository academicActivitiesRepository;
+	private ScienceActivitiesRepository scienceActivitiesRepository;
+
 
 	public EmployeeInfo newInstance() {
 		EmployeeInfoPo po = new EmployeeInfoPo();
@@ -82,7 +75,7 @@ public class EmployeeInfoRepositoryImpl extends AbstractRepository<String, Emplo
 	 * void
 	 */
 	@Override
-	public EmployeeInfoPo loadCascade(String id,String tableCode){
+	public EmployeeInfoPo loadCascade(String id){
 		EmployeeInfoPo employeeInfoPo = null;
 		if(StringUtil.isNotEmpty(id)){
 			employeeInfoPo = get(id);
@@ -102,36 +95,17 @@ public class EmployeeInfoRepositoryImpl extends AbstractRepository<String, Emplo
 				List<CertificateInfoPo> certificateInfoPoList = certificateInfoRepository.findByMainId(employeeInfoPo.getId());
 				employeeInfoPo.setCertificateInfoPoList(certificateInfoPoList);
 			}
-			if(BeanUtils.isNotEmpty(employeeInfoPo) && BeanUtils.isNotEmpty(employeeInfoPo.getId()) && tableCode.equals("kyxmglb")){
-				List<ScientificProjectPo> scientificProjectPoList = scientificProjectRepository.findByMainId(employeeInfoPo.getId());
-				employeeInfoPo.setScientificProjectPoList(scientificProjectPoList);
-			}
-			if(BeanUtils.isNotEmpty(employeeInfoPo) && BeanUtils.isNotEmpty(employeeInfoPo.getId()) && tableCode.equals("kjhjcgglb")){
-				List<TechnologyAwardPo> technologyAwardPoList = technologyAwardRepository.findByMainId(employeeInfoPo.getId());
-				employeeInfoPo.setTechnologyAwardPoList(technologyAwardPoList);
-			}
-			if(BeanUtils.isNotEmpty(employeeInfoPo) && BeanUtils.isNotEmpty(employeeInfoPo.getId()) && tableCode.equals("SCIwzglb")){
-				List<SciArticlePo> sciArticlePoList = sciArticleRepository.findByMainId(employeeInfoPo.getId());
-				employeeInfoPo.setSciArticlePoList(sciArticlePoList);
-			}
-			if(BeanUtils.isNotEmpty(employeeInfoPo) && BeanUtils.isNotEmpty(employeeInfoPo.getId()) && tableCode.equals("zwlwglb")){
-				List<ChinesePapersPo> chinesePapersPoList = chinesePapersRepository.findByMainId(employeeInfoPo.getId());
-				employeeInfoPo.setChinesePapersPoList(chinesePapersPoList);
-			}
-			if(BeanUtils.isNotEmpty(employeeInfoPo) && BeanUtils.isNotEmpty(employeeInfoPo.getId()) && tableCode.equals("kyzzglb")){
-				List<ResearchMonographPo> researchMonographPoList = researchMonographRepository.findByMainId(employeeInfoPo.getId());
-				employeeInfoPo.setResearchMonographPoList(researchMonographPoList);
-			}
-			if(BeanUtils.isNotEmpty(employeeInfoPo) && BeanUtils.isNotEmpty(employeeInfoPo.getId()) && tableCode.equals("kyzlglb")){
-				List<ResearchPatentPo> researchPatentPoList = researchPatentRepository.findByMainId(employeeInfoPo.getId());
-				employeeInfoPo.setResearchPatentPoList(researchPatentPoList);
-			}
-			if(BeanUtils.isNotEmpty(employeeInfoPo) && BeanUtils.isNotEmpty(employeeInfoPo.getId()) && tableCode.equals("jxjyxmxshdglb")){
-				List<AcademicActivitiesPo> academicActivitiesPoList = academicActivitiesRepository.findByMainId(employeeInfoPo.getId());
-				employeeInfoPo.setAcademicActivitiesPoList(academicActivitiesPoList);
-			}
 		}
 		return employeeInfoPo;
 	}
+	@Override
+	public List<AbstractPo> queryResearches(String employeeId, String type, Page page){
+		List<? extends AbstractPo> data = null;
+		//科普活动
+		if("kphd".equalsIgnoreCase(type)) {
+			 data = scienceActivitiesRepository.findByEmployeeId(employeeId, page);
+		}
+		return (List<AbstractPo>) data;
+	}
 	
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/repository/impl/ScienceActivitiesRepositoryImpl.java

@@ -0,0 +1,60 @@
+package com.lc.ibps.components.employee.repository.impl;
+
+import com.lc.ibps.api.base.page.Page;
+import com.lc.ibps.base.core.util.AppUtil;
+import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
+import com.lc.ibps.base.framework.repository.AbstractRepository;
+import com.lc.ibps.components.employee.domain.ScienceActivities;
+import com.lc.ibps.components.employee.persistence.dao.ScienceActivitiesQueryDao;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+import com.lc.ibps.components.employee.repository.ScienceActivitiesRepository;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 科普活动 仓库的实现类
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:56
+ *</pre>
+ */
+@Repository
+public class ScienceActivitiesRepositoryImpl extends AbstractRepository<String, ScienceActivitiesPo,ScienceActivities> implements ScienceActivitiesRepository{
+	  
+	@Resource
+	private  ScienceActivitiesQueryDao scienceActivitiesQueryDao;
+
+	public ScienceActivities newInstance() {
+		ScienceActivitiesPo po = new ScienceActivitiesPo();
+		ScienceActivities scienceActivities = AppUtil.getBean(ScienceActivities.class);
+		scienceActivities.setData(po);
+		return scienceActivities;
+	}
+
+	public ScienceActivities newInstance(ScienceActivitiesPo po) {
+		ScienceActivities scienceActivities = AppUtil.getBean(ScienceActivities.class);
+		scienceActivities.setData(po);
+		return scienceActivities;
+	} 
+	
+	@Override
+	protected IQueryDao<String, ScienceActivitiesPo> getQueryDao() {
+		return scienceActivitiesQueryDao;
+	}
+	
+	@Override
+	public String getInternalCacheName() {
+		return "scienceActivities";
+	}
+	
+
+
+	public List<ScienceActivitiesPo> findByEmployeeId(String employeeId, Page page){
+		return scienceActivitiesQueryDao.findByEmployeeId(employeeId,page);
+	}
+	
+}

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/ScienceActivities.map.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo">
+	<!--<cache type="net.oschina.j2cache.mybatis.J2CacheAdapter"/>-->
+	<resultMap id="ScienceActivitiesPo" type="com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo">
+		<id property="id" column="ID_" jdbcType="VARCHAR"/>
+		<result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
+		<result property="ip" column="IP_" jdbcType="VARCHAR"/>
+		<result property="createBy" column="CREATE_BY_" jdbcType="VARCHAR"/>
+		<result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP"/>
+		<result property="updateBy" column="UPDATE_BY_" jdbcType="VARCHAR"/>
+		<result property="updateTime" column="UPDATE_TIME_" jdbcType="TIMESTAMP"/>
+		<result property="shiFouGuoShen" column="SHI_FOU_GUO_SHEN_" jdbcType="VARCHAR"/>
+		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
+		<result property="bianZhiRen" column="BIAN_ZHI_REN_" jdbcType="VARCHAR"/>
+		<result property="bianZhiBuMen" column="BIAN_ZHI_BU_MEN_" jdbcType="VARCHAR"/>
+		<result property="bianZhiShiJian" column="BIAN_ZHI_SHI_JIAN" jdbcType="VARCHAR"/>
+		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
+		<result property="xingMing" column="XING_MING_" jdbcType="BLOB"/>
+		<result property="huoDongShiJian" column="HUO_DONG_SHI_JIAN" jdbcType="VARCHAR"/>
+		<result property="kePuXingShi" column="KE_PU_XING_SHI_" jdbcType="VARCHAR"/>
+		<result property="fuJian" column="FU_JIAN_" jdbcType="BLOB"/>
+		<result property="beiZhu" column="BEI_ZHU_" jdbcType="BLOB"/>
+		<result property="kePuBianHao" column="KE_PU_BIAN_HAO_" jdbcType="VARCHAR"/>
+	</resultMap>
+	<resultMap id="ScienceActivitiesDTO" type="com.lc.ibps.components.employee.dto.ScienceActivitiesDTO" extends="ScienceActivitiesPo">
+		<result property="joinedTime" column="joined_time" jdbcType="TIMESTAMP"/>
+	</resultMap>
+	
+	<sql id="columns">
+		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,DI_DIAN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,XING_MING_,HUO_DONG_SHI_JIAN,KE_PU_XING_SHI_,FU_JIAN_,BEI_ZHU_,KE_PU_BIAN_HAO_
+	</sql>
+	
+	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo">
+		INSERT INTO T_KPHD
+		(<include refid="columns"/>)
+		VALUES 
+		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{xingMing,jdbcType=BLOB}, #{huoDongShiJian,jdbcType=VARCHAR}, #{kePuXingShi,jdbcType=VARCHAR}, #{fuJian,jdbcType=BLOB}, #{beiZhu,jdbcType=BLOB}, #{kePuBianHao,jdbcType=VARCHAR})
+	</insert>
+	
+	<select id="get" parameterType="java.lang.String" resultMap="ScienceActivitiesPo">
+		SELECT <include refid="columns"/> FROM T_KPHD 
+		WHERE 
+		ID_=#{id}
+	</select>
+	
+	
+	<sql id="querySql" >
+		SELECT <include refid="columns"/> FROM T_KPHD
+		<where>
+			<if test="@o.Ognl@isNotEmpty(whereSql)">
+				${whereSql}
+			</if>
+		</where>
+		<if test="@o.Ognl@isNotEmpty(orderBySql)">
+			ORDER BY ${orderBySql}
+		</if>
+		<if test="@o.Ognl@isEmpty(orderBySql)">
+			ORDER BY ID_ DESC
+		</if>
+	</sql>
+	
+	<select id="query" parameterType="java.util.Map" resultMap="ScienceActivitiesPo">
+		<include refid="querySql"/>
+	</select>
+	
+	<select id="queryIds" parameterType="java.util.Map" resultMap="ScienceActivitiesPo">
+		SELECT ID_ FROM (<include refid="querySql"/>) T
+	</select>
+	
+	<select id="findByIds" resultMap="ScienceActivitiesPo">
+		SELECT <include refid="columns"/> FROM T_KPHD
+			WHERE ID_ in 
+			<foreach item="id" index="index" collection="ids" open="(" separator="," close=")">  
+				#{id}  
+			</foreach>  		
+			ORDER BY ID_ DESC			
+	</select>
+
+	<select id="findByEmployeeId" resultMap="ScienceActivitiesDTO">
+		SELECT p.*,c.create_time_ joined_time FROM t_kphd p
+		    JOIN t_kphdglb c
+		        ON c.tenant_id_=p.id_ AND c.parent_id_=#{employeeId}
+	</select>
+
+	<update id="update" parameterType="com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo">
+		UPDATE T_KPHD SET
+		TENANT_ID_=#{tenantId,jdbcType=VARCHAR},
+		IP_=#{ip,jdbcType=VARCHAR},
+		UPDATE_BY_=#{updateBy,jdbcType=VARCHAR},
+		UPDATE_TIME_=#{updateTime,jdbcType=TIMESTAMP},
+		SHI_FOU_GUO_SHEN_=#{shiFouGuoShen,jdbcType=VARCHAR},
+		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
+		BIAN_ZHI_REN_=#{bianZhiRen,jdbcType=VARCHAR},
+		BIAN_ZHI_BU_MEN_=#{bianZhiBuMen,jdbcType=VARCHAR},
+		BIAN_ZHI_SHI_JIAN=#{bianZhiShiJian,jdbcType=VARCHAR},
+		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
+		XING_MING_=#{xingMing,jdbcType=BLOB},
+		HUO_DONG_SHI_JIAN=#{huoDongShiJian,jdbcType=VARCHAR},
+		KE_PU_XING_SHI_=#{kePuXingShi,jdbcType=VARCHAR},
+		FU_JIAN_=#{fuJian,jdbcType=BLOB},
+		BEI_ZHU_=#{beiZhu,jdbcType=BLOB},
+		KE_PU_BIAN_HAO_=#{kePuBianHao,jdbcType=VARCHAR}
+		WHERE
+		ID_=#{id}
+	</update>
+	
+	<delete id="remove" parameterType="java.lang.String">
+		DELETE FROM T_KPHD 
+		WHERE
+		ID_=#{id}
+	</delete>
+	
+	
+</mapper>

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/EmployeeBaseTest.java

@@ -14,7 +14,7 @@ import com.lc.ibps.api.base.id.IdGenerator;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-08-13 11:04:08
+ * 创建时间：2024-12-03 14:40:03
  *</pre>
  */
 @ContextConfiguration({"classpath:conf/components-test.xml"})

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/employee/domain/ScienceActivitiesTest.java

@@ -0,0 +1,60 @@
+package com.lc.ibps.components.employee.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.annotation.Rollback;
+
+import com.lc.ibps.components.employee.domain.ScienceActivities;
+import com.lc.ibps.components.employee.repository.ScienceActivitiesRepository;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+import com.lc.ibps.components.EmployeeBaseTest;
+
+/**
+ * 科普活动 领域对象实体单元测试类
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:56
+ *</pre>
+ */
+public class ScienceActivitiesTest extends EmployeeBaseTest{
+	 
+	@Resource
+	private ScienceActivitiesRepository scienceActivitiesRepository;
+	
+	@Test
+	@Rollback(true)
+	public void create(){				
+		ScienceActivities scienceActivities = scienceActivitiesRepository.newInstance();
+		
+		ScienceActivitiesPo scienceActivitiesPo=new ScienceActivitiesPo();
+		scienceActivitiesPo.setId(idGenerator.getId());
+		
+		scienceActivities.setData(scienceActivitiesPo);
+		
+		List<String> ids = new ArrayList<String>();
+		
+		scienceActivities.create();	
+		ids.add(scienceActivities.getId());
+						
+		ScienceActivities scienceActivities2 = scienceActivitiesRepository.newInstance();
+		scienceActivitiesPo.setId(idGenerator.getId());
+		scienceActivities2.setData(scienceActivitiesPo);
+		
+		scienceActivities2.create();
+		ids.add(scienceActivities2.getId());
+		
+		List<ScienceActivitiesPo> scienceActivitiesPoList = scienceActivitiesRepository.findByIds(ids);
+		Assert.assertTrue(scienceActivitiesPoList.size()>=2);
+		
+		List<ScienceActivitiesPo>scienceActivities1 = scienceActivitiesRepository.findAll();
+		Assert.assertTrue(scienceActivities1.size()>=2);
+
+	}
+}

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/employee/persistence/dao/ScienceActivitiesDaoTest.java

@@ -0,0 +1,55 @@
+package com.lc.ibps.components.employee.persistence.dao;
+
+import javax.annotation.Resource;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.annotation.Rollback;
+
+import com.lc.ibps.components.employee.persistence.dao.ScienceActivitiesDao;
+import com.lc.ibps.components.employee.persistence.dao.ScienceActivitiesQueryDao;
+import com.lc.ibps.components.employee.persistence.entity.ScienceActivitiesPo;
+import com.lc.ibps.components.EmployeeBaseTest;
+
+/**
+ * 科普活动 dao单元测试类
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-12-03 14:39:55
+ *</pre>
+ */
+public class ScienceActivitiesDaoTest extends EmployeeBaseTest{
+
+	@Resource
+	private ScienceActivitiesDao scienceActivitiesDao;
+	
+	@Resource
+	private ScienceActivitiesQueryDao scienceActivitiesQueryDao;
+		
+	@Test
+	@Rollback(true)
+	public void testCrud(){
+		ScienceActivitiesPo scienceActivitiesPo=new ScienceActivitiesPo();
+		scienceActivitiesPo.setId(idGenerator.getId());
+		
+		//创建一实体
+		scienceActivitiesDao.create(scienceActivitiesPo);
+        Assert.assertNotNull(scienceActivitiesPo.getId());
+        logger.debug("scienceActivitiesPo1:"+ scienceActivitiesPo.getId());
+		//获取一实体
+		ScienceActivitiesPo scienceActivitiesPo2=scienceActivitiesQueryDao.get(scienceActivitiesPo.getId());
+		Assert.assertNotNull(scienceActivitiesPo2);
+		logger.debug("scienceActivitiesPo2:" + scienceActivitiesPo2.toString());
+		//更新一实体
+		scienceActivitiesDao.update(scienceActivitiesPo2);
+		
+		ScienceActivitiesPo scienceActivitiesPo3=scienceActivitiesQueryDao.get(scienceActivitiesPo.getId());
+		Assert.assertNotNull(scienceActivitiesPo3);
+		logger.debug("scienceActivitiesPo3:"+scienceActivitiesPo3.toString());
+		//删除一实体
+		//scienceActivitiesDao.remove(scienceActivitiesPo.getId());
+	}
+	
+}