diff --git a/src/main/java/com/glxp/api/dao/sup/UserCompanyPilotMapper.java b/src/main/java/com/glxp/api/dao/sup/UserCompanyPilotMapper.java new file mode 100644 index 0000000..cb638cd --- /dev/null +++ b/src/main/java/com/glxp/api/dao/sup/UserCompanyPilotMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.sup; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.sup.UserCompanyPilotEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UserCompanyPilotMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/api/entity/purchase/SupCertTypeEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupCertTypeEntity.java index 02c0dc0..d503d79 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupCertTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupCertTypeEntity.java @@ -4,15 +4,17 @@ 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 java.io.Serializable; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; /** - * 证书类型配置 - */ + * 证书类型配置 + */ @Data @Builder @AllArgsConstructor @@ -44,7 +46,14 @@ public class SupCertTypeEntity implements Serializable { * 是否启用 */ @TableField(value = "enabled") - private Byte enabled; + private Boolean enabled; + + /** + * 是否通用证书 + */ + @TableField(value = "commonUse") + private Boolean commonUse; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/sup/UserCompanyOnlineEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCompanyOnlineEntity.java index 3f35036..75f8ae3 100644 --- a/src/main/java/com/glxp/api/entity/sup/UserCompanyOnlineEntity.java +++ b/src/main/java/com/glxp/api/entity/sup/UserCompanyOnlineEntity.java @@ -26,6 +26,12 @@ public class UserCompanyOnlineEntity implements Serializable { @TableField(value = "lastIp") private String lastIp; + /** + * 离线统计(分钟) + */ + @TableField(value = "offlineStat") + private String offlineStat; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/sup/UserCompanyPilotEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCompanyPilotEntity.java new file mode 100644 index 0000000..771a37b --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sup/UserCompanyPilotEntity.java @@ -0,0 +1,101 @@ +package com.glxp.api.entity.sup; + +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 java.io.Serializable; +import java.util.Date; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 试点单位表 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "user_company_pilot") +public class UserCompanyPilotEntity implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 试点单位已注册企业Id + */ + @TableField(value = "companyIdFk") + private Long companyIdFk; + + /** + * 单位名称 + */ + @TableField(value = "companyName") + private String companyName; + + /** + * 统一社会信用代码 + */ + @TableField(value = "creditNum") + private Integer creditNum; + + /** + * 企业类型 + */ + @TableField(value = "bussinessStatus") + private String bussinessStatus; + + /** + * 拼音简称 + */ + @TableField(value = "spell") + private String spell; + + /** + * 地址 + */ + @TableField(value = "addr") + private String addr; + + /** + * 状态 + */ + @TableField(value = "`status`") + private String status; + + /** + * 联系人 + */ + @TableField(value = "contacts") + private String contacts; + + /** + * 联系电话 + */ + @TableField(value = "mobile") + private String mobile; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/service/sup/UserCompanyPilotService.java b/src/main/java/com/glxp/api/service/sup/UserCompanyPilotService.java new file mode 100644 index 0000000..7153ae5 --- /dev/null +++ b/src/main/java/com/glxp/api/service/sup/UserCompanyPilotService.java @@ -0,0 +1,10 @@ +package com.glxp.api.service.sup; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.sup.UserCompanyPilotEntity; +import com.glxp.api.dao.sup.UserCompanyPilotMapper; +@Service +public class UserCompanyPilotService extends ServiceImpl { + +} diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertTypeMapper.xml b/src/main/resources/mybatis/mapper/purchase/SupCertTypeMapper.xml index 0f06e75..c00c160 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCertTypeMapper.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCertTypeMapper.xml @@ -1,17 +1,18 @@ - - - - - - - - - - - - id, code, `name`, remark, enabled - + + + + + + + + + + + + + id, code, `name`, remark, enabled,commonUse + diff --git a/src/main/resources/mybatis/mapper/sup/UserCompanyPilotMapper.xml b/src/main/resources/mybatis/mapper/sup/UserCompanyPilotMapper.xml new file mode 100644 index 0000000..dbb3fe0 --- /dev/null +++ b/src/main/resources/mybatis/mapper/sup/UserCompanyPilotMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + id, companyIdFk, companyName, creditNum, bussinessStatus, spell, addr, `status`, + contacts, mobile, remark, createTime, updateTime + + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 29e8323..bf6482f 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -344,7 +344,7 @@ CREATE TABLE IF NOT EXISTS `anncmnt_ylqxzczh` SET FOREIGN_KEY_CHECKS = 1; - +CALL Pro_Temp_ColumnWork('user_company_online', 'offlineStat', 'int', 1);