From 198f4e8c3374b44ee3864750961790aa01d83a57 Mon Sep 17 00:00:00 2001 From: DELL Date: Mon, 15 Apr 2024 19:24:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=B0=8F=E7=BB=93=E6=9F=A5=E9=87=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3-=E4=BB=BB=E5=8A=A1=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E7=BB=93=E6=98=AF=E5=90=A6=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8Cai=E7=BB=9F=E8=AE=A1=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=8C=E5=96=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlowTaskServiceImpl.java | 20 +++++++++- .../ocr/controller/OcrPictureController.java | 37 +++++++++++++++++-- .../ocr/dataobject/OcrTaskchildPicture.java | 4 ++ .../dataobject/OcrTaskchildPictureAppro.java | 3 +- .../impl/OcrSearchHistoryServiceImpl.java | 15 ++++++-- .../resources/mapper/oa/FlowableccMapper.xml | 11 +++++- .../mapper/oa/OcrTaskchildPictureMapper.xml | 6 ++- 7 files changed, 83 insertions(+), 13 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 975d4a8b..251afd20 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 @@ -33,6 +33,8 @@ import cn.jyjz.xiaoyao.oa.from.dataobject.Flowablecc; import cn.jyjz.xiaoyao.oa.from.service.*; import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo; +import cn.jyjz.xiaoyao.oa.from.vo.RepeatedContentVo; +import cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo; import cn.jyjz.xiaoyao.ocr.dataobject.*; import cn.jyjz.xiaoyao.ocr.service.*; import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting; @@ -40,6 +42,7 @@ import cn.jyjz.xiaoyao.ocr.vo.OcrTaskchildPictureApproVo; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -1819,7 +1822,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask @Override public ResultVo repetitionTask() { - return ResultVoUtil.success(flowableccMybatisDao.repetitionTask()); + List repeatedContentVoList = flowableccMybatisDao.repetitionTask(); + List formIdsToUpdate = new ArrayList<>(); + if(repeatedContentVoList.size()>0 && repeatedContentVoList.get(0).getRepeatedTaskList().size() >0){ + String formIds = repeatedContentVoList.get(0).getRepeatedTaskList().get(0).getFormId(); + String[] formIdsArray = formIds.split(","); + for (String formId : formIdsArray) { + formIdsToUpdate.add(formId.trim()); // 去除字符串首尾的空格并添加到集合中 + } + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("PICTUREID", formIdsToUpdate) + .eq("is_repeated_nodules", 0); + OcrTaskchildPicture updateEntity = new OcrTaskchildPicture(); + updateEntity.setIsRepeatedNodules(1); + ocrTaskchildPictureService.update(updateEntity, updateWrapper); + } + return ResultVoUtil.success(repeatedContentVoList); } @Override 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 257a487a..015f0d9b 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 @@ -3,6 +3,7 @@ package cn.jyjz.xiaoyao.ocr.controller; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,6 +21,7 @@ import cn.jyjz.xiaoyao.ocr.util.DataUtil; import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum; import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -265,7 +267,6 @@ public class OcrPictureController extends BaseController { } - QueryWrapper queryWrapper = new QueryWrapper<>(); String search_month = req.getParameter("search_month"); @@ -295,8 +296,8 @@ public class OcrPictureController extends BaseController { //提报人模糊搜索 String upUserName = req.getParameter("upUserName"); - if(StringUtils.isNotBlank(upUserName)){ - queryWrapper.like("upName",upUserName); + if (StringUtils.isNotBlank(upUserName)) { + queryWrapper.like("upName", upUserName); } //根据参数枚举，获取检索参数，并映射为数据库的字段的key-v map @@ -313,6 +314,34 @@ public class OcrPictureController extends BaseController { queryWrapper.eq("tenant_id", tenantId); Page page = new Page(pageNo, pageSize); IPage pageList = ocrPictureService.page(page, queryWrapper); + List ocrPictures = pageList.getRecords(); + List ocrPicturesNew = new ArrayList<>(); + for (OcrPicture ocrPictureOne : ocrPictures) { + LambdaQueryWrapper ocrTaskchildPictureLambdaQueryWrapper = new LambdaQueryWrapper<>(); + ocrTaskchildPictureLambdaQueryWrapper.eq(OcrTaskchildPicture::getId, ocrPictureOne.getTaskchildpictureid()); + OcrTaskchildPicture ocrTaskchildPicture = ocrTaskchildPictureService.getOne(ocrTaskchildPictureLambdaQueryWrapper); + if(ocrTaskchildPicture != null && ocrTaskchildPicture.getStates() != null){ + switch (ocrTaskchildPicture.getStates()) { + case 1: + ocrPictureOne.setField16("未提交"); + break; + case 2: + ocrPictureOne.setField16("审批中"); + break; + case 3: + ocrPictureOne.setField16("审批通过"); + break; + case 5: + ocrPictureOne.setField16("审批不通过"); + break; + default: + ocrPictureOne.setField16("未知状态"); + break; + } + } + ocrPicturesNew.add(ocrPictureOne); + } + pageList.setRecords(ocrPicturesNew); return ResultVoUtil.success(pageList); } @@ -403,7 +432,7 @@ public class OcrPictureController extends BaseController { @RequestParam(name = "pictureId", required = false) String pictureId, HttpServletRequest req) { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req)); - OcrPicture result = ocrPictureService.getPackagePictureInfo(checkDuplicateId, pictureId,userToken); + OcrPicture result = ocrPictureService.getPackagePictureInfo(checkDuplicateId, pictureId, userToken); return ResultVoUtil.success(result); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java index d2e0ae2a..c440d7f2 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java @@ -203,6 +203,10 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable { @TableField(value = "FINISHTIME") private Long finishtime; + @Schema(description = "是否小结重复,1重复，0不重复") + @TableField(value = "is_repeated_nodules") + private Integer isRepeatedNodules; + @ApiModelProperty(value = "项目对象") @TableField(exist = false) private Category categoryDto; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java index 2330f05d..926380db 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java @@ -142,7 +142,8 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable { @ApiModelProperty(value = "拜访城市") private String fromCity; - + @ApiModelProperty(value = "是否重复小结") + private Integer isRepeatedNodules; @ApiModelProperty(value = "所属计划") private String fromplanid; 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 a65dbec1..e95e47fe 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 @@ -139,10 +139,14 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl counts = new HashMap<>(); - counts.put("total", approvedCount + pendingApprovalCount + notGoCount); - counts.put("treat", pendingApprovalCount); - counts.put("approvedCount", approvedCount+notGoCount); - counts.put("repeat", repeat); + counts.put("total", approvedCount + pendingApprovalCount + notGoCount); //任务总数 + counts.put("treat", pendingApprovalCount); //待审批 + counts.put("alreadyApprove", approvedCount+notGoCount); //已审批 + counts.put("approvedCount", approvedCount); //已通过 + counts.put("notGoCount", notGoCount); //未通过 + counts.put("repeat", repeat); //重复图片 + counts.put("repeatedNodules", repeatedNodulesCount); //重复小结数 resultVo.setCode("OK"); resultVo.setMessage("成功"); resultVo.setData(counts); diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml index 7822a540..9bab79b4 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml @@ -213,7 +213,16 @@ t2.FROMUPTIME fromTime, t2.UPDATETIME updateTime, t2.TASKID taskId, - t2.ID formId + ( + SELECT GROUP_CONCAT(t4.ID) + FROM ocr_picture t4 + WHERE t4.field8 = t1.content + AND t4.ID IN ( + SELECT child.PICTUREID + FROM oa_userfinal_t final + LEFT JOIN ocr_taskchild_picture child ON final.FORMID = child.ID + ) + ) AS formId from (select count(field8) count, 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) diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml index e3e7b44c..c1d9a2a0 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml @@ -636,7 +636,8 @@ op.field6 as fromCustomerLevel, op.releaseArea as fromCity, - op.is_repeat + op.is_repeat, + tc.is_repeated_nodules as isRepeatedNodules from ocr_taskchild_picture tc LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID left join ocr_picture op on tc.PICTUREID = op.ID @@ -660,7 +661,8 @@ op.field6 as fromCustomerLevel, op.releaseArea as fromCity, - op.is_repeat + op.is_repeat, + tc.is_repeated_nodules as isRepeatedNodules from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op From 6845d22efba75ea6291404b5f5763d9936b9ab52 Mon Sep 17 00:00:00 2001 From: DELL Date: Mon, 15 Apr 2024 19:36:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml index f419908b..6829134a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml @@ -646,7 +646,7 @@ ) UNION - select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat + select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat,tc.is_repeated_nodules as isRepeatedNodules from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op where tc.ID = uf.FORMID and tc.PICTUREID = op.ID