Commit cfdb5b70 authored by hongguangwu's avatar hongguangwu

MVP1.7.16-优化

parent d11d7495
......@@ -253,6 +253,9 @@ public class FascUtil {
pushLog.setTaskStatus(res.isSuccess() ? CommonConstants.ONE_STRING : CommonConstants.TWO_STRING);
tFascPushLogService.updateById(pushLog);
// 参与方控件,要排除掉
// key是docID+控件ID
Map<String, Integer> fillMap = new HashMap<>();
if (res.isSuccess() && res.getData() != null && res.getData().getActors() != null
&& !res.getData().getActors().isEmpty()) {
String companyActorId = null;
......@@ -270,6 +273,11 @@ public class FascUtil {
&& Common.isNotNull(actor.getActorInfo().getActorId())) {
personActorId = actor.getActorInfo().getActorId();
}
if (actor.getFillFields() != null && !actor.getFillFields().isEmpty()) {
for (FillActorFieldInfo a :actor.getFillFields()) {
fillMap.put(a.getFieldDocId() + CommonConstants.DOWN_LINE_STRING + a.getFieldId(), CommonConstants.ONE_INT);
}
}
}
template.setCompanyActorId(companyActorId);
template.setPersonActorId(personActorId);
......@@ -288,6 +296,7 @@ public class FascUtil {
fieldType = fields.getFieldType();
if (Common.isNotNull(fieldType)) {
if (FascConstants.FIELD_TEXT_TYPE.contains(fieldType)) {
if (fillMap.get(docId + CommonConstants.DOWN_LINE_STRING + fields.getFieldId()) == null) {
// 文本数字等控件
detail = new TFascTemplateDetail();
detail.setSignTemplateId(signTemplateId);
......@@ -301,6 +310,7 @@ public class FascUtil {
detail.setIsMust(isMust);
detail.setDeleteFlag(CommonConstants.NOT_DELETE_FLAG);
detailList.add(detail);
}
} else if (FascConstants.FIELD_ZHANG_TYPE.contains(fieldType)) {
// 章控件
if (zhangName.length() > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment