Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/enums/ActiveAuditStatusEnum.java

@@ -21,9 +21,7 @@ public enum ActiveAuditStatusEnum {
     //活动审核状态 1-待审核 2-通过 9-驳回
     WAIT_REVIEW(1,"待审核"),
     REVIEW_PASS(2,"审核通过"),
-    ENABLE(3, "启用"),
-    REVIEW_REFUSE(9,"审核驳回"),
-    DISABLE(10, "停用");
+    REVIEW_REFUSE(9,"审核驳回");
 
 
     @EnumValue

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

@@ -20,6 +20,6 @@ public class ListActiveReq extends PageReq implements Serializable {
     @ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
     private Integer activeType;
 
-    @ApiModelProperty(value = "活动状态 1-待审核 2-通过 3-启用 9-驳回 10-停用")
+    @ApiModelProperty(value = "活动状态 1-待审核 2-通过 9-驳回")
     private Integer auditStatus;
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListActiveRes.java

@@ -43,7 +43,7 @@ public class ListActiveRes extends PageResp implements Serializable {
         @ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
         private Integer activeType;
 
-        @ApiModelProperty(value = "活动状态 1-待审核 2-通过 3-启用 9-驳回 10-停用")
+        @ApiModelProperty(value = "活动状态 1-待审核 2-通过 9-驳回")
         private Integer auditStatus;
 
         @ApiModelProperty(value = "申请时间")
@@ -64,5 +64,8 @@ public class ListActiveRes extends PageResp implements Serializable {
         @ApiModelProperty(value = "活动域名")
         private String activeUrl;
 
+        @ApiModelProperty(value = "是否有效")
+        private Integer valid;
+
     }
 }

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

@@ -144,16 +144,6 @@ public class ActiveServiceImpl implements ActiveService {
         //分页查询
         IPage<BaseActive> iPage = baseActiveMapper.listActivePage(PageUtil.createPage(req), req);
         List<BaseActive> activeList = iPage.getRecords();
-        //活动状态作处理  1-待审核 2-通过 3-启用 9-驳回 10-停用
-        activeList.forEach(active -> {
-            if(ActiveAuditStatusEnum.REVIEW_PASS.is(active.getAuditStatus())){
-                if(ValidEnum.VALID.is(active.getValid())){
-                    active.setAuditStatus(ActiveAuditStatusEnum.ENABLE.getCode());
-                }else{
-                    active.setAuditStatus(ActiveAuditStatusEnum.DISABLE.getCode());
-                }
-            }
-        });
         //封装出参
         ListActiveRes res = new ListActiveRes();
         //放入分页信息

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

@@ -89,9 +89,11 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
             throw new BusinessException("非ABI用户必须选择供应商");
         }
         //查询供应商
+        Integer factoryType = null;
         if(req.getFactoryId()!=null){
             BaseFactory factory = baseFactoryMapper.selectById(req.getFactoryId());
             AssertUtil.isNull(factory,"供应商不存在");
+            factoryType = factory.getFactoryType();
         }
 
         //操作人
@@ -105,6 +107,8 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
         userInfo.setPassword(req.getPassword());
         userInfo.setIsAbi(req.getIsAbi());
         userInfo.setFactoryId(req.getFactoryId());
+        //添加用户供应商类型的标志
+        userInfo.setFactoryType(factoryType);
         userInfo.setRoleCode(req.getRoleCode());
         userInfo.setPhone(req.getPhone());
         userInfoMapper.insert(userInfo);
@@ -143,7 +147,15 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
         //1-修改主表
         userInfo.setEmail(req.getEmail());
         userInfo.setPhone(req.getPhone());
-        userInfo.setFactoryId(req.getFactoryId());
+        //校验供应商
+        if(Objects.nonNull(req.getFactoryId())) {
+            if(!userInfo.getFactoryId().equals(req.getFactoryId())) {
+                BaseFactory factory = baseFactoryMapper.selectById(req.getFactoryId());
+                AssertUtil.isNull(factory,"供应商不存在");
+                userInfo.setFactoryId(req.getFactoryId());
+                userInfo.setFactoryType(factory.getFactoryType());
+            }
+        }
         userInfo.setRoleCode(req.getRoleCode());
         userInfoMapper.updateById(userInfo);
 

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

@@ -44,12 +44,7 @@
                 AND active_type = #{param.activeType}
             </if>
             <if test="param.auditStatus != null ">
-                <if test="param.auditStatus == 1 or param.auditStatus == 2 or param.auditStatus == 9">
-                    AND audit_status = #{param.auditStatus}
-                </if>
-                <if test="param.auditStatus == 3 or param.auditStatus == 10">
-                    AND audit_status = 2 and valid = #{param.valid}
-                </if>
+                AND audit_status = #{param.auditStatus}
             </if>
         </where>
         order by apply_time