diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 79e1e2368..57562e913 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.Map; /** @@ -112,7 +111,8 @@ public class WxPropertyContractController extends BaseController { WxBillProperty wxBillProperty = new WxBillProperty(); wxBillProperty.setTenantId(super.getTenantId()); wxBillPropertyService.updateBillStatus(wxBillProperty); - return wxPropertyContractService.getById(id); + Map data = wxPropertyContractService.getById(id); + return new ResultData(data); } @RequestMapping("/download") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index ea66724f1..cebb7d41e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -180,7 +180,8 @@ public class WxRentContractController extends BaseController { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setTenantId(getTenantId()); wxBillRentService.updateBillStatus(wxBillRent); - return wxRentContractService.getById(id); + Map data = wxRentContractService.getById(id); + return new ResultData(data); } @RequestMapping("/download") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 24e40337f..1ee2fe6fd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -8,6 +8,7 @@ import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.service.WxRentContractService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -42,6 +43,15 @@ public class WxRentPropertyContractController extends BaseController { return new ResultData(page); } + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "租赁物业合同-根据id查询接口") + public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::findById"); + return wxRentContractService.getContractInfo(id); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 797c654e5..2dcb846d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -32,7 +32,7 @@ public interface WxPropertyContractService { * @param id * @return */ - ResultData getById(Long id); + Map getById(Long id); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 31403379f..d40a744ad 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -35,7 +35,7 @@ public interface WxRentContractService { * @param id * @return */ - ResultData getById(Long id); + Map getById(Long id); /** * 保存或更新实体 @@ -90,4 +90,6 @@ public interface WxRentContractService { PageInfo listContractVo(WxRentPropertyContractVo wxRentPropertyContractVo, Integer pageNum, Integer pageSize); + ResultData getContractInfo(Long id); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 59a303c6e..355cf8353 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -83,12 +83,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } @Override - public ResultData getById(Long id) { + public Map getById(Long id) { Map result = new HashMap<>(); WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(id); if (wxPropertyContract == null) { - return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); + throw new MallinkException(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); } //init dateDiff @@ -195,7 +195,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService List resultList = wxBillPropertyMapper.findList(wxBillRent); result.put("previewBillRentList",resultList); - return new ResultData(Result.SUCCESS, "查询成功", result); + return result; } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 478dca706..094abb07e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -14,10 +14,7 @@ import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; -import com.iformall.service.WxFlowRecordService; -import com.iformall.service.WxFlowService; -import com.iformall.service.WxMerchantService; -import com.iformall.service.WxRentContractService; +import com.iformall.service.*; import com.iformall.utils.DateUtils; import com.iformall.utils.DownFileUtil; import com.iformall.utils.PriceUtil; @@ -105,6 +102,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Autowired WxFlowRecordMapper wxFlowRecordMapper; + @Autowired + WxPropertyContractService wxPropertyContractService; + @Override public Map listAsPage(WxRentContract record, Integer pageIndex, Integer pageSize) { Object rentContractStatusInfo = getRentContractStatusInfo(record); @@ -118,11 +118,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public ResultData getById(Long id) { + public Map getById(Long id) { Map result = new HashMap<>(); WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); if (wxRentContract == null) { - return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); + throw new MallinkException(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); } //init dateDiff @@ -242,7 +242,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { List resultList = wxBillRentMapper.findList(wxBillRent); result.put("previewBillRentList",resultList); - return new ResultData(Result.SUCCESS, "查询成功", result); + return result; } @Transactional(rollbackFor = {Exception.class}) @@ -1841,6 +1841,26 @@ public class WxRentContractServiceImpl implements WxRentContractService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.listContractVo(record)); } + @Override + public ResultData getContractInfo(Long id) { + Map data = new HashMap<>(); + Map rent = getById(id); + data.put("rent", rent); + WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); + wxPropertyContractQuery.setRentContractId(id); + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.select(wxPropertyContractQuery).parallelStream() + .filter(p -> p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode()) || + p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || + p.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())) + .findFirst().orElseGet(null); + data.put("property", wxPropertyContract); + if (wxPropertyContract != null) { + Map property = wxPropertyContractService.getById(wxPropertyContract.getRentContractId()); + data.put("property", property); + } + return new ResultData(data); + } + public static double getMonthNeedPay(Double price,Date start,Date end){ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 8216ffa60..ba1b8bff5 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -317,8 +317,8 @@