From 22221173febee472297775f2b1aaa872d3bf3b04 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 20 Apr 2023 18:02:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=BA=9Btodo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/sys/entity/UserEO.java | 3 +- .../main/java/com/adc/da/sys/vo/UserVO.java | 9 +- .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 12 +- .../define/ActivitDefineController.java | 18 ++- .../service/ActivitDefineService.java | 19 +++ .../task/TaskController.java | 19 ++- .../task/TodoTaskController.java | 110 +++++++----------- .../business_main/entity/BusProcessNew.java | 11 -- .../mapper/BusProcessNewMapper.java | 2 + .../service/IBusProcessNewService.java | 1 + .../impl/BusProcessNewServiceImpl.java | 5 + .../business_main/vo/BusProcessNewVO.java | 38 ++++++ .../mapper/mysql/BusProcessNewMapper.xml | 5 + 13 files changed, 140 insertions(+), 112 deletions(-) create mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java create mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/BusProcessNewVO.java diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index 5701d61..c3253a5 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -113,7 +113,6 @@ public class UserEO extends BaseEntity implements Serializable { @TableField(exist = false) private String roleId; - @TableField(exist = false) - private String orgName; + } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java index 09fa544..b1dedec 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java @@ -1,13 +1,12 @@ package com.adc.da.sys.vo; -import java.util.ArrayList; -import java.util.List; - import com.adc.da.sys.entity.OrgEO; import com.adc.da.sys.entity.RoleEO; -import com.adc.da.sys.vo.iam.OrgsShortVoIAM; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @Data public class UserVO { @@ -43,7 +42,7 @@ public class UserVO { private String usname; /** - * 角色ID列表 + * 角色列表 */ private List roleEOList = new ArrayList<>(); diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index c2a032e..352b7d3 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -163,11 +163,11 @@ #{id} - + + + + + + diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java index 570a213..1cd5c94 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java @@ -3,6 +3,7 @@ package com.adc.da.wkflow.business_activiti.define; import cn.hutool.core.util.StrUtil; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.iservice.IUserEoService; +import com.adc.da.wkflow.business_activiti.service.ActivitDefineService; import com.adc.da.wkflow.business_main.entity.BusProcessName; import com.adc.da.wkflow.business_main.service.IBusProcessNameService; import com.adc.da.wkflow.enums.SubmitStatusEnum; @@ -55,6 +56,8 @@ public class ActivitDefineController { @Autowired private IBusProcessNameService ibusprocessnameService; + @Autowired + private ActivitDefineService activitDefineService; @Resource IUserEoService userEoService; @@ -174,7 +177,8 @@ public class ActivitDefineController { busProcessName.setCreatUserName(byId.getUsname()); busProcessName.setPrcNum((String) prcNameAndPrcNum.get("prcNum")); busProcessName.setPrcType(prcType); - String dateId = this.saveOrUpdateDate(prcType,msg); + String data = JSON.toJSONString(msg, SerializerFeature.DisableCircularReferenceDetect); + String dateId = activitDefineService.saveOrUpdateDate(prcType,data); busProcessName.setDataId(dateId); busProcessName.setPrcName((String) prcNameAndPrcNum.get("prcName")); busProcessName.setSubmitStatus(SubmitStatusEnum.SUBMIT.getValue()); @@ -194,7 +198,8 @@ public class ActivitDefineController { one.setPrcId(pi.getId()); one.setSubmitStatus(SubmitStatusEnum.SUBMIT.getValue()); one.setCreatTime(sdf.format(new Date())); - String dateId = this.saveOrUpdateDate(prcType,msg); + String data = JSON.toJSONString(msg, SerializerFeature.DisableCircularReferenceDetect); + String dateId = activitDefineService.saveOrUpdateDate(prcType,data); one.setDataId(dateId); ibusprocessnameService.save(one); } @@ -203,15 +208,6 @@ public class ActivitDefineController { return WrapMapper.ok(task.getId()); } - //保存data数据 - private String saveOrUpdateDate(String prcType, Object msg) { - String data = JSON.toJSONString(msg, SerializerFeature.DisableCircularReferenceDetect); - String dataId = ""; - if ("".equals(prcType)){ - - } - return dataId; - } @ApiOperation(value = "判断流程定义key的唯一性") @GetMapping("/check_define_key") diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java new file mode 100644 index 0000000..e04ecec --- /dev/null +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java @@ -0,0 +1,19 @@ +package com.adc.da.wkflow.business_activiti.service; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +@Service +public class ActivitDefineService { + protected Logger logger = LoggerFactory.getLogger(getClass()); + + //保存data数据 + public String saveOrUpdateDate(String prcType, String dataJson) { + String dataId = ""; + if ("".equals(prcType)){ + + } + return dataId; + } +} diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java index 17602a6..5b88871 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java @@ -2,6 +2,7 @@ package com.adc.da.wkflow.business_activiti.task; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.iservice.IUserEoService; +import com.adc.da.sys.vo.UserVO; import com.adc.da.wkflow.business_main.entity.BusProcessApprove; import com.adc.da.wkflow.business_main.entity.BusProcessEntrust; import com.adc.da.wkflow.business_main.entity.BusProcessName; @@ -58,13 +59,7 @@ public class TaskController { @GetMapping("/get_list_by_instance") public List> get_list_by_instance(String prcNum,String sortWord,String shunxu) { QueryWrapper queryWrapper = new QueryWrapper(); - if(prcNum.indexOf("(子)") != -1){ - String[] split = prcNum.split("\\)"); - queryWrapper.eq("PRC_NUM",split[1]); - queryWrapper.eq("PRC_TYPE","72"); - }else { - queryWrapper.eq("PRC_NUM",prcNum); - } + BusProcessName one = iBusProcessNameService.getOne(queryWrapper); // 缺了PRCID导致的BUg if (one == null || StringUtils.isEmpty(one.getPrcId())){ @@ -91,13 +86,13 @@ public class TaskController { } } }else{ - UserEO assignee = userEoService.getUserById(historicTaskInstance.get("assignee").toString()); - - if(assignee != null){ + String assigneeId = historicTaskInstance.get("assignee").toString(); + List userByIdList = userEoService.getUserByIdList(Arrays.asList(assigneeId)); + if(userByIdList.size()>0){ + UserVO assignee = userByIdList.get(0); historicTaskInstance.put("assignee", assignee.getUsname()); historicTaskInstance.put("assigneeId", assignee.getUsid()); - // TODO 部门同步完成后，补充部门数据 -// historicTaskInstance.put("orgName",assignee.getData().getOrgName()); + historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0)); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); queryWrapper2.orderByAsc("CREATE_TIME"); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index efa3280..b86d3ba 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -7,6 +7,7 @@ import com.adc.da.sys.vo.UserVO; import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.wkflow.business_activiti.dto.Page; import com.adc.da.wkflow.business_activiti.dto.TaskCommonQuery; +import com.adc.da.wkflow.business_activiti.service.ActivitDefineService; import com.adc.da.wkflow.business_activiti.service.TaskTodoService; import com.adc.da.wkflow.business_main.entity.BusProcessApprove; import com.adc.da.wkflow.business_main.entity.BusProcessEntrust; @@ -19,6 +20,7 @@ import com.adc.da.wkflow.business_main.service.IBusProcessEntrustService; import com.adc.da.wkflow.business_main.service.IBusProcessNameService; import com.adc.da.wkflow.business_main.service.IBusProcessNewService; import com.adc.da.wkflow.business_main.vo.ApproveDataVO; +import com.adc.da.wkflow.business_main.vo.BusProcessNewVO; import com.adc.da.wkflow.enums.SubmitStatusEnum; import com.adc.da.wkflow.util.activiti.ActivitiTools; import com.adc.da.wkflow.util.date.DateTools; @@ -46,6 +48,8 @@ import org.activiti.engine.task.NativeTaskQuery; import org.activiti.engine.task.Task; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -95,6 +99,8 @@ public class TodoTaskController { @Resource private IUserEoService userEoService; + @Autowired + private ActivitDefineService activitDefineService; @ApiOperation(value = "我的待办任务列表") @ApiImplicitParams({@ApiImplicitParam(name = "name", value = "名称"), @@ -151,16 +157,16 @@ public class TodoTaskController { queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue()); BusProcessName busProcessName = iBusProcessNameService.getOne(queryWrapper); - String taskIds = ""; - for (Map map : entry.getValue()) { - taskIds += map.get("id").toString() + ","; - } + // 因 现只考虑单任务id的情况 故注掉 ，如出现问题在做调整 +// for (Map map : entry.getValue()) { +// taskIds += map.get("id").toString() + ","; +// } + String taskId = entry.getValue().get(0).get("id").toString(); if (busProcessName != null) { - if(StringUtils.isNotEmpty(taskIds)){ - taskIds = taskIds.substring(0,taskIds.length()-1); - } - // TODO 处理单个任务id的情况 - busProcessName.setTaskId(taskIds); +// if(StringUtils.isNotEmpty(taskId)){ +// taskIds = taskIds.substring(0,taskIds.length()-1); +// } + busProcessName.setTaskId(taskId); busProcessName.setTaskInfo(entry.getValue().get(0).get("name").toString()); busProcessName.setTaskDefinitionKey(entry.getValue().get(0).get("taskDefinitionKey").toString()); todoList.add(busProcessName); @@ -226,7 +232,7 @@ public class TodoTaskController { @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"), @ApiImplicitParam(name = "userId", value = "完成任务用户Id")}) @PostMapping("/completeTask") - public Wrapper completeTaskByUserId(@RequestBody ApproveDataVO busMes) { + public Wrapper completeTaskByUserId(@RequestBody ApproveDataVO busMes,@RequestBody String dateJson) { log.info("!!!!!!!!!!!!!TaskId!!!!!!!!!!!!!!!"+busMes.getTaskId()); if (busMes.getTaskId() != null && !busMes.getTaskId().equals("")) { Task task = taskService.createTaskQuery().taskId(busMes.getTaskId()).singleResult(); @@ -234,19 +240,17 @@ public class TodoTaskController { if (StrUtil.isEmpty(task.getAssignee())) { taskService.claim(busMes.getTaskId(), busMes.getUserId()); } - //TODO 对 “SubmitJson” 这串json的设计 - String approve = JSON.parseObject(busMes.getSubmitJson()).getString("approve"); - BusProcessApprove busProcessApprove = new BusProcessApprove(); busProcessApprove.setTaskId(busMes.getTaskId()); busProcessApprove.setCreateUserId(UserUtils.getUserId()); busProcessApprove.setPrcId(task.getProcessInstanceId()); busProcessApprove.setCreateDate(new Date()); - busProcessApprove.setFromValsJson(approve); + busProcessApprove.setFromValsJson(busMes.getSubmitJson()); iBusProcessApproveService.save(busProcessApprove); - //根据业务情况 对业务数据进行saveOrupdate - this.saveOrUpdateDate(busMes); - + if (StringUtils.isNotEmpty(dateJson)){ + //根据业务情况 对业务数据进行saveOrupdate + activitDefineService.saveOrUpdateDate(busMes.getPrcType(),dateJson); + } taskService.complete(busMes.getTaskId()); } return WrapMapper.ok(task.getProcessInstanceId()); @@ -255,21 +259,6 @@ public class TodoTaskController { } } - /** - * 存储业务数据 到对应的表 - * @param busMes - */ - private String saveOrUpdateDate(ApproveDataVO busMes) { - String date = JSON.parseObject(busMes.getSubmitJson()).getString("date"); - String dateId = ""; - if ("".equals(busMes.getPrcType())){ - - } - - return dateId; - } - - @ApiOperation(value = "查询流程编号", notes = "根据流程实例ID查询流程编号") @ApiImplicitParams({@ApiImplicitParam(name = "pId", value = "流程id")}) @GetMapping("/findPrcNumByPid") @@ -354,45 +343,38 @@ public class TodoTaskController { /** * - * @param taskIds,pId + * @param taskId + * @param prcType */ @ApiOperation(value = "详情") @GetMapping("/queryDetail") - public BusProcessNew queryDetail(String taskIds,String prcType) { - - List taskIdList = new ArrayList<>(Arrays.asList(taskIds.split(","))); - List list = iBusProcessNewService.findNoExecuteBusProcessNewForEnd(taskIdList); - if (list.isEmpty()) { + public BusProcessNewVO queryDetail(String taskId,String prcType) { + BusProcessNew busProcessNew = iBusProcessNewService.selectEOByTaskId(taskId); + if (busProcessNew == null) { return null; } - - // TODO 去对应的业务表中找相应的ID --- start // 查找详细业务数据 - BusProcessNew processNew = this.queryDetailDate(list,prcType); + BusProcessNewVO busProcessNewVO = this.queryDetailDate(busProcessNew, prcType); //审批数据 - BusProcessApprove busProcessApprove = busProcessApproveMapper.selectEoByPrcIdAndTask(processNew.getPId(), - processNew.getTaskId()); + BusProcessApprove busProcessApprove = busProcessApproveMapper.selectEoByPrcIdAndTask(busProcessNewVO.getPId(), + busProcessNewVO.getTaskId()); String approveJson = JSON.toJSONString(busProcessApprove); - processNew.setApproveJson(approveJson); -// JSONObject object = JSONObject.parseObject(list.get(0).getMesg()); -// object.put("taskId", list.get(0).getTaskId()); -// BeanUtils.copyProperties(list.get(0), processNew); -// processNew.setMesg(object.toJSONString()); - // TODO 去对应的业务表中找相应的ID --- end - return processNew; - + busProcessNewVO.setApproveJson(approveJson); + return busProcessNewVO; } - private BusProcessNew queryDetailDate(List list, String prcType) { - BusProcessNew busProcessNew = list.get(0); - + private BusProcessNewVO queryDetailDate(BusProcessNew busProcessNew, String prcType) { + BusProcessNewVO busProcessNewVO = new BusProcessNewVO(); + BeanUtils.copyProperties(busProcessNew,busProcessNewVO); if ("".equals(prcType)){ String dataId = busProcessNew.getDataId(); //去对应的 数据表查数据 - +// busProcessNewVO.setDateMesg(); } - return busProcessNew; + + + return busProcessNewVO; } /** @@ -401,7 +383,7 @@ public class TodoTaskController { */ @ApiOperation(value = "保存任务第一步") @PostMapping("/saveTaskFirst") - public Wrapper saveTaskFirst(@RequestBody ApproveDataVO approveDataVO) { + public Wrapper saveTaskFirst(@RequestBody ApproveDataVO approveDataVO,@RequestBody String dataJson) { String saveId = null; if (approveDataVO.getId() != null && !approveDataVO.getId().equals("")) { saveId = approveDataVO.getId(); @@ -414,23 +396,22 @@ public class TodoTaskController { List list = iBusProcessNameService.list(queryWrapper); if (list != null && list.size() > 0) { BusProcessName busProcessName = list.get(0); - // TODO 先存到业务表单中，再存入busProcessName --start - String dataId = this.saveOrUpdateDate(approveDataVO); - busProcessName.setDataId(dataId); + busProcessName.setSubmitStatus(SubmitStatusEnum.DRAFT.getValue()); iBusProcessNameService.saveOrUpdate(busProcessName); - // TODO 先存到业务表单中，再存入busProcessName --end } } else { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String time = sdf.format(new Date()); BusProcessName busProcessName = new BusProcessName(); - - String dataId = this.saveOrUpdateDate(approveDataVO); + if (StringUtils.isNotEmpty(dataJson)) { + //根据业务情况 对业务数据进行saveOrupdate + String dataId = activitDefineService.saveOrUpdateDate(approveDataVO.getPrcType(), dataJson); + busProcessName.setDataId(dataId); + } busProcessName.setPrcType(approveDataVO.getPrcType()); busProcessName.setCreatUser(approveDataVO.getCreateUser()); busProcessName.setCreatTime(time); - busProcessName.setDataId(dataId); busProcessName.setCreatUserName(approveDataVO.getCreateUserName()); busProcessName.setSubmitStatus(SubmitStatusEnum.DRAFT.getValue()); iBusProcessNameService.save(busProcessName); @@ -1227,7 +1208,6 @@ public class TodoTaskController { * 根据用户idList获取用户信息 */ public List getUserInfoByIdList(List userIdList){ - // TODO 根据用户id列表获取用户信息，不完善 -- lixuetao改 List userList = this.userEoService.getUserByIdList(userIdList); return userList; } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessNew.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessNew.java index aa0148e..a166393 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessNew.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessNew.java @@ -37,21 +37,10 @@ public class BusProcessNew implements Serializable { @TableField("USER_ID") private String userId; - @TableField(exist = false) - private String userName; - @ApiModelProperty(value = "具体的数据ID，关联具体的业务表的id") @TableField("DATA_ID") private String dataId; - @ApiModelProperty(value = "具体的业务数据") - @TableField(exist = false) - private String dateMesg; - - @ApiModelProperty(value = "具体的审批数据") - @TableField(exist = false) - private String approveJson; - @ApiModelProperty(value = "节点信息") @TableField("TASK_INFO") private String taskInfo; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessNewMapper.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessNewMapper.java index 4be8a8a..385ff63 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessNewMapper.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessNewMapper.java @@ -24,6 +24,8 @@ public interface BusProcessNewMapper extends BaseMapper { List findNoExecuteBusProcessNew(@Param("taskIds")List taskIds); List findNoExecuteBusProcessNewForEnd(@Param("taskIds")List taskIds); + + BusProcessNew selectEOByTaskId(@Param("taskId") String taskId); // String queryTaskName(@Param("id")String id); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java index 7570e09..2e1e244 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java @@ -29,4 +29,5 @@ public interface IBusProcessNewService extends IService { List findNoExecuteBusProcessNewForEnd(List taskIdList); + BusProcessNew selectEOByTaskId(String taskId); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java index d6c2239..d3838e8 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java @@ -68,4 +68,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl findNoExecuteBusProcessNewForEnd(List taskIdList) { return baseMapper.findNoExecuteBusProcessNewForEnd(taskIdList); } + + @Override + public BusProcessNew selectEOByTaskId(String taskId) { + return baseMapper.selectEOByTaskId(taskId); + } } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/BusProcessNewVO.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/BusProcessNewVO.java new file mode 100644 index 0000000..6734e44 --- /dev/null +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/BusProcessNewVO.java @@ -0,0 +1,38 @@ +package com.adc.da.wkflow.business_main.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BusProcessNewVO { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "处理人") + private String userId; + + @TableField(exist = false) + private String userName; + + @ApiModelProperty(value = "具体的数据ID，关联具体的业务表的id") + private String dataId; + + @ApiModelProperty(value = "具体的业务数据") + private String dateMesg; + + @ApiModelProperty(value = "具体的审批数据") + private String approveJson; + + @ApiModelProperty(value = "节点信息") + private String taskInfo; + + @ApiModelProperty(value = "任务id") + private String taskId; + + @ApiModelProperty(value = "流程实例id") + private String pId; +} diff --git a/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessNewMapper.xml b/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessNewMapper.xml index ce87311..3e9115c 100644 --- a/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessNewMapper.xml +++ b/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessNewMapper.xml @@ -27,4 +27,9 @@ +