Commit 787a86df authored by liqin's avatar liqin 💬

bug fixed

parent fddc9af2
...@@ -5,15 +5,11 @@ import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum; ...@@ -5,15 +5,11 @@ import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
import cn.wisenergy.chnmuseum.party.common.enums.AuditTypeEnum; import cn.wisenergy.chnmuseum.party.common.enums.AuditTypeEnum;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update; import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import cn.wisenergy.chnmuseum.party.common.vo.AuditStatusParam; import cn.wisenergy.chnmuseum.party.common.vo.AuditStatusParam;
import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
import cn.wisenergy.chnmuseum.party.model.Audit; import cn.wisenergy.chnmuseum.party.model.Audit;
import cn.wisenergy.chnmuseum.party.model.TUser; import cn.wisenergy.chnmuseum.party.model.TUser;
import cn.wisenergy.chnmuseum.party.service.AuditService;
import cn.wisenergy.chnmuseum.party.service.impl.AuditServiceImpl; import cn.wisenergy.chnmuseum.party.service.impl.AuditServiceImpl;
import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl; import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController; import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -29,7 +25,6 @@ import javax.annotation.Resource; ...@@ -29,7 +25,6 @@ import javax.annotation.Resource;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -79,11 +74,11 @@ public class AuditController extends BaseController { ...@@ -79,11 +74,11 @@ public class AuditController extends BaseController {
user.setAuditStatus(level); user.setAuditStatus(level);
} }
//如果是账号禁用初审员,设置层级为初审 //如果是账号禁用初审员,设置层级为初审
if (user1.getRoleList().contains("15")){ if (user1.getRoleList().contains("15")) {
user.setAuditStatus(AuditStatusEnum.TBC.name()); user.setAuditStatus(AuditStatusEnum.TBC.name());
}else if (user1.getRoleList().contains("16")){ } else if (user1.getRoleList().contains("16")) {
user.setAuditStatus(AuditStatusEnum.TBCA.name()); user.setAuditStatus(AuditStatusEnum.TBCA.name());
}else { } else {
//不存在的层级 //不存在的层级
user.setAuditStatus("1"); user.setAuditStatus("1");
} }
...@@ -211,7 +206,7 @@ public class AuditController extends BaseController { ...@@ -211,7 +206,7 @@ public class AuditController extends BaseController {
try { try {
Audit audit = null; Audit audit = null;
//只获取最新的一条审核数据 //只获取最新的一条审核数据
audit = auditService.selectOne(id,type); audit = auditService.selectOne(id, type);
resultMap.put("resultCode", "200"); resultMap.put("resultCode", "200");
resultMap.put("message", "操作成功"); resultMap.put("message", "操作成功");
resultMap.put("data", audit); resultMap.put("data", audit);
...@@ -232,7 +227,7 @@ public class AuditController extends BaseController { ...@@ -232,7 +227,7 @@ public class AuditController extends BaseController {
@ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"), @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "status", value = "待初审:TBC, 驳回:REFUSED,待复审:TBCA, 通过:APPROVED_FINAL", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "status", value = "待初审:TBC, 驳回:REFUSED,待复审:TBCA, 通过:APPROVED_FINAL", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "type", value = "视频内容:ASSET,展板内容:EXHIBITION_BOARD,学习内容:LEARNING_CONTENT", paramType = "query", dataType = "String", required = true) @ApiImplicitParam(name = "type", value = "视频内容:VIDEO_CONTENT,展板内容:EXHIBITION_BOARD,学习内容:LEARNING_CONTENT", paramType = "query", dataType = "String", allowableValues = "VIDEO_CONTENT,EXHIBITION_BOARD,LEARNING_CONTENT,ACCOUNT", required = true)
}) })
public Map<String, Object> getPageAllList(String name, String status, public Map<String, Object> getPageAllList(String name, String status,
@NotBlank(message = "type参数不能为空") String type) { @NotBlank(message = "type参数不能为空") String type) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment