里程碑模块

src/main/java/com/migao/controller/MilestoneController.java

@@ -5,13 +5,12 @@ import com.migao.config.response.PageBean;
 import com.migao.config.response.ResponseBean;
 import com.migao.config.validation.Insert;
 import com.migao.config.validation.Update;
-import com.migao.entity.vo.req.MilestoneInsertReq;
-import com.migao.entity.vo.req.MilestonePageQueryReq;
-import com.migao.entity.vo.req.MilestoneQueryReq;
-import com.migao.entity.vo.req.MilestoneUpdateReq;
+import com.migao.entity.vo.req.*;
 import com.migao.entity.vo.res.MilestoneQueryRes;
+import com.migao.entity.vo.res.ProjectQueryRes;
 import com.migao.service.MilestoneService;
 
+import com.migao.service.PurchasingApprovalService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperationSupport;
@@ -28,6 +27,9 @@ public class MilestoneController {
     @Resource
     private MilestoneService milestoneService;
 
+    @Resource
+    private PurchasingApprovalService purchasingApprovalService;
+
     @ApiOperationSupport(order = 2)
     @ApiOperation("新增")
     @PostMapping(value = "/insert")
@@ -64,12 +66,31 @@ public class MilestoneController {
         return milestoneService.update(milestoneUpdateReq);
     }
 
-    @ApiOperationSupport(order =1)
-    @ApiOperation("分页查")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("分页查询(所有子项目)")
     @PostMapping(value = "/pageQuery")
-    public ResponseBean<PageBean<MilestoneQueryRes>> pageQuery(
+    public ResponseBean<PageBean<ProjectQueryRes>> pageQuery(
+            @RequestBody PurchasingApprovalPageQueryReq purchasingApprovalPageQueryReq
+    ) {
+        return purchasingApprovalService.pageQuery(purchasingApprovalPageQueryReq);
+    }
+
+
+    @ApiOperationSupport(order = 8)
+    @ApiOperation("导入")
+    @PostMapping(value = "/importData")
+    public ResponseBean<?> importData(
+            @RequestParam("fileId") String fileId
+    ) {
+        return milestoneService.importData(fileId);
+    }
+
+    @ApiOperationSupport(order = 9)
+    @ApiOperation("导出")
+    @PostMapping(value = "/export")
+    public ResponseBean<?> export(
             @RequestBody MilestonePageQueryReq milestonePageQueryReq
     ) {
-        return milestoneService.pageQuery(milestonePageQueryReq);
+        return milestoneService.export(milestonePageQueryReq);
     }
 }

src/main/java/com/migao/entity/vo/req/MilestoneInsertReq.java

@@ -26,6 +26,10 @@ public class MilestoneInsertReq {
     @NotNull(message = "结束时间不能为空")
     private LocalDateTime endTime;
 
+    @ApiModelProperty(value = "开始时间")
+    @NotNull(message = "开始时间不能为空")
+    private LocalDateTime createTime;
+
     @ApiModelProperty(value = "名称")
     @NotEmpty(message = "名称不能为空")
     private String name;

src/main/java/com/migao/entity/vo/req/SubProjectInsertReq.java

@@ -17,6 +17,7 @@ import java.time.LocalDateTime;
 @Builder
 @Data
 public class SubProjectInsertReq {
+
     @ApiModelProperty(value = "资本性(万元)")
     @NotEmpty(message = "资本性(万元)不能为空")
     private String capital;
@@ -28,10 +29,6 @@ public class SubProjectInsertReq {
     @NotEmpty(message = "父级项目id不能为空")
     private Integer parentId;
 
-
-    @NotEmpty(message = "里程碑id不能为空")
-    private Integer milestoneId;
-
     @ApiModelProperty(value = "成本性(万元)")
     @NotEmpty(message = "成本性(万元)不能为空")
     private String cost;

src/main/java/com/migao/service/MilestoneService.java

@@ -24,4 +24,8 @@ public interface MilestoneService{
     ResponseBean<?> update(MilestoneUpdateReq milestoneUpdateReq);
 
     ResponseBean<PageBean<MilestoneQueryRes>> pageQuery(MilestonePageQueryReq milestonePageQueryReq);
+
+    ResponseBean<?> importData(String fileId);
+
+    ResponseBean<?> export(MilestonePageQueryReq milestonePageQueryReq);
 }

src/main/java/com/migao/service/impl/MilestoneServiceImpl.java

@@ -84,6 +84,16 @@ public class MilestoneServiceImpl implements MilestoneService {
         );
     }
 
+    @Override
+    public ResponseBean<?> importData(String fileId) {
+        return null;
+    }
+
+    @Override
+    public ResponseBean<?> export(MilestonePageQueryReq milestonePageQueryReq) {
+        return null;
+    }
+
     /**
      * 删
      *

src/main/java/com/migao/service/impl/ProjectServiceImpl.java

@@ -295,15 +295,6 @@ public class ProjectServiceImpl implements ProjectService {
         project.setOrderStatus(ProjectStatus.APPROVE.getName());
         parProject.setPurchaseStatus(ProjectStatus.TO_BE_REPORTED.getName());
         projectMapper.updateById(parProject);
-        //关联里程碑
-        Integer milestoneId = subProjectInsertReq.getMilestoneId();
-        Milestone milestone = milestoneMapper.selectById(milestoneId);
-        if (milestone == null) {
-            return ResponseBuilder.fail("里程碑不存在");
-        }
-        milestone.setProjectId(save.getId());
-        milestone.setDeleted(0);
-        milestoneMapper.updateById(milestone);
         return ResponseBuilder.ok();
     }
 }