下级已办待办查询

This commit is contained in:
黎润豪 2026-02-27 17:07:44 +08:00
parent ab4f176840
commit 0f901b0bf6
2 changed files with 268 additions and 194 deletions

View File

@ -9,9 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaweal.aiccs.aiccs.abnormal.entity.Gzaiccode;
import com.chinaweal.aiccs.aiccs.abnormal.entity.TSAbnList; import com.chinaweal.aiccs.aiccs.abnormal.entity.TSAbnList;
import com.chinaweal.aiccs.aiccs.abnormal.entity.dto.ToIncludeAbnDto;
import com.chinaweal.aiccs.aiccs.abnormal.entity.excel.AbnListExcel; import com.chinaweal.aiccs.aiccs.abnormal.entity.excel.AbnListExcel;
import com.chinaweal.aiccs.aiccs.abnormal.entity.vo.XyxfCqDto; import com.chinaweal.aiccs.aiccs.abnormal.entity.vo.XyxfCqDto;
import com.chinaweal.aiccs.aiccs.abnormal.mapper.TSBizRemListMapper; import com.chinaweal.aiccs.aiccs.abnormal.mapper.TSBizRemListMapper;
@ -34,9 +32,8 @@ import com.chinaweal.aiccs.aiccs.business.service.WorkFlowService;
import com.chinaweal.aiccs.aiccs.fraudreg.entity.TFraudCheck; import com.chinaweal.aiccs.aiccs.fraudreg.entity.TFraudCheck;
import com.chinaweal.aiccs.aiccs.fraudreg.service.ITFraudCheckService; import com.chinaweal.aiccs.aiccs.fraudreg.service.ITFraudCheckService;
import com.chinaweal.aiccs.aiccs.market.entity.TSUsualInspect; import com.chinaweal.aiccs.aiccs.market.entity.TSUsualInspect;
import com.chinaweal.aiccs.aiccs.market.service.ITSUsualInspectService;
import com.chinaweal.aiccs.aiccs.market.entity.TSSueInspect;
import com.chinaweal.aiccs.aiccs.market.service.ITSSueInspectService; import com.chinaweal.aiccs.aiccs.market.service.ITSSueInspectService;
import com.chinaweal.aiccs.aiccs.market.service.ITSUsualInspectService;
import com.chinaweal.aiccs.aiccs.system.entity.DeadlineStas; import com.chinaweal.aiccs.aiccs.system.entity.DeadlineStas;
import com.chinaweal.aiccs.aiccs.system.service.DeadlinestasService; import com.chinaweal.aiccs.aiccs.system.service.DeadlinestasService;
import com.chinaweal.aiccs.common.base.controller.BaseController; import com.chinaweal.aiccs.common.base.controller.BaseController;
@ -51,11 +48,8 @@ import com.chinaweal.aiccs.org.service.TUsersService;
import com.chinaweal.aiccs.outside.service.SMSServiceImpl; import com.chinaweal.aiccs.outside.service.SMSServiceImpl;
import com.chinaweal.aiccs.outside.service.TfRevokeServicelmpl; import com.chinaweal.aiccs.outside.service.TfRevokeServicelmpl;
import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.aicorg.model.AICUser;
import com.chinaweal.aicorg.pojo.AICPermission;
import com.chinaweal.youfool.framework.springboot.exception.custom.BusinessException;
import com.chinaweal.youfool.framework.springboot.mybatis.plus.page.PageRequestDto; import com.chinaweal.youfool.framework.springboot.mybatis.plus.page.PageRequestDto;
import com.chinaweal.youfool.framework.springboot.rest.RestResult; import com.chinaweal.youfool.framework.springboot.rest.RestResult;
import com.chinaweal.youfool.framework.springboot.rest.ResultCode;
import com.chinaweal.youfool.framework.springboot.util.AssertUtils; import com.chinaweal.youfool.framework.springboot.util.AssertUtils;
import com.chinaweal.youfool.framework.sso.util.SSOUtil; import com.chinaweal.youfool.framework.sso.util.SSOUtil;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -69,7 +63,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -215,25 +208,25 @@ public class TaskController extends BaseController {
Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap(); Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap();
if(customParamMap != null && customParamMap.get("UNISCIDORREGNO")!=null){ if (customParamMap != null && customParamMap.get("UNISCIDORREGNO") != null) {
if (StringUtils.isNotBlank(customParamMap.get("UNISCIDORREGNO").toString())) { if (StringUtils.isNotBlank(customParamMap.get("UNISCIDORREGNO").toString())) {
String uscc = customParamMap.get("UNISCIDORREGNO").toString(); String uscc = customParamMap.get("UNISCIDORREGNO").toString();
if(StringUtils.isUscc(uscc)){ if (StringUtils.isUscc(uscc)) {
customParamMap.put("UNISCID",uscc); customParamMap.put("UNISCID", uscc);
}else { } else {
customParamMap.put("REGNO",uscc); customParamMap.put("REGNO", uscc);
} }
} }
} }
// 处理业务类型、业务状态查询参数 // 处理业务类型、业务状态查询参数
AICUser aicUser = getLoginUser(request); AICUser aicUser = getLoginUser(request);
if(customParamMap != null && customParamMap.get("bustype") != null && customParamMap.get("busstatus") != null && customParamMap.get("bustypeAndCurrentNode") != null){ if (customParamMap != null && customParamMap.get("bustype") != null && customParamMap.get("busstatus") != null && customParamMap.get("bustypeAndCurrentNode") != null) {
Object bustypeAndStatus1 = customParamMap.get("bustypeAndStatus"); Object bustypeAndStatus1 = customParamMap.get("bustypeAndStatus");
if (bustypeAndStatus1 instanceof List<?>) { if (bustypeAndStatus1 instanceof List<?>) {
if(((List<?>) bustypeAndStatus1).size() > 0) { if (((List<?>) bustypeAndStatus1).size() > 0) {
String bustype = StringUtils.tranObject(((List<?>) bustypeAndStatus1).get(0)); String bustype = StringUtils.tranObject(((List<?>) bustypeAndStatus1).get(0));
customParamMap.put("bustype", bustype); customParamMap.put("bustype", bustype);
if(((List<?>) bustypeAndStatus1).size() > 1) { if (((List<?>) bustypeAndStatus1).size() > 1) {
String currentNodeOrBizStatus = StringUtils.tranObject(((List<?>) bustypeAndStatus1).get(1)); String currentNodeOrBizStatus = StringUtils.tranObject(((List<?>) bustypeAndStatus1).get(1));
customParamMap.put("currentNodeOrBizStatus", currentNodeOrBizStatus); customParamMap.put("currentNodeOrBizStatus", currentNodeOrBizStatus);
} }
@ -248,7 +241,7 @@ public class TaskController extends BaseController {
if (customParamMap != null && customParamMap.get("type") != null && "repair".equals(customParamMap.get("type"))) { if (customParamMap != null && customParamMap.get("type") != null && "repair".equals(customParamMap.get("type"))) {
//处理年报申请过来的信用修复待办 //处理年报申请过来的信用修复待办
//倒计时工作日开关 //倒计时工作日开关
boolean isGzrNum = customParamMap.containsKey("gzrNumSwitch") && (boolean)customParamMap.get("gzrNumSwitch"); boolean isGzrNum = customParamMap.containsKey("gzrNumSwitch") && (boolean) customParamMap.get("gzrNumSwitch");
if (isGzrNum) { if (isGzrNum) {
int gzrNum = (int) customParamMap.get("gzrNum"); int gzrNum = (int) customParamMap.get("gzrNum");
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@ -262,25 +255,25 @@ public class TaskController extends BaseController {
} }
} }
//是否显示下级单位的待办 //是否显示下级单位的待办
boolean isChildUnit = customParamMap.containsKey("childUnitSwitch") && (boolean)customParamMap.get("childUnitSwitch"); boolean isChildUnit = customParamMap.containsKey("childUnitSwitch") && (boolean) customParamMap.get("childUnitSwitch");
if (isChildUnit) { //查下级待办 if (isChildUnit) { //查下级待办
customParamMap.put("checkChildUnit","1"); customParamMap.put("checkChildUnit", "1");
//这一步进行判断,且允许上级办理下级的信用修复 //这一步进行判断,且允许上级办理下级的信用修复
map.put("orgNumber", aicUser.getRegionID()); map.put("orgNumber", aicUser.getRegionID());
OrgUnits org = aicorgService.queryByOrgNumberMap(map); OrgUnits org = aicorgService.queryByOrgNumberMap(map);
Integer orgLevel = org.getOrgLevel(); Integer orgLevel = org.getOrgLevel();
//根据机构等级判断 //根据机构等级判断
if (orgLevel == 1) { //省局 if (orgLevel == 1) { //省局
customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 2)+"%"); customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 2) + "%");
} else if (orgLevel == 2) { //市局 } else if (orgLevel == 2) { //市局
customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 4)+"%"); customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 4) + "%");
} else if (orgLevel == 3) { //区局 } else if (orgLevel == 3) { //区局
customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 6)+"%"); customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 6) + "%");
} else if (orgLevel >= 4) { //所 } else if (orgLevel >= 4) { //所
customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 6)+"%"); customParamMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 6) + "%");
} }
} else { } else {
customParamMap.put("checkChildUnit","0"); customParamMap.put("checkChildUnit", "0");
customParamMap.put("areaCode", aicUser.getRegionID()); customParamMap.put("areaCode", aicUser.getRegionID());
} }
} }
@ -291,9 +284,9 @@ public class TaskController extends BaseController {
} }
IPage<TaskListUnionDto> page = taskListService.searchUnionTaskPage(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), taskListParam, customParamMap); IPage<TaskListUnionDto> page = taskListService.searchUnionTaskPage(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), taskListParam, customParamMap);
List<TaskListUnionDto> taskListUnionDtoList = page.getRecords(); List<TaskListUnionDto> taskListUnionDtoList = page.getRecords();
for(TaskListUnionDto taskListUnionDto : taskListUnionDtoList){ for (TaskListUnionDto taskListUnionDto : taskListUnionDtoList) {
List<TSOpinion> tsOpinions = tsOpinionService.queryByWorkflowId(taskListUnionDto.getWorkflowid()); List<TSOpinion> tsOpinions = tsOpinionService.queryByWorkflowId(taskListUnionDto.getWorkflowid());
if(tsOpinions.size()>0){ if (tsOpinions.size() > 0) {
TSOpinion tsOpinion = tsOpinions.get(0); TSOpinion tsOpinion = tsOpinions.get(0);
taskListUnionDto.setIsagree(tsOpinion.getIsagree()); taskListUnionDto.setIsagree(tsOpinion.getIsagree());
} }
@ -304,13 +297,15 @@ public class TaskController extends BaseController {
case "12": case "12":
taskListUnionDto.setBusname(tsBizRemListMapper.queryLerep(taskListUnionDto.getBizseqid())); taskListUnionDto.setBusname(tsBizRemListMapper.queryLerep(taskListUnionDto.getBizseqid()));
break; break;
default: break; default:
break;
} }
} }
if (BaseDataConstant.MARKET_INSPECT.equals(taskListUnionDto.getBustype())) { if (BaseDataConstant.MARKET_INSPECT.equals(taskListUnionDto.getBustype())) {
TSUsualInspect tsUsualInspect = itsUsualInspectService.getById(taskListUnionDto.getBizseqid()); TSUsualInspect tsUsualInspect = itsUsualInspectService.getById(taskListUnionDto.getBizseqid());
// 回退待核查 // 回退待核查
if (tsUsualInspect != null && StringUtils.isNotBlank(tsUsualInspect.getBackOpinion())) taskListUnionDto.setCurrentNodeOrBizStatus("bak-startInspect"); if (tsUsualInspect != null && StringUtils.isNotBlank(tsUsualInspect.getBackOpinion()))
taskListUnionDto.setCurrentNodeOrBizStatus("bak-startInspect");
} }
if (taskListUnionDto.getDeadlineDate() != null) { if (taskListUnionDto.getDeadlineDate() != null) {
Date startDate = new DateTime(taskListUnionDto.getDeadlineDate()); Date startDate = new DateTime(taskListUnionDto.getDeadlineDate());
@ -325,7 +320,7 @@ public class TaskController extends BaseController {
//补充受理机关中文(信用修复) //补充受理机关中文(信用修复)
map.put("orgNumber", taskListUnionDto.getAreaCode()); map.put("orgNumber", taskListUnionDto.getAreaCode());
OrgUnits org = aicorgService.queryByOrgNumberMap(map); OrgUnits org = aicorgService.queryByOrgNumberMap(map);
taskListUnionDto.setAreaCode(org==null?"":org.getOrgUnitName()); taskListUnionDto.setAreaCode(org == null ? "" : org.getOrgUnitName());
} }
return page; return page;
} }
@ -341,25 +336,25 @@ public class TaskController extends BaseController {
Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap(); Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap();
customParamMap.put("areaCode", curUser.getRegionID()); customParamMap.put("areaCode", curUser.getRegionID());
if(customParamMap != null && customParamMap.get("UNISCIDORREGNO")!=null){ if (customParamMap != null && customParamMap.get("UNISCIDORREGNO") != null) {
if (StringUtils.isNotBlank(customParamMap.get("UNISCIDORREGNO").toString())) { if (StringUtils.isNotBlank(customParamMap.get("UNISCIDORREGNO").toString())) {
String uscc = customParamMap.get("UNISCIDORREGNO").toString(); String uscc = customParamMap.get("UNISCIDORREGNO").toString();
if(StringUtils.isUscc(uscc)){ if (StringUtils.isUscc(uscc)) {
customParamMap.put("UNISCID",uscc); customParamMap.put("UNISCID", uscc);
}else { } else {
customParamMap.put("REGNO",uscc); customParamMap.put("REGNO", uscc);
} }
} }
} }
// 处理业务类型、业务状态查询参数 // 处理业务类型、业务状态查询参数
if(customParamMap != null && customParamMap.get("bustypeAndStatus") != null){ if (customParamMap != null && customParamMap.get("bustypeAndStatus") != null) {
Object bustypeAndStatus1 = customParamMap.get("bustypeAndStatus"); Object bustypeAndStatus1 = customParamMap.get("bustypeAndStatus");
if (bustypeAndStatus1 instanceof List<?>) { if (bustypeAndStatus1 instanceof List<?>) {
if(((List<?>) bustypeAndStatus1).size() > 0) { if (((List<?>) bustypeAndStatus1).size() > 0) {
String bustype = StringUtils.tranObject(((List<?>) bustypeAndStatus1).get(0)); String bustype = StringUtils.tranObject(((List<?>) bustypeAndStatus1).get(0));
customParamMap.put("bustype", bustype); customParamMap.put("bustype", bustype);
if(((List<?>) bustypeAndStatus1).size() > 1) { if (((List<?>) bustypeAndStatus1).size() > 1) {
String currentNodeOrBizStatus = StringUtils.tranObject(((List<?>) bustypeAndStatus1).get(1)); String currentNodeOrBizStatus = StringUtils.tranObject(((List<?>) bustypeAndStatus1).get(1));
customParamMap.put("currentNodeOrBizStatus", currentNodeOrBizStatus); customParamMap.put("currentNodeOrBizStatus", currentNodeOrBizStatus);
} }
@ -371,9 +366,9 @@ public class TaskController extends BaseController {
// 单独获取信用风险分类监管待办 // 单独获取信用风险分类监管待办
int risk = taskListService.getRiskStatistic(customParamMap); int risk = taskListService.getRiskStatistic(customParamMap);
Map<String,Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map = taskListService.unionTaskPageStatistic(customParamMap); map = taskListService.unionTaskPageStatistic(customParamMap);
map.put("risknum",risk); map.put("risknum", risk);
return RestResult.ok(map); return RestResult.ok(map);
} }
@ -402,17 +397,17 @@ public class TaskController extends BaseController {
String searchName = ""; String searchName = "";
String acceptno = ""; String acceptno = "";
if(customParamMap != null){ if (customParamMap != null) {
bustype = StringUtils.tranObject(customParamMap.get("bustype")); bustype = StringUtils.tranObject(customParamMap.get("bustype"));
searchName = StringUtils.tranObject(customParamMap.get("searchName")); searchName = StringUtils.tranObject(customParamMap.get("searchName"));
acceptno = StringUtils.tranObject(customParamMap.get("acceptno")); acceptno = StringUtils.tranObject(customParamMap.get("acceptno"));
} }
// 获取待办分页 // 获取待办分页
LambdaQueryWrapper<TSTaskList> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TSTaskList> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TSTaskList::getBusstatus,"2") wrapper.eq(TSTaskList::getBusstatus, "2")
.eq(StringUtils.isNotBlank(bustype),TSTaskList::getBustype,bustype) .eq(StringUtils.isNotBlank(bustype), TSTaskList::getBustype, bustype)
.eq(StringUtils.isNotBlank(acceptno),TSTaskList::getAcceptno,acceptno) .eq(StringUtils.isNotBlank(acceptno), TSTaskList::getAcceptno, acceptno)
.eq(StringUtils.isNotBlank(searchName),TSTaskList::getBusname,searchName) .eq(StringUtils.isNotBlank(searchName), TSTaskList::getBusname, searchName)
.orderByDesc(TSTaskList::getLauptime); .orderByDesc(TSTaskList::getLauptime);
IPage<TSTaskList> page = taskListService.page(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), wrapper); IPage<TSTaskList> page = taskListService.page(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), wrapper);
@ -453,33 +448,33 @@ public class TaskController extends BaseController {
Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap(); Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap();
if(customParamMap != null && customParamMap.get("UNISCIDORREGNO")!=null){ if (customParamMap != null && customParamMap.get("UNISCIDORREGNO") != null) {
if (StringUtils.isNotBlank(customParamMap.get("UNISCIDORREGNO").toString())) { if (StringUtils.isNotBlank(customParamMap.get("UNISCIDORREGNO").toString())) {
String uscc = customParamMap.get("UNISCIDORREGNO").toString(); String uscc = customParamMap.get("UNISCIDORREGNO").toString();
if(StringUtils.isUscc(uscc)){ if (StringUtils.isUscc(uscc)) {
customParamMap.put("UNISCID",uscc); customParamMap.put("UNISCID", uscc);
}else { } else {
customParamMap.put("REGNO",uscc); customParamMap.put("REGNO", uscc);
} }
} }
} }
// 处理业务类型、业务状态查询参数 // 处理业务类型、业务状态查询参数
if(customParamMap != null && customParamMap.get("bustypeAndCurrentNode") != null){ if (customParamMap != null && customParamMap.get("bustypeAndCurrentNode") != null) {
Object bustypeAndCurrentNode = customParamMap.get("bustypeAndCurrentNode"); Object bustypeAndCurrentNode = customParamMap.get("bustypeAndCurrentNode");
if (bustypeAndCurrentNode instanceof List<?>) { if (bustypeAndCurrentNode instanceof List<?>) {
if(((List<?>) bustypeAndCurrentNode).size() > 0) { if (((List<?>) bustypeAndCurrentNode).size() > 0) {
String bustype = StringUtils.tranObject(((List<?>) bustypeAndCurrentNode).get(0)); String bustype = StringUtils.tranObject(((List<?>) bustypeAndCurrentNode).get(0));
customParamMap.put("bustype", bustype); customParamMap.put("bustype", bustype);
if(((List<?>) bustypeAndCurrentNode).size() > 1) { if (((List<?>) bustypeAndCurrentNode).size() > 1) {
String currentNode = StringUtils.tranObject(((List<?>) bustypeAndCurrentNode).get(1)); String currentNode = StringUtils.tranObject(((List<?>) bustypeAndCurrentNode).get(1));
if("noAccept".equals(currentNode)){ if ("noAccept".equals(currentNode)) {
customParamMap.put("currentNode","endDissent"); customParamMap.put("currentNode", "endDissent");
customParamMap.put("lastNode","handleDissentAccept"); customParamMap.put("lastNode", "handleDissentAccept");
}else if("noRegister".equals(currentNode)) { } else if ("noRegister".equals(currentNode)) {
customParamMap.put("currentNode","endRevoke"); customParamMap.put("currentNode", "endRevoke");
customParamMap.put("lastNode","noRegister"); customParamMap.put("lastNode", "noRegister");
}else { } else {
customParamMap.put("currentNode", currentNode); customParamMap.put("currentNode", currentNode);
} }
} }
@ -487,12 +482,20 @@ public class TaskController extends BaseController {
} }
} }
if(customParamMap != null && customParamMap.get("createDate") != null){ if (customParamMap != null && customParamMap.get("createDate") != null) {
Object searchDate = customParamMap.get("createDate"); Object searchDate = customParamMap.get("createDate");
if(searchDate instanceof List){ if (searchDate instanceof List) {
List<String> list = (List<String>) searchDate; List<String> list = (List<String>) searchDate;
customParamMap.put("startDate",list.get(0)); customParamMap.put("startDate", list.get(0));
customParamMap.put("endDate",list.get(1)); customParamMap.put("endDate", list.get(1));
}
}
if (customParamMap != null && customParamMap.containsKey("childUnitSwitch")) {
String myOrgNumber = StringUtils.clearRegionZero(curUser.getRegionID());
if (StringUtils.isNotBlank(myOrgNumber)) {
customParamMap.put("myOrgNumber", myOrgNumber);
customParamMap.put("myOrgNumberLike", myOrgNumber + "%");
} }
} }
@ -502,11 +505,11 @@ public class TaskController extends BaseController {
page.getRecords().forEach(each -> { page.getRecords().forEach(each -> {
if (BaseDataConstant.SERILLEGAL_TYPE_ENTERSERILLEGAL.equals(each.getBustype())) { // 严重违法列入 if (BaseDataConstant.SERILLEGAL_TYPE_ENTERSERILLEGAL.equals(each.getBustype())) { // 严重违法列入
if (!FlowUtil.SERIOUS_ILLEGAL_CITY_EXAMINE_SUCCESS.equals(each.getCurrentNodeOrBizStatus()) && if (!FlowUtil.SERIOUS_ILLEGAL_CITY_EXAMINE_SUCCESS.equals(each.getCurrentNodeOrBizStatus()) &&
!FlowUtil.SERIOUS_ILLEGAL_ENDARCHIVES.equals(each.getCurrentNode())) { // 不是市局的审批通过待归档 和 归档状态 !FlowUtil.SERIOUS_ILLEGAL_ENDARCHIVES.equals(each.getCurrentNode())) { // 不是市局的审批通过待归档 和 归档状态
// 判断是否通过第一伦区局审批 // 判断是否通过第一伦区局审批
List<TSTwfProcessNode> nodes = tsTwfProcessNodeService.list( List<TSTwfProcessNode> nodes = tsTwfProcessNodeService.list(
new LambdaQueryWrapper<TSTwfProcessNode>().eq(TSTwfProcessNode::getProcessid, each.getWorkflowid()) new LambdaQueryWrapper<TSTwfProcessNode>().eq(TSTwfProcessNode::getProcessid, each.getWorkflowid())
.eq(TSTwfProcessNode::getCurrentnode,FlowUtil.SERIOUS_ILLEGAL_BUREAU_EXAMINE_SUCCESS)); .eq(TSTwfProcessNode::getCurrentnode, FlowUtil.SERIOUS_ILLEGAL_BUREAU_EXAMINE_SUCCESS));
if (nodes.size() > 0) { if (nodes.size() > 0) {
each.setIsPrint("1"); each.setIsPrint("1");
} }
@ -548,7 +551,7 @@ public class TaskController extends BaseController {
boolean flag0 = false; boolean flag0 = false;
boolean flag1 = false; boolean flag1 = false;
boolean flag2 = false; boolean flag2 = false;
if(tsTaskList.getBustype().equals("5") || tsTaskList.getBustype().equals("71")){ if (tsTaskList.getBustype().equals("5") || tsTaskList.getBustype().equals("71")) {
//将最新同意意见加入结果resultList //将最新同意意见加入结果resultList
for (TSOpinion item : list) { for (TSOpinion item : list) {
if ("1".equals(item.getOpiniontype()) && !flag0) { if ("1".equals(item.getOpiniontype()) && !flag0) {
@ -564,7 +567,7 @@ public class TaskController extends BaseController {
flag2 = true; flag2 = true;
} }
} }
}else { } else {
//将最新同意意见加入结果resultList //将最新同意意见加入结果resultList
for (TSOpinion item : list) { for (TSOpinion item : list) {
if ("0".equals(item.getOpiniontype()) && !flag0) { if ("0".equals(item.getOpiniontype()) && !flag0) {
@ -620,65 +623,65 @@ public class TaskController extends BaseController {
* @since 2021年6月29日 21:32:33 * @since 2021年6月29日 21:32:33
*/ */
@PostMapping("getAbnormal2") @PostMapping("getAbnormal2")
public RestResult<?> getAbnormal2( String aicUserId) { public RestResult<?> getAbnormal2(String aicUserId) {
Map<String,Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
//企业异常名录列入 //企业异常名录列入
String yclrStr = "5"; String yclrStr = "5";
List<TaskListUnionDto> yclr = taskListService.searchUnionTaskList(yclrStr,aicUserId); List<TaskListUnionDto> yclr = taskListService.searchUnionTaskList(yclrStr, aicUserId);
//企业异常名录异议 //企业异常名录异议
String ycyyStr = "6"; String ycyyStr = "6";
List<TaskListUnionDto> ycyy = taskListService.searchUnionTaskList(ycyyStr,aicUserId); List<TaskListUnionDto> ycyy = taskListService.searchUnionTaskList(ycyyStr, aicUserId);
//企业异常名录移除 //企业异常名录移除
String ycycStr = "7"; String ycycStr = "7";
List<TaskListUnionDto> ycyc = taskListService.searchUnionTaskList(ycycStr,aicUserId); List<TaskListUnionDto> ycyc = taskListService.searchUnionTaskList(ycycStr, aicUserId);
//个体工商户标记 //个体工商户标记
String gtbjStr = "11"; String gtbjStr = "11";
List<TaskListUnionDto> gtbj = taskListService.searchUnionTaskList(gtbjStr,aicUserId); List<TaskListUnionDto> gtbj = taskListService.searchUnionTaskList(gtbjStr, aicUserId);
//个体工商户恢复 //个体工商户恢复
String gthfStr = "12"; String gthfStr = "12";
List<TaskListUnionDto> gthf = taskListService.searchUnionTaskList(gthfStr,aicUserId); List<TaskListUnionDto> gthf = taskListService.searchUnionTaskList(gthfStr, aicUserId);
//农专列入 //农专列入
String nzlrStr = "13"; String nzlrStr = "13";
List<TaskListUnionDto> nzlr = taskListService.searchUnionTaskList(nzlrStr,aicUserId); List<TaskListUnionDto> nzlr = taskListService.searchUnionTaskList(nzlrStr, aicUserId);
//农专移出 //农专移出
String nzycStr = "14"; String nzycStr = "14";
List<TaskListUnionDto> nzyc = taskListService.searchUnionTaskList(nzycStr,aicUserId); List<TaskListUnionDto> nzyc = taskListService.searchUnionTaskList(nzycStr, aicUserId);
//严重违法列入 //严重违法列入
String yzwflrStr = "15"; String yzwflrStr = "15";
List<TaskListUnionDto> yzwflr = taskListService.searchUnionTaskList(yzwflrStr,aicUserId); List<TaskListUnionDto> yzwflr = taskListService.searchUnionTaskList(yzwflrStr, aicUserId);
//严重违法异议 //严重违法异议
String yzwfyyStr = "16"; String yzwfyyStr = "16";
List<TaskListUnionDto> yzwfyy = taskListService.searchUnionTaskList(yzwfyyStr,aicUserId); List<TaskListUnionDto> yzwfyy = taskListService.searchUnionTaskList(yzwfyyStr, aicUserId);
//严重违法移除 //严重违法移除
String yzwfycStr = "17"; String yzwfycStr = "17";
List<TaskListUnionDto> yzwfyc = taskListService.searchUnionTaskList(yzwfycStr,aicUserId); List<TaskListUnionDto> yzwfyc = taskListService.searchUnionTaskList(yzwfycStr, aicUserId);
//冒用他人信息 //冒用他人信息
String myxxcStr = "31"; String myxxcStr = "31";
List<TaskListUnionDto> myxx = taskListService.searchUnionTaskList(myxxcStr,aicUserId); List<TaskListUnionDto> myxx = taskListService.searchUnionTaskList(myxxcStr, aicUserId);
//批量吊销 //批量吊销
String pldxStr = "51"; String pldxStr = "51";
List<TaskListUnionDto> pldx = taskListService.searchUnionTaskList(pldxStr,aicUserId); List<TaskListUnionDto> pldx = taskListService.searchUnionTaskList(pldxStr, aicUserId);
//问题处置反馈 //问题处置反馈
String wtczfk = "32"; String wtczfk = "32";
List<TaskListUnionDto> wtcz = taskListService.searchUnionTaskList(wtczfk,aicUserId); List<TaskListUnionDto> wtcz = taskListService.searchUnionTaskList(wtczfk, aicUserId);
//信用修复 //信用修复
String xyxf = "33"; String xyxf = "33";
List<TaskListUnionDto> xyxF = taskListService.searchUnionTaskList(xyxf,aicUserId); List<TaskListUnionDto> xyxF = taskListService.searchUnionTaskList(xyxf, aicUserId);
//总局一体化 //总局一体化
String zjyth = "30"; String zjyth = "30";
List<TaskListUnionDto> zjytH = taskListService.searchUnionTaskList(zjyth,aicUserId); List<TaskListUnionDto> zjytH = taskListService.searchUnionTaskList(zjyth, aicUserId);
//异议申请 //异议申请
List<TaskListUnionDto> yysq = taskListService.searchCheckList(aicUserId); List<TaskListUnionDto> yysq = taskListService.searchCheckList(aicUserId);
//联合惩戒锁定 //联合惩戒锁定
String lhcjsd = "61"; String lhcjsd = "61";
List<TaskListUnionDto> lhcjsD = taskListService.searchUnionTaskList(lhcjsd,aicUserId); List<TaskListUnionDto> lhcjsD = taskListService.searchUnionTaskList(lhcjsd, aicUserId);
//联合惩戒解锁 //联合惩戒解锁
String lhcjjs = "62"; String lhcjjs = "62";
List<TaskListUnionDto> lhcjjS = taskListService.searchUnionTaskList(lhcjjs,aicUserId); List<TaskListUnionDto> lhcjjS = taskListService.searchUnionTaskList(lhcjjs, aicUserId);
//经营异常拟列入列表总数 //经营异常拟列入列表总数
int nlrjyyc=0; int nlrjyyc = 0;
AICUser curUser = SSOUtil.getUser(); AICUser curUser = SSOUtil.getUser();
// 不再用假待办 // 不再用假待办
@ -719,7 +722,7 @@ public class TaskController extends BaseController {
} else { } else {
cxdjsdhc = itFraudCheckService.lambdaQuery().eq(TFraudCheck::getStatus, "1").eq(TFraudCheck::getSendOrg, curUser.getRegionID()).count(); cxdjsdhc = itFraudCheckService.lambdaQuery().eq(TFraudCheck::getStatus, "1").eq(TFraudCheck::getSendOrg, curUser.getRegionID()).count();
} }
resultMap.put("cxdjsdhc",cxdjsdhc); resultMap.put("cxdjsdhc", cxdjsdhc);
} }
// 每日新增待办 // 每日新增待办
@ -738,111 +741,111 @@ public class TaskController extends BaseController {
+ Integer.valueOf(lhcjsD.size()) + Integer.valueOf(lhcjjS.size()) + cxdjsdhc; + Integer.valueOf(lhcjsD.size()) + Integer.valueOf(lhcjjS.size()) + cxdjsdhc;
resultMap.put("jyyc",Integer.valueOf(yclr.size()) + Integer.valueOf(ycyy.size()) + Integer.valueOf(ycyc.size()) resultMap.put("jyyc", Integer.valueOf(yclr.size()) + Integer.valueOf(ycyy.size()) + Integer.valueOf(ycyc.size())
+ Integer.valueOf(gtbj.size()) + Integer.valueOf(gthf.size()) + Integer.valueOf(nzlr.size()) + Integer.valueOf(nzyc.size())); + Integer.valueOf(gtbj.size()) + Integer.valueOf(gthf.size()) + Integer.valueOf(nzlr.size()) + Integer.valueOf(nzyc.size()));
resultMap.put("yzwfsx",Integer.valueOf(yzwflr.size()) + Integer.valueOf(yzwfyy.size()) + Integer.valueOf(yzwfyc.size())); resultMap.put("yzwfsx", Integer.valueOf(yzwflr.size()) + Integer.valueOf(yzwfyy.size()) + Integer.valueOf(yzwfyc.size()));
resultMap.put("pldx",Integer.valueOf(pldx.size())); resultMap.put("pldx", Integer.valueOf(pldx.size()));
resultMap.put("mytrxx",Integer.valueOf(myxx.size())); resultMap.put("mytrxx", Integer.valueOf(myxx.size()));
resultMap.put("qyjyycml",Integer.valueOf(yclr.size()) + Integer.valueOf(ycyy.size()) + Integer.valueOf(ycyc.size())); resultMap.put("qyjyycml", Integer.valueOf(yclr.size()) + Integer.valueOf(ycyy.size()) + Integer.valueOf(ycyc.size()));
resultMap.put("gthjyyczt",Integer.valueOf(gtbj.size()) + Integer.valueOf(gthf.size())); resultMap.put("gthjyyczt", Integer.valueOf(gtbj.size()) + Integer.valueOf(gthf.size()));
resultMap.put("nzsjyycml",Integer.valueOf(nzlr.size()) + Integer.valueOf(nzyc.size())); resultMap.put("nzsjyycml", Integer.valueOf(nzlr.size()) + Integer.valueOf(nzyc.size()));
resultMap.put("yzwflr",Integer.valueOf(yzwflr.size())); resultMap.put("yzwflr", Integer.valueOf(yzwflr.size()));
resultMap.put("yzwfyy",Integer.valueOf(yzwfyy.size())); resultMap.put("yzwfyy", Integer.valueOf(yzwfyy.size()));
resultMap.put("yzwfyc",Integer.valueOf(yzwfyc.size())); resultMap.put("yzwfyc", Integer.valueOf(yzwfyc.size()));
resultMap.put("wtfkcz",Integer.valueOf(wtcz.size())); resultMap.put("wtfkcz", Integer.valueOf(wtcz.size()));
resultMap.put("xyxf",Integer.valueOf(xyxF.size())); resultMap.put("xyxf", Integer.valueOf(xyxF.size()));
resultMap.put("zjyth",Integer.valueOf(zjytH.size())); resultMap.put("zjyth", Integer.valueOf(zjytH.size()));
resultMap.put("yysq",Integer.valueOf(yysq.size())); resultMap.put("yysq", Integer.valueOf(yysq.size()));
resultMap.put("lhcjsD",Integer.valueOf(lhcjsD.size())); resultMap.put("lhcjsD", Integer.valueOf(lhcjsD.size()));
resultMap.put("lhcjjS",Integer.valueOf(lhcjjS.size())); resultMap.put("lhcjjS", Integer.valueOf(lhcjjS.size()));
resultMap.put("dbzs",dbzs); resultMap.put("dbzs", dbzs);
resultMap.put("mrxz",mrxz); resultMap.put("mrxz", mrxz);
resultMap.put("yb",yb); resultMap.put("yb", yb);
resultMap.put("mryb",mryb); resultMap.put("mryb", mryb);
resultMap.put("gtbj",Integer.valueOf(gtbj.size())); resultMap.put("gtbj", Integer.valueOf(gtbj.size()));
resultMap.put("yclr",Integer.valueOf(yclr.size())); resultMap.put("yclr", Integer.valueOf(yclr.size()));
resultMap.put("nzlr",Integer.valueOf(nzlr.size())); resultMap.put("nzlr", Integer.valueOf(nzlr.size()));
resultMap.put("ycyy",Integer.valueOf(ycyy.size())); resultMap.put("ycyy", Integer.valueOf(ycyy.size()));
resultMap.put("ycyc",Integer.valueOf(ycyc.size())); resultMap.put("ycyc", Integer.valueOf(ycyc.size()));
resultMap.put("nzyc",Integer.valueOf(nzyc.size())); resultMap.put("nzyc", Integer.valueOf(nzyc.size()));
resultMap.put("gthf",Integer.valueOf(gthf.size())); resultMap.put("gthf", Integer.valueOf(gthf.size()));
return RestResult.ok(resultMap); return RestResult.ok(resultMap);
} }
@PostMapping("getAbnormal") @PostMapping("getAbnormal")
public RestResult<?> getAbnormal( String aicUserId) { public RestResult<?> getAbnormal(String aicUserId) {
Map<String,Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
//企业异常名录列入 //企业异常名录列入
String yclrStr = "5"; String yclrStr = "5";
int yclr = taskListService.countByBUSTYPE(yclrStr,aicUserId); int yclr = taskListService.countByBUSTYPE(yclrStr, aicUserId);
//企业异常名录异议 //企业异常名录异议
String ycyyStr = "6"; String ycyyStr = "6";
int ycyy = taskListService.countByBUSTYPE(ycyyStr,aicUserId); int ycyy = taskListService.countByBUSTYPE(ycyyStr, aicUserId);
//企业异常名录移除 //企业异常名录移除
String ycycStr = "7"; String ycycStr = "7";
int ycyc = taskListService.countByBUSTYPE(ycycStr,aicUserId); int ycyc = taskListService.countByBUSTYPE(ycycStr, aicUserId);
//个体工商户标记 //个体工商户标记
String gtbjStr = "11"; String gtbjStr = "11";
int gtbj = taskListService.countByBUSTYPE(gtbjStr,aicUserId); int gtbj = taskListService.countByBUSTYPE(gtbjStr, aicUserId);
//个体工商户恢复 //个体工商户恢复
String gthfStr = "12"; String gthfStr = "12";
int gthf = taskListService.countByBUSTYPE(gthfStr,aicUserId); int gthf = taskListService.countByBUSTYPE(gthfStr, aicUserId);
//农专列入 //农专列入
String nzlrStr = "13"; String nzlrStr = "13";
int nzlr = taskListService.countByBUSTYPE(nzlrStr,aicUserId); int nzlr = taskListService.countByBUSTYPE(nzlrStr, aicUserId);
//农专移出 //农专移出
String nzycStr = "14"; String nzycStr = "14";
int nzyc = taskListService.countByBUSTYPE(nzycStr,aicUserId); int nzyc = taskListService.countByBUSTYPE(nzycStr, aicUserId);
//严重违法拟列入 //严重违法拟列入
String yzwfnlrStr = "55"; String yzwfnlrStr = "55";
int yzwfnlr = taskListService.countByBUSTYPE(yzwfnlrStr, aicUserId); int yzwfnlr = taskListService.countByBUSTYPE(yzwfnlrStr, aicUserId);
//严重违法列入 //严重违法列入
String yzwflrStr = "15"; String yzwflrStr = "15";
int yzwflr = taskListService.countByBUSTYPE(yzwflrStr,aicUserId); int yzwflr = taskListService.countByBUSTYPE(yzwflrStr, aicUserId);
// 严重违法列入(列异满3年) // 严重违法列入(列异满3年)
int yzwflrthree = taskListService.countByBUSTYPEAndsourceType(yzwflrStr, aicUserId, "1"); int yzwflrthree = taskListService.countByBUSTYPEAndsourceType(yzwflrStr, aicUserId, "1");
// 严重违法列入(行政处罚) // 严重违法列入(行政处罚)
int yzwflrxzcf = taskListService.countByBUSTYPEAndsourceType(yzwflrStr, aicUserId, "2"); int yzwflrxzcf = taskListService.countByBUSTYPEAndsourceType(yzwflrStr, aicUserId, "2");
//严重违法异议 //严重违法异议
String yzwfyyStr = "16"; String yzwfyyStr = "16";
int yzwfyy = taskListService.countByBUSTYPE(yzwfyyStr,aicUserId); int yzwfyy = taskListService.countByBUSTYPE(yzwfyyStr, aicUserId);
//严重违法移除 //严重违法移除
String yzwfycStr = "17"; String yzwfycStr = "17";
int yzwfyc = taskListService.countByBUSTYPE(yzwfycStr,aicUserId); int yzwfyc = taskListService.countByBUSTYPE(yzwfycStr, aicUserId);
//冒用他人信息 //冒用他人信息
String myxxcStr = "31"; String myxxcStr = "31";
int myxx = taskListService.countByBUSTYPE(myxxcStr,aicUserId); int myxx = taskListService.countByBUSTYPE(myxxcStr, aicUserId);
//批量吊销 //批量吊销
String pldxStr = "51"; String pldxStr = "51";
int pldx = taskListService.countPD(aicUserId); int pldx = taskListService.countPD(aicUserId);
//问题处置反馈 //问题处置反馈
String wtczfk = "32"; String wtczfk = "32";
int wtcz = taskListService.countByBUSTYPE(wtczfk,aicUserId); int wtcz = taskListService.countByBUSTYPE(wtczfk, aicUserId);
//信用修复 //信用修复
String xyxf = "33"; String xyxf = "33";
int xyxF = taskListService.countByBUSTYPE(xyxf,aicUserId); int xyxF = taskListService.countByBUSTYPE(xyxf, aicUserId);
//总局一体化 //总局一体化
String zjyth = "30"; String zjyth = "30";
int zjytH = taskListService.countByBUSTYPE(zjyth,aicUserId); int zjytH = taskListService.countByBUSTYPE(zjyth, aicUserId);
//异议申请 //异议申请
//联合惩戒锁定 //联合惩戒锁定
String lhcjsd = "61"; String lhcjsd = "61";
int lhcjsD = taskListService.countByBUSTYPE(lhcjsd,aicUserId); int lhcjsD = taskListService.countByBUSTYPE(lhcjsd, aicUserId);
//联合惩戒解锁 //联合惩戒解锁
String lhcjjs = "62"; String lhcjjs = "62";
int lhcjjS = taskListService.countByBUSTYPE(lhcjjs,aicUserId); int lhcjjS = taskListService.countByBUSTYPE(lhcjjs, aicUserId);
//现场核查任务 //现场核查任务
String xchcrwStr = "66"; String xchcrwStr = "66";
int xchcrw = taskListService.countByBUSTYPE(xchcrwStr,aicUserId); int xchcrw = taskListService.countByBUSTYPE(xchcrwStr, aicUserId);
//投诉处理 //投诉处理
AICUser curUser = SSOUtil.getUser(); AICUser curUser = SSOUtil.getUser();
//经营异常拟列入列表总数 //经营异常拟列入列表总数
int nlrjyyc=0; int nlrjyyc = 0;
// 撤销登记实地核查 // 撤销登记实地核查
Integer cxdjsdhc = 0; Integer cxdjsdhc = 0;
if (curUser.getAicPermissions().containsKey("fraudRegOneAssign")) { if (curUser.getAicPermissions().containsKey("fraudRegOneAssign")) {
@ -851,7 +854,7 @@ public class TaskController extends BaseController {
} else { } else {
cxdjsdhc = itFraudCheckService.lambdaQuery().eq(TFraudCheck::getStatus, "1").eq(TFraudCheck::getSendOrg, curUser.getRegionID()).count(); cxdjsdhc = itFraudCheckService.lambdaQuery().eq(TFraudCheck::getStatus, "1").eq(TFraudCheck::getSendOrg, curUser.getRegionID()).count();
} }
resultMap.put("cxdjsdhc",cxdjsdhc); resultMap.put("cxdjsdhc", cxdjsdhc);
} }
// 每日新增待办 // 每日新增待办
@ -870,38 +873,38 @@ public class TaskController extends BaseController {
+ lhcjsD + lhcjjS + cxdjsdhc + lhcjsD + lhcjjS + cxdjsdhc
+ xchcrw; + xchcrw;
resultMap.put("jyyc",yclr + ycyy + ycyc resultMap.put("jyyc", yclr + ycyy + ycyc
+ gtbj + gthf + nzlr + nzyc); + gtbj + gthf + nzlr + nzyc);
resultMap.put("yzwfsx",yzwflr + yzwfyy + yzwfyc); resultMap.put("yzwfsx", yzwflr + yzwfyy + yzwfyc);
resultMap.put("pldx",pldx); resultMap.put("pldx", pldx);
resultMap.put("mytrxx",myxx); resultMap.put("mytrxx", myxx);
resultMap.put("qyjyycml",yclr + ycyy + ycyc); resultMap.put("qyjyycml", yclr + ycyy + ycyc);
resultMap.put("gthjyyczt",gtbj + gthf); resultMap.put("gthjyyczt", gtbj + gthf);
resultMap.put("nzsjyycml",nzlr + nzyc); resultMap.put("nzsjyycml", nzlr + nzyc);
resultMap.put("yzwfnlr",yzwfnlr); resultMap.put("yzwfnlr", yzwfnlr);
resultMap.put("yzwflrthree", yzwflrthree); resultMap.put("yzwflrthree", yzwflrthree);
resultMap.put("yzwflrxzcf", yzwflrxzcf); resultMap.put("yzwflrxzcf", yzwflrxzcf);
resultMap.put("yzwflr",yzwflr); resultMap.put("yzwflr", yzwflr);
resultMap.put("yzwfyy",yzwfyy); resultMap.put("yzwfyy", yzwfyy);
resultMap.put("yzwfyc",yzwfyc); resultMap.put("yzwfyc", yzwfyc);
resultMap.put("wtfkcz",wtcz); resultMap.put("wtfkcz", wtcz);
resultMap.put("xyxf",xyxF); resultMap.put("xyxf", xyxF);
resultMap.put("zjyth",zjytH); resultMap.put("zjyth", zjytH);
resultMap.put("lhcjsD",lhcjsD); resultMap.put("lhcjsD", lhcjsD);
resultMap.put("lhcjjS",lhcjjS); resultMap.put("lhcjjS", lhcjjS);
resultMap.put("dbzs",dbzs); resultMap.put("dbzs", dbzs);
resultMap.put("mrxz",mrxz); resultMap.put("mrxz", mrxz);
resultMap.put("yb",yb); resultMap.put("yb", yb);
resultMap.put("mryb",mryb); resultMap.put("mryb", mryb);
resultMap.put("gtbj",gtbj); resultMap.put("gtbj", gtbj);
resultMap.put("yclr",yclr); resultMap.put("yclr", yclr);
resultMap.put("nzlr",nzlr); resultMap.put("nzlr", nzlr);
resultMap.put("ycyy",ycyy); resultMap.put("ycyy", ycyy);
resultMap.put("ycyc",ycyc); resultMap.put("ycyc", ycyc);
resultMap.put("nzyc",nzyc); resultMap.put("nzyc", nzyc);
resultMap.put("gthf",gthf); resultMap.put("gthf", gthf);
resultMap.put("xchcrw",xchcrw); resultMap.put("xchcrw", xchcrw);
return RestResult.ok(resultMap); return RestResult.ok(resultMap);
} }
@ -909,6 +912,7 @@ public class TaskController extends BaseController {
/** /**
* 综合查询 * 综合查询
* 经营异常名录查询 * 经营异常名录查询
*
* @param pageRequestDto * @param pageRequestDto
* @param request * @param request
* @return * @return
@ -927,12 +931,13 @@ public class TaskController extends BaseController {
/** /**
* 综合查询 * 综合查询
* 经营异常名录查询 * 经营异常名录查询
*
* @param pageRequestDto * @param pageRequestDto
* @param request * @param request
* @return * @return
*/ */
@PostMapping("/exportAbnList") @PostMapping("/exportAbnList")
public void exportAbnList(@RequestBody PageRequestDto pageRequestDto, HttpServletRequest request, HttpServletResponse response) throws IOException{ public void exportAbnList(@RequestBody PageRequestDto pageRequestDto, HttpServletRequest request, HttpServletResponse response) throws IOException {
AssertUtils.isNotNull(pageRequestDto); AssertUtils.isNotNull(pageRequestDto);
Map<String, Object> paramMap = pageRequestDto.getCustomParamMap(); Map<String, Object> paramMap = pageRequestDto.getCustomParamMap();
//Page<AbnListExcel> page = new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()); //Page<AbnListExcel> page = new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize());
@ -950,7 +955,7 @@ public class TaskController extends BaseController {
// 结束 // 结束
excelWriter.finish(); excelWriter.finish();
response.getOutputStream().write(bos.toByteArray()); response.getOutputStream().write(bos.toByteArray());
}finally { } finally {
// 结束 // 结束
if (excelWriter != null) excelWriter.finish(); if (excelWriter != null) excelWriter.finish();
} }
@ -994,16 +999,16 @@ public class TaskController extends BaseController {
String createDateStr = DateUtils.localDateFormat(createTime.toLocalDate(), DateUtils.DATE_DEFAULT_FORMAT); String createDateStr = DateUtils.localDateFormat(createTime.toLocalDate(), DateUtils.DATE_DEFAULT_FORMAT);
String workDayEnd = DateUtils.getWorkDayEnd(null, createDateStr, 11); String workDayEnd = DateUtils.getWorkDayEnd(null, createDateStr, 11);
LocalDate workEndDate = DateUtils.parseLocalDate(workDayEnd, DateUtils.DATE_DEFAULT_FORMAT); LocalDate workEndDate = DateUtils.parseLocalDate(workDayEnd, DateUtils.DATE_DEFAULT_FORMAT);
int leftDays = (int) LocalDate.now().toEpochDay() - (int)workEndDate.toEpochDay(); int leftDays = (int) LocalDate.now().toEpochDay() - (int) workEndDate.toEpochDay();
if(leftDays >= 0) { if (leftDays >= 0) {
return true; return true;
}else {//在各自环节剩余办理超过时限会预警 经办4天 审核3天 审批3天 } else {//在各自环节剩余办理超过时限会预警 经办4天 审核3天 审批3天
String currentnode = workFlowService.findCurrentNode(taskList.getWorkflowid()).getCurrentnode(); String currentnode = workFlowService.findCurrentNode(taskList.getWorkflowid()).getCurrentnode();
DeadlineStas deadlineStas = deadlinestasService.getByWorkflowId(taskList.getWorkflowid()); DeadlineStas deadlineStas = deadlinestasService.getByWorkflowId(taskList.getWorkflowid());
boolean overTime = false; boolean overTime = false;
//在经办 //在经办
if(deadlineStas != null) { if (deadlineStas != null) {
if (FlowUtil.SERILLEGALWORKFLOW_SERILLEGALENTER.equals(currentnode)) { if (FlowUtil.SERILLEGALWORKFLOW_SERILLEGALENTER.equals(currentnode)) {
overTime = isOverTime(deadlineStas.getAcceptStartDate(), Integer.parseInt(deadlineStas.getAcceptLeftDays()), LocalDate.now()); overTime = isOverTime(deadlineStas.getAcceptStartDate(), Integer.parseInt(deadlineStas.getAcceptLeftDays()), LocalDate.now());
} else if (FlowUtil.SERILLEGALWORKFLOW_HANDLESERILLEGAL.equals(currentnode)) {//在审核 } else if (FlowUtil.SERILLEGALWORKFLOW_HANDLESERILLEGAL.equals(currentnode)) {//在审核
@ -1017,11 +1022,11 @@ public class TaskController extends BaseController {
} }
} }
private boolean isOverTime(LocalDate sDate,Integer days,LocalDate eDate){ private boolean isOverTime(LocalDate sDate, Integer days, LocalDate eDate) {
int dutyDays = DateUtils.getDutyDays(sDate, eDate); int dutyDays = DateUtils.getDutyDays(sDate, eDate);
if (dutyDays > days){ if (dutyDays > days) {
return true; return true;
}else { } else {
return false; return false;
} }
@ -1048,31 +1053,33 @@ public class TaskController extends BaseController {
/** /**
* 信用修复预警待办分析 * 信用修复预警待办分析
* @author ymc *
* @since 2024年8月1日 11:53
* @param pageRequestDto * @param pageRequestDto
* @return * @return
* @author ymc
* @since 2024年8月1日 11:53
*/ */
@RequestMapping("/repairTaskQuery") @RequestMapping("/repairTaskQuery")
public RestResult<?> repairTaskQuery(@RequestBody PageRequestDto pageRequestDto) { public RestResult<?> repairTaskQuery(@RequestBody PageRequestDto pageRequestDto) {
Map<String, Object> paramMap = pageRequestDto.getCustomParamMap(); Map<String, Object> paramMap = pageRequestDto.getCustomParamMap();
IPage<RepairTaskListDto> rs = taskListService.repairTaskQuery(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), paramMap); IPage<RepairTaskListDto> rs = taskListService.repairTaskQuery(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), paramMap);
Map<Object,String> map = new HashMap<>(); Map<Object, String> map = new HashMap<>();
map.put("total", String.valueOf(rs.getTotal())); map.put("total", String.valueOf(rs.getTotal()));
map.put("rows", String.valueOf(rs.getRecords())); map.put("rows", String.valueOf(rs.getRecords()));
map.put("page", String.valueOf(rs.getCurrent())); map.put("page", String.valueOf(rs.getCurrent()));
map.put("size", String.valueOf(rs.getSize())); map.put("size", String.valueOf(rs.getSize()));
map.put("sfsdf","fsgdg"); map.put("sfsdf", "fsgdg");
return RestResult.ok(rs); return RestResult.ok(rs);
} }
/** /**
* 导出信用修复待办 * 导出信用修复待办
* @author ymc *
* @since 2024年8月5日 15:41
* @param pageRequestDto * @param pageRequestDto
* @param request * @param request
* @return * @return
* @author ymc
* @since 2024年8月5日 15:41
*/ */
@PostMapping("exportRepairTask") @PostMapping("exportRepairTask")
public void exportRepairTask(@RequestBody PageRequestDto pageRequestDto, HttpServletRequest request, HttpServletResponse response) throws IOException { public void exportRepairTask(@RequestBody PageRequestDto pageRequestDto, HttpServletRequest request, HttpServletResponse response) throws IOException {
@ -1095,6 +1102,7 @@ public class TaskController extends BaseController {
/** /**
* 综合查询 * 综合查询
* 信用修复超期查询 * 信用修复超期查询
*
* @param pageRequestDto * @param pageRequestDto
* @param request * @param request
* @return * @return
@ -1107,8 +1115,8 @@ public class TaskController extends BaseController {
if (curUser != null) { if (curUser != null) {
if ("440101".equals(curUser.getRegionID())) { if ("440101".equals(curUser.getRegionID())) {
paramMap.put("regorg", "4401" + "%"); paramMap.put("regorg", "4401" + "%");
}else { } else {
paramMap.put("regorg", curUser.getRegionID().substring(0,6) + "%" ); paramMap.put("regorg", curUser.getRegionID().substring(0, 6) + "%");
} }
} }
@ -1120,20 +1128,21 @@ public class TaskController extends BaseController {
/** /**
* 综合查询 * 综合查询
* 经营异常名录查询 * 经营异常名录查询
*
* @param pageRequestDto * @param pageRequestDto
* @param request * @param request
* @return * @return
*/ */
@PostMapping("/exportxyxfCqList") @PostMapping("/exportxyxfCqList")
public void exportxyxfCqList(@RequestBody PageRequestDto pageRequestDto, HttpServletRequest request, HttpServletResponse response) throws IOException{ public void exportxyxfCqList(@RequestBody PageRequestDto pageRequestDto, HttpServletRequest request, HttpServletResponse response) throws IOException {
AssertUtils.isNotNull(pageRequestDto); AssertUtils.isNotNull(pageRequestDto);
AICUser curUser = SSOUtil.getUser(); AICUser curUser = SSOUtil.getUser();
Map<String, Object> paramMap = pageRequestDto.getCustomParamMap(); Map<String, Object> paramMap = pageRequestDto.getCustomParamMap();
if (curUser != null) { if (curUser != null) {
if ("440101".equals(curUser.getRegionID())) { if ("440101".equals(curUser.getRegionID())) {
paramMap.put("regorg", "4401" + "%"); paramMap.put("regorg", "4401" + "%");
}else { } else {
paramMap.put("regorg", curUser.getRegionID().substring(0,6) + "%"); paramMap.put("regorg", curUser.getRegionID().substring(0, 6) + "%");
} }
} }
// List<XyxfCqDto> rs = taskListService.exportxyxfCqList(paramMap); // List<XyxfCqDto> rs = taskListService.exportxyxfCqList(paramMap);
@ -1181,7 +1190,7 @@ public class TaskController extends BaseController {
* 信用修复预警统计 * 信用修复预警统计
*/ */
@RequestMapping("/repairTaskStatistic") @RequestMapping("/repairTaskStatistic")
public RestResult<?> repairTaskStatistic(@RequestBody PageRequestDto pageRequestDto,HttpServletRequest request) { public RestResult<?> repairTaskStatistic(@RequestBody PageRequestDto pageRequestDto, HttpServletRequest request) {
Map<String, Object> paramMap = pageRequestDto.getCustomParamMap(); Map<String, Object> paramMap = pageRequestDto.getCustomParamMap();
AICUser aicUser = getLoginUser(request); AICUser aicUser = getLoginUser(request);
//统计内外网的数量,只统计未完成的 //统计内外网的数量,只统计未完成的

View File

@ -573,9 +573,24 @@
SELECT SELECT
DISTINCT WORKFLOWID DISTINCT WORKFLOWID
FROM FROM
tsopinion tsopinion tso
WHERE <where>
HANDLERID = #{customParamMap.userId}) and REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1) <if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
<choose>
<when test='customParamMap.childUnitSwitch eq "1"'>
and (
tso.HANDLERID = #{customParamMap.userId}
or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
where tso.HANDLERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
))
</when>
<otherwise>
and tso.HANDLERID = #{customParamMap.userId}
</otherwise>
</choose>
</if>
</where>) and REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1)
union all union all
(select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , n.currentNode as currentNodeOrBizStatus ,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, t.CREATETIME (select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , n.currentNode as currentNodeOrBizStatus ,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, t.CREATETIME
from tsrevtasklist t from tsrevtasklist t
@ -584,22 +599,72 @@
SELECT SELECT
DISTINCT WORKFLOWID DISTINCT WORKFLOWID
FROM FROM
tsopinion tsopinion tso
WHERE <where>
HANDLERID = #{customParamMap.userId}) and REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1) <if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
<choose>
<when test='customParamMap.childUnitSwitch eq "1"'>
and (
tso.HANDLERID = #{customParamMap.userId}
or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
where tso.HANDLERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
))
</when>
<otherwise>
and tso.HANDLERID = #{customParamMap.userId}
</otherwise>
</choose>
</if>
</where>
) and REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1)
union all union all
</when> </when>
</choose> </choose>
(select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , b.STATUS as currentNodeOrBizStatus, null as lastNode, t.CREATETIME (select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , b.STATUS as currentNodeOrBizStatus, null as lastNode, t.CREATETIME
from tsrevtasklist t, tsbizrevlist b from tsrevtasklist t, tsbizrevlist b
where t.bizseqid = b.bizseq and t.busstatus = '0' and b.ISREMOVE = '0' where t.bizseqid = b.bizseq and t.busstatus = '0' and b.ISREMOVE = '0'
and t.WORKFLOWID in (SELECT DISTINCT WORKFLOWID FROM tsopinion where HANDLERID = #{customParamMap.userId})) and t.WORKFLOWID in (SELECT DISTINCT WORKFLOWID FROM tsopinion tso
<where>
<if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
<choose>
<when test='customParamMap.childUnitSwitch eq "1"'>
and (
tso.HANDLERID = #{customParamMap.userId}
or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
where tso.HANDLERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
))
</when>
<otherwise>
and tso.HANDLERID = #{customParamMap.userId}
</otherwise>
</choose>
</if>
</where>))
union all union all
(select DISTINCT ta.TASKLISTID, ta.WORKFLOWID, ta.BIZSEQID, ta.SIGNUSERID, ta.SENDERORGID, ta.SENDERUSERID, ta.SENDTOORGID, ta.ACCEPTNO, ta.BUSNAME, ta.SIGNTIME, ta.BUSTYPE, ta.BUSSTATUS, ta.LINKNAME, ta.AUDITDEPTTYPE, ta.ISSIGNON,ta.SIGNLOGINNAME, ta.SENDERTIME, ta.SENDERNAME, ta.ACCEPTGROUPID, ta.AREA_CODE, ta.LAUPTIME, n.currentNode as currentNodeOrBizStatus,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, ta.CREATETIME (select DISTINCT ta.TASKLISTID, ta.WORKFLOWID, ta.BIZSEQID, ta.SIGNUSERID, ta.SENDERORGID, ta.SENDERUSERID, ta.SENDTOORGID, ta.ACCEPTNO, ta.BUSNAME, ta.SIGNTIME, ta.BUSTYPE, ta.BUSSTATUS, ta.LINKNAME, ta.AUDITDEPTTYPE, ta.ISSIGNON,ta.SIGNLOGINNAME, ta.SENDERTIME, ta.SENDERNAME, ta.ACCEPTGROUPID, ta.AREA_CODE, ta.LAUPTIME, n.currentNode as currentNodeOrBizStatus,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, ta.CREATETIME
from TSTaskList ta from TSTaskList ta
LEFT JOIN TSTwfProcessNode n on ta.WorkflowID = n.processid LEFT JOIN TSTwfProcessNode n on ta.WorkflowID = n.processid
where ta.BUSSTATUS in ('-1', '0', '1', '3', '5') where ta.BUSSTATUS in ('-1', '0', '1', '3', '5')
and n.CURRUSERID = #{customParamMap.userId}) <where>
<if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
<choose>
<when test='customParamMap.childUnitSwitch eq "1"'>
and (
n.CURRUSERID = #{customParamMap.userId}
or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
where n.CURRUSERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
))
</when>
<otherwise>
and n.CURRUSERID = #{customParamMap.userId}
</otherwise>
</choose>
</if>
</where>
)
) m ) m
<where> <where>
<if test="customParamMap != null"> <if test="customParamMap != null">