|
@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -85,14 +86,21 @@ public class AgreementLogic {
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void add(AgreementAddUp agreementAddUp) {
|
|
|
AdminUserCom adminUser = commonLogic.getAdminUser();
|
|
|
+
|
|
|
agreementAddUp.setCompanyWechatId(adminUser.getCompanyWechatId());
|
|
|
agreementAddUp.setCompanyWechatName(adminUser.getCompanyName());
|
|
|
agreementAddUp.insert();
|
|
|
|
|
|
- for (AgreementPolicy agreementPolicy : agreementAddUp.getAgreementPolicies()) {
|
|
|
+ List<AgreementPolicy> agreementPolicies = new ArrayList<>();
|
|
|
+
|
|
|
+ for (Policy policy : agreementAddUp.getPolicy()) {
|
|
|
+ AgreementPolicy agreementPolicy = new AgreementPolicy();
|
|
|
+ agreementPolicy.setPolicyId(policy.getId());
|
|
|
agreementPolicy.setAgreementId(agreementAddUp.getId());
|
|
|
+
|
|
|
+ agreementPolicies.add(agreementPolicy);
|
|
|
}
|
|
|
- agreementPolicyService.saveBatch(agreementAddUp.getAgreementPolicies());
|
|
|
+ agreementPolicyService.saveBatch(agreementPolicies);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -104,10 +112,16 @@ public class AgreementLogic {
|
|
|
|
|
|
agreementPolicyService.lambdaUpdate().eq(AgreementPolicy::getAgreementId,agreementAddUp.getId()).remove();
|
|
|
|
|
|
- for (AgreementPolicy agreementPolicy : agreementAddUp.getAgreementPolicies()) {
|
|
|
+ List<AgreementPolicy> agreementPolicies = new ArrayList<>();
|
|
|
+
|
|
|
+ for (Policy policy : agreementAddUp.getPolicy()) {
|
|
|
+ AgreementPolicy agreementPolicy = new AgreementPolicy();
|
|
|
+ agreementPolicy.setPolicyId(policy.getId());
|
|
|
agreementPolicy.setAgreementId(agreementAddUp.getId());
|
|
|
+
|
|
|
+ agreementPolicies.add(agreementPolicy);
|
|
|
}
|
|
|
- agreementPolicyService.saveBatch(agreementAddUp.getAgreementPolicies());
|
|
|
+ agreementPolicyService.saveBatch(agreementPolicies);
|
|
|
}
|
|
|
|
|
|
public MailboxAdd detailMailbox() {
|