Skip to content

M
map-parent
Commit b544cc7a by Guojunfeng
Options

网合平台代码更新

parent ab072abc
Showing with 298 additions and 66 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Approve.java
......@@ -113,6 +113,18 @@ public class Approve extends Model<Approve> {
@ApiModelProperty(value = "审批申请单名称")
private String auditName;
@ApiModelProperty(value = "子任务编号")
private String subtaskId;
@ApiModelProperty(value = "目标接收人账号")
private String targetJsrzh;
/**
* 1.退回缘由
*/
@ApiModelProperty(value = "备注")
private String bz;
@ApiModelProperty(value = "审批人id（表示当前审批节点应该让谁来审批）")
@TableField(exist = false)
private String auditUserId;
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDto.java
......@@ -114,5 +114,13 @@ public class ApproveDto extends BaseDto {
@ApiModelProperty(value = "审批申请单名称")
private String auditName;
@ApiModelProperty(value = "审批人姓名")
private String auditUserName;
@ApiModelProperty(value = "子任务编号")
private String subtaskId;
@ApiModelProperty(value = "目标接收人账号")
private String targetJsrzh;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/SubTask.java
......@@ -19,7 +19,7 @@ import java.util.Date;
*/
@Data
@TableName("tb_wh_subtask")
@ApiModel(value = "子任务表(tb_wh_subtask)实体类",description = "")
@ApiModel(value = "子任务表(tb_wh_subtask)实体类", description = "")
public class SubTask extends Model<SubTask> {
@TableId(type = IdType.INPUT)
......@@ -165,7 +165,7 @@ public class SubTask extends Model<SubTask> {
private String ladw;
@ApiModelProperty(value = "立案日期")
private String larq;
private String larq;
@ApiModelProperty(value = "工作单位")
private String gzdw;
......@@ -253,7 +253,7 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
......@@ -270,7 +270,7 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
......@@ -337,6 +337,9 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "退回标志")
private String thbz;
@ApiModelProperty(value = "退回缘由")
private String thMessage;
@ApiModelProperty(value = "用户评价")
private String evaluation;
......@@ -348,27 +351,35 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "评价标志")
private String pjbz;
/**
* 评价等级
* 0：不及格
* 1：及格
*/
@ApiModelProperty(value = "评价等级")
private String pjdj;
@ApiModelProperty(value = "评价时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date pjsj;
@ApiModelProperty(value = "反馈时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date fksj;
@ApiModelProperty(value = "反馈次数")
private Integer fkcs;
private int fkcs;
@ApiModelProperty(value = "退回时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date thsj;
@ApiModelProperty(value = "移交时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date yjsj;
@ApiModelProperty(value = "主任务名称")
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/SubTaskDto.java
......@@ -337,6 +337,9 @@ public class SubTaskDto extends BaseDto {
@ApiModelProperty(value = "退回标志")
private String thbz;
@ApiModelProperty(value = "退回标志")
private String thMessage;
/**
* 评价标志
* 0：未评价
......@@ -345,6 +348,14 @@ public class SubTaskDto extends BaseDto {
@ApiModelProperty(value = "评价标志")
private String pjbz;
/**
* 评价等级
* 0：不及格
* 1：及格
*/
@ApiModelProperty(value = "评价等级")
private String pjdj;
@ApiModelProperty(value = "用户评价")
private String evaluation;
......@@ -367,4 +378,53 @@ public class SubTaskDto extends BaseDto {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zrwfkjssj;
//审批相关字段开始-------------------------------------------
@ApiModelProperty(value = "总审核节点（表明此审核业务的总共审核节点数）")
private String totalPoint;
@ApiModelProperty(value = "当前所在审核节点（表名此审核业务当前所处的节点）")
private String nowPoint;
@ApiModelProperty(value = "审批申请单名称")
private String auditName;
@ApiModelProperty(value = "审批人id（表示当前审批节点应该让谁来审批）")
private String auditUserId;
@ApiModelProperty(value = "审批人姓名")
private String auditUserName;
/**
* 审核人类型（表示当前节点审核时审核人的类型）
* 1：特指某人
* 2：具有某个角色（角色id可以存在audit_user_id，也可以新增一个角色id字段）
*/
@ApiModelProperty(value = "审核人类型（表示当前节点审核时审核人的类型）")
private String auditUserType;
@ApiModelProperty(value = "目标接收人账号")
private String targetJsrzh;
//审批相关字段结束-------------------------------------------
//反馈要前端传个人信息开始-------------------------------------------
@ApiModelProperty(value = "用户名")
private String username;
@ApiModelProperty(value = "真实姓名")
private String trueName;
@ApiModelProperty(value = "用户警号")
private String policemanid;
@ApiModelProperty(value = "单位代码")
private String unitcode;
@ApiModelProperty(value = "单位名称")
private String unitname;
//反馈要前端传个人信息结束-------------------------------------------
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwDto.java
......@@ -247,4 +247,22 @@ public class XcrwDto extends BaseDto {
*/
@ApiModelProperty(value = "审核进度")
private String auditStatus;
//反馈要前端传个人信息开始-------------------------------------------
@ApiModelProperty(value = "用户名")
private String username;
@ApiModelProperty(value = "真实姓名")
private String trueName;
@ApiModelProperty(value = "用户警号")
private String policemanid;
@ApiModelProperty(value = "单位代码")
private String unitcode;
@ApiModelProperty(value = "单位名称")
private String unitname;
//反馈要前端传个人信息结束-------------------------------------------
}
common/common_utils/src/main/java/com/founder/commonutils/util/Base64Util.java
......@@ -13,6 +13,8 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Base64;
import static com.founder.commonutils.util.CodeUtils.addZeroForNum;
/**
* Base64加密，解密
*/
......@@ -67,11 +69,19 @@ public class Base64Util {
}
public static void main(String[] args) {
System.out.println(Base64Util.encode("123456"));
System.out.println(Base64Util.decode("YmoxNTAxNDc="));
String str = "441978010400";
System.out.println(str.replaceAll("0+$", ""));//去掉后面全部0
String s = str.replaceAll("0+$", "");
String substring = s.substring(0, s.length() - 2);
System.out.println(substring);//去掉最后2位
System.out.println(addZeroForNum(substring, 12));//补全12位
// System.out.println(Base64Util.encode("dk123456"));
// System.out.println(Base64Util.decode("ZGsxMjM0NTY="));
System.out.println(Base64Util.encode("123456"));
System.out.println(Base64Util.decode("YmoxNTAxNDc="));
// System.out.println(Base64Util.encode("123456"));
// System.out.println(Base64Util.decode("YmoxNTAxNDc="));
}
......
common/common_utils/src/main/java/com/founder/commonutils/util/CodeUtils.java
......@@ -33,60 +33,61 @@ public class CodeUtils {
}
public static String getUuid(){
public static String getUuid() {
return UUID.randomUUID().toString().replace("-", "");
}
/**
*
* @Description: 生成唯一的主键 格式: 19位
*/
public static synchronized String getUUIDKey(String str) {
String uuid= System.currentTimeMillis()+ UUID.randomUUID().toString().replaceAll("-","").substring(0,6);
String uuid = System.currentTimeMillis() + UUID.randomUUID().toString().replaceAll("-", "").substring(0, 6);
return str + uuid;
}
public static String substrDwdm(String dwdm){
if (dwdm.endsWith("0000000000")){
dwdm = dwdm.substring(0,2);
}else if(dwdm.endsWith("00000000")){
dwdm = dwdm.substring(0,4);
}else if(dwdm.endsWith("000000")){
dwdm = dwdm.substring(0,6);
}else if(dwdm.endsWith("0000")){
dwdm = dwdm.substring(0,8);
}else if(dwdm.endsWith("00")){
dwdm = dwdm.substring(0,10);
public static String substrDwdm(String dwdm) {
if (dwdm.endsWith("0000000000")) {
dwdm = dwdm.substring(0, 2);
} else if (dwdm.endsWith("00000000")) {
dwdm = dwdm.substring(0, 4);
} else if (dwdm.endsWith("000000")) {
dwdm = dwdm.substring(0, 6);
} else if (dwdm.endsWith("0000")) {
dwdm = dwdm.substring(0, 8);
} else if (dwdm.endsWith("00")) {
dwdm = dwdm.substring(0, 10);
}
return dwdm;
}
/**
* 截取案件类别代码
*
* @param lbdm
* @return
*/
public static String substrAjldDm(String lbdm){
if (lbdm.endsWith("000000")){
lbdm = lbdm.substring(0,2);
}else if(lbdm.endsWith("0000")){
lbdm = lbdm.substring(0,4);
}else if(lbdm.endsWith("00")){
lbdm = lbdm.substring(0,6);
public static String substrAjldDm(String lbdm) {
if (lbdm.endsWith("000000")) {
lbdm = lbdm.substring(0, 2);
} else if (lbdm.endsWith("0000")) {
lbdm = lbdm.substring(0, 4);
} else if (lbdm.endsWith("00")) {
lbdm = lbdm.substring(0, 6);
}
return lbdm;
}
/**
* 截取行政区划代码
*
* @param xzqhDm
* @return
*/
public static String substrXzqhdm(String xzqhDm) {
if(xzqhDm.endsWith("0000")){
return xzqhDm.substring(0,2);
}else if(xzqhDm.endsWith("00")){
return xzqhDm.substring(0,4);
if (xzqhDm.endsWith("0000")) {
return xzqhDm.substring(0, 2);
} else if (xzqhDm.endsWith("00")) {
return xzqhDm.substring(0, 4);
}
return xzqhDm;
}
......@@ -112,4 +113,17 @@ public class CodeUtils {
return "(select name from sys_dictitem s where s.groupid = '" + groupid + "' and code = " + colunm + ") AS " + sb.toString() + "Str";
}
public static String addZeroForNum(String str, int strLength) {
int strLen = str.length();
if (strLen < strLength) {
while (strLen < strLength) {
StringBuffer sb = new StringBuffer();
sb.append(str).append("0");//右补0
str = sb.toString();
strLen = str.length();
}
}
return str;
}
}
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java
......@@ -18,6 +18,7 @@ import com.founder.servicebase.service.SysRoleService;
import com.founder.servicebase.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
......@@ -27,7 +28,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.founder.commonutils.util.AesEncryptUtil.desEncrypt;
......@@ -126,32 +126,47 @@ public class SysUserController extends ApiController {
@OperLog(message = "获取一级审批用户列表", operation = OperationType.QUERY)
@PostMapping("/getApproveUsers")
public MapRestResult getApproveUsers(@RequestBody SysUser sysUser) {
String id = sysUser.getId();
// String id = sysUser.getId();
String unitcode = sysUser.getUnitcode();
List<SysRole> rolesByUserId = sysRoleService.getRolesByUserId(id);//获取用户拥有的角色列表
//看列表中是否包含一级审批权限
List<String> approveIds = rolesByUserId.stream().map(SysRole::getId).collect(Collectors.toList());
boolean contains = approveIds.contains(WSWX_YJSP_ROLEID);//一级审批id
if (!contains) {
return MapRestResult.build(201, "用户没有审批权限", null);
}
// List<SysRole> rolesByUserId = sysRoleService.getRolesByUserId(id);//获取用户拥有的角色列表
// //看列表中是否包含一级审批权限
// List<String> approveIds = rolesByUserId.stream().map(SysRole::getId).collect(Collectors.toList());
// boolean contains = approveIds.contains(WSWX_YJSP_ROLEID);//一级审批id
// if (!contains) {
// return MapRestResult.build(201, "用户没有审批权限", null);
// }
unitcode = unitcode.substring(0, 6);//截取拿到分局层面代码
List<SysUser> users = sysUserService.getUsersByApprove(WSWX_YJSP_ROLEID, unitcode);
return MapRestResult.build(200, "获取一级审批用户列表", users);
}
//按条件查询用户表信息（不分页）
//用于
@ApiOperation(value = "按条件查询用户表信息")
@OperLog(message = "按条件查询用户表信息", operation = OperationType.QUERY)
@PostMapping("/selectUser")
public MapRestResult selectUser(@RequestBody SysUser sysUser) {
QueryWrapper<SysUser> qw = new QueryWrapper<>();
//用户单位
qw.likeRight(StringUtils.isNotBlank(sysUser.getUnitcode()),"unitcode",sysUser.getUnitcode());
qw.eq("scbz","0");//未删除
qw.eq("open_flag","1");//已激活
List<SysUser> list = this.sysUserService.list(qw);
return MapRestResult.build(200, "按条件查询用户表信息（不分页）", list);
}
/**
* 智侦用户表：sys_user
* 智侦角色表：sys_role
* 智侦用户角色表：sys_user_role
* 智侦权限表：sys_permission_new
* 角色和权限没关系，角色控制功能，权限控制菜单。
*
* @param id
* @return
*/
/**
* 智侦用户表：sys_user
* 智侦角色表：sys_role
* 智侦用户角色表：sys_user_role
* 智侦权限表：sys_permission_new
* 角色和权限没关系，角色控制功能，权限控制菜单。
*
* @param id
* @return
*/
//判断该登陆角色是否可以审批
@ApiOperation(value = "根据用户id获得该用户所拥有的的角色")
@OperLog(message = "根据用户id获得该用户所拥有的的角色", operation = OperationType.QUERY)
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ApproveController.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.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
......@@ -8,16 +9,15 @@ 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.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.SubTaskService;
import com.founder.publicapi.service.ZczxRoleService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
......@@ -49,6 +49,12 @@ public class ApproveController extends ApiController {
@Resource
private ZczxRoleService zczxRoleService;
@Resource
private SysUserService sysUserService;
@Resource
private SubTaskService subTaskService;
/**
* 审批类型（表明此条记录的审批类型，如流转审批、分享审批）
* 1：协查任务审批
......@@ -135,7 +141,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) throws Exception {
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
......@@ -175,9 +181,9 @@ public class ApproveController extends ApiController {
updateWrapper.eq("audit_id", approveDto.getId());//审批主键id
approveDetailService.update(approveDetail, updateWrapper);
//如果审批类型是“侦查专项取消分享审批” 且 审批状态是“审批通过”,去侦查专项角色表把对应的分享数据删掉
String auditType = approveDto.getAuditType();//审批类型
String auditStatus = approveDto.getAuditStatus();//审批状态
//如果审批类型是“侦查专项取消分享审批” 且 审批状态是“审批通过”,去侦查专项角色表(tb_wh_zczx_role)把对应的分享数据删掉
if (StringUtils.isNotBlank(auditType) && auditType.equals("9") && StringUtils.isNotBlank(auditStatus) && auditStatus.equals("2")) {
UpdateWrapper<ZczxRole> zczxRoleUpdateWrapper = new UpdateWrapper<>();
zczxRoleUpdateWrapper.eq("id", approveDto.getFlowNo());//审批编号(连接具体业务表的数据主键)
......@@ -187,7 +193,62 @@ public class ApproveController extends ApiController {
// String flowNo = approveDto.getFlowNo();//审批编号(连接具体业务表的数据主键)
// zczxRoleService.removeById(flowNo);
}
return new MapRestResult();
//如果审批类型时"移交" 且 审批状态是 "审批通过",去子任务表(tb_wh_subtask)把接收人等字段覆盖掉
if (StringUtils.isNotBlank(auditType) && auditType.equals("7") && StringUtils.isNotBlank(auditStatus) && auditStatus.equals("2")) {
String targetJsrzh = approveDto.getTargetJsrzh();//前端传入目标接收人账号(移交、退回使用字段)
//查一下用户表的信息
QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
sysUserQueryWrapper.eq("username", targetJsrzh);
sysUserQueryWrapper.eq("scbz", "0");
SysUser targetUser = this.sysUserService.getOne(sysUserQueryWrapper);
if (targetUser == null) {
//抛异常回滚
throw new Exception("目标账号不存在");
// return new MapRestResult(201,"目标账号不存在!",null);
}
UpdateWrapper<SubTask> subTaskUpdateWrapper = new UpdateWrapper<>();
subTaskUpdateWrapper.eq("id", approveDto.getFlowNo());//审批编号(连接具体业务表的数据主键)
SubTask subTask = new SubTask();
subTask.setJsrzh(targetJsrzh);//设置接收人账号
subTask.setJsrdwmc(targetUser.getUnitname());//接收人单位名称
subTask.setJsrdwdm(targetUser.getUnitcode());//接收人单位代码
subTask.setJsrjh(targetUser.getPolicemanid());//接收人警号
subTask.setJsrxm(targetUser.getTrueName());//接收人姓名
subTask.setJsrlxdh(targetUser.getTelephone());//接收人联系电话
subTask.setJsrsfzh(targetUser.getIdentitycard());//接收人证件号码
subTask.setYjbz("1");//移交标志设置为1,只能移交1次
subTask.setYjsj(new Date());
this.subTaskService.update(subTask,subTaskUpdateWrapper);
}
//退回
if (StringUtils.isNotBlank(auditType) && auditType.equals("8") && StringUtils.isNotBlank(auditStatus) && auditStatus.equals("2")) {
String targetJsrzh = approveDto.getTargetJsrzh();//前端传入目标接收人账号(移交、退回使用字段)
//查一下用户表的信息
QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
sysUserQueryWrapper.eq("username", targetJsrzh);
sysUserQueryWrapper.eq("scbz", "0");
SysUser targetUser = this.sysUserService.getOne(sysUserQueryWrapper);
if (targetUser == null) {
//抛异常回滚
throw new Exception("目标账号不存在");
// return new MapRestResult(201,"目标账号不存在!",null);
}
UpdateWrapper<SubTask> subTaskUpdateWrapper = new UpdateWrapper<>();
subTaskUpdateWrapper.eq("id", approveDto.getFlowNo());//审批编号(连接具体业务表的数据主键)
SubTask subTask = new SubTask();
subTask.setJsrzh(targetJsrzh);//设置接收人账号
subTask.setJsrdwmc(targetUser.getUnitname());//接收人单位名称
subTask.setJsrdwdm(targetUser.getUnitcode());//接收人单位代码
subTask.setJsrjh(targetUser.getPolicemanid());//接收人警号
subTask.setJsrxm(targetUser.getTrueName());//接收人姓名
subTask.setJsrlxdh(targetUser.getTelephone());//接收人联系电话
subTask.setJsrsfzh(targetUser.getIdentitycard());//接收人证件号码
this.subTaskService.update(subTask,subTaskUpdateWrapper);
}
return new MapRestResult();
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java
......@@ -211,7 +211,7 @@ public class XcrwController extends ApiController {
qw1.eq("XCRWBH", id);
qw1.eq("XXSC_PDBZ", "0");
qw1.eq("FILE_TYPE", "1");
// queryWrapper.select(XcrwFile.class, info -> !info.getColumn().equals("FILE_CONTENT"));
qw1.select(XcrwFile.class, info -> !info.getColumn().equals("file_content"));
List<XcrwFile> sqdList = xcrwFileService.list(qw1);
//2.协查任务反馈单
......@@ -219,6 +219,8 @@ public class XcrwController extends ApiController {
qw2.eq("XCRWBH", id);
qw2.eq("XXSC_PDBZ", "0");
qw2.eq("FILE_TYPE", "2");
qw2.select(XcrwFile.class, info -> !info.getColumn().equals("file_content"));
List<XcrwFile> fkdList = xcrwFileService.list(qw2);
Xcrw xcrw = records.get(i);
xcrw.setXcrwSqd(sqdList);
......@@ -241,6 +243,7 @@ public class XcrwController extends ApiController {
@OperLog(message = "协查结果反馈", operation = OperationType.UPDATE)
@Transactional
public MapRestResult feedback(XcrwDto xcrwDto) {
String xcrwbh = xcrwDto.getXcrwbh();
Xcrw xcrw = this.xcrwService.getById(xcrwbh);
if (null == xcrw) {
......@@ -255,7 +258,16 @@ public class XcrwController extends ApiController {
return new MapRestResult().error("协查任务已退回");
}
BeanUtil.copyProperties(xcrwDto, xcrw);
//重点：把该条子任务的接收人账号更新为当前反馈的这个人的用户名
xcrw.setXcrwjsrzh(xcrwDto.getUsername());//用户名
xcrw.setXcrwfkrxm(xcrwDto.getTrueName());//姓名
xcrw.setXcrwfkrjh(xcrwDto.getPolicemanid());//姓名
xcrw.setXcrwfkrdwdm(xcrwDto.getUnitcode());//单位代码
xcrw.setXcrwfkrdwmc(xcrwDto.getUnitname());//单位名称
xcrw.setXcrwjssj(new Date());//协查任务反馈后就结束了
xcrw.setXcrwFkzt("1");//设置协查任务反馈判断标志为1，代表已反馈
//更新协查任务信息
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java
......@@ -255,7 +255,7 @@ public class ZczxController extends ApiController {
approveDetail.setId(approveDetailNo);//审批明细表主键
approveDetail.setAuditId(approveNo);//连接审批主表主键
approveDetail.setAuditUserId(approveDto.getAuditUserId());//由谁审批
approveDetail.setAuditUserName(trueName);//审批人
approveDetail.setAuditUserName(approveDto.getAuditUserName());//审批人名字
approveDetail.setLrr(trueName);
approveDetail.setLrrjh(policemanid);
approveDetail.setLrrdwdm(unitcode);
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ApproveMapper.xml
......@@ -35,6 +35,9 @@
wa.zxmc,
wa.xcrwbh,
wa.xcrwmc,
wa.subtask_id,
wa.target_jsrzh,
wa.bz,
ad.audit_user_id,
ad.audit_time,
ad.audit_opinion,
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SubTaskMapper.xml
......@@ -97,7 +97,15 @@
s.yjbz,
s.thbz,
s.evaluation,
s.fkcs,
s.fksj,
s.thsj,
s.yjsj,
s.pjsj,
s.pjbz,
s.pjdj,
s.main_id,
s.th_message,
m.task_name,
m.task_type,
m.task_content
......
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