Commit 5a164f4e authored by hongguangwu's avatar hongguangwu

Merge branch 'develop'

parents 6544f82c cfdb5b70
...@@ -253,6 +253,9 @@ public class FascUtil { ...@@ -253,6 +253,9 @@ public class FascUtil {
pushLog.setTaskStatus(res.isSuccess() ? CommonConstants.ONE_STRING : CommonConstants.TWO_STRING); pushLog.setTaskStatus(res.isSuccess() ? CommonConstants.ONE_STRING : CommonConstants.TWO_STRING);
tFascPushLogService.updateById(pushLog); tFascPushLogService.updateById(pushLog);
// 参与方控件,要排除掉
// key是docID+控件ID
Map<String, Integer> fillMap = new HashMap<>();
if (res.isSuccess() && res.getData() != null && res.getData().getActors() != null if (res.isSuccess() && res.getData() != null && res.getData().getActors() != null
&& !res.getData().getActors().isEmpty()) { && !res.getData().getActors().isEmpty()) {
String companyActorId = null; String companyActorId = null;
...@@ -270,6 +273,11 @@ public class FascUtil { ...@@ -270,6 +273,11 @@ public class FascUtil {
&& Common.isNotNull(actor.getActorInfo().getActorId())) { && Common.isNotNull(actor.getActorInfo().getActorId())) {
personActorId = 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.setCompanyActorId(companyActorId);
template.setPersonActorId(personActorId); template.setPersonActorId(personActorId);
...@@ -288,19 +296,21 @@ public class FascUtil { ...@@ -288,19 +296,21 @@ public class FascUtil {
fieldType = fields.getFieldType(); fieldType = fields.getFieldType();
if (Common.isNotNull(fieldType)) { if (Common.isNotNull(fieldType)) {
if (FascConstants.FIELD_TEXT_TYPE.contains(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); detail = new TFascTemplateDetail();
detail.setFascDocId(docId); detail.setSignTemplateId(signTemplateId);
detail.setFascField(fields.getFieldName()); detail.setFascDocId(docId);
detail.setFascFieldId(fields.getFieldId()); detail.setFascField(fields.getFieldName());
isMust = CommonConstants.ONE_STRING; detail.setFascFieldId(fields.getFieldId());
if (this.isFieldNotRequired(fields, fieldType)) { isMust = CommonConstants.ONE_STRING;
isMust = CommonConstants.ZERO_STRING; if (this.isFieldNotRequired(fields, fieldType)) {
isMust = CommonConstants.ZERO_STRING;
}
detail.setIsMust(isMust);
detail.setDeleteFlag(CommonConstants.NOT_DELETE_FLAG);
detailList.add(detail);
} }
detail.setIsMust(isMust);
detail.setDeleteFlag(CommonConstants.NOT_DELETE_FLAG);
detailList.add(detail);
} else if (FascConstants.FIELD_ZHANG_TYPE.contains(fieldType)) { } else if (FascConstants.FIELD_ZHANG_TYPE.contains(fieldType)) {
// 章控件 // 章控件
if (zhangName.length() > 0) { 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