|
@@ -121,6 +121,9 @@ public class ActivitiServiceImpl implements ActivitiService {
|
|
|
@Resource
|
|
|
TSJobRemindService tsJobRemindService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ SysCustomService sysCustomService;
|
|
|
+
|
|
|
/**
|
|
|
* 根据deploymentId查找processDefinitionId
|
|
|
*
|
|
@@ -922,6 +925,18 @@ public class ActivitiServiceImpl implements ActivitiService {
|
|
|
if (Objects.nonNull(tfCustomFlowEntity.getCrmNo())) {
|
|
|
crmProjectResult = tbCrmService.findCrmProjectBySopNoOrCrmNo(tfCustomFlowEntity.getCode(), tfCustomFlowEntity.getCrmNo());
|
|
|
}
|
|
|
+ if (tfCustomFlow.getType() == TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW && tfFlowApprove.getSetup().intValue() == 1) {
|
|
|
+ List<FlowFormWidgetResult> flowFormWidgetResultList = currFlowTaskResult.getFormProperty();
|
|
|
+ for (FlowFormWidgetResult f : flowFormWidgetResultList) {
|
|
|
+ if (f.getFormId().contains("week_people_day") && Objects.isNull(f.getValue())) {
|
|
|
+ SysCustom sysCustom = sysCustomService.getById(crmProjectResult.getCustomId());
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
+ jsonObject.put("value", sysCustom.getPeoperDay());
|
|
|
+ f.setValue(jsonObject.toString());
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return new FlowViewResult(flowId, tfFlowApprove.getStatus(), tfCustomFlowEntity.getCode(), taskIdList, flowTaskHistoryList, currFlowTaskResult, flowApproveHistoryList, crmProjectResult);
|
|
|
}
|
|
|
|