Skip to content

M
map-parent
Commit 265e74d0 by Guojunfeng
Options

网合平台bug修复及细节补充

parent de9af2cb
Showing with 558 additions and 21 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDto.java
......@@ -32,6 +32,7 @@ public class ApproveDto extends BaseDto {
* 6：其他协查任务发送审批
* 7：移交审批
* 8：退回审批
* 9：取消分享
*/
@ApiModelProperty(value = "审批类型")
private String auditType;
......@@ -95,6 +96,9 @@ public class ApproveDto extends BaseDto {
@ApiModelProperty(value = "审核人类型（表示当前节点审核时审核人的类型）")
private String auditUserType;
@ApiModelProperty(value = "专项编号")
private String zxbh;
@ApiModelProperty(value = "专项名称")
private String zxmc;
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxLog.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author Godffy
* @create 2023-07-12 16:34
*/
@Data
@TableName("tb_wh_zczx_log")
@ApiModel(value = "侦查专项日志(tb_wh_zczx_log)表实体类", description = "")
public class ZczxLog extends Model<ZczxLog> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "主键编号")
private String id;
@ApiModelProperty(value = "侦查专项编号")
private String zxbh;
@ApiModelProperty(value = "用户名(警号)")
private String userid;
@ApiModelProperty(value = "请求类型")
private String operation;
@ApiModelProperty(value = "ip")
private String ip;
@ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createtime;
@ApiModelProperty(value = "用户操作")
private String message;
@ApiModelProperty(value = "姓名")
private String truename;
@ApiModelProperty(value = "单位代码")
private String unitcode;
@ApiModelProperty(value = "单位名称")
private String unitname;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxLogDto.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.founder.commonutils.model.BaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author Godffy
* @create 2023-07-12 16:47
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ZczxLogDto extends BaseDto {
@ApiModelProperty(value = "侦查专项编号")
private String zxbh;
@ApiModelProperty(value = "用户名")
private String userid;
@ApiModelProperty(value = "ip")
private String ip;
@ApiModelProperty(value = "请求类型")
private String operation;
@ApiModelProperty(value = "用户操作")
private String message;
@ApiModelProperty(value = "姓名")
private String truename;
@ApiModelProperty(value = "单位代码")
private String unitcode;
@ApiModelProperty(value = "单位名称")
private String unitname;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRole.java
package com.founder.commonutils.model.zczxEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
......@@ -91,4 +92,20 @@ public class ZczxRole extends Model<ZczxRole> {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
@ApiModelProperty(value = "审批表主键")
@TableField(exist = false)
private String approveId;
@ApiModelProperty(value = "审批类型")
@TableField(exist = false)
private String auditType;
@ApiModelProperty(value = "审批状态")
@TableField(exist = false)
private String auditStatus;
@ApiModelProperty(value = "处于取消分享的待审批状态")
@TableField(exist = false)
private String isCanselShareApprove;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRoleDto.java
package com.founder.commonutils.model.zczxEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.founder.commonutils.model.BaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -17,7 +15,6 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
public class ZczxRoleDto extends BaseDto {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "侦查专项角色主键")
private String id;
......@@ -50,6 +47,9 @@ public class ZczxRoleDto extends BaseDto {
@ApiModelProperty(value = "侦查专项_收藏状态")
private String zczxSczt;
@ApiModelProperty(value = "侦查专项_分享状态")
private String zczxFxzt;
@ApiModelProperty(value = "机构代码")
private String unitcode;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ApproveController.java
......@@ -14,10 +14,12 @@ import com.founder.commonutils.model.zczxEntity.ApproveDto;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.service.ApproveDetailService;
import com.founder.publicapi.service.ApproveService;
import com.founder.publicapi.service.ZczxRoleService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
......@@ -43,6 +45,9 @@ public class ApproveController extends ApiController {
@Resource
private ApproveDetailService approveDetailService;
@Resource
private ZczxRoleService zczxRoleService;
/**
* 审批类型（表明此条记录的审批类型，如流转审批、分享审批）
* 1：协查任务审批
......@@ -105,9 +110,9 @@ public class ApproveController extends ApiController {
/**
* 拥有一级审批角色的用户才可以看到该列表及进行操作
* 前端已限制可视，接口可不判断
*
* <p>
* 只能看到发给自己的
*
* <p>
* 1、审批列表
* 2、待我审批
*
......@@ -131,7 +136,7 @@ public class ApproveController extends ApiController {
@PostMapping("sp")
@ApiOperation(value = "审批")
@OperLog(message = "审批", operation = OperationType.UPDATE)
public MapRestResult sp(@RequestBody ApproveDto approveDto){
public MapRestResult sp(@RequestBody ApproveDto approveDto) {
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
......@@ -143,12 +148,16 @@ public class ApproveController extends ApiController {
String unitname = user.getUnitname();
//前端传审批申请单id(id),业务编号(flowNo)和审批业务类型(auditType)对应审批主表记录和审批明细表节点
Approve approve = new Approve();//审批主表
BeanUtil.copyProperties(approveDto,approve);
// BeanUtil.copyProperties(approveDto, approve);
approve.setId(approveDto.getId());//主键
approve.setAuditStatus(approveDto.getAuditStatus());//审批状态
// approve.setAuditOpinion(approveDto.getAuditOpinion());//审批意见
// approve.setAuditRemark(approveDto.getAuditRemark());//审批备注
approve.setGxr(trueName);
approve.setGxrjh(policemanid);
approve.setGxrdwdm(unitcode);
approve.setGxrdwmc(unitname);
//更新审批主表信息
//更新审批主表信息2
approveService.updateById(approve);
ApproveDetail approveDetail = new ApproveDetail();//审批明细
......@@ -163,9 +172,17 @@ public class ApproveController extends ApiController {
approveDetail.setAuditStatus(approveDto.getAuditStatus());//审批状态
UpdateWrapper<ApproveDetail> updateWrapper = new UpdateWrapper<>();
//假设有多个审批节点，审批明细表中的audit_id 和 audit_user_id 对应一个节点,审批节点由不同的审批人进行审批
updateWrapper.eq("audit_user_id",policemanid);//审批人警号
updateWrapper.eq("audit_id",approveDto.getId());//审批主键id
approveDetailService.update(approveDetail,updateWrapper);
updateWrapper.eq("audit_user_id", policemanid);//审批人警号
updateWrapper.eq("audit_id", approveDto.getId());//审批主键id
approveDetailService.update(approveDetail, updateWrapper);
//如果审批类型是“侦查专项取消分享审批” 且 审批状态是“审批通过”,去侦查专项角色表把对应的分享数据删掉
String auditType = approveDto.getAuditType();//审批类型
String auditStatus = approveDto.getAuditStatus();//审批状态
if (StringUtils.isNotBlank(auditType) && auditType.equals("9") && StringUtils.isNotBlank(auditStatus) && auditStatus.equals("2")) {
String flowNo = approveDto.getFlowNo();//审批编号(连接具体业务表的数据主键)
zczxRoleService.removeById(flowNo);
}
return new MapRestResult();
}
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java
package com.founder.publicapi.controller.ZczxService;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -123,7 +124,7 @@ public class ZczxController extends ApiController {
public MapRestResult selectZczxById(@RequestBody ZczxDto zczxDto) {
String zxbh = zczxDto.getZxbh();
if (StringUtils.isBlank(zxbh)) {
return new MapRestResult(200, "专项编号不能为空", null);
return new MapRestResult(201, "专项编号不能为空", null);
}
Zczx zczx = zczxService.getById(zxbh);
return new MapRestResult(200, "查询成功!", zczx);
......@@ -139,7 +140,7 @@ public class ZczxController extends ApiController {
@OperLog(message = "侦查专项分享", operation = OperationType.UPDATE)
@Transactional
public MapRestResult share(@RequestBody ZczxDto zczxDto) {
//分享给某单位时，提供一个接口告诉前端哪些单位分享过，分享过的灰色不能选中，不要重复插入
//分享给某单位时，提供一个接口告诉前端哪些单位分享过，分享过的灰色不能选中，不要重复插入(包括未审批的)
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
......@@ -198,8 +199,129 @@ public class ZczxController extends ApiController {
approveDetail.setAuditUserType(zczxDto.getAuditUserType());//目前为特指某人
approveDetailService.save(approveDetail);
return new MapRestResult();
}
//侦查专项取消分享，先往审批表插入一条取消分享的审批信息，如果审批通过，在审批接口里判断类型并进行角色删除操作
@PostMapping("cancelShare")
@ApiOperation(value = "侦查专项取消分享")
@OperLog(message = "侦查专项取消分享", operation = OperationType.ADD)
@Transactional
public MapRestResult cancelShare(@RequestBody ApproveDto approveDto) {
// //看一下数据库是否已经有这条数据。如果取消分享的审批数据已经发送给领导，控制一下不能重复发送取消分享审批
//审批状态：1 待审批
//审批类型：9 取消分享
//必传流水号
// if (StringUtils.isNotBlank(approveDto.getAuditType()))
QueryWrapper<Approve> qw = new QueryWrapper<>();
qw.eq(StringUtils.isNotBlank(approveDto.getFlowNo()), "flow_no", approveDto.getFlowNo());
qw.eq("audit_type", "9");
qw.eq("audit_status", "1");
Approve one = approveService.getOne(qw);
if (one != null) {
return new MapRestResult(201,"该单位的取消分享已处于待审批状态，不能重复取消分享!",null);
}
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String trueName = user.getTrueName();
String policemanid = user.getPolicemanid();
String unitcode = user.getUnitcode();
String unitname = user.getUnitname();
Approve approve = new Approve();
String approveNo = KeyUtil.getUUIDKey("A");
approve.setId(approveNo);//审批主表主键
approve.setFlowNo(approveDto.getFlowNo());//连接专项角色表主键
approve.setAuditType("9");//审批类型,9:侦查专项取消分享审批
approve.setLrr(trueName);
approve.setLrrjh(policemanid);
approve.setLrrdwdm(unitcode);
approve.setLrrdwmc(unitname);
approve.setRksj(new Date());
approve.setTotalPoint(approveDto.getTotalPoint());//总审核节点（表明此审核业务的总共审核节点数）
approve.setNowPoint(approveDto.getNowPoint());//当前所在审核节点（表明此审核业务当前所处的节点）
approve.setZxbh(approveDto.getZxbh());//专项编号
approve.setZxmc(approveDto.getZxmc());//专项名称
approve.setAuditName(approveDto.getAuditName());//分享申请单名称
//存审批主表信息
approveService.save(approve);
ApproveDetail approveDetail = new ApproveDetail();
String approveDetailNo = KeyUtil.getUUIDKey("AD");
approveDetail.setId(approveDetailNo);//审批明细表主键
approveDetail.setAuditId(approveNo);//连接审批主表主键
approveDetail.setAuditUserId(approveDto.getAuditUserId());//由谁审批
approveDetail.setAuditUserName(trueName);//审批人
approveDetail.setLrr(trueName);
approveDetail.setLrrjh(policemanid);
approveDetail.setLrrdwdm(unitcode);
approveDetail.setLrrdwmc(unitname);
approveDetail.setRksj(new Date());
approveDetail.setNowPoint(approveDto.getNowPoint());//当前所在审核节点（表明此审核业务当前所处的节点）
approveDetail.setAuditUserType(approveDto.getAuditUserType());//目前为特指某人
approveDetailService.save(approveDetail);
return new MapRestResult();
}
//收藏侦查专项
//专项编码、警号、侦查专项收藏状态
@PostMapping("favorite")
@ApiOperation(value = "收藏")
@OperLog(message = "收藏", operation = OperationType.ADD)
public MapRestResult favorite(@RequestBody ZczxDto zczxDto) {
String zxbh = zczxDto.getZxbh();
//侦查专项编码、警号、收藏状态必传
if (StringUtils.isBlank(zxbh)) {
return new MapRestResult(201, "专项编号不能为空", null);
}
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String policemanid = user.getPolicemanid();
ZczxRole zczxRole = new ZczxRole();
zczxRole.setId(KeyUtil.getUUIDKey("ZXR"));
zczxRole.setZxbh(zxbh);
zczxRole.setPolicemanid(policemanid);
zczxRole.setZczxSczt("1");
this.zczxRoleService.save(zczxRole);
return new MapRestResult();
}
//取消收藏侦查专项
//1.直接拿侦查专项列表中的专项编码和当前登录人的警号，去删除侦查专项角色表数据（侦查专项编码、警号、收藏状态为1）
@PostMapping("cancelFavorite")
@ApiOperation(value = "取消收藏")
@OperLog(message = "取消收藏", operation = OperationType.DELETE)
public MapRestResult cancelFavorite(@RequestBody ZczxDto zczxDto) {
String zxbh = zczxDto.getZxbh();
//侦查专项编码、警号、收藏状态必传
if (StringUtils.isBlank(zxbh)) {
return new MapRestResult(201, "专项编号不能为空", null);
}
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String policemanid = user.getPolicemanid();
QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
// 按专项编号查询
qw.eq("zxbh", zxbh);
// 按警号查询
qw.eq("policemanid", policemanid);
// 查收藏状态为“1”的数据
qw.eq("zczx_sczt", "1");
this.zczxRoleService.remove(qw);
return new MapRestResult();
}
}
}
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxLogController.java 0 → 100644
package com.founder.publicapi.controller.ZczxService;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.model.PageSimpleVO;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.commonutils.model.zczxEntity.ZczxLog;
import com.founder.commonutils.model.zczxEntity.ZczxLogDto;
import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.util.NetworkUtil;
import com.founder.publicapi.service.ZczxLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
/**
* @author Godffy
* @create 2023-07-12 16:32
*/
@CrossOrigin
@RestController
@RequestMapping("/zczxLog")
@Api(tags = "侦查专项日志")
public class ZczxLogController extends ApiController {
@Resource
private ZczxLogService zczxLogService;
@PostMapping("save")
@ApiOperation(value = "保存用户操作侦查专项的日志")
public MapRestResult save(@RequestBody ZczxLogDto zczxLogDto) {
ZczxLog zczxLog = new ZczxLog();
BeanUtil.copyProperties(zczxLogDto, zczxLog);
String uuidKey = KeyUtil.getUUIDKey("ZXRZ");
zczxLog.setId(uuidKey);
zczxLog.setCreatetime(new Date());//创建时间
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String trueName = user.getTrueName();
String username = user.getUsername();
String unitcode = user.getUnitcode();
String unitname = user.getUnitname();
zczxLog.setTruename(trueName);//姓名
zczxLog.setUserid(username);//用户名
zczxLog.setUnitcode(unitcode);//创建人单位代码
zczxLog.setUnitname(unitname);//专项创建单位名称
zczxLog.setIp(NetworkUtil.getIpAddr(request));
//侦查专项编号，在警情和案件更新的情况下，是否变动？
zczxLogService.save(zczxLog);
return new MapRestResult();
}
@PostMapping("query")
@ApiOperation(value = "查询用户操作侦查专项的日志")
public MapRestResult query(@RequestBody ZczxLogDto zczxLogDto) {
//专项编号不能为空
if (StringUtils.isBlank(zczxLogDto.getZxbh())) {
return new MapRestResult<>(201, "专项编号不能为空", null);
}
QueryWrapper<ZczxLog> qw = new QueryWrapper<>();
//专项编号
qw.eq("zxbh",zczxLogDto.getZxbh());
//用户名（警号或单位代码）
qw.eq(StringUtils.isNotBlank(zczxLogDto.getUserid()),"userid",zczxLogDto.getUserid());
//请求类型
qw.eq(StringUtils.isNotBlank(zczxLogDto.getOperation()),"operation",zczxLogDto.getOperation());
//ip
qw.like(StringUtils.isNotBlank(zczxLogDto.getIp()),"ip",zczxLogDto.getIp());
// 按操作时间范围查询
qw.ge(null != zczxLogDto.getBeginTime(), "createtime", zczxLogDto.getBeginTime());
qw.le(null != zczxLogDto.getEndTime(), "createtime", zczxLogDto.getEndTime());
//按操作内容模糊查询
qw.like(StringUtils.isNotBlank(zczxLogDto.getMessage()),"message",zczxLogDto.getMessage());
//姓名
qw.like(StringUtils.isNotBlank(zczxLogDto.getTruename()),"truename",zczxLogDto.getTruename());
//单位代码
qw.like(StringUtils.isNotBlank(zczxLogDto.getUnitcode()),"unitcode",zczxLogDto.getUnitcode());
//单位名称
qw.like(StringUtils.isNotBlank(zczxLogDto.getUnitname()),"unitname",zczxLogDto.getUnitname());
qw.orderByDesc("createtime");//按操作时间降序
IPage page = new Page(zczxLogDto.getPageNum(), zczxLogDto.getPageSize());
IPage<ZczxLog> result = this.zczxLogService.page(page,qw);
PageSimpleVO pageSimpleVO = new PageSimpleVO<>(result.getCurrent(), result.getTotal(), result.getRecords());
return new MapRestResult(200, "分页查询成功!", pageSimpleVO.getTotal(), pageSimpleVO);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxRoleController.java
......@@ -2,6 +2,9 @@ package com.founder.publicapi.controller.ZczxService;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.model.PageSimpleVO;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.commonutils.model.zczxEntity.ZczxRole;
......@@ -149,7 +152,6 @@ public class ZczxRoleController {
return new MapRestResult();
}
//还没写!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//用途：
//1.该接口用于控制前端已分享的单位显示灰色不要重新分享。
//2.领导可以在侦查专项里直接控制其他人的参与状态。
......@@ -163,11 +165,37 @@ public class ZczxRoleController {
QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
// 按专项编号查询
qw.eq(StringUtils.isNotBlank(zczxRoleDto.getZxbh()), "ZXBH", zczxRoleDto.getZxbh());
// 按参与类型查询
// 按参与状态查询
qw.eq(StringUtils.isNotBlank(zczxRoleDto.getZczxCyzt()), "ZCZX_CYZT", zczxRoleDto.getZczxCyzt());
// 按查询
qw.eq(StringUtils.isNotBlank(zczxRoleDto.getZczxCyzt()), "ZCZX_CYZT", zczxRoleDto.getZczxCyzt());
return null;
// 按分享状态查询
qw.eq(StringUtils.isNotBlank(zczxRoleDto.getZczxFxzt()), "ZCZX_FXZT", zczxRoleDto.getZczxFxzt());
qw.orderByDesc("RKSJ");
List<ZczxRole> list = this.zczxRoleService.list(qw);
return new MapRestResult(200, "查询成功!", list.size(), list);
}
@PostMapping("listZczxRoleByType")
@ApiOperation(value = "根据类型查询侦查专项角色(分页)")
@OperLog(message = "根据类型查询侦查专项角色(分页)", operation = OperationType.QUERY)
public MapRestResult listZczxRoleByType(@RequestBody ZczxRoleDto zczxRoleDto) {
IPage page = new Page(zczxRoleDto.getPageNum(), zczxRoleDto.getPageSize());
IPage<ZczxRole> result = this.zczxRoleService.listZczxRoleByType(page,zczxRoleDto);
PageSimpleVO pageSimpleVO = new PageSimpleVO<>(result.getCurrent(), result.getTotal(), result.getRecords());
return new MapRestResult(200, "分页查询成功!", pageSimpleVO.getTotal(), pageSimpleVO);
// QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
// // 按专项编号查询
// qw.eq(StringUtils.isNotBlank(zczxRoleDto.getZxbh()), "ZXBH", zczxRoleDto.getZxbh());
// // 按参与状态查询
// qw.eq(StringUtils.isNotBlank(zczxRoleDto.getZczxCyzt()), "ZCZX_CYZT", zczxRoleDto.getZczxCyzt());
// // 按分享状态查询
// qw.eq(StringUtils.isNotBlank(zczxRoleDto.getZczxFxzt()), "ZCZX_FXZT", zczxRoleDto.getZczxFxzt());
// qw.orderByDesc("RKSJ");
// IPage page = new Page(zczxRoleDto.getPageNum(), zczxRoleDto.getPageSize());
// IPage<ZczxRole> result = this.zczxRoleService.page(page,qw);
// PageSimpleVO pageSimpleVO = new PageSimpleVO<>(result.getCurrent(), result.getTotal(), result.getRecords());
// return new MapRestResult(200, "分页查询成功!", pageSimpleVO.getTotal(), pageSimpleVO);
}
......@@ -186,5 +214,18 @@ public class ZczxRoleController {
// return new MapRestResult(200, "查询成功!", one);
// }
@GetMapping("getZczxRoleById")
@ApiOperation(value = "根据主键id查询专项角色信息")
@OperLog(message = "根据主键id查询专项角色信息", operation = OperationType.QUERY)
public MapRestResult getZczxRoleById(@RequestParam("id")String id){
if (StringUtils.isBlank(id)){
return new MapRestResult(201, "主键id不能为空!", null);
}
ZczxRole one = this.zczxRoleService.getById(id);
return new MapRestResult(200, "查询成功!", one);
}
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ZczxLogMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.zczxEntity.ZczxLog;
/**
* @author Godffy
* @create 2023-07-12 16:41
*/
public interface ZczxLogMapper extends BaseMapper<ZczxLog> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ZczxRoleMapper.java
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.founder.commonutils.model.zczxEntity.ZczxRole;
import com.founder.commonutils.model.zczxEntity.ZczxRoleDto;
/**
* @author Godffy
......@@ -9,4 +11,5 @@ import com.founder.commonutils.model.zczxEntity.ZczxRole;
*/
public interface ZczxRoleMapper extends BaseMapper<ZczxRole> {
IPage<ZczxRole> listZczxRoleByType(IPage page, ZczxRoleDto zczxRoleDto);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ApproveMapper.xml
......@@ -18,6 +18,7 @@
when wa.audit_type = '6' then '其他协查任务发送审批'
when wa.audit_type = '7' then '移交审批'
when wa.audit_type = '8' then '退回审批'
when wa.audit_type = '9' then '侦查专项取消分享审批'
end as auditTypeStr,
wa.audit_status,
case
......@@ -80,6 +81,6 @@
AND wa.rksj &lt;= #{approveDto.endTime}
</when>
</choose>
order by rksj desc
</select>
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxLogMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.founder.publicapi.mapper.mysqlMapper.ZczxLogMapper">
</mapper>
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxMapper.xml
......@@ -129,6 +129,7 @@
AND j.asjfssj_asjfskssj &lt;= #{zczxDto.asjfssjAsjfskssjJssj}
</when>
</choose>
order by z.zxcjsj desc
</select>
<select id="listZczxForPageByCyzt" resultType="com.founder.commonutils.model.zczxEntity.Zczx"
......@@ -268,6 +269,7 @@
AND j.asjfssj_asjfskssj &lt;= #{zczxDto.asjfssjAsjfskssjJssj}
</when>
</choose>
order by z.zxcjsj desc
</select>
<select id="listZczxForPageBySczt" resultType="com.founder.commonutils.model.zczxEntity.Zczx"
......@@ -407,6 +409,7 @@
AND j.asjfssj_asjfskssj &lt;= #{zczxDto.asjfssjAsjfskssjJssj}
</when>
</choose>
order by z.zxcjsj desc
</select>
<select id="listZczxForPageByCode" resultType="com.founder.commonutils.model.zczxEntity.Zczx"
......@@ -557,7 +560,7 @@
AND j.asjfssj_asjfskssj &lt;= #{zczxDto.asjfssjAsjfskssjJssj}
</when>
</choose>
order by z.zxcjsj desc
</select>
</mapper>
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxRoleMapper.xml
......@@ -2,4 +2,44 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.founder.publicapi.mapper.mysqlMapper.ZczxRoleMapper">
<select id="listZczxRoleByType" resultType="com.founder.commonutils.model.zczxEntity.ZczxRole">
select r.id,
r.zxbh,
r.policemanid,
r.role_id,
r.role_name,
r.zczx_cyzt,
r.zczx_sczt,
r.unitcode,
r.unitname,
r.zczx_fxzt,
r.lrr,
r.lrrdwdm,
r.lrrdwmc,
r.lrrjh,
r.rksj,
r.gxr,
r.gxrjh,
r.gxrdwdm,
r.gxrdwmc,
r.gxsj,
a.id approveId,
a.audit_type,
a.audit_status
from tb_wh_zczx_role r
left join tb_wh_approve a on r.id = a.flow_no
where
1=1
<if test="zczxRoleDto.zxbh!=null and zczxRoleDto.zxbh!=''">
AND r.zxbh = #{zczxRoleDto.zxbh , jdbcType=VARCHAR }
</if>
<if test="zczxRoleDto.zczxCyzt!=null and zczxRoleDto.zczxCyzt!='' and zczxRoleDto.zczxCyzt=='1'.toString()">
AND r.zczx_cyzt = '1'
</if>
<if test="zczxRoleDto.zczxFxzt!=null and zczxRoleDto.zczxFxzt!='' and zczxRoleDto.zczxFxzt=='1'.toString()">
AND r.zczx_fxzt = '1'
AND a.audit_status = '2'
</if>
order by r.rksj desc
</select>
</mapper>
service/publicapi/src/main/java/com/founder/publicapi/service/ZczxLogService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.ZczxLog;
/**
* @author Godffy
* @create 2023-07-12 16:33
*/
public interface ZczxLogService extends IService<ZczxLog> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/ZczxRoleService.java
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.ZczxRole;
import com.founder.commonutils.model.zczxEntity.ZczxRoleDto;
/**
* @author Godffy
* @create 2023-06-16 10:26
*/
public interface ZczxRoleService extends IService<ZczxRole> {
IPage<ZczxRole> listZczxRoleByType(IPage page, ZczxRoleDto zczxRoleDto);
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ZczxLogServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.ZczxLog;
import com.founder.publicapi.mapper.mysqlMapper.ZczxLogMapper;
import com.founder.publicapi.service.ZczxLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-07-12 16:40
*/
@Service
public class ZczxLogServiceImpl extends ServiceImpl<ZczxLogMapper, ZczxLog> implements ZczxLogService {
@Autowired
private ZczxLogMapper zczxLogMapper;
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ZczxRoleServiceImpl.java
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.Approve;
import com.founder.commonutils.model.zczxEntity.ZczxRole;
import com.founder.commonutils.model.zczxEntity.ZczxRoleDto;
import com.founder.publicapi.mapper.mysqlMapper.ApproveMapper;
import com.founder.publicapi.mapper.mysqlMapper.ZczxRoleMapper;
import com.founder.publicapi.service.ZczxRoleService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author Godffy
* @create 2023-06-16 10:32
......@@ -17,4 +25,34 @@ public class ZczxRoleServiceImpl extends ServiceImpl<ZczxRoleMapper, ZczxRole> i
@Autowired
private ZczxRoleMapper zczxRoleMapper;
@Autowired
private ApproveMapper approveMapper;
@Override
public IPage<ZczxRole> listZczxRoleByType(IPage page, ZczxRoleDto zczxRoleDto) {
IPage<ZczxRole> result = this.zczxRoleMapper.listZczxRoleByType(page, zczxRoleDto);
List<ZczxRole> records = result.getRecords();
//如果是查看分享列表，需要重新去审批列表看看有没有待审批的取消分享数据，如果有则告诉前端已经在取消分享审批中
//取消分享类型(auditType)：9
//审批状态(auditStatus)：1
if (StringUtils.isNotBlank(zczxRoleDto.getZczxFxzt())&&zczxRoleDto.getZczxFxzt().equals("1")){
for (int i = 0; i < records.size(); i++) {
ZczxRole zczxRole = records.get(i);
String flowNo = zczxRole.getId();//此id为专项角色表中的主键id
//该分享分局,存在取消分享处于待审批状态的数据
QueryWrapper<Approve> qw = new QueryWrapper<>();
qw.eq(StringUtils.isNotBlank(flowNo), "flow_no", flowNo);
qw.eq("audit_type", "9");
qw.eq("audit_status", "1");
Approve approve = approveMapper.selectOne(qw);
//如果有取消分享待审批的数据，
if (approve != null) {
zczxRole.setIsCanselShareApprove("1");
}
records.set(i, zczxRole);
}
result.setRecords(records);
}
return result;
}
}
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