diff --git a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java index 1c73801..4c1ee6b 100644 --- a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; import io.swagger.annotations.ApiModel; @@ -105,6 +106,241 @@ public class UserCompanyEntity implements Serializable { private String reason; + private String customerId; + + private String classes; + + /** + * 地址 + */ + private String area; + + /** + * 详细地址 + */ + private String detailAddr; + + /** + * 应用码x + */ + private String appId; + + /** + * 授权码x + */ + private String appSecret; + + /** + * 联系人 + */ + private String contacts; + + /** + * 联系电话 + */ + private String mobile; + + /** + * 电话 + */ + private String tel; + + /** + * 邮箱 + */ + private String email; + + private String areaCode; + + /** + * 企业唯一标识x + */ + private String refEntId; + + /** + * 企业IDx + */ + private String entId; + + /** + * 入网标识【0非入网1入网2入驻马上放心】x + */ + private Integer networkType; + + /** + * 绑定appkey外键IDx + */ + private Integer certIdFk; + + /** + * 所属总部x + */ + private String parentCompany; + + /** + * 所属总部Idx + */ + private String parentIdFk; + + /** + * 法人证件类型：1：身份证 + */ + private String contactsPapersType; + + /** + * 法人证件号码 + */ + private String contactsPapersCode; + + /** + * 登记状态：1：续存（在营，开业，在册），2：吊销，3：注销，4：迁出 + */ + private String registerStatus; + + /** + * 经营许可证号（Ⅲ类） + */ + private String jyxkzh; + + /** + * 经营许可证发证机关 + */ + private String jyxkzfzjg; + + /** + * 经营许可证有效期至 + */ + private LocalDate jyxkzyxq; + + /** + * 经营备案凭证号（Ⅱ类） + */ + private String jybapzh; + + /** + * 经营备案部门 + */ + private String jybabm; + + /** + * 发证日期 + */ + @TableField("fzrq") + private Date fzrq; + + /** + * 税号 + */ + private String suihao; + + /** + * 开户行 + */ + private String kaihuhang; + + /** + * 开户账号 + */ + private String kaihuzhanghao; + + /** + * 审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过 + */ + private Integer auditStatus; + + /** + * 文件路径 + */ + private String filePath; + + /** + * 文件路径 + */ + private String filePath2; + + /** + * 文件路径 + */ + private String filePath3; + + /** + * 文件路径 + */ + private String filePath4; + + /** + * 往来单位外键 + */ + private String unitIdFk; + + /** + * 创建人 + */ + private String createBy; + + /** + * 审核时间 + */ + private Date auditTime; + + /** + * 审核意见 + */ + private String auditComment; + + /** + * 保存状态（1.草稿保存，2.已提交保存) + */ + + private Integer editStatus; + + + + /** + * 备注 + */ + + private String remark; + + /** + * 创建人 + */ + + private String createUser; + + /** + * 创建时间 + */ + + private Date createTime; + + /** + * 更新人 + */ + + private String updateUser; + + /** + * 更新时间 + */ + + private Date updateTime; + + + private String auditor; + + + private String roleId; + + + @TableField(exist = false) + private String failCout; + @TableField(exist = false) + private String passCout; + @TableField(exist = false) + private String productFailCout; + @TableField(exist = false) + private String prouctPassCout; private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index c1d03d5..3f02645 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -114,8 +114,17 @@ public class FilterUdiRelRequest extends ListPageRequest { private Boolean groupBuy; @ApiModelProperty(value = "企业id") private Long companyId; - + private String productStatus; private String companyIdFk; private String burId; + private String manufacturerId; + + private String creditCode; + private String placeArea; + + private Integer auditStatus; + + private Integer type; + } diff --git a/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java index e896be2..d25a5f2 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java @@ -10,7 +10,7 @@ import java.util.List; public class FilterUserCompanyRequest extends ListPageRequest { private String id; -// private String customerId; + private String customerId; private String companyName; private String creditNum; private Integer checkStatus; @@ -18,8 +18,11 @@ public class FilterUserCompanyRequest extends ListPageRequest { private String registerAddress; + private Integer auditStatus; + private String unitIdFk; private String lastUpdateTime; private List auditStatusList; private Integer manufacturerStatus; + } diff --git a/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java b/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java index 92565da..cf23bd4 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; + import java.util.List; public interface SupManufacturerService extends IService { diff --git a/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml index 44605d6..28fa5cc 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml @@ -162,6 +162,58 @@ ORDER BY bur.updateTime DESC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +