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

Merge branch 'dev'

Browse Source
dev
sunchenliang 1 year ago
parent fb536bee37 84c1b0e221
commit 5c39f70e06
10 changed files with 973 additions and 753 deletions
Show Stats Download Patch File Download Diff File

4
jyjz-system/jyjz-system-oa/pom.xml
Unescape View File

@ -120,6 +120,10 @@
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>${lombok.version}</version> <version>${lombok.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

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

@ -295,7 +295,7 @@ public class FlowTaskController extends BaseController {
//如果assigneeId 为空查询发起流程，否则查询待办流程 //如果assigneeId 为空查询发起流程，否则查询待办流程
if(StringUtils.isNotBlank(assigneeId) && assigneeId.equals(user.getId().toString())){ if(StringUtils.isNotBlank(assigneeId) && assigneeId.equals(user.getId().toString())){
searchQuery.addEqual("assignee",user.getLoginname()); searchQuery.addEqual("assignee",user.getLoginname());
// searchQuery.addEqual("states",SystemConstantsOa.OA_STATUS_TYPE_ING.toString()); searchQuery.addEqual("states",SystemConstantsOa.OA_STATUS_TYPE_ING.toString());
}else{ }else{
searchQuery.addEqual("createuser",user.getLoginname()); searchQuery.addEqual("createuser",user.getLoginname());
} }
@ -501,4 +501,18 @@ public class FlowTaskController extends BaseController {
//return ResultVoUtil.success(); //return ResultVoUtil.success();
} }
/**
* 重复任务
* @return
*/
@ApiOperation(value="重复流程", notes="重复流程")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
})
@GetMapping("/repetitionTask")
@ResponseBody
public ResultVo repetitionTask(HttpServletRequest request){
return flowTaskService.repetitionTask();
}
} }

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

@ -27,12 +27,12 @@ public interface IFlowTaskService {
InputStream diagram(String processId); InputStream diagram(String processId);
InputStream myDiagram(String processId,HttpServletRequest request); InputStream myDiagram(String processId, HttpServletRequest request);
Category viewForm(String processId, HttpServletRequest request); Category viewForm(String processId, HttpServletRequest request);
Boolean complete(FlowTaskVO taskVO,HttpServletRequest request); Boolean complete(FlowTaskVO taskVO, HttpServletRequest request);
/** /**
* 获取当前任务的可回退的流程集合 * 获取当前任务的可回退的流程集合
* *
@ -40,85 +40,106 @@ public interface IFlowTaskService {
* @return 可以回退的节点列表 * @return 可以回退的节点列表
*/ */
public List<WorkFlowNodeVO> getReturnTaskList(String taskId); public List<WorkFlowNodeVO> getReturnTaskList(String taskId);
/** /**
* 更新当前节点处理人信息 * 更新当前节点处理人信息
*
* @param * @param
* @param processDefinition * @param processDefinition
*/ */
public void updateAssignee(String processInstanceId,String processDefinitionId, ProcessDefinition processDefinition); public void updateAssignee(String processInstanceId, String processDefinitionId, ProcessDefinition processDefinition);
void finishedList(PageUtils pageUtils, HttpServletRequest request);
void finishedList(PageUtils pageUtils,HttpServletRequest request);
/** /**
* 查询我发起的流程实例 * 查询我发起的流程实例
* *
* @param query 搜索条件 * @param query 搜索条件
* @param pageUtils 分页参数 * @param pageUtils 分页参数
* @return * @return
*/ */
public void getMyProcessInstances( Map<String, Object> query, PageUtils<FlowUnionVo> pageUtils); public void getMyProcessInstances(Map<String, Object> query, PageUtils<FlowUnionVo> pageUtils);
/** /**
* 查询最终审批数据 * 查询最终审批数据
* *
* @param query 搜索条件 * @param query 搜索条件
* @param pageUtils 分页参数 * @param pageUtils 分页参数
* @return * @return
*/ */
public void getFinalProcessInstances( Map<String, Object> query, PageUtils<OcrTaskchildPicture> pageUtils); public void getFinalProcessInstances(Map<String, Object> query, PageUtils<OcrTaskchildPicture> pageUtils);
/** /**
* 查询我发起的流程实例 * 查询我发起的流程实例
* 不做分类 * 不做分类
*
* @param query 查询条件 * @param query 查询条件
* @return * @return
*/ */
public List<FlowUnionVo> getMyProcessInstances(Map<String, Object> query); public List<FlowUnionVo> getMyProcessInstances(Map<String, Object> query);
/** /**
* 抄送给我的 * 抄送给我的
* *
* @return * @return
*/ */
public IPage<FlowUnionVo> getMyListCc(Map<String, Object> query, UserToken userToken, ParamterPage paramterPage); public IPage<FlowUnionVo> getMyListCc(Map<String, Object> query, UserToken userToken, ParamterPage paramterPage);
/** /**
* 查看任务的流程记录 * 查看任务的流程记录
*
* @return * @return
*/ */
public List<HistoricTaskInstanceDto> listHistoriceTask(String processInstanceId); public List<HistoricTaskInstanceDto> listHistoriceTask(String processInstanceId);
/** /**
* 获取当前活动节点列表 * 获取当前活动节点列表
*
* @param processInstanceId 实例主键 * @param processInstanceId 实例主键
* @return * @return
*/ */
public List<String> listTask(String processInstanceId); public List<String> listTask(String processInstanceId);
/** /**
* 设置当前审批节点的审批人 * 设置当前审批节点的审批人
* 目前只多候选组和多个候选人起作用 * 目前只多候选组和多个候选人起作用
*
* @param processInstanceId * @param processInstanceId
*/ */
public FlowTaskCompleteVO updateNowTaskAssignee(String processInstanceId, String processDefinitionId); public FlowTaskCompleteVO updateNowTaskAssignee(String processInstanceId, String processDefinitionId);
/** /**
* 查看当前执行人列表 * 查看当前执行人列表
*
* @param processInstanceId * @param processInstanceId
* @return * @return
*/ */
public List getApprovers(String processInstanceId); public List getApprovers(String processInstanceId);
/** /**
* 设置当前审批节点的 * 设置当前审批节点的
*/ */
public List<Task> nowRunTask(String processInstanceId, String processDefinitionId); public List<Task> nowRunTask(String processInstanceId, String processDefinitionId);
/** /**
* 撤销流程 * 撤销流程
*
* @param taskId * @param taskId
* @param reason * @param reason
*/ */
public void cancelTask(String taskId, String reason); public void cancelTask(String taskId, String reason);
/** /**
* 重置流程 * 重置流程
*
* @param fromid 任务表主键 * @param fromid 任务表主键
*/ */
public ResultVo removeTask(String fromid,String taskid ); public ResultVo removeTask(String fromid, String taskid);
/**
* 查询重复流程
*
* @return
*/
ResultVo repetitionTask();
} }

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

