diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index f5adbf5..7297a77 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -18,6 +18,7 @@ import com.adc.da.report.vo.ReportVo; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.adc.da.util.utils.FileUtil; +import com.adc.da.util.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; @@ -469,13 +470,15 @@ public class ReportManageConroller { } catch (Exception ex) { log.info(ex.getMessage(),ex); } - ReportLogBook reportLog = new ReportLogBook(); - reportLog.setId(UUID.randomUUID().toString().replaceAll("-","")); - reportLog.setReportId(repostId); - reportLog.setType(2); - reportLog.setUpdateTime(new Date()); - reportLog.setUserId(UserUtils.getUserId()); - reportLogBookDao.insert(reportLog); + if (StringUtils.isNotEmpty(repostId)){ + ReportLogBook reportLog = new ReportLogBook(); + reportLog.setId(UUID.randomUUID().toString().replaceAll("-","")); + reportLog.setReportId(repostId); + reportLog.setType(2); + reportLog.setUpdateTime(new Date()); + reportLog.setUserId(UserUtils.getUserId()); + reportLogBookDao.insert(reportLog); + } } diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java index d4cdcfc..f96fd9d 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java @@ -3,6 +3,8 @@ package com.adc.da.report.dao.mysql; import com.adc.da.report.eo.TreeLabelEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * @author ThinkBook * @description 针对表【ts_tree_label】的数据库操作Mapper @@ -17,6 +19,8 @@ public interface TreeLabelDao extends BaseMapper { * @return */ double getMaxNum(String parentId); + + List selectIdByReport(String reportId); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java index 81fa43e..2d3cb27 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java @@ -125,6 +125,4 @@ public class TtReportManageAct { @TableField(exist = false) private List labelList; - @TableField(exist = false) - private List labelEOList; } diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java b/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java index 3426567..6b63355 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java @@ -93,4 +93,5 @@ public class TtReportManageActPageVO extends BasePageVO { private Integer delFlag; private List powerList; + } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 625314b..64cb910 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -19,10 +19,10 @@ insert into TT_REPORT_MANAGE () value ( - #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, + #{Vo.dataId},#{Vo.name},#{Vo.keyContent},#{Vo.mainContent},#{Vo.department},#{Vo.year},#{Vo.fileId}, #{Vo.confidentialLevel},#{Vo.privacyLevel}, #{Vo.createUserId}, - #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}, + #{Vo.createDate},#{Vo.updateDate},#{Vo.delFlag}, #{Vo.secrecyLast}) diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TreeLabelDao.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TreeLabelDao.xml index db1b394..f4b72d6 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TreeLabelDao.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TreeLabelDao.xml @@ -18,4 +18,9 @@ from ts_tree_label t where t.parent_id = #{parentId} + diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml index 1c00fab..cebdeba 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml @@ -22,10 +22,6 @@ - - - - @@ -129,10 +125,7 @@ a.id, task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag ,secrecy_last,file_name - ,label.label as lableName,label.id as labelId FROM a - LEFT JOIN ts_report_label rl on rl.report_id = a.data_id - LEFT JOIN ts_tree_label label on rl.label_id = label.id data_id = #{dataId} @@ -142,10 +135,7 @@ a.id, task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag ,secrecy_last,file_name - ,label.label as lableName,label.id as labelId FROM a - LEFT JOIN ts_report_label rl on rl.report_id = a.data_id - LEFT JOIN ts_tree_label label on rl.label_id = label.id prc_id = #{prcId} diff --git a/adc-da-report/target/classes/com/adc/da/report/controller/ReportLogBookController.class b/adc-da-report/target/classes/com/adc/da/report/controller/ReportLogBookController.class index 4a2296a..008bd27 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/controller/ReportLogBookController.class and b/adc-da-report/target/classes/com/adc/da/report/controller/ReportLogBookController.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class b/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class index 5aa7870..6f8cb6b 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class and b/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/ReportDao.class b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/ReportDao.class index dbafc90..5f075a3 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/ReportDao.class and b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/ReportDao.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TreeLabelDao.class b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TreeLabelDao.class index c82cfde..4b00ad6 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TreeLabelDao.class and b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TreeLabelDao.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/eo/ReportLogBook.class b/adc-da-report/target/classes/com/adc/da/report/eo/ReportLogBook.class index 07e0de5..37a8a83 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/eo/ReportLogBook.class and b/adc-da-report/target/classes/com/adc/da/report/eo/ReportLogBook.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class b/adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class index a65f698..27e69c5 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class and b/adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/service/IReportLogBookService.class b/adc-da-report/target/classes/com/adc/da/report/service/IReportLogBookService.class index 3d026e6..2f7d343 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/IReportLogBookService.class and b/adc-da-report/target/classes/com/adc/da/report/service/IReportLogBookService.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/service/IReportService.class b/adc-da-report/target/classes/com/adc/da/report/service/IReportService.class index b2a1d36..a510a6b 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/IReportService.class and b/adc-da-report/target/classes/com/adc/da/report/service/IReportService.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportLogBookServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportLogBookServiceImpl.class index 57383f7..9811d7d 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportLogBookServiceImpl.class and b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportLogBookServiceImpl.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class index d1c5e18..80dbb35 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class and b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class differ diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml index 947da47..64cb910 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml @@ -19,10 +19,10 @@ insert into TT_REPORT_MANAGE () value ( - #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, + #{Vo.dataId},#{Vo.name},#{Vo.keyContent},#{Vo.mainContent},#{Vo.department},#{Vo.year},#{Vo.fileId}, #{Vo.confidentialLevel},#{Vo.privacyLevel}, #{Vo.createUserId}, - #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}, + #{Vo.createDate},#{Vo.updateDate},#{Vo.delFlag}, #{Vo.secrecyLast}) @@ -229,4 +229,22 @@ + diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/TreeLabelDao.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/TreeLabelDao.xml index db1b394..f4b72d6 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/TreeLabelDao.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/TreeLabelDao.xml @@ -18,4 +18,9 @@ from ts_tree_label t where t.parent_id = #{parentId} + diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml index 1c00fab..cebdeba 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml @@ -22,10 +22,6 @@ - - - - @@ -129,10 +125,7 @@ a.id, task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag ,secrecy_last,file_name - ,label.label as lableName,label.id as labelId FROM a - LEFT JOIN ts_report_label rl on rl.report_id = a.data_id - LEFT JOIN ts_tree_label label on rl.label_id = label.id data_id = #{dataId} @@ -142,10 +135,7 @@ a.id, task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag ,secrecy_last,file_name - ,label.label as lableName,label.id as labelId FROM a - LEFT JOIN ts_report_label rl on rl.report_id = a.data_id - LEFT JOIN ts_tree_label label on rl.label_id = label.id prc_id = #{prcId} 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 05fccee..45f96ee 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 @@ -8,6 +8,7 @@ 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.IBusProcessApproveService; import com.adc.da.wkflow.business_main.service.IBusProcessNameService; +import com.adc.da.wkflow.dto.StartProcessEO; import com.adc.da.wkflow.enums.SubmitStatusEnum; import com.adc.da.wkflow.util.ImpulseSenderUtils; import com.adc.da.wkflow.util.activiti.ActivitiTools; @@ -143,13 +144,7 @@ public class ActivitDefineController { Map prcNameAndPrcNum = createPrcNameAndPrcNum(prcType); jsonObject.put("id",prcNameAndPrcNum.get("id")); - /** - * String id, - * String userId, - * String bpnId, - * String prcType, - * String msg - */ + String id = jsonObject.getString("id"); String userId = jsonObject.getString("loginUserId"); String bpnId = jsonObject.getString("bpnId"); @@ -225,7 +220,100 @@ public class ActivitDefineController { log.info("启动流程实例,获取id-->{},实例名称-->{}", pi.getId(), pd.getName()); return WrapMapper.ok(task.getId()); } + @ApiOperation(value = "启动流程-以流程定义id") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "流程定义Id"), + @ApiImplicitParam(name = "userId", value = "流程发起人Id"), + @ApiImplicitParam(name = "bpnId", value = "流程表单ID"), + @ApiImplicitParam(name = "prcType", value = "流程类型"), + @ApiImplicitParam(name = "prcName", value = "流程名称"), + }) + @PostMapping("/batchStartProcess") + public Wrapper batchStartProcess(@RequestBody List startProcessEOList) { + List busProcessNames = new ArrayList<>(); + StringBuilder stringBuilder = new StringBuilder(); + for (StartProcessEO startProcessEO : startProcessEOList) { + startProcessEO.setLoginUserId(UserUtils.getUserId()); + if(com.adc.da.util.utils.StringUtils.isNotEmpty(startProcessEO.getId())){ + startProcessEO.setBpnId(startProcessEO.getId()); + } + String prcType = startProcessEO.getPrcType(); + Map prcNameAndPrcNum = createPrcNameAndPrcNum(prcType); + + startProcessEO.setId((String) prcNameAndPrcNum.get("id")); + + String id = startProcessEO.getId(); + String userId = startProcessEO.getUserId(); + String bpnId = startProcessEO.getBpnId(); + + // 创建查询对象 + ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery(); + // 使用流程定义的名称模糊查询 + long total = processDefinitionQuery.count(); + List list = processDefinitionQuery.orderByProcessDefinitionKey().asc().list(); + List> definitions = ActivitiTools.turnProcessDefinitions(list); + String pid = ""; + for(Map map:definitions){ + if(map.get("key").toString().equals(id)){ + pid = map.get("id").toString(); + } + } + + ProcessDefinition pd = repositoryService.createProcessDefinitionQuery().processDefinitionId(pid).singleResult(); + ProcessInstance pi = runtimeService.startProcessInstanceById(pid); + Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult(); + task.setAssignee(userId); + taskService.saveTask(task); + + stringBuilder.append(","+task.getId()); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + if(StringUtils.isEmpty(bpnId)) { + BusProcessName busProcessName = new BusProcessName(); + busProcessName.setPrcId(pi.getId()); + busProcessName.setCreatTime(sdf.format(new Date())); + busProcessName.setCreatUser(userId); + UserEO byId = userEoService.getUserById(userId); + busProcessName.setCreatUserName(byId.getUsname()); + busProcessName.setPrcNum((String) prcNameAndPrcNum.get("prcNum")); + busProcessName.setPrcType(prcType); +// String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect); +// String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId(),reportId); +// busProcessName.setDataId(dateId); +// busProcessName.setPrcName((String) prcNameAndPrcNum.get("prcName")); + busProcessName.setPrcName(startProcessEO.getPrcName()); + busProcessName.setSubmitStatus(SubmitStatusEnum.SUBMIT.getValue()); + busProcessNames.add(busProcessName); + }else{ + // 删除重新增加的目的是为了留下历史的流程编号,方便发号器生成 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ID", bpnId); + BusProcessName one = ibusprocessnameService.getOne(queryWrapper); + one.setSubmitStatus(SubmitStatusEnum.DELETE.getValue()); + ibusprocessnameService.saveOrUpdate(one); + + String newId = UUID.randomUUID().toString().replace("-", ""); + one.setId(newId); + one.setPrcNum((String) prcNameAndPrcNum.get("prcNum")); +// one.setPrcName((String) prcNameAndPrcNum.get("prcName")); + one.setPrcName(startProcessEO.getPrcName()); + one.setPrcId(pi.getId()); + one.setSubmitStatus(SubmitStatusEnum.SUBMIT.getValue()); + one.setCreatTime(sdf.format(new Date())); +// String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect); +// String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId(),reportId); +// one.setDataId(dateId); + busProcessNames.add(one); + } + log.info("启动流程实例,获取id-->{},实例名称-->{}", pi.getId(), pd.getName()); + } + ibusprocessnameService.saveBatch(busProcessNames); + + String substring = stringBuilder.toString().substring(1, stringBuilder.length() - 1); + + return WrapMapper.ok(substring); + } @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 index ccc8e70..17b8f68 100644 --- 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 @@ -9,6 +9,7 @@ import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.service.IPowerApplyActService; import com.adc.da.report.service.IReportLabelService; import com.adc.da.report.service.ITtReportManageActService; +import com.adc.da.util.utils.CollectionUtils; import com.adc.da.util.utils.StringUtils; import com.alibaba.fastjson.JSONObject; import org.slf4j.Logger; @@ -69,11 +70,13 @@ public class ActivitDefineService { //插入报表标签关系表 //修改报表标签关系表(先删后增) iReportLabelService.deleteReportLabelByReportId(new String[]{reportId}); - ttReportManageAct.getLabelList().forEach((label) -> { - ReportLabelEntity reportLabelEntity = new ReportLabelEntity(com.adc.da.util.utils.UUID.randomUUID10() - ,ttReportManageAct.getDataId(), label); - reportLabelDao.insert(reportLabelEntity); - }); + if (CollectionUtils.isNotEmpty(ttReportManageAct.getLabelList())){ + ttReportManageAct.getLabelList().forEach((label) -> { + ReportLabelEntity reportLabelEntity = new ReportLabelEntity(com.adc.da.util.utils.UUID.randomUUID10() + ,ttReportManageAct.getDataId(), label); + reportLabelDao.insert(reportLabelEntity); + }); + } } return reportId; } 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 c5ebe89..c5da48a 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 @@ -3,6 +3,7 @@ package com.adc.da.wkflow.business_activiti.task; import cn.hutool.core.util.StrUtil; import com.adc.da.login.util.UserUtils; import com.adc.da.report.dao.mysql.PowerApplyActDao; +import com.adc.da.report.dao.mysql.TreeLabelDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.vo.PowerApplyActPageVO; @@ -114,6 +115,9 @@ public class TodoTaskController { @Autowired private TtReportManageActDao ttReportManageActDao; + @Autowired + private TreeLabelDao treeLableDao; + @ApiOperation(value = "我的待办任务列表") @ApiImplicitParams({@ApiImplicitParam(name = "name", value = "名称"), @ApiImplicitParam(name = "current", value = "当前页"), @@ -478,6 +482,8 @@ public class TodoTaskController { }else { ttReportManageAct = ttReportManageActDao.selectByPrcId(pId); } + List labelList = treeLableDao.selectIdByReport(ttReportManageAct.getDataId()); + ttReportManageAct.setLabelList(labelList); String string = JSONArray.toJSONString(ttReportManageAct); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/dto/StartProcessEO.java b/report-activity/src/main/java/com/adc/da/wkflow/dto/StartProcessEO.java new file mode 100644 index 0000000..db747e1 --- /dev/null +++ b/report-activity/src/main/java/com/adc/da/wkflow/dto/StartProcessEO.java @@ -0,0 +1,24 @@ +package com.adc.da.wkflow.dto; + +import com.alibaba.fastjson.JSON; +import lombok.Data; + +@Data +public class StartProcessEO { + + private String prcName; + + private String prcType; + + private String userId; + + private JSON approveData; + + private JSON dataMsg; + + private String loginUserId; + + private String bpnId; + + private String id; +} diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class index ab7e5de..ab08e70 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class index 12651f6..2b7350f 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class index bc012ff..4c706e0 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class index 80663ab..953a8f4 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class differ