jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java

@@ -15,6 +15,10 @@ import java.util.Map;
  */
 @Data
 public class PictureSourceResult {
+    /**
+     * id
+     */
+    Long id;
     /**
      * 租户no
      */
@@ -204,4 +208,9 @@ public class PictureSourceResult {
      */
     Long submitTime;
 
+    /**
+     * 备注
+     */
+    String comment;
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java

@@ -13,4 +13,6 @@ public interface OcrPictureMybatisDao extends BaseMapper<OcrPicture> {
     OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId);
 
     OcrPicture selectByRemark(@Param("remark") String remark);
+
+    String getPictureApproveResult(Long id);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java

@@ -364,6 +364,11 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
     @TableField(value = "location")
     private String location;
 
+    @ApiModelProperty(value = "备注")
+    @Schema(description = "备注")
+    @TableField(value = "comment")
+    private String comment;
+
     @ApiModelProperty(value = "拍照时间")
     @TableField(value = "photo_date_timestamp")
     @JsonSerialize(using = DateSerializer.class)

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java

@@ -4,6 +4,7 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -32,6 +33,9 @@ public interface OcrPictureService extends BaseService<OcrPicture> {
 
     public ResultVo createTaskChild(List<OcrPicture> ocrPictureList, String tenantId, HttpServletRequest request);
 
+    String getPictureApproveResult(Long id);
+
+    void deletePictureInfo(Long id);
     /**
      * 查询工单图片信息
      *
@@ -86,4 +90,5 @@ public interface OcrPictureService extends BaseService<OcrPicture> {
      */
     OcrPicture selectByRemark(String remark);
 
+    OcrTaskchildPicture getOcrTaskChildPictureByPictureId(String pictureId);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java

@@ -13,6 +13,8 @@ import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
 import cn.jyjz.xiaoyao.oa.from.service.CategoryService;
+import cn.jyjz.xiaoyao.oa.from.service.UserapproveService;
+import cn.jyjz.xiaoyao.oa.from.service.impl.UserapproveServiceImpl;
 import cn.jyjz.xiaoyao.ocr.api.utils.ApiConfig;
 import cn.jyjz.xiaoyao.ocr.dataDao.OcrPictureMybatisDao;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPackagetask;
@@ -83,6 +85,8 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     @Resource
     private OcrPackagetaskService ocrPackagetaskService;
+
+    @Resource
     private OcrTaskchildPictureService ocrTaskchildPictureService;
     @Resource
     IFlowInstanceService flowInstanceService;
@@ -103,6 +107,8 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     @Resource
     OcrPictureMybatisDao pictureMybatisDao;
+    @Autowired
+    private UserapproveService userapproveService;
 
     public ResultVo createTaskChild(List<OcrPicture> ocrPictureList, String tenantId, UserToken sysUser, String search_month, HttpServletRequest request, String buessinessno) {
 
@@ -343,6 +349,11 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
         return pictureMybatisDao.selectByRemark(remark);
     }
 
+    @Override
+    public OcrTaskchildPicture getOcrTaskChildPictureByPictureId(String pictureId) {
+        return ocrTaskchildPictureService.getOne(new LambdaQueryWrapper<OcrTaskchildPicture>().eq(OcrTaskchildPicture::getPictureid,pictureId));
+    }
+
 //    @Override
 //    public Long getPhotoDateTime(OcrPicture picture) {
 //        long timestamp = 0L;
@@ -504,6 +515,24 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
         return ResultVoUtil.error("失败。");
     }
 
+    @Override
+    public String getPictureApproveResult(Long id) {
+       return pictureMybatisDao.getPictureApproveResult(id);
+    }
+
+    @Override
+    public void deletePictureInfo(Long id) {
+        //删除图片表
+        pictureMybatisDao.deleteById(id);
+        //删除图片信息表
+        ocrPictureInfoService.remove(new LambdaQueryWrapper<OcrPictureInfo>().eq(OcrPictureInfo::getPictureId,id));
+        OcrTaskchildPicture taskchildPicture = ocrTaskchildPictureService.getOne(new LambdaQueryWrapper<OcrTaskchildPicture>().eq(OcrTaskchildPicture::getPictureid, id));
+        //删除任务表
+        ocrTaskchildPictureService.remove(new LambdaQueryWrapper<OcrTaskchildPicture>().eq(OcrTaskchildPicture::getPictureid,id));
+        //删除审批记录表
+        userapproveService.delete(taskchildPicture.getId().toString());
+    }
+
     public void bubbleSortOpt(List<OcrPicture> compareList) {
 
         if (null == compareList) {
@@ -695,7 +724,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
             boolean saveBatch = false;
             synchronized(lock) {
                 // 同步的代码块
-                saveBatch  = this.saveBatch(ocrPictureList);
+                saveBatch  = this.saveOrUpdateBatch(ocrPictureList);
             }
 
             //3.添加图片信息

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java

@@ -2,6 +2,7 @@ package cn.jyjz.xiaoyao.ocr.thread;
 
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult;
 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.thread.entity.PictureImgToLocalEntity;
 import com.google.common.collect.Sets;
@@ -42,9 +43,17 @@ public class TaskQueue {
             Long taskId = pictureSourceResult.getTaskId();
             OcrPicture ocrPicture = ocrPictureService.selectByRemark(String.valueOf(taskId));
             if (ocrPicture != null) {
+                OcrTaskchildPicture taskchildPicture = ocrPictureService.getOcrTaskChildPictureByPictureId(ocrPicture.getId().toString());
+                if (taskchildPicture != null && pictureSourceResult.getTaskStatus() != null
+                        && pictureSourceResult.getTaskStatus() == 6 && taskchildPicture.getStates() == 5) {
+                    String result = ocrPictureService.getPictureApproveResult(ocrPicture.getId());
+                    ocrPictureService.deletePictureInfo(ocrPicture.getId());
+                    pictureSourceResult.setComment(result);
+                    pictureSourceResult.setId(ocrPicture.getId());
+                } else {
                     return true;
                 }
-
+            }
             resultSet.add(String.valueOf(taskId));
             pictureDisposeQueue.put(pictureSourceResult);
         } catch (InterruptedException e) {

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java

@@ -66,6 +66,14 @@ public class PictureDisposeTask implements Runnable{
 //                }
                 //不为空开始组装参数 入库
                 OcrPicture picture = new OcrPicture();
+                //id
+                if (pictureSourceResult.getId() != null) {
+                    picture.setId(pictureSourceResult.getId());
+                }
+                //备注
+                if (pictureSourceResult.getComment() != null) {
+                    picture.setComment(pictureSourceResult.getComment());
+                }
                 //定位信息
                 if (pictureSourceResult.getLocation() != null) {
                     picture.setLocation(JSONObject.toJSONString(pictureSourceResult.getLocation()));

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml

@@ -250,11 +250,20 @@
     </select>
 
 	<select id="selectByRemark" resultMap="BaseResultMap">
-		SELECT `ID`
+		SELECT
+		<include refid="Base_Column_List"/>
 		FROM
 		ocr_picture
 		WHERE `remark` = #{remark}
 		LIMIT 1
 	</select>
 
+	<select id="getPictureApproveResult" resultType="java.lang.String">
+		SELECT
+			CONCAT('审批节点：',t1.TASKNODE,'，审批结果：',t1.STATES,'，不通过原因：',t2.REASON)
+		FROM
+			ocr_taskchild_picture t1
+				LEFT JOIN oa_userapprove_t t2 ON t1.ID = t2.FORMID
+		where t1.PICTUREID = #{id,jdbcType=BIGINT}
+    </select>
 </mapper>