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 7f890e2..3357d31 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 @@ -152,8 +152,8 @@ public class ReportManageConroller { if (count1 > 0){ return Result.error("报告名称已流程中存在"); } - //有报告id说明不是新增报告 走得不是新增流程 - if(StringUtils.isNotEmpty(vo.getId())){ + // 非新增流程 + if(!"4".equals(vo.getPrcType())){ long count2 = reportDao.selectByReportId(vo.getId()); if (count2==0){ return Result.error("报告已经不存在"); diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java index a9e1554..48cfc2a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java @@ -134,4 +134,6 @@ public class ReportVo { */ private Integer isAct; + private String prcType; + } 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 dacca21..611751d 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 @@ -19,10 +19,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; @Service public class ActivitDefineService { @@ -98,6 +95,7 @@ public class ActivitDefineService { //上传 TtReportManageAct ttReportManageAct = JSONObject.parseObject(dataJson, TtReportManageAct.class); ttReportManageAct.setDataId(reportId); + ttReportManageAct.setReportId(reportId); ttReportManageAct.setTaskId(taskId); ttReportManageAct.setPrcId(prcId); ttReportManageAct.setDelFlag(0);