|
|
@@ -37,6 +37,8 @@ import com.xjrsoft.module.form.mapper.FormTemplateMapper;
|
|
|
import com.xjrsoft.module.form.service.IFormExecuteService;
|
|
|
import com.xjrsoft.module.magicapi.service.IMagicApiService;
|
|
|
import com.xjrsoft.module.magicapi.vo.MagicApiInfoVo;
|
|
|
+import com.xjrsoft.module.oa.entity.OfficialDocumentReceived;
|
|
|
+import com.xjrsoft.module.oa.mapper.OfficialDocumentReceivedMapper;
|
|
|
import com.xjrsoft.module.organization.entity.User;
|
|
|
import com.xjrsoft.module.organization.entity.UserRoleRelation;
|
|
|
import com.xjrsoft.module.organization.service.IUserService;
|
|
|
@@ -149,6 +151,8 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
*/
|
|
|
private static final String DB_FIELD_XML_PREFIX = "xml";
|
|
|
|
|
|
+ private final OfficialDocumentReceivedMapper officialdocumentreceivedmapper;
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public boolean deploy(DeployDto dto) {
|
|
|
@@ -378,7 +382,12 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
Optional<FormTemplate> templateOp = formTemplates.stream().filter(f -> Objects.equals(f.getId(), formConfig.getFormId())).findFirst();
|
|
|
templateOp.ifPresent(t -> formInfoVo.setFormJson(t.getFormJson()));
|
|
|
}
|
|
|
-
|
|
|
+ if(formInfoVo.getFormData().containsKey("document_level") && formInfoVo.getFormData().containsKey("emergency_level")){
|
|
|
+ Object id = formInfoVo.getFormData().get("id");
|
|
|
+ OfficialDocumentReceived received = officialdocumentreceivedmapper.selectById(id.toString());
|
|
|
+ formInfoVo.getFormData().put("document_level", received.getDocumentLevel());
|
|
|
+ formInfoVo.getFormData().put("emergency_level", received.getEmergencyLevel());
|
|
|
+ }
|
|
|
formInfoVos.add(formInfoVo);
|
|
|
}
|
|
|
vo.setFormInfos(formInfoVos);
|