@ -15,19 +15,14 @@ import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.util.SpringUtils; import cn.jyjz.xiaoyao.common.base.util.SpringUtils;
import cn.jyjz.xiaoyao.common.base.util.StringUtils; import cn.jyjz.xiaoyao.common.base.util.StringUtils;
import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.framework.security.model.AdminUserModel;
import cn.jyjz.xiaoyao.framework.security.service.FlowableUserLoginService;
import cn.jyjz.xiaoyao.oa.from.service.UserViewapproeService; import cn.jyjz.xiaoyao.oa.from.service.UserViewapproeService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.*;
import org.flowable.engine.RepositoryService; import org.flowable.engine.RepositoryService;
import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior;
import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.ProcessInstance; import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task; import org.flowable.task.api.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.context.request.RequestContextHolder;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -48,148 +43,154 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
private IFlowTaskService flowTaskService; private IFlowTaskService flowTaskService;
@Resource @Resource
private UserViewapproeService userViewApproeService; private UserViewapproeService userViewApproeService;
@Override @Override
public boolean startProcessInstanceById(String procDefId, Map<String, Object> variables, HttpServletRequest request,String formid,String servicename) { public boolean startProcessInstanceById(String procDefId, Map<String, Object> variables, HttpServletRequest request, String formid, String servicename) {
IFormCustomService iFormCustomService = null; IFormCustomService iFormCustomService = null;
if(StringUtils.isNotBlank(servicename)){ if (StringUtils.isNotBlank(servicename)) {
iFormCustomService = SpringUtils.getBean(servicename); iFormCustomService = SpringUtils.getBean(servicename);
} }
if(StringUtils.isBlank(formid) ){ if (StringUtils.isBlank(formid)) {
//表单主键 //表单主键
formid = iFormCustomService.saveForm(request); formid = iFormCustomService.saveForm(request);
} }
String token = RequestBaseUtil.getToken(request);
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); String userName = "";
if (StringUtils.isBlank(token)) {
userName = "admin";
String userName = userToken.getLoginname(); } else {
UserToken userToken = this.userTokenService.getUserToken(token);
userName = userToken.getLoginname();
}
// 绑定当前认证的账号 我们的认证系统如果使用的是 SpringSecurity的话，默认就会设置当前登录的账号 // 绑定当前认证的账号 我们的认证系统如果使用的是 SpringSecurity的话，默认就会设置当前登录的账号
//identityService.setAuthenticatedUserId(userName); //identityService.setAuthenticatedUserId(userName);
if(null == variables){ if (null == variables) {
variables = new HashMap<>(); variables = new HashMap<>();
} }
variables.put("loginUser",userName); variables.put("loginUser", userName);
//根据流程定义信息 //根据流程定义信息
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId).singleResult(); ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId).singleResult();
//业务key 用于待办已办 扩展字段 展示使用 //业务key 用于待办已办 扩展字段 展示使用
//我这里以 流程定义key(oa_category_t定义的关键字，逻辑唯一) + 业务表主键（请假表、调岗表等） + 业务表对应的servicename //我这里以 流程定义key(oa_category_t定义的关键字，逻辑唯一) + 业务表主键（请假表、调岗表等） + 业务表对应的servicename
String businessKey= userToken.getLoginname() + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT+ formid + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT+ servicename; String businessKey = userName + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT + formid + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT + servicename;
ProcessInstance processInstance = null; ProcessInstance processInstance = null;
//启动了一个流程实例 //启动了一个流程实例
try { try {
variables.put("businessKey",businessKey); variables.put("businessKey", businessKey);
processInstance = runtimeService.startProcessInstanceById(procDefId,businessKey,variables) ; processInstance = runtimeService.startProcessInstanceById(procDefId, businessKey, variables);
if(null != iFormCustomService){ if (null != iFormCustomService) {
FlowTaskCompleteVO flowTaskCompleteVO = flowTaskService.updateNowTaskAssignee(processInstance.getProcessInstanceId(),processInstance.getProcessDefinitionId()); FlowTaskCompleteVO flowTaskCompleteVO = flowTaskService.updateNowTaskAssignee(processInstance.getProcessInstanceId(), processInstance.getProcessDefinitionId());
if(null == flowTaskCompleteVO){ if (null == flowTaskCompleteVO) {
throw new ServiceException("没有审批人，请联系管理员，流程定义：" + businessKey); throw new ServiceException("没有审批人，请联系管理员，流程定义：" + businessKey);
} }
List<Task> list = this.flowTaskService.nowRunTask(processInstance.getProcessInstanceId(),processInstance.getProcessDefinitionId()); List<Task> list = this.flowTaskService.nowRunTask(processInstance.getProcessInstanceId(), processInstance.getProcessDefinitionId());
String taskname = ""; String taskname = "";
if(null != list && !list.isEmpty()){ if (null != list && !list.isEmpty()) {
taskname = list.get(0).getName(); taskname = list.get(0).getName();
} }
//保存instanceId到数据库，需要根据流程分类进行，判断更新 //保存instanceId到数据库，需要根据流程分类进行，判断更新
boolean isupdate = iFormCustomService.updateForm(formid,processDefinition.getDeploymentId(),processDefinition.getId(),flowTaskCompleteVO.getAssignee(),flowTaskCompleteVO.getTaskId(),processInstance.getProcessInstanceId(),taskname); boolean isupdate = iFormCustomService.updateForm(formid, processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstance.getProcessInstanceId(), taskname);
if(isupdate){ if (isupdate) {
FlowModelVO flowModelVO = iFormCustomService.getForm(formid); FlowModelVO flowModelVO = iFormCustomService.getForm(formid);
//增加未查看记录 //增加未查看记录
userViewApproeService.saveUserViewApproe(flowTaskCompleteVO.getAssignee(),formid,flowModelVO.getTenantid().toString()); userViewApproeService.saveUserViewApproe(flowTaskCompleteVO.getAssignee(), formid, flowModelVO.getTenantid().toString());
} }
} }
log.info("流程启动成功:procDefId:{}",procDefId); log.info("流程启动成功:procDefId:{}", procDefId);
return true; return true;
}catch (Exception e){ } catch (Exception e) {
log.error("流程启动失败:procDefId:{}",procDefId); log.error("流程启动失败:procDefId:{}", procDefId);
log.error("流程启动失败:e:{}",e); log.error("流程启动失败:e:{}", e);
//删除流程 //删除流程
if(null != processInstance){ if (null != processInstance) {
runtimeService.deleteProcessInstance(processInstance.getProcessInstanceId(), SystemMessage.SYS_OA_START_ERROR); runtimeService.deleteProcessInstance(processInstance.getProcessInstanceId(), SystemMessage.SYS_OA_START_ERROR);
historyService.deleteHistoricProcessInstance(processInstance.getProcessInstanceId()); historyService.deleteHistoricProcessInstance(processInstance.getProcessInstanceId());
} }
if(StringUtils.isNotBlank(servicename) && StringUtils.isNotBlank(formid)){ if (StringUtils.isNotBlank(servicename) && StringUtils.isNotBlank(formid)) {
iFormCustomService.delForm(formid); iFormCustomService.delForm(formid);
} }
}finally {
RequestContextHolder.resetRequestAttributes();
} }
return false; return false;
} }
@Override @Override
public boolean startProcessInstanceById(String procDefId, String userName,String createuser, String formid,String servicename) { public boolean startProcessInstanceById(String procDefId, String userName, String createuser, String formid, String servicename) {
IFormCustomService iFormCustomService = null; IFormCustomService iFormCustomService = null;
if(StringUtils.isNotBlank(servicename)){ if (StringUtils.isNotBlank(servicename)) {
iFormCustomService = SpringUtils.getBean(servicename); iFormCustomService = SpringUtils.getBean(servicename);
} }
if(StringUtils.isBlank(formid) ){ if (StringUtils.isBlank(formid)) {
//表单主键 //表单主键
return false; return false;
} }
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
variables.put("loginUser",userName); variables.put("loginUser", userName);
//根据流程定义信息 //根据流程定义信息
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId).singleResult(); ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId).singleResult();
//业务key 用于待办已办 扩展字段 展示使用 //业务key 用于待办已办 扩展字段 展示使用
//我这里以 流程定义key(oa_category_t定义的关键字，逻辑唯一) + 业务表主键（请假表、调岗表等） + 业务表对应的servicename //我这里以 流程定义key(oa_category_t定义的关键字，逻辑唯一) + 业务表主键（请假表、调岗表等） + 业务表对应的servicename
String businessKey= createuser + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT+ formid + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT+ servicename; String businessKey = createuser + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT + formid + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT + servicename;
ProcessInstance processInstance = null; ProcessInstance processInstance = null;
//启动了一个流程实例 //启动了一个流程实例
try { try {
variables.put("businessKey",businessKey); variables.put("businessKey", businessKey);
processInstance = runtimeService.startProcessInstanceById(procDefId,businessKey,variables) ; processInstance = runtimeService.startProcessInstanceById(procDefId, businessKey, variables);
if(null != iFormCustomService){ if (null != iFormCustomService) {
FlowTaskCompleteVO flowTaskCompleteVO = flowTaskService.updateNowTaskAssignee(processInstance.getProcessInstanceId(),processInstance.getProcessDefinitionId()); FlowTaskCompleteVO flowTaskCompleteVO = flowTaskService.updateNowTaskAssignee(processInstance.getProcessInstanceId(), processInstance.getProcessDefinitionId());
if(null == flowTaskCompleteVO){ if (null == flowTaskCompleteVO) {
throw new ServiceException("没有审批人，请联系管理员，流程定义：" + businessKey); throw new ServiceException("没有审批人，请联系管理员，流程定义：" + businessKey);
} }
List<Task> list = this.flowTaskService.nowRunTask(processInstance.getProcessInstanceId(),processInstance.getProcessDefinitionId()); List<Task> list = this.flowTaskService.nowRunTask(processInstance.getProcessInstanceId(), processInstance.getProcessDefinitionId());
String taskname = ""; String taskname = "";
if(null != list && !list.isEmpty()){ if (null != list && !list.isEmpty()) {
taskname = list.get(0).getName(); taskname = list.get(0).getName();
} }
//保存instanceId到数据库，需要根据流程分类进行，判断更新 //保存instanceId到数据库，需要根据流程分类进行，判断更新
boolean isupdate = iFormCustomService.updateForm(formid,processDefinition.getDeploymentId(),processDefinition.getId(),flowTaskCompleteVO.getAssignee(),flowTaskCompleteVO.getTaskId(),processInstance.getProcessInstanceId(),taskname); boolean isupdate = iFormCustomService.updateForm(formid, processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstance.getProcessInstanceId(), taskname);
if(isupdate){ if (isupdate) {
FlowModelVO flowModelVO = iFormCustomService.getForm(formid); FlowModelVO flowModelVO = iFormCustomService.getForm(formid);
//增加未查看记录 //增加未查看记录
userViewApproeService.saveUserViewApproe(flowTaskCompleteVO.getAssignee(),formid,flowModelVO.getTenantid().toString()); userViewApproeService.saveUserViewApproe(flowTaskCompleteVO.getAssignee(), formid, flowModelVO.getTenantid().toString());
} }
} }
log.info("流程启动成功:procDefId:{}",procDefId); log.info("流程启动成功:procDefId:{}", procDefId);
return true; return true;
}catch (Exception e){ } catch (Exception e) {
log.error("流程启动失败:procDefId:{}",procDefId); log.error("流程启动失败:procDefId:{}", procDefId);
log.error("流程启动失败:e:{}",e); log.error("流程启动失败:e:{}", e);
//删除流程 //删除流程
if(null != processInstance){ if (null != processInstance) {
runtimeService.deleteProcessInstance(processInstance.getProcessInstanceId(), SystemMessage.SYS_OA_START_ERROR); runtimeService.deleteProcessInstance(processInstance.getProcessInstanceId(), SystemMessage.SYS_OA_START_ERROR);
historyService.deleteHistoricProcessInstance(processInstance.getProcessInstanceId()); historyService.deleteHistoricProcessInstance(processInstance.getProcessInstanceId());
} }
if(StringUtils.isNotBlank(servicename) && StringUtils.isNotBlank(formid)){ if (StringUtils.isNotBlank(servicename) && StringUtils.isNotBlank(formid)) {
iFormCustomService.delForm(formid); iFormCustomService.delForm(formid);
} }
} }

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

