fix: 修改任务包列表

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java

@@ -23,8 +23,14 @@ import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
 import cn.jyjz.xiaoyao.oa.from.service.UserapproveService;
 import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearch;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearchchild;
+import cn.jyjz.xiaoyao.ocr.service.OcrSearchmanagerService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
+import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService;
+import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchchildService;
 import com.alanpoi.common.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.*;
 import org.apache.commons.collections4.CollectionUtils;
@@ -62,7 +68,7 @@ public class FlowTaskController extends BaseController {
     private OcrTaskchildPictureService ocrTaskchildPictureService;
 
     @Resource
-    private UserapproveService userapproveService;
+    private OcrUsersearchchildService usersearchchildService;
 //    /**
 //     * 查询我的待办任务
 //     * @return
@@ -156,11 +162,11 @@ public class FlowTaskController extends BaseController {
             List<String> formIds = ocrTaskchildPictureService.validateAssignee(formIdList, userToken);
             // 判断当前任务是否审批完毕
             if (CollectionUtils.isNotEmpty(formIds)) {
-                Integer success = flowTaskService.complete(approve, userToken,formIds);
+                Integer success = flowTaskService.complete(approve, userToken, formIds);
-                return ResultVoUtil.success("审批成功" + success + "条，" + "无权审核" + (flowTaskInfoList.size() - success) + "条","");
+                return ResultVoUtil.success("审批成功" + success + "条，" + "无权审核" + (flowTaskInfoList.size() - success) + "条", "");
             }
         }
-        return ResultVoUtil.success("审核成功0条，" + "无权审核" + flowTaskInfoList.size() + "条","");
+        return ResultVoUtil.success("审核成功0条，" + "无权审核" + flowTaskInfoList.size() + "条", "");
     }
 
     @GetMapping("/listhistore")
@@ -294,14 +300,14 @@ public class FlowTaskController extends BaseController {
         String tenantId = request.getHeader("X-Tenant-Id");
 
         String taskName = request.getParameter("keyword");
-
         if (org.apache.commons.lang3.StringUtils.isBlank(tenantId)) {
             return ResultVoUtil.error("租户主键不能为空");
         }
-        if(org.apache.commons.lang3.StringUtils.isNotBlank(taskName)){
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(taskName)) {
-            searchQuery.addLike("fromtaskname",taskName);
+            searchQuery.addLike("fromtaskname", taskName);
         }
 
+
         User user = this.userService.getSessionUser(request);
         if (user.isUserIsSys(xiaoyaoConfig.getWebconfig().getSysLoginUser().split(","))) {
             flowTaskService.getMyProcessInstances(searchQuery.getQuery(), pageUtils);
@@ -327,6 +333,28 @@ public class FlowTaskController extends BaseController {
         return ResultVoUtil.success(pageUtils);
     }
 
+    private void disSearchQuery(SearchQuery query, OcrUsersearchchild userSearch) {
+        if (userSearch.getSearchtype().equals("eq")) {
+            if (userSearch.getSearchvalue().contains(",")) {
+                String[] userIds = userSearch.getSearchvalue().split(",");
+                List<String> arrayData = Arrays.asList(userIds);
+                query.addIn(userSearch.getSearchfield(), arrayData);
+            } else {
+                query.addEqual(userSearch.getSearchfield(), userSearch.getSearchvalue());
+            }
+        }
+        if (userSearch.getSearchtype().equals("noteq")) {
+            if (userSearch.getSearchvalue().contains(",")) {
+                String[] userIds = userSearch.getSearchvalue().split(",");
+                List<String> arrayData = Arrays.asList(userIds);
+                query.addNotIn(userSearch.getSearchfield(), arrayData);
+            } else {
+                query.addNotEqual(userSearch.getSearchfield(), userSearch.getSearchvalue());
+            }
+        }
+
+    }
+
 
     /**
      * 终审列表
@@ -398,6 +426,7 @@ public class FlowTaskController extends BaseController {
                 searchQuery.addEqual("fromsourceid", iztaskrrom);
             }
         }
+
         if (org.springframework.util.StringUtils.hasText(izuptime)) {
             String[] dateRange = izuptime.split("-");
             if (dateRange.length == 2) {
@@ -436,6 +465,14 @@ public class FlowTaskController extends BaseController {
             searchQuery.addEqual("thisLoginUserid", user.getId().toString());
             searchQuery.addEqual("tenantid", tenantId);
         }
+        String searchId = request.getParameter("searchId");
+
+        if (StringUtils.isNotBlank(searchId)) {
+            List<OcrUsersearchchild> list = usersearchchildService.list(new LambdaQueryWrapper<OcrUsersearchchild>().eq(OcrUsersearchchild::getUsersearchid, searchId).orderByAsc(OcrUsersearchchild::getOrderNum));
+            for (OcrUsersearchchild userSearch : list) {
+                disSearchQuery(searchQuery, userSearch);
+            }
+        }
 
         Map<String, Object> query = searchQuery.getQuery();
 
@@ -633,7 +670,8 @@ public class FlowTaskController extends BaseController {
     })
     @GetMapping("/repetitionTaskList")
     @ResponseBody
-    public ResultVo repetitionTaskList() {
+    public ResultVo repetitionTaskList(@RequestParam(name = "pageNo") Integer pageNo,
-        return flowTaskService.repetitionTaskList();
+                                       @RequestParam(name = "pageSize") Integer pageSize) {
+        return flowTaskService.repetitionTaskList(pageNo, pageSize);
     }
 }

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

@@ -165,5 +165,5 @@ public interface IFlowTaskService {
      */
     ResultVo repetitionTask();
 
-    ResultVo repetitionTaskList();
+    ResultVo repetitionTaskList(Integer pageNo, Integer pageSize);
 }

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

@@ -35,6 +35,7 @@ import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
 import cn.jyjz.xiaoyao.ocr.dataobject.*;
 import cn.jyjz.xiaoyao.ocr.service.*;
 import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting;
+import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
 import cn.jyjz.xiaoyao.ocr.vo.OcrTaskchildPictureApproVo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -1763,8 +1764,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     }
 
     @Override
