Skip to content

M
map-parent
Commit 2897fd8d by Guojunfeng
Options

网合平台:侦查专项模块、协查任务模块、审批模块代码更新

parent ce0b3a07
Showing with 1533 additions and 97 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SysRole.java 0 → 100644
package com.founder.commonutils.model.newPublicEntity;
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-06-26 16:44
*/
@Data
@TableName("sys_role")
@ApiModel(value = "(sys_role)表实体类", description = "用户角色信息")
public class SysRole extends Model<SysRole> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "主键id")
private String id;
@ApiModelProperty(value = "角色名称")
private String rolename;
@ApiModelProperty(value = "角色描述")
private String description;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入时间")
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date lrsj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date gxsj;
@ApiModelProperty(value = "录入单位代码")
private String lrdwdm;
@ApiModelProperty(value = "录入单位名称")
private String lrdwmc;
@ApiModelProperty(value = "删除判断标志")
private String scbz;
@ApiModelProperty(value = "ip地址")
private String ip;
@ApiModelProperty(value = "是否发布(0:未发布,1:已发布)")
private String sffb;
@ApiModelProperty(value = "父级角色id")
private String pid;
@ApiModelProperty(value = "角色类型")
private String type;
@ApiModelProperty(value = "是否是父级（0：父级，1：子级）")
private String isparent;
@ApiModelProperty(value = "所属权限 1、市局管理员 2、分局管理员")
private String ssqx;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Approve.java 0 → 100644
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;
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-06-25 14:36
*/
@Data
@TableName("tb_wh_approve")
@ApiModel(value = "审批主体(tb_wh_approve)表实体类",description = "")
public class Approve extends Model<Approve> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "审批主体表主键")
private String id;
@ApiModelProperty(value = "审批编号（连接具体业务表的数据主键）")
private String flowNo;
/**
* 审批类型（表明此条记录的审批类型）
* 1：侦查专项分享审批
* 2：技侦研判协查任务发送审批
* 3：市局网合网警协查任务发送审批
* 4：市局网合情报协查任务发送审批
* 5：分局网合协查任务发送审批
* 6：其他协查任务发送审批
* 7：移交审批
* 8：退回审批
*/
@ApiModelProperty(value = "审批类型")
private String auditType;
/**
* 审核进度（表名此审批业务总的审核状态）
* 1：待审批
* 2：审批通过
* 3：驳回
* 4：撤销
*/
@ApiModelProperty(value = "审批进度")
private String auditStatus;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
@ApiModelProperty(value = "总审核节点（表明此审核业务的总共审核节点数）")
private String totalPoint;
@ApiModelProperty(value = "当前所在审核节点（表明此审核业务当前所处的节点）")
private String nowPoint;
@ApiModelProperty(value = "专项编号")
private String zxbh;
@ApiModelProperty(value = "专项名称")
private String zxmc;
@ApiModelProperty(value = "协查任务编号")
private String xcrwbh;
@ApiModelProperty(value = "协查任务名称")
private String xcrwmc;
@ApiModelProperty(value = "审批申请单名称")
private String auditName;
@ApiModelProperty(value = "审批人id（表示当前审批节点应该让谁来审批）")
@TableField(exist = false)
private String auditUserId;
@ApiModelProperty(value = "审批时间（记录下啥时候审批的）")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date auditTime;
@ApiModelProperty(value = "审批意见（审批人的审批意见）")
@TableField(exist = false)
private String auditOpinion;
@ApiModelProperty(value = "审批备注（审批人的额外备注信息）")
@TableField(exist = false)
private String auditRemark;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDetail.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-06-25 16:02
*/
@Data
@TableName("tb_wh_approve_detail")
@ApiModel(value = "审批明细(tb_wh_approve_detail)表实体类", description = "")
public class ApproveDetail extends Model<ApproveDetail> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "审批明细表主键")
private String id;
@ApiModelProperty(value = "审批id（连接审批主表的id）")
private String auditId;
@ApiModelProperty(value = "审批人id（表示当前审批节点应该让谁来审批）")
private String auditUserId;
@ApiModelProperty(value = "审批时间（记录下啥时候审批的）")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
@ApiModelProperty(value = "审批意见（审批人的审批意见）")
private String auditOpinion;
@ApiModelProperty(value = "审批备注（审批人的额外备注信息）")
private String auditRemark;
/**
* 审批状态（审批人的审核结果）
* 1：待审
* 2：通过
* 3：驳回
* 4：撤销
*/
@ApiModelProperty(value = "审批状态（审批人的审核结果）")
private String auditStatus;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
@ApiModelProperty(value = "当前所在节点（表示当前审核在总审核流程中所处的级别）")
private String nowPoint;
/**
* 审核人类型（表示当前节点审核时审核人的类型）
* 1：特指某人
* 2：具有某个角色（角色id可以存在audit_user_id，也可以新增一个角色id字段）
*/
@ApiModelProperty(value = "审核人类型（表示当前节点审核时审核人的类型）")
private String auditUserType;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDetailDto.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;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author Godffy
* @create 2023-06-25 16:02
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ApproveDetailDto extends BaseDto {
@ApiModelProperty(value = "审批明细表主键")
private String id;
@ApiModelProperty(value = "审批id（连接审批主表的id）")
private String auditId;
@ApiModelProperty(value = "审批人id（表示当前审批节点应该让谁来审批）")
private String auditUserId;
@ApiModelProperty(value = "审批时间（记录下啥时候审批的）")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
@ApiModelProperty(value = "审批意见（审批人的审批意见）")
private String auditOpinion;
@ApiModelProperty(value = "审批备注（审批人的额外备注信息）")
private String auditRemark;
/**
* 审批状态（审批人的审核结果）
* 1：待审
* 2：通过
* 3：驳回
* 4：撤销
*/
@ApiModelProperty(value = "审批状态（审批人的审核结果）")
private String auditStatus;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
@ApiModelProperty(value = "总审核节点（表明此审核业务的总共审核节点数）")
private String totalPoint;
@ApiModelProperty(value = "当前所在节点（表示当前审核在总审核流程中所处的级别）")
private String nowPoint;
/**
* 审核人类型（表示当前节点审核时审核人的类型）
* 1：特指某人
* 2：具有某个角色（角色id可以存在audit_user_id，也可以新增一个角色id字段）
*/
@ApiModelProperty(value = "审核人类型（表示当前节点审核时审核人的类型）")
private String auditUserType;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDto.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;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @author Godffy
* @create 2023-06-25 14:36
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ApproveDto extends BaseDto {
@ApiModelProperty(value = "审批主体表主键")
private String id;
@ApiModelProperty(value = "审批编号（连接具体业务表的数据主键）")
private String flowNo;
/**
* 审批类型（表明此条记录的审批类型）
* 1：侦查专项分享审批
* 2：技侦研判协查任务发送审批
* 3：市局网合网警协查任务发送审批
* 4：市局网合情报协查任务发送审批
* 5：分局网合协查任务发送审批
* 6：其他协查任务发送审批
* 7：移交审批
* 8：退回审批
*/
@ApiModelProperty(value = "审批类型")
private String auditType;
/**
* 审核进度（表名此审批业务总的审核状态）
* 1：待审批
* 2：审批通过
* 3：驳回
* 4：撤销
*/
@ApiModelProperty(value = "审批进度")
private String auditStatus;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String gxsj;
@ApiModelProperty(value = "总审核节点（表明此审核业务的总共审核节点数）")
private String totalPoint;
@ApiModelProperty(value = "当前所在审核节点（表名此审核业务当前所处的节点）")
private String nowPoint;
@ApiModelProperty(value = "审批人id（表示当前审批节点应该让谁来审批）")
private String auditUserId;
/**
* 审核人类型（表示当前节点审核时审核人的类型）
* 1：特指某人
* 2：具有某个角色（角色id可以存在audit_user_id，也可以新增一个角色id字段）
*/
@ApiModelProperty(value = "审核人类型（表示当前节点审核时审核人的类型）")
private String auditUserType;
@ApiModelProperty(value = "专项名称")
private String zxmc;
@ApiModelProperty(value = "协查任务名称")
private String xcrwmc;
@ApiModelProperty(value = "审批意见（审批人的审批意见）")
private String auditOpinion;
@ApiModelProperty(value = "审批备注（审批人的额外备注信息）")
private String auditRemark;
@ApiModelProperty(value = "审批申请单名称")
private String auditName;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Xcrw.java
......@@ -44,6 +44,10 @@ public class Xcrw extends Model<Xcrw> {
@ApiModelProperty(value = "协查任务类型")
private String xcrwlx;
@ApiModelProperty(value = "协查任务类型翻译")
@TableField(exist = false)
private String xcrwlxStr;
@ApiModelProperty(value = "协查任务开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date xcrwkssj;
......@@ -177,32 +181,15 @@ public class Xcrw extends Model<Xcrw> {
@ApiModelProperty(value = "协查任务_退回信息")
private String xcrwThxx;
// @ApiModelProperty(value = "协查任务_申请单_名字")
// private String xcrwSqdName;
//
// @ApiModelProperty(value = "协查任务_申请单_字节数据")
// private byte[] xcrwSqdContent;
//
// @ApiModelProperty(value = "协查任务_申请单_后缀")
// private String xcrwSqdEx;
//
// @ApiModelProperty(value = "协查任务_申请单_大小")
// private String xcrwSqdSize;
//
// @ApiModelProperty(value = "协查任务_反馈单_名字")
// private String xcrwFkdName;
//
// @ApiModelProperty(value = "协查任务_反馈单_字节数据")
// private byte[] xcrwFkdContent;
//
// @ApiModelProperty(value = "协查任务_反馈单_后缀")
// private String xcrwFkdEx;
//
// @ApiModelProperty(value = "协查任务_反馈单_大小")
// private String xcrwFkdSize;
/**
* 审核进度（表名此审批业务总的审核状态）
* 1：待审批：表示所有的审批节点还在走流程
* 2：审批通过：所有审批节点均审批通过
* 3：驳回：后置审批节点中有驳回的情况,流程终止
* 4：撤销：审批申请人自己撤销了审批
*/
@ApiModelProperty(value = "审核进度")
@TableField(exist = false)
private String auditStatus;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwDto.java
......@@ -114,6 +114,7 @@ public class XcrwDto extends BaseDto {
@ApiModelProperty(value = "协查任务_审批状态")
private String xcrwSpzt;
//反馈时间的超时
@ApiModelProperty(value = "协查任务_超时状态")
private String xcrwCszt;
......@@ -199,4 +200,45 @@ public class XcrwDto extends BaseDto {
@ApiModelProperty(value = "协查任务_退回信息")
private String xcrwThxx;
@ApiModelProperty(value = "总审核节点（表明此审核业务的总共审核节点数）")
private String totalPoint;
@ApiModelProperty(value = "当前所在审核节点（表名此审核业务当前所处的节点）")
private String nowPoint;
/**
* 审批类型（表明此条记录的审批类型）
* 1：侦查专项分享审批
* 2：技侦研判协查任务发送审批
* 3：市局网合网警协查任务发送审批
* 4：市局网合情报协查任务发送审批
* 5：分局网合协查任务发送审批
* 6：其他协查任务发送审批
* 7：移交审批
* 8：退回审批
*/
@ApiModelProperty(value = "审批类型")
private String auditType;
@ApiModelProperty(value = "审批人id（表示当前审批节点应该让谁来审批）")
private String auditUserId;
/**
* 审核人类型（表示当前节点审核时审核人的类型）
* 1：特指某人
* 2：具有某个角色（角色id可以存在audit_user_id，也可以新增一个角色id字段）
*/
@ApiModelProperty(value = "审核人类型（表示当前节点审核时审核人的类型）")
private String auditUserType;
/**
* 审核进度（表名此审批业务总的审核状态）
* 1：待审批：表示所有的审批节点还在走流程
* 2：审批通过：所有审批节点均审批通过
* 3：驳回：后置审批节点中有驳回的情况,流程终止
* 4：撤销：审批申请人自己撤销了审批
*/
@ApiModelProperty(value = "审核进度")
private String auditStatus;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Zczx.java
......@@ -134,7 +134,13 @@ public class Zczx extends Model<Zczx> {
@ApiModelProperty(value = "其他协查编号")
private String qtxcbh;
@ApiModelProperty(value = "侦查专项角色表主键编号")
@TableField(exist = false)
private String roleNo;
@ApiModelProperty(value = "案事件发生时间_案事件发生开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date asjfssjAsjfskssj;
@ApiModelProperty(value = "角色Id")
......@@ -153,4 +159,15 @@ public class Zczx extends Model<Zczx> {
@TableField(exist = false)
private String zczxSczt;
/**
* 审核进度（表名此审批业务总的审核状态）
* 1：待审批：表示所有的审批节点还在走流程
* 2：审批通过：所有审批节点均审批通过
* 3：驳回：后置审批节点中有驳回的情况,流程终止
* 4：撤销：审批申请人自己撤销了审批
*/
@ApiModelProperty(value = "审核进度")
@TableField(exist = false)
private String auditStatus;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxDto.java
......@@ -79,7 +79,7 @@ public class ZczxDto extends BaseDto {
private String asjbh;
@ApiModelProperty(value = "案件名称")
private String aj;
private String ajmc;
@ApiModelProperty(value = "案事件简要情况")
private String asjJyqk;
......@@ -87,8 +87,8 @@ public class ZczxDto extends BaseDto {
@ApiModelProperty(value = "警情编号")
private String jqbh;
@ApiModelProperty(value = "警情名称")
private String jqmc;
// @ApiModelProperty(value = "警情名称")
// private String jqmc;
@ApiModelProperty(value = "警情简要情况")
private String jqJyqk;
......@@ -193,5 +193,41 @@ public class ZczxDto extends BaseDto {
@ApiModelProperty(value = "单位代码")
private String targetUnitCode;
//分享的指定单位名称
@ApiModelProperty(value = "单位名称")
private String targetUnitName;
/**
* 审核进度（表名此审批业务总的审核状态）
* 1：待审批：表示所有的审批节点还在走流程
* 2：审批通过：所有审批节点均审批通过
* 3：驳回：后置审批节点中有驳回的情况,流程终止
* 4：撤销：审批申请人自己撤销了审批
*/
@ApiModelProperty(value = "审核进度")
private String auditStatus;
@ApiModelProperty(value = "分享状态")
private String zczxFxzt;
@ApiModelProperty(value = "总审核节点（表明此审核业务的总共审核节点数）")
private String totalPoint;
@ApiModelProperty(value = "当前所在审核节点（表名此审核业务当前所处的节点）")
private String nowPoint;
@ApiModelProperty(value = "审批申请单名称")
private String auditName;
@ApiModelProperty(value = "审批人id（表示当前审批节点应该让谁来审批）")
private String auditUserId;
/**
* 审核人类型（表示当前节点审核时审核人的类型）
* 1：特指某人
* 2：具有某个角色（角色id可以存在audit_user_id，也可以新增一个角色id字段）
*/
@ApiModelProperty(value = "审核人类型（表示当前节点审核时审核人的类型）")
private String auditUserType;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRole.java
......@@ -53,4 +53,7 @@ public class ZczxRole extends Model<ZczxRole> {
@ApiModelProperty(value = "机构名称")
private String unitname;
@ApiModelProperty(value = "分享状态")
private String zczxFxzt;
}
common/common_utils/src/main/java/com/founder/commonutils/util/Base64Util.java
......@@ -68,7 +68,7 @@ public class Base64Util {
public static void main(String[] args) {
System.out.println(Base64Util.encode("123456"));
System.out.println(Base64Util.decode("MTIzNDU2"));
System.out.println(Base64Util.decode("YmoxNTAxNDc="));
}
......
common/common_utils/src/main/java/com/founder/commonutils/util/JwtUser.java
......@@ -29,6 +29,7 @@ import java.util.Map;
public class JwtUser {
// @Value("${jwt.secret}")
public String base64Security="bWFwLXBsYXRmb3JtLWRvbmdndWFuLTIwMTktMTEtNg==";
// final static long ttlMillis = 1000 * 60;//过期时间,1分钟
final static long ttlMillis = 1000 * 60 * 60 * 24;//过期时间,24小时
private static final Logger logger = LoggerFactory.getLogger(JwtUser.class);
/**
......
common/service_base/src/main/java/com/founder/servicebase/controller/SysRoleController.java 0 → 100644
package com.founder.servicebase.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SysRole;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SysRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* @author Godffy
* @create 2023-06-26 16:43
*/
@CrossOrigin
@RestController
@RequestMapping("/role")
@Api(tags = "用户角色")
public class SysRoleController extends ApiController {
@Resource
private SysRoleService sysRoleService;
/**
* 查询有效的所有角色
* @return
*/
@ApiOperation(value = "查询有效的所有角色")
@OperLog(message = "查询有效的所有角色", operation = OperationType.QUERY)
@PostMapping("/selectAllRole")
public MapRestResult selectAllRole() {
QueryWrapper<SysRole> qw = new QueryWrapper<>();
//直接查询可用的
qw.eq("SCBZ", 0);
List<SysRole> sysRoles = this.sysRoleService.list(qw);
return MapRestResult.build(200, "查询有效的所有角色", sysRoles);
}
}
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/SysRoleMapper.java 0 → 100644
package com.founder.servicebase.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.newPublicEntity.SysRole;
import java.util.List;
/**
* @author Godffy
* @create 2023-06-26 17:00
*/
public interface SysRoleMapper extends BaseMapper<SysRole> {
List<SysRole> getRolesByUserId(String id);
}
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/SysUserMapper.java
......@@ -2,8 +2,9 @@ package com.founder.servicebase.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.commonutils.model.newPublicEntity.SysUsers;
import com.founder.commonutils.model.vo.param.SkServiceApplyParam;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (SysUser)表数据库访问层
......@@ -12,5 +13,8 @@ import com.founder.commonutils.model.vo.param.SkServiceApplyParam;
* @since 2022-03-17 14:09:47
*/
public interface SysUserMapper extends BaseMapper<SysUser> {
List<SysUser> getUsersByRoleId(String roleId);
List<SysUser> getUsersByApprove(@Param("roldId") String roldId,@Param("unitcode") String unitcode);
}
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/xml/SysRoleMapper.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.servicebase.mapper.mysqlMapper.SysRoleMapper">
<select id="getRolesByUserId" resultType="com.founder.commonutils.model.newPublicEntity.SysRole">
select r.*
from sys_role r
left join sys_user_role ur on r.id = ur.role_id
where ur.user_id = #{id}
and r.scbz = '0'
and ur.scbz = '0'
</select>
</mapper>
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/xml/SysUsersMapper.xml
......@@ -2,14 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.founder.servicebase.mapper.mysqlMapper.SysUserMapper">
<select id="getUsersByNamePassword" resultType="com.founder.commonutils.model.newPublicEntity.SysUsers">
select * from sys_users
where 1=1 and xxsc_pdbz = '0'
<if test="username!=null and username!=''">
and username = #{username}
</if>
<if test="password!=null and password!=''">
and password = #{password}
</if>
<select id="getUsersByRoleId" resultType="com.founder.commonutils.model.newPublicEntity.SysUser">
select *
from sys_user u
left join sys_user_role ur on u.id = ur.user_id
where ur.role_id = #{roleId}
and u.scbz = '0'
and ur.scbz = '0'
</select>
<select id="getUsersByApprove" resultType="com.founder.commonutils.model.newPublicEntity.SysUser">
select *
from sys_user u
left join sys_user_role ur on u.id = ur.user_id
where ur.role_id = #{roldId}
and ur.scbz = '0'
and u.unitcode like #{unitcode} || '%'
</select>
</mapper>
common/service_base/src/main/java/com/founder/servicebase/service/SysRoleService.java 0 → 100644
package com.founder.servicebase.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.SysRole;
import java.util.List;
/**
* @author Godffy
* @create 2023-06-26 16:58
*/
public interface SysRoleService extends IService<SysRole> {
/**
* 查询用户id绑定的角色列表
* @param id
* @return
*/
List<SysRole> getRolesByUserId(String id);
}
common/service_base/src/main/java/com/founder/servicebase/service/SysUserService.java
......@@ -3,6 +3,8 @@ package com.founder.servicebase.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import java.util.List;
/**
* (SysUser)表服务接口
*
......@@ -11,5 +13,9 @@ import com.founder.commonutils.model.newPublicEntity.SysUser;
*/
public interface SysUserService extends IService<SysUser> {
List<SysUser> getUsersByRoleId(String roleId);
List<SysUser> getUsersByApprove(String roldId, String unitcode);
}
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SysRoleServiceImpl.java 0 → 100644
package com.founder.servicebase.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SysRole;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.servicebase.mapper.mysqlMapper.SysRoleMapper;
import com.founder.servicebase.service.SysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author Godffy
* @create 2023-06-26 16:59
*/
@Service("sysRoleService")
public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements SysRoleService {
@Autowired
private SysRoleMapper sysRoleMapper;
/**
* 查询用户id绑定的角色列表
*
* @param id
* @return
*/
@Override
public List<SysRole> getRolesByUserId(String id) {
return sysRoleMapper.getRolesByUserId(id);
}
}
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SysUserServiceImpl.java
......@@ -6,8 +6,11 @@ import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.servicebase.mapper.mysqlMapper.SysUserMapper;
import com.founder.servicebase.service.SysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* (SysUser)表服务实现类
*
......@@ -17,5 +20,17 @@ import org.springframework.stereotype.Service;
@Service("sysUserService")
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
@Autowired
private SysUserMapper sysUserMapper;
@Override
public List<SysUser> getUsersByRoleId(String roleId) {
return sysUserMapper.getUsersByRoleId(roleId);
}
@Override
public List<SysUser> getUsersByApprove(String roldId, String unitcode) {
return sysUserMapper.getUsersByApprove(roldId,unitcode);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ApproveController.java 0 → 100644
package com.founder.publicapi.controller.ZczxService;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.Approve;
import com.founder.commonutils.model.zczxEntity.ApproveDetail;
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.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.transaction.annotation.Transactional;
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-06-25 14:34
*/
@CrossOrigin
@RestController
@RequestMapping("/approve")
@Api(tags = "审批主表")
public class ApproveController extends ApiController {
@Resource
private ApproveService approveService;
@Resource
private ApproveDetailService approveDetailService;
/**
* 审批类型（表明此条记录的审批类型，如流转审批、分享审批）
* 1：协查任务审批
* 2：分享审批
* 3：下发任务
* <p>
* 审批节点：目前只有一级审批
* 前端传，若有二级审批，给个可视化界面列出领导信息，同时让申请人逐级往上选择各个审批领导
* 总审核节点（表明此审核业务的总共审核节点数）
* 当前所在审核节点（表名此审核业务当前所处的节点）
* totalPoint:1
* nowPoint:1
*
* @param approveDto
* @return
*/
//废弃接口！
@PostMapping("save")
@ApiOperation(value = "新增审批信息")
@OperLog(message = "新增审批信息", operation = OperationType.ADD)
@Transactional
public MapRestResult save(@RequestBody ApproveDto approveDto) {
Approve approve = new Approve();
BeanUtil.copyProperties(approveDto, approve);
String approveId = KeyUtil.getUUIDKey("A");
approve.setId(approveId);
approve.setRksj(new Date());//创建时间
//当前登陆人的信息
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.setLrr(trueName);//姓名
approve.setLrrjh(policemanid);//警号
approve.setLrrdwdm(unitcode);//创建人单位代码
approve.setLrrdwmc(unitname);//专项创建单位名称
approve.setAuditStatus("1");//审批业务总的审批状态，待审状态
approveService.save(approve);
//插入审批明细表信息
ApproveDetail approveDetail = new ApproveDetail();
approveDetail.setId(KeyUtil.getUUIDKey("AD"));//明细表主键
approveDetail.setAuditId(approveId);//关联审批主表
approveDetail.setAuditStatus("1");//审批人的审核结果，待审状态
approveDetail.setRksj(new Date());//入库时间
approveDetail.setLrr(trueName);//姓名
approveDetail.setLrrjh(policemanid);//警号
approveDetail.setLrrdwdm(unitcode);//创建人单位代码
approveDetail.setLrrdwmc(unitname);//专项创建单位名称
approveDetailService.save(approveDetail);
return new MapRestResult();
}
/**
* 拥有一级审批角色的用户才可以看到该列表及进行操作
* 前端已限制可视，接口可不判断
*
* 只能看到发给自己的
*
* @param approveDto
* @return
*/
@PostMapping("listApproveForPage")
@ApiOperation(value = "查询任务审批列表信息")
@OperLog(message = "查询任务审批列表信息", operation = OperationType.QUERY)
public MapRestResult listApproveForPage(@RequestBody ApproveDto approveDto) {
IPage page = new Page(approveDto.getPageNum(), approveDto.getPageSize());
IPage<Approve> result = this.approveService.listApproveForPage(page, approveDto);
PageSimpleVO pageSimpleVO = new PageSimpleVO<>(result.getCurrent(), result.getTotal(), result.getRecords());
return new MapRestResult(200, "查询成功!", result.getTotal(), pageSimpleVO);
}
//目前只有一级审批,表是按多级审批建的,如要拓展后面再改
//审批不同类型的业务时，把审批状态修改至对应业务表的审批状态中
//1.侦查专项角色表中的id关联分享审批单
//2.协查任务编号关联审批单
@PostMapping("sp")
@ApiOperation(value = "审批")
@OperLog(message = "审批", operation = OperationType.UPDATE)
public MapRestResult sp(@RequestBody ApproveDto approveDto){
//当前登陆人的信息
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();
//前端传审批申请单id(id),业务编号(flowNo)和审批业务类型(auditType)对应审批主表记录和审批明细表节点
Approve approve = new Approve();//审批主表
BeanUtil.copyProperties(approveDto,approve);
approve.setGxr(trueName);
approve.setGxrjh(policemanid);
approve.setGxrdwdm(unitcode);
approve.setGxrdwmc(unitname);
//更新审批主表信息
approveService.updateById(approve);
ApproveDetail approveDetail = new ApproveDetail();//审批明细
approveDetail.setGxr(trueName);
approveDetail.setGxrjh(policemanid);
approveDetail.setGxrdwdm(unitcode);
approveDetail.setGxrdwmc(unitname);
//因为目前只有一个审批节点，所以两张表的auditStatus是相同的
approveDetail.setAuditTime(new Date());
approveDetail.setAuditOpinion(approveDto.getAuditOpinion());//审批意见
approveDetail.setAuditRemark(approveDto.getAuditRemark());//审批备注
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);
return new MapRestResult();
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ApproveDetailController.java 0 → 100644
package com.founder.publicapi.controller.ZczxService;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.founder.publicapi.service.ApproveDetailService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @author Godffy
* @create 2023-06-25 16:00
*/
@CrossOrigin
@RestController
@RequestMapping("/approveDetail")
@Api(tags = "审批明细表")
public class ApproveDetailController extends ApiController {
@Resource
private ApproveDetailService approveDetailService;
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java
......@@ -7,16 +7,17 @@ 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.Zczx;
import com.founder.commonutils.model.zczxEntity.ZczxDto;
import com.founder.commonutils.model.zczxEntity.ZczxRole;
import com.founder.commonutils.model.zczxEntity.*;
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.publicapi.service.ZczxService;
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;
......@@ -42,6 +43,12 @@ public class ZczxController extends ApiController {
@Resource
private ZczxRoleService zczxRoleService;
@Resource
private ApproveService approveService;
@Resource
private ApproveDetailService approveDetailService;
/**
* 创建侦查专项时，把当前用户的机构代码存到侦查专项角色表(TB_WH_ZCZX_ROLE)
*
......@@ -103,30 +110,80 @@ public class ZczxController extends ApiController {
IPage<Zczx> result = this.zczxService.listZczxForPage(page, zczxDto);
PageSimpleVO pageSimpleVO = new PageSimpleVO<>(result.getCurrent(), result.getTotal(), result.getRecords());
return new MapRestResult(200, "查询成功!", result.getTotal(), pageSimpleVO);
}
@PostMapping("selectZczxById")
@ApiOperation(value = "根据侦查专项编号查询侦查专项信息")
@OperLog(message = "根据侦查专项编号查询侦查专项信息", operation = OperationType.QUERY)
public MapRestResult selectZczxById(@RequestBody ZczxDto zczxDto) {
String zxbh = zczxDto.getZxbh();
if (StringUtils.isBlank(zxbh)) {
return new MapRestResult(200, "专项编号不能为空", null);
}
Zczx zczx = zczxService.getById(zxbh);
return new MapRestResult(200, "查询成功!", zczx);
}
//侦查专项分享接口
//1.侦查专项角色表：新增分享指定单位的单位编号、单位名称、侦查专项分享状态
//2.审批主表：新增记录，flowNo连接侦查专项角色表主键ID
//3.审批明细表：新增记录
@PostMapping("share")
@ApiOperation(value = "侦查专项分享")
@OperLog(message = "侦查专项分享", operation = OperationType.UPDATE)
@Transactional
public MapRestResult share(@RequestBody ZczxDto zczxDto) {
//当前登陆人的信息
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();
// QueryWrapper<Zczx> qw = new QueryWrapper<>();
// // 按侦查专项编号查询
// qw.eq(StringUtils.isNotBlank(zczxDto.getZxbh()), "ZXBH", zczxDto.getZxbh());
// // 按侦查专项名称查询
// qw.eq(StringUtils.isNotBlank(zczxDto.getZxmc()), "ZXMC", zczxDto.getZxmc());
// // 按案件编号查询
// qw.eq(StringUtils.isNotBlank(zczxDto.getAsjbh()), "ASJBH", zczxDto.getAsjbh());
// // 按侦查专项创建单位代码查询
// qw.eq(StringUtils.isNotBlank(zczxDto.getZxcjdwdm()), "ZXCJDWDM", zczxDto.getZxcjdwdm());
// // 按警情编号查询
// qw.eq(StringUtils.isNotBlank(zczxDto.getJqbh()), "JQBH", zczxDto.getJqbh());
// // 按创建人警号查询
// qw.eq(StringUtils.isNotBlank(zczxDto.getZxcjrjh()), "ZXCJRJH", zczxDto.getZxcjrjh());
// // 按要情编号查询
// qw.eq(StringUtils.isNotBlank(zczxDto.getYqbh()), "YQBH", zczxDto.getYqbh());
// // 按侦查专项创建时间查询
// qw.ge(null != zczxDto.getZxcjsj(), "ZXCJSJ", zczxDto.getZxcjsj());
// qw.le(null != zczxDto.getZxcjsj(), "ZXCJSJ", zczxDto.getZxcjsj());
// // 按侦查专项创建时间查询
// qw.ge(null != zczxDto.getZxcjsj(), "ZXCJSJ", zczxDto.getZxcjsj());
// qw.le(null != zczxDto.getZxcjsj(), "ZXCJSJ", zczxDto.getZxcjsj());
ZczxRole role = new ZczxRole();
String zczxRoleNo = KeyUtil.getUUIDKey("ZXR");
role.setId(zczxRoleNo);//专项角色表主键
role.setZxbh(zczxDto.getZxbh());//专项编号
role.setUnitcode(zczxDto.getTargetUnitCode());//指定单位代码
role.setUnitname(zczxDto.getTargetUnitName());//指定单位名称
role.setZczxFxzt("1");//分享状态
//侦查专项角色表，存分享的单位代码、名称、分享状态
zczxRoleService.save(role);
Approve approve = new Approve();
String approveNo = KeyUtil.getUUIDKey("A");
approve.setId(approveNo);//审批主表主键
approve.setFlowNo(zczxRoleNo);//连接专项角色表主键
approve.setAuditType("1");//审批类型,1:侦查专项分享审批
approve.setLrr(trueName);
approve.setLrrjh(policemanid);
approve.setLrrdwdm(unitcode);
approve.setLrrdwmc(unitname);
approve.setRksj(new Date());
approve.setTotalPoint(zczxDto.getTotalPoint());//总审核节点（表明此审核业务的总共审核节点数）
approve.setNowPoint(zczxDto.getNowPoint());//当前所在审核节点（表明此审核业务当前所处的节点）
approve.setZxbh(zczxDto.getZxbh());//专项编号
approve.setZxmc(zczxDto.getZxmc());//专项名称
approve.setAuditName(zczxDto.getAuditName());//分享申请单名称
//存审批主表信息
approveService.save(approve);
ApproveDetail approveDetail = new ApproveDetail();
String approveDetailNo = KeyUtil.getUUIDKey("AD");
approveDetail.setId(approveDetailNo);//审批明细表主键
approveDetail.setAuditId(approveNo);//连接审批主表主键
approveDetail.setAuditUserId(zczxDto.getAuditUserId());//由谁审批
approveDetail.setLrr(trueName);
approveDetail.setLrrjh(policemanid);
approveDetail.setLrrdwdm(unitcode);
approveDetail.setLrrdwmc(unitname);
approveDetail.setRksj(new Date());
approveDetail.setNowPoint(zczxDto.getNowPoint());//当前所在审核节点（表明此审核业务当前所处的节点）
approveDetail.setAuditUserType(zczxDto.getAuditUserType());//目前为特指某人
approveDetailService.save(approveDetail);
return new MapRestResult();
}
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxRoleController.java
......@@ -59,7 +59,6 @@ public class ZczxRoleController {
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String policemanid = user.getPolicemanid();
ZczxRole zczxRole = new ZczxRole();
BeanUtil.copyProperties(zczxRoleDto, zczxRole);
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ApproveDetailMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.zczxEntity.ApproveDetail;
/**
* @author Godffy
* @create 2023-06-25 16:10
*/
public interface ApproveDetailMapper extends BaseMapper<ApproveDetail> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ApproveMapper.java 0 → 100644
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.Approve;
import com.founder.commonutils.model.zczxEntity.ApproveDto;
/**
* @author Godffy
* @create 2023-06-25 15:53
*/
public interface ApproveMapper extends BaseMapper<Approve> {
IPage<Approve> listApproveForPage(IPage page, ApproveDto approveDto);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/XcrwMapper.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.Xcrw;
import com.founder.commonutils.model.zczxEntity.XcrwDto;
/**
* @author Godffy
* @create 2023-06-09 16:48
*/
public interface XcrwMapper extends BaseMapper<Xcrw> {
IPage<Xcrw> listXcrwForPage(IPage page, XcrwDto xcrwDto);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ApproveDetailMapper.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.ApproveDetailMapper">
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ApproveMapper.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.ApproveMapper">
<select id="listApproveForPage" resultType="com.founder.commonutils.model.zczxEntity.Approve"
parameterType="com.founder.commonutils.model.zczxEntity.ApproveDto">
select
wa.id,
wa.audit_name,
wa.flow_no,
wa.audit_type,
wa.audit_status,
wa.lrr,
wa.lrrjh,
wa.rksj,
wa.zxmc,
wa.xcrwmc,
ad.audit_user_id,
ad.audit_time,
ad.audit_opinion,
ad.audit_remark
from tb_wh_approve wa
left join tb_wh_approve_detail ad on wa.id = ad.audit_id
where
ad.audit_user_id = #{approveDto.auditUserId , jdbcType=VARCHAR }
<if test="approveDto.flowNo!= null and approveDto.flowNo!=''">
AND wa.flow_no= #{approveDto.flowNo , jdbcType=VARCHAR }
</if>
<if test="approveDto.zxmc!= null and approveDto.zxmc!=''">
AND wa.zxmc= #{approveDto.zxmc , jdbcType=VARCHAR }
</if>
<if test="approveDto.xcrwmc!= null and approveDto.xcrwmc!=''">
AND wa.xcrwmc= #{approveDto.xcrwmc , jdbcType=VARCHAR }
</if>
<if test="approveDto.id!= null and approveDto.id!=''">
AND wa.id= #{approveDto.id , jdbcType=VARCHAR }
</if>
<if test="approveDto.auditStatus!= null and approveDto.auditStatus!=''">
AND wa.audit_status= #{approveDto.auditStatus , jdbcType=VARCHAR }
</if>
<if test="approveDto.lrr!= null and approveDto.lrr!=''">
AND wa.lrr= #{approveDto.lrr , jdbcType=VARCHAR }
</if>
<if test="approveDto.lrrjh!= null and approveDto.lrrjh!=''">
AND wa.lrrjh= #{approveDto.lrrjh , jdbcType=VARCHAR }
</if>
<if test="approveDto.lrrdwdm!= null and approveDto.lrrdwdm!=''">
AND wa.lrrdwdm= #{approveDto.lrrdwdm , jdbcType=VARCHAR }
</if>
<if test="approveDto.auditType!= null and approveDto.auditType!=''">
AND wa.audit_type= #{approveDto.auditType , jdbcType=VARCHAR }
</if>
<choose>
<when test="approveDto.beginTime != null and approveDto.endTime !=null">
AND wa.rksj between #{approveDto.beginTime} and #{approveDto.endTime}
</when>
<when test="approveDto.beginTime != null and approveDto.endTime ==null">
AND wa.rksj &gt;= #{approveDto.beginTime}
</when>
<when test="approveDto.beginTime == null and approveDto.endTime !=null">
AND wa.rksj &lt;= #{approveDto.endTime}
</when>
</choose>
</select>
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/XcrwMapper.xml
......@@ -2,4 +2,118 @@
<!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.XcrwMapper">
<select id="listXcrwForPage" resultType="com.founder.commonutils.model.zczxEntity.Xcrw">
select x.xcrwbh,
x.xcrwmc,
x.zxbh,
x.zxmc,
x.xcrwlx,
case
when x.xcrwlx = '1' then '技侦研判'
when x.xcrwlx = '2' then '市局网合（网警）研判'
when x.xcrwlx = '3' then '市局网合（情报）研判'
when x.xcrwlx = '4' then '分局网合'
when x.xcrwlx = '5' then '其他协查'
end as xcrwlxStr,
x.xcrwzt,
x.xcrwkssj,
x.xcrwjssj,
x.xcrwcjrjh,
x.xcrwcjrsfzh,
x.xcrwcjrdwdm,
x.xcrwcjrdwmc,
x.xcrwcjrlxdh,
x.xxsc_pdbz,
x.xcrwjsrzh,
x.xcrwjsrxm,
x.xcrwjsrjh,
x.xcrwjsrlxdh,
x.xcrwjsrdwdm,
x.xcrwjsrdwmc,
x.xcrwfkr,
x.xcrwfkrdwdm,
x.xcrwfkrdwmc,
x.xcrwfkrlxdh,
x.xcrw_fkxx,
x.xcrwlzsj,
x.xcrwfksj,
x.xcrw_spzt,
x.xcrw_cszt,
x.asjbh,
x.ajmc,
x.jqbh,
x.yqbh,
x.xcrw_fkzt,
x.xcrwsprjh,
x.xcrwsprxm,
x.xcrwsprdwdm,
x.xcrwsprdwmc,
x.ajlbdm,
x.xcrw_jyqk,
x.xcrw_zccs,
x.xcrw_xcxq,
x.xcrw_bz,
x.xcrw_thzt,
x.xcrw_thxx,
a.audit_status
from tb_wh_xcrw x
left join tb_wh_approve a on x.xcrwbh = a.flow_no
where x.xxsc_pdbz = '0'
<if test="xcrwDto.zxbh!=null and xcrwDto.zxbh!=''">
AND x.zxbh = #{xcrwDto.zxbh , jdbcType=VARCHAR }
</if>
<choose>
<when test="xcrwDto.xcrwjsrzh!=null and xcrwDto.xcrwjsrzh!='' and xcrwDto.xcrwjsrzh.length() == 12">
AND x.xcrwjsrzh like SUBSTR(#{xcrwDto.xcrwjsrzh , jdbcType=VARCHAR },1,6) || '%'
</when>
<when test="xcrwDto.xcrwjsrzh!=null and xcrwDto.xcrwjsrzh!='' and xcrwDto.xcrwjsrzh.length() != 12">
AND x.xcrwjsrzh = #{xcrwDto.xcrwjsrzh , jdbcType=VARCHAR }
</when>
</choose>
<if test="xcrwDto.auditStatus!=null and xcrwDto.auditStatus!=''">
AND a.audit_status = #{xcrwDto.auditStatus , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.xcrwbh!=null and xcrwDto.xcrwbh!=''">
AND x.xcrwbh = #{xcrwDto.xcrwbh , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.asjbh!=null and xcrwDto.asjbh!=''">
AND x.asjbh = #{xcrwDto.asjbh , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.jqbh!=null and xcrwDto.jqbh!=''">
AND x.jqbh = #{xcrwDto.jqbh , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.yqbh!=null and xcrwDto.yqbh!=''">
AND x.yqbh = #{xcrwDto.yqbh , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.xcrwcjrjh!=null and xcrwDto.xcrwcjrjh!=''">
AND x.xcrwcjrjh = #{xcrwDto.xcrwcjrjh , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.xcrwcjrdwdm!=null and xcrwDto.xcrwcjrdwdm!=''">
AND x.xcrwcjrdwdm = #{xcrwDto.xcrwcjrdwdm , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.xcrwjsrdwdm!=null and xcrwDto.xcdwjsrdwdm!=''">
AND x.xcrwjsrdwdm = #{xcrwDto.xcrwjsrdwdm , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.xcrwCszt!=null and xcrwDto.xcrwCszt!=''">
AND x.xcrw_cszt = #{xcrwDto.xcrwCszt , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.auditStatus!=null and xcrwDto.auditStatus!=''">
AND a.audit_status = #{xcrwDto.auditStatus , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.xcrwlx!=null and xcrwDto.xcrwlx!=''">
AND a.xcrwlx = #{xcrwDto.xcrwlx , jdbcType=VARCHAR }
</if>
<choose>
<when test="xcrwDto.xcrwkssjKssj != null and xcrwDto.xcrwkssjJssj !=null">
AND x.xcrwkssj between #{xcrwDto.xcrwkssjKssj} and #{xcrwDto.xcrwkssjJssj}
</when>
<when test="xcrwDto.xcrwkssjKssj != null and xcrwDto.xcrwkssjJssj ==null">
AND x.xcrwkssj &gt;= #{xcrwDto.xcrwkssjKssj}
</when>
<when test="xcrwDto.xcrwkssjKssj == null and xcrwDto.xcrwkssjJssj !=null">
AND x.xcrwkssj &lt;= #{xcrwDto.xcrwkssjJssj}
</when>
</choose>
order by x.xcrwkssj desc
</select>
</mapper>
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxMapper.xml
......@@ -168,6 +168,7 @@
y.infoid as yqbh,
y.title as yqmc,
y.content as yqJyqk,
r.id as roleNo,
r.role_id,
r.role_name,
r.zczx_cyzt,
......@@ -306,6 +307,7 @@
y.infoid as yqbh,
y.title as yqmc,
y.content as yqJyqk,
r.id as roleNo,
r.role_id,
r.role_name,
r.zczx_cyzt,
......@@ -443,12 +445,19 @@
j.asjfssj_asjfskssj,
y.infoid as yqbh,
y.title as yqmc,
y.content as yqJyqk
y.content as yqJyqk,
r.id as roleNo,
r.role_id,
r.role_name,
r.zczx_cyzt,
r.zczx_sczt,
a.audit_type as auditType
from tb_wh_zczx z
left join tb_xw_asj_110jq q on z.jqbh = q.jjdbh
left join tb_st_asj j on z.asjbh = j.asjbh
left join tb_st_yq y on z.yqmc = y.title
left join tb_wh_zczx_role r on z.zxbh = r.zxbh
left join tb_wh_approve a on r.id = a.flow_no
where
1=1
<if test="zczxDto.cxlx!=null and zczxDto.cxlx=='2'.toString()">
......@@ -459,14 +468,14 @@
</if>
<if test="zczxDto.cxlx!=null and zczxDto.cxlx=='6'.toString()">
AND r.zczx_fxzt = '1'
</if>
<if test="zczxDto.cxlx!=null and zczxDto.cxlx=='7'.toString()">
AND r.zczx_fxzt = '1'
AND r.policemanid = #{zczxDto.zxdlrjh , jdbcType=VARCHAR }
<if test="zczxDto.auditStatus!=null and zczxDto.auditStatus!=''">
AND a.audit_status = #{zczxDto.auditStatus , jdbcType=VARCHAR }
</if>
</if>
<if test="zczxDto.zxbh!=null and zczxDto.zxbh!=''">
AND z.zxbh = #{zczxDto.zxbh , jdbcType=VARCHAR }
</if>
<if test="zczxDto.zxmc!=null and zczxDto.zxmc!=''">
AND z.zxmc = #{zczxDto.zxmc , jdbcType=VARCHAR }
</if>
......
service/publicapi/src/main/java/com/founder/publicapi/service/ApproveDetailService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.ApproveDetail;
/**
* @author Godffy
* @create 2023-06-25 16:01
*/
public interface ApproveDetailService extends IService<ApproveDetail> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/ApproveService.java 0 → 100644
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.Approve;
import com.founder.commonutils.model.zczxEntity.ApproveDto;
/**
* @author Godffy
* @create 2023-06-25 14:36
*/
public interface ApproveService extends IService<Approve> {
IPage<Approve> listApproveForPage(IPage page, ApproveDto approveDto);
}
service/publicapi/src/main/java/com/founder/publicapi/service/XcrwService.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.Xcrw;
import com.founder.commonutils.model.zczxEntity.XcrwDto;
/**
* @author Godffy
......@@ -10,4 +12,5 @@ import com.founder.commonutils.model.zczxEntity.Xcrw;
public interface XcrwService extends IService<Xcrw> {
IPage<Xcrw> listXcrwForPage(IPage page, XcrwDto xcrwDto);
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ApproveDetailServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.ApproveDetail;
import com.founder.publicapi.mapper.mysqlMapper.ApproveDetailMapper;
import com.founder.publicapi.service.ApproveDetailService;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-06-25 16:09
*/
@Service
public class ApproveDetailServiceImpl extends ServiceImpl<ApproveDetailMapper, ApproveDetail> implements ApproveDetailService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ApproveServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.commonutils.model.zczxEntity.Approve;
import com.founder.commonutils.model.zczxEntity.ApproveDto;
import com.founder.publicapi.mapper.mysqlMapper.ApproveMapper;
import com.founder.publicapi.service.ApproveService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* @author Godffy
* @create 2023-06-25 15:50
*/
@Service
public class ApproveServiceImpl extends ServiceImpl<ApproveMapper, Approve> implements ApproveService {
@Autowired
private ApproveMapper approveMapper;
/**
* 拥有一级审批角色的用户才可以看到该列表及进行操作（前端已控制）
* 1、审批主表(tb_wh_approve)连接业务表拿到业务数据信息
* 2、审批主表(tb_wh_approve)连接审批明细表(tb_wh_approve_detail)拿到审批节点详情
*
* 业务表：协查任务发送（tb_wh_xcrw)、侦查专项分享（tb_wh_zczx）
*
* 功能：
* 1：查看所有发给自己的未审批任务
*
* 审批类型（表明此条记录的审批类型）
* 1：侦查专项分享审批
* 2：技侦研判协查任务发送审批
* 3：市局网合网警协查任务发送审批
* 4：市局网合情报协查任务发送审批
* 5：分局网合协查任务发送审批
* 6：其他协查任务发送审批
* 7：移交审批
* 8：退回审批
*
* @param page
* @param approveDto
* @return
*/
@Override
public IPage<Approve> listApproveForPage(IPage page, ApproveDto approveDto) {
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String policemanid = user.getPolicemanid();
approveDto.setAuditUserId(policemanid);
IPage<Approve> result = this.approveMapper.listApproveForPage(page,approveDto);
return result;
}
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/XcrwServiceImpl.java
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.Xcrw;
import com.founder.commonutils.model.zczxEntity.XcrwDto;
import com.founder.publicapi.mapper.mysqlMapper.XcrwMapper;
import com.founder.publicapi.service.XcrwService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -17,5 +19,9 @@ public class XcrwServiceImpl extends ServiceImpl<XcrwMapper, Xcrw> implements Xc
@Autowired
private XcrwMapper xcrwMapper;
@Override
public IPage<Xcrw> listXcrwForPage(IPage page, XcrwDto xcrwDto) {
IPage<Xcrw> result = this.xcrwMapper.listXcrwForPage(page, xcrwDto);
return result;
}
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ZczxServiceImpl.java
......@@ -147,12 +147,12 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
*/
if (StringUtils.isNotBlank(zczxDto.getCxlx()) && "2".equals(zczxDto.getCxlx()) || StringUtils.isNotBlank(zczxDto.getCxlx()) && "3".equals(zczxDto.getCxlx())) {
String s = unitcode;
//全镇街的
//全镇街的,分享状态为0
if ("2".equals(zczxDto.getCxlx())) {
s = unitcode.substring(0, 6);
zczxDto.setUnitcode(s);
}
//我辖区的
//我辖区的,分享状态为0
if ("3".equals(zczxDto.getCxlx())) {
zczxDto.setUnitcode(s);
}
......@@ -190,6 +190,7 @@ public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements Zc
* 分享
* 1：某侦查专项分享给指定分局（侦查专项编号、侦查专项分享状态zczx_fxzt、机构代码、机构名称）
* 2：某侦查专项分享给指定某个人（侦查专项编号、侦查专项分享状态zczx_fxzt、警号）
* 分享状态为1，且分享审批状态要为已通过
*/
if (StringUtils.isNotBlank(zczxDto.getCxlx()) && "6".equals(zczxDto.getCxlx())) {
//机构代码前6位是分局单位
......
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