|
@@ -361,6 +361,10 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
|
|
}
|
|
}
|
|
//yes 的时候状态为审核通过 否则为未通过
|
|
//yes 的时候状态为审核通过 否则为未通过
|
|
feedback.setStatus(("yes".equals(feedback.getAct().getFlag()) ? "2" : "4"));
|
|
feedback.setStatus(("yes".equals(feedback.getAct().getFlag()) ? "2" : "4"));
|
|
|
|
+ //驳回意见
|
|
|
|
+ if (feedback.getStatus().equals("4")){
|
|
|
|
+ feedback.setApplyView(feedback.getAct().getComment());
|
|
|
|
+ }
|
|
Map<String, Object> vars = Maps.newHashMap();
|
|
Map<String, Object> vars = Maps.newHashMap();
|
|
//业务逻辑对应的条件表达式
|
|
//业务逻辑对应的条件表达式
|
|
String exp = "";
|
|
String exp = "";
|
|
@@ -674,6 +678,7 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
|
|
String newIds = ids.substring(0,ids.lastIndexOf(","));
|
|
String newIds = ids.substring(0,ids.lastIndexOf(","));
|
|
feedback.setExaminer(newIds);
|
|
feedback.setExaminer(newIds);
|
|
}
|
|
}
|
|
|
|
+
|
|
dao.update(feedback);
|
|
dao.update(feedback);
|
|
//保存附件
|
|
//保存附件
|
|
if (CollectionUtils.isNotEmpty(feedback.getWorkAttachments())){
|
|
if (CollectionUtils.isNotEmpty(feedback.getWorkAttachments())){
|