xiangpei
2024-08-07 45d5b8bdbe5407b88cc324fdbcbcbaa51b7ab64c
点位时间优化
3个文件已修改
1 文件已重命名
29 ■■■■■ 已修改文件
pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml
@@ -256,7 +256,7 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
            <version>${spring-boot.version}</version>
            <version>4.1.3</version>
        </dependency>
ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java
File was renamed from ycl-server/src/main/java/com/ycl/platform/controller/TContractController.java
@@ -32,10 +32,17 @@
@RestController
@RequestMapping("/system/contract")
@AllArgsConstructor
public class TContractController extends BaseController {
public class ContractController extends BaseController {
    private final ITContractService tContractService;
    @PreAuthorize("@ss.hasPermi('system:contract:time')")
    @GetMapping("/time/{unitId}")
    @ApiOperation("获取该单位的合同时间范围")
    public Result timeRange(@PathVariable("unitId") Integer unitId) {
        return tContractService.timeRange(unitId);
    }
    @PreAuthorize("@ss.hasPermi('system:contract:list')")
    @GetMapping("/list")
    public Result page(ContractQuery query) {
ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java
@@ -53,4 +53,12 @@
     * @return 数据
     */
    List<TContract> selectUsingContract();
    /**
     * 获取运维单位的合同时间范围
     *
     * @param unitId
     * @return
     */
    Result timeRange(Integer unitId);
}
ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
@@ -216,4 +216,14 @@
                .ge(TContract::getEndTime, DateUtils.getDate())
                .list();
    }
    @Override
    public Result timeRange(Integer unitId) {
        List<TContract> unitContractList = new LambdaQueryChainWrapper<>(baseMapper)
                .select(TContract::getId, TContract::getName, TContract::getStartTime, TContract::getEndTime)
                .eq(TContract::getUnitId, unitId)
                .ge(TContract::getEndTime, new Date())
                .list();
        return Result.ok().data(unitContractList);
    }
}