Просмотр исходного кода

[BUG][ID1000886][日常费用账单和其他费用账单新增选择商铺时报500和404]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
d1fe43b1e2
5 измененных файлов: 10 добавлений и 8 удалений
  1. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  5. +3
    -2
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

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

@@ -115,9 +115,10 @@ public class WxRentContractController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData getRentContractList(Integer pageNum, Integer pageSize) {
public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList");
return new ResultData(wxRentContractService.getRentContractList(getTenantId(),pageNum, pageSize));
wxRentContract.setTenantId(getTenantId());
return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize));
}

@GetMapping("exportContract")


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java Просмотреть файл

@@ -33,7 +33,7 @@ public interface WxRentContractMapper extends CommonMapper<WxRentContract, Strin

void updateRentInvalidStatus(WxRentContract wxRentContract);

List<WxRentContract> getRentContractList(String tenantId);
List<WxRentContract> getRentContractList(WxRentContract tenantId);

void updateStatusForUnsign(WxRentContract wxRentContract);



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java Просмотреть файл

@@ -57,7 +57,7 @@ public interface WxRentContractService {

ResultData updateMerchant(WxRentContract wxRentContract);

Object getRentContractList(String tenantId, Integer pageNum, Integer pageSize);
Object getRentContractList(WxRentContract rentContract, Integer pageNum, Integer pageSize);

void exportContract(HttpServletRequest request, HttpServletResponse response, String tenantId, Long id);



+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -610,8 +610,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}

@Override
public PageInfo<WxRentContract> getRentContractList(String tenantId, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(tenantId));
public PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(rentContract));
}

public Map<String, Object> updateStatus(WxRentContract record) {


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

@@ -174,13 +174,14 @@
)s) and status=1 and status!=7 and tenant_id=#{tenantId}
</update>
<select id="getRentContractList" parameterType="String" resultType="com.iformall.domain.po.WxRentContract">
<select id="getRentContractList" parameterType="com.iformall.domain.po.WxRentContract"
resultType="com.iformall.domain.po.WxRentContract">
select rc.*,s.shop_number,b.building_name building, f.floor_name floor from wx_rent_contract rc
left join wx_shop s on rc.shop_id=s.id
left join wx_mall_building b on s.building=b.id
left join wx_mall_floor f on s.floor=f.id
where rc.status not in(1,5,6,7) and rc.tenant_id=#{tenantId}
<if test=" null != rentShopType ">and rent_shop_type = #{rentShopType}</if>
<if test=" null != rentShopType ">and rc.rent_shop_type = #{rentShopType}</if>
order by id desc
</select>


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