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

Merge branch 'dev'

Browse Source 
# Conflicts:
#	jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java
pull/1/head
sunchenliang 2 years ago
parent 9e3964a48c 9d0d25a222
commit 0cc2e871e0
5 changed files with 501 additions and 418 deletions
Show Stats Download Patch File Download Diff File

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

@ -169,6 +169,10 @@ public class FlowTaskController extends BaseController {
return ResultVoUtil.error("存在已经审批的任务。");
}
if(!this.ocrTaskchildPictureService.validateBoole(formid)){
return ResultVoUtil.error("存在未判真假数据。");
}
//TODO 判断taskid是否为非法，空置、taskid是否存在
//判断当前任务是否存在历史任务--暂时不做，生成任务时直接保存历史任务的审批工具中
@ -248,11 +252,32 @@ public class FlowTaskController extends BaseController {
//租户主键，由前端页面传送
String tenantId = request.getHeader("X-Tenant-Id");
String taskid = request.getParameter("taskid");
String states = request.getParameter("states");
String fromprojectid = request.getParameter("fromprojectid");
String fromuserid = request.getParameter("fromuserid");
String fromplanid = request.getParameter("fromplanid");
if(org.apache.commons.lang3.StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
if(StringUtils.isNotBlank(taskid)){
searchQuery.addEqual("taskid",taskid);
}
if(StringUtils.isNotBlank(states)){
searchQuery.addEqual("states",states);
}
if(StringUtils.isNotBlank(fromprojectid)){
searchQuery.addEqual("fromprojectid",fromprojectid);
}
if(StringUtils.isNotBlank(fromuserid)){
searchQuery.addEqual("fromuserid",fromuserid);
}
if(StringUtils.isNotBlank(fromplanid)){
searchQuery.addEqual("fromplanid",fromplanid);
}
//查询判过真假的
searchQuery.addNotEqual("iztrueorfalse",null);
User user = this.userService.getSessionUser(request);
if(user.isUserIsSys(xiaoyaoConfig.getWebconfig().getSysLoginUser().split(","))){
@ -262,7 +287,7 @@ public class FlowTaskController extends BaseController {
//如果assigneeId 为空查询发起流程，否则查询待办流程
if(StringUtils.isNotBlank(assigneeId) && assigneeId.equals(user.getId().toString())){
searchQuery.addEqual("assignee",user.getLoginname());
searchQuery.addEqual("states",SystemConstantsOa.OA_STATUS_TYPE_ING.toString());
// searchQuery.addEqual("states",SystemConstantsOa.OA_STATUS_TYPE_ING.toString());
}else{
searchQuery.addEqual("createuser",user.getLoginname());
}
@ -450,4 +475,23 @@ public class FlowTaskController extends BaseController {
//return ResultVoUtil.success();
}
/**
* 审批历史记录
* @return
*/
@ApiOperation(value="重置流程流程", notes="重置流程流程")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
@ApiImplicitParam(paramType = "path",name = "buessinessno", value = "业务编码", required = true)
})
@GetMapping("/historyTask")
@ResponseBody
public ResultVo historyTask(HttpServletRequest request){
String fromid = request.getParameter("fromid");
String taskid = request.getParameter("buessinessno");
return flowTaskService.removeTask(fromid,taskid);
//return ResultVoUtil.success();
}
}

10
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java
Unescape View File

@ -90,23 +90,23 @@ public class OcrPackagetaskController extends BaseController{
public ResultVo<IPage<OcrPackagetask>> queryPageList(OcrPackagetask ocrPackagetask,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="packagename", required = false) String packagename,
HttpServletRequest request) {
if(StringUtils.isBlank(packagename)){
return ResultVoUtil.success();
}
//租户主键，由前端页面传送
String tenantId = request.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
String packageName = request.getParameter("packagename");
//获取当前登录人
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
QueryWrapper<OcrPackagetask> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("tenant_id",tenantId);
queryWrapper.like("packagename",packagename);
if(StringUtils.isNotBlank(packageName)){
queryWrapper.like("packagename",packageName);
}
Page<OcrPackagetask> page = new Page<OcrPackagetask>(pageNo, pageSize);
IPage<OcrPackagetask> pageList = ocrPackagetaskService.page(page, queryWrapper);
return ResultVoUtil.success(pageList);

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
Unescape View File

@ -41,6 +41,8 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
*/
public boolean validateApprove(String[] formid);
public boolean validateBoole(String[] formid);
/**
* 判断当前用户是否可以审批
* @param formid 任务主键

42
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
Unescape View File

@ -12,6 +12,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
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;
@ -25,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
/**
* 业务层实现
@ -40,8 +42,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
@Resource
IFlowTaskService iFlowTaskService;
/**
* 图片真假设置
*
* @param childpictureids
* @return
*/
@ -84,8 +88,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
if (StringUtils.isNotBlank(historyPname.toString())) {
return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能标记。");
}
else if(StringUtils.isNotBlank(taskType.toString())){
} else if (StringUtils.isNotBlank(taskType.toString())) {
return ResultVoUtil.error(taskType.toString() + "已经审批，不能标记。");
}
@ -130,8 +133,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
if (StringUtils.isNotBlank(historyPname.toString())) {
return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能清除标记。");
}
else if(StringUtils.isNotBlank(taskType.toString())){
} else if (StringUtils.isNotBlank(taskType.toString())) {
return ResultVoUtil.error(taskType.toString() + "已经审批，不能清除标记。");
}
@ -140,6 +142,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 图片是否合格设置
*
* @param childpictureid
* @return
*/
@ -169,6 +172,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 判断当前用户是否可以审批
*
* @param formid 任务主键
* @param userToken
* @return
@ -192,6 +196,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 判断任务是否已经审批
*
* @param formid 任务主键
* @return
*/
@ -213,6 +218,23 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
return true;
}
/**
* 判断任务是否已经审批
*
* @param formid 任务主键
* @return
*/
public boolean validateBoole(String[] formid) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.in("ID", formid);
List<OcrTaskchildPicture> list = this.ocrtaskchildpicturemybatisdao.selectList(queryWrapper);
List<OcrPicture> pictures = ocrPictureService.list(new LambdaQueryWrapper<OcrPicture>().eq(OcrPicture::getId, list.stream().map(OcrTaskchildPicture::getPictureid).collect(Collectors.toList())).isNull(OcrPicture::getIztrueorfalse));
if (pictures.size() > 1) {
return false;
}
return true;
}
@Override
public List<OcrTaskchildPicture> listAll(String tenantId, String createUser, QueryWrapper queryWrapper) {
@ -229,6 +251,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 批量标记当前任务相似度为百分之百
*
* @param taskids 任务主键
* @return
*/
@ -242,6 +265,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 查询智能识别
*
* @param packageid 任务包主键
* @return
*/
@ -258,6 +282,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 根据主键，查询图片详情
*
* @param fromid 任务主键
* @return
*/
@ -295,8 +320,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
return ocrTaskchildPicture;
}
/**
* 根据任务包主键，查询对应的任务信息
*
* @param taskchildpictureid 当前显示的任务主键
* @param queryWrapper
* @return
@ -347,7 +374,6 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
queryWrapper.in("PICTUREID", mainOcrTaskchildPicture.getOcpictureid().split(","));
IPage<OcrTaskchildPicture> iPage = this.page(page, queryWrapper);
this.formatTask(iPage.getRecords(), packageid);
@ -358,6 +384,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 格式化显示数据
*
* @param list
* @param packageid
*/
@ -396,6 +423,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 关闭工单
*
* @param id
* @return
*/
@ -410,6 +438,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 生成工单
*
* @param ocrPicture 源图
* @param tenantId 公司主键
* @param sysUser 当前登录用户
@ -455,6 +484,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 查询所有业务表集合
*
* @param query
* @return
*/
@ -466,6 +496,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 根据任务\工单主键查询图片对象
*
* @param taskchildid
* @return
*/
@ -483,6 +514,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
/**
* 查询所有业务表数量
*
* @param query
* @return
*/

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

