接口调整

zjugis-business/src/main/java/com/zjugis/business/controller/ContractController.java

@@ -69,13 +69,13 @@ public class ContractController {
 //    }
 
     @GetMapping("/subcontract/process")
-    public CommonResult<String> subcontract(String contractId) {
-        return CommonResult.success(contractService.subcontract(contractId));
+    public CommonResult<String> subcontract(@RequestParam("applyId") String applyId) {
+        return CommonResult.success(contractService.subcontract(applyId));
     }
 
     @GetMapping("/outsourcing/process")
-    public CommonResult<String> outsourcing(String contractId) {
-        return CommonResult.success(contractService.outsourcing(contractId));
+    public CommonResult<String> outsourcing(@RequestParam("applyId") String applyId) {
+        return CommonResult.success(contractService.outsourcing(applyId));
     }
 
     @PutMapping("/contract")

zjugis-business/src/main/java/com/zjugis/business/controller/OutsourceApplyController.java

@@ -24,7 +24,7 @@ public class OutsourceApplyController {
     @Resource
     private OutsourceApplyService outsourceApplyService;
 
-    @GetMapping("/outsourceApply/page")
+    @GetMapping("/outsource-apply/page")
     public CommonResult<Page<OutsourceApply>> page(@RequestBody OutsourceApplyDto outsourceApplyDto) {
         return CommonResult.success(outsourceApplyService.page(outsourceApplyDto));
     }
@@ -36,7 +36,7 @@ public class OutsourceApplyController {
      * @param id 主键
      * @return 单条数据
      */
-    @GetMapping("/outsourceApply")
+    @GetMapping("/outsource-apply")
     public CommonResult<OutsourceApply> queryById(@RequestParam("id") String id) {
         return CommonResult.success(outsourceApplyService.queryById(id));
     }
@@ -47,7 +47,7 @@ public class OutsourceApplyController {
      * @param outsourceApply 实体
      * @return 新增结果
      */
-    @PostMapping("/outsourceApply")
+    @PostMapping("/outsource-apply")
     public CommonResult<String> create(@RequestBody OutsourceApply outsourceApply) {
         return CommonResult.success(outsourceApplyService.insert(outsourceApply));
     }
@@ -58,7 +58,7 @@ public class OutsourceApplyController {
      * @param outsourceApply 实体
      * @return 编辑结果
      */
-    @PutMapping("/outsourceApply")
+    @PutMapping("/outsource-apply")
     public CommonResult update(@RequestBody OutsourceApply outsourceApply) {
         return CommonResult.success(outsourceApplyService.update(outsourceApply));
     }
@@ -68,10 +68,16 @@ public class OutsourceApplyController {
      *
      * @return 删除是否成功
      */
-    @DeleteMapping("/outsourceApply")
+    @DeleteMapping("/outsource-apply")
     public CommonResult<Integer> deleteByIds(@RequestBody List<String> idList) {
         return CommonResult.success(outsourceApplyService.deleteByIdList(idList));
     }
 
+    @GetMapping("/outsource-apply/process")
+    public CommonResult<String> subcontract(@RequestParam("projectId") String projectId) {
+        return CommonResult.success(outsourceApplyService.process(projectId));
+    }
+
+
 }
 

zjugis-business/src/main/java/com/zjugis/business/controller/SubcontractApplyController.java

@@ -24,7 +24,7 @@ public class SubcontractApplyController {
     @Resource
     private SubcontractApplyService subcontractApplyService;
 
-    @GetMapping("/subcontractApply/page")
+    @GetMapping("/subcontract-apply/page")
     public CommonResult<Page<SubcontractApply>> page(@RequestBody SubcontractApplyDto subcontractApplyDto) {
         return CommonResult.success(subcontractApplyService.page(subcontractApplyDto));
     }
@@ -36,7 +36,7 @@ public class SubcontractApplyController {
      * @param id 主键
      * @return 单条数据
      */
-    @GetMapping("/subcontractApply")
+    @GetMapping("/subcontract-apply")
     public CommonResult<SubcontractApply> queryById(@RequestParam("id") String id) {
         return CommonResult.success(subcontractApplyService.queryById(id));
     }
@@ -47,7 +47,7 @@ public class SubcontractApplyController {
      * @param subcontractApply 实体
      * @return 新增结果
      */
-    @PostMapping("/subcontractApply")
+    @PostMapping("/subcontract-apply")
     public CommonResult<String> create(@RequestBody SubcontractApply subcontractApply) {
         return CommonResult.success(subcontractApplyService.insert(subcontractApply));
     }
@@ -58,7 +58,7 @@ public class SubcontractApplyController {
      * @param subcontractApply 实体
      * @return 编辑结果
      */
-    @PutMapping("/subcontractApply")
+    @PutMapping("/subcontract-apply")
     public CommonResult update(@RequestBody SubcontractApply subcontractApply) {
         return CommonResult.success(subcontractApplyService.update(subcontractApply));
     }
@@ -68,13 +68,13 @@ public class SubcontractApplyController {
      *
      * @return 删除是否成功
      */
-    @DeleteMapping("/subcontractApply")
+    @DeleteMapping("/subcontract-apply")
     public CommonResult<Integer> deleteByIds(@RequestBody List<String> idList) {
         return CommonResult.success(subcontractApplyService.deleteByIdList(idList));
     }
 
     @GetMapping("/subcontract-apply/process")
-    public CommonResult<String> subcontract(String projectId) {
+    public CommonResult<String> subcontract(@RequestParam("projectId") String projectId) {
         return CommonResult.success(subcontractApplyService.process(projectId));
     }
 

zjugis-business/src/main/java/com/zjugis/business/service/impl/OutsourceApplyServiceImpl.java

@@ -41,7 +41,6 @@ public class OutsourceApplyServiceImpl implements OutsourceApplyService {
     public Page<OutsourceApply> page(OutsourceApplyDto outsourceApplyDto) {
         Page<OutsourceApply> page = new Page<>(outsourceApplyDto.getPageNo(),outsourceApplyDto.getPageSize());
         QueryWrapper<OutsourceApply> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("ISVALID",1);
         return outsourceApplyMapper.selectPage(page,queryWrapper);
     }
 

zjugis-business/src/main/java/com/zjugis/business/service/impl/SubcontractApplyServiceImpl.java

@@ -39,7 +39,6 @@ public class SubcontractApplyServiceImpl implements SubcontractApplyService {
     public Page<SubcontractApply> page(SubcontractApplyDto subcontractApplyDto) {
         Page<SubcontractApply> page = new Page<>(subcontractApplyDto.getPageNo(),subcontractApplyDto.getPageSize());
         QueryWrapper<SubcontractApply> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("ISVALID",1);
         return subcontractApplyMapper.selectPage(page,queryWrapper);
     }