租赁协议
This commit is contained in:
parent
8d576fe17b
commit
f961f3f200
|
|
@ -10,6 +10,7 @@ import com.bonus.common.security.utils.SecurityUtils;
|
||||||
import com.bonus.material.book.domain.BookCarInfoDto;
|
import com.bonus.material.book.domain.BookCarInfoDto;
|
||||||
import com.bonus.material.contract.domain.BmContract;
|
import com.bonus.material.contract.domain.BmContract;
|
||||||
import com.bonus.material.contract.service.BmContractService;
|
import com.bonus.material.contract.service.BmContractService;
|
||||||
|
import com.bonus.material.device.domain.vo.DevInfoVo;
|
||||||
import com.bonus.material.order.domain.OrderDetailCostReliefDto;
|
import com.bonus.material.order.domain.OrderDetailCostReliefDto;
|
||||||
import com.bonus.material.order.domain.OrderDetailDto;
|
import com.bonus.material.order.domain.OrderDetailDto;
|
||||||
import com.bonus.material.order.domain.OrderInfoDto;
|
import com.bonus.material.order.domain.OrderInfoDto;
|
||||||
|
|
@ -174,10 +175,11 @@ public class OrderController extends BaseController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*@ApiOperation(value = "租赁协议(查看)")
|
@ApiOperation(value = "租赁协议(查看)")
|
||||||
@GetMapping("/leaseAgreement")
|
@GetMapping("/leaseAgreement")
|
||||||
public AjaxResult getleaseAgreement(String orderId, Map<String, String> replacements) throws IOException, ParseException {
|
public AjaxResult getleaseAgreement(String orderId, Map<String, String> replacements) throws IOException, ParseException {
|
||||||
OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId);
|
OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId);
|
||||||
|
List<OrderDetailDto> orderDetailsByOrderId = orderMapper.selectOrderDetailsByOderId(orderId);
|
||||||
BmContract bmContract = new BmContract();
|
BmContract bmContract = new BmContract();
|
||||||
bmContract.setStatus(1);
|
bmContract.setStatus(1);
|
||||||
List<BmContract> list = bmContractService.list(bmContract);
|
List<BmContract> list = bmContractService.list(bmContract);
|
||||||
|
|
@ -199,6 +201,16 @@ public class OrderController extends BaseController {
|
||||||
replacements.put("${companyName}", orderInfoDto.getCompanyName());
|
replacements.put("${companyName}", orderInfoDto.getCompanyName());
|
||||||
//订单金额
|
//订单金额
|
||||||
replacements.put("${cost}", orderInfoDto.getCost().toString());
|
replacements.put("${cost}", orderInfoDto.getCost().toString());
|
||||||
|
//订单详情
|
||||||
|
String orderDetail = "";
|
||||||
|
for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) {
|
||||||
|
Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString());
|
||||||
|
String beginTime = outputFormat.format(rentBeginTime);
|
||||||
|
Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString());
|
||||||
|
String endTime = outputFormat.format(rentEndTime);
|
||||||
|
orderDetail += "机具名称:" + orderDetailDto.getDeviceName() + "租期:" + beginTime + "至" + endTime + "天数:" + orderDetailDto.getDays() + "天 租金:" + orderDetailDto.getDayLeasePrice() + "元/天数量:" + orderDetailDto.getNum();
|
||||||
|
}
|
||||||
|
replacements.put("${orderTable}", orderDetail);
|
||||||
|
|
||||||
for (IBodyElement element : document.getBodyElements()) {
|
for (IBodyElement element : document.getBodyElements()) {
|
||||||
if (element instanceof XWPFParagraph) {
|
if (element instanceof XWPFParagraph) {
|
||||||
|
|
@ -221,12 +233,12 @@ public class OrderController extends BaseController {
|
||||||
|
|
||||||
MultipartFile file = new MockMultipartFile("contract", "contract.docx", MediaType.APPLICATION_OCTET_STREAM_VALUE, wordBytes);
|
MultipartFile file = new MockMultipartFile("contract", "contract.docx", MediaType.APPLICATION_OCTET_STREAM_VALUE, wordBytes);
|
||||||
return sysFileService.upload(file);
|
return sysFileService.upload(file);
|
||||||
}*/
|
}
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation(value = "租赁协议(查看)")
|
/* @ApiOperation(value = "租赁协议(查看)")
|
||||||
@GetMapping("/leaseAgreement")
|
@GetMapping("/leaseAgreement")
|
||||||
public AjaxResult getleaseAgreement(String orderId, Map<String, Object> replacements) throws ParseException {
|
public AjaxResult getleaseAgreement(String orderId, Map<String, String> replacements) throws ParseException {
|
||||||
OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId);
|
OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId);
|
||||||
List<OrderDetailDto> orderDetailsByOrderId = orderMapper.selectOrderDetailsByOderId(orderId);
|
List<OrderDetailDto> orderDetailsByOrderId = orderMapper.selectOrderDetailsByOderId(orderId);
|
||||||
String dateStr = orderInfoDto.getOrderTime().toString();
|
String dateStr = orderInfoDto.getOrderTime().toString();
|
||||||
|
|
@ -235,27 +247,71 @@ public class OrderController extends BaseController {
|
||||||
|
|
||||||
Date date = inputFormat.parse(dateStr);
|
Date date = inputFormat.parse(dateStr);
|
||||||
String formattedDate = outputFormat.format(date);
|
String formattedDate = outputFormat.format(date);
|
||||||
|
|
||||||
//订单日期
|
//订单日期
|
||||||
replacements.put("${orderTime}", formattedDate);
|
replacements.put("orderTime", formattedDate);
|
||||||
//装备所属公司
|
//装备所属公司
|
||||||
replacements.put("${czcompanyName}", orderInfoDto.getCzcompanyName());
|
replacements.put("czCompanyName", orderInfoDto.getCzcompanyName());
|
||||||
//承租方所属公司
|
//承租方所属公司
|
||||||
replacements.put("${companyName}", orderInfoDto.getCompanyName());
|
replacements.put("companyName", orderInfoDto.getCompanyName());
|
||||||
//订单金额
|
//订单金额
|
||||||
replacements.put("${cost}", orderInfoDto.getCost().toString());
|
replacements.put("cost", orderInfoDto.getCost().toString());
|
||||||
//订单详情
|
//订单详情
|
||||||
String orderDetail = "";
|
String orderDetail = "";
|
||||||
for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) {
|
for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) {
|
||||||
orderDetail += "<p>机具名称:" + orderDetailDto.getDeviceName() + "  租期:" + orderDetailDto.getRentBeginTime() + "至" + orderDetailDto.getRentEndTime() + "  天数:" + orderDetailDto.getDays() + "天 租金:" + orderDetailDto.getDayLeasePrice() + "元/天  数量:" + orderDetailDto.getNum() + "</p>";
|
Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString());
|
||||||
|
String beginTime = outputFormat.format(rentBeginTime);
|
||||||
|
Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString());
|
||||||
|
String endTime = outputFormat.format(rentEndTime);
|
||||||
|
orderDetail += "<p>机具名称:" + orderDetailDto.getDeviceName() + "<br>租期:" + beginTime + "至" + endTime + "<br>天数:" + orderDetailDto.getDays() + "天 <br>租金:" + orderDetailDto.getDayLeasePrice() + "元/天<br>数量:" + orderDetailDto.getNum() + "</p>";
|
||||||
}
|
}
|
||||||
replacements.put("${orderTable}", orderDetail);
|
replacements.put("orderTable", orderDetail);
|
||||||
|
|
||||||
BmContract bmContract = new BmContract();
|
BmContract bmContract = new BmContract();
|
||||||
bmContract.setStatus(1);
|
bmContract.setStatus(1);
|
||||||
List<BmContract> list = bmContractService.list(bmContract);
|
List<BmContract> list = bmContractService.list(bmContract);
|
||||||
String content = list.get(0).getContent();
|
String content = list.get(0).getContent();
|
||||||
|
if (StringUtils.isBlank(content)){
|
||||||
|
content = bmContractService.lisTemplate(bmContract).get(0).getContent();
|
||||||
|
}
|
||||||
StrSubstitutor sub = new StrSubstitutor(replacements);
|
StrSubstitutor sub = new StrSubstitutor(replacements);
|
||||||
String result = sub.replace(content);
|
String result = sub.replace(content);
|
||||||
return AjaxResult.success(result);
|
return AjaxResult.success(result);
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
/* @ApiOperation(value = "购物车协议(查看)")
|
||||||
|
@GetMapping("/bookCarAgreement")
|
||||||
|
public AjaxResult getbookCarAgreement(OrderInfoDto orderInfoDto, Map<String, Object> replacements) throws ParseException {
|
||||||
|
if (orderInfoDto != null) {
|
||||||
|
SimpleDateFormat inputFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH);
|
||||||
|
SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
|
//装备所属公司
|
||||||
|
replacements.put("czcompanyName", orderInfoDto.getCzcompanyName());
|
||||||
|
//承租方所属公司
|
||||||
|
replacements.put("companyName", orderInfoDto.getCompanyName());
|
||||||
|
//订单金额
|
||||||
|
replacements.put("cost", orderInfoDto.getCost().toString());
|
||||||
|
//订单详情
|
||||||
|
String orderDetail = "";
|
||||||
|
List<OrderDetailDto> detailsList = orderInfoDto.getDetailsList();
|
||||||
|
for (OrderDetailDto orderDetailDto : detailsList) {
|
||||||
|
Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString());
|
||||||
|
String beginTime = outputFormat.format(rentBeginTime);
|
||||||
|
Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString());
|
||||||
|
String endTime = outputFormat.format(rentEndTime);
|
||||||
|
orderDetail += "<p>机具名称:" + orderDetailDto.getDeviceName() + "<br>租期:" + beginTime + "至" + endTime + "<br>天数:" + orderDetailDto.getDays() + "天 <br>租金:" + orderDetailDto.getDayLeasePrice() + "元/天<br>数量:" + orderDetailDto.getNum() + "</p>";
|
||||||
|
}
|
||||||
|
replacements.put("orderTable", orderDetail);
|
||||||
|
}
|
||||||
|
BmContract bmContract = new BmContract();
|
||||||
|
bmContract.setStatus(1);
|
||||||
|
List<BmContract> list = bmContractService.list(bmContract);
|
||||||
|
String content = list.get(0).getContent();
|
||||||
|
if (StringUtils.isBlank(content)){
|
||||||
|
content = bmContractService.lisTemplate(bmContract).get(0).getContent();
|
||||||
|
}
|
||||||
|
StrSubstitutor sub = new StrSubstitutor(replacements);
|
||||||
|
String result = sub.replace(content);
|
||||||
|
return AjaxResult.success(result);
|
||||||
|
}*/
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue