|
|
@@ -26,6 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
import java.text.SimpleDateFormat; |
|
|
import java.text.SimpleDateFormat; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
|
|
|
|
|
|
@@ -933,6 +935,14 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
if (null == rentContract) { |
|
|
if (null == rentContract) { |
|
|
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); |
|
|
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
WxRentContractRevenueJump jq = new WxRentContractRevenueJump(); |
|
|
|
|
|
jq.updateTenantInfo(rentContract); |
|
|
|
|
|
jq.setRentContractId(rentContract.getId()); |
|
|
|
|
|
List<WxRentContractRevenueJump> jumpList = wxRentContractService.findJumpList(jq); |
|
|
|
|
|
if (null == jumpList || jumpList.size() <= 0 ) { |
|
|
|
|
|
return new ResultData(Result.ERROR, "合同未设置跳点,不用做汇算"); |
|
|
|
|
|
} |
|
|
return new ResultData(wxRentContractService.calcuteYearsRevenueRentUp(rentContract)); |
|
|
return new ResultData(wxRentContractService.calcuteYearsRevenueRentUp(rentContract)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|