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

Merge pull request 'fix:修改ai审批工具弹窗接口，审批节点不需要前端传递' (#38) from fix/one-click_pop-up_window_2898 into test

Browse Source 
Reviewed-on: #38
pull/39/head
cuihaojie 1 year ago
parent 4f50317ec6 a772b8859b
commit 2c85c8d93b
4 changed files with 163 additions and 10 deletions
Show Stats Download Patch File Download Diff File

9
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java
Unescape View File

@ -70,6 +70,15 @@ public interface IFlowTaskService {
* @param pageUtils
*/
public void getMyProcessInstances(User user,String tenantId, Map<String, Object> query,PageUtils pageUtils);
/**
* 查询我的待办、已经办理任务
*
* @param user
* @param tenantId
* @param pageUtils
*/
public void getMyProcessInstancesNew(User user,String tenantId, Map<String, Object> query,PageUtils pageUtils);
/**
* 查询最终审批数据

95
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
Unescape View File

@ -1476,6 +1476,101 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
pageUtils.setList(listNew);
}
/**
* 查询我的待办、已经办理任务
*
* @param user
* @param tenantId
* @param pageUtils
*/
public void getMyProcessInstancesNew(User user, String tenantId, Map<String, Object> searchQuery, PageUtils pageUtils) {
ParamterPage paramterPage = new ParamterPage();
paramterPage.setStart((pageUtils.getCurrPage() - 1) * pageUtils.getPageSize());
paramterPage.setPagesize(pageUtils.getPageSize());
if (StringUtils.isNotBlank(pageUtils.getSortname())) {
paramterPage.setSortname(pageUtils.getSortname());
} else {
paramterPage.setSortname("CREATEDATE");
}
if (StringUtils.isNotBlank(pageUtils.getSortorder())) {
paramterPage.setSortorder(pageUtils.getSortorder());
} else {
paramterPage.setSortorder("DESC");
}
Map<String, Object> query = new HashMap<>();
query.put("page", paramterPage);
query.put("thisLoginUserid", user.getId().toString());
query.put("searchtenantid", tenantId);
//我的待办数据
query.put("searchassignee", user.getLoginname());
query.putAll(searchQuery);
Long count = ocrTaskchildPictureService.listmytaskCount(query);
query.put("page", paramterPage);
List<OcrTaskchildPictureAppro> list = ocrTaskchildPictureService.listmytask(query);
//补充历史状态名称，检查补充节点信息
for (OcrTaskchildPictureAppro ocrTaskchildPictureAppro : list) {
//审批节点 当前如果没有历史操作，则将当前节点赋值到历史审批节点中.
if (StringUtils.isBlank(ocrTaskchildPictureAppro.getTasknamehis())) {
ocrTaskchildPictureAppro.setTasknamehis(ocrTaskchildPictureAppro.getTaskname());
}
if (ocrTaskchildPictureAppro.getStatshis() != null) {
String stateText;
switch (ocrTaskchildPictureAppro.getStatshis()) {
case 1:
stateText = "待审批";
break;
case 2:
stateText = "通过";
break;
case 3:
stateText = "不通过";
break;
default:
stateText = "未知状态";
break;
}
// 将中文状态赋值给 flowUnionVo 的状态属性
ocrTaskchildPictureAppro.setStatshisText(stateText);
} else {
//暂定，后期修改
ocrTaskchildPictureAppro.setStatshisText("待审批");
}
}
List<OcrTaskchildPictureApproVo> listNew = new ArrayList<>();
for (OcrTaskchildPictureAppro one : list) {
OcrTaskchildPictureApproVo ocrTaskchildPictureApproVo = new OcrTaskchildPictureApproVo();
ocrTaskchildPictureApproVo.setId(one.getId()); //任务id
ocrTaskchildPictureApproVo.setFromtaskname(one.getFromtaskname()); //任务名称
ocrTaskchildPictureApproVo.setStatshisText(one.getStatshisText()); //历史-审批状态中文
ocrTaskchildPictureApproVo.setTasknamehis(one.getTasknamehis());//历史-审批节点名称
ocrTaskchildPictureApproVo.setFinishTime(one.getFinishTime()); //完成时间
ocrTaskchildPictureApproVo.setReleaseProvince(one.getPicture().getReleaseprovince()); //省份
ocrTaskchildPictureApproVo.setFromprojectid(one.getFromprojectid()); //项目id
ocrTaskchildPictureApproVo.setProductName(one.getPicture().getField9()); //产品
ocrTaskchildPictureApproVo.setCategory(one.getCategory()); //类型
ocrTaskchildPictureApproVo.setFromsourceid(one.getFromsourceid()); //原始任务id
ocrTaskchildPictureApproVo.setCustomerType(one.getPicture().getField2()); //客户类型
ocrTaskchildPictureApproVo.setCustomerName(one.getPicture().getField3()); //客户名称
ocrTaskchildPictureApproVo.setItemCategory(one.getPicture().getField17());//项目类别
ocrTaskchildPictureApproVo.setFromUserName(one.getFromUserName()); //提报人
ocrTaskchildPictureApproVo.setManufacturer(one.getPicture().getField5()); //manufacturer
ocrTaskchildPictureApproVo.setPackageid(one.getPackageid()); //任务包id
listNew.add(ocrTaskchildPictureApproVo);
}
pageUtils.setList(listNew);
}
/**
* 查询我发起的流程实例
*

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

@ -1,7 +1,13 @@
package cn.jyjz.xiaoyao.ocr.controller;
import cn.jyjz.flowable.service.IFlowTaskService;
import cn.jyjz.flowable.utils.PageUtils;
import cn.jyjz.xiaoyao.admin.dataobject.User;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
@ -11,8 +17,10 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -25,7 +33,7 @@ import java.util.Map;
@CrossOrigin
@RestController
@RequestMapping("/ocr/aitools")
public class OcrAiApprovalTools {
public class OcrAiApprovalTools extends BaseController {
@Autowired
@ -34,6 +42,12 @@ public class OcrAiApprovalTools {
@Autowired
IOcrSearchHistoryService iocrsearchhistoryservice;
@Resource
private UserService userService;
@Resource
IFlowTaskService flowTaskService;
/**
* 统计
*
@ -52,19 +66,54 @@ public class OcrAiApprovalTools {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
ResultVo toolscount = iocrsearchhistoryservice.toolscount(tenantId,userToken.getUserid());
return toolscount;
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
String taskName = request.getParameter("keyword");
if (org.apache.commons.lang3.StringUtils.isNotBlank(taskName)) {
searchQuery.addLike("fromtaskname", taskName);
}
User user = this.userService.getSessionUser(request);
PageUtils pageUtils = new PageUtils();
pageUtils.setPageSize(9999);
pageUtils.setCurrPage(1);
flowTaskService.getMyProcessInstances(user, tenantId, searchQuery.getQuery(), pageUtils);
ResultVo<Map<String, Integer>> resultVo = new ResultVo<>();
List<Map<String, Object>> instances = (List<Map<String, Object>>) pageUtils.getList();
int pendingApprovalCount = 0; // 待审批的数量
int approvedCount = 0; // 通过的数量
int otherCount = 0; // 其他情况的数量
for (Map<String, Object> instance : instances) {
String statshisText = (String) instance.get("statshisText");
if ("待审批".equals(statshisText)) {
pendingApprovalCount++;
} else if ("通过".equals(statshisText)) {
approvedCount++;
} else if("不通过".equals(statshisText)){
otherCount++;
}
}
Map<String, Integer> counts = new HashMap<>();
counts.put("total", approvedCount+pendingApprovalCount+otherCount);
counts.put("treat", approvedCount);
counts.put("approvedCount", pendingApprovalCount);
resultVo.setData(counts);
// ResultVo toolscount = iocrsearchhistoryservice.toolscount(tenantId,userToken.getUserid());
return resultVo;
}
/*
ai审批工单
*/
@RequestMapping(value = "/aiApprovaltools", method = RequestMethod.GET)
public ResultVo aiApprovaltools(HttpServletRequest request,@RequestParam(value = "taskid", required = true) String taskid,
@RequestParam(value = "nodeType", required = true) Integer nodeType) {
public ResultVo aiApprovaltools(HttpServletRequest request,@RequestParam(value = "taskid", required = true) String taskid) {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
Map<Object, Object> selectaisp = iocrsearchhistoryservice.selectaisp(userToken.getUserid(), taskid,nodeType);
Map<Object, Object> selectaisp = iocrsearchhistoryservice.selectaisp(userToken.getUserid(), taskid,userToken.getNodeType());
return ResultVoUtil.success(selectaisp);
}

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

@ -145,11 +145,11 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
List<OcrPicture> failedPictureIds = ocrPictureService.getPictureNodeStatesList(pictureIds, nodeType);
for (OcrPicture picture : failedPictureIds) {
if (picture.getHistoryStates() == 3) {
failedList.add(picture.getPictureid());
failedList.add(picture.getRemark());
} else if (picture.getHistoryStates() == 1) {
pendingApprovalList.add(picture.getPictureid());
pendingApprovalList.add(picture.getRemark());
} else if (picture.getHistoryStates() == 2) {
approvedList.add(picture.getPictureid());
approvedList.add(picture.getRemark());
}
}
@ -158,7 +158,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
mappedResults.put("similarComplete", similarComplete);
mappedResults.put("passCount", passCount);
mappedResults.put("pendingApprovaCount", pendingApprovaCount);
mappedResults.put("pictureIdList", pendingApprovalList);
mappedResults.put("taskIdList", pendingApprovalList);
return mappedResults;
}

Write Preview
Loading…
Cancel
Save