@ -111,6 +111,11 @@
<if test="tenantid != null"> and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if>
<if test="packageid != null"> and PACKAGEID ${packageid.dataOp} ${packageid.likestar}#{packageid.value}${packageid.likeend}</if>
<if test="processdefinitionid != null"> and PROCESSDEFINITIONID ${processdefinitionid.dataOp} ${processdefinitionid.likestar}#{processdefinitionid.value}${processdefinitionid.likeend}</if>
<if test="taskid != null"> and TASKID ${taskid.dataOp} ${taskid.likestar}#{taskid.value}${taskid.likeend}</if>
<if test="fromprojectid != null"> and FROMPROJECTID ${fromprojectid.dataOp} ${fromprojectid.likestar}#{fromprojectid.value}${fromprojectid.likeend}</if>
<if test="fromuserid != null"> and FROMUSERID ${fromuserid.dataOp} ${fromuserid.likestar}#{fromuserid.value}${fromuserid.likeend}</if>
<if test="fromplanid != null"> and FROMPLANID ${fromplanid.dataOp} ${fromplanid.likestar}#{fromplanid.value}${fromplanid.likeend}</if>
<if test="iztrueorfalse != null"> and IZTRUEORFALSE ${iztrueorfalse.dataOp} ${iztrueorfalse.likestar}#{iztrueorfalse.value}${iztrueorfalse.likeend}</if>
<if test="listFlowCcUserid != null">
and ID in
<foreach collection="listFlowCcUserid" item="item" index="index" open="(" separator="," close=")" >

Write Preview
Loading…
Cancel
Save