企业资质审核代码更新完善

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -115,4 +115,6 @@ public class FilterUdiRelRequest extends ListPageRequest {
     @ApiModelProperty(value = "企业id")
     private Long companyId;
 
+    private String companyIdFk;
+
 }

src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.Date;
 @ApiModel("基本UDI关联响应")
 @Data
@@ -159,5 +160,160 @@ public class BasicUdiRelResponse {
     private String manufactory;
 
 
+    /**
+     * 企业ID主键
+     */
+    @TableField("manufacturerId")
+    private String manufacturerId;
+
+
+
+    /**
+     * 统一社会信用代码
+     */
+    @TableField("creditCode")
+    private String creditCode;
+
+
+
+    /**
+     * 所在地区：省市区
+     */
+    @TableField("placeArea")
+    private String placeArea;
+
+    /**
+     * 所在地区代码
+     */
+    @TableField("placeAreaCode")
+    private String placeAreaCode;
+
+    /**
+     * 所在地址：详细地址
+     */
+    @TableField("placeAddress")
+    private String placeAddress;
+
+    /**
+     * 法人姓名
+     */
+    @TableField("legalPersonName")
+    private String legalPersonName;
+
+    /**
+     * 法人证件类型：1：身份证
+     */
+    @TableField("legalPersonPapersType")
+    private String legalPersonPapersType;
+
+    /**
+     * 法人证件号码
+     */
+    @TableField("legalPersonPapersCode")
+    private String legalPersonPapersCode;
+
+    /**
+     * 生产地区：省市区
+     */
+    @TableField("productionArea")
+    private String productionArea;
+
+    /**
+     * 生产地区代码
+     */
+    @TableField("productionAreaCode")
+    private String productionAreaCode;
+
+    /**
+     * 生产地址：详细地址
+     */
+    @TableField("productionAddress")
+    private String productionAddress;
+
+    /**
+     * 登记状态：1：续存（在营，开业，在册），2：吊销，3：注销，4：迁出
+     */
+    @TableField("registerStatus")
+    private String registerStatus;
+
+    /**
+     * 医疗器械生产许可证号
+     */
+    @TableField("productionLicenceNum")
+    private String productionLicenceNum;
+
+    /**
+     * 医疗器械生产许可证有效期至
+     */
+    @TableField("productionLicenceDate")
+    private LocalDate productionLicenceDate;
+
+    /**
+     * 医疗器械生产备案凭证号
+     */
+    @TableField("productionRecordNum")
+    private String productionRecordNum;
+
+    /**
+     * 医疗器械经营备案凭证号
+     发证机关/备案部门
+     */
+    @TableField("productionRecordSection")
+    private String productionRecordSection;
+
+    /**
+     * 医疗器械生产备案凭证号发证日期
+     */
+    @TableField("productionRecordDate")
+    private Date productionRecordDate;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_date")
+    private LocalDate updateDate;
+
+    /**
+     * 往来单位ID主键
+     */
+    @TableField("customerId")
+    private String customerId;
+
+    /**
+     * 审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过
+     */
+    @TableField("auditStatus")
+    private Integer auditStatus;
+
+    /**
+     * 拒绝说明
+     */
+    @TableField("auditComment")
+    private String auditComment;
+
+
+
+    /**
+     * 创建人
+     */
+    @TableField("createUser")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private Date createTime;
+
+
+
+    @TableField("agentName")
+    private String agentName;
 
+    @TableField(exist = false)
+    private String supName;
+    @TableField(exist = false)
+    private String failCout;
+    @TableField(exist = false)
+    private String passCout;
 }

src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml

@@ -98,7 +98,7 @@
 
     <select id="filterBasicList" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             resultType="com.glxp.api.res.basic.BasicUdiRelResponse">
-        select bur.*,
+        select bur.*,sm.*,sc.*,
         uc.companyName,
         nameCode,
         packRatio,
@@ -150,11 +150,15 @@
         FROM basic_udi_rel bur
         left JOIN basic_udi_product p on bur.uuid = p.uuid
         left join user_company uc on bur.companyIdFk = uc.id
+        left join sup_manufacturer sm on uc.id=sm.manufacturerId
+        left join sup_company sc on sm.customerId=sc.customerId
         <where>
+            <if test="companyIdFk != '' and companyIdFk != null">
+                AND bur.companyIdFk = #{companyIdFk}
+            </if>
             <if test="customerId != '' and customerId != null">
-                AND bur.companyIdFk = #{customerId}
+                AND bur.id = #{customerId}
             </if>
-
         </where>
         ORDER BY bur.updateTime DESC
     </select>