From 38e682da0cfed806c154b30eeeb2377da32c3e1c Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Mon, 18 Mar 2024 15:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=8D=95?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85-=E7=9B=B8=E4=BC=BC?=
 =?UTF-8?q?=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

---
 .../ocr/controller/OcrTaskchildPictureController.java |  5 +++++
 .../xiaoyao/ocr/dataobject/OcrTaskchildPicture.java   |  4 ++++
 .../service/impl/OcrTaskchildPictureServiceImpl.java  | 11 +++++++----
 .../resources/mapper/oa/OcrTaskchildPictureMapper.xml |  7 +++----
 4 files changed, 19 insertions(+), 8 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 08118eb1..8ad94b66 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
@@ -2,6 +2,8 @@ package cn.jyjz.xiaoyao.ocr.controller;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -13,6 +15,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.beust.jcommander.Parameter;
 import io.swagger.annotations.ApiImplicitParam;
@@ -144,6 +147,8 @@ public class OcrTaskchildPictureController extends BaseController{
 		//queryWrapper.eq("PACKAGEID",packageid);
 		
 		IPage<OcrTaskchildPicture> page = this.ocrTaskchildPictureService.listByPackageId(taskchildpictureid,paramterPage,queryWrapper,orderbyname,orderbyvalue, packageid,tenantId);
+		List collect = page.getRecords().stream().map(p -> JSON.parseObject(JSON.toJSONString(p), Map.class)).collect(Collectors.toList());
+		page.setRecords(collect);
 		return ResultVoUtil.success(page);
 	}
 	
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 862465dc..0059f387 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
@@ -221,6 +221,10 @@ public class OcrTaskchildPicture implements BaseDto,java.io.Serializable {
 	@TableField(exist = false)
 	private OcrPicture ocrPicture;
 
+	@ApiModelProperty(value ="提报时间")
+	@TableField(exist = false)
+	private String reporttime;
+
 	@ApiModelProperty(value ="审查日志")
 	@TableField(exist = false)
 	private List<Userapprove> 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 a64ea2c4..0d791f8e 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
@@ -15,11 +15,15 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+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.extension.plugins.pagination.Page;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -102,10 +106,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error();
     }
 
-    public ResultVo clearmark(String tenantId,String childpictureids, String packageid) {
+    public ResultVo clearmark(String tenantId, String childpictureids, String packageid) {
 
 
-        String selectocpicture = ocrtaskchildpicturemybatisdao.selectocpicture(tenantId, packageid ,childpictureids);
+        String selectocpicture = ocrtaskchildpicturemybatisdao.selectocpicture(tenantId, packageid, childpictureids);
 
 
         String[] cps = selectocpicture.split(",");
@@ -337,7 +341,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         OcrTaskchildPicture mainOcrTaskchildPicture = this.getById(taskchildpictureid);
 
         //判断当前图片是否为历史图片
-        if (null != packageid && null != mainOcrTaskchildPicture.getPackageid() && !packageid.equals(mainOcrTaskchildPicture.getPackageid().toString())) {
+        if (null != packageid && null != mainOcrTaskchildPicture && null != mainOcrTaskchildPicture.getPackageid() && !packageid.equals(mainOcrTaskchildPicture.getPackageid().toString())) {
 
             QueryWrapper<OcrTaskchildPicture> queryWrapperNew = new QueryWrapper<>();
             queryWrapperNew.eq("TENANTID", tenantId);
@@ -381,7 +385,6 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
 
         this.formatTask(iPage.getRecords(), packageid);
 
-
         return iPage;
     }
 
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 438fcc44..ad5e8822 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
@@ -168,7 +168,7 @@
 	</sql>
 	<select id="listFinal" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture" parameterType="java.util.Map">
 
-select tcp.* from (
+select tcp.*,pic.field11 reporttime from (
 			select
 			tc.*
 			from ocr_taskchild_picture tc,OA_USERFINAL_T uf
@@ -179,9 +179,8 @@ select tcp.* from (
 			tc.*
 			from ocr_taskchild_picture tc
 			where tc.STATES = 5
-		) as tcp
-
-
+		) as tcp,ocr_picture pic
+		where tcp.PICTUREID = pic.ID
 		<include refid="Base_Where_union"></include>
 		<if test="fromuptimeStart != null"> and tcp.fromuptime &gt;= ${fromuptimeStart}  </if>
 		<if test="fromuptimeEnd != null"> and tcp.fromuptime &lt;= ${fromuptimeEnd}  </if>