Merge pull request 'fix:1、设置审批过的任务不能放入可疑文件夹' (#135) from fix/Suspicious_folder_restriction into test

Reviewed-on: #135

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

@@ -1252,7 +1252,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         for (FlowUnionVo flowUnionVo : list) {
 
             if (flowUnionVo.getStates() != null) {
-                String stateText;
+                String stateText = "";
                 switch (flowUnionVo.getStates()) {
                     case 1:
                         stateText = "撤销";
@@ -1261,13 +1261,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                         stateText = "审批中";
                         break;
                     case 3:
-                        stateText = "审批通过";
+                        stateText = "通过";
                         break;
                     case 5:
-                        stateText = "审批未通过";
-                        break;
-                    default:
-                        stateText = "未知状态";
+                        stateText = "不通过";
                         break;
                 }
                 // 将中文状态赋值给 flowUnionVo 的状态属性
@@ -1439,7 +1436,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             }
 
             if (ocrTaskchildPictureAppro.getStatshis() != null) {
-                String stateText;
+                String stateText = "";
                 switch (ocrTaskchildPictureAppro.getStatshis()) {
                     case 1:
                         stateText = "待审批";
@@ -1450,9 +1447,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     case 3:
                         stateText = "不通过";
                         break;
-                    default:
-                        stateText = "未知状态";
-                        break;
                 }
                 // 将中文状态赋值给 flowUnionVo 的状态属性
                 ocrTaskchildPictureAppro.setStatshisText(stateText);

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

@@ -338,13 +338,10 @@ public class OcrPictureController extends BaseController {
                         ocrPictureOne.setField16("审批中");
                         break;
                     case 3:
-                        ocrPictureOne.setField16("审批通过");
+                        ocrPictureOne.setField16("通过");
                         break;
                     case 5:
-                        ocrPictureOne.setField16("审批不通过");
-                        break;
-                    default:
-                        ocrPictureOne.setField16("未知状态");
+                        ocrPictureOne.setField16("不通过");
                         break;
                 }
                 ocrPictureOne.setStates(ocrTaskchildPicture.getStates());

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

@@ -6,9 +6,11 @@ import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
+import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildPictureMybatisDao;
 import cn.jyjz.xiaoyao.ocr.dataobject.*;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
+import cn.jyjz.xiaoyao.ocr.vo.OaUserApproveVo;
 import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -25,6 +27,8 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import cn.jyjz.xiaoyao.ocr.service.IOcrTaskchildDubiousFileService;
 
@@ -57,6 +61,9 @@ public class OcrTaskchildDubiousFileController  {
     @Autowired
     OcrPictureService ocrpictureservice;
 
+    @Autowired
+    private OcrTaskchildPictureMybatisDao taskchildPictureMybatisDao;
+
     /**
      * 分页查询
      * @param request
@@ -175,7 +182,10 @@ public class OcrTaskchildDubiousFileController  {
             if(one != null && !one.getAssignee().equals(userToken.getLoginname())){
                 return ResultVoUtil.error("勾选存在无权限审批的任务，不能添加可疑文件！");
             }
-
+            List<OaUserApproveVo> oaUserApproveVoList = taskchildPictureMybatisDao.queryHistoricalTask(userToken.getUserid(),one.getId());
+            if(CollUtil.isNotEmpty(oaUserApproveVoList)){
+                return ResultVoUtil.error("该任务已审批，不能添加可疑文件！");
+            }
             QueryWrapper<OcrTaskchildDubiousFile> filewrapper = new QueryWrapper<>();
             filewrapper.eq("picture_id",asd).eq("userid",userToken.getUserid());
             OcrTaskchildDubiousFile one1 = ocrTaskchildDubiousFileService.getOne(filewrapper);

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

@@ -47,6 +47,11 @@ public interface OcrTaskchildPictureMybatisDao extends BaseMapper<OcrTaskchildPi
      * 查询当前用户审批节点
      */
     public List<OaUserApproveVo> queryApprovalNode(@Param("userId") String userId);
+
+    /**
+     * 查询当前用户历史任务
+     */
+    public List<OaUserApproveVo> queryHistoricalTask(@Param("userId") String userId, @Param("formId") Long formId);
     /**
      * 查询当前用户待审批任务
      */

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

@@ -86,10 +86,8 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
         List<SFrontmenuT> frontmenuTList = isFrontmenuTService.queryUserMenuById(assignee);
         if(CollUtil.isNotEmpty(frontmenuTList)){
             for (SFrontmenuT sFrontmenuT : frontmenuTList) {
-                if(StringUtils.isNotBlank(search)){
-                    if(sFrontmenuT.getResKey().equals(FrontMenuEnum.WORKSHEETMAIN.getResKey())){
-                        strings1 = ocrsearchhistorymapper.selectsearch1(userId,search,tenantId);
-                    }
+                if(sFrontmenuT.getResKey().equals(FrontMenuEnum.WORKSHEETMAIN.getResKey())){
+                    strings1 = ocrsearchhistorymapper.selectsearch1(userId,search,tenantId);
                 }
                 if(sFrontmenuT.getResKey().equals(FrontMenuEnum.TASKMAIN.getResKey())){
                     strings2 = ocrsearchhistorymapper.selectsearch2(assignee,search,tenantId);
@@ -102,9 +100,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
 
 //        List<Map<Object,List<Map<String,String>>>> list = new ArrayList<>();
         Map<Object,List<Map<String,String>>> map=new HashMap<>();
-        if(StringUtils.isNotBlank(search)){
-            map.put("ai",strings1);
-        }
+        map.put("ai",strings1);
         map.put("preliminary",strings2);
         map.put("final",strings3);
 //        list.add(map);

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

@@ -18,7 +18,20 @@
     <select id="selectsearch1" resultType="map">
 
 <!--        SELECT ID as id,packagename as name FROM ocr_packagetask WHERE create_by=#{userid} AND packagename like "%"#{search}"%"-->
-        SELECT id,name FROM ocr_task_package WHERE create_by=#{userid} AND name like "%"#{search}"%" AND tenant_id = #{tenantId} AND is_delete = 0
+        SELECT
+            id,name
+        FROM
+            ocr_task_package
+        WHERE
+            create_by=#{userid}
+            <if test="search != null and search != ''">
+                AND name like "%"#{search}"%"
+            </if>
+            AND tenant_id = #{tenantId}
+            AND is_delete = 0
+        ORDER BY
+            create_time DESC
+            LIMIT 3
     </select>
 
     <select id="selectsearch2" resultType="map">

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

@@ -730,6 +730,17 @@
         WHERE USERID = #{userId}
     </select>
 
+    <select id="queryHistoricalTask" resultType="cn.jyjz.xiaoyao.ocr.vo.OaUserApproveVo">
+        SELECT ou.ID as id,
+               ou.USERID as userId,
+               ou.FORMID as formId,
+               ou.TASKINDEX as taskNode,
+               ou.TASKNAME as taskName,
+               ou.STATSHIS as statsHis
+        FROM oa_userapprove_t ou
+        WHERE USERID = #{userId} AND FORMID = #{formId}
+    </select>
+
     <select id="queryExamineApprove" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro">
         select tc.*,
                op.is_repeat,