-    public ResultVo repetitionTaskList() {
+    public ResultVo repetitionTaskList(Integer pageNo, Integer pageSize) {
-        return ResultVoUtil.success(flowableccMybatisDao.repetitionTaskList());
+        Page<OcrTaskChildPictureVo> page = new Page<>(pageNo, pageSize);
+
+        return ResultVoUtil.success(flowableccMybatisDao.repetitionTaskList(page));
     }
 
     /**

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java

@@ -5,7 +5,9 @@ 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 cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -40,5 +42,5 @@ public interface FlowableccMybatisDao extends BaseMapper<Flowablecc> {
 
     List<RepeatedContentVo> repetitionTask();
 
-    List<RepeatedTaskVo> repetitionTaskList();
+    Page<RepeatedTaskVo> repetitionTaskList(Page<OcrTaskChildPictureVo> page);
 }

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

@@ -390,7 +390,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         if (null != userToken) {
             Optional<Userapprove> first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid())).findFirst();
             Userapprove userapprove = new Userapprove();
-            userapprove.setStatshis(1);
+            userapprove.setStatshis(ocrTaskchildPicture.getStates()==3?2:ocrTaskchildPicture.getStates()==5?3:1);
             ocrTaskchildPicture.setUserapprove(first.orElse(userapprove));
         }
         //查询图片对象

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

@@ -450,7 +450,7 @@
         where tc.STATES = 5
         ) as tcp
             left join ocr_picture pic
-                      on tcp.PICTUREID = pic.ID
+                      on tcp.PICTUREID = pic.ID and pic.suspiciousfile =0
         <include refid="Base_Where_union">
         </include>
         <if test="fromuptimeStart != null">
@@ -470,16 +470,18 @@
         select count(tcp.ID) from (
         select tc.*
         from ocr_taskchild_picture tc,
-             OA_USERFINAL_T uf
+             OA_USERFINAL_T uf,
-        where tc.ID = uf.FORMID
+             ocr_picture p
+        where tc.ID = uf.FORMID  and p.ID = tc.PICTUREID and p.suspiciousfile =0
         <if test="thisLoginUserid != null">
             and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
         </if>
         UNION
         select
             tc.*
-        from ocr_taskchild_picture tc
+        from ocr_taskchild_picture tc,
-        where tc.STATES = 5
+        ocr_picture p
+        where tc.STATES = 5 and p.suspiciousfile =0
         ) as tcp
         <include refid="Base_Where_union">
         </include>
@@ -496,6 +498,7 @@
                uf.TASKNO
         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 and op.suspiciousfile =0
         where tc.ASSIGNEE = #{searchassignee}
           and tc.TENANTID = #{searchtenantid}
           and tc.STATES = 2
@@ -507,8 +510,9 @@
                uf.TASKINDEX,
                uf.TASKNO
         from ocr_taskchild_picture tc,
-             OA_USERAPPROVE_T uf
+             OA_USERAPPROVE_T uf,
-        where tc.ID = uf.FORMID
+        ocr_picture op
+        where tc.ID = uf.FORMID and  tc.PICTUREID = op.ID and op.suspiciousfile =0
           and tc.TENANTID = #{searchtenantid}
         <if test="thisLoginUserid != null">
             and uf.USERID = #{thisLoginUserid}
@@ -589,7 +593,7 @@
                t1.photo_date_timestamp  photoDateTimestamp
         FROM ocr_picture t1
                  LEFT JOIN ocr_taskchild_picture t2
-                           on t1.ID = t2.PICTUREID
+                           on t1.ID = t2.PICTUREID and t1.suspiciousfile = 0
                  LEFT JOIN oa_userapprove_t t3 on t2.ID = t3.FORMID and t3.TASKNAME = '${taskname}'
         where t1.ID in
         <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
@@ -655,7 +659,7 @@
                  LEFT JOIN ocr_picture_info t2 on t1.ID = t2.picture_id
                  LEFT JOIN ocr_taskchild_picture t3 on t1.ID = t3.PICTUREID
                  LEFT JOIN oa_userapprove_t t4 on t4.FORMID = t3.ID
-        where t1.ID = #{pictureId}
+        where t1.ID = #{pictureId} and t1.suspiciousfile = 0
     </select>
 
     <select id="getPackageSimilarityList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
@@ -694,7 +698,7 @@
                t1.max_similarity        maxSimilarity,
                ifnull(t4.STATSHIS, 1)   historyStates
         FROM ocr_check_duplicate_result t1
-                 LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
+                 LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID and t2.suspiciousfile = 0
                  LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID
                  LEFT JOIN oa_userapprove_t t4 ON t3.ID = t4.FORMID and t4.TASKNAME = '${taskname}'
         WHERE t1.check_duplicate_id = #{checkDuplicateId}