From b8721bd84a096e8e306e637615754c6f4579cc5f Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Sat, 30 Mar 2024 23:20:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=201.=E4=BF=AE=E6=94=B9=E5=B0=8F?= =?UTF-8?q?=E7=BB=93=E6=9F=A5=E9=87=8D2.=E4=BF=AE=E6=94=B9=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/controller/FlowTaskController.java | 4 ++-- .../xiaoyao/ocr/dataobject/OcrPictureInfo.java | 6 ++++++ .../ocr/service/impl/OcrPictureServiceImpl.java | 1 + .../impl/OcrTaskchildPictureServiceImpl.java | 15 +++++++++++++++ .../impl/OcrUsersearchchildServiceImpl.java | 6 +++--- .../main/resources/mapper/oa/FlowableccMapper.xml | 2 ++ .../main/resources/mapper/oa/OcrPictureMapper.xml | 1 + 7 files changed, 30 insertions(+), 5 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java index 1f0c8b2d..b739f568 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java @@ -172,10 +172,10 @@ public class FlowTaskController extends BaseController { formIds.addAll(formId); if (CollectionUtils.isNotEmpty(formIds)) { Integer success = flowTaskService.complete(approve, userToken); - return ResultVoUtil.success("审批成功" + success + "条，" + "审核失败" + (flowTaskInfoList.size() - success) + "条"); + return ResultVoUtil.success("审批成功" + success + "条，" + "无权审核" + (flowTaskInfoList.size() - success) + "条",""); } } - return ResultVoUtil.success("审核成功0条，" + "审核失败" + flowTaskInfoList.size() + "条"); + return ResultVoUtil.success("审核成功0条，" + "无权审核" + flowTaskInfoList.size() + "条",""); } @GetMapping("/listhistore") diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java index 6dd46f0c..47bf3322 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java @@ -35,6 +35,12 @@ public class OcrPictureInfo { @TableField(value = "img_size") private String imgSize; + /** + * 图片名称 + */ + @TableField(value = "img_name") + private String imgName; + /** * 图片格式 */ diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index f0574221..b8afcf1e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -699,6 +699,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl taskList = iFlowTaskService.nowRunTask(formData.getProcessInstanceId(), ocrTaskchildPicture.getProcessdefinitionid()); + Task taskData = null; + if (null != taskList && !taskList.isEmpty()) { + taskData = taskList.get(0); + ocrTaskchildPicture.setAssignee(taskData.getAssignee()); + } + ocrPicture.setTaskchildpictureid(ocrTaskchildPicture.getId().toString()); //修改状态为已生成任务并且审批状态为审批中 ocrPicture.setTaskstatus("1"); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java index 73157acf..ad032b4e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java @@ -86,9 +86,9 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl 1) t1 LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID @@ -232,6 +233,7 @@ t2.UPDATETIME updateTime from (select field8 content, ID id, imgUrl FROM ocr_picture + where ID in (select child.PICTUREID from oa_userfinal_t final left join ocr_taskchild_picture child on final.FORMID = child.ID) GROUP BY field8 HAVING count(field8) > 1) t1 LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml index 6e283e3a..d9bf1c86 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml @@ -72,6 +72,7 @@ + From 0ccbf8bbfc184a0e8d6ff70f0bfcb941acf16e16 Mon Sep 17 00:00:00 2001 From: DELL Date: Sat, 30 Mar 2024 23:28:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9ai=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A1=A8=E5=92=8C=E8=BF=94=E5=9B=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OcrSearchHistoryServiceImpl.java | 4 ++-- .../mapper/oa/OcrSearchHistoryMapper.xml | 23 +++++++++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) 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 ac608815..23bb0b30 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 @@ -87,7 +87,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl saveList = new ArrayList<>(); int i=0; for (String childpictureid : cps) { - if (childpictureid.equals("100.00")){ + if (childpictureid.equals("100")){ i++; } } @@ -97,7 +97,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl + + + + + + + + + +