提交 90ac6388 作者: chenshiqiang

commit fix

上级 add96653
......@@ -108,6 +108,11 @@
<artifactId>commons-pool2</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.24</version>
</dependency>
</dependencies>
......
package com.zzsn.leaderbase.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.util.Date;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* <p>
*5.1 人物变更信息咨询抽取表
* </p>
*
* @since
* @Description: 信息
* @Author: jeecg-boot
* @Date: 2024-02-29
* @Version: V1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("character_change_info_extract")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="character_change_info_extract对象", description="信息")
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class CharacterChangeInfoExtract extends Model<CharacterChangeInfoExtract>
{
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
/**
* 关联人物id
*/
@TableField("uid")
private String uid;
/**
*人物名称
*/
@TableField("name")
private String name;
/**
*原部门 原单位 原企业
*/
@TableField("department_original")
private String departmentOriginal;
/**
*原职务
*/
@TableField("duty_original")
private String dutyOriginal;
/**
*部门 单位 企业(现)
*/
@TableField("department")
private String department;
/**
*职务(现)
*/
@TableField("duty")
private String duty;
/**
*任职时间
*/
@TableField("take_office_status")
private String takeOfficeStatus;
/**
*任职状态
*/
@TableField("take_office_time")
private Date takeOfficeTime;
/**
*变更链接
*/
@TableField("change_url")
private String changeUrl;
/**
*职务变更时间
*/
@TableField("duties_update_time")
private Date dutiesUpdateTime;
/**
*职务变更原因
*/
@TableField("duties_update_reason")
private String dutiesUpdateReason;
/**
*是否审核 1是 0否
*/
@TableField("check_status")
private Integer checkStatus;
/**
*是否审核通过 0未通过 1通过 2待定
*/
@TableField("check")
private Integer check;
/**
*关联资讯id
*/
@TableField("article_id")
private String articleId;
/**
*关联资讯标题
*/
@TableField("article_title")
private String articleTitle;
/**
*变更描述
*/
@TableField("update_desc")
private String updateDesc;
/**
* 创建时间
*/
@TableField("create_time")
private Date createTime;
public class CharacterChangeInfoExtract {
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**关联人物id*/
@Excel(name = "关联人物id", width = 15)
@ApiModelProperty(value = "关联人物id")
private String uid;
/**人物名称*/
@Excel(name = "人物名称", width = 15)
@ApiModelProperty(value = "人物名称")
private String name;
/**原部门 原单位 原企业*/
@Excel(name = "原部门 原单位 原企业", width = 15)
@ApiModelProperty(value = "原部门 原单位 原企业")
private String departmentOriginal;
/**原职务*/
@Excel(name = "原职务", width = 15)
@ApiModelProperty(value = "原职务")
private String dutyOriginal;
/**部门 单位 企业(现)*/
@Excel(name = "部门 单位 企业(现)", width = 15)
@ApiModelProperty(value = "部门 单位 企业(现)")
private String department;
/**职务(现)*/
@Excel(name = "职务(现)", width = 15)
@ApiModelProperty(value = "职务(现)")
private String duty;
/**任职时间*/
@Excel(name = "任职时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "任职时间")
private Date takeOfficeTime;
/**任职状态*/
@Excel(name = "任职状态", width = 15)
@ApiModelProperty(value = "任职状态")
private String takeOfficeStatus;
/**变更链接*/
@Excel(name = "变更链接", width = 15)
@ApiModelProperty(value = "变更链接")
private String changeUrl;
/**职务变更时间*/
@Excel(name = "职务变更时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "职务变更时间")
private Date dutiesUpdateTime;
/**职务变更原因*/
@Excel(name = "职务变更原因", width = 15)
@ApiModelProperty(value = "职务变更原因")
private String dutiesUpdateReason;
/**是否审核 1是 0否*/
@Excel(name = "是否审核 1是 0否", width = 15)
@ApiModelProperty(value = "是否审核 1是 0否")
private Integer checkStatus;
/**是否审核通过 0未通过 1通过 2待定*/
@Excel(name = "是否审核通过 0未通过 1通过 2待定", width = 15)
@ApiModelProperty(value = "是否审核通过 0未通过 1通过 2待定")
private Integer check;
/**关联资讯id*/
@Excel(name = "关联资讯id", width = 15)
@ApiModelProperty(value = "关联资讯id")
private String articleId;
/**关联资讯标题*/
@Excel(name = "关联资讯标题", width = 15)
@ApiModelProperty(value = "关联资讯标题")
private String articleTitle;
/**变更描述*/
@Excel(name = "变更描述", width = 15)
@ApiModelProperty(value = "变更描述")
private String updateDesc;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
}
package com.zzsn.leaderbase.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zzsn.leaderbase.entity.CharacterCategoryStructure;
import java.util.List;
import com.zzsn.leaderbase.entity.CharacterChangeInfoExtract;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author obcy
* @since 2024-01-04
* @Description: 信息
* @Author: jeecg-boot
* @Date: 2024-02-29
* @Version: V1.0
*/
@Mapper
public interface CharacterChangeInfoExtractMapper extends BaseMapper<CharacterChangeInfoExtract> {
}
package com.zzsn.leaderbase.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zzsn.leaderbase.entity.CharacterCategoryStructure;
import com.zzsn.leaderbase.entity.CharacterChangeInfoExtract;
import com.zzsn.leaderbase.vo.Result;
/**
* <p>
* 服务类
* </p>
*
* @author obcy
* @since 2024-01-04
*/
public interface CharacterChangeInfoExtractService extends IService<CharacterChangeInfoExtract> {
}
......@@ -35,7 +35,7 @@ public class DealLeaderDataService {
@Autowired
RedisTemplate redisTemplate;
@Resource
private CharacterChangeInfoExtractService characterChangeInfoExtractService;
private ICharacterChangeInfoExtractService characterChangeInfoExtractService;
public void getData() throws IOException {
......@@ -96,6 +96,7 @@ public class DealLeaderDataService {
}
if(!list.isEmpty()){
characterChangeInfoExtractService.saveBatch(list);
characterChangeInfoExtractService.list();
}
......
package com.zzsn.leaderbase.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zzsn.leaderbase.entity.CharacterChangeInfoExtract;
/**
* @Description: 信息
* @Author: jeecg-boot
* @Date: 2024-02-29
* @Version: V1.0
*/
public interface ICharacterChangeInfoExtractService extends IService<CharacterChangeInfoExtract> {
}
......@@ -4,19 +4,17 @@ package com.zzsn.leaderbase.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zzsn.leaderbase.entity.CharacterChangeInfoExtract;
import com.zzsn.leaderbase.mapper.CharacterChangeInfoExtractMapper;
import com.zzsn.leaderbase.service.CharacterChangeInfoExtractService;
import com.zzsn.leaderbase.service.ICharacterChangeInfoExtractService;
import org.springframework.stereotype.Service;
/**
* <p>
* 分类树服务实现类
* </p>
*
* @author
* @since
* @Description: 信息
* @Author: jeecg-boot
* @Date: 2024-02-29
* @Version: V1.0
*/
@Service
public class CharacterChangeInfoExtractServiceImpl extends ServiceImpl<CharacterChangeInfoExtractMapper, CharacterChangeInfoExtract> implements CharacterChangeInfoExtractService {
public class CharacterChangeInfoExtractServiceImpl extends ServiceImpl<CharacterChangeInfoExtractMapper, CharacterChangeInfoExtract> implements ICharacterChangeInfoExtractService {
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论