From 318886592d8362bc6a771443bd22149f35cfe313 Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Sun, 21 Apr 2024 23:40:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E7=BA=B5-=E4=BE=9B=E5=BA=94=E5=95=86-?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=B5=84=E8=B4=A8=E4=BF=A1=E6=81=AFbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/EnterpriseQualification.java | 27 ++++++- .../IEnterpriseQualificationService.java | 2 + .../EnterpriseQualificationServiceImpl.java | 20 ++++- .../XzSupplierQualificationController.java | 61 ++++++++------ .../xz/entity/XzSupplierQualification.java | 79 ------------------- .../modules/xz/entity/XzUserToSupplier.java | 10 +-- .../mapper/XzSupplierQualificationMapper.java | 16 ---- .../xz/mapper/XzUserToSupplierMapper.java | 12 +-- .../xml/XzSupplierQualificationMapper.xml | 4 - .../xz/mapper/xml/XzUserToSupplierMapper.xml | 6 ++ .../IXzSupplierQualificationService.java | 14 ---- ...SupplierQualificationApplyServiceImpl.java | 15 ++-- .../XzSupplierQualificationServiceImpl.java | 19 ----- 13 files changed, 104 insertions(+), 181 deletions(-) delete mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualification.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierQualificationMapper.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierQualificationMapper.xml delete mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationService.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationServiceImpl.java diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseQualification.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseQualification.java index 12cc0b643..27925c1ef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseQualification.java +++ b/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.databind.ser.std.ToStringSerializer; +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; /** @@ -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; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IEnterpriseQualificationService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IEnterpriseQualificationService.java index 70d65f572..c80895ec3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IEnterpriseQualificationService.java +++ b/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 { + EnterpriseInfo getSupplierByUserId(Long userId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseQualificationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseQualificationServiceImpl.java index fb517f4b4..09d8125e2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseQualificationServiceImpl.java +++ b/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 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; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierQualificationController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierQualificationController.java index 854bebbd7..60a00c982 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierQualificationController.java +++ b/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.xz.service.IXzSupplierQualificationService; +import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; +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> selectXzSupplierBadRecordList(@RequestBody Map map) { - Result> result = new Result>(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(XzSupplierQualification::getUserId, MapUtils.getString(map, "userId")); - queryWrapper.lambda().orderByDesc(XzSupplierQualification::getCreateTime); - List pageList = xzSupplierQualificationService.list(queryWrapper); + public Result> selectXzSupplierBadRecordList(@RequestBody Map map) { + Result> result = new Result>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + Long userId = MapUtils.getLong(map, "userId"); + EnterpriseInfo ei = xzSupplierQualificationService.getSupplierByUserId(userId); + queryWrapper.lambda().eq(EnterpriseQualification::getEnterpriseId, ei.getId()); + queryWrapper.lambda().orderByDesc(EnterpriseQualification::getCreateTime); + List 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> selectXzSupplierBadRecordPage(@RequestBody Map map) { - Result> result = new Result>(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(XzSupplierQualification::getUserId, MapUtils.getString(map, "userId")); - queryWrapper.lambda().orderByDesc(XzSupplierQualification::getCreateTime); + public Result> selectXzSupplierBadRecordPage(@RequestBody Map map) { + Result> result = new Result>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + Long userId = MapUtils.getLong(map, "userId"); + EnterpriseInfo ei = xzSupplierQualificationService.getSupplierByUserId(userId); + queryWrapper.lambda().eq(EnterpriseQualification::getEnterpriseId, ei.getId()); + queryWrapper.lambda().orderByDesc(EnterpriseQualification::getCreateTime); Page page = PageUtil.getPage(map); - Page pageList = xzSupplierQualificationService.page(page, queryWrapper); + Page 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 add(@RequestBody XzSupplierQualification xzSupplierQualification) { - Result result = new Result(); + public Result add(@RequestBody EnterpriseQualification xzSupplierQualification) { + Result result = new Result(); 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 edit(@RequestBody XzSupplierQualification xzSupplierQualification) { - Result result = new Result(); - XzSupplierQualification xzSupplierQualificationEntity = xzSupplierQualificationService.getById(xzSupplierQualification.getId()); + public Result edit(@RequestBody EnterpriseQualification xzSupplierQualification) { + Result result = new Result(); + 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 delete(@RequestBody Map map) { - Result result = new Result(); - XzSupplierQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id")); + public Result delete(@RequestBody Map map) { + Result result = new Result(); + 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 queryById(@RequestBody Map map) { - Result result = new Result(); - XzSupplierQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id")); + public Result queryById(@RequestBody Map map) { + Result result = new Result<>(); + EnterpriseQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id")); if (xzSupplierQualification == null) { result.error500(MessageUtil.get("notFindErr")); } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualification.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualification.java deleted file mode 100644 index 5c3bb7ca7..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualification.java +++ /dev/null @@ -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; - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzUserToSupplier.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzUserToSupplier.java index e24dc0502..a50e9916f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzUserToSupplier.java +++ b/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; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierQualificationMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierQualificationMapper.java deleted file mode 100644 index ce463f32b..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierQualificationMapper.java +++ /dev/null @@ -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 { - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzUserToSupplierMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzUserToSupplierMapper.java index dad9e4423..3c1046603 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzUserToSupplierMapper.java +++ b/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 java.util.Map; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 { void updateXzSupplierType(Map map); List> selectExternalXzSupplierList(Map map); + + EnterpriseInfo getSupplierByUserId(Long userId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierQualificationMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierQualificationMapper.xml deleted file mode 100644 index c0dfcd1d3..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierQualificationMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzUserToSupplierMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzUserToSupplierMapper.xml index 326b91bbf..7597b33f8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzUserToSupplierMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzUserToSupplierMapper.xml @@ -102,4 +102,10 @@ and a.social_code = #{socialCode} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationService.java deleted file mode 100644 index 76d263c4f..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationService.java +++ /dev/null @@ -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 { - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java index ac2e545cb..ea2e3a417 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java +++ b/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 xzSupplierQualifications = xzSupplierQualificationMapper.selectList(new LambdaQueryWrapper() - .eq(XzSupplierQualification::getUserId, userId)); - for (XzSupplierQualification xzSupplierQualification : xzSupplierQualifications) { + EnterpriseInfo ei = getSupplierInfoByUserId(Long.valueOf(userId)); + List xzSupplierQualifications = enterpriseQualificationMapper.selectList(new LambdaQueryWrapper() + .eq(EnterpriseQualification::getEnterpriseId, ei.getId())); + for (EnterpriseQualification xzSupplierQualification : xzSupplierQualifications) { XzSupplierQualificationRecord qualificationRecord = new XzSupplierQualificationRecord(); qualificationRecord.setXzSupplierQualificationApplyId(xzSupplierQualificationApply.getId()); BeanUtil.copyProperties(xzSupplierQualification, qualificationRecord); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationServiceImpl.java deleted file mode 100644 index 9d37a18f8..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationServiceImpl.java +++ /dev/null @@ -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 implements IXzSupplierQualificationService { - -}