Explorar el Código

fix

release_toaliyun_real
winter hace 1 año
padre
commit
b25e61c5b4
Se han modificado 3 ficheros con 7 adiciones y 4 borrados
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java
  3. +1
    -0
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Ver fichero

@@ -481,7 +481,6 @@ public class WxRentContractController extends WxContractBaseController {
@ApiImplicitParams({}) @ApiImplicitParams({})
@SystemControllerLog(description = "租金合同-合同生效") @SystemControllerLog(description = "租金合同-合同生效")
public ResultData effective(@RequestBody WxRentContract wxRentContract) { public ResultData effective(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList");
WxRentContract contract = wxRentContractService.getSimpleDeatil(wxRentContract.getId()); WxRentContract contract = wxRentContractService.getSimpleDeatil(wxRentContract.getId());
if (null == contract) { if (null == contract) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"租赁合同不存在"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"租赁合同不存在");
@@ -651,10 +650,11 @@ public class WxRentContractController extends WxContractBaseController {
statuss.add(EnumRentContractStatus.OUT_DATE.getCode()); statuss.add(EnumRentContractStatus.OUT_DATE.getCode());
wxRentContract.setStatuss(statuss); wxRentContract.setStatuss(statuss);
} }
if (null == wxRentContract.getIsPrivateMerchant()) {
wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode());
}
} }
if (null == wxRentContract.getIsPrivateMerchant()) {
wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode());
}
wxRentContract.setSortColumns(SortField.Createtime_DESC); wxRentContract.setSortColumns(SortField.Createtime_DESC);
return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize));
} }


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java Ver fichero

@@ -111,5 +111,7 @@ public class WxRentPropertyContractVo extends TenantEntity {
private List<Long> merchantIds; private List<Long> merchantIds;
private String queryShopNumber; private String queryShopNumber;
private Integer isPrivateMerchant;
} }



+ 1
- 0
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Ver fichero

@@ -399,6 +399,7 @@
<if test=" null != contractNumber and '' != contractNumber"> <if test=" null != contractNumber and '' != contractNumber">
and rc.`contract_number` = #{contractNumber} and rc.`contract_number` = #{contractNumber}
</if> </if>
<if test=" null != isPrivateMerchant and '' != isPrivateMerchant">and rc.`is_private_merchant` = #{isPrivateMerchant}</if>
<if test=" null != rentId and '' != rentId"> <if test=" null != rentId and '' != rentId">
and rc.`id` = #{rentId} and rc.`id` = #{rentId}
</if> </if>


Cargando…
Cancelar
Guardar