Merge branch 'feature/1.0.0' of D:\works\abi-cloud-qr-platform with conflicts.

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrFormatMapper.java

@@ -20,7 +20,7 @@ public interface QrFormatMapper extends BaseMapper<QrFormat> {
 	/**
 	 * 分页查询码格式信息
 	 */
-	IPage<QrFormatVO> listQrFormat(IPage page, ListQrFormatReq param);
+	IPage<QrFormatVO> listQrFormat(IPage page,@Param("param") ListQrFormatReq param);
 
 	/**
 	 * 根据码库id查询与码库关联的，被禁用的码格式
@@ -32,5 +32,5 @@ public interface QrFormatMapper extends BaseMapper<QrFormat> {
 	/**
 	 * 修改使用状态
 	 */
-	void updateUseStatusByIds(List<Long> ids, Integer useStatus);
+	void updateUseStatusByIds(@Param("ids") List<Long> ids, @Param("useStatus") Integer useStatus);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrPackageMapper.java

@@ -1,7 +1,10 @@
 package com.abi.qms.platform.dao.mapper;
 
 import com.abi.qms.platform.dao.entity.QrPackage;
-import com.abi.qms.platform.dao.vo.result.*;
+import com.abi.qms.platform.dao.vo.result.ActivePackageVO;
+import com.abi.qms.platform.dao.vo.result.PackageActiveSearchVO;
+import com.abi.qms.platform.dao.vo.result.QrPackageVO;
+import com.abi.qms.platform.dao.vo.result.QrSingleCheckVO;
 import com.abi.qms.platform.dto.req.ListActivePackageAddReq;
 import com.abi.qms.platform.dto.req.ListQrPackageReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -19,7 +22,7 @@ public interface QrPackageMapper extends BaseMapper<QrPackage> {
 	/**
 	 * 分页查询码包信息
 	 */
-	IPage<QrPackageVO> listQrPackage(IPage page, ListQrPackageReq param);
+	IPage<QrPackageVO> listQrPackage(IPage page, @Param("param") ListQrPackageReq param);
 
 	/**
 	 * 查询码包详细信息
@@ -45,12 +48,5 @@ public interface QrPackageMapper extends BaseMapper<QrPackage> {
 	/**
 	 * 单码查询详细信息
 	 */
-	QrSingleCheckVO getQrSingleCheckDetailById(Long id);
-
-	/**
-	 * 通过码活动申请id查询关联码包列表
-	 * @param page
-	 * @return
-	 */
-	IPage<ActiveModifyApplyPackageVO> listPackageByActiveApplyId(IPage page, @Param("applyId") Long applyId);
+	QrSingleCheckVO getQrSingleCheckDetailById(@Param("id") Long id);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrRepertoryServiceImpl.java

@@ -98,7 +98,7 @@ public class QrRepertoryServiceImpl implements QrRepertoryService {
         SaveQrRepertoryColumnReq qrRepertoryColumn;
         for (int i = 0; i < qrRepertoryColumnList.size(); i++) {
             qrRepertoryColumn = qrRepertoryColumnList.get(i);
-            if (QrRepertoryTypeEnum.SYSTEM_GENERATE.is(req.getType()) && qrRepertoryColumn.getQrFormatId() == null) {
+            if (QrRepertoryTypeEnum.SYSTEM_GENERATE.is(req.getType()) && null == qrRepertoryColumn.getQrFormatId()) {
                 throw new BusinessException("码格式为空");
             }
             if (!notRepeat.add(qrRepertoryColumn.getAlias())) {
@@ -119,7 +119,7 @@ public class QrRepertoryServiceImpl implements QrRepertoryService {
         // 新增or修改
         Long userId = userUtil.getUser().getId();
         qrRepertory.setUpdateBy(userId);
-        if (qrRepertoryId != null) {
+         if (qrRepertoryId != null) {
             qrRepertoryMapper.updateById(qrRepertory);
             // 逻辑删除码库的列
             qrRepertoryColumnMapper.deleteByQrRepertoryId(qrRepertoryId);