From 8750b393e24429f775be19a81192adc37c3695a3 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Sun, 24 Mar 2024 14:08:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E4=BC=BC?= =?UTF-8?q?=E5=BA=A6=E5=9B=BE=E7=89=87=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlowTaskController.java | 14 +++++++++++++ .../flowable/service/IFlowTaskService.java | 2 ++ .../service/impl/FlowTaskServiceImpl.java | 13 ++++++++---- .../oa/from/dataDao/FlowableccMybatisDao.java | 3 +++ .../ocr/dataobject/OcrTaskchildPicture.java | 4 ++++ .../impl/OcrTaskchildPictureServiceImpl.java | 7 +++++-- .../resources/mapper/oa/FlowableccMapper.xml | 20 +++++++++++++++++++ 7 files changed, 57 insertions(+), 6 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 7d420099..3441cfa0 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 @@ -649,4 +649,18 @@ public class FlowTaskController extends BaseController { public ResultVo repetitionTask(){ return flowTaskService.repetitionTask(); } + + /** + * 重复任务 + * @return + */ + @ApiOperation(value="重复流程", notes="重复流程") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true), + }) + @GetMapping("/repetitionTaskList") + @ResponseBody + public ResultVo repetitionTaskList(){ + return flowTaskService.repetitionTaskList(); + } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java index 5ea0aa58..4ac91d06 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java @@ -166,4 +166,6 @@ public interface IFlowTaskService { * @return */ ResultVo repetitionTask(); + + ResultVo repetitionTaskList(); } 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 d24ef4c7..2b6f8f74 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 @@ -511,7 +511,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask userFinalService.save(user.getId().toString(), taskVO.getFormid()); model.setFinishtime(System.currentTimeMillis()); ocrTaskchildPictureService.updateById(model); - }else{ + } else { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(model.getAssignee()); OcrMsg msg = new OcrMsg(); @@ -529,7 +529,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask jsonObject.put("sendTime", System.currentTimeMillis()); jsonObject.put("fromId", model.getId().toString()); jsonObject.put("taskName", model.getFromtaskname()); - jsonObject.put("packageId",model.getPackageid()); + jsonObject.put("packageId", model.getPackageid()); msg.setBusJson(jsonObject.toJSONString()); msg.setCreateBy(Long.valueOf(userToken.getUserid())); msg.setCreateTime(System.currentTimeMillis()); @@ -1469,8 +1469,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } } - List listNew = new ArrayList<>(); - for(OcrTaskchildPictureAppro one : list){ + List listNew = new ArrayList<>(); + for (OcrTaskchildPictureAppro one : list) { OcrTaskchildPictureApproVo ocrTaskchildPictureApproVo = new OcrTaskchildPictureApproVo(); ocrTaskchildPictureApproVo.setId(one.getId()); ocrTaskchildPictureApproVo.setFromtaskname(one.getFromtaskname()); @@ -1781,6 +1781,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask return ResultVoUtil.success(flowableccMybatisDao.repetitionTask()); } + @Override + public ResultVo repetitionTaskList() { + return ResultVoUtil.success(flowableccMybatisDao.repetitionTaskList()); + } + /** * 格式化筛选关系 * diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java index 3f3d7183..06f2a9ba 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java @@ -3,6 +3,7 @@ package cn.jyjz.xiaoyao.oa.from.dataDao; import cn.jyjz.xiaoyao.oa.from.dataobject.Flowablecc; 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.oa.from.vo.UserDistionaryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -38,4 +39,6 @@ public interface FlowableccMybatisDao extends BaseMapper { List selectUserByFromid(String fromid); List repetitionTask(); + + List repetitionTaskList(); } 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 20cb4eeb..26bc399a 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 @@ -253,6 +253,10 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable { @TableField(exist = false) private String field14 = "重复"; + @ApiModelProperty(value = "历史状态") + @TableField(exist = false) + private Integer historyStates; + @ApiModelProperty(value = "审查日志") @TableField(exist = false) private List userapproveList; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java index 2190950f..0cae866a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java @@ -1,5 +1,6 @@ package cn.jyjz.xiaoyao.ocr.service.impl; +import cn.hutool.core.util.ObjectUtil; import cn.jyjz.flowable.common.SystemConstantsOa; import cn.jyjz.flowable.service.IFlowTaskService; import cn.jyjz.xiaoyao.common.base.param.ParamterPage; @@ -435,8 +436,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl().eq(Userapprove::getFormid,ocrTaskchildPicture.getId()).orderByDesc(Userapprove::getCreatedate)); + if(ObjectUtil.isNotEmpty(one)){ + ocrTaskchildPicture.setHistoryStates(one.getStatshis()); + } OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid()); //获取当前真假标记 ocrTaskchildPicture.setIztrueorfalse(ocrPicture.getIztrueorfalse()); 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 acc16033..1bed6661 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 @@ -217,4 +217,24 @@ LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID LEFT JOIN ocr_picture t3 on t1.content = t3.field8 + + From 4038b03337e375259069cb2cb33fd125f56e0bb6 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Sun, 24 Mar 2024 14:55:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=9B=BE=E7=89=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jyjz/xiaoyao/ocr/dataobject/OcrPicture.java | 6 ++++++ .../ocr/dataobject/OcrTaskchildPicture.java | 7 +++++++ .../impl/OcrTaskchildPictureServiceImpl.java | 15 +++++++++++---- .../ocr/thread/tasks/PictureDisposeTask.java | 2 ++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index 94dabec5..72561a70 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -348,6 +348,12 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @TableField(value = "suspiciousfile") private Integer suspiciousfile; + @ApiModelProperty(value = "定位") + @Schema(description = "定位") + @TableField(value = "location") + private String location; + + //图片分类 @TableField(exist = false) private OcrPictureclass ocrPictureclass; 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 26bc399a..9395fff9 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 @@ -261,11 +261,18 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable { @TableField(exist = false) private List userapproveList; + @ApiModelProperty(value = "定位") + @TableField(exist = false) + private String location; + //保存当前登录用户的数据权限范围的搜索条件 @TableField(exist = false) @JsonIgnore private SearchQuery searchQueryrolesShowleave; + @TableField(exist = false) + private OcrPictureInfo pictureInfo; + public FlowModelVO getFlowModelVO() { FlowModelVO flowModelVO = new FlowModelVO(); flowModelVO.setFormid(this.getId()); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java index 0cae866a..063ddc3a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java @@ -14,9 +14,11 @@ import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove; import cn.jyjz.xiaoyao.oa.from.service.UserapproveService; import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildPictureMybatisDao; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo; import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture; import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro; import cn.jyjz.xiaoyao.ocr.dto.UserapproveDto; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureInfoService; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import com.alibaba.fastjson.JSON; @@ -57,6 +59,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl().eq(OcrPictureInfo::getPictureId, ocrTaskchildPicture.getPictureid())); + ocrTaskchildPicture.setPictureInfo(one); + ocrTaskchildPicture.setLocation(ocrPicture.getLocation()); + // String pictureids = ocrTaskchildPicture.getPicturecompare(); // String[] splitPictureids = pictureids.split(","); // List listPictureids = Arrays.asList(splitPictureids); // //设置是否为历史信息 @@ -436,8 +443,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl().eq(Userapprove::getFormid,ocrTaskchildPicture.getId()).orderByDesc(Userapprove::getCreatedate)); - if(ObjectUtil.isNotEmpty(one)){ + Userapprove one = userapproveService.getOne(new LambdaQueryWrapper().eq(Userapprove::getFormid, ocrTaskchildPicture.getId()).orderByDesc(Userapprove::getCreatedate).last("limit 1")); + if (ObjectUtil.isNotEmpty(one)) { ocrTaskchildPicture.setHistoryStates(one.getStatshis()); } OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid()); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java index 5b1dec8a..3c6357fa 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java @@ -6,6 +6,7 @@ import cn.jyjz.xiaoyao.common.base.util.StringUtils; import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; +import com.alibaba.fastjson.JSONObject; import javafx.scene.input.DataFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +47,7 @@ public class PictureDisposeTask implements Runnable{ if(map.get("imgUrl")!=null && !StringUtils.isEmpty(map.get("imgUrl").toString())){ //不为空开始组装参数 入库 OcrPicture picture = new OcrPicture(); + picture.setLocation(JSONObject.toJSONString(pictureSourceResult.getLocation())); //租户编号 picture.setTenantId(pictureSourceResult.getTenantNo()); //租户名称