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

Merge pull request 'fix: 1.修改小结查重2.修改创建任务' (#22) from sunchenliang into test

Browse Source 
Reviewed-on: #22
pull/27/head^2
sunchenliang 1 year ago
parent 9d5d167f03 b8721bd84a
commit a31e94d28e
7 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File

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

@ -172,10 +172,10 @@ public class FlowTaskController extends BaseController {
formIds.addAll(formId);
if (CollectionUtils.isNotEmpty(formIds)) {
Integer success = flowTaskService.complete(approve, userToken);
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")

6
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java
Unescape View File

@ -35,6 +35,12 @@ public class OcrPictureInfo {
@TableField(value = "img_size")
private String imgSize;
/**
* 图片名称
*/
@TableField(value = "img_name")
private String imgName;
/**
* 图片格式
*/

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

@ -699,6 +699,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
OcrPictureInfo imageInfo = getImageInfo(ocrPicture.getImgurl());
if (ObjectUtil.isNotEmpty(imageInfo)) {
imageInfo.setPictureId(ocrPicture.getId());
imageInfo.setImgName(ocrPicture.getImgname());
list.add(imageInfo);
}
}

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

@ -4,10 +4,13 @@ import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.util.ObjectUtil;
import cn.jyjz.flowable.common.ProcessConstant;
import cn.jyjz.flowable.common.SystemConstantsOa;
import cn.jyjz.flowable.domain.vo.FlowModelVO;
import cn.jyjz.flowable.entity.FlowApprove;
import cn.jyjz.flowable.service.IFlowInstanceService;
import cn.jyjz.flowable.service.IFlowTaskService;
import cn.jyjz.flowable.service.IFormCustomService;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.SpringUtils;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
@ -35,6 +38,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.flowable.bpmn.model.FlowElement;
import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.task.api.Task;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.stereotype.Service;
@ -324,6 +330,15 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
ocrTaskchildPicture.getId().toString(),
category.getServicename()
);
IFormCustomService iFormCustomService = SpringUtils.getBean(category.getServicename());
FlowModelVO formData = iFormCustomService.getForm(ocrTaskchildPicture.getId().toString());
List<Task> taskList = iFlowTaskService.nowRunTask(formData.getProcessInstanceId(), ocrTaskchildPicture.getProcessdefinitionid());
Task taskData = null;
if (null != taskList && !taskList.isEmpty()) {
taskData = taskList.get(0);
ocrTaskchildPicture.setAssignee(taskData.getAssignee());
}
ocrPicture.setTaskchildpictureid(ocrTaskchildPicture.getId().toString());
//修改状态为已生成任务并且审批状态为审批中
ocrPicture.setTaskstatus("1");

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

@ -86,9 +86,9 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
vo.setIzupuser(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.SIMISEARCH.getId().equals(searchfield)){
vo.setIzsimilarity(ocrUsersearchchild.getSearchvalue());
}
// if(SearchConfigEnum.SIMISEARCH.getId().equals(searchfield)){
// vo.setIzsimilarity(ocrUsersearchchild.getSearchvalue());
// }
if(SearchConfigEnum.CLASSISEARCH.getId().equals(searchfield)){
vo.setIzshow(ocrUsersearchchild.getSearchvalue());

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

@ -212,6 +212,7 @@
t2.UPDATETIME updateTime
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)
GROUP BY field8
HAVING count(field8) > 1) t1
LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID
@ -232,6 +233,7 @@
t2.UPDATETIME updateTime
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)
GROUP BY field8
HAVING count(field8) > 1) t1
LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID

1
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
Unescape View File

@ -72,6 +72,7 @@
<association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo">
<result column="pictureid" property="pictureId"/>
<result column="img_size" property="imgSize"/>
<result column="img_name" property="imgName"/>
<result column="img_format" property="imgFormat"/>
<result column="img_measure" property="imgMeasure"/>
<result column="upload_time" property="uploadTime"/>

Write Preview
Loading…
Cancel
Save