Commit 322f714a authored by hongguangwu's avatar hongguangwu

MVP1.7.17-模板优化

parent 1c39ce53
......@@ -79,14 +79,24 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
}
List<TFascCompany> companyList = tFascCompanyService.getTFascCompanyAllList();
if (companyList != null && !companyList.isEmpty()) {
for (TFascCompany company : companyList) {
// templateName 签署任务模板名称
List<SignTemplateListInfo> list = fascUtil.getTemplateList(templateName, tFascPushLogService, company);
if (list != null && !list.isEmpty()) {
List<TFascTemplate> tList = new ArrayList<>();
List<SignTemplateListInfo> listSubList;
List<TFascTemplate> tempList = new ArrayList<>();
List<TFascTemplateDetail> detailList = new ArrayList<>();
fascUtil.getTemplateDetailList(list, tList, detailList, tFascPushLogService, company);
List<TFascTemplateDetail> detailSubList;
for (TFascCompany company : companyList) {
listSubList = fascUtil.getTemplateList(templateName, tFascPushLogService, company);
if (listSubList != null && !listSubList.isEmpty()) {
detailSubList = new ArrayList<>();
fascUtil.getTemplateDetailList(listSubList, tempList, detailSubList, tFascPushLogService, company);
if (!tempList.isEmpty() && !detailSubList.isEmpty()) {
tList.addAll(tempList);
detailList.addAll(detailSubList);
}
}
}
// 拉取到数据再更新:
if (!tList.isEmpty() && !detailList.isEmpty()) {
String editContent1 = "定时任务同步,拉取到数据";
......@@ -179,8 +189,6 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
tFascTemplateDetailService.initFascTemplateIsMust(null);
}
}
}
}
return R.ok();
}
......
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