From b6bccd82dc0b3c6638ef21476b570ab9ca6eb3c5 Mon Sep 17 00:00:00 2001 From: DELL Date: Mon, 15 Apr 2024 20:04:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=8E=B7=E5=8F=96=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B9=E6=8E=A5=E5=8F=A3=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E6=88=90=E4=B9=8B=E5=89=8D=E7=9A=84=EF=BC=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=A1=E6=89=B9ai=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E4=B8=80=E4=BB=BD=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrAiApprovalTools.java | 22 ++++++ .../ocr/dataobject/OcrConfiguration.java | 20 +++--- .../ocr/service/IOcrSearchHistoryService.java | 2 + .../impl/OcrSearchHistoryServiceImpl.java | 67 +++++++++++++++++++ 4 files changed, 101 insertions(+), 10 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java index 323d9e29..7cf34f27 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java @@ -66,6 +66,28 @@ public class OcrAiApprovalTools { return toolscount; } + /** + * 任务审批统计 + * + * @param request + * @return + */ + @RequestMapping(value = "/toolsTaskApprovalCount", method = RequestMethod.GET) + public ResultVo toolsTaskApprovalCount(HttpServletRequest request) { + + String tenantId = request.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + + + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + ResultVo toolscount = iocrsearchhistoryservice.toolsTaskApprovalCount(tenantId,userToken.getUserid(),request); + + return toolscount; + } + /* ai审批工单 */ diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrConfiguration.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrConfiguration.java index dd1dba75..a861d173 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrConfiguration.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrConfiguration.java @@ -135,8 +135,8 @@ public class OcrConfiguration implements BaseDto,java.io.Serializable { private String iztaskrrom; @Schema(description = "任务状态,Y表示是 N表示否，读取数据字典") - @TableField(value="IZSTATUS") - private String izstatus; + @TableField(value="IZTASKSTATUS") + private String iztaskstatus; @Schema(description = "拜访省份/直辖市,Y表示是 N表示否，读取单表") @TableField(value="IZVISITPRO") @@ -205,7 +205,7 @@ public class OcrConfiguration implements BaseDto,java.io.Serializable { new SimpleEntry<>("IZCUSTOMNAME","izcustomname"), new SimpleEntry<>("IZPROJECTTYPE","izprojecttype"), new SimpleEntry<>("IZTASKRROM","iztaskrrom"), - new SimpleEntry<>("IZSTATUS","izstatus"), + new SimpleEntry<>("IZTASKSTATUS","iztaskstatus"), new SimpleEntry<>("IZVISITPRO","izvisitpro"), new SimpleEntry<>("IZVISITCITY","izvisitcity"), new SimpleEntry<>("IZFIRM","izfirm"), @@ -245,7 +245,7 @@ public class OcrConfiguration implements BaseDto,java.io.Serializable { put("izcustomname","izcustomname"); put("izprojecttype","izprojecttype"); put("iztaskrrom","iztaskrrom"); - put("izstatus","izstatus"); + put("iztaskstatus","iztaskstatus"); put("izvisitpro","izvisitpro"); put("izvisitcity","izvisitcity"); put("izfirm","izfirm"); @@ -361,10 +361,10 @@ public class OcrConfiguration implements BaseDto,java.io.Serializable { this.iztaskrrom = "N"; } - else if(this.izstatus.equals("Y") && s.equals("izstatus")){ - this.izstatus = "Y"; - }else if(this.izstatus.equals("N") && s.equals("izstatus")){ - this.izstatus = "N"; + else if(this.iztaskstatus.equals("Y") && s.equals("iztaskstatus")){ + this.iztaskstatus = "Y"; + }else if(this.iztaskstatus.equals("N") && s.equals("iztaskstatus")){ + this.iztaskstatus = "N"; } else if(this.izvisitpro.equals("Y") && s.equals("izvisitpro")){ @@ -455,8 +455,8 @@ public class OcrConfiguration implements BaseDto,java.io.Serializable { this.izcustomname = "N"; }else if(entry.getKey().equals("iztaskrrom")){ this.iztaskrrom = "N"; - }else if(entry.getKey().equals("izstatus")){ - this.izstatus = "N"; + }else if(entry.getKey().equals("iztaskstatus")){ + this.iztaskstatus = "N"; }else if(entry.getKey().equals("izvisitpro")){ this.izvisitpro = "N"; }else if(entry.getKey().equals("izvisitcity")){ diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java index 43254b9a..5ceb1091 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java @@ -22,6 +22,8 @@ public interface IOcrSearchHistoryService extends IService { ResultVo toolscount(String tenantid, String userId, HttpServletRequest request); + ResultVo toolsTaskApprovalCount(String tenantid, String userId, HttpServletRequest request); + Map selectaisp(String userid,String id,Integer nodeType); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java index debdea5d..0ccb715f 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java @@ -124,6 +124,73 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl ocrTaskchildPictureApproList = flowTaskService.getMyProcessInstancesNew(user, tenantid, searchQuery.getQuery(), pageUtils); + resultVo = new ResultVo<>(); + int pendingApprovalCount = 0; // 待审批的数量 + int approvedCount = 0; // 通过的数量 + int notGoCount = 0; // 不通过的数量 + int repeat = 0; // 重复数量 + for (OcrTaskchildPictureAppro ocrTaskchildPictureAppro : ocrTaskchildPictureApproList) { + if(ocrTaskchildPictureAppro.getIsRepeat() != null && ocrTaskchildPictureAppro.getIsRepeat() == 1){ + repeat++; + } + if (ocrTaskchildPictureAppro.getStatshis() != null) { + switch (ocrTaskchildPictureAppro.getStatshis()) { + case 1: + pendingApprovalCount++; + break; + case 2: + approvedCount++; + break; + case 3: + notGoCount++; + break; + default: + break; + } + } else { + //暂定，后期修改 + pendingApprovalCount++; + } + } + + Map counts = new HashMap<>(); + counts.put("total", approvedCount + pendingApprovalCount + notGoCount); //任务总数 + counts.put("treat", pendingApprovalCount); //待审批 + counts.put("approvedCount", approvedCount+notGoCount); //已审批 + counts.put("repeat", repeat); //重复图片 + resultVo.setCode("OK"); + resultVo.setMessage("成功"); + resultVo.setData(counts); + } catch (Exception e) { + e.printStackTrace(); + } + return resultVo; + } + + @Override + public ResultVo toolsTaskApprovalCount(String tenantid, String userId, HttpServletRequest request) { + ResultVo> resultVo = null; + + try { + //系统中记录的ai统计租户id + String counttenantid = iCacheManager.get(CacheConstants.TOOLSCOUNT_TENANTID_MODEL_NAME,tenantid+"_"+userId); +// if(!StringUtils.isBlank(counttenantid)){ +// return ResultVoUtil.error("true"); +// } + + //用户登录信息写入缓存 + iCacheManager.put(CacheConstants.TOOLSCOUNT_TENANTID_MODEL_NAME,tenantid+"_"+userId,"true",CacheConstants.TOOLSCOUNT_TENANTID_CACHE_TIME); + SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); String taskName = request.getParameter("keyword"); if (StringUtils.isNotBlank(taskName)) {