diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java index de05121b..181eed2b 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java @@ -100,6 +100,16 @@ public class AdvertisementController extends BaseController { return ApiResult.success(advertisementService.getList(request)); } + /** + * 获取质量宣传图版本列表 + * @param request 请求参数 + * @return 质量宣传图版本列表 + */ + @PostMapping("versions") + public ApiResult> getAdvertisementVersions(@Valid @RequestBody @NotNull AdvertisementRequst request){ + return ApiResult.success(advertisementService.getVersions(request.getType(), request.getPosition())); + } + /** * 根据类型获取质量宣传图 * @param request 请求参数 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java index d6b41a07..755520f2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdvertisementMapper.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.wms.common.pojo.vo.AdvertisementListVO; import com.nflg.wms.repository.entity.Advertisement; +import java.util.List; + /** *

* Mapper 接口 @@ -19,4 +21,6 @@ public interface AdvertisementMapper extends BaseMapper { Advertisement getByType(String type, String position); IPage getList(IPage page); + + List getVersions(String type, String position); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java index c187ecf6..19626c4a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdvertisementService.java @@ -9,6 +9,8 @@ import com.nflg.wms.common.pojo.vo.AdvertisementListVO; import com.nflg.wms.common.pojo.vo.AdvertisementVO; import com.nflg.wms.repository.entity.Advertisement; +import java.util.List; + /** *

* 服务类 @@ -25,5 +27,7 @@ public interface IAdvertisementService extends IService { IPage getList(PageQO request); + List getVersions(String type, String position); + void enable(EnableBatchQO request); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java index 46b223be..1ecc00c1 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdvertisementServiceImpl.java @@ -75,6 +75,11 @@ public class AdvertisementServiceImpl extends ServiceImpl(request.getPage(), request.getPageSize())); } + @Override + public List getVersions(String type, String position) { + return baseMapper.getVersions(type, position); + } + @Override public void enable(EnableBatchQO request) { lambdaUpdate() diff --git a/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml b/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml index ebd7044d..5f4cedaa 100644 --- a/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml @@ -8,14 +8,40 @@ INNER JOIN dictionary_item di1 ON ad.type = di1.id INNER JOIN dictionary_item di2 ON ad.position = di2.id where di1.code = #{type} AND di2.code=#{position} and ad.enable - ORDER BY CAST(SUBSTRING(ad.version, 2) AS UNSIGNED) DESC + ORDER BY CAST(SUBSTRING(ad.version, 2) AS INTEGER) DESC LIMIT 1 + +