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

[周期账单][修改][查询问题]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
848de99613
8 измененных файлов: 18 добавлений и 17 удалений
  1. +5
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java
  2. +5
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxBillRentService.java
  5. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  6. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  7. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  8. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

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

@@ -84,14 +84,14 @@ public class WxBillPropertyController extends BaseController {
return new ResultData(Result.SUCCESS, "查询成功", wxBillPropertyService.detail(id));
}

@GetMapping("/findByMerchantId")
@GetMapping("/findByPropertyContractId")
@ApiImplicitParams({
@ApiImplicitParam(name = "merchantId", value = "merchantId", dataType = "Long", paramType = "query", required = true),
@ApiImplicitParam(name = "propertyContractId", value = "merchantId", dataType = "Long", paramType = "query", required = true),
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData findByMerchantId(Long merchantId, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillPropertyController::findByMerchantId");
final PageInfo<Map<String, Object>> page = wxBillPropertyService.findByMerchantId(merchantId, getTenantId(), pageNum, pageSize);
public ResultData findByPropertyContractId(Long propertyContractId, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillPropertyController::findByPropertyContractId");
final PageInfo<Map<String, Object>> page = wxBillPropertyService.findByPropertyContractId(propertyContractId, getTenantId(), pageNum, pageSize);
return new ResultData(page);
}
}

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

@@ -68,14 +68,14 @@ public class WxBillRentController extends BaseController {
return new ResultData(Result.SUCCESS, "查询成功", wxBillRentService.getById(id));
}

@GetMapping("/findByMerchantId")
@GetMapping("/findByRentContractId")
@ApiImplicitParams({
@ApiImplicitParam(name = "merchantId", value = "merchantId", dataType = "Long", paramType = "query", required = true),
@ApiImplicitParam(name = "rentContractId", value = "merchantId", dataType = "Long", paramType = "query", required = true),
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData findByMerchantId(Long merchantId, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillRentController::findByMerchantId");
final PageInfo<Map<String, Object>> page = wxBillRentService.findByMerchantId(merchantId, getTenantId(), pageNum, pageSize);
public ResultData findByRentContractId(Long rentContractId, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillRentController::findByRentContractId");
final PageInfo<Map<String, Object>> page = wxBillRentService.findByRentContractId(rentContractId, getTenantId(), pageNum, pageSize);
return new ResultData(page);
}



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

@@ -47,7 +47,7 @@ public interface WxBillPropertyService {
void deleteById(Long id);


PageInfo<Map<String, Object>> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize);
PageInfo<Map<String, Object>> findByPropertyContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize);

ResultData updatePaid(Long id);



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

@@ -45,7 +45,7 @@ public interface WxBillRentService {
void deleteById(Long id);


PageInfo<Map<String, Object>> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize);
PageInfo<Map<String, Object>> findByRentContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize);

ResultData updatePaid(Long id);



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

@@ -149,9 +149,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
}

@Override
public PageInfo<Map<String, Object>> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize) {
public PageInfo<Map<String, Object>> findByPropertyContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize) {
WxBillProperty record = new WxBillProperty();
record.setMerchantId(id);
record.setPropertyContractId(id);
record.setTenantId(tenantId);
record.setSortColumns(WxBillProperty.Field.Id_ASC);
updateBillStatus(record);


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

@@ -149,9 +149,9 @@ public class WxBillRentServiceImpl implements WxBillRentService {
}

@Override
public PageInfo<Map<String, Object>> findByMerchantId(Long id, String tenantId, Integer pageIndex, Integer pageSize) {
public PageInfo<Map<String, Object>> findByRentContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize) {
WxBillRent record = new WxBillRent();
record.setMerchantId(id);
record.setRentContractId(id);
record.setTenantId(tenantId);
record.setSortColumns(WxBillRent.Field.Id_ASC);
updateBillStatus(record);


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

@@ -98,7 +98,7 @@
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime}</if>
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != propertyContractId ">and br.`property_contract_id` = #{propertyContractId}</if>
</where>
<if test=" null != sortColumns">order by br.${sortColumns}</if>
</select>


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

@@ -100,6 +100,7 @@
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime}</if>
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if>
</where>
<if test=" null != sortColumns">order by br.${sortColumns}</if>
</select>


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