星纵-供应商-企业资质信息bug修改

src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseQualification.java

@@ -1,14 +1,15 @@
 package com.zhgd.xmgl.modules.worker.entity;
 
 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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 /**
@@ -22,7 +23,7 @@ import java.io.Serializable;
 @ApiModel(value="EnterpriseQualification实体类",description="EnterpriseQualification")
 public class EnterpriseQualification implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**id*/
     @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="id")
@@ -30,7 +31,6 @@ public class EnterpriseQualification implements Serializable {
 	/**所属劳务公司id*/
 	@Excel(name = "所属劳务公司id", width = 15)
    @ApiModelProperty(value="所属劳务公司id")
-    
 	private java.lang.Long enterpriseId;
 	/**资质文件名称*/
 	@Excel(name = "资质文件名称", width = 15)
@@ -48,4 +48,23 @@ public class EnterpriseQualification implements Serializable {
 	@Excel(name = "备注", width = 15)
    @ApiModelProperty(value="备注")
 	private java.lang.String remarks;
+
+	@ApiModelProperty(value = "源文件名称")
+	private java.lang.String originFileName;
+	@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 java.util.Date createTime;
+	/**
+	 * 更新时间
+	 */
+	@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 java.util.Date updateTime;
+
+	@TableField(exist = false)
+	private Long userId;
 }

src/main/java/com/zhgd/xmgl/modules/worker/service/IEnterpriseQualificationService.java

@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.worker.service;
 
+import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
 import com.zhgd.xmgl.modules.worker.entity.EnterpriseQualification;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IEnterpriseQualificationService extends IService<EnterpriseQualification> {
 
+    EnterpriseInfo getSupplierByUserId(Long userId);
 }

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseQualificationServiceImpl.java

@@ -1,12 +1,15 @@
 package com.zhgd.xmgl.modules.worker.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
+import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
 import com.zhgd.xmgl.modules.worker.entity.EnterpriseQualification;
 import com.zhgd.xmgl.modules.worker.mapper.EnterpriseQualificationMapper;
 import com.zhgd.xmgl.modules.worker.service.IEnterpriseQualificationService;
+import com.zhgd.xmgl.modules.xz.mapper.XzUserToSupplierMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
  * @Description: 劳务公司-企业资质
  * @author： pds
@@ -15,5 +18,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class EnterpriseQualificationServiceImpl extends ServiceImpl<EnterpriseQualificationMapper, EnterpriseQualification> implements IEnterpriseQualificationService {
+    @Autowired
+    XzUserToSupplierMapper xzUserToSupplierMapper;
 
+    @Override
+    public EnterpriseInfo getSupplierByUserId(Long userId) {
+        if (userId==null) {
+            throw new OpenAlertException("userId为空");
+        }
+        EnterpriseInfo xzUserToSupplier = xzUserToSupplierMapper.getSupplierByUserId(userId);
+        if (xzUserToSupplier == null) {
+            throw new OpenAlertException("请先填写企业基本信息");
+        }
+        return xzUserToSupplier;
+    }
 }

src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierQualificationController.java

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
-import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualification;
+import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
-import com.zhgd.xmgl.modules.xz.service.IXzSupplierQualificationService;
+import com.zhgd.xmgl.modules.worker.entity.EnterpriseQualification;
+import com.zhgd.xmgl.modules.worker.service.IEnterpriseQualificationService;
 import com.zhgd.xmgl.util.MessageUtil;
 import com.zhgd.xmgl.util.PageUtil;
 import io.swagger.annotations.Api;
@@ -37,7 +38,7 @@ import java.util.Map;
 @Api(tags = "星纵-供应商-企业资质")
 public class XzSupplierQualificationController {
     @Autowired
-    private IXzSupplierQualificationService xzSupplierQualificationService;
+    private IEnterpriseQualificationService xzSupplierQualificationService;
 
     /**
      * 列表查询
@@ -47,12 +48,14 @@ public class XzSupplierQualificationController {
     @ApiOperation(value = "列表查询星纵-供应商-企业资质信息", notes = "列表查询星纵-供应商-企业资质信息", httpMethod = "POST")
     @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", required = true, dataType = "String")
     @PostMapping(value = "/list")
-    public Result<List<XzSupplierQualification>> selectXzSupplierBadRecordList(@RequestBody Map<String, Object> map) {
+    public Result<List<EnterpriseQualification>> selectXzSupplierBadRecordList(@RequestBody Map<String, Object> map) {
-        Result<List<XzSupplierQualification>> result = new Result<List<XzSupplierQualification>>();
+        Result<List<EnterpriseQualification>> result = new Result<List<EnterpriseQualification>>();
-        QueryWrapper<XzSupplierQualification> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<EnterpriseQualification> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(XzSupplierQualification::getUserId, MapUtils.getString(map, "userId"));
+        Long userId = MapUtils.getLong(map, "userId");
-        queryWrapper.lambda().orderByDesc(XzSupplierQualification::getCreateTime);
+        EnterpriseInfo ei = xzSupplierQualificationService.getSupplierByUserId(userId);
-        List<XzSupplierQualification> pageList = xzSupplierQualificationService.list(queryWrapper);
+        queryWrapper.lambda().eq(EnterpriseQualification::getEnterpriseId, ei.getId());
+        queryWrapper.lambda().orderByDesc(EnterpriseQualification::getCreateTime);
+        List<EnterpriseQualification> pageList = xzSupplierQualificationService.list(queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
@@ -65,13 +68,15 @@ public class XzSupplierQualificationController {
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
     })
     @PostMapping(value = "/page")
-    public Result<Page<XzSupplierQualification>> selectXzSupplierBadRecordPage(@RequestBody Map<String, Object> map) {
+    public Result<Page<EnterpriseQualification>> selectXzSupplierBadRecordPage(@RequestBody Map<String, Object> map) {
-        Result<Page<XzSupplierQualification>> result = new Result<Page<XzSupplierQualification>>();
+        Result<Page<EnterpriseQualification>> result = new Result<Page<EnterpriseQualification>>();
-        QueryWrapper<XzSupplierQualification> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<EnterpriseQualification> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(XzSupplierQualification::getUserId, MapUtils.getString(map, "userId"));
+        Long userId = MapUtils.getLong(map, "userId");
-        queryWrapper.lambda().orderByDesc(XzSupplierQualification::getCreateTime);
+        EnterpriseInfo ei = xzSupplierQualificationService.getSupplierByUserId(userId);
+        queryWrapper.lambda().eq(EnterpriseQualification::getEnterpriseId, ei.getId());
+        queryWrapper.lambda().orderByDesc(EnterpriseQualification::getCreateTime);
         Page page = PageUtil.getPage(map);
-        Page<XzSupplierQualification> pageList = xzSupplierQualificationService.page(page, queryWrapper);
+        Page<EnterpriseQualification> pageList = xzSupplierQualificationService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
@@ -86,9 +91,11 @@ public class XzSupplierQualificationController {
     @OperLog(operModul = "供应商管理", operType = "添加星纵-供应商-企业资质", operDesc = "添加星纵-供应商-企业资质")
     @ApiOperation(value = "添加星纵-供应商-企业资质信息", notes = "添加星纵-供应商-企业资质信息", httpMethod = "POST")
     @PostMapping(value = "/add")
-    public Result<XzSupplierQualification> add(@RequestBody XzSupplierQualification xzSupplierQualification) {
+    public Result<EnterpriseQualification> add(@RequestBody EnterpriseQualification xzSupplierQualification) {
-        Result<XzSupplierQualification> result = new Result<XzSupplierQualification>();
+        Result<EnterpriseQualification> result = new Result<EnterpriseQualification>();
         try {
+            EnterpriseInfo ei = xzSupplierQualificationService.getSupplierByUserId(xzSupplierQualification.getUserId());
+            xzSupplierQualification.setEnterpriseId(ei.getId());
             xzSupplierQualificationService.save(xzSupplierQualification);
             result.successMsg(MessageUtil.get("addSucess"));
         } catch (Exception e) {
@@ -108,12 +115,14 @@ public class XzSupplierQualificationController {
     @OperLog(operModul = "供应商管理", operType = "编辑星纵-供应商-企业资质", operDesc = "编辑星纵-供应商-企业资质")
     @ApiOperation(value = "编辑星纵-供应商-企业资质信息", notes = "编辑星纵-供应商-企业资质信息", httpMethod = "POST")
     @PostMapping(value = "/edit")
-    public Result<XzSupplierQualification> edit(@RequestBody XzSupplierQualification xzSupplierQualification) {
+    public Result<EnterpriseQualification> edit(@RequestBody EnterpriseQualification xzSupplierQualification) {
-        Result<XzSupplierQualification> result = new Result<XzSupplierQualification>();
+        Result<EnterpriseQualification> result = new Result<EnterpriseQualification>();
-        XzSupplierQualification xzSupplierQualificationEntity = xzSupplierQualificationService.getById(xzSupplierQualification.getId());
+        EnterpriseQualification xzSupplierQualificationEntity = xzSupplierQualificationService.getById(xzSupplierQualification.getId());
         if (xzSupplierQualificationEntity == null) {
             result.error500(MessageUtil.get("notFindErr"));
         } else {
+            EnterpriseInfo ei = xzSupplierQualificationService.getSupplierByUserId(xzSupplierQualification.getUserId());
+            xzSupplierQualification.setEnterpriseId(ei.getId());
             boolean ok = xzSupplierQualificationService.updateById(xzSupplierQualification);
 
             if (ok) {
@@ -134,9 +143,9 @@ public class XzSupplierQualificationController {
     @ApiOperation(value = "删除星纵-供应商-企业资质信息", notes = "删除星纵-供应商-企业资质信息", httpMethod = "POST")
     @ApiImplicitParam(name = "id", value = "星纵-供应商-企业资质ID", paramType = "body", required = true, dataType = "Integer")
     @PostMapping(value = "/delete")
-    public Result<XzSupplierQualification> delete(@RequestBody Map<String, Object> map) {
+    public Result<EnterpriseQualification> delete(@RequestBody Map<String, Object> map) {
-        Result<XzSupplierQualification> result = new Result<XzSupplierQualification>();
+        Result<EnterpriseQualification> result = new Result<EnterpriseQualification>();
-        XzSupplierQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id"));
+        EnterpriseQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id"));
         if (xzSupplierQualification == null) {
             result.error500(MessageUtil.get("notFindErr"));
         } else {
@@ -159,9 +168,9 @@ public class XzSupplierQualificationController {
     @ApiOperation(value = "通过id查询星纵-供应商-企业资质信息", notes = "通过id查询星纵-供应商-企业资质信息", httpMethod = "POST")
     @ApiImplicitParam(name = "id", value = "星纵-供应商-企业资质ID", paramType = "body", required = true, dataType = "Integer")
     @PostMapping(value = "/queryById")
-    public Result<XzSupplierQualification> queryById(@RequestBody Map<String, Object> map) {
+    public Result<EnterpriseQualification> queryById(@RequestBody Map<String, Object> map) {
-        Result<XzSupplierQualification> result = new Result<XzSupplierQualification>();
+        Result<EnterpriseQualification> result = new Result<>();
-        XzSupplierQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id"));
+        EnterpriseQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id"));
         if (xzSupplierQualification == null) {
             result.error500(MessageUtil.get("notFindErr"));
         } else {

src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualification.java

@@ -1,79 +0,0 @@
-package com.zhgd.xmgl.modules.xz.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-
-/**
- * @Description: 星纵-供应商-企业资质
- * @author： pds
- * @date： 2020-10-10
- * @version： V1.0
- */
-@Data
-@TableName("xz_supplier_qualification")
-@ApiModel(value = "XzSupplierQualification实体类", description = "XzSupplierQualification")
-public class XzSupplierQualification implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	/**
-     * id
-     */
-    @TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "id")
-    private java.lang.Long id;
-    /**
-     * 用户id
-     */
-    @Excel(name = "用户id", width = 15)
-    @ApiModelProperty(value = "用户id")
-    private java.lang.Long userId;
-    /**
-     * 资质文件名称
-     */
-    @Excel(name = "资质文件名称", width = 15)
-    @ApiModelProperty(value = "资质文件名称")
-    private java.lang.String fileName;
-	/**
-	 * 资质文件编号
-	 */
-	@Excel(name = "资质文件编号", width = 15)
-	@ApiModelProperty(value = "资质文件编号")
-	private java.lang.String fileNumber;
-    /**
-     * 文件路径
-     */
-    @Excel(name = "文件路径", width = 15)
-    @ApiModelProperty(value = "文件路径")
-    private java.lang.String fileUrl;
-    /**
-     * 备注
-     */
-    @Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private java.lang.String remarks;
-    @ApiModelProperty(value = "源文件名称")
-    private java.lang.String originFileName;
-    @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 java.util.Date createTime;
-    /**
-     * 更新时间
-     */
-    @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 java.util.Date updateTime;
-
-}

src/main/java/com/zhgd/xmgl/modules/xz/entity/XzUserToSupplier.java

@@ -1,14 +1,14 @@
 package com.zhgd.xmgl.modules.project.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
 
 /**
  * @Description: 星纵-用户和供应商关联
@@ -32,14 +32,12 @@ public class XzUserToSupplier implements Serializable {
      */
     @Excel(name = "企业Id xz_supplier外键", width = 15)
     @ApiModelProperty(value = "企业Id xz_supplier外键")
-
     private java.lang.Long xzSupplierId;
     /**
      * 企业类型
      */
     @Excel(name = "企业类型", width = 15)
     @ApiModelProperty(value = "企业类型")
-
     private java.lang.Long xzSupplierTypeId;
 
     /**

src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierQualificationMapper.java

@@ -1,16 +0,0 @@
-package com.zhgd.xmgl.modules.xz.mapper;
-
-import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualification;
-import org.apache.ibatis.annotations.Mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 星纵-供应商-企业资质
- * @author： pds
- * @date： 2020-10-10
- * @version： V1.0
- */
-@Mapper
-public interface XzSupplierQualificationMapper extends BaseMapper<XzSupplierQualification> {
-
-}

src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzUserToSupplierMapper.java

@@ -1,17 +1,17 @@
 package com.zhgd.xmgl.modules.xz.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
