ljy121 1 year ago
parent
commit
d31a83413b

+ 11 - 0
zjugis-business/src/main/java/com/zjugis/business/bean/dto/ContractMilestoneDto.java

@@ -0,0 +1,11 @@
+package com.zjugis.business.bean.dto;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/2/27 9:09
+ */
+public class ContractMilestoneDto {
+
+
+}

+ 5 - 6
zjugis-business/src/main/java/com/zjugis/business/flow/contract/controller/FlowContractController.java

@@ -1,9 +1,9 @@
 package com.zjugis.business.flow.contract.controller;
 package com.zjugis.business.flow.contract.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zjugis.business.bean.dto.ProjectDto;
+import com.zjugis.business.bean.dto.ContractMilestoneDto;
 import com.zjugis.business.bean.entity.Contract;
 import com.zjugis.business.bean.entity.Contract;
-import com.zjugis.business.bean.entity.Project;
+import com.zjugis.business.bean.entity.ContractMilestone;
 import com.zjugis.business.flow.contract.service.FlowContractService;
 import com.zjugis.business.flow.contract.service.FlowContractService;
 import com.zjugis.business.service.ContractMilestoneService;
 import com.zjugis.business.service.ContractMilestoneService;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
@@ -65,9 +65,9 @@ public class FlowContractController extends BaseController {
     }
     }
 
 
     @PostMapping("/milestone/page")
     @PostMapping("/milestone/page")
-    public String page(@ParamModel ProjectDto project, long page, long rows) {
-        Page<Project> p = projectService.page(new Page<>(page, rows), project);
-        Grid<Project> grid = new Grid(
+    public String page(@ParamModel ContractMilestoneDto entity, long page, long rows) {
+        Page<ContractMilestone> p = contractMilestoneService.page(new Page<>(page, rows), entity);
+        Grid<ContractMilestone> grid = new Grid(
                 p.getCurrent(),
                 p.getCurrent(),
                 p.getSize(),
                 p.getSize(),
                 p.getTotal(),
                 p.getTotal(),
@@ -78,7 +78,6 @@ public class FlowContractController extends BaseController {
     @GetMapping("/milestone/list")
     @GetMapping("/milestone/list")
     public String selectMilestoneList(String contractId) {
     public String selectMilestoneList(String contractId) {
         HashMap<Object, Object> params = new HashMap<>();
         HashMap<Object, Object> params = new HashMap<>();
-        contractMilestoneService.selectByContractId(contractId);
         return resultPage(params);
         return resultPage(params);
     }
     }
 
 

+ 4 - 0
zjugis-business/src/main/java/com/zjugis/business/service/ContractMilestoneService.java

@@ -1,5 +1,7 @@
 package com.zjugis.business.service;
 package com.zjugis.business.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zjugis.business.bean.dto.ContractMilestoneDto;
 import com.zjugis.business.bean.entity.ContractMilestone;
 import com.zjugis.business.bean.entity.ContractMilestone;
 
 
 import java.util.List;
 import java.util.List;
@@ -48,5 +50,7 @@ public interface ContractMilestoneService {
     int deleteByIdList(List<String> ids);
     int deleteByIdList(List<String> ids);
 
 
     List<ContractMilestone> selectByContractId(String contractId);
     List<ContractMilestone> selectByContractId(String contractId);
+
+    Page<ContractMilestone> page(Page<Object> objectPage, ContractMilestoneDto contractMilestoneDto);
 }
 }
 
 

+ 12 - 0
zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractMilestoneServiceImpl.java

@@ -1,6 +1,8 @@
 package com.zjugis.business.service.impl;
 package com.zjugis.business.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zjugis.business.bean.dto.ContractMilestoneDto;
 import com.zjugis.business.bean.entity.ContractMilestone;
 import com.zjugis.business.bean.entity.ContractMilestone;
 import com.zjugis.business.mapper.ContractMilestoneMapper;
 import com.zjugis.business.mapper.ContractMilestoneMapper;
 import com.zjugis.business.service.ContractMilestoneService;
 import com.zjugis.business.service.ContractMilestoneService;
@@ -82,5 +84,15 @@ public class ContractMilestoneServiceImpl implements ContractMilestoneService {
         return contractMilestoneMapper.selectList(queryWrapper);
         return contractMilestoneMapper.selectList(queryWrapper);
     }
     }
 
 
+    /**
+     * @param objectPage
+     * @param contractMilestoneDto
+     * @return
+     */
+    @Override
+    public Page<ContractMilestone> page(Page<Object> objectPage, ContractMilestoneDto contractMilestoneDto) {
+        return null;
+    }
+
 }
 }