winter 11 месяцев назад
Родитель
Сommit
a7a3988130
2 измененных файлов: 4 добавлений и 4 удалений
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -403,7 +403,7 @@ public class WxRentContractController extends WxContractBaseController {
public ResultData setRevenueSales(@RequestBody WxRentContract wxRentContract) { public ResultData setRevenueSales(@RequestBody WxRentContract wxRentContract) {
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId());
if (null == rentContract) { if (null == rentContract) {
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同");
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到合同");
} }
if (null == wxRentContract.getSalesStartTime() || null == wxRentContract.getSalesEndTime()) { if (null == wxRentContract.getSalesStartTime() || null == wxRentContract.getSalesEndTime()) {
return new ResultData(Result.ERROR, "时间不能为空"); return new ResultData(Result.ERROR, "时间不能为空");
@@ -433,7 +433,7 @@ public class WxRentContractController extends WxContractBaseController {
public ResultData setContractYearsSalesConfirm(@RequestBody WxRentContract wxRentContract) { public ResultData setContractYearsSalesConfirm(@RequestBody WxRentContract wxRentContract) {
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId());
if (null == rentContract) { if (null == rentContract) {
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同");
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到合同");
} }
rentContract.setYearsBegin(wxRentContract.getYearsBegin()); rentContract.setYearsBegin(wxRentContract.getYearsBegin());
rentContract.setYearsEnd(wxRentContract.getYearsEnd()); rentContract.setYearsEnd(wxRentContract.getYearsEnd());
@@ -450,7 +450,7 @@ public class WxRentContractController extends WxContractBaseController {
public ResultData calcuteYearsRevenueRentUp(@RequestBody WxRentContract wxRentContract) { public ResultData calcuteYearsRevenueRentUp(@RequestBody WxRentContract wxRentContract) {
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId());
if (null == rentContract) { if (null == rentContract) {
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同");
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到合同");
} }
rentContract.setYearsBegin(wxRentContract.getYearsBegin()); rentContract.setYearsBegin(wxRentContract.getYearsBegin());
rentContract.setYearsEnd(wxRentContract.getYearsEnd()); rentContract.setYearsEnd(wxRentContract.getYearsEnd());


+ 1
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Просмотреть файл

@@ -434,7 +434,7 @@
</update> </update>
<select id="getReceivePaySum" parameterType="com.iformall.domain.po.WxAllBill" resultType="DECIMAL"> <select id="getReceivePaySum" parameterType="com.iformall.domain.po.WxAllBill" resultType="DECIMAL">
select sum(CAST(ifnull(receive_pay,'0') AS DECIMAL(20,2))
select sum(CAST(ifnull(receive_pay,'0'))) AS DECIMAL(20,2))
from wx_all_bill from wx_all_bill
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
</select> </select>


Загрузка…
Отмена
Сохранить