fix:小结查重接口-任务表增加小结是否重复字段，ai统计弹窗接口，完善返回值

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java

@@ -33,6 +33,8 @@ import cn.jyjz.xiaoyao.oa.from.dataobject.Flowablecc;
 import cn.jyjz.xiaoyao.oa.from.service.*;
 
 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.ocr.dataobject.*;
 import cn.jyjz.xiaoyao.ocr.service.*;
 import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting;
@@ -40,6 +42,7 @@ import cn.jyjz.xiaoyao.ocr.vo.OcrTaskchildPictureApproVo;
 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.core.toolkit.StringUtils;
 
@@ -1819,7 +1822,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
     @Override
     public ResultVo repetitionTask() {
-        return ResultVoUtil.success(flowableccMybatisDao.repetitionTask());
+        List<RepeatedContentVo> repeatedContentVoList = flowableccMybatisDao.repetitionTask();
+        List<String> formIdsToUpdate = new ArrayList<>();
+        if(repeatedContentVoList.size()>0 && repeatedContentVoList.get(0).getRepeatedTaskList().size() >0){
+            String formIds = repeatedContentVoList.get(0).getRepeatedTaskList().get(0).getFormId();
+            String[] formIdsArray = formIds.split(",");
+            for (String formId : formIdsArray) {
+                formIdsToUpdate.add(formId.trim()); // 去除字符串首尾的空格并添加到集合中
+            }
+            UpdateWrapper<OcrTaskchildPicture> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.in("PICTUREID", formIdsToUpdate)
+                    .eq("is_repeated_nodules", 0);
+            OcrTaskchildPicture updateEntity = new OcrTaskchildPicture();
+            updateEntity.setIsRepeatedNodules(1);
+            ocrTaskchildPictureService.update(updateEntity, updateWrapper);
+        }
+        return ResultVoUtil.success(repeatedContentVoList);
     }
 
     @Override

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java

@@ -3,6 +3,7 @@ package cn.jyjz.xiaoyao.ocr.controller;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -20,6 +21,7 @@ import cn.jyjz.xiaoyao.ocr.util.DataUtil;
 import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum;
 import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -265,7 +267,6 @@ public class OcrPictureController extends BaseController {
         }
 
 
-
         QueryWrapper<OcrPicture> queryWrapper = new QueryWrapper<>();
 
         String search_month = req.getParameter("search_month");
