Merge remote-tracking branch 'origin/master'

lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCPropPrintBL.java

@@ -50,6 +50,7 @@ public class LCPropPrintBL implements BusinessService {
     private String AskBatchNo = "";
     private String operator = "xjauto";
     private String manageCom = "86";
+    private LSQuotPubFun mLSQuotPubFun = new LSQuotPubFun();
 
     @Override
     public boolean submitData(VData cInputData, String Operater) {
@@ -292,8 +293,11 @@ public class LCPropPrintBL implements BusinessService {
                     LSQuotPlanSchema lsQuotPlanSchema = new LSQuotPlanSchema();
                     lsQuotPlanSchema.setQuotNo(AskNo);//quotno	报价单号
                     lsQuotPlanSchema.setQuotBatNo(AskBatchNo);//quotbatno	报价批次号
-                    lsQuotPlanSchema.setSysPlanCode(plan.getContPlanCode());//sysplancode	系统方案编码
+                    String tSysPlanCode = mLSQuotPubFun.getSysPlanCode();
+                    lsQuotPlanSchema.setSysPlanCode(tSysPlanCode);//sysplancode	系统方案编码
                     lsQuotPlanSchema.setPlanCode(plan.getContPlanCode());//plancode	方案编码
+                    contPlans.stream().filter(a -> lsQuotPlanSchema.getPlanCode().equals(a.getContPlanCode()))
+                            .forEach(a -> a.setSysContPlanCode(tSysPlanCode));
                     lsQuotPlanSchema.setPlanDesc(plan.getContPlanName());//plandesc	方案描述
                     lsQuotPlanSchema.setPremCalType(transBody.getCalFeeMethod());//premcaltype	保费计算方式 todo CalFeeMethod
                     lsQuotPlanSchema.setInsuPeriod(transBody.getInsuYear());//insuperiod	保险期间 todo 无响应字段
@@ -441,13 +445,14 @@ public class LCPropPrintBL implements BusinessService {
                     LSQuotPlanDetailSchema lsQuotPlanDetailSchema = new LSQuotPlanDetailSchema();
                     lsQuotPlanDetailSchema.setQuotNo(AskNo);//quotno	报价单号
                     lsQuotPlanDetailSchema.setQuotBatNo(AskBatchNo);//quotbatno	报价批次号
-                    lsQuotPlanDetailSchema.setSysPlanCode(plan.getContPlanCode());//sysplancode	系统计划代码
+                    lsQuotPlanDetailSchema.setSysPlanCode(plan.getSysContPlanCode());//sysplancode	系统计划代码
                     lsQuotPlanDetailSchema.setPlanCode(plan.getContPlanCode());//plancode	计划代码
                     lsQuotPlanDetailSchema.setRiskCode(plan.getRiskCode());//riskcode	险种代码
                     lsQuotPlanDetailSchema.setDutyCode(plan.getDutyCode());//dutycode	责任代码
                     lsQuotPlanDetailSchema.setAmntType("01");//amnttype	保额类型
                     lsQuotPlanDetailSchema.setFixedAmnt(plan.getAmnt());//fixedamnt	固定保额
                     lsQuotPlanDetailSchema.setSalaryMult(plan.getMonthAmntMul());//salarymult	薪资倍数
+                    lsQuotPlanDetailSchema.setExceptPremType("01");//exceptprem	期望保费类型
                     lsQuotPlanDetailSchema.setExceptPrem(plan.getPrem());//exceptprem	期望保费/费率/折扣
                     lsQuotPlanDetailSchema.setStandValue(plan.getStandardPrem());//standvalue	参考保费/费率
                     lsQuotPlanDetailSchema.setUWValue(plan.getStandardPrem());//uwvalue	核保值
@@ -470,7 +475,7 @@ public class LCPropPrintBL implements BusinessService {
                     LSQuotPlanDetailSubSchema lsQuotPlanDetailSubSchema = new LSQuotPlanDetailSubSchema();
                     lsQuotPlanDetailSubSchema.setQuotNo(AskNo);//quotno	报价单号
                     lsQuotPlanDetailSubSchema.setQuotBatNo(AskBatchNo);//quotbatno	报价批次号
-                    lsQuotPlanDetailSubSchema.setSysPlanCode(plan.getContPlanCode());//sysplancode	系统计划代码
+                    lsQuotPlanDetailSubSchema.setSysPlanCode(plan.getSysContPlanCode());//sysplancode	系统计划代码
                     lsQuotPlanDetailSubSchema.setPlanCode(plan.getContPlanCode());//plancode	计划代码
                     lsQuotPlanDetailSubSchema.setRiskCode(plan.getRiskCode());//riskcode	险种代码
                     lsQuotPlanDetailSubSchema.setDutyCode(plan.getDutyCode());//dutycode	责任代码

lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/response/g_app/TXResponse.java

@@ -251,6 +251,10 @@ public class TXResponse {
          */
         @XmlElement(name = "ContPlanCode")
         private String contPlanCode;
+        /**
+         * 保障层级编码
+         */
+        private String sysContPlanCode;
         /**
          * 保障层级名称
          */