Skip to content

C
chnmuseum-party
Commit 58a5a42c authored by liqin's avatar liqin 💬
Browse files
Options

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

parents c026d943 7a515b90
Show whitespace changes
Inline Side-by-side
Showing with 156 additions and 52 deletions
src/main/java/cn/chnmuseum/party/model/Audit.java
View file @ 58a5a42c
......@@ -99,6 +99,10 @@ public class Audit implements Serializable {
@TableField("model_data")
private String modelData;
@ApiModelProperty("审核人员")
@TableField(value = "audit_id")
private String auditId;
@ApiModelProperty("机构名")
@TableField(exist = false)
private String orgName;
......@@ -111,4 +115,16 @@ public class Audit implements Serializable {
@TableField(exist = false)
private String name;
@ApiModelProperty("审核人名")
@TableField(exist = false)
private String auditName;
@TableField(exist = false)
private Boolean one;
@TableField(exist = false)
private Boolean two;
}
src/main/java/cn/chnmuseum/party/service/AuditService.java
View file @ 58a5a42c
......@@ -28,9 +28,10 @@ public interface AuditService extends IService<Audit> {
* @param auditStatusLevel
* @param type
* @param page
* @param id
* @return
*/
Page<Audit> pageList(String name, AuditStatusEnum status, AuditStatusEnum auditStatusLevel, AuditTypeEnum type, Page<Object> page);
Page<Audit> pageList(String name, AuditStatusEnum status, AuditStatusEnum auditStatusLevel, AuditTypeEnum type, Page<Object> page, String id);
/**
* 根据id更新审核信息
......
src/main/java/cn/chnmuseum/party/service/impl/AuditServiceImpl.java
View file @ 58a5a42c
......@@ -23,6 +23,7 @@ import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Collectors;
/**
......@@ -73,23 +74,39 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
* 分页查询
*/
@Override
public Page<Audit> pageList(String name, AuditStatusEnum status, AuditStatusEnum auditStatusLevel, AuditTypeEnum type, Page<Object> page) {
public Page<Audit> pageList(String name, AuditStatusEnum status, AuditStatusEnum auditStatusLevel, AuditTypeEnum type, Page<Object> page, String id) {
//分页
Page<Audit> auditPage = new Page<>();
auditPage.setCurrent(page.getCurrent());
auditPage.setSize(page.getSize());
//条件
QueryWrapper<Audit> ew = new QueryWrapper<Audit>()
//暂时注掉
.eq("a.level", auditStatusLevel.name())
.eq("a.type", type.name())
.eq("b.is_deleted", 0)
.eq("c.is_deleted", 0)
.orderByDesc("a.create_time", "a.id");
//
QueryWrapper<Audit> ew = new QueryWrapper<Audit>();
if (null != auditStatusLevel) {
ew.eq("a.level", auditStatusLevel.name());
}
if (StringUtils.isNotBlank(name)) {
ew.and(i -> i.like("b.name", name).or().like("c.user_name", name));
}
if (status != null) {
ew.eq(status != null, "a.status", status.name());
}
//暂时注掉
ew.eq("a.type", type.name())
.or(new Consumer<QueryWrapper<Audit>>() {
@Override
public void accept(QueryWrapper<Audit> auditQueryWrapper) {
auditQueryWrapper.eq("audit_id", id).eq("a.type", type.name());
if (StringUtils.isNotBlank(name)) {
auditQueryWrapper.and(i -> i.like("b.name", name).or().like("c.user_name", name));
}
if (status != null) {
auditQueryWrapper.eq(status != null, "a.status", status.name());
}
}
})
.orderByDesc("a.create_time", "a.id");
//
return pageByType(ew, name, type, auditPage);
}
......@@ -98,9 +115,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
*/
private Page<Audit> pageByType(QueryWrapper<Audit> ew, String name, AuditTypeEnum type, Page<Audit> auditPage) {
Page<Audit> selectPage = null;
if (StringUtils.isNotBlank(name)) {
ew.and(i -> i.like("b.name", name).or().like("c.user_name", name));
}
switch (type) {
case LEARNING_CONTENT:
selectPage = auditMapper.getLearningContentPage(auditPage, ew);
......
src/main/java/cn/chnmuseum/party/web/controller/AuditController.java
View file @ 58a5a42c
......@@ -65,6 +65,8 @@ public class AuditController extends BaseController {
@MethodLog(operModule = OperModule.RECHECK, operType = OperType.SELECT)
public Map<String, Object> getUserList(String name, String status, String level) {
Page<Audit> auditList;
Boolean one = true;
Boolean two = true;
try {
TUser user1 = getcurUser();
TUser user = new TUser();
......@@ -78,15 +80,30 @@ public class AuditController extends BaseController {
user.setAuditStatus(level);
}
//如果是账号禁用初审员，设置层级为初审
if (!user1.getRoleList().contains("1")) {
if (user1.getRoleList().contains("15")) {
user.setAuditStatus(AuditStatusEnum.TBC.name());
one = true;
if (user.getRoleList().contains("16")) {
two = true;
}
} else if (user1.getRoleList().contains("16")) {
user.setAuditStatus(AuditStatusEnum.TBCA.name());
two = true;
if (user.getRoleList().contains("15")) {
one = true;
}
} else {
//不存在的层级
user.setAuditStatus("1");
}
}
user.setId(user1.getId());
auditList = auditService.getUserList(getPage(), user);
for (Audit record : auditList.getRecords()) {
record.setOne(one);
record.setTwo(two);
}
return getResult(auditList);
} catch (Exception e) {
e.printStackTrace();
......@@ -99,6 +116,8 @@ public class AuditController extends BaseController {
@ApiOperation(value = "修改禁用审核信息", notes = "修改禁用审核信息")
@MethodLog(operModule = OperModule.RECHECK, operType = OperType.AUDIT)
public Map<String, Object> updateAudit(@RequestBody @Validated(value = {Update.class}) Audit audit) {
TUser tUser = getcurUser();
audit.setAuditId(tUser.getId());
boolean flag;
//如果层级是初审，设置初审时间
if (AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
......@@ -225,43 +244,79 @@ public class AuditController extends BaseController {
AuditStatusEnum auditStatus = null;
AuditStatusEnum auditStatusLevel = null;
AuditTypeEnum auditTypeEnum = AuditTypeEnum.valueOf(type);
Boolean one = true;
Boolean two = true;
//数据权限，暂时注释
TUser user = getcurUser();
switch (auditTypeEnum){
if (!user.getRoleList().contains("1")) {
one = false;
two = false;
switch (auditTypeEnum) {
case VIDEO_CONTENT:
if (user.getRoleList().contains("9")){
auditStatusLevel=AuditStatusEnum.TBC;
}else if(user.getRoleList().contains("10")) {
auditStatusLevel=AuditStatusEnum.TBCA;
}else {
auditStatusLevel=AuditStatusEnum.APPROVED_FINAL;
if (user.getRoleList().contains("9")) {
auditStatusLevel = AuditStatusEnum.TBC;
one = true;
if (user.getRoleList().contains("10")) {
two = true;
}
} else if (user.getRoleList().contains("10")) {
auditStatusLevel = AuditStatusEnum.TBCA;
two = true;
auditStatusLevel = AuditStatusEnum.TBC;
if (user.getRoleList().contains("9")) {
one = true;
}
} else {
auditStatusLevel = AuditStatusEnum.APPROVED_FINAL;
}
break;
case EXHIBITION_BOARD:
if (user.getRoleList().contains("11")){
auditStatusLevel=AuditStatusEnum.TBC;
}else if(user.getRoleList().contains("12")) {
auditStatusLevel=AuditStatusEnum.TBCA;
}else {
auditStatusLevel=AuditStatusEnum.APPROVED_FINAL;
if (user.getRoleList().contains("11")) {
auditStatusLevel = AuditStatusEnum.TBC;
one = true;
if (user.getRoleList().contains("12")) {
two = true;
}
} else if (user.getRoleList().contains("12")) {
auditStatusLevel = AuditStatusEnum.TBCA;
two = true;
auditStatusLevel = AuditStatusEnum.TBC;
if (user.getRoleList().contains("11")) {
one = true;
}
} else {
auditStatusLevel = AuditStatusEnum.APPROVED_FINAL;
}
break;
case LEARNING_CONTENT:
if (user.getRoleList().contains("13")){
auditStatusLevel=AuditStatusEnum.TBC;
}else if(user.getRoleList().contains("14")) {
auditStatusLevel=AuditStatusEnum.TBCA;
}else {
auditStatusLevel=AuditStatusEnum.APPROVED_FINAL;
if (user.getRoleList().contains("13")) {
auditStatusLevel = AuditStatusEnum.TBC;
one = true;
if (user.getRoleList().contains("14")) {
two = true;
}
} else if (user.getRoleList().contains("14")) {
auditStatusLevel = AuditStatusEnum.TBCA;
two = true;
auditStatusLevel = AuditStatusEnum.TBC;
if (user.getRoleList().contains("13")) {
one = true;
}
} else {
auditStatusLevel = AuditStatusEnum.APPROVED_FINAL;
}
break;
}
}
if (StringUtils.isNotBlank(status)) {
auditStatus = AuditStatusEnum.valueOf(status);
}
try {
Page<Audit> auditList = auditService.pageList(name, auditStatus, auditStatusLevel, auditTypeEnum, getPage());
Page<Audit> auditList = auditService.pageList(name, auditStatus, auditStatusLevel, auditTypeEnum, getPage(), user.getId());
for (Audit record : auditList.getRecords()) {
record.setOne(one);
record.setTwo(two);
}
return getResult(auditList);
} catch (Exception e) {
e.printStackTrace();
......@@ -279,6 +334,8 @@ public class AuditController extends BaseController {
if (audit == null) {
return getFailResult("id参数有误");
}
TUser tUser = getcurUser();
audit.setAuditId(tUser.getId());
//设置修改的审核状态
audit.setStatus(auditStatusParam.getStatus());
//为啥数据库有null值
......
src/main/resources/mapper/AuditMapper.xml
View file @ 58a5a42c
......@@ -19,6 +19,7 @@
<result column="second_remarks" property="secondRemarks"/>
<result column="level" property="level"/>
<result column="model_data" property="modelData"/>
<result column="audit_id" property="auditId"/>
</resultMap>
<select id="getUserList" resultMap="BaseResultMap">
......@@ -26,7 +27,7 @@
from t_audit a
left join t_organ o on o.id = a.organ_id
left join t_user u on u.id = a.user_id
where 1 = 1
where (1 = 1
<if test="user.userName != null and user.userName != ''">
and (u.user_name LIKE concat('%', #{user.userName}, '%') or a.content LIKE concat('%', #{user.userName},
'%'))
......@@ -41,7 +42,22 @@
and o.code LIKE concat(#{user.orgCode}, '%')
</if>
and a.type = 'ACCOUNT'
and a.operation = 'DISABLE'
and a.operation = 'DISABLE')
<if test="user.id != null and user.id != ''">
or (a.audit_id = #{user.id}
<if test="user.userName != null and user.userName != ''">
and (u.user_name LIKE concat('%', #{user.userName}, '%') or a.content LIKE concat('%', #{user.userName},
'%'))
</if>
<if test="user.status != null and user.status != ''">
and a.status = #{user.status}
</if>
<if test="user.orgCode != null and user.orgCode != ''">
and o.code LIKE concat(#{user.orgCode}, '%')
</if>
and a.type = 'ACCOUNT'
and a.operation = 'DISABLE')
</if>
order by a.create_time desc
</select>
......
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