guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fix:获取系统筛选项接口恢复成之前的，任务审批ai统计接口复制一份出来' (#104) from fix/Statistical_interface_replication into test

Browse Source 
Reviewed-on: #104
pull/105/head
cuihaojie 1 year ago
parent ab2f08c433 b6bccd82dc
commit 0e1438645b
4 changed files with 101 additions and 10 deletions
Show Stats Download Patch File Download Diff File

22
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java
Unescape View File

@ -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审批工单
*/

20
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrConfiguration.java
Unescape View File

@ -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")){

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java
Unescape View File

@ -22,6 +22,8 @@ public interface IOcrSearchHistoryService extends IService<OcrSearchHistory> {
ResultVo toolscount(String tenantid, String userId, HttpServletRequest request);
ResultVo toolsTaskApprovalCount(String tenantid, String userId, HttpServletRequest request);
Map<Object,Object> selectaisp(String userid,String id,Integer nodeType);

67
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java
Unescape View File

@ -124,6 +124,73 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
//用户登录信息写入缓存
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)) {
searchQuery.addLike("fromtaskname", taskName);
}
User user = this.userService.getSessionUser(request);
PageUtils pageUtils = new PageUtils();
pageUtils.setPageSize(9999);
pageUtils.setCurrPage(1);
List<OcrTaskchildPictureAppro> 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<String, Integer> 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<Map<String, Integer>> 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)) {

Write Preview
Loading…
Cancel
Save