From bdb8de04db8b4d42fc978093671f65c4deb8a603 Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Tue, 1 Jul 2025 15:07:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=AD=89=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E8=B5=84=E8=B4=A8=E9=A2=84=E8=AD=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupplierQualificationController.java | 16 +++ .../canteen/core/ims/dto/SupplierAddDTO.java | 2 +- .../ims/dto/SupplierQualificationAddDTO.java | 2 +- .../ims/dto/SupplierQualificationPageDTO.java | 98 +++++++++++++++++++ .../ims/enums/SupplierQualificationEnum.java | 25 +++++ .../mapper/SupplierQualificationMapper.java | 19 ++-- .../ISupplierQualificationService.java | 4 + .../SupplierQualificationServiceImpl.java | 19 ++++ .../ims/service/impl/SupplierServiceImpl.java | 1 + .../canteen/core/ims/vo/SupplierPageVO.java | 75 +++++++++++--- .../ims/vo/SupplierQualificationExpireVO.java | 37 +++++++ .../mapper/ims/SupplierCategoryMapper.xml | 2 +- .../ims/SupplierQualificationMapper.xml | 45 +++++++++ 13 files changed, 324 insertions(+), 21 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationPageDTO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/enums/SupplierQualificationEnum.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierQualificationExpireVO.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/SupplierQualificationController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/SupplierQualificationController.java index 9485b1f..a57b80c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/SupplierQualificationController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/SupplierQualificationController.java @@ -2,6 +2,9 @@ package com.bonus.canteen.core.ims.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.bonus.canteen.core.ims.dto.SupplierQualificationPageDTO; +import com.bonus.canteen.core.ims.vo.SupplierQualificationExpireVO; import com.bonus.common.log.enums.OperaType; //import com.bonus.canteen.core.ims.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; @@ -116,4 +119,17 @@ public class SupplierQualificationController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(supplierQualificationService.deleteSupplierQualificationByIds(ids)); } + + + @ApiOperation(value = "查询供应商资质列表") + //@RequiresPermissions("ims:qualification:list") + @GetMapping("/early_warning") + public TableDataInfo earlyWarning(SupplierQualificationPageDTO supplierQualification) { + startPage(); + List list = supplierQualificationService.earlyWarning(supplierQualification); + return getDataTable(list); + } + + + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierAddDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierAddDTO.java index 5e027dd..565e83d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierAddDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierAddDTO.java @@ -26,7 +26,7 @@ public class SupplierAddDTO { @ApiModelProperty("主要联系人") private String linkman; @ApiModelProperty("主要联系人电话") - private String linkmanNumber; + private String linkmanPhone; @ApiModelProperty("主要邮箱") private String email; @ApiModelProperty("主要微信号") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationAddDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationAddDTO.java index 45b0baf..507f7c1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationAddDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationAddDTO.java @@ -21,7 +21,7 @@ public class SupplierQualificationAddDTO { @ApiModelProperty("资质类型(1-营业执照,2-ISO9001国际质量体系认证,3-食品经营许可证,4-烟草经营许可证,5-HACCP认证)") private Long qualificationType; @ApiModelProperty("有效期") - private LocalDate validity; + private LocalDate expirationDate; @ApiModelProperty("资质照片") private String imgUrl; @ApiModelProperty("主次(1主，2次)") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationPageDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationPageDTO.java new file mode 100644 index 0000000..aa4ae8f --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationPageDTO.java @@ -0,0 +1,98 @@ +package com.bonus.canteen.core.ims.dto; + +import io.swagger.annotations.ApiModelProperty; + +import java.util.List; + +public class SupplierQualificationPageDTO { + @ApiModelProperty("当前页") + private Long current; + @ApiModelProperty("每页显示条数") + private Long size; + @ApiModelProperty("资质编号") + private String qualificationCode; + @ApiModelProperty("资质名称") + private String qualificationName; + @ApiModelProperty("供应商id") + private Long supplierId; + @ApiModelProperty("主次资质类型") + private Integer mainFlag; + @ApiModelProperty("小于30,1是 2否") + private Integer isLessThanMonth; + @ApiModelProperty("区域id列表") + private List areaIdList; + + public Long getCurrent() { + return this.current; + } + + public Long getSize() { + return this.size; + } + + public String getQualificationCode() { + return this.qualificationCode; + } + + public String getQualificationName() { + return this.qualificationName; + } + + public Long getSupplierId() { + return this.supplierId; + } + + public Integer getMainFlag() { + return this.mainFlag; + } + + public Integer getIsLessThanMonth() { + return this.isLessThanMonth; + } + + public List getAreaIdList() { + return this.areaIdList; + } + + public SupplierQualificationPageDTO setCurrent(final Long current) { + this.current = current; + return this; + } + + public SupplierQualificationPageDTO setSize(final Long size) { + this.size = size; + return this; + } + + public SupplierQualificationPageDTO setQualificationNum(final String qualificationCode) { + this.qualificationCode = qualificationCode; + return this; + } + + public SupplierQualificationPageDTO setQualificationName(final String qualificationName) { + this.qualificationName = qualificationName; + return this; + } + + public SupplierQualificationPageDTO setSupplierId(final Long supplierId) { + this.supplierId = supplierId; + return this; + } + + public SupplierQualificationPageDTO setMainFlag(final Integer mainFlag) { + this.mainFlag = mainFlag; + return this; + } + + public SupplierQualificationPageDTO setIsLessThanMonth(final Integer isLessThanMonth) { + this.isLessThanMonth = isLessThanMonth; + return this; + } + + public SupplierQualificationPageDTO setAreaIdList(final List areaIdList) { + this.areaIdList = areaIdList; + return this; + } + + +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/enums/SupplierQualificationEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/enums/SupplierQualificationEnum.java new file mode 100644 index 0000000..c098d44 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/enums/SupplierQualificationEnum.java @@ -0,0 +1,25 @@ +package com.bonus.canteen.core.ims.enums; + +public enum SupplierQualificationEnum { + BUSINE(1, "营业执照"), + ISO(2, "ISO9001国际质量体系认证"), + FOOD(3, "食品经营许可证"), + SMOKE(4, "烟草经营许可证"), + HACCP(5, "HACCP认证"); + + + private final Integer key; + private final String desc; + + private SupplierQualificationEnum(Integer key, String desc) { + this.key = key; + this.desc = desc; + } + public Integer getKey() { + return this.key; + } + + public String getDesc() { + return this.desc; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/SupplierQualificationMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/SupplierQualificationMapper.java index 166dca2..16bb659 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/SupplierQualificationMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/SupplierQualificationMapper.java @@ -2,17 +2,20 @@ package com.bonus.canteen.core.ims.mapper; import java.util.List; import com.bonus.canteen.core.ims.domain.SupplierQualification; +import com.bonus.canteen.core.ims.dto.SupplierQualificationPageDTO; +import com.bonus.canteen.core.ims.vo.SupplierQualificationExpireVO; +import org.apache.ibatis.annotations.Param; /** * 供应商资质Mapper接口 - * + * * @author xsheng * @date 2025-06-30 */ public interface SupplierQualificationMapper { /** * 查询供应商资质 - * + * * @param id 供应商资质主键 * @return 供应商资质 */ @@ -20,7 +23,7 @@ public interface SupplierQualificationMapper { /** * 查询供应商资质列表 - * + * * @param supplierQualification 供应商资质 * @return 供应商资质集合 */ @@ -28,7 +31,7 @@ public interface SupplierQualificationMapper { /** * 新增供应商资质 - * + * * @param supplierQualification 供应商资质 * @return 结果 */ @@ -36,7 +39,7 @@ public interface SupplierQualificationMapper { /** * 修改供应商资质 - * + * * @param supplierQualification 供应商资质 * @return 结果 */ @@ -44,7 +47,7 @@ public interface SupplierQualificationMapper { /** * 删除供应商资质 - * + * * @param id 供应商资质主键 * @return 结果 */ @@ -52,11 +55,13 @@ public interface SupplierQualificationMapper { /** * 批量删除供应商资质 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteSupplierQualificationByIds(Long[] ids); void deleteSupplierQualificationBySupplierId(Long supplierId); + + List earlyWarning(@Param("content") SupplierQualificationPageDTO content); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ISupplierQualificationService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ISupplierQualificationService.java index 2df8c34..e90ce83 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ISupplierQualificationService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ISupplierQualificationService.java @@ -2,6 +2,8 @@ package com.bonus.canteen.core.ims.service; import java.util.List; import com.bonus.canteen.core.ims.domain.SupplierQualification; +import com.bonus.canteen.core.ims.dto.SupplierQualificationPageDTO; +import com.bonus.canteen.core.ims.vo.SupplierQualificationExpireVO; /** * 供应商资质Service接口 @@ -59,4 +61,6 @@ public interface ISupplierQualificationService { public int deleteSupplierQualificationById(Long id); void deleteSupplierQualificationBySupplierId(Long supplierId); + + List earlyWarning(SupplierQualificationPageDTO supplierQualification); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierQualificationServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierQualificationServiceImpl.java index 25b8e8f..a62ee11 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierQualificationServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierQualificationServiceImpl.java @@ -1,6 +1,11 @@ package com.bonus.canteen.core.ims.service.impl; +import java.time.Duration; +import java.time.LocalDateTime; import java.util.List; + +import com.bonus.canteen.core.ims.dto.SupplierQualificationPageDTO; +import com.bonus.canteen.core.ims.vo.SupplierQualificationExpireVO; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -100,4 +105,18 @@ public class SupplierQualificationServiceImpl implements ISupplierQualificationS public void deleteSupplierQualificationBySupplierId(Long supplierId) { supplierQualificationMapper.deleteSupplierQualificationBySupplierId(supplierId); } + + @Override + public List earlyWarning(SupplierQualificationPageDTO supplierQualification) { + List list = supplierQualificationMapper.earlyWarning(supplierQualification); + if(list !=null && list.size() >0 ) { + list.forEach(item->{ + if(item.getExpirationDate() !=null){ + Duration duration = Duration.between(LocalDateTime.now(), item.getExpirationDate().atStartOfDay()); + item.setExpireDays(duration.toDays()); + } + }); + } + return list; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierServiceImpl.java index 8374aa0..2a2bbde 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierServiceImpl.java @@ -24,6 +24,7 @@ import com.bonus.canteen.core.ims.vo.SupplierQualificationDetailPageVO; import com.bonus.canteen.core.kitchen.domain.KitchenDeviceInfo; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.StringUtils; import com.bonus.common.houqin.constant.DelFlagEnum; import com.bonus.common.security.utils.SecurityUtils; import org.apache.commons.compress.utils.Lists; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierPageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierPageVO.java index f52e76b..9209652 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierPageVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierPageVO.java @@ -18,7 +18,7 @@ public class SupplierPageVO { @ApiModelProperty("供应商id") private Long supplierId; @ApiModelProperty("供应商编号") - private String supplierNum; + private String supplierCode; @ApiModelProperty("供应商名称") private String supplierName; @ApiModelProperty("区域id") @@ -30,7 +30,7 @@ public class SupplierPageVO { @ApiModelProperty("主要联系人") private String linkman; @ApiModelProperty("主要联系人电话") - private String linkmanNumber; + private String linkmanPhone; @ApiModelProperty("主要邮箱") private String email; @ApiModelProperty("主要微信号") @@ -148,8 +148,8 @@ public class SupplierPageVO { return this.supplierId; } - public String getSupplierNum() { - return this.supplierNum; + public String getSupplierCode() { + return this.supplierCode; } public String getSupplierName() { @@ -173,7 +173,7 @@ public class SupplierPageVO { } public String getLinkmanNumber() { - return this.linkmanNumber; + return this.linkmanPhone; } public String getEmail() { @@ -344,8 +344,8 @@ public class SupplierPageVO { this.supplierId = supplierId; } - public void setSupplierNum(final String supplierNum) { - this.supplierNum = supplierNum; + public void setSupplierCode(final String supplierCode) { + this.supplierCode = supplierCode; } public void setSupplierName(final String supplierName) { @@ -368,8 +368,8 @@ public class SupplierPageVO { this.linkman = linkman; } - public void setLinkmanNumber(final String linkmanNumber) { - this.linkmanNumber = linkmanNumber; + public void setLinkmanNumber(final String linkmanPhone) { + this.linkmanPhone = linkmanPhone; } public void setEmail(final String email) { @@ -548,8 +548,61 @@ public class SupplierPageVO { this.attachmentList = attachmentList; } + @Override public String toString() { - Long var10000 = this.getSupplierId(); - return "DrpSupplierPageVO(supplierId=" + var10000 + ", supplierNum=" + this.getSupplierNum() + ", supplierName=" + this.getSupplierName() + ", areaId=" + this.getAreaId() + ", areaName=" + this.getAreaName() + ", address=" + this.getAddress() + ", linkman=" + this.getLinkman() + ", linkmanNumber=" + this.getLinkmanNumber() + ", email=" + this.getEmail() + ", wechat=" + this.getWechat() + ", openingBank=" + this.getOpeningBank() + ", bankAccount=" + this.getBankAccount() + ", supplierSimpleName=" + this.getSupplierSimpleName() + ", telephone=" + this.getTelephone() + ", companyWeb=" + this.getCompanyWeb() + ", regionProvince=" + this.getRegionProvince() + ", regionCity=" + this.getRegionCity() + ", regionDistrict=" + this.getRegionDistrict() + ", taxRate=" + this.getTaxRate() + ", paymentDays=" + this.getPaymentDays() + ", standbyLinkman=" + this.getStandbyLinkman() + ", standbyPhone=" + this.getStandbyPhone() + ", standbyWechat=" + this.getStandbyWechat() + ", standbyEmail=" + this.getStandbyEmail() + ", categoryModelList=" + String.valueOf(this.getCategoryModelList()) + ", registFund=" + String.valueOf(this.getRegistFund()) + ", establishDate=" + String.valueOf(this.getEstablishDate()) + ", workersNum=" + this.getWorkersNum() + ", clientNum=" + this.getClientNum() + ", lastYearOperatingIncome=" + String.valueOf(this.getLastYearOperatingIncome()) + ", beforeYearOperatingIncome=" + String.valueOf(this.getBeforeYearOperatingIncome()) + ", businessScope=" + this.getBusinessScope() + ", topFiveClient=" + this.getTopFiveClient() + ", topFiveSupplier=" + this.getTopFiveSupplier() + ", companyIntroduction=" + this.getCompanyIntroduction() + ", mainAdvantage=" + this.getMainAdvantage() + ", ifReceiveNotice=" + this.getIfReceiveNotice() + ", noticeStyle=" + this.getNoticeStyle() + ", supplierUserId=" + this.getSupplierUserId() + ", status=" + this.getStatus() + ", supplierScore=" + String.valueOf(this.getSupplierScore()) + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ", idCardImgZ=" + this.getIdCardImgZ() + ", idCardImgF=" + this.getIdCardImgF() + ", attachment=" + this.getAttachment() + ", mainQualificationList=" + String.valueOf(this.getMainQualificationList()) + ", otherQualificationList=" + String.valueOf(this.getOtherQualificationList()) + ", deliverVOList=" + String.valueOf(this.getDeliverVOList()) + ", attachmentList=" + String.valueOf(this.getAttachmentList()) + ")"; + return "SupplierPageVO{" + + "supplierId=" + supplierId + + ", supplierCode='" + supplierCode + '\'' + + ", supplierName='" + supplierName + '\'' + + ", areaId=" + areaId + + ", areaName='" + areaName + '\'' + + ", address='" + address + '\'' + + ", linkman='" + linkman + '\'' + + ", linkmanPhone='" + linkmanPhone + '\'' + + ", email='" + email + '\'' + + ", wechat='" + wechat + '\'' + + ", openingBank='" + openingBank + '\'' + + ", bankAccount='" + bankAccount + '\'' + + ", supplierSimpleName='" + supplierSimpleName + '\'' + + ", telephone='" + telephone + '\'' + + ", companyWeb='" + companyWeb + '\'' + + ", regionProvince='" + regionProvince + '\'' + + ", regionCity='" + regionCity + '\'' + + ", regionDistrict='" + regionDistrict + '\'' + + ", taxRate=" + taxRate + + ", paymentDays=" + paymentDays + + ", standbyLinkman='" + standbyLinkman + '\'' + + ", standbyPhone='" + standbyPhone + '\'' + + ", standbyWechat='" + standbyWechat + '\'' + + ", standbyEmail='" + standbyEmail + '\'' + + ", categoryModelList=" + categoryModelList + + ", registFund=" + registFund + + ", establishDate=" + establishDate + + ", workersNum=" + workersNum + + ", clientNum=" + clientNum + + ", lastYearOperatingIncome=" + lastYearOperatingIncome + + ", beforeYearOperatingIncome=" + beforeYearOperatingIncome + + ", businessScope='" + businessScope + '\'' + + ", topFiveClient='" + topFiveClient + '\'' + + ", topFiveSupplier='" + topFiveSupplier + '\'' + + ", companyIntroduction='" + companyIntroduction + '\'' + + ", mainAdvantage='" + mainAdvantage + '\'' + + ", ifReceiveNotice=" + ifReceiveNotice + + ", noticeStyle=" + noticeStyle + + ", supplierUserId=" + supplierUserId + + ", status=" + status + + ", supplierScore=" + supplierScore + + ", crby='" + crby + '\'' + + ", crtime=" + crtime + + ", upby='" + upby + '\'' + + ", uptime=" + uptime + + ", idCardImgZ='" + idCardImgZ + '\'' + + ", idCardImgF='" + idCardImgF + '\'' + + ", attachment='" + attachment + '\'' + + ", mainQualificationList=" + mainQualificationList + + ", otherQualificationList=" + otherQualificationList + + ", deliverVOList=" + deliverVOList + + ", attachmentList=" + attachmentList + + '}'; } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierQualificationExpireVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierQualificationExpireVO.java new file mode 100644 index 0000000..659ec39 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierQualificationExpireVO.java @@ -0,0 +1,37 @@ +package com.bonus.canteen.core.ims.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDate; + +@Data +public class SupplierQualificationExpireVO { + @ApiModelProperty("资质编号") + private String qualificationCode; + @ApiModelProperty("资质名称") + private String qualificationName; + @ApiModelProperty("有效期") + private LocalDate expirationDate; + @ApiModelProperty("资质照片") + private String imgUrl; + @ApiModelProperty("供应商id") + private Long supplierId; + @ApiModelProperty("供应商编号") + private String supplierCode; + @ApiModelProperty("主次(1主，2次)") + private Integer mainFlag; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("区域id") + private Long areaId; + @ApiModelProperty("区域名称") + private String areaName; + @ApiModelProperty("主要联系人") + private String linkman; + @ApiModelProperty("主要联系人电话") + private String linkmanPhone; + @ApiModelProperty("临期天数") + private Long expireDays; + +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierCategoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierCategoryMapper.xml index e6c8ca5..b13782b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierCategoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierCategoryMapper.xml @@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mmc.material_type_name as categoryName FROM ims_supplier_category dsc - LEFT JOIN cook_material_type mmc ON dsc.category_id = mmc.material_type_id and mmc.`level` =2 + LEFT JOIN cook_material_type mmc ON dsc.category_id = mmc.material_type_id where dsc.supplier_id = #{supplierId} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierQualificationMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierQualificationMapper.xml index 1cd9eea..6b8fce9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierQualificationMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierQualificationMapper.xml @@ -107,4 +107,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from ims_supplier_qualification where supplier_id = #{supplierId} + +