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-06 09:30:46 +08:00
parent 0de7012353
commit 91c14e0489
8 changed files with 32 additions and 13 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
+6 -3
View File
@@ -61,17 +61,20 @@ public class ActivitDefineService {
List<PowerApplyAct> powerApplyActs = new ArrayList<>();
List<PowerApplyAct> powerList = ttReportManageAct.getPowerList();
for (PowerApplyAct powerApplyAct : powerList) {
if (StringUtils.isNotEmpty(powerApplyAct.getId())){
if (StringUtils.isEmpty(powerApplyAct.getId())){
powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-",""));
powerApplyAct.setReportId(ttReportManageAct.getId());
powerApplyAct.setDataId(dataId);
powerApplyAct.setTaskId(taskId);
// powerApplyAct.setTaskId(taskId);
powerApplyAct.setPrcId(prcId);
powerApplyAct.setDelFlag(0);
powerApplyAct.setCreateDate(new Date());
powerApplyActs.add(powerApplyAct);
}
}
powerApplyActDao.batchInsert(powerApplyActs);
if (powerApplyActs.size()>0){
powerApplyActDao.batchInsert(powerApplyActs);
}
}
return dataId;
}
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+2 -2
View File
@@ -446,7 +446,7 @@ public class TodoTaskController {
busProcessNewVO.setDataJson(string);
}else if ("2".equals(prcType)){
TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId);
List<PowerApplyActPageVO> powerApplyActs = powerApplyActDao.selectListBydataId(dataId);
List<PowerApplyActPageVO> powerApplyActs = powerApplyActDao.selectListByPrcId(ttReportManageActPageVO.getPrcId());
ttReportManageActPageVO.setPowerList(powerApplyActs);
String string = JSONArray.toJSONString(ttReportManageActPageVO);
//去对应的 数据表查数据
@@ -472,7 +472,7 @@ public class TodoTaskController {
busProcessNewVO.setDataJson(string);
}else if("2".equals(prcType)){
TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId);
List<PowerApplyActPageVO> powerApplyActs = powerApplyActDao.selectListBydataId(dataId);
List<PowerApplyActPageVO> powerApplyActs = powerApplyActDao.selectListByPrcId(ttReportManageActPageVO.getPrcId());
ttReportManageActPageVO.setPowerList(powerApplyActs);
String string = JSONArray.toJSONString(ttReportManageActPageVO);
//去对应的 数据表查数据
report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java
+5 -1
View File
@@ -46,7 +46,11 @@ public class BusProcessNameServiceImpl extends ServiceImpl<BusProcessNameMapper,
if(StringUtils.equals(FlowTypeEnum.BGQXSQLC.getValue(), prcType)){
prcName = FlowTypeEnum.BGQXSQLC.getPrcName();
prcNum = FlowTypeEnum.BGQXSQLC.getPrcNum();
}else {
}else if (StringUtils.equals(FlowTypeEnum.SCBGLC.getValue(), prcType)){
prcName = FlowTypeEnum.SCBGLC.getPrcName();
prcNum = FlowTypeEnum.SCBGLC.getPrcNum();
}
else {
throw new ActivitiException("非法的流程类型： " + prcType);
}
result.put("id",prcNum);
report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java
+4
View File
@@ -92,6 +92,10 @@ public class ImpulseSenderUtils {
number = bgqxsqNumber.incrementAndGet();
checkNumberLegitimate(number,"报告权限申请流程");
break;
case SCBGLC:
number = bgqxsqNumber.incrementAndGet();
checkNumberLegitimate(number,"上传报告流程");
break;
default:
throw new ActivitiException("流程类型 " + flowType + " 非法！");
}