yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复问题

master
dimengzhe 2 years ago
parent
ce46f3a915
commit
09ffa0ed8e
9 changed files with 129 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  2. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
  3. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
  4. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
  5. 50
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  6. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java
  7. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
  8. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
  9. 97
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

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

@ -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 = "";
@ -1769,7 +1770,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
/* Future<String> future1 = pool.submit(() -> {
/*Future<String> future1 = pool.submit(() -> {
return genCarSaleContract(dto, map, appOrderDetailsVo);
});
Future<String> future1_2 = pool.submit(() -> {
@ -1777,7 +1778,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
});*/
PrintConfirmVo printConfirmVo = null;
String urlAll = "";
/* Future<String> future2 = pool.submit(() -> {
/*Future<String> future2 = pool.submit(() -> {
return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
});
Future<String> future2_2 = pool.submit(() -> {

2
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
View File

@ -1561,7 +1561,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t> 年 月 日 年 月 日</w:t>
<w:t> 年 月 日 年 月 日</w:t>
</w:r>
</w:p>
<w:sectPr wsp:rsidR="00CE5AB6">

2
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
View File

@ -1561,7 +1561,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t> 年 月 日 年 月 日</w:t>
<w:t> 年 月 日 年 月 日</w:t>
</w:r>
</w:p>
<w:sectPr wsp:rsidR="00CE5AB6">

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

@ -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;
}

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

@ -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);

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

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

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

@ -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>

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

@ -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);
}
}

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

@ -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,42 +1302,51 @@ 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());
for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
vinListVo.removeAll(Collections.singleton(null));
if(!vinListVo.isEmpty()){
for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8));
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
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());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8));
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//查询该客户的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone());
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
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,37 +1450,43 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
fEntityList = new ArrayList<>();
//查询该客户的车架号不为空的情况
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone());
for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
vinListVo.removeAll(Collections.singleton(null));
if(!vinListVo.isEmpty()){
for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) {
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8));
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
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());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8));
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//查询该客户的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone());
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
arReceivebill.setF_PAEZ_AssistantKey("006");

Write Preview
Loading…
Cancel
Save