活动bug fix

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListActiveReq.java

@@ -23,6 +23,6 @@ public class ListActiveReq extends PageReq implements Serializable {
     @ApiModelProperty(value = "活动状态 1-待审核 2-通过 9-驳回")
     private Integer auditStatus;
 
-    @ApiModelProperty(value = "状态 1-启用 0-停用")
+    @ApiModelProperty(value = "状态 1-启用 0-停用 9-新建")
     private Integer valid;
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/runner/CheckTableStoreRunner.java

@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @version: 1.0
  * @todo:
  */
-@Component
+//@Component
 @Slf4j
 public class CheckTableStoreRunner implements ApplicationRunner {
 

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

@@ -69,16 +69,16 @@ public class ActiveServiceImpl implements ActiveService {
     public void addActive(AddActiveReq req) {
         //校验入参
         //活动ID不可重复创建。
-        QueryWrapper<BaseActive> activeVali = new QueryWrapper<>();
-        activeVali.eq("active_code", req.getActiveCode());
-        activeVali.eq("is_delete", 0);
-        BaseActive baseActive = baseActiveMapper.selectOne(activeVali);
-        if (Objects.nonNull(baseActive)) {
+        QueryWrapper<BaseActive> activeQw = new QueryWrapper<>();
+        activeQw.eq("active_code", req.getActiveCode());
+        activeQw.eq("is_delete", 0);
+        List<BaseActive> activeList = baseActiveMapper.selectList(activeQw);
+        if (CollectionUtil.isNotEmpty(activeList)) {
             throw new BusinessException("码活动ID" + req.getActiveCode() + "已存在。");
         }
 
         //校验活动名称是否存在
-        checkActiveName(req.getActiveName());
+        checkActiveName(req.getActiveName(),null);
 
         //1-新增
         Long userId = userUtil.getUser().getId();
@@ -110,20 +110,12 @@ public class ActiveServiceImpl implements ActiveService {
         //1-查询活动
         BaseActive active = baseActiveMapper.selectById(req.getId());
         AssertUtil.isNull(active, "活动不存在");
-
-        //校验活动名称是否存在
-//        checkActiveName(req.getActiveName());
-        QueryWrapper<BaseActive> qw = new QueryWrapper<>();
-        qw.eq("active_name", req.getActiveName());
-        qw.eq("is_delete", 0);
-        BaseActive activeOne = baseActiveMapper.selectOne(qw);
-        if(null != activeOne && !activeOne.getId().equals(active.getId())){
-            throw new BusinessException("活动名称已存在。");
-        }
-
+        //已通过审核不能直接修改
         if (ActiveAuditStatusEnum.REVIEW_PASS.is(active.getAuditStatus())) {
             throw new BusinessException("该数据已审核通过，请调用码活动申请单的接口。");
         }
+        //校验活动名称是否存在
+        checkActiveName(req.getActiveName(),req.getId());
 
         //2-修改活动
         Long userId = userUtil.getUser().getId();
@@ -166,13 +158,12 @@ public class ActiveServiceImpl implements ActiveService {
         //0-查询活动
         BaseActive active = baseActiveMapper.selectById(req.getId());
         AssertUtil.isNull(active, "活动不存在");
-
-        //校验活动名称是否存在
-        checkActiveName(req.getActiveName());
-
+        //未通过审核不让调用这个接口
         if (!ActiveAuditStatusEnum.REVIEW_PASS.is(active.getAuditStatus())) {
             throw new BusinessException("该数据没有审核通过，请调用编辑码活动的接口。");
         }
+        //校验活动名称是否存在
+        checkActiveName(req.getActiveName(),req.getId());
 
         //1-删除原有申请单数据
         UpdateWrapper<BaseActiveModifyApply> activeModifyUw = new UpdateWrapper<>();
@@ -419,16 +410,19 @@ public class ActiveServiceImpl implements ActiveService {
         baseActiveModifyApplyMapper.updateById(activeModifyApply);
     }
 
-    private void checkActiveName(String activeName) {
+    private void checkActiveName(String activeName,Long id) {
+        if (activeName == null) {
+            return;
+        }
+
         //校验活动名称是否存在
-        if (activeName != null) {
-            QueryWrapper<BaseActive> qw = new QueryWrapper<>();
-            qw.eq("active_name", activeName);
-            qw.eq("is_delete", 0);
-            List<BaseActive> activeList = baseActiveMapper.selectList(qw);
-            if (CollectionUtil.isNotEmpty(activeList)) {
-                throw new BusinessException("码活动名称已存在!");
-            }
+        QueryWrapper<BaseActive> qw = new QueryWrapper<>();
+        qw.eq("active_name", activeName);
+        qw.eq("is_delete", 0);
+        qw.ne(id!=null,"id",id);
+        List<BaseActive> activeList = baseActiveMapper.selectList(qw);
+        if (CollectionUtil.isNotEmpty(activeList)) {
+            throw new BusinessException("码活动名称已存在!");
         }
     }
 

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

@@ -51,8 +51,13 @@
             <if test="param.auditStatus != null ">
                 AND active.audit_status = #{param.auditStatus}
             </if>
-            <if test="param.valid != null ">
+            <if test="param.valid==1 or param.valid==0 ">
                 AND active.valid = #{param.valid}
+                AND active.audit_status = 2
+            </if>
+            <if test="param.valid==9">
+                AND active.valid = 1
+                AND active.audit_status in (1,9)
             </if>
         </where>
         order by active.apply_time desc