Merge remote-tracking branch 'origin/master'

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();
+    }
 }

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();
 }

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<OcrTaskchildPictureApproVo>  listNew = new ArrayList<>();
+        List<OcrTaskchildPictureApproVo> listNew = new ArrayList<>();
-        for(OcrTaskchildPictureAppro one : list){
+        for (OcrTaskchildPictureAppro one : list) {
             OcrTaskchildPictureApproVo ocrTaskchildPictureApproVo = new OcrTaskchildPictureApproVo();
             ocrTaskchildPictureApproVo.setId(one.getId()); //任务id
             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());
+    }
+
     /**
      * 格式化筛选关系
      *

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<Flowablecc> {
     List<UserDistionaryVo> selectUserByFromid(String fromid);
 
     List<RepeatedContentVo> repetitionTask();
+
+    List<RepeatedTaskVo> repetitionTaskList();
 }

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;

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

@@ -253,15 +253,26 @@ 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<UserapproveDto> 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());

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;
@@ -13,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;
@@ -56,6 +59,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
     @Resource
     private UserapproveService userapproveService;
 
+    @Resource
+    private OcrPictureInfoService pictureInfoService;
+
     /**
      * 图片真假设置
      *
@@ -316,8 +322,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         }
         //查询图片对象
         OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid());
-
+        OcrPictureInfo one = pictureInfoService.getOne(new LambdaQueryWrapper<OcrPictureInfo>().eq(OcrPictureInfo::getPictureId, ocrTaskchildPicture.getPictureid()));
-//		String pictureids = ocrTaskchildPicture.getPicturecompare();
+        ocrTaskchildPicture.setPictureInfo(one);
+        ocrTaskchildPicture.setLocation(ocrPicture.getLocation());
+        //		String pictureids = ocrTaskchildPicture.getPicturecompare();
 //		String[] splitPictureids = pictureids.split(",");
 //		List<String> listPictureids = Arrays.asList(splitPictureids);
 //		//设置是否为历史信息
@@ -435,8 +443,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             } else {
                 ocrTaskchildPicture.setIzHistory(true);
             }
-
+            Userapprove one = userapproveService.getOne(new LambdaQueryWrapper<Userapprove>().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());
             //获取当前真假标记
             ocrTaskchildPicture.setIztrueorfalse(ocrPicture.getIztrueorfalse());

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());
                 //租户名称

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
     </select>
+
+	<select id="repetitionTaskList" resultType="cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo">
+		SELECT
+			t1.content,
+			t1.id,
+			t1.imgUrl,
+			t3.similarity_score similarityScore,
+			t2.STATES,
+			t3.remark           taskId,
+			t3.taskName,
+			t2.TASKNAME         nodeName,
+			t2.FROMUPTIME       fromTime,
+			t2.UPDATETIME       updateTime
+		from (select field8 content, ID id, imgUrl
+			  FROM ocr_picture
+			  GROUP BY field8
+			  HAVING count(field8) > 1) t1
+				 LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID
+				 LEFT JOIN ocr_picture t3 on t1.content = t3.field8
+    </select>
 </mapper>