+import com.zhgd.xmgl.modules.project.entity.XzUserToSupplier;
 import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.zhgd.xmgl.modules.project.entity.XzUserToSupplier;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 星纵-用户和供应商关联
  * @author： pds
@@ -33,4 +33,6 @@ public interface XzUserToSupplierMapper extends BaseMapper<XzUserToSupplier> {
     void updateXzSupplierType(Map<String, Object> map);
 
     List<Map<String, Object>> selectExternalXzSupplierList(Map<String, Object> map);
+
+    EnterpriseInfo getSupplierByUserId(Long userId);
 }

src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierQualificationMapper.xml

@@ -1,4 +0,0 @@
-<?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.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationMapper">
-</mapper>

src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzUserToSupplierMapper.xml

@@ -102,4 +102,10 @@
             and a.social_code = #{socialCode}
         </if>
     </select>
+
+    <select id="getSupplierByUserId" resultType="com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo">
+        select ei.* from enterprise_info ei
+        join xz_user_to_supplier ts on ts.xz_supplier_id=ei.id
+        where ts.user_id=#{userId}
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationService.java

@@ -1,14 +0,0 @@
-package com.zhgd.xmgl.modules.xz.service;
-
-import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualification;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 星纵-供应商-企业资质
- * @author： pds
- * @date： 2020-10-10
- * @version： V1.0
- */
-public interface IXzSupplierQualificationService extends IService<XzSupplierQualification> {
-
-}

