DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[修改] 标签问题

Browse Source
This commit is contained in:
bupengxiang
2023-05-26 10:55:17 +08:00
parent d7c6203393
commit 400d5bc28a
14 changed files with 122 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java
+2 -2
View File
@@ -120,7 +120,7 @@ public class ActivitDefineService {
JSONArray objects = JSONObject.parseArray(label);
String lastLabel =(String)objects.get(objects.size()-1);
ReportLabelEntity reportLabelEntity = new ReportLabelEntity(com.adc.da.util.utils.UUID.randomUUID10()
,ttReportManageAct.getDataId(), label,lastLabel);
,ttReportManageAct.getDataId(), label,lastLabel,1);
labelList.add(reportLabelEntity);
}
iReportLabelService.saveBatch(labelList);
@@ -154,7 +154,7 @@ public class ActivitDefineService {
JSONArray objects = JSONObject.parseArray(label);
String lastLabel =(String)objects.get(objects.size()-1);
ReportLabelEntity reportLabelEntity = new ReportLabelEntity(com.adc.da.util.utils.UUID.randomUUID10()
,ttReportManageAct.getDataId(), label,lastLabel);
,ttReportManageAct.getDataId(), label,lastLabel,1);
labelList.add(reportLabelEntity);
}
iReportLabelService.saveBatch(labelList);
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+18 -4
View File
@@ -626,8 +626,15 @@ public class TodoTaskController {
reportFileDao.selectByReport(new ReportFile(ttReportManageAct.getDataId(),2));
ttReportManageAct.setFileList(reportFiles);
}
List<String> labelList = treeLableDao.selectIdByReport(ttReportManageAct.getDataId());
ttReportManageAct.setLabelList(labelList);
List<String> labelList = treeLableDao.selectIdByReport(ttReportManageAct.getDataId(),1);
if (labelList.size()>0){
//流程未结束
ttReportManageAct.setLabelList(labelList);
}else {
//流程已结束
labelList = treeLableDao.selectIdByReport(ttReportManageAct.getDataId(),2);
ttReportManageAct.setLabelList(labelList);
}
String string = JSONArray.toJSONString(ttReportManageAct);
//去对应的 数据表查数据
busProcessNewVO.setDataJson(string);
@@ -646,8 +653,15 @@ public class TodoTaskController {
reportFileDao.selectByReport(new ReportFile(ttReportManageAct.getDataId(),2));
ttReportManageAct.setFileList(reportFiles);
}
List<String> labelList = treeLableDao.selectIdByReport(ttReportManageAct.getDataId());
ttReportManageAct.setLabelList(labelList);
List<String> labelList = treeLableDao.selectIdByReport(ttReportManageAct.getDataId(),1);
if (labelList.size()>0){
//流程未结束
ttReportManageAct.setLabelList(labelList);
}else {
//流程已结束
labelList = treeLableDao.selectIdByReport(ttReportManageAct.getDataId(),2);
ttReportManageAct.setLabelList(labelList);
}
String string = JSONArray.toJSONString(ttReportManageAct);
//去对应的 数据表查数据
busProcessNewVO.setDataJson(string);