Commit 58a5a42c authored by liqin's avatar liqin 💬

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

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