src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java

@@ -19,13 +19,13 @@ import com.zhgd.xmgl.modules.basicdata.service.impl.CompanyServiceImpl;
 import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise;
 import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
 import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
+import com.zhgd.xmgl.modules.worker.entity.EnterpriseQualification;
 import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
-import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualification;
+import com.zhgd.xmgl.modules.worker.mapper.EnterpriseQualificationMapper;
 import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationApply;
 import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationRecord;
 import com.zhgd.xmgl.modules.xz.entity.XzSupplierRecord;
 import com.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationApplyMapper;
-import com.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationMapper;
 import com.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationRecordMapper;
 import com.zhgd.xmgl.modules.xz.mapper.XzSupplierRecordMapper;
 import com.zhgd.xmgl.modules.xz.service.IXzSupplierQualificationApplyService;
@@ -59,7 +59,7 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl<XzSuppl
     @Autowired
     private XzSupplierRecordMapper xzSupplierRecordMapper;
     @Autowired
-    private XzSupplierQualificationMapper xzSupplierQualificationMapper;
+    private EnterpriseQualificationMapper enterpriseQualificationMapper;
     @Autowired
     private XzSupplierServiceImpl xzSupplierService;
     @Autowired
@@ -161,6 +161,8 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl<XzSuppl
                 projectEnterprise.setEnterpriseTypeId(ei.getEnterpriseTypeId());
                 projectEnterprise.setType(1);
                 projectEnterprise.setParentEnterpriseId(0L);
