Commit 38a6a60b authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents 690960df d67b0572
......@@ -151,7 +151,12 @@ public class FascUtil {
// 超过1页的循环查询
if (listPageCount > 1) {
for (int i = 2; i <= listPageCount; i++) {
getSignTemplateListReq = new GetSignTemplateListReq();
getSignTemplateListReq.setOwnerId(ownerId);
getSignTemplateListReq.setListFilter(signTemplateListFilterInfo);
getSignTemplateListReq.setAccessToken(accessToken);
getSignTemplateListReq.setListPageNo(i);
getSignTemplateListReq.setListPageSize(100);
pushLog = new TFascPushLog();
pushLog.setTransReferenceId(company.getOpenId());
......@@ -168,7 +173,8 @@ public class FascUtil {
pushLog.setTaskStatus(res.isSuccess() ? CommonConstants.ONE_STRING : CommonConstants.TWO_STRING);
tFascPushLogService.updateById(pushLog);
if (res.getData().getSignTemplates() != null && !res.getData().getSignTemplates().isEmpty()) {
if (res.isSuccess() && res.getData() != null && res.getData().getSignTemplates() != null
&& !res.getData().getSignTemplates().isEmpty()) {
list.addAll(res.getData().getSignTemplates());
}
}
......@@ -253,6 +259,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;
......@@ -261,15 +270,24 @@ public class FascUtil {
if (Common.isEmpty(companyActorId) && actor.getActorInfo() != null
&& Common.isNotNull(actor.getActorInfo().getActorType())
&& "corp".equals(actor.getActorInfo().getActorType())
&& Common.isNotNull(actor.getActorInfo().getActorId())) {
&& Common.isNotNull(actor.getActorInfo().getActorId())
&& actor.getActorInfo().getPermissions() != null
&& actor.getActorInfo().getPermissions().contains("sign")) {
companyActorId = actor.getActorInfo().getActorId();
}
if (Common.isEmpty(personActorId) && actor.getActorInfo() != null
&& Common.isNotNull(actor.getActorInfo().getActorType())
&& "person".equals(actor.getActorInfo().getActorType())
&& Common.isNotNull(actor.getActorInfo().getActorId())) {
&& Common.isNotNull(actor.getActorInfo().getActorId())
&& actor.getActorInfo().getPermissions() != null
&& actor.getActorInfo().getPermissions().contains("sign")) {
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,19 +306,21 @@ public class FascUtil {
fieldType = fields.getFieldType();
if (Common.isNotNull(fieldType)) {
if (FascConstants.FIELD_TEXT_TYPE.contains(fieldType)) {
// 文本数字等控件
detail = new TFascTemplateDetail();
detail.setSignTemplateId(signTemplateId);
detail.setFascDocId(docId);
detail.setFascField(fields.getFieldName());
detail.setFascFieldId(fields.getFieldId());
isMust = CommonConstants.ONE_STRING;
if (this.isFieldNotRequired(fields, fieldType)) {
isMust = CommonConstants.ZERO_STRING;
if (fillMap.get(docId + CommonConstants.DOWN_LINE_STRING + fields.getFieldId()) == null) {
// 文本数字等控件
detail = new TFascTemplateDetail();
detail.setSignTemplateId(signTemplateId);
detail.setFascDocId(docId);
detail.setFascField(fields.getFieldName());
detail.setFascFieldId(fields.getFieldId());
isMust = CommonConstants.ONE_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)) {
// 章控件
if (zhangName.length() > 0) {
......
......@@ -300,7 +300,7 @@
<include refid="tEmployeeContractPre_where"/>
</where>
order by a.create_time desc
limit 0,5
limit 0,2000
</select>
<!--tEmployeeContractPre导出查询-->
......
......@@ -74,5 +74,5 @@ wx:
corpid: wwbcb090af0dfe50e5
corpsecret: 16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid: 1000010
authUrl: https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin
domainName: https://test-wx.worfu.com
\ No newline at end of file
authUrl: https://wx.worfu.com/yifu-auth/method/oauth/wxLogin
domainName: https://wx.worfu.com
\ No newline at end of file
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