Commit 0342febd authored by wujipeng's avatar wujipeng
Browse files

合同列表分页查询

parent acec1570
...@@ -106,6 +106,12 @@ ...@@ -106,6 +106,12 @@
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.83</version> <!-- 请检查最新版本 --> <version>1.2.83</version> <!-- 请检查最新版本 -->
</dependency> </dependency>
<!-- pageHelper 插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.3.0</version>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
......
package com.ruzhoukj.sms.common;
import lombok.Data;
import org.springframework.http.HttpStatus;
/**
* @author 邬吉朋
*/
@Data
public class PageResponse<T> {
//响应编码
private long code;
//响应消息
private String msg;
//总条数
private int total;
//数据列表
private T data;
// 构造函数
public PageResponse(long code, String msg, int total, T data) {
this.code = code;
this.msg = msg;
this.total = total;
this.data = data;
}
public static <T> PageResponse<T> success(Integer total, T data) {
return new PageResponse<>(HttpStatus.OK.value(), HttpStatus.OK.getReasonPhrase(), total, data);
}
}
package com.ruzhoukj.sms.controller; package com.ruzhoukj.sms.controller;
import com.ruzhoukj.sms.common.PageResponse;
import com.ruzhoukj.sms.pojo.dto.ContractDTO;
import com.ruzhoukj.sms.pojo.vo.ContractVO;
import com.ruzhoukj.sms.service.ContractService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/** /**
* @author wujipeng * @author wujipeng
* @version 1.0 * @version 1.0
* @create 2024-09-02 16:47 * @create 2024-09-02 16:47
*/ */
@RestController @RestController
@RequestMapping("contract") @RequestMapping("/contract")
public class ContractController { public class ContractController {
@Resource
private ContractService contractService;
@PostMapping("/page")
public PageResponse<List<ContractVO>> page(@RequestBody ContractDTO contractDTO) {
List<ContractVO> contractList = contractService.pageContract(contractDTO);
return PageResponse.success(contractList.size(), contractList);
}
} }
...@@ -2,8 +2,12 @@ package com.ruzhoukj.sms.dao; ...@@ -2,8 +2,12 @@ package com.ruzhoukj.sms.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.sms.entity.ContractEntity; import com.ruzhoukj.sms.entity.ContractEntity;
import com.ruzhoukj.sms.pojo.dto.ContractDTO;
import com.ruzhoukj.sms.pojo.vo.ContractVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* @author wujipeng * @author wujipeng
* @version 1.0 * @version 1.0
...@@ -12,4 +16,12 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -12,4 +16,12 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface ContractDao extends BaseMapper<ContractEntity> { public interface ContractDao extends BaseMapper<ContractEntity> {
/**
* 分页查询合同信息
*
* @param contractDTO contractDTO
* @return List<ContractVO>
*/
List<ContractVO> pageContract(ContractDTO contractDTO);
} }
...@@ -2,6 +2,7 @@ package com.ruzhoukj.sms.entity; ...@@ -2,6 +2,7 @@ package com.ruzhoukj.sms.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -14,6 +15,7 @@ import java.util.Date; ...@@ -14,6 +15,7 @@ import java.util.Date;
*/ */
@Data @Data
@TableName("contract") @TableName("contract")
@JsonInclude(JsonInclude.Include.NON_NULL)
public class ContractEntity { public class ContractEntity {
private String id; private String id;
...@@ -21,6 +23,10 @@ public class ContractEntity { ...@@ -21,6 +23,10 @@ public class ContractEntity {
@TableField("parent_id") @TableField("parent_id")
private String parentId; private String parentId;
@ApiModelProperty(value = "同组id")
@TableField("hom_id")
private String homId;
@ApiModelProperty(value = "合同编号") @ApiModelProperty(value = "合同编号")
private String code; private String code;
...@@ -33,7 +39,7 @@ public class ContractEntity { ...@@ -33,7 +39,7 @@ public class ContractEntity {
@ApiModelProperty(value = "到期时间") @ApiModelProperty(value = "到期时间")
@TableField("end_time") @TableField("end_time")
private String endTime; private Date endTime;
@ApiModelProperty(value = "是否续约") @ApiModelProperty(value = "是否续约")
@TableField("renew_contract") @TableField("renew_contract")
......
package com.ruzhoukj.sms.pojo.dto;
import com.ruzhoukj.sms.entity.ContractEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @author wujipeng
* @version 1.0
* @create 2024-09-02 17:00
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ContractDTO extends ContractEntity {
@ApiModelProperty(value = "页码")
private Integer pageNum;
@ApiModelProperty(value = "每页条数")
private Integer pageSize;
}
package com.ruzhoukj.sms.pojo.vo;
import com.ruzhoukj.sms.entity.ContractEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @author wujipeng
* @version 1.0
* @create 2024-09-02 17:00
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ContractVO extends ContractEntity {
}
...@@ -2,6 +2,10 @@ package com.ruzhoukj.sms.service; ...@@ -2,6 +2,10 @@ package com.ruzhoukj.sms.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.sms.entity.ContractEntity; import com.ruzhoukj.sms.entity.ContractEntity;
import com.ruzhoukj.sms.pojo.dto.ContractDTO;
import com.ruzhoukj.sms.pojo.vo.ContractVO;
import java.util.List;
/** /**
* @author wujipeng * @author wujipeng
...@@ -9,4 +13,12 @@ import com.ruzhoukj.sms.entity.ContractEntity; ...@@ -9,4 +13,12 @@ import com.ruzhoukj.sms.entity.ContractEntity;
* @create 2024-09-02 16:45 * @create 2024-09-02 16:45
*/ */
public interface ContractService extends IService<ContractEntity> { public interface ContractService extends IService<ContractEntity> {
/**
* 分页查询合同信息
*
* @param contractDTO contractDTO
* @return List<ContractVO>
*/
List<ContractVO> pageContract(ContractDTO contractDTO);
} }
package com.ruzhoukj.sms.service.impl; package com.ruzhoukj.sms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.page.PageMethod;
import com.ruzhoukj.sms.dao.ContractDao; import com.ruzhoukj.sms.dao.ContractDao;
import com.ruzhoukj.sms.entity.ContractEntity; import com.ruzhoukj.sms.entity.ContractEntity;
import com.ruzhoukj.sms.pojo.dto.ContractDTO;
import com.ruzhoukj.sms.pojo.vo.ContractVO;
import com.ruzhoukj.sms.service.ContractService; import com.ruzhoukj.sms.service.ContractService;
import com.ruzhoukj.sms.util.DateUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/** /**
* @author wujipeng * @author wujipeng
* @version 1.0 * @version 1.0
...@@ -13,4 +20,17 @@ import org.springframework.stereotype.Service; ...@@ -13,4 +20,17 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class ContractServiceImpl extends ServiceImpl<ContractDao, ContractEntity> implements ContractService { public class ContractServiceImpl extends ServiceImpl<ContractDao, ContractEntity> implements ContractService {
@Override
public List<ContractVO> pageContract(ContractDTO contractDTO) {
PageMethod.startPage(contractDTO.getPageNum(), contractDTO.getPageSize());
List<ContractVO> contractList = baseMapper.pageContract(contractDTO);
//计算剩余多少天
for (ContractVO contractVO : contractList) {
Date beginTime = contractVO.getBeginTime();
Date endTime = contractVO.getEndTime();
int differ = (int) DateUtils.daysBetween(beginTime, endTime);
contractVO.setRemainingDays(differ);
}
return contractList;
}
} }
...@@ -3,4 +3,21 @@ ...@@ -3,4 +3,21 @@
<mapper namespace="com.ruzhoukj.sms.dao.ContractDao"> <mapper namespace="com.ruzhoukj.sms.dao.ContractDao">
<select id="pageContract" resultType="com.ruzhoukj.sms.pojo.vo.ContractVO">
select id,
parent_id as parentId,
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 null
order by
begin_time
desc
</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