@ -1122,6 +1122,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
HistoricTaskInstanceDto dto = new HistoricTaskInstanceDto(); HistoricTaskInstanceDto dto = new HistoricTaskInstanceDto();
dto.setTaskId(taskHiInstance.getId()); dto.setTaskId(taskHiInstance.getId());
dto.setTaskName(taskHiInstance.getName()); dto.setTaskName(taskHiInstance.getName());
flowUnionVo.setNodeName(taskHiInstance.getName());
dto.setFinishTime(taskHiInstance.getEndTime()); dto.setFinishTime(taskHiInstance.getEndTime());
if(taskHiInstance.getDurationInMillis() != null){ if(taskHiInstance.getDurationInMillis() != null){
dto.setDuration(taskHiInstance.getDurationInMillis()/1000 + "秒"); dto.setDuration(taskHiInstance.getDurationInMillis()/1000 + "秒");
@ -1457,5 +1458,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
return ResultVoUtil.success(); return ResultVoUtil.success();
} }
@Override
public ResultVo repetitionTask() {
return ResultVoUtil.success(flowableccMybatisDao.repetitionTask());
}
} }

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

@ -35,4 +35,6 @@ public interface FlowableccMybatisDao extends BaseMapper<Flowablecc> {
* @return * @return
*/ */
List<UserDistionaryVo> selectUserByFromid(String fromid); List<UserDistionaryVo> selectUserByFromid(String fromid);
List<Map<String,Object>> repetitionTask();
} }

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

