From 188ef2019c32e6be63807f0a618cbf8d02b6fda5 Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Mon, 18 Mar 2024 13:05:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E9=99=A4=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=20=E6=B2=A1=E6=B8=85=E9=99=A4=E6=A0=87=E8=AE=B0=20?= =?UTF-8?q?=E5=B7=B2=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OcrTaskchildPictureController.java | 40 ++++++++++++----- .../OcrTaskchildPictureMybatisDao.java | 4 ++ .../service/OcrTaskchildPictureService.java | 4 +- .../impl/OcrTaskchildPictureServiceImpl.java | 42 +++++++---------- .../mapper/oa/OcrTaskchildPictureMapper.xml | 45 +++++++++++-------- 5 files changed, 79 insertions(+), 56 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java index 3c007c35..08118eb1 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java @@ -184,6 +184,26 @@ public class OcrTaskchildPictureController extends BaseController{ * @param req * @return */ +// @ApiOperation(value="任务清除标记", notes="任务清除标记") +// @ApiImplicitParams({ +// @ApiImplicitParam(paramType = "path",name = "taskchildpictureid", value = "任务主键", required = true), +// @ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键", required = true) +// }) +// @PostMapping(value = "/clearmark") +// public ResultVo clearmark(@RequestParam(name="taskchildpictureid",required=true) String taskchildpictureid, +// @RequestParam(name="packageid",required=true) String packageid, +// HttpServletRequest req) { +// //如果是历史图片，不允许进行设置 +// //如果是已经审批完成的图片不允许是指 +// +// OcrTaskchildPicture ocrTaskchildPicture = new OcrTaskchildPicture(); +// +// ocrTaskchildPicture.setPackageid(Long.parseLong(packageid)); +// +// return ocrTaskchildPictureService.clearmark(taskchildpictureid,packageid); +// } + + @ApiOperation(value="任务清除标记", notes="任务清除标记") @ApiImplicitParams({ @ApiImplicitParam(paramType = "path",name = "taskchildpictureid", value = "任务主键", required = true), @@ -191,16 +211,16 @@ public class OcrTaskchildPictureController extends BaseController{ }) @PostMapping(value = "/clearmark") public ResultVo clearmark(@RequestParam(name="taskchildpictureid",required=true) String taskchildpictureid, - @RequestParam(name="packageid",required=true) String packageid, - HttpServletRequest req) { - //如果是历史图片，不允许进行设置 - //如果是已经审批完成的图片不允许是指 - - OcrTaskchildPicture ocrTaskchildPicture = new OcrTaskchildPicture(); - - ocrTaskchildPicture.setPackageid(Long.parseLong(packageid)); - - return ocrTaskchildPictureService.clearmark(taskchildpictureid,packageid); + @RequestParam(name="packageid",required=true) String packageid, + HttpServletRequest request) { + //租户主键，由前端页面传送 + String tenantId = request.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + + + return ocrTaskchildPictureService.clearmark(tenantId,taskchildpictureid,packageid); } /** 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 ad3bcd04..6caf5b19 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 @@ -1,9 +1,11 @@ package cn.jyjz.xiaoyao.ocr.dataDao; +import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo; import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture; import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -41,4 +43,6 @@ public interface OcrTaskchildPictureMybatisDao extends BaseMapper query); + + String selectocpicture(@Param("tenantid")String tenantid,@Param("packageid")String packageid,@Param("id")String id); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java index a62beae3..59ce5ff6 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java @@ -12,6 +12,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture; import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestParam; /** @@ -73,7 +74,8 @@ public interface OcrTaskchildPictureService extends BaseService saveList = new ArrayList<>(); - StringBuffer historyPname = new StringBuffer(); + String selectocpicture = ocrtaskchildpicturemybatisdao.selectocpicture(tenantId, packageid ,childpictureids); + + + String[] cps = selectocpicture.split(","); + + List saveList = new ArrayList<>(); - StringBuffer taskType = new StringBuffer(); for (String childpictureid : cps) { - OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid)); +// OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid)); - //如果是历史图片，不允许进行设置 -// if(old.isIzHistory()){ -// if(historyPname.length() > 0){ -// historyPname.append("," + old.getOcrPicture().getImgname()); -// }else{ -// historyPname.append(old.getOcrPicture().getImgname()); -// } -// } -// if(old.getStates().intValue() == 3 || old.getStates().intValue() == 5) { -// if(taskType.length() > 0){ -// taskType.append("," + old.getOcrPicture().getImgname()); -// }else{ -// taskType.append(old.getOcrPicture().getImgname()); -// } -// } + OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(Long.parseLong(childpictureid)); - OcrPicture ocrPicture = old.getOcrPicture(); ocrPicture.setJudgeid(null); ocrPicture.setJudgedesc(null); ocrPicture.setIztrueorfalse(null); ocrPicture.setUpdateTime(System.currentTimeMillis()); +// OcrPicture ocrPicture = old.getOcrPicture(); +// ocrPicture.setJudgeid(null); +// ocrPicture.setJudgedesc(null); +// ocrPicture.setIztrueorfalse(null); +// ocrPicture.setUpdateTime(System.currentTimeMillis()); + saveList.add(ocrPicture); } @@ -297,11 +290,6 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl list = userapproveService.list(new LambdaQueryWrapper().eq(Userapprove::getFormid, fromid)); - ocrTaskchildPicture.setUserapproveList(list); //查询图片对象 OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid()); 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 3bc1e440..438fcc44 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 @@ -207,29 +207,24 @@ select tcp.* from ( @@ -249,4 +244,18 @@ select tcp.* from ( + + + + +