Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/mapper/AuditMapper.java

@@ -18,5 +18,5 @@ import java.util.List;
  */
 public interface AuditMapper extends BaseMapper<Audit> {
 
-    List<Audit> getUserList(Page<Audit> page, @Param("name") String name, @Param("status") Integer status);
+    List<Audit> getUserList(Page<Audit> page, @Param("name") String name, @Param("status") String status);
 }

src/main/java/cn/wisenergy/chnmuseum/party/mapper/TUserMapper.java

@@ -23,5 +23,5 @@ public interface TUserMapper extends BaseMapper<TUser> {
 
     TUser getById(String id);
 
-    List<TUser> getUserList(TUser user);
+    List<TUser> getUserList(@Param("user") TUser user);
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/AuditService.java

@@ -14,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface AuditService extends IService<Audit> {
 
-    Page<Audit> getUserList(Page<Audit> page, String name, Integer status);
+    Page<Audit> getUserList(Page<Audit> page, String name, String status);
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java

@@ -29,7 +29,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
     private AuditMapper auditMapper;
 
     @Override
-    public Page<Audit> getUserList(Page<Audit> page, String name, Integer status) {
+    public Page<Audit> getUserList(Page<Audit> page, String name, String status) {
         return page.setRecords(auditMapper.getUserList(page,name,status));
     }
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TUserServiceImpl.java

 package cn.wisenergy.chnmuseum.party.service.impl;
 
+import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum;
+import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
 import cn.wisenergy.chnmuseum.party.mapper.TAreaMapper;
 import cn.wisenergy.chnmuseum.party.model.TUser;
 import cn.wisenergy.chnmuseum.party.mapper.TUserMapper;
@@ -43,8 +45,8 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
     public Page<TUser> getList(Page<TUser> page, TUser user) {
         List<TUser> list = tUserMapper.getList(page,user);
         for (TUser u : list) {
-            if ("2".equals(u.getAuditStatus())||"4".equals(u.getAuditStatus())){
-                if ("1".equals(u.getStatus())){
+            if (AuditStatusEnum.REFUSED.name().equals(u.getAuditStatus())||AuditStatusEnum.APPROVED_FINAL.name().equals(u.getAuditStatus())){
+                if (AuditOperationEnum.UNABLE.name().equals(u.getStatus())){
                     u.setStatusName("活跃");
                 }else {
                     u.setStatusName("禁用");

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java

@@ -53,9 +53,9 @@ public class AuditController extends BaseController {
             @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "status", value = "1待初审 2 驳回 3 待复审 4通过", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "status", value = "待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过APPROVED_FINAL", paramType = "query", dataType = "String")
     })
-    public Map<String, Object> getUserList(String name, Integer status) {
+    public Map<String, Object> getUserList(String name, String status) {
         Page<Audit> auditList;
         try {
             auditList = auditService.getUserList(getPage(), name, status);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -70,6 +70,9 @@ public class ChinaMobileRestApiController extends BaseController {
     @Resource
     private TAreaServiceImpl areaService;
 
+    @Resource
+    private AssetServiceImpl assetService;
+
     @Resource
     private TBoxOperationServiceImpl boxOperationService;
 
@@ -94,9 +97,6 @@ public class ChinaMobileRestApiController extends BaseController {
     @Resource
     private LearningContentBoardService learningContentBoardService;
 
-    @Resource
-    private AssetService assetService;
-
     private static final String SHIRO_JWT_TOKEN = "shiro:jwt:token:";
     //用户登录次数计数  redisKey 前缀
     private static final String SHIRO_LOGIN_COUNT = "shiro_login_count_";
@@ -397,7 +397,7 @@ public class ChinaMobileRestApiController extends BaseController {
             @ApiImplicitParam(name = "startDate", value = "创建时间-开始", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "endDate", value = "创建时间-结束", paramType = "query", dataType = "String")
     })
-    @PostMapping("/exhibitionBoard/getPage")
+    @PostMapping("/getPageList")
     @RequiresPermissions("exhibition:board:page")
     @ApiOperation(value = "获取展板分页列表", notes = "获取展板分页列表")
     public Map<String, Object> getExhibitionBoardPageList(GenericPageParam genericPageParam) {

src/main/resources/mapper/AuditMapper.xml

@@ -32,7 +32,7 @@
         <if test="name != null and name != ''">
             and (u.user_name LIKE concat('%', #{name}, '%') or a.audit_content LIKE concat('%', #{name}, '%'))
         </if>
-        <if test="status != null">
+        <if test="status != null and name != ''">
             and a.status = #{status}
         </if>
         and a.is_deleted = false

src/main/resources/mapper/TUserMapper.xml

@@ -105,7 +105,7 @@
             and u.status = #{user.status}
         </if>
         <if test=" user.auditStatus != null and user.auditStatus != '' ">
-            and (u.audit_status = "1" or u.audit_status = "3")
+            and u.audit_status LIKE "TBC%"
         </if>
         <if test=" user.type != null and user.type != '' ">
             and u.type = #{user.type}