Procházet zdrojové kódy

hetong

release_toaliyun_real
xhxu před 4 roky
rodič
revize
0186ffba14
3 změnil soubory, kde provedl 58 přidání a 7 odebrání
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  2. +57
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. binární
      mallinkService/src/main/resources/contract-word-template/jinmao_contract_rent_property.docx

+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Zobrazit soubor

@@ -274,6 +274,7 @@ public class WxRentContract extends TenantEntity {




@io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "filename")
private String filename;



+ 57
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Zobrazit soubor

@@ -500,14 +500,47 @@ public class WxRentContractServiceImpl implements WxRentContractService {
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}




















//生成预览账单(补录第二步,第三步走编辑)
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0l)) {
wxBillRentMapper.deletePreviewBill(record);
//重新生成
List<WxBillRent> resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true);
record.setPreviewBillRentList(resultList);
}
// if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null
// && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0l)) {
// wxBillRentMapper.deletePreviewBill(record);
// //重新生成
// List<WxBillRent> resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true);
// record.setPreviewBillRentList(resultList);
// }














//创建预览账单
// List<WxBillRent> resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true);
// record.setPreviewBillRentList(resultList);
@@ -557,6 +590,19 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return resultData;
}













// if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) {
// if (record.getReceivePeriod() != null && record.getLease() != null
// && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0)) {
@@ -2209,6 +2255,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
result.put("oneRentalPrice2", priceRent2);
result.put("oneRentalPriceUpper2", PriceUtil.digitUppercase(priceRent2));



// TODO
}else{
result.put("oneRentalStartDateYear1",incrementStartDate.substring(0,4));
result.put("oneRentalStartDateMonth1",incrementStartDate.substring(5,7));


binární
mallinkService/src/main/resources/contract-word-template/jinmao_contract_rent_property.docx Zobrazit soubor


Načítá se…
Zrušit
Uložit