guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'sunchenliang' (#44) from sunchenliang into test

Browse Source 
Reviewed-on: #44
pull/46/head^2^2
sunchenliang 1 year ago
parent 4f2a478f68 d9066f1115
commit a615930c35
5 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File

6
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
Unescape View File

@ -22,6 +22,7 @@ import cn.jyjz.xiaoyao.common.base.vo.UserToken;
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.oa.from.vo.RepeatedTaskVo;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearch;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearchchild;
@ -29,9 +30,11 @@ 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 cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
import com.alanpoi.common.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.*;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.http.MediaType;
@ -675,6 +678,7 @@ public class FlowTaskController extends BaseController {
@ResponseBody
public ResultVo repetitionTaskList(@RequestParam(name = "pageNo") Integer pageNo,
@RequestParam(name = "pageSize") Integer pageSize) {
return flowTaskService.repetitionTaskList(pageNo, pageSize);
IPage<OcrTaskchildPicture> result = flowTaskService.repetitionTaskList(pageNo, pageSize);
return ResultVoUtil.success(result);
}
}

6
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java
Unescape View File

@ -13,9 +13,13 @@ import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
import cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.task.api.Task;
@ -175,5 +179,5 @@ public interface IFlowTaskService {
*/
ResultVo repetitionTask();
ResultVo repetitionTaskList(Integer pageNo, Integer pageSize);
IPage<OcrTaskchildPicture> repetitionTaskList(Integer pageNo, Integer pageSize);
}

12
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
Unescape View File

@ -33,6 +33,7 @@ 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.RepeatedTaskVo;
import cn.jyjz.xiaoyao.ocr.dataobject.*;
import cn.jyjz.xiaoyao.ocr.service.*;
import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting;
@ -1814,10 +1815,13 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
@Override
public ResultVo repetitionTaskList(Integer pageNo, Integer pageSize) {
Page<OcrTaskChildPictureVo> page = new Page<>(pageNo, pageSize);
return ResultVoUtil.success(flowableccMybatisDao.repetitionTaskList(page));
public IPage<OcrTaskchildPicture> repetitionTaskList(Integer pageNo, Integer pageSize) {
Page<OcrTaskchildPicture> page = new Page<>(pageNo, pageSize);
List<OcrTaskchildPicture> result = flowableccMybatisDao.repetitionTaskList();
List<OcrTaskchildPicture> collect = result.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
page.setRecords(collect);
page.setTotal(result.size());
return page;
}
/**

3
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java
Unescape View File

@ -5,6 +5,7 @@ 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.dataobject.OcrTaskchildPicture;
import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -42,5 +43,5 @@ public interface FlowableccMybatisDao extends BaseMapper<Flowablecc> {
List<RepeatedContentVo> repetitionTask();
Page<RepeatedTaskVo> repetitionTaskList(Page<OcrTaskChildPictureVo> page);
List<OcrTaskchildPicture> repetitionTaskList();
}

28
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
Unescape View File

@ -223,20 +223,20 @@
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 fromTaskId,
t3.taskName,
t2.TASKNAME nodeName,
t2.FROMUPTIME fromTime,
t2.UPDATETIME updateTime,
t2.TASKID taskId,
t2.ID formId
<select id="repetitionTaskList" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture">
SELECT t2.*
<!-- t1.content,-->
<!-- t1.id,-->
<!-- t1.imgUrl,-->
<!-- t3.similarity_score similarityScore,-->
<!-- t2.STATES,-->
<!-- t3.remark fromTaskId,-->
<!-- t3.taskName,-->
<!-- t2.TASKNAME nodeName,-->
<!-- t2.FROMUPTIME fromTime,-->
<!-- t2.UPDATETIME updateTime,-->
<!-- t2.TASKID taskId,-->
<!-- t2.ID formId-->
from (select 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)

Write Preview
Loading…
Cancel
Save