修复问题

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -81,6 +81,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
@@ -1677,7 +1678,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //上装
         if (appOrderDetailsVo.getTopInfo() != null) {
             AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();
-            String topName = topInfo.getTopName();
+            String topName = appOrderDetailsVo.getTopMessage();
             topName = "上装：" + topName + "。";
             map.put("topName", topName);
         }
@@ -1706,7 +1707,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         }
 
         //保险说明
-        String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfo() + "。";
+        String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfoMessage() + "。";
         //车价合计
         String totalPrice = priceInfo.getTotalPrice();
         String priceRemarks = "";

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -102,7 +102,13 @@ public class AppOrderDetailsVo implements Vo {
     //中介人2
     private SubmitVo intermediary2;
 
+    @ApiModelProperty("是否包含保险：0不包含，1包括")
     private String isInsurance;
+    @ApiModelProperty("合同中的保险说明")
+    private String insuranceInfoMessage;
+
+    @ApiModelProperty("合同中的上装信息")
+    private String topMessage;
 
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -80,6 +80,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDt
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
@@ -2751,6 +2752,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     info = info + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks();
                 }
                 vo.setInsuranceInfo(info);
+                String infoMessage = "公司投保、"+x2+busSalesOrderInsurance.getInsuranceNum();
+                vo.setInsuranceInfoMessage(infoMessage);
             }
         } else {
             if ("0".equals(busSalesOrder.getIsInsurance())) {
@@ -2808,6 +2811,53 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 vo.setTopInfo(topInfo);
             }
+            BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
+            String topMessage = "";
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())){
+                topMessage = topMessage+busSalesOrderMakeup.getTopName();
+            }
+            //委改方式
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefitMethod())){
+                topMessage = topMessage+ " "+ busSalesOrderMakeup.getRefitMethod();
+            }
+            //委改厂
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefitFactory())){
+                topMessage = topMessage+ " "+ busSalesOrderMakeup.getRefitFactory();
+            }
+            //外廓尺寸
+            String sizeMessage = "";
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getSizeLong())){
+                sizeMessage = "外廓尺寸"+busSalesOrderMakeup.getSizeLong()+"mm";
+            }
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getSizeWide())){
+                sizeMessage = sizeMessage+"*"+busSalesOrderMakeup.getSizeWide()+"mm";
+            }
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getSizeHigh())){
+                sizeMessage = sizeMessage+"*"+busSalesOrderMakeup.getSizeHigh()+"mm";
+            }
+            if(StringUtils.isNotBlank(sizeMessage)){
+                topMessage = topMessage+ " "+ sizeMessage;
+            }
+            //板材厚度
+            String ssMessage = "";
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessBottom())){
+                ssMessage = "板材厚度"+busSalesOrderMakeup.getThicknessBottom()+"mm";
+            }
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessEdge())){
+                ssMessage = ssMessage+"*"+busSalesOrderMakeup.getThicknessEdge()+"mm";
+            }
+            if(StringUtils.isNotBlank(ssMessage)){
+                topMessage = topMessage+ " "+ ssMessage;
+            }
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getPlateMaterial())){
+                topMessage = topMessage+ " "+ busSalesOrderMakeup.getPlateMaterial();
+            }
+            //公告型号
+            //其他配置
+            /*if(StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig())){
+                topMessage = topMessage+busSalesOrderMakeup.getMoreConfig();
+            }*/
+            vo.setTopMessage(topMessage);
         }
         /***************************主车优惠***************************************/
         List<AppOrderDiscountListVo> discountList = busSalesOrderDiscountService.selectDiscount(sid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@@ -81,4 +81,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
      * @return
      */
     AppOrderTopInfoVo selectTop(String sid);
+
+    BusSalesOrderMakeup detailsss(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -94,4 +94,8 @@
         FROM bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="detailsss" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
+        select * from bus_sales_order_makeup where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -248,4 +248,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
     public AppOrderTopInfoVo selectTop(String sid) {
         return baseMapper.selectTop(sid);
     }
+
+    public BusSalesOrderMakeup detailsss(String sid) {
+        return baseMapper.detailsss(sid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -258,13 +258,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 return rb.setMsg("认款不完全，提交失败");
             }
             List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
-            if (paymentVoucherAppendixs.size() == 0) {
+            /*if (paymentVoucherAppendixs.size() == 0) {
                 return rb.setMsg("请上传打款凭证附件");
-            }
+            }*/
             List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
-            if (remittanceConfirmationAppendixs.size() == 0) {
+            /*if (remittanceConfirmationAppendixs.size() == 0) {
                 return rb.setMsg("请上传汇款确认书附件");
-            }
+            }*/
             if (finSelectedReceivablesDetailedDtos.size() > 0) {
                 for (FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) {
                     if (StringUtils.isBlank(v.getSubscriptionMoney())) {
@@ -1302,8 +1302,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     //往来单位
                     arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber());
                     fEntityList = new ArrayList<>();
+                    String uncollSid = "";
                     //查询该客户的车架号不为空的情况
                     List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone());
+                    vinListVo.removeAll(Collections.singleton(null));
+                    if(!vinListVo.isEmpty()){
                         for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
                             freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
                             //结算方式
@@ -1319,9 +1322,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             freceivebillentry.setFPURPOSEIDType("cw_skyt");
                             freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
                             fEntityList.add(freceivebillentry);
+                            uncollSid = vvvv.getReceivablesSid();
+                        }
                     }
                     //查询该客户的车架号为空的情况
                     FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone());
+                    if(vvVo != null){
+                        uncollSid = vvVo.getReceivablesSid();
                         freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
                         //结算方式
                         freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
@@ -1335,9 +1342,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         freceivebillentry.setFPURPOSEIDType("cw_skyt");
                         freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
                         fEntityList.add(freceivebillentry);
+                    }
+
                     //项目类别key、value
                     arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
-                    FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(vvVo.getReceivablesSid());
+                    FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(uncollSid);
                     if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
                         arReceivebill.setF_PAEZ_AssistantKey("001");
                     } else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
@@ -1441,6 +1450,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     fEntityList = new ArrayList<>();
                     //查询该客户的车架号不为空的情况
                     List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone());
+                    vinListVo.removeAll(Collections.singleton(null));
+                    if(!vinListVo.isEmpty()){
                         for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
                             freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
                             //结算方式
@@ -1457,8 +1468,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
                             fEntityList.add(freceivebillentry);
                         }
+                    }
+
                     //查询该客户的车架号为空的情况
                     FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone());
+                    if(vvVo != null){
                         freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
                         //结算方式
                         freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
@@ -1472,6 +1486,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         freceivebillentry.setFPURPOSEIDType("cw_skyt");
                         freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
                         fEntityList.add(freceivebillentry);
+                    }
                     //项目类别key、value
                     arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
                     arReceivebill.setF_PAEZ_AssistantKey("006");