|
|
|
@ -74,15 +74,25 @@ public class BaseTDxTaxCurrentServiceImpl extends MpBaseServiceImpl<BaseTDxTaxCu |
|
|
|
|
String selectStartDate = current.getSelectStartDate(); |
|
|
|
|
String selectEndDate = current.getSelectEndDate(); |
|
|
|
|
String operationEndDate = current.getOperationEndDate(); |
|
|
|
|
selectStartDate = LocalDate.parse(selectStartDate, DateTimeFormatter.ofPattern("yyyyMMdd")) |
|
|
|
|
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")); |
|
|
|
|
selectEndDate = LocalDate.parse(selectEndDate, DateTimeFormatter.ofPattern("yyyyMMdd")) |
|
|
|
|
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")); |
|
|
|
|
operationEndDate = LocalDate.parse(operationEndDate, DateTimeFormatter.ofPattern("yyyyMMdd")) |
|
|
|
|
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")); |
|
|
|
|
if (StringUtils.isNotBlank(selectStartDate)){ |
|
|
|
|
selectStartDate = LocalDate.parse(selectStartDate, DateTimeFormatter.ofPattern("yyyyMMdd")) |
|
|
|
|
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(selectEndDate)){ |
|
|
|
|
selectEndDate = LocalDate.parse(selectEndDate, DateTimeFormatter.ofPattern("yyyyMMdd")) |
|
|
|
|
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(operationEndDate)){ |
|
|
|
|
operationEndDate = LocalDate.parse(operationEndDate, DateTimeFormatter.ofPattern("yyyyMMdd")) |
|
|
|
|
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")); |
|
|
|
|
} |
|
|
|
|
current.setSelectStartDate(selectStartDate); |
|
|
|
|
current.setSelectEndDate(selectEndDate); |
|
|
|
|
current.setOperationEndDate(operationEndDate); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
JSONObject json = new JSONObject(); |
|
|
|
|
json.put("current", current); |
|
|
|
|