Merge pull request #15 from ab-inbev-apac/feature/1.0.0

Feature/1.0.0

abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/advice/ExceptionAdvice.java

@@ -1,8 +1,7 @@
-package com.abi.task.common.advice;
+package com.abi.qms.platform.advice;
 
 
 
-import com.abi.task.common.api.base.BasePageResp;
 import com.abi.task.common.api.base.BaseResponse;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.api.exception.ErrorCodeEnum;

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

@@ -20,7 +20,7 @@ public interface BoxCodeFormatMapper extends BaseMapper<BoxCodeFormat> {
      * @param page
      * @return
      */
-    IPage<BoxCodeFormatVO> listBoxCodeFormat(IPage page, ListBoxCodeFormatReq param);
+    IPage<BoxCodeFormatVO> listBoxCodeFormat(IPage page, @Param("param") ListBoxCodeFormatReq param);
 
     /**
      * 根据ID查询详情信息

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

@@ -17,6 +17,7 @@ import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
 import com.abi.qms.platform.service.FactoryService;
 import com.abi.task.common.api.exception.BusinessException;
+import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.abi.task.common.excel.preperties.FactoryProperty;
 import com.abi.task.common.utils.PojoConverterUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -56,7 +57,7 @@ public class FactoryServiceImpl implements FactoryService {
         }
         List<BaseFactory> checkFactoryList = baseFactoryMapper.selectList(factoryQw);
         if (CollectionUtil.isNotEmpty(checkFactoryList)) {
-            throw new BusinessException("供应商ID已存在");
+            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "供应商ID已存在");
         }
 
         //1-声明对象

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BoxCodeFormatMapper.xml

@@ -39,7 +39,7 @@
             <if test="param.name != null and param.name != ''">
                 AND bcf.name like concat('%',#{param.name},'%')
             </if>
-            <if test="param.state != null and param.state != ''">
+            <if test="param.state != null ">
                 AND bcf.state = #{param.state}
             </if>
         </where>