浏览代码

工作填报流程修改

lamphua 7 个月前
父节点
当前提交
f743c72abc
共有 16 个文件被更改,包括 20 次插入20 次删除
  1. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeclareController.java
  2. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcManageDeptController.java
  3. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcMaterialBuyController.java
  4. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcMaterialController.java
  5. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcMaterialGiveController.java
  6. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcOutsourceController.java
  7. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcOutsourceWorkController.java
  8. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPerformanceController.java
  9. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProcureApprovalController.java
  10. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProcurePlanController.java
  11. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSafeReportController.java
  12. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSafeRequestController.java
  13. 1
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTechnicalController.java
  14. 2
    2
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTrainController.java
  15. 2
    2
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcWageController.java
  16. 3
    3
      oa-back/sql/sq.sql

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeclareController.java 查看文件

92
 	@DeleteMapping("/{formIds}")
92
 	@DeleteMapping("/{formIds}")
93
     public AjaxResult remove(@PathVariable String[] formIds)
93
     public AjaxResult remove(@PathVariable String[] formIds)
94
     {
94
     {
95
-        return toAjax(cmcDeclareService.deleteCmcDeclareByFormIds(formIds));
95
+        return success(cmcDeclareService.deleteCmcDeclareByFormIds(formIds));
96
     }
96
     }
97
 }
97
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcManageDeptController.java 查看文件

134
 	@DeleteMapping("/{userIds}")
134
 	@DeleteMapping("/{userIds}")
135
     public AjaxResult remove(@PathVariable Long[] userIds)
135
     public AjaxResult remove(@PathVariable Long[] userIds)
136
     {
136
     {
137
-        return toAjax(cmcManageDeptService.deleteCmcManageDeptByUserIds(userIds));
137
+        return success(cmcManageDeptService.deleteCmcManageDeptByUserIds(userIds));
138
     }
138
     }
139
 }
139
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcMaterialBuyController.java 查看文件

101
 	@DeleteMapping("/{buyIds}")
101
 	@DeleteMapping("/{buyIds}")
102
     public AjaxResult remove(@PathVariable Integer[] buyIds)
102
     public AjaxResult remove(@PathVariable Integer[] buyIds)
103
     {
103
     {
104
-        return toAjax(cmcMaterialBuyService.deleteCmcMaterialBuyByBuyIds(buyIds));
104
+        return success(cmcMaterialBuyService.deleteCmcMaterialBuyByBuyIds(buyIds));
105
     }
105
     }
106
 }
106
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcMaterialController.java 查看文件

92
 	@DeleteMapping("/{materialIds}")
92
 	@DeleteMapping("/{materialIds}")
93
     public AjaxResult remove(@PathVariable Integer[] materialIds)
93
     public AjaxResult remove(@PathVariable Integer[] materialIds)
94
     {
94
     {
95
-        return toAjax(cmcMaterialService.deleteCmcMaterialByMaterialIds(materialIds));
95
+        return success(cmcMaterialService.deleteCmcMaterialByMaterialIds(materialIds));
96
     }
96
     }
97
 }
97
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcMaterialGiveController.java 查看文件

101
 	@DeleteMapping("/{giveIds}")
101
 	@DeleteMapping("/{giveIds}")
102
     public AjaxResult remove(@PathVariable Integer[] giveIds)
102
     public AjaxResult remove(@PathVariable Integer[] giveIds)
103
     {
103
     {
104
-        return toAjax(cmcMaterialGiveService.deleteCmcMaterialGiveByGiveIds(giveIds));
104
+        return success(cmcMaterialGiveService.deleteCmcMaterialGiveByGiveIds(giveIds));
105
     }
105
     }
106
 }
106
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcOutsourceController.java 查看文件

102
 	@DeleteMapping("/{outsourceIds}")
102
 	@DeleteMapping("/{outsourceIds}")
103
     public AjaxResult remove(@PathVariable String[] outsourceIds)
103
     public AjaxResult remove(@PathVariable String[] outsourceIds)
104
     {
104
     {
105
-        return toAjax(cmcOutsourceService.deleteCmcOutsourceByOutsourceIds(outsourceIds));
105
+        return success(cmcOutsourceService.deleteCmcOutsourceByOutsourceIds(outsourceIds));
106
     }
106
     }
107
 
107
 
108
     public void partnerIdToName(CmcOutsource cmcOutsource) {
108
     public void partnerIdToName(CmcOutsource cmcOutsource) {

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcOutsourceWorkController.java 查看文件

92
 	@DeleteMapping("/{outsourceIds}")
92
 	@DeleteMapping("/{outsourceIds}")
93
     public AjaxResult remove(@PathVariable String[] outsourceIds)
93
     public AjaxResult remove(@PathVariable String[] outsourceIds)
94
     {
94
     {
95
-        return toAjax(cmcOutsourceWorkService.deleteCmcOutsourceWorkByOutsourceIds(outsourceIds));
95
+        return success(cmcOutsourceWorkService.deleteCmcOutsourceWorkByOutsourceIds(outsourceIds));
96
     }
96
     }
97
 }
97
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPerformanceController.java 查看文件

92
     @DeleteMapping("/{performanceIds}")
92
     @DeleteMapping("/{performanceIds}")
93
     public AjaxResult remove(@PathVariable String[] performanceIds)
93
     public AjaxResult remove(@PathVariable String[] performanceIds)
94
     {
94
     {
95
-        return toAjax(cmcPerformanceService.deleteCmcPerformanceByPerformanceIds(performanceIds));
95
+        return success(cmcPerformanceService.deleteCmcPerformanceByPerformanceIds(performanceIds));
96
     }
96
     }
97
 }