@@ -295,8 +296,8 @@ public class OcrPictureController extends BaseController {
 
         //提报人模糊搜索
         String upUserName = req.getParameter("upUserName");
-        if(StringUtils.isNotBlank(upUserName)){
+        if (StringUtils.isNotBlank(upUserName)) {
-            queryWrapper.like("upName",upUserName);
+            queryWrapper.like("upName", upUserName);
         }
 
         //根据参数枚举，获取检索参数，并映射为数据库的字段的key-v map
@@ -313,6 +314,34 @@ public class OcrPictureController extends BaseController {
         queryWrapper.eq("tenant_id", tenantId);
         Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize);
         IPage<OcrPicture> pageList = ocrPictureService.page(page, queryWrapper);
+        List<OcrPicture> ocrPictures = pageList.getRecords();
+        List<OcrPicture> ocrPicturesNew = new ArrayList<>();
+        for (OcrPicture ocrPictureOne : ocrPictures) {
+            LambdaQueryWrapper<OcrTaskchildPicture> ocrTaskchildPictureLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            ocrTaskchildPictureLambdaQueryWrapper.eq(OcrTaskchildPicture::getId, ocrPictureOne.getTaskchildpictureid());
+            OcrTaskchildPicture ocrTaskchildPicture = ocrTaskchildPictureService.getOne(ocrTaskchildPictureLambdaQueryWrapper);
+            if(ocrTaskchildPicture != null && ocrTaskchildPicture.getStates() != null){
+                switch (ocrTaskchildPicture.getStates()) {
+                    case 1:
+                        ocrPictureOne.setField16("未提交");
+                        break;
+                    case 2:
+                        ocrPictureOne.setField16("审批中");
+                        break;
+                    case 3:
+                        ocrPictureOne.setField16("审批通过");
+                        break;
+                    case 5:
+                        ocrPictureOne.setField16("审批不通过");
+                        break;
+                    default:
+                        ocrPictureOne.setField16("未知状态");
+                        break;
+                }
+            }
+            ocrPicturesNew.add(ocrPictureOne);
+        }
+        pageList.setRecords(ocrPicturesNew);
 
         return ResultVoUtil.success(pageList);
     }
@@ -403,7 +432,7 @@ public class OcrPictureController extends BaseController {
                                           @RequestParam(name = "pictureId", required = false) String pictureId,
                                           HttpServletRequest req) {
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
-        OcrPicture result = ocrPictureService.getPackagePictureInfo(checkDuplicateId, pictureId,userToken);
+        OcrPicture result = ocrPictureService.getPackagePictureInfo(checkDuplicateId, pictureId, userToken);
         return ResultVoUtil.success(result);
     }
 

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

@@ -203,6 +203,10 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable {
     @TableField(value = "FINISHTIME")
     private Long finishtime;
 
+    @Schema(description = "是否小结重复,1重复，0不重复")
+    @TableField(value = "is_repeated_nodules")
+    private Integer isRepeatedNodules;
+
     @ApiModelProperty(value = "项目对象")
     @TableField(exist = false)
     private Category categoryDto;

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

@@ -142,7 +142,8 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable {
 	@ApiModelProperty(value =  "拜访城市")
 	private String fromCity;
 
-
+	@ApiModelProperty(value =  "是否重复小结")
+	private Integer isRepeatedNodules;
 
 	@ApiModelProperty(value =  "所属计划")
 	private String fromplanid;

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

@@ -139,10 +139,14 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
             int approvedCount = 0; // 通过的数量
             int notGoCount = 0; // 不通过的数量
             int repeat = 0; // 重复数量
+            int repeatedNodulesCount = 0; //重复小结数
             for (OcrTaskchildPictureAppro ocrTaskchildPictureAppro : ocrTaskchildPictureApproList) {
                 if(ocrTaskchildPictureAppro.getIsRepeat() != null && ocrTaskchildPictureAppro.getIsRepeat() == 1){
                     repeat++;
                 }
+                if(ocrTaskchildPictureAppro.getIsRepeatedNodules() !=null && ocrTaskchildPictureAppro.getIsRepeatedNodules() == 1){
+                    repeatedNodulesCount++;
+                }
                 if (ocrTaskchildPictureAppro.getStatshis() != null) {
                     switch (ocrTaskchildPictureAppro.getStatshis()) {
                         case 1:
@@ -164,10 +168,13 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
             }
 
             Map<String, Integer> counts = new HashMap<>();
-            counts.put("total", approvedCount + pendingApprovalCount + notGoCount);
+            counts.put("total", approvedCount + pendingApprovalCount + notGoCount); //任务总数
-            counts.put("treat", pendingApprovalCount);
+            counts.put("treat", pendingApprovalCount); //待审批
-            counts.put("approvedCount", approvedCount+notGoCount);
+            counts.put("alreadyApprove", approvedCount+notGoCount);  //已审批
-            counts.put("repeat", repeat);
+            counts.put("approvedCount", approvedCount); //已通过
+            counts.put("notGoCount", notGoCount); //未通过
+            counts.put("repeat", repeat); //重复图片
+            counts.put("repeatedNodules", repeatedNodulesCount); //重复小结数
             resultVo.setCode("OK");
             resultVo.setMessage("成功");
             resultVo.setData(counts);

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

@@ -213,7 +213,16 @@
 			   t2.FROMUPTIME       fromTime,
 			   t2.UPDATETIME       updateTime,
 			   t2.TASKID			taskId,
-			   t2.ID formId
+			   (
+				   SELECT GROUP_CONCAT(t4.ID)
+				   FROM ocr_picture t4
+				   WHERE t4.field8 = t1.content
+					 AND t4.ID IN (
+					   SELECT child.PICTUREID
+					   FROM oa_userfinal_t final
+								LEFT JOIN ocr_taskchild_picture child ON final.FORMID = child.ID
+				   )
+			   ) AS formId
 		from (select count(field8) count, field8 content, ID id, imgUrl
 			  FROM ocr_picture
 			  where ID in (select child.PICTUREID from oa_userfinal_t final left join ocr_taskchild_picture child on final.FORMID = child.ID)

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

@@ -636,7 +636,8 @@
 
                op.field6 as fromCustomerLevel,
                op.releaseArea as fromCity,
-               op.is_repeat
+               op.is_repeat,
+        tc.is_repeated_nodules as isRepeatedNodules
         from ocr_taskchild_picture tc
         LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
         left join ocr_picture op on tc.PICTUREID = op.ID
@@ -660,7 +661,8 @@
 
                op.field6 as fromCustomerLevel,
                op.releaseArea as fromCity,
-               op.is_repeat
+               op.is_repeat,
+        tc.is_repeated_nodules as isRepeatedNodules
         from ocr_taskchild_picture tc,
         OA_USERAPPROVE_T uf,
         ocr_picture op