Commit 0cb3dc3c authored by wujipeng's avatar wujipeng
Browse files

优化

parent 0ff608ed
...@@ -29,7 +29,8 @@ public class ContractController { ...@@ -29,7 +29,8 @@ public class ContractController {
@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); int count = contractService.count();
return PageResponse.success(count, contractList);
} }
@ApiOperation(value = "查询一级合同下的合同列表") @ApiOperation(value = "查询一级合同下的合同列表")
...@@ -58,7 +59,7 @@ public class ContractController { ...@@ -58,7 +59,7 @@ public class ContractController {
} }
@ApiOperation(value = "详情") @ApiOperation(value = "详情")
@GetMapping ("/{id}") @GetMapping("/{id}")
public Result getContract(@PathVariable String id) { public Result getContract(@PathVariable String id) {
return Result.success(contractService.getContract(id)); return Result.success(contractService.getContract(id));
} }
......
...@@ -29,7 +29,8 @@ public class SSLController { ...@@ -29,7 +29,8 @@ public class SSLController {
@PostMapping("/page") @PostMapping("/page")
public PageResponse<List<SSLVO>> page(@RequestBody SSLDTO ssldto) { public PageResponse<List<SSLVO>> page(@RequestBody SSLDTO ssldto) {
List<SSLVO> list = sslService.pageSSL(ssldto); List<SSLVO> list = sslService.pageSSL(ssldto);
return PageResponse.success(list.size(), list); int count = sslService.count();
return PageResponse.success(count, list);
} }
@ApiOperation("新增或修改") @ApiOperation("新增或修改")
......
...@@ -2,6 +2,7 @@ package com.ruzhoukj.sms.controller; ...@@ -2,6 +2,7 @@ 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.common.Result;
import com.ruzhoukj.sms.entity.ScheduleEntity;
import com.ruzhoukj.sms.pojo.dto.ScheduleDTO; import com.ruzhoukj.sms.pojo.dto.ScheduleDTO;
import com.ruzhoukj.sms.pojo.vo.ScheduleVO; import com.ruzhoukj.sms.pojo.vo.ScheduleVO;
import com.ruzhoukj.sms.service.ScheduleService; import com.ruzhoukj.sms.service.ScheduleService;
...@@ -29,7 +30,8 @@ public class ScheduleController { ...@@ -29,7 +30,8 @@ public class ScheduleController {
@PostMapping("/page") @PostMapping("/page")
public PageResponse<List<ScheduleVO>> page(@RequestBody ScheduleDTO scheduleDTO) { public PageResponse<List<ScheduleVO>> page(@RequestBody ScheduleDTO scheduleDTO) {
List<ScheduleVO> list = scheduleService.pageSchedule(scheduleDTO); List<ScheduleVO> list = scheduleService.pageSchedule(scheduleDTO);
return PageResponse.success(list.size(), list); int count = scheduleService.count();
return PageResponse.success(count, list);
} }
@ApiOperation(value = "新增或修改") @ApiOperation(value = "新增或修改")
......
...@@ -15,7 +15,7 @@ import java.util.Date; ...@@ -15,7 +15,7 @@ import java.util.Date;
* @create 2024-08-16 13:42 * @create 2024-08-16 13:42
*/ */
@Data @Data
@TableName(value = "ssl") @TableName(value = "ssl_certificate")
public class SSLEntity { public class SSLEntity {
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
select id, select id,
name, name,
time time
from `ssl` from ssl_certificate
where date_format(time, '%Y%M%d') where date_format(time, '%Y%M%d')
between between
date_format(#{startDate}, '%Y%M%d') date_format(#{startDate}, '%Y%M%d')
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
select id, select id,
name, name,
time time
from `ssl` from ssl_certificate
where date_format(time, '%Y%M%d') where date_format(time, '%Y%M%d')
between between
date_format(now(), '%Y%M%d') date_format(now(), '%Y%M%d')
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
select id, select id,
name, name,
time time
from `ssl` from ssl_certificate
order by time asc order by time asc
</select> </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