ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java
@@ -91,7 +91,7 @@ @PostMapping(value = "/add") public R<Boolean> add(@Validated @RequestBody TCheckAcceptRecord dto) { // 添加验收记录 checkAcceptRecordService.save(dto); checkAcceptRecordService.updateById(dto); // TODO 生成结算帐单
@@ -71,6 +71,7 @@ private TBillService billService; @Autowired private TCheckAcceptRecordService checkAcceptRecordService; @ApiOperation(value = "测试生成账单") @PostMapping(value = "/testBill") public R testBill(String id) { @@ -210,6 +211,7 @@ @PreAuthorize("@ss.hasPermi('system:contract:terminate')") public R terminateContract(@RequestBody TerminateContractDTO dto) { contractService.terminateContract(dto); // 生成房屋验收记录 待验收 return R.ok(); } @ApiOperation(value = "根据合同id查看验收记录") ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -15,11 +15,10 @@ import com.ruoyi.system.model.*; import com.ruoyi.system.query.TBannerQuery; import com.ruoyi.system.query.TBillQuery; import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery; import com.ruoyi.system.query.TCheckAcceptRecordQuery; import com.ruoyi.system.service.*; import com.ruoyi.system.vo.MyHouseVO; import com.ruoyi.system.vo.MyToDoVO; import com.ruoyi.system.vo.PayListVO; import com.ruoyi.system.vo.TBillVO; import com.ruoyi.system.vo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jdk.nashorn.internal.parser.Token; @@ -27,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -57,7 +57,8 @@ @Autowired private THouseService houseService; @Autowired private TCheckAcceptRecordService checkAcceptRecordService; /** * 获取轮播图管理列表 */ @@ -160,6 +161,39 @@ return R.ok(myToDoVO); } /** * 获取验收记录管理列表 */ @ApiOperation(value = "管理员-房屋验收单列表") @PostMapping(value = "/admin/houseCheck") public R<PageInfo<TCheckAcceptRecordVO>> houseCheck(@RequestBody TCheckAcceptRecordAppletQuery query) { return R.ok(checkAcceptRecordService.pageListApplet(query)); } /** * 查看验收记录详情 */ @ApiOperation(value = "管理员-查看验收记录详情") @GetMapping(value = "/getDetailById") public R<TCheckAcceptRecordVO> getDetailById(@RequestParam String id) { TCheckAcceptRecord checkAcceptRecord = checkAcceptRecordService.getById(id); checkAcceptRecord.setCleanSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,checkAcceptRecord.getCleanSituation())); checkAcceptRecord.setOverallSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,checkAcceptRecord.getOverallSituation())); checkAcceptRecord.setDeviceSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,checkAcceptRecord.getDeviceSituation())); checkAcceptRecord.setFurnitureSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,checkAcceptRecord.getFurnitureSituation())); TCheckAcceptRecordVO checkAcceptRecordVO = new TCheckAcceptRecordVO(); BeanUtils.copyProperties(checkAcceptRecord, checkAcceptRecordVO); // 查询合同信息 checkAcceptRecordVO.setContract(contractService.getById(checkAcceptRecord.getContractId())); // 查询房屋信息 checkAcceptRecordVO.setHouse(houseService.getById(checkAcceptRecord.getHouseId())); return R.ok(checkAcceptRecordVO); } @ApiOperation(value = "管理员-新增验收") @GetMapping(value = "/addRecord") public R<TCheckAcceptRecordVO> getDetailById(@Validated @RequestBody TCheckAcceptRecord dto) { return R.ok(); } }
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TCheckAcceptRecord; import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery; import com.ruoyi.system.query.TCheckAcceptRecordQuery; import com.ruoyi.system.vo.TCheckAcceptRecordVO; import org.apache.ibatis.annotations.Param; @@ -26,6 +27,7 @@ * @return */ List<TCheckAcceptRecordVO> pageList(@Param("query") TCheckAcceptRecordQuery query, @Param("pageInfo")PageInfo<TCheckAcceptRecordVO> pageInfo); List<TCheckAcceptRecordVO> pageListApplet(@Param("query") TCheckAcceptRecordAppletQuery query, @Param("pageInfo")PageInfo<TCheckAcceptRecordVO> pageInfo); } ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java
@@ -94,5 +94,8 @@ @ApiModelProperty(value = "验收状态 待验收 已验收") @TableField("status") private String status; @ApiModelProperty(value = "验收单号") @TableField("code") private String code; } ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -44,12 +44,12 @@ private String contractName; @ApiModelProperty(value = "开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @TableField("start_time") private LocalDateTime startTime; @ApiModelProperty(value = "结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @TableField("end_time") private LocalDateTime endTime; @ApiModelProperty(value = "开始计费时间") ruoyi-system/src/main/java/com/ruoyi/system/query/TCheckAcceptRecordAppletQuery.java
New file @@ -0,0 +1,18 @@ package com.ruoyi.system.query; import com.ruoyi.common.core.domain.model.TimeRangeQueryBody; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "小程序管理员-验收记录查询对象query") public class TCheckAcceptRecordAppletQuery extends TimeRangeQueryBody { @ApiModelProperty(value = "房屋名称或地址") private String houseNameOrAddress; @ApiModelProperty(value = "状态 不传为全部 1待验收 2已验收") private Integer status; } ruoyi-system/src/main/java/com/ruoyi/system/service/TCheckAcceptRecordService.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TCheckAcceptRecord; import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery; import com.ruoyi.system.query.TCheckAcceptRecordQuery; import com.ruoyi.system.vo.TCheckAcceptRecordVO; @@ -22,4 +23,5 @@ * @return */ PageInfo<TCheckAcceptRecordVO> pageList(TCheckAcceptRecordQuery query); PageInfo<TCheckAcceptRecordVO> pageListApplet(TCheckAcceptRecordAppletQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCheckAcceptRecordServiceImpl.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.DictUtils; import com.ruoyi.system.mapper.TCheckAcceptRecordMapper; import com.ruoyi.system.model.TCheckAcceptRecord; import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery; import com.ruoyi.system.query.TCheckAcceptRecordQuery; import com.ruoyi.system.service.TCheckAcceptRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -38,4 +39,18 @@ pageInfo.setRecords(list); return pageInfo; } @Override public PageInfo<TCheckAcceptRecordVO> pageListApplet(TCheckAcceptRecordAppletQuery query) { PageInfo<TCheckAcceptRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TCheckAcceptRecordVO> list = this.baseMapper.pageListApplet(query,pageInfo); list.forEach(item -> { item.setCleanSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,item.getCleanSituation())); item.setOverallSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,item.getOverallSituation())); item.setDeviceSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,item.getDeviceSituation())); item.setFurnitureSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,item.getFurnitureSituation())); }); pageInfo.setRecords(list); return pageInfo; } } ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
@@ -76,5 +76,44 @@ </where> ORDER BY t.create_time DESC </select> <select id="pageListApplet" resultType="com.ruoyi.system.vo.TCheckAcceptRecordVO"> select t.id, t.contract_id, t.house_id, t.check_time, t.lease_reason, t.check_person, t.accompany_person, t.overall_situation, t.furniture_situation, t.device_situation, t.clean_situation, t.other_problem, t.pictures, t.check_result, t.check_money, t.create_time, t.update_time, t.create_by, t.update_by, t.disabled, c.contract_number, h.house_name from t_check_accept_record t left join t_contract c on t.contract_id = c.id left join t_house h on t.house_id = h.id <where> <if test="query.status != null"> AND t.status = #{query.status} </if> <if test="query.houseNameOrAddress != null and query.houseNameOrAddress != ''"> AND (h.house_name LIKE concat('%', #{query.houseNameOrAddress}, '%') or h.house_address LIKE concat('%', #{query.houseNameOrAddress}, '%')) </if> AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> ORDER BY t.create_time DESC </select> </mapper>