97
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProcureApprovalController.java 查看文件

92
 	@DeleteMapping("/{procureApplyIds}")
92
 	@DeleteMapping("/{procureApplyIds}")
93
     public AjaxResult remove(@PathVariable String[] procureApplyIds)
93
     public AjaxResult remove(@PathVariable String[] procureApplyIds)
94
     {
94
     {
95
-        return toAjax(cmcProcureApprovalService.deleteCmcProcureApprovalByProcureApplyIds(procureApplyIds));
95
+        return success(cmcProcureApprovalService.deleteCmcProcureApprovalByProcureApplyIds(procureApplyIds));
96
     }
96
     }
97
 }
97
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProcurePlanController.java 查看文件

92
 	@DeleteMapping("/{procureApplyId}")
92
 	@DeleteMapping("/{procureApplyId}")
93
     public AjaxResult remove(@PathVariable String[] procureApplyId)
93
     public AjaxResult remove(@PathVariable String[] procureApplyId)
94
     {
94
     {
95
-        return toAjax(cmcProcurePlanService.deleteCmcProcurePlanByProcureApplyIds(procureApplyId));
95
+        return success(cmcProcurePlanService.deleteCmcProcurePlanByProcureApplyIds(procureApplyId));
96
     }
96
     }
97
 }
97
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSafeReportController.java 查看文件

115
 	@DeleteMapping("/{safeReportIds}")
115
 	@DeleteMapping("/{safeReportIds}")
116
     public AjaxResult remove(@PathVariable Integer[] safeReportIds)
116
     public AjaxResult remove(@PathVariable Integer[] safeReportIds)
117
     {
117
     {
118
-        return toAjax(cmcSafeReportService.deleteCmcSafeReportBySafeReportIds(safeReportIds));
118
+        return success(cmcSafeReportService.deleteCmcSafeReportBySafeReportIds(safeReportIds));
119
     }
119
     }
120
 }
120
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSafeRequestController.java 查看文件

92
 	@DeleteMapping("/{requestIds}")
92
 	@DeleteMapping("/{requestIds}")
93
     public AjaxResult remove(@PathVariable Integer[] requestIds)
93
     public AjaxResult remove(@PathVariable Integer[] requestIds)
94
     {
94
     {
95
-        return toAjax(cmcSafeRequestService.deleteCmcSafeRequestByRequestIds(requestIds));
95
+        return success(cmcSafeRequestService.deleteCmcSafeRequestByRequestIds(requestIds));
96
     }
96
     }
97
 }
97
 }

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTechnicalController.java 查看文件

92
 	@DeleteMapping("/{technicalIds}")
92
 	@DeleteMapping("/{technicalIds}")
93
     public AjaxResult remove(@PathVariable String[] technicalIds)
93
     public AjaxResult remove(@PathVariable String[] technicalIds)
94
     {
94
     {
95
-        return toAjax(cmcTechnicalService.deleteCmcTechnicalByTechnicalIds(technicalIds));
95
+        return success(cmcTechnicalService.deleteCmcTechnicalByTechnicalIds(technicalIds));
96
     }
96
     }
97
 }
97
 }

+ 2
- 2
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTrainController.java 查看文件

82
     @PutMapping
82
     @PutMapping
83
     public AjaxResult edit(@RequestBody CmcTrain cmcTrain)
83
     public AjaxResult edit(@RequestBody CmcTrain cmcTrain)
84
     {
84
     {
85
-        return toAjax(cmcTrainService.updateCmcTrain(cmcTrain));
85
+        return success(cmcTrainService.updateCmcTrain(cmcTrain));
86
     }
86
     }
87
 
87
 
88
     /**
88
     /**
92
 	@DeleteMapping("/{trainIds}")
92
 	@DeleteMapping("/{trainIds}")
93
     public AjaxResult remove(@PathVariable Integer[] trainIds)
93
     public AjaxResult remove(@PathVariable Integer[] trainIds)
94
     {
94
     {
95
-        return toAjax(cmcTrainService.deleteCmcTrainByTrainIds(trainIds));
95
+        return success(cmcTrainService.deleteCmcTrainByTrainIds(trainIds));
96
     }
96
     }
97
 }
97
 }

+ 2
- 2
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcWageController.java 查看文件

92
 	@DeleteMapping("/{wageIds}")
92
 	@DeleteMapping("/{wageIds}")
93
     public AjaxResult remove(@PathVariable Integer[] wageIds)
93
     public AjaxResult remove(@PathVariable Integer[] wageIds)
94
     {
94
     {
95
-        return toAjax(cmcWageService.deleteCmcWageByWageIds(wageIds));
95
+        return success(cmcWageService.deleteCmcWageByWageIds(wageIds));
96
     }
96
     }
97
 
97
 
98
     /**
98
     /**
102
 	@DeleteMapping("/batch/{performanceIds}")
102
 	@DeleteMapping("/batch/{performanceIds}")
103
     public AjaxResult removeBatch(@PathVariable String[] performanceIds)
103
     public AjaxResult removeBatch(@PathVariable String[] performanceIds)
104
     {
104
     {
105
-        return toAjax(cmcWageService.deleteCmcWageByPerformanceIds(performanceIds));
105
+        return success(cmcWageService.deleteCmcWageByPerformanceIds(performanceIds));
106
     }
106
     }
107
 }
107
 }

+ 3
- 3
oa-back/sql/sq.sql
文件差异内容过多而无法显示
查看文件


正在加载...
取消
保存