@ -33,6 +33,8 @@ public interface OcrPictureService extends BaseService<OcrPicture> {
public ResultVo createTaskChild(List<OcrPicture> ocrPictureList, String tenantId , UserToken sysUser, String search_month, HttpServletRequest req, String buessinessno); public ResultVo createTaskChild(List<OcrPicture> ocrPictureList, String tenantId , UserToken sysUser, String search_month, HttpServletRequest req, String buessinessno);
public ResultVo createTaskChild(List<OcrPicture> ocrPictureList, String tenantId);
/** /**
* 查询工单图片信息 * 查询工单图片信息
* @param tenantId * @param tenantId

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

File diff suppressed because it is too large Load Diff

64
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDownloadTask.java
Unescape View File

@ -7,6 +7,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -19,12 +20,12 @@ import java.util.Map;
* @version 1.0 * @version 1.0
* @date 2024/3/14 11:15 * @date 2024/3/14 11:15
*/ */
public class PictureDownloadTask implements Runnable{ public class PictureDownloadTask implements Runnable {
protected Logger logger = LoggerFactory.getLogger(getClass()); protected Logger logger = LoggerFactory.getLogger(getClass());
private PictureSourceResult pictureSourceResult; private PictureSourceResult pictureSourceResult;
public PictureDownloadTask(PictureSourceResult pictureSourceResult){ public PictureDownloadTask(PictureSourceResult pictureSourceResult) {
this.pictureSourceResult = pictureSourceResult; this.pictureSourceResult = pictureSourceResult;
} }
@ -34,13 +35,13 @@ public class PictureDownloadTask implements Runnable{
OcrPictureService ocrPictureService = SpringUtils.getBean("ocrPictureService"); OcrPictureService ocrPictureService = SpringUtils.getBean("ocrPictureService");
//获取当前任务中有多少图片 //获取当前任务中有多少图片
List<Map<String,Object>> livePhoto = pictureSourceResult.getLivePhoto(); List<Map<String, Object>> livePhoto = pictureSourceResult.getLivePhoto();
//定义新增集合对象 //定义新增集合对象
List<OcrPicture> ocrPictureList = new ArrayList<>(); List<OcrPicture> ocrPictureList = new ArrayList<>();
for (Map<String, Object> map : livePhoto) { for (Map<String, Object> map : livePhoto) {
//检查图片地址是否为空 //检查图片地址是否为空
if(map.get("imgUrl")!=null && !StringUtils.isEmpty(map.get("imgUrl").toString())){ if (map.get("imgUrl") != null && !StringUtils.isEmpty(map.get("imgUrl").toString())) {
//不为空开始组装参数 入库 //不为空开始组装参数 入库
OcrPicture picture = new OcrPicture(); OcrPicture picture = new OcrPicture();
//租户编号 //租户编号
@ -48,11 +49,11 @@ public class PictureDownloadTask implements Runnable{
//租户名称 //租户名称
picture.setTenantname(pictureSourceResult.getTenantName()); picture.setTenantname(pictureSourceResult.getTenantName());
//租户状态 //租户状态
if(pictureSourceResult.getTenantStatus()!=null){ if (pictureSourceResult.getTenantStatus() != null) {
picture.setTenantstatus(pictureSourceResult.getTenantStatus().toString()); picture.setTenantstatus(pictureSourceResult.getTenantStatus().toString());
} }
//业务主体 //业务主体
if(pictureSourceResult.getAccountNo()!=null){ if (pictureSourceResult.getAccountNo() != null) {
picture.setPictureid(pictureSourceResult.getAccountNo().toString()); picture.setPictureid(pictureSourceResult.getAccountNo().toString());
} }
//业务主体名称 //业务主体名称
@ -60,25 +61,28 @@ public class PictureDownloadTask implements Runnable{
//业务主体状态 //业务主体状态
picture.setPicturestatus(pictureSourceResult.getPlanChildStatus()); picture.setPicturestatus(pictureSourceResult.getPlanChildStatus());
//项目编号 //项目编号
if(pictureSourceResult.getProjectNo()!=null){ if (pictureSourceResult.getProjectNo() != null) {
picture.setProjectid(pictureSourceResult.getProjectNo().toString()); picture.setProjectid(pictureSourceResult.getProjectNo().toString());
} }
//项目id
picture.setCategoryid(251374070600303007L);
//项目名称 //项目名称
picture.setPicturename(pictureSourceResult.getProjectName()); picture.setPicturename(pictureSourceResult.getProjectName());
//项目状态 //项目状态
if(pictureSourceResult.getProjectNo()!=null) { if (pictureSourceResult.getProjectNo() != null) {
picture.setProjectstatus(pictureSourceResult.getProjectNo().toString()); picture.setProjectstatus(pictureSourceResult.getProjectNo().toString());
} }
//所属主计划id //所属主计划id
if(pictureSourceResult.getPlanNo()!=null) { if (pictureSourceResult.getPlanNo() != null) {
picture.setPlanid(pictureSourceResult.getPlanNo().toString()); picture.setPlanid(pictureSourceResult.getPlanNo().toString());
} }
//所属计划名称 //所属计划名称
picture.setPlanname(pictureSourceResult.getPlanName()); picture.setPlanname(pictureSourceResult.getPlanName());
//所属计划状态 //所属计划状态
picture.setPlanstatus( pictureSourceResult.getPlanstatus()); picture.setPlanstatus(pictureSourceResult.getPlanstatus());
//所属子计划id //所属子计划id
if(pictureSourceResult.getPlanChildNo()!=null) { if (pictureSourceResult.getPlanChildNo() != null) {
picture.setPlanchildid(pictureSourceResult.getPlanChildNo().toString()); picture.setPlanchildid(pictureSourceResult.getPlanChildNo().toString());
} }
//所属子计划名称 //所属子计划名称
@ -92,7 +96,7 @@ public class PictureDownloadTask implements Runnable{
//任务来源名称 //任务来源名称
picture.setField4(pictureSourceResult.getTaskName()); picture.setField4(pictureSourceResult.getTaskName());
//所属任务状态 //所属任务状态
if(pictureSourceResult.getTenantStatus()!=null) { if (pictureSourceResult.getTenantStatus() != null) {
picture.setTaskstatus(pictureSourceResult.getTenantStatus().toString()); picture.setTaskstatus(pictureSourceResult.getTenantStatus().toString());
} }
//提报人id //提报人id
@ -106,56 +110,56 @@ public class PictureDownloadTask implements Runnable{
//拜访详细地址 //拜访详细地址
StringBuilder addressDetails = new StringBuilder(); StringBuilder addressDetails = new StringBuilder();
//拜访省份 //拜访省份
if(pictureSourceResult.getProvince()!=null){ if (pictureSourceResult.getProvince() != null) {
if(pictureSourceResult.getProvince().get("name")!=null){ if (pictureSourceResult.getProvince().get("name") != null) {
addressDetails.append(pictureSourceResult.getProvince().get("name").toString()); addressDetails.append(pictureSourceResult.getProvince().get("name").toString());
picture.setReleaseprovince(pictureSourceResult.getProvince().get("name").toString()); picture.setReleaseprovince(pictureSourceResult.getProvince().get("name").toString());
} }
} }
//拜访城市 //拜访城市
if(pictureSourceResult.getCity()!=null){ if (pictureSourceResult.getCity() != null) {
if(pictureSourceResult.getCity().get("name")!=null){ if (pictureSourceResult.getCity().get("name") != null) {
addressDetails.append(pictureSourceResult.getCity().get("name").toString()); addressDetails.append(pictureSourceResult.getCity().get("name").toString());
picture.setReleasearea(pictureSourceResult.getCity().get("name").toString()); picture.setReleasearea(pictureSourceResult.getCity().get("name").toString());
} }
} }
//拜访定位信息 //拜访定位信息
if(pictureSourceResult.getLocation()!=null){ if (pictureSourceResult.getLocation() != null) {
if(pictureSourceResult.getCity().get("address")!=null){ if (pictureSourceResult.getCity().get("address") != null) {
addressDetails.append(pictureSourceResult.getCity().get("address").toString()); addressDetails.append(pictureSourceResult.getCity().get("address").toString());
} }
} }
picture.setField10(addressDetails.toString()); picture.setField10(addressDetails.toString());
//拜访客户类型 //拜访客户类型
if(pictureSourceResult.getTerminalType()!=null){ if (pictureSourceResult.getTerminalType() != null) {
if(pictureSourceResult.getTerminalType().get("name")!=null){ if (pictureSourceResult.getTerminalType().get("name") != null) {
picture.setField2(pictureSourceResult.getTerminalType().get("name").toString()); picture.setField2(pictureSourceResult.getTerminalType().get("name").toString());
} }
} }
//拜访客户名称 //拜访客户名称
if(pictureSourceResult.getCustomerName()!=null){ if (pictureSourceResult.getCustomerName() != null) {
if(pictureSourceResult.getCustomerName().get("name")!=null){ if (pictureSourceResult.getCustomerName().get("name") != null) {
picture.setField3(pictureSourceResult.getCustomerName().get("name").toString()); picture.setField3(pictureSourceResult.getCustomerName().get("name").toString());
} }
} }
//拜访客户级别 //拜访客户级别
if(pictureSourceResult.getTerminalLevel()!=null){ if (pictureSourceResult.getTerminalLevel() != null) {
if(pictureSourceResult.getTerminalLevel().get("name")!=null){ if (pictureSourceResult.getTerminalLevel().get("name") != null) {
picture.setField6(pictureSourceResult.getTerminalLevel().get("name").toString()); picture.setField6(pictureSourceResult.getTerminalLevel().get("name").toString());
} }
} }
//拜访项目类别 //拜访项目类别
if(pictureSourceResult.getProjectType()!=null){ if (pictureSourceResult.getProjectType() != null) {
if(pictureSourceResult.getTerminalLevel().get("name")!=null){ if (pictureSourceResult.getTerminalLevel().get("name") != null) {
picture.setField17(pictureSourceResult.getTerminalLevel().get("name").toString()); picture.setField17(pictureSourceResult.getTerminalLevel().get("name").toString());
} }
} }
//拜访品种 //拜访品种
if(pictureSourceResult.getProductName()!=null){ if (pictureSourceResult.getProductName() != null) {
if(pictureSourceResult.getProductName().get("name")!=null){ if (pictureSourceResult.getProductName().get("name") != null) {
picture.setField9(pictureSourceResult.getProductName().get("name").toString()); picture.setField9(pictureSourceResult.getProductName().get("name").toString());
} }
} }
@ -169,10 +173,10 @@ public class PictureDownloadTask implements Runnable{
picture.setField12(pictureSourceResult.getDistance()); picture.setField12(pictureSourceResult.getDistance());
//设置图片信息 //设置图片信息
if(map.get("imgName")!=null){ if (map.get("imgName") != null) {
picture.setImgname(map.get("imgName").toString()); picture.setImgname(map.get("imgName").toString());
} }
if(map.get("imgUrl")!=null){ if (map.get("imgUrl") != null) {
picture.setImgurl(map.get("imgUrl").toString()); picture.setImgurl(map.get("imgUrl").toString());
} }
//默认为创建人为admin //默认为创建人为admin

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

@ -181,4 +181,13 @@
from OA_SUMMARY_VIEW from OA_SUMMARY_VIEW
<include refid="Base_Where_union"></include> <include refid="Base_Where_union"></include>
</select> </select>
<select id="repetitionTask" resultType="java.util.Map">
SELECT REPETITION,count(1) count
FROM
OA_SUMMARY_VIEW
GROUP BY REPETITION
HAVING count(1)>1
</select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save