Commit 98a1665d authored by wujipeng's avatar wujipeng
Browse files

查询一级合同下的合同列表

parent 0342febd
package com.ruzhoukj.sms.controller; package com.ruzhoukj.sms.controller;
import com.ruzhoukj.sms.common.PageResponse; import com.ruzhoukj.sms.common.PageResponse;
import com.ruzhoukj.sms.common.Result;
import com.ruzhoukj.sms.pojo.dto.ContractDTO; import com.ruzhoukj.sms.pojo.dto.ContractDTO;
import com.ruzhoukj.sms.pojo.vo.ContractVO; import com.ruzhoukj.sms.pojo.vo.ContractVO;
import com.ruzhoukj.sms.service.ContractService; import com.ruzhoukj.sms.service.ContractService;
import org.springframework.web.bind.annotation.PostMapping; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
...@@ -24,11 +23,19 @@ public class ContractController { ...@@ -24,11 +23,19 @@ public class ContractController {
@Resource @Resource
private ContractService contractService; private ContractService contractService;
@ApiOperation(value = "分页查询一级合同")
@PostMapping("/page") @PostMapping("/page")
public PageResponse<List<ContractVO>> page(@RequestBody ContractDTO contractDTO) { public PageResponse<List<ContractVO>> page(@RequestBody ContractDTO contractDTO) {
List<ContractVO> contractList = contractService.pageContract(contractDTO); List<ContractVO> contractList = contractService.pageContract(contractDTO);
return PageResponse.success(contractList.size(), contractList); return PageResponse.success(contractList.size(), contractList);
} }
@ApiOperation(value = "查询一级合同下的合同列表")
@PostMapping("/list/{homId}")
public Result listSecondLevel(@PathVariable String homId) {
List<ContractVO> contractList = contractService.listSecondLevel(homId);
return Result.success(contractList);
}
} }
...@@ -5,6 +5,7 @@ import com.ruzhoukj.sms.entity.ContractEntity; ...@@ -5,6 +5,7 @@ import com.ruzhoukj.sms.entity.ContractEntity;
import com.ruzhoukj.sms.pojo.dto.ContractDTO; import com.ruzhoukj.sms.pojo.dto.ContractDTO;
import com.ruzhoukj.sms.pojo.vo.ContractVO; import com.ruzhoukj.sms.pojo.vo.ContractVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -24,4 +25,12 @@ public interface ContractDao extends BaseMapper<ContractEntity> { ...@@ -24,4 +25,12 @@ public interface ContractDao extends BaseMapper<ContractEntity> {
* @return List<ContractVO> * @return List<ContractVO>
*/ */
List<ContractVO> pageContract(ContractDTO contractDTO); List<ContractVO> pageContract(ContractDTO contractDTO);
/**
* 查询一级合同下的合同列表
*
* @param homId homId
* @return List<ContractVO>
*/
List<ContractVO> listSecondLevel(@Param("homId") String homId);
} }
...@@ -15,10 +15,18 @@ import java.util.List; ...@@ -15,10 +15,18 @@ import java.util.List;
public interface ContractService extends IService<ContractEntity> { public interface ContractService extends IService<ContractEntity> {
/** /**
* 分页查询合同信息 * 分页查询一级合同信息
* *
* @param contractDTO contractDTO * @param contractDTO contractDTO
* @return List<ContractVO> * @return List<ContractVO>
*/ */
List<ContractVO> pageContract(ContractDTO contractDTO); List<ContractVO> pageContract(ContractDTO contractDTO);
/**
* 查询一级合同下的合同列表
*
* @param homId homId
* @return List<ContractVO>
*/
List<ContractVO> listSecondLevel(String homId);
} }
...@@ -33,4 +33,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractDao, ContractEntity ...@@ -33,4 +33,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractDao, ContractEntity
} }
return contractList; return contractList;
} }
@Override
public List<ContractVO> listSecondLevel(String homId) {
return baseMapper.listSecondLevel(homId);
}
} }
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<select id="pageContract" resultType="com.ruzhoukj.sms.pojo.vo.ContractVO"> <select id="pageContract" resultType="com.ruzhoukj.sms.pojo.vo.ContractVO">
select id, select id,
parent_id as parentId, parent_id as parentId,
hom_id as homId,
code, code,
client, client,
begin_time as beginTime, begin_time as beginTime,
...@@ -20,4 +21,25 @@ ...@@ -20,4 +21,25 @@
begin_time begin_time
desc desc
</select> </select>
<select id="listSecondLevel" resultType="com.ruzhoukj.sms.pojo.vo.ContractVO">
select id,
parent_id as parentId,
hom_id as homId,
code,
client,
begin_time as beginTime,
end_time as endTime,
renew_contract as renewContract,
renew_contract_code as renewContractCode
from
contract
where
parent_id
is not null
and
hom_id = #{homId}
order by
begin_time
asc
</select>
</mapper> </mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment