1.上传后，根据表内填写的选择协议列内的信息，与系统内的“协议代码”做字段匹配，匹配到完全一致的信息后，将系统内协议的保险公司和保司机构写入本次导入的数据中；表格内填写的数据不做写入。

  表格内签单时间格式为yyyy-MM-dd，上传后，补充签单时间的HH:mm:ss，默认时分秒为

src/main/java/com/ydtech/modules/inv/utils/CheckInsPlyComeUtils.java

@@ -18,6 +18,9 @@ import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -37,9 +40,10 @@ public class CheckInsPlyComeUtils {
      *  @Description:  验证签单日期
      */
     public static String  checkSignDate(String data,String msg){
+        //2024-11-14  需求签单日期格式不需要时分秒
         String errorMsg =null;
-        if(StringUtils.isBlank(data)  ||  !isValidDate(data,"yyyy-MM-dd HH:mm:ss") ){
-            errorMsg = msg+"不能为空或格式错误，格式为yyyy-MM-dd HH:mm:ss";
+        if(StringUtils.isBlank(data)  ||  !isValidDate(data,"yyyy-MM-dd") ){
+            errorMsg = msg+"不能为空或格式错误，格式为yyyy-MM-dd";
         }
         return errorMsg;
     }
@@ -118,7 +122,9 @@ public class CheckInsPlyComeUtils {
         ApplicationContext applicationContext = SpringContextUtil.getApplicationContext();
         PtlAgreementService ptlAgreementService = applicationContext.getBean(PtlAgreementService.class);
         //由于协议名称确定不了唯一，通过协议编号确认唯一  add  by  hxl  2024-10-12 14:36
-        PtlAgreement ptlAgreement = ptlAgreementService.getById(data);
+        PtlAgreement ptlAgreement = ptlAgreementService.getByAgreementIdNew(data);
+
+
         //PtlAgreement ptlAgreement = ptlAgreementService.getByAgreementTitle(data);
         String errorMsg =null;
         if(StringUtils.isBlank(data) || ptlAgreement==null ){
@@ -180,23 +186,34 @@ public class CheckInsPlyComeUtils {
         if(checkSignDate(dto.getSignDate(), "签单时间")!=null){
             errorMsg+=checkSignDate(dto.getSignDate(), "签单时间")+"; ";
         }
+        //签单日期转换为 yyyy-MM-dd HH:mm:ss
+        if(StringUtils.isNotEmpty(dto.getSignDate())){
+            String singTime = pareTimeLocalDate(dto.getSignDate());
+            dto.setSignDate(singTime);
+        }
+
+
         if(checkIsNull(dto.getLicenseno(), "车牌号")!=null){
             errorMsg+=checkIsNull(dto.getSignDate(), "车牌号")+"; ";
         }
         String companyId =null;
-        Map<String, String> companyMap = checkCompanyName(dto.getCompanyName(), "保险公司");
-        if(companyMap!=null && companyMap.get("msg")!=null){
-            errorMsg+=companyMap.get("msg").toString()+"; ";
-        }else if(companyMap.get("msg")==null){
-            companyId = companyMap.get("id").toString();
-        }
+        String companyName=null;
         String partnerCompaniesId =null;
-        Map<String, String> companySubMap = checkCompanyName(dto.getPartnerCompaniesName(), "保司机构");
-        if(companySubMap!=null && companySubMap.get("msg")!=null){
-            errorMsg+=companySubMap+"; ";
-        }else if( companySubMap.get("msg")==null){
-            partnerCompaniesId = companySubMap.get("id");
-        }
+        String partnerCompaniesName=null;
+
+//        Map<String, String> companyMap = checkCompanyName(dto.getCompanyName(), "保险公司");
+//        if(companyMap!=null && companyMap.get("msg")!=null){
+//            errorMsg+=companyMap.get("msg").toString()+"; ";
+//        }else if(companyMap.get("msg")==null){
+//            companyId = companyMap.get("id").toString();
+//        }
+//        Map<String, String> companySubMap = checkCompanyName(dto.getPartnerCompaniesName(), "保司机构");
+//        if(companySubMap!=null && companySubMap.get("msg")!=null){
+//            errorMsg+=companySubMap+"; ";
+//        }else if( companySubMap.get("msg")==null){
+//            partnerCompaniesId = companySubMap.get("id");
+//        }
+//
         if(checkRiskcode(dto.getRiskcode(), "险种")!=null){
             errorMsg+=checkRiskcode(dto.getSignDate(), "险种")+"; ";
         }
@@ -210,6 +227,10 @@ public class CheckInsPlyComeUtils {
             ptl =((PtlAgreement)agreeMap.get("id"));
             agreeId = ((PtlAgreement)agreeMap.get("id")).getId().toString();
             agreeDeptId = ((PtlAgreement)agreeMap.get("id")).getDeptId().toString();
+            partnerCompaniesId = ptl.getPartnerCompaniesId();
+            companyId = ptl.getInsuranceCompanyId();
+            partnerCompaniesName = ptl.getNamesimple();
+            companyName  =ptl.getInsuranceCompany();
         }
         if(checkIsNull(dto.getInsuredName(), "被保险人")!=null){
             errorMsg+=checkIsNull(dto.getInsuredName(), "被保险人")+"; ";
@@ -246,20 +267,35 @@ public class CheckInsPlyComeUtils {
             addTypeId = addTypeMap.get("id").toString();
         }
         //添加验证协议id 和保险公司id和保司机构id匹配  add  by  hxl  2024-10-12
-        if(companyId!=null  &&  partnerCompaniesId !=null && ptl!=null ){
-            if(!ptl.getInsuranceCompanyId().equals(companyId) || !ptl.getPartnerCompaniesId().equals(partnerCompaniesId)){
-                errorMsg+="协议选择和保险公司和保司机构名称不一致，请确认;";
-            }
-        }
+//        if(companyId!=null  &&  partnerCompaniesId !=null && ptl!=null ){
+//            if(!ptl.getInsuranceCompanyId().equals(companyId) || !ptl.getPartnerCompaniesId().equals(partnerCompaniesId)){
+//                errorMsg+="协议选择和保险公司和保司机构名称不一致，请确认;";
+//            }
+//        }
+
         map.put("msg",errorMsg);
         if(StringUtils.isBlank(errorMsg)){
-            InsPlyIncome  insPlyIncome =new InsPlyIncome(dto.getSignDate(),dto.getLicenseno(),companyId,dto.getCompanyName(),partnerCompaniesId,dto.getPartnerCompaniesName(),
+            InsPlyIncome  insPlyIncome =new InsPlyIncome(dto.getSignDate(),dto.getLicenseno(),companyId,companyName,partnerCompaniesId,partnerCompaniesName,
                     dto.getRiskcode(),agreeId,agreeDeptId,dto.getInsuredName(),dto.getPolicyno(),dto.getSyPolicyno(),dto.getJqPremium(),dto.getSyPremium(),
                     dto.getTaxamount(),dto.getJqSuperviseCostsProportion(),dto.getSySuperviseCostsProportion(),dto.getCommissionFeevalue(),addTypeId);
             map.put("dto",insPlyIncome);
         }
         return map;
     }
+
+    private static String pareTimeLocalDate(String signDate) {
+        DateTimeFormatter originalFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter targetFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        // 解析原始字符串日期为 LocalDate
+        LocalDate originalDate = LocalDate.parse(signDate, originalFormatter);
+
+        // 将 LocalDate 转换为 LocalDateTime，时间设为午夜
+        LocalDateTime dateTime = originalDate.atStartOfDay();
+        String b = dateTime.format(targetFormatter);
+        return b;
+    }
+
     /**
      *  @version
      *  @author: hxl
@@ -274,23 +310,34 @@ public class CheckInsPlyComeUtils {
         if(checkSignDate(dto.getSignDate(), "签单时间")!=null){
             errorMsg+=checkSignDate(dto.getSignDate(), "签单时间")+"; ";
         }
+        //签单日期转换为 yyyy-MM-dd HH:mm:ss
+        if(StringUtils.isNotEmpty(dto.getSignDate())){
+            String singTime = pareTimeLocalDate(dto.getSignDate());
+            dto.setSignDate(singTime);
+        }
+
         if(checkIsNull(dto.getLicenseno(), "车牌号")!=null){
             errorMsg+=checkIsNull(dto.getSignDate(), "车牌号")+"; ";
         }
         String companyId =null;
-        Map<String, String> companyMap = checkCompanyName(dto.getCompanyName(), "保险公司");
-        if(companyMap!=null && companyMap.get("msg")!=null){
-            errorMsg+=companyMap.get("msg").toString()+"; ";
-        }else if(companyMap.get("msg")==null){
-            companyId = companyMap.get("id").toString();
-        }
+        String companyName=null;
         String partnerCompaniesId =null;
-        Map<String, String> companySubMap = checkCompanyName(dto.getPartnerCompaniesName(), "保司机构");
-        if(companySubMap!=null && companySubMap.get("msg")!=null){
-            errorMsg+=companySubMap+"; ";
-        }else if( companySubMap.get("msg")==null){
-            partnerCompaniesId = companySubMap.get("id");
-        }
+        String partnerCompaniesName=null;
+
+
+//        Map<String, String> companyMap = checkCompanyName(dto.getCompanyName(), "保险公司");
+//        if(companyMap!=null && companyMap.get("msg")!=null){
+//            errorMsg+=companyMap.get("msg").toString()+"; ";
+//        }else if(companyMap.get("msg")==null){
+//            companyId = companyMap.get("id").toString();
+//        }
+//        Map<String, String> companySubMap = checkCompanyName(dto.getPartnerCompaniesName(), "保司机构");
+//        if(companySubMap!=null && companySubMap.get("msg")!=null){
+//            errorMsg+=companySubMap+"; ";
+//        }else if( companySubMap.get("msg")==null){
+//            partnerCompaniesId = companySubMap.get("id");
+//        }
+
         if(checkRiskcode(dto.getRiskcode(), "险种")!=null){
             errorMsg+=checkRiskcode(dto.getSignDate(), "险种")+"; ";
         }
@@ -304,6 +351,10 @@ public class CheckInsPlyComeUtils {
             ptl =((PtlAgreement)agreeMap.get("id"));
             agreeId = ((PtlAgreement)agreeMap.get("id")).getId().toString();
             agreeDeptId = ((PtlAgreement)agreeMap.get("id")).getDeptId().toString();
+            partnerCompaniesId = ptl.getPartnerCompaniesId();
+            companyId = ptl.getInsuranceCompanyId();
+            partnerCompaniesName = ptl.getNamesimple();
+            companyName  =ptl.getInsuranceCompany();
         }
         if(checkIsNull(dto.getInsuredName(), "被保险人")!=null){
             errorMsg+=checkIsNull(dto.getInsuredName(), "被保险人")+"; ";
@@ -340,14 +391,15 @@ public class CheckInsPlyComeUtils {
             addTypeId = addTypeMap.get("id").toString();
         }
         //添加验证协议id 和保险公司id和保司机构id匹配  add  by  hxl  2024-10-12
-        if(companyId!=null  &&  partnerCompaniesId !=null && ptl!=null ){
-            if(!ptl.getInsuranceCompanyId().equals(companyId) || !ptl.getPartnerCompaniesId().equals(partnerCompaniesId)){
-                errorMsg+="协议选择和保险公司和保司机构名称不一致，请确认;";
-            }
-        }
+//        if(companyId!=null  &&  partnerCompaniesId !=null && ptl!=null ){
+//            if(!ptl.getInsuranceCompanyId().equals(companyId) || !ptl.getPartnerCompaniesId().equals(partnerCompaniesId))
+//            {
+//                errorMsg+="协议选择和保险公司和保司机构名称不一致，请确认;";
+//            }
+//        }
         map.put("msg",errorMsg);
         if(StringUtils.isBlank(errorMsg)){
-            InsPlyIncome  insPlyIncome =new InsPlyIncome(dto.getSignDate(),dto.getLicenseno(),companyId,dto.getCompanyName(),partnerCompaniesId,dto.getPartnerCompaniesName(),
+            InsPlyIncome  insPlyIncome =new InsPlyIncome(dto.getSignDate(),dto.getLicenseno(),companyId,companyName,partnerCompaniesId,partnerCompaniesName,
                     dto.getRiskcode(),agreeId,agreeDeptId,dto.getInsuredName(),dto.getPolicyno(),dto.getSyPolicyno(),dto.getJqPremium(),dto.getSyPremium(),
                     dto.getTaxamount(),dto.getJqOtherCostsProportion(),dto.getSyOtherCostsProportion(),dto.getOtherFeevalue(),addTypeId,null);
             map.put("dto",insPlyIncome);
@@ -367,23 +419,32 @@ public class CheckInsPlyComeUtils {
         if(checkSignDate(dto.getSignDate(), "签单时间")!=null){
             errorMsg+=checkSignDate(dto.getSignDate(), "签单时间")+"; ";
         }
+        //签单日期转换为 yyyy-MM-dd HH:mm:ss
+        if(StringUtils.isNotEmpty(dto.getSignDate())){
+            String singTime = pareTimeLocalDate(dto.getSignDate());
+            dto.setSignDate(singTime);
+        }
+
         if(checkIsNull(dto.getLicenseno(), "车牌号")!=null){
             errorMsg+=checkIsNull(dto.getSignDate(), "车牌号")+"; ";
         }
         String companyId =null;
-        Map<String, String> companyMap = checkCompanyName(dto.getCompanyName(), "保险公司");
-        if(companyMap!=null && companyMap.get("msg")!=null){
-            errorMsg+=companyMap.get("msg").toString()+"; ";
-        }else if(companyMap.get("msg")==null){
-            companyId = companyMap.get("id").toString();
-        }
+        String companyName=null;
         String partnerCompaniesId =null;
-        Map<String, String> companySubMap = checkCompanyName(dto.getPartnerCompaniesName(), "保司机构");
-        if(companySubMap!=null && companySubMap.get("msg")!=null){
-            errorMsg+=companySubMap+"; ";
-        }else if( companySubMap.get("msg")==null){
-            partnerCompaniesId = companySubMap.get("id");
-        }
+        String partnerCompaniesName=null;
+
+//        Map<String, String> companyMap = checkCompanyName(dto.getCompanyName(), "保险公司");
+//        if(companyMap!=null && companyMap.get("msg")!=null){
+//            errorMsg+=companyMap.get("msg").toString()+"; ";
+//        }else if(companyMap.get("msg")==null){
+//            companyId = companyMap.get("id").toString();
+//        }
+//        Map<String, String> companySubMap = checkCompanyName(dto.getPartnerCompaniesName(), "保司机构");
+//        if(companySubMap!=null && companySubMap.get("msg")!=null){
+//            errorMsg+=companySubMap+"; ";
+//        }else if( companySubMap.get("msg")==null){
+//            partnerCompaniesId = companySubMap.get("id");
+//        }
         if(checkRiskcode(dto.getRiskcode(), "险种")!=null){
             errorMsg+=checkRiskcode(dto.getSignDate(), "险种")+"; ";
         }
@@ -397,6 +458,10 @@ public class CheckInsPlyComeUtils {
             ptl =((PtlAgreement)agreeMap.get("id"));
             agreeId = ((PtlAgreement)agreeMap.get("id")).getId().toString();
             agreeDeptId = ((PtlAgreement)agreeMap.get("id")).getDeptId().toString();
+            partnerCompaniesId = ptl.getPartnerCompaniesId();
+            companyId = ptl.getInsuranceCompanyId();
+            partnerCompaniesName = ptl.getNamesimple();
+            companyName  =ptl.getInsuranceCompany();
         }
         if(checkIsNull(dto.getInsuredName(), "被保险人")!=null){
             errorMsg+=checkIsNull(dto.getInsuredName(), "被保险人")+"; ";
@@ -421,14 +486,14 @@ public class CheckInsPlyComeUtils {
             addTypeId = addTypeMap.get("id").toString();
         }
         //添加验证协议id 和保险公司id和保司机构id匹配  add  by  hxl  2024-10-12
-        if(companyId!=null  &&  partnerCompaniesId !=null && ptl!=null ){
-            if(!ptl.getInsuranceCompanyId().equals(companyId) || !ptl.getPartnerCompaniesId().equals(partnerCompaniesId)){
-                errorMsg+="协议选择和保险公司和保司机构名称不一致，请确认;";
-            }
-        }
+//        if(companyId!=null  &&  partnerCompaniesId !=null && ptl!=null ){
+//            if(!ptl.getInsuranceCompanyId().equals(companyId) || !ptl.getPartnerCompaniesId().equals(partnerCompaniesId)){
+//                errorMsg+="协议选择和保险公司和保司机构名称不一致，请确认;";
+//            }
+//        }
         map.put("msg",errorMsg);
         if(StringUtils.isBlank(errorMsg)){
-            InsPlyIncome  insPlyIncome =new InsPlyIncome(dto.getSignDate(),dto.getLicenseno(),companyId,dto.getCompanyName(),partnerCompaniesId,dto.getPartnerCompaniesName(),
+            InsPlyIncome  insPlyIncome =new InsPlyIncome(dto.getSignDate(),dto.getLicenseno(),companyId,companyName,partnerCompaniesId,partnerCompaniesName,
                     dto.getRiskcode(),agreeId,agreeDeptId,dto.getInsuredName(),dto.getNoPolicyno(),dto.getNoPremium(),dto.getNoSuperviseCostsProportion(),null,
                     dto.getNoSuperviseCostsPremiums(),addTypeId);
             map.put("dto",insPlyIncome);
@@ -447,23 +512,31 @@ public class CheckInsPlyComeUtils {
         if(checkSignDate(dto.getSignDate(), "签单时间")!=null){
             errorMsg+=checkSignDate(dto.getSignDate(), "签单时间")+"; ";
         }
+        //签单日期转换为 yyyy-MM-dd HH:mm:ss
+        if(StringUtils.isNotEmpty(dto.getSignDate())){
+            String singTime = pareTimeLocalDate(dto.getSignDate());
+            dto.setSignDate(singTime);
+        }
         if(checkIsNull(dto.getLicenseno(), "车牌号")!=null){
             errorMsg+=checkIsNull(dto.getSignDate(), "车牌号")+"; ";
         }
         String companyId =null;
-        Map<String, String> companyMap = checkCompanyName(dto.getCompanyName(), "保险公司");
-        if(companyMap!=null && companyMap.get("msg")!=null){
-            errorMsg+=companyMap.get("msg").toString()+"; ";
-        }else if(companyMap.get("msg")==null){
-            companyId = companyMap.get("id").toString();
-        }
+        String companyName=null;
         String partnerCompaniesId =null;
-        Map<String, String> companySubMap = checkCompanyName(dto.getPartnerCompaniesName(), "保司机构");
-        if(companySubMap!=null && companySubMap.get("msg")!=null){
-            errorMsg+=companySubMap+"; ";
-        }else if( companySubMap.get("msg")==null){
-            partnerCompaniesId = companySubMap.get("id");
-        }
+        String partnerCompaniesName=null;
+
+//        Map<String, String> companyMap = checkCompanyName(dto.getCompanyName(), "保险公司");
+//        if(companyMap!=null && companyMap.get("msg")!=null){
+//            errorMsg+=companyMap.get("msg").toString()+"; ";
+//        }else if(companyMap.get("msg")==null){
+//            companyId = companyMap.get("id").toString();
+//        }
+//        Map<String, String> companySubMap = checkCompanyName(dto.getPartnerCompaniesName(), "保司机构");
+//        if(companySubMap!=null && companySubMap.get("msg")!=null){
+//            errorMsg+=companySubMap+"; ";
+//        }else if( companySubMap.get("msg")==null){
+//            partnerCompaniesId = companySubMap.get("id");
+//        }
         if(checkRiskcode(dto.getRiskcode(), "险种")!=null){
             errorMsg+=checkRiskcode(dto.getSignDate(), "险种")+"; ";
         }
@@ -477,6 +550,10 @@ public class CheckInsPlyComeUtils {
             ptl =((PtlAgreement)agreeMap.get("id"));
             agreeId = ((PtlAgreement)agreeMap.get("id")).getId().toString();
             agreeDeptId = ((PtlAgreement)agreeMap.get("id")).getDeptId().toString();
+            partnerCompaniesId = ptl.getPartnerCompaniesId();
+            companyId = ptl.getInsuranceCompanyId();
+            partnerCompaniesName = ptl.getNamesimple();
+            companyName  =ptl.getInsuranceCompany();
         }
         if(checkIsNull(dto.getInsuredName(), "被保险人")!=null){
             errorMsg+=checkIsNull(dto.getInsuredName(), "被保险人")+"; ";
@@ -501,14 +578,14 @@ public class CheckInsPlyComeUtils {
             addTypeId = addTypeMap.get("id").toString();
         }
         //添加验证协议id 和保险公司id和保司机构id匹配  add  by  hxl  2024-10-12
-        if(companyId!=null  &&  partnerCompaniesId !=null && ptl!=null ){
-            if(!ptl.getInsuranceCompanyId().equals(companyId) || !ptl.getPartnerCompaniesId().equals(partnerCompaniesId)){
-                errorMsg+="协议选择和保险公司和保司机构名称不一致，请确认;";
-            }
-        }
+//        if(companyId!=null  &&  partnerCompaniesId !=null && ptl!=null ){
+//            if(!ptl.getInsuranceCompanyId().equals(companyId) || !ptl.getPartnerCompaniesId().equals(partnerCompaniesId)){
+//                errorMsg+="协议选择和保险公司和保司机构名称不一致，请确认;";
+//            }
+//        }
         map.put("msg",errorMsg);
         if(StringUtils.isBlank(errorMsg)){
-            InsPlyIncome  insPlyIncome =new InsPlyIncome(dto.getSignDate(),dto.getLicenseno(),companyId,dto.getCompanyName(),partnerCompaniesId,dto.getPartnerCompaniesName(),
+            InsPlyIncome  insPlyIncome =new InsPlyIncome(dto.getSignDate(),dto.getLicenseno(),companyId,companyName,partnerCompaniesId,partnerCompaniesName,
                     dto.getRiskcode(),agreeId,agreeDeptId,dto.getInsuredName(),dto.getNoPolicyno(),dto.getNoPremium(),dto.getNoOtherCostsProportion(),dto.getNoOtherCostsPremium(),addTypeId);
             map.put("dto",insPlyIncome);
         }
@@ -527,23 +604,32 @@ public class CheckInsPlyComeUtils {
         if(checkSignDate(dto.getSignDate(), "签单时间")!=null){
             errorMsg+=checkSignDate(dto.getSignDate(), "签单时间")+"; ";
         }
+        //签单日期转换为 yyyy-MM-dd HH:mm:ss
+        if(StringUtils.isNotEmpty(dto.getSignDate())){
+            String singTime = pareTimeLocalDate(dto.getSignDate());
+            dto.setSignDate(singTime);
+        }
         if(checkIsNull(dto.getLicenseno(), "车牌号")!=null){
             errorMsg+=checkIsNull(dto.getSignDate(), "车牌号")+"; ";
         }
         String companyId =null;
-        Map<String, String> companyMap = checkCompanyName(dto.getCompanyName(), "保险公司");
-        if(companyMap!=null && companyMap.get("msg")!=null){
-            errorMsg+=companyMap.get("msg").toString()+"; ";
-        }else if(companyMap.get("msg")==null){
-            companyId = companyMap.get("id").toString();
-        }
+        String companyName=null;
         String partnerCompaniesId =null;
-        Map<String, String> companySubMap = checkCompanyName(dto.getPartnerCompaniesName(), "保司机构");
-        if(companySubMap!=null && companySubMap.get("msg")!=null){
-            errorMsg+=companySubMap+"; ";
-        }else if( companySubMap.get("msg")==null){
-            partnerCompaniesId = companySubMap.get("id");
-        }
+        String partnerCompaniesName=null;
+
+//        Map<String, String> companyMap = checkCompanyName(dto.getCompanyName(), "保险公司");
+//        if(companyMap!=null && companyMap.get("msg")!=null){
+//            errorMsg+=companyMap.get("msg").toString()+"; ";
+//        }else if(companyMap.get("msg")==null){
+//            companyId = companyMap.get("id").toString();
+//        }
+//        Map<String, String> companySubMap = checkCompanyName(dto.getPartnerCompaniesName(), "保司机构");
+//        if(companySubMap!=null && companySubMap.get("msg")!=null){
+//            errorMsg+=companySubMap+"; ";
+//        }else if( companySubMap.get("msg")==null){
+//            partnerCompaniesId = companySubMap.get("id");
+//        }
+
         if(checkRiskcode(dto.getRiskcode(), "险种")!=null){
             errorMsg+=checkRiskcode(dto.getSignDate(), "险种")+"; ";
         }
@@ -557,6 +643,10 @@ public class CheckInsPlyComeUtils {
             ptl =((PtlAgreement)agreeMap.get("id"));
             agreeId = ((PtlAgreement)agreeMap.get("id")).getId().toString();
             agreeDeptId = ((PtlAgreement)agreeMap.get("id")).getDeptId().toString();
+            partnerCompaniesId = ptl.getPartnerCompaniesId();
+            companyId = ptl.getInsuranceCompanyId();
+            partnerCompaniesName = ptl.getNamesimple();
+            companyName  =ptl.getInsuranceCompany();
         }
         if(checkIsNull(dto.getInsuredName(), "被保险人")!=null){
             errorMsg+=checkIsNull(dto.getInsuredName(), "被保险人")+"; ";
@@ -604,14 +694,14 @@ public class CheckInsPlyComeUtils {
             addTypeId = addTypeMap.get("id").toString();
         }
         //添加验证协议id 和保险公司id和保司机构id匹配  add  by  hxl  2024-10-12
-        if(companyId!=null  &&  partnerCompaniesId !=null && ptl!=null ){
-            if(!ptl.getInsuranceCompanyId().equals(companyId) || !ptl.getPartnerCompaniesId().equals(partnerCompaniesId)){
-                errorMsg+="协议选择和保险公司和保司机构名称不一致，请确认;";
-            }
-        }
+//        if(companyId!=null  &&  partnerCompaniesId !=null && ptl!=null ){
+//            if(!ptl.getInsuranceCompanyId().equals(companyId) || !ptl.getPartnerCompaniesId().equals(partnerCompaniesId)){
+//                errorMsg+="协议选择和保险公司和保司机构名称不一致，请确认;";
+//            }
+//        }
         map.put("msg",errorMsg);
         if(StringUtils.isBlank(errorMsg)){
-            InsPlyIncome  insPlyIncome =new InsPlyIncome(dto.getSignDate(),dto.getLicenseno(),companyId,dto.getCompanyName(),partnerCompaniesId,dto.getPartnerCompaniesName(),
+            InsPlyIncome  insPlyIncome =new InsPlyIncome(dto.getSignDate(),dto.getLicenseno(),companyId,companyName,partnerCompaniesId,partnerCompaniesName,
                     dto.getRiskcode(),agreeId,agreeDeptId,dto.getInsuredName(),dto.getPolicyno(),dto.getSyPolicyno(),dto.getJqPremium(),dto.getSyPremium(),
                     dto.getTaxamount(),dto.getNoPolicyno(),dto.getNoPremium(),dto.getJqReceivableProportion(),dto.getSyReceivableProportion(),dto.getNoReceivableProportion(),dto.getReceivableAmount(),addTypeId);
             map.put("dto",insPlyIncome);

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreement.java

@@ -291,6 +291,11 @@ public class PtlAgreement implements Serializable {
 
     @TableField(exist = false)
     private String name;
+    /**
+     * 合作公司简称
+     */
+    @TableField(exist = false)
+    private String namesimple;
 
     @TableField(exist = false)
     private boolean Check = false;

src/main/resources/mapper/modules/protocol/PtlAgreementMapper.xml

@@ -128,11 +128,51 @@
     </select>
     <select id="getByAgreementIdNew" resultType="com.ydtech.modules.protocol.entity.po.PtlAgreement">
         select
-           *
-        from  ptl_agreement
+           pa.id as "id",
+           pa.companies_type as "companiesType",
+           pa.agreement_type as "agreementType",
+           pa.agreement_code as "agreementCode",
+           pa.agreement_name as "agreementName",
+           pa.agreement_title as "agreementTitle",
+           pa.agreement_abbreviation as "agreementAbbreviation",
+           pa.partner_companies_id as "partnerCompaniesId",
+           pa.association_companies_id as "associationCompaniesId",
+           pa.insurance_company as "insuranceCompany",
+           pa.insurance_company_id as "insuranceCompanyId",
+           pa.start_date as "startDate",
+           pa.end_date as "endDate",
+           pa.money_time as "moneyTime",
+           pa.match_type as "matchType",
+           pa.docking_person as "dockingPerson",
+           pa.docking_phone as "dockingPhone",
+           pa.with_tax as "withTax",
+           pa.money_type as "moneyType",
+           pa.file_id as "fileId",
+           pa.audit_content as "auditContent",
+           pa.audit_status as "auditStatus",
+           pa.creator as "creator",
+           pa.create_time as "createTime",
+           pa.modified_by as "modifiedBy",
+           pa.update_time as "updateTime",
+           pa.serial_number as "serialNumber",
+           pa.underwriting_description as "underwritingDescription",
+           pa.business_description as "businessDescription",
+           pa.job_description as "jobDescription",
+           pa.audit_type as "auditType",
+           pa.products_code as "productsCode",
+           pa.modified_name as "modifiedName",
+           pa.dept_id as "deptId",
+           pa.is_external as "isExternal",
+           pa.deleted as "deleted",
+           pa.custodian_id as custodianId,
+           pa.is_valid as isValid,
+           pa.fee_file_id as feeFileId,
+           eic.namesimple as "namesimple"
+        from  ptl_agreement pa
+        left join esm_ins_company eic on eic.id =pa.partner_companies_id
         <where>
             <if test="agreementId!=null  and  agreementId !=''">
-                id=#{agreementId}
+                pa.id=#{agreementId}
             </if>
         </where>
     </select>