+                projectEnterprise.setProjectDirectorName(ei.getProjectDirectorName());
+                projectEnterprise.setProjectDirectorPhone(ei.getProjectDirectorPhone());
                 projectEnterpriseMapper.insert(projectEnterprise);
             }
         }
@@ -236,9 +238,10 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl<XzSuppl
         xzSupplierQualificationApply.setProjectSn(projectSn);
         xzSupplierQualificationApply.setApplyUserId(Long.valueOf(userId));
         baseMapper.insert(xzSupplierQualificationApply);
-        List<XzSupplierQualification> xzSupplierQualifications = xzSupplierQualificationMapper.selectList(new LambdaQueryWrapper<XzSupplierQualification>()
+        EnterpriseInfo ei = getSupplierInfoByUserId(Long.valueOf(userId));
-                .eq(XzSupplierQualification::getUserId, userId));
+        List<EnterpriseQualification> xzSupplierQualifications = enterpriseQualificationMapper.selectList(new LambdaQueryWrapper<EnterpriseQualification>()
-        for (XzSupplierQualification xzSupplierQualification : xzSupplierQualifications) {
+                .eq(EnterpriseQualification::getEnterpriseId, ei.getId()));
+        for (EnterpriseQualification xzSupplierQualification : xzSupplierQualifications) {
             XzSupplierQualificationRecord qualificationRecord = new XzSupplierQualificationRecord();
             qualificationRecord.setXzSupplierQualificationApplyId(xzSupplierQualificationApply.getId());
             BeanUtil.copyProperties(xzSupplierQualification, qualificationRecord);

src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationServiceImpl.java

@@ -1,19 +0,0 @@
-package com.zhgd.xmgl.modules.xz.service.impl;
-
-import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualification;
-import com.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationMapper;
-import com.zhgd.xmgl.modules.xz.service.IXzSupplierQualificationService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 星纵-供应商-企业资质
- * @author： pds
- * @date： 2020-10-10
- * @version： V1.0
- */
-@Service
-public class XzSupplierQualificationServiceImpl extends ServiceImpl<XzSupplierQualificationMapper, XzSupplierQualification> implements IXzSupplierQualificationService {
-
-}