From 65f4dc6e783b27de7d1fb5a7e3c7e684c3e924c1 Mon Sep 17 00:00:00 2001 From: DELL Date: Fri, 19 Apr 2024 19:00:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E8=AE=BE=E7=BD=AE=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E8=BF=87=E7=9A=84=E4=BB=BB=E5=8A=A1=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=94=BE=E5=85=A5=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=202=E3=80=81=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9=203=E3=80=81=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=90=9C=E7=B4=A2=E4=B8=8D=E5=8A=A0=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=80=BC=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E5=9B=BE=E6=A3=80=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlowTaskServiceImpl.java | 14 ++++---------- .../ocr/controller/OcrPictureController.java | 7 ++----- .../OcrTaskchildDubiousFileController.java | 12 +++++++++++- .../dataDao/OcrTaskchildPictureMybatisDao.java | 5 +++++ .../service/impl/OcrSearchHistoryServiceImpl.java | 10 +++------- .../mapper/oa/OcrSearchHistoryMapper.xml | 15 ++++++++++++++- .../mapper/oa/OcrTaskchildPictureMapper.xml | 11 +++++++++++ 7 files changed, 50 insertions(+), 24 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java index 2dc12c3e..dd43d664 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java @@ -1252,7 +1252,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask for (FlowUnionVo flowUnionVo : list) { if (flowUnionVo.getStates() != null) { - String stateText; + String stateText = ""; switch (flowUnionVo.getStates()) { case 1: stateText = "撤销"; @@ -1261,13 +1261,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask stateText = "审批中"; break; case 3: - stateText = "审批通过"; + stateText = "通过"; break; case 5: - stateText = "审批未通过"; - break; - default: - stateText = "未知状态"; + stateText = "不通过"; break; } // 将中文状态赋值给 flowUnionVo 的状态属性 @@ -1439,7 +1436,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } if (ocrTaskchildPictureAppro.getStatshis() != null) { - String stateText; + String stateText = ""; switch (ocrTaskchildPictureAppro.getStatshis()) { case 1: stateText = "待审批"; @@ -1450,9 +1447,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask case 3: stateText = "不通过"; break; - default: - stateText = "未知状态"; - break; } // 将中文状态赋值给 flowUnionVo 的状态属性 ocrTaskchildPictureAppro.setStatshisText(stateText); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java index cb42ce86..c0a954cf 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java @@ -338,13 +338,10 @@ public class OcrPictureController extends BaseController { ocrPictureOne.setField16("审批中"); break; case 3: - ocrPictureOne.setField16("审批通过"); + ocrPictureOne.setField16("通过"); break; case 5: - ocrPictureOne.setField16("审批不通过"); - break; - default: - ocrPictureOne.setField16("未知状态"); + ocrPictureOne.setField16("不通过"); break; } ocrPictureOne.setStates(ocrTaskchildPicture.getStates()); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java index 67f73bb3..df14ebfd 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java @@ -6,9 +6,11 @@ import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.common.base.vo.UserToken; +import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildPictureMybatisDao; import cn.jyjz.xiaoyao.ocr.dataobject.*; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; +import cn.jyjz.xiaoyao.ocr.vo.OaUserApproveVo; import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -25,6 +27,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestParam; + +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import cn.jyjz.xiaoyao.ocr.service.IOcrTaskchildDubiousFileService; @@ -57,6 +61,9 @@ public class OcrTaskchildDubiousFileController { @Autowired OcrPictureService ocrpictureservice; + @Autowired + private OcrTaskchildPictureMybatisDao taskchildPictureMybatisDao; + /** * 分页查询 * @param request @@ -175,7 +182,10 @@ public class OcrTaskchildDubiousFileController { if(one != null && !one.getAssignee().equals(userToken.getLoginname())){ return ResultVoUtil.error("勾选存在无权限审批的任务，不能添加可疑文件！"); } - + List oaUserApproveVoList = taskchildPictureMybatisDao.queryHistoricalTask(userToken.getUserid(),one.getId()); + if(CollUtil.isNotEmpty(oaUserApproveVoList)){ + return ResultVoUtil.error("该任务已审批，不能添加可疑文件！"); + } QueryWrapper filewrapper = new QueryWrapper<>(); filewrapper.eq("picture_id",asd).eq("userid",userToken.getUserid()); OcrTaskchildDubiousFile one1 = ocrTaskchildDubiousFileService.getOne(filewrapper); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java index 8b295f38..aaae4839 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java @@ -47,6 +47,11 @@ public interface OcrTaskchildPictureMybatisDao extends BaseMapper queryApprovalNode(@Param("userId") String userId); + + /** + * 查询当前用户历史任务 + */ + public List queryHistoricalTask(@Param("userId") String userId, @Param("formId") Long formId); /** * 查询当前用户待审批任务 */ 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 94d62096..077f3200 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 @@ -86,10 +86,8 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl frontmenuTList = isFrontmenuTService.queryUserMenuById(assignee); if(CollUtil.isNotEmpty(frontmenuTList)){ for (SFrontmenuT sFrontmenuT : frontmenuTList) { - if(StringUtils.isNotBlank(search)){ - if(sFrontmenuT.getResKey().equals(FrontMenuEnum.WORKSHEETMAIN.getResKey())){ - strings1 = ocrsearchhistorymapper.selectsearch1(userId,search,tenantId); - } + if(sFrontmenuT.getResKey().equals(FrontMenuEnum.WORKSHEETMAIN.getResKey())){ + strings1 = ocrsearchhistorymapper.selectsearch1(userId,search,tenantId); } if(sFrontmenuT.getResKey().equals(FrontMenuEnum.TASKMAIN.getResKey())){ strings2 = ocrsearchhistorymapper.selectsearch2(assignee,search,tenantId); @@ -102,9 +100,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl>>> list = new ArrayList<>(); Map>> map=new HashMap<>(); - if(StringUtils.isNotBlank(search)){ - map.put("ai",strings1); - } + map.put("ai",strings1); map.put("preliminary",strings2); map.put("final",strings3); // list.add(map); diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml index 3d0ad3f8..bf547069 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml @@ -18,7 +18,20 @@ + +