Преглед на файлове

优化结构树查询,注释权限

bgy преди 1 година
родител
ревизия
48507ebd3a
променени са 14 файла, в които са добавени 84 реда и са изтрити 67 реда
  1. 9
    4
      qomo-kn-cost-manage-start/src/main/resources/application-dev.yml
  2. 5
    5
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostCountController.java
  3. 6
    6
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostHourRateController.java
  4. 6
    6
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostMaterialBomController.java
  5. 6
    6
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostMaterialProcessHoursController.java
  6. 6
    6
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPartMissingInfoController.java
  7. 6
    6
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPurchaseEvaluateController.java
  8. 6
    6
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPurchasePriceController.java
  9. 2
    2
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostResultValueController.java
  10. 6
    6
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostStandardDetailController.java
  11. 6
    6
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostStandardVersionController.java
  12. 2
    0
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/AppSceneCostCountServiceImpl.java
  13. 7
    7
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/BomTreeServiceImpl.java
  14. 11
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/util/BomTreeBuilder.java

+ 9
- 4
qomo-kn-cost-manage-start/src/main/resources/application-dev.yml Целия файл

@@ -15,7 +15,7 @@ v2:
15 15
   defaultFormat: .png
16 16
 
17 17
 server:
18
-  port: 8082
18
+  port: 8098
19 19
   tomcat:
20 20
     max-swallow-size: -1
21 21
   error:
@@ -205,10 +205,15 @@ spring:
205 205
         # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
206 206
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
207 207
       datasource:
208
+#        master:
209
+#          url: jdbc:mysql://192.168.50.9:2212/selef_report?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false
210
+#          username: zzzz
211
+#          password: knphm2021
212
+#          driver-class-name: com.mysql.cj.jdbc.Driver
208 213
         master:
209
-          url: jdbc:mysql://192.168.50.9:2212/selef_report?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false
210
-          username: zzzz
211
-          password: knphm2021
214
+          url: jdbc:mysql://158.158.4.51:13306/kn_otd_app?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false
215
+          username: knotd
216
+          password: otd@2024
212 217
           driver-class-name: com.mysql.cj.jdbc.Driver
213 218
           # 多数据源配置
214 219
           #multi-datasource1:

+ 5
- 5
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostCountController.java Целия файл

@@ -79,7 +79,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
79 79
      */
80 80
     @AutoLog(value = "app_scene_cost_count-添加")
81 81
     @ApiOperation(value = "添加标准成本计算任务", notes = "添加标准成本计算任务")
82
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:addCostCountTask")
82
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:addCostCountTask")
83 83
     @PostMapping(value = "/addCostCountTask")
84 84
     public Result<String> addCostCountTask(@RequestBody AppSceneCostCount appSceneCostCount) {
85 85
         appSceneCostCountService.addCostCountTask(appSceneCostCount);
@@ -95,7 +95,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
95 95
      */
96 96
     @AutoLog(value = "app_scene_cost_count-通过id删除")
97 97
     @ApiOperation(value = "标准成本计算-通过id删除", notes = "标准成本计算-通过id删除")
98
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:delete")
98
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:delete")
99 99
     @DeleteMapping(value = "/delete")
100 100
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
101 101
         appSceneCostCountService.removeById(id);
@@ -110,7 +110,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
110 110
 //     */
111 111
 //    @AutoLog(value = "app_scene_cost_count-批量删除")
112 112
 //    @ApiOperation(value = "app_scene_cost_count-批量删除", notes = "app_scene_cost_count-批量删除")
113
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:deleteBatch")
113
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:deleteBatch")
114 114
 //    @DeleteMapping(value = "/deleteBatch")
115 115
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
116 116
 //        this.appSceneCostCountService.removeByIds(Arrays.asList(ids.split(",")));
@@ -157,7 +157,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
157 157
      * @param request
158 158
      * @param appSceneCostCount
159 159
      */
160
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:exportXls")
160
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:exportXls")
161 161
     @RequestMapping(value = "/exportXls")
162 162
     public ModelAndView exportXls(HttpServletRequest request, AppSceneCostCount appSceneCostCount) {
163 163
         return super.exportXls(request, appSceneCostCount, AppSceneCostCount.class, "app_scene_cost_count");
@@ -170,7 +170,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
170 170
      * @param response
171 171
      * @return
172 172
      */
173
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:importExcel")
173
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:importExcel")
174 174
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
175 175
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
176 176
         return super.importExcel(request, response, AppSceneCostCount.class);

+ 6
- 6
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostHourRateController.java Целия файл

@@ -65,7 +65,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
65 65
      */
66 66
     @AutoLog(value = "app_scene_cost_hour_rate-添加")
67 67
     @ApiOperation(value = "app_scene_cost_hour_rate-添加", notes = "app_scene_cost_hour_rate-添加")
68
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:add")
68
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:add")
69 69
     @PostMapping(value = "/add")
70 70
     public Result<String> add(@RequestBody AppSceneCostHourRate appSceneCostHourRate) {
71 71
         appSceneCostHourRateService.save(appSceneCostHourRate);
@@ -80,7 +80,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
80 80
      */
81 81
     @AutoLog(value = "app_scene_cost_hour_rate-编辑")
82 82
     @ApiOperation(value = "app_scene_cost_hour_rate-编辑", notes = "app_scene_cost_hour_rate-编辑")
83
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:edit")
83
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:edit")
84 84
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
85 85
     public Result<String> edit(@RequestBody AppSceneCostHourRate appSceneCostHourRate) {
86 86
         appSceneCostHourRateService.updateById(appSceneCostHourRate);
@@ -95,7 +95,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
95 95
      */
96 96
     @AutoLog(value = "app_scene_cost_hour_rate-通过id删除")
97 97
     @ApiOperation(value = "app_scene_cost_hour_rate-通过id删除", notes = "app_scene_cost_hour_rate-通过id删除")
98
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:delete")
98
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:delete")
99 99
     @DeleteMapping(value = "/delete")
100 100
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
101 101
         appSceneCostHourRateService.removeById(id);
@@ -110,7 +110,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
110 110
 //     */
111 111
 //    @AutoLog(value = "app_scene_cost_hour_rate-批量删除")
112 112
 //    @ApiOperation(value = "app_scene_cost_hour_rate-批量删除", notes = "app_scene_cost_hour_rate-批量删除")
113
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:deleteBatch")
113
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:deleteBatch")
114 114
 //    @DeleteMapping(value = "/deleteBatch")
115 115
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
116 116
 //        this.appSceneCostHourRateService.removeByIds(Arrays.asList(ids.split(",")));
@@ -140,7 +140,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
140 140
 //     * @param request
141 141
 //     * @param appSceneCostHourRate
142 142
 //     */
143
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:exportXls")
143
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:exportXls")
144 144
 //    @RequestMapping(value = "/exportXls")
145 145
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostHourRate appSceneCostHourRate) {
146 146
 //        return super.exportXls(request, appSceneCostHourRate, AppSceneCostHourRate.class, "app_scene_cost_hour_rate");
@@ -153,7 +153,7 @@ public class AppSceneCostHourRateController extends JeecgController<AppSceneCost
153 153
 //     * @param response
154 154
 //     * @return
155 155
 //     */
156
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:importExcel")
156
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:importExcel")
157 157
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
158 158
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
159 159
 //        return super.importExcel(request, response, AppSceneCostHourRate.class);

+ 6
- 6
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostMaterialBomController.java Целия файл

@@ -93,7 +93,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
93 93
 //     */
94 94
 //    @AutoLog(value = "app_scene_cost_material_bom-添加")
95 95
 //    @ApiOperation(value = "app_scene_cost_material_bom-添加", notes = "app_scene_cost_material_bom-添加")
96
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:add")
96
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:add")
97 97
 //    @PostMapping(value = "/add")
98 98
 //    public Result<String> add(@RequestBody AppSceneCostMaterialBom appSceneCostMaterialBom) {
99 99
 //        appSceneCostMaterialBomService.save(appSceneCostMaterialBom);
@@ -108,7 +108,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
108 108
 //     */
109 109
 //    @AutoLog(value = "app_scene_cost_material_bom-编辑")
110 110
 //    @ApiOperation(value = "app_scene_cost_material_bom-编辑", notes = "app_scene_cost_material_bom-编辑")
111
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:edit")
111
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:edit")
112 112
 //    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
113 113
 //    public Result<String> edit(@RequestBody AppSceneCostMaterialBom appSceneCostMaterialBom) {
114 114
 //        appSceneCostMaterialBomService.updateById(appSceneCostMaterialBom);
@@ -123,7 +123,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
123 123
 //     */
124 124
 //    @AutoLog(value = "app_scene_cost_material_bom-通过id删除")
125 125
 //    @ApiOperation(value = "app_scene_cost_material_bom-通过id删除", notes = "app_scene_cost_material_bom-通过id删除")
126
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:delete")
126
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:delete")
127 127
 //    @DeleteMapping(value = "/delete")
128 128
 //    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
129 129
 //        appSceneCostMaterialBomService.removeById(id);
@@ -138,7 +138,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
138 138
 //     */
139 139
 //    @AutoLog(value = "app_scene_cost_material_bom-批量删除")
140 140
 //    @ApiOperation(value = "app_scene_cost_material_bom-批量删除", notes = "app_scene_cost_material_bom-批量删除")
141
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:deleteBatch")
141
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:deleteBatch")
142 142
 //    @DeleteMapping(value = "/deleteBatch")
143 143
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
144 144
 //        this.appSceneCostMaterialBomService.removeByIds(Arrays.asList(ids.split(",")));
@@ -168,7 +168,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
168 168
 //     * @param request
169 169
 //     * @param appSceneCostMaterialBom
170 170
 //     */
171
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:exportXls")
171
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:exportXls")
172 172
 //    @RequestMapping(value = "/exportXls")
173 173
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostMaterialBom appSceneCostMaterialBom) {
174 174
 //        return super.exportXls(request, appSceneCostMaterialBom, AppSceneCostMaterialBom.class, "app_scene_cost_material_bom");
@@ -181,7 +181,7 @@ public class AppSceneCostMaterialBomController extends JeecgController<AppSceneC
181 181
 //     * @param response
182 182
 //     * @return
183 183
 //     */
184
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:importExcel")
184
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:importExcel")
185 185
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
186 186
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
187 187
 //        return super.importExcel(request, response, AppSceneCostMaterialBom.class);

+ 6
- 6
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostMaterialProcessHoursController.java Целия файл

@@ -62,7 +62,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
62 62
      */
63 63
     @AutoLog(value = "app_scene_cost_material_process_hours-添加")
64 64
     @ApiOperation(value = "app_scene_cost_material_process_hours-添加", notes = "app_scene_cost_material_process_hours-添加")
65
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:add")
65
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:add")
66 66
     @PostMapping(value = "/add")
67 67
     public Result<String> add(@RequestBody AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours) {
68 68
         appSceneCostMaterialProcessHoursService.save(appSceneCostMaterialProcessHours);
@@ -77,7 +77,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
77 77
      */
78 78
     @AutoLog(value = "app_scene_cost_material_process_hours-编辑")
79 79
     @ApiOperation(value = "app_scene_cost_material_process_hours-编辑", notes = "app_scene_cost_material_process_hours-编辑")
80
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:edit")
80
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:edit")
81 81
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
82 82
     public Result<String> edit(@RequestBody AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours) {
83 83
         appSceneCostMaterialProcessHoursService.updateById(appSceneCostMaterialProcessHours);
@@ -92,7 +92,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
92 92
      */
93 93
     @AutoLog(value = "app_scene_cost_material_process_hours-通过id删除")
94 94
     @ApiOperation(value = "app_scene_cost_material_process_hours-通过id删除", notes = "app_scene_cost_material_process_hours-通过id删除")
95
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:delete")
95
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:delete")
96 96
     @DeleteMapping(value = "/delete")
97 97
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
98 98
         appSceneCostMaterialProcessHoursService.removeById(id);
@@ -107,7 +107,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
107 107
 //     */
108 108
 //    @AutoLog(value = "app_scene_cost_material_process_hours-批量删除")
109 109
 //    @ApiOperation(value = "app_scene_cost_material_process_hours-批量删除", notes = "app_scene_cost_material_process_hours-批量删除")
110
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:deleteBatch")
110
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:deleteBatch")
111 111
 //    @DeleteMapping(value = "/deleteBatch")
112 112
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
113 113
 //        this.appSceneCostMaterialProcessHoursService.removeByIds(Arrays.asList(ids.split(",")));
@@ -137,7 +137,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
137 137
 //     * @param request
138 138
 //     * @param appSceneCostMaterialProcessHours
139 139
 //     */
140
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:exportXls")
140
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:exportXls")
141 141
 //    @RequestMapping(value = "/exportXls")
142 142
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours) {
143 143
 //        return super.exportXls(request, appSceneCostMaterialProcessHours, AppSceneCostMaterialProcessHours.class, "app_scene_cost_material_process_hours");
@@ -150,7 +150,7 @@ public class AppSceneCostMaterialProcessHoursController extends JeecgController<
150 150
 //     * @param response
151 151
 //     * @return
152 152
 //     */
153
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:importExcel")
153
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:importExcel")
154 154
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
155 155
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
156 156
 //        return super.importExcel(request, response, AppSceneCostMaterialProcessHours.class);

+ 6
- 6
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPartMissingInfoController.java Целия файл

@@ -62,7 +62,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
62 62
 //     */
63 63
 //    @AutoLog(value = "app_scene_cost_part_missing_info-添加")
64 64
 //    @ApiOperation(value = "app_scene_cost_part_missing_info-添加", notes = "app_scene_cost_part_missing_info-添加")
65
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:add")
65
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:add")
66 66
 //    @PostMapping(value = "/add")
67 67
 //    public Result<String> add(@RequestBody AppSceneCostPartMissingInfo appSceneCostPartMissingInfo) {
68 68
 //        appSceneCostPartMissingInfoService.save(appSceneCostPartMissingInfo);
@@ -77,7 +77,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
77 77
 //     */
78 78
 //    @AutoLog(value = "app_scene_cost_part_missing_info-编辑")
79 79
 //    @ApiOperation(value = "app_scene_cost_part_missing_info-编辑", notes = "app_scene_cost_part_missing_info-编辑")
80
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:edit")
80
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:edit")
81 81
 //    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
82 82
 //    public Result<String> edit(@RequestBody AppSceneCostPartMissingInfo appSceneCostPartMissingInfo) {
83 83
 //        appSceneCostPartMissingInfoService.updateById(appSceneCostPartMissingInfo);
@@ -92,7 +92,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
92 92
 //     */
93 93
 //    @AutoLog(value = "app_scene_cost_part_missing_info-通过id删除")
94 94
 //    @ApiOperation(value = "app_scene_cost_part_missing_info-通过id删除", notes = "app_scene_cost_part_missing_info-通过id删除")
95
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:delete")
95
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:delete")
96 96
 //    @DeleteMapping(value = "/delete")
97 97
 //    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
98 98
 //        appSceneCostPartMissingInfoService.removeById(id);
@@ -107,7 +107,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
107 107
 //     */
108 108
 //    @AutoLog(value = "app_scene_cost_part_missing_info-批量删除")
109 109
 //    @ApiOperation(value = "app_scene_cost_part_missing_info-批量删除", notes = "app_scene_cost_part_missing_info-批量删除")
110
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:deleteBatch")
110
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:deleteBatch")
111 111
 //    @DeleteMapping(value = "/deleteBatch")
112 112
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
113 113
 //        this.appSceneCostPartMissingInfoService.removeByIds(Arrays.asList(ids.split(",")));
@@ -137,7 +137,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
137 137
 //     * @param request
138 138
 //     * @param appSceneCostPartMissingInfo
139 139
 //     */
140
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:exportXls")
140
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:exportXls")
141 141
 //    @RequestMapping(value = "/exportXls")
142 142
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostPartMissingInfo appSceneCostPartMissingInfo) {
143 143
 //        return super.exportXls(request, appSceneCostPartMissingInfo, AppSceneCostPartMissingInfo.class, "app_scene_cost_part_missing_info");
@@ -150,7 +150,7 @@ public class AppSceneCostPartMissingInfoController extends JeecgController<AppSc
150 150
 //     * @param response
151 151
 //     * @return
152 152
 //     */
153
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:importExcel")
153
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:importExcel")
154 154
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
155 155
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
156 156
 //        return super.importExcel(request, response, AppSceneCostPartMissingInfo.class);

+ 6
- 6
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPurchaseEvaluateController.java Целия файл

@@ -65,7 +65,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
65 65
      */
66 66
     @AutoLog(value = "app_scene_cost_purchase_evaluate-添加")
67 67
     @ApiOperation(value = "app_scene_cost_purchase_evaluate-添加", notes = "app_scene_cost_purchase_evaluate-添加")
68
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:add")
68
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:add")
69 69
     @PostMapping(value = "/add")
70 70
     public Result<String> add(@RequestBody AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate) {
71 71
         appSceneCostPurchaseEvaluateService.save(appSceneCostPurchaseEvaluate);
@@ -80,7 +80,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
80 80
      */
81 81
     @AutoLog(value = "app_scene_cost_purchase_evaluate-编辑")
82 82
     @ApiOperation(value = "app_scene_cost_purchase_evaluate-编辑", notes = "app_scene_cost_purchase_evaluate-编辑")
83
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:edit")
83
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:edit")
84 84
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
85 85
     public Result<String> edit(@RequestBody AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate) {
86 86
         appSceneCostPurchaseEvaluateService.updateById(appSceneCostPurchaseEvaluate);
@@ -95,7 +95,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
95 95
      */
96 96
     @AutoLog(value = "app_scene_cost_purchase_evaluate-通过id删除")
97 97
     @ApiOperation(value = "app_scene_cost_purchase_evaluate-通过id删除", notes = "app_scene_cost_purchase_evaluate-通过id删除")
98
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:delete")
98
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:delete")
99 99
     @DeleteMapping(value = "/delete")
100 100
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
101 101
         appSceneCostPurchaseEvaluateService.removeById(id);
@@ -110,7 +110,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
110 110
 //     */
111 111
 //    @AutoLog(value = "app_scene_cost_purchase_evaluate-批量删除")
112 112
 //    @ApiOperation(value = "app_scene_cost_purchase_evaluate-批量删除", notes = "app_scene_cost_purchase_evaluate-批量删除")
113
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:deleteBatch")
113
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:deleteBatch")
114 114
 //    @DeleteMapping(value = "/deleteBatch")
115 115
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
116 116
 //        this.appSceneCostPurchaseEvaluateService.removeByIds(Arrays.asList(ids.split(",")));
@@ -140,7 +140,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
140 140
 //     * @param request
141 141
 //     * @param appSceneCostPurchaseEvaluate
142 142
 //     */
143
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:exportXls")
143
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:exportXls")
144 144
 //    @RequestMapping(value = "/exportXls")
145 145
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate) {
146 146
 //        return super.exportXls(request, appSceneCostPurchaseEvaluate, AppSceneCostPurchaseEvaluate.class, "app_scene_cost_purchase_evaluate");
@@ -153,7 +153,7 @@ public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppS
153 153
 //     * @param response
154 154
 //     * @return
155 155
 //     */
156
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:importExcel")
156
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:importExcel")
157 157
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
158 158
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
159 159
 //        return super.importExcel(request, response, AppSceneCostPurchaseEvaluate.class);

+ 6
- 6
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPurchasePriceController.java Целия файл

@@ -62,7 +62,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
62 62
      */
63 63
     @AutoLog(value = "app_scene_cost_purchase_price-添加")
64 64
     @ApiOperation(value = "app_scene_cost_purchase_price-添加", notes = "app_scene_cost_purchase_price-添加")
65
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:add")
65
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:add")
66 66
     @PostMapping(value = "/add")
67 67
     public Result<String> add(@RequestBody AppSceneCostPurchasePrice appSceneCostPurchasePrice) {
68 68
         appSceneCostPurchasePriceService.save(appSceneCostPurchasePrice);
@@ -77,7 +77,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
77 77
      */
78 78
     @AutoLog(value = "app_scene_cost_purchase_price-编辑")
79 79
     @ApiOperation(value = "app_scene_cost_purchase_price-编辑", notes = "app_scene_cost_purchase_price-编辑")
80
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:edit")
80
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:edit")
81 81
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
82 82
     public Result<String> edit(@RequestBody AppSceneCostPurchasePrice appSceneCostPurchasePrice) {
83 83
         appSceneCostPurchasePriceService.updateById(appSceneCostPurchasePrice);
@@ -92,7 +92,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
92 92
      */
93 93
     @AutoLog(value = "app_scene_cost_purchase_price-通过id删除")
94 94
     @ApiOperation(value = "app_scene_cost_purchase_price-通过id删除", notes = "app_scene_cost_purchase_price-通过id删除")
95
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:delete")
95
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:delete")
96 96
     @DeleteMapping(value = "/delete")
97 97
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
98 98
         appSceneCostPurchasePriceService.removeById(id);
@@ -107,7 +107,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
107 107
      */
108 108
     @AutoLog(value = "app_scene_cost_purchase_price-批量删除")
109 109
     @ApiOperation(value = "app_scene_cost_purchase_price-批量删除", notes = "app_scene_cost_purchase_price-批量删除")
110
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:deleteBatch")
110
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:deleteBatch")
111 111
     @DeleteMapping(value = "/deleteBatch")
112 112
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
113 113
         this.appSceneCostPurchasePriceService.removeByIds(Arrays.asList(ids.split(",")));
@@ -137,7 +137,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
137 137
      * @param request
138 138
      * @param appSceneCostPurchasePrice
139 139
      */
140
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:exportXls")
140
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:exportXls")
141 141
     @RequestMapping(value = "/exportXls")
142 142
     public ModelAndView exportXls(HttpServletRequest request, AppSceneCostPurchasePrice appSceneCostPurchasePrice) {
143 143
         return super.exportXls(request, appSceneCostPurchasePrice, AppSceneCostPurchasePrice.class, "app_scene_cost_purchase_price");
@@ -150,7 +150,7 @@ public class AppSceneCostPurchasePriceController extends JeecgController<AppScen
150 150
      * @param response
151 151
      * @return
152 152
      */
153
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:importExcel")
153
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:importExcel")
154 154
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
155 155
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
156 156
         return super.importExcel(request, response, AppSceneCostPurchasePrice.class);

+ 2
- 2
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostResultValueController.java Целия файл

@@ -157,7 +157,7 @@ public class AppSceneCostResultValueController extends JeecgController<AppSceneC
157 157
     * @param request
158 158
     * @param appSceneCostResultValue
159 159
     */
160
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:exportXls")
160
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:exportXls")
161 161
     @RequestMapping(value = "/exportXls")
162 162
     public ModelAndView exportXls(HttpServletRequest request, AppSceneCostResultValue appSceneCostResultValue) {
163 163
         return super.exportXls(request, appSceneCostResultValue, AppSceneCostResultValue.class, "app_scene_cost_result_value");
@@ -170,7 +170,7 @@ public class AppSceneCostResultValueController extends JeecgController<AppSceneC
170 170
     * @param response
171 171
     * @return
172 172
     */
173
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:importExcel")
173
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:importExcel")
174 174
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
175 175
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
176 176
         return super.importExcel(request, response, AppSceneCostResultValue.class);

+ 6
- 6
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostStandardDetailController.java Целия файл

@@ -62,7 +62,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
62 62
 //     */
63 63
 //    @AutoLog(value = "app_scene_cost_standard_detail-添加")
64 64
 //    @ApiOperation(value = "app_scene_cost_standard_detail-添加", notes = "app_scene_cost_standard_detail-添加")
65
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:add")
65
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:add")
66 66
 //    @PostMapping(value = "/add")
67 67
 //    public Result<String> add(@RequestBody AppSceneCostStandardDetail appSceneCostStandardDetail) {
68 68
 //        appSceneCostStandardDetailService.save(appSceneCostStandardDetail);
@@ -77,7 +77,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
77 77
 //     */
78 78
 //    @AutoLog(value = "app_scene_cost_standard_detail-编辑")
79 79
 //    @ApiOperation(value = "app_scene_cost_standard_detail-编辑", notes = "app_scene_cost_standard_detail-编辑")
80
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:edit")
80
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:edit")
81 81
 //    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
82 82
 //    public Result<String> edit(@RequestBody AppSceneCostStandardDetail appSceneCostStandardDetail) {
83 83
 //        appSceneCostStandardDetailService.updateById(appSceneCostStandardDetail);
@@ -92,7 +92,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
92 92
 //     */
93 93
 //    @AutoLog(value = "app_scene_cost_standard_detail-通过id删除")
94 94
 //    @ApiOperation(value = "app_scene_cost_standard_detail-通过id删除", notes = "app_scene_cost_standard_detail-通过id删除")
95
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:delete")
95
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:delete")
96 96
 //    @DeleteMapping(value = "/delete")
97 97
 //    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
98 98
 //        appSceneCostStandardDetailService.removeById(id);
@@ -107,7 +107,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
107 107
 //     */
108 108
 //    @AutoLog(value = "app_scene_cost_standard_detail-批量删除")
109 109
 //    @ApiOperation(value = "app_scene_cost_standard_detail-批量删除", notes = "app_scene_cost_standard_detail-批量删除")
110
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:deleteBatch")
110
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:deleteBatch")
111 111
 //    @DeleteMapping(value = "/deleteBatch")
112 112
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
113 113
 //        this.appSceneCostStandardDetailService.removeByIds(Arrays.asList(ids.split(",")));
@@ -137,7 +137,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
137 137
      * @param request
138 138
      * @param appSceneCostStandardDetail
139 139
      */
140
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:exportXls")
140
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:exportXls")
141 141
     @RequestMapping(value = "/exportXls")
142 142
     @ApiOperation(value = "cost-单行查询导出", notes = "cost-单行查询导出")
143 143
     public ModelAndView exportXls(HttpServletRequest request, AppSceneCostStandardDetail appSceneCostStandardDetail) {
@@ -151,7 +151,7 @@ public class AppSceneCostStandardDetailController extends JeecgController<AppSce
151 151
 //     * @param response
152 152
 //     * @return
153 153
 //     */
154
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:importExcel")
154
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:importExcel")
155 155
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
156 156
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
157 157
 //        return super.importExcel(request, response, AppSceneCostStandardDetail.class);

+ 6
- 6
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostStandardVersionController.java Целия файл

@@ -60,7 +60,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
60 60
 //     */
61 61
 //    @AutoLog(value = "app_scene_cost_standard_version-添加")
62 62
 //    @ApiOperation(value = "app_scene_cost_standard_version-添加", notes = "app_scene_cost_standard_version-添加")
63
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:add")
63
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:add")
64 64
 //    @PostMapping(value = "/add")
65 65
 //    public Result<String> add(@RequestBody AppSceneCostStandardVersion appSceneCostStandardVersion) {
66 66
 //        appSceneCostStandardVersionService.save(appSceneCostStandardVersion);
@@ -75,7 +75,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
75 75
 //     */
76 76
 //    @AutoLog(value = "app_scene_cost_standard_version-编辑")
77 77
 //    @ApiOperation(value = "app_scene_cost_standard_version-编辑", notes = "app_scene_cost_standard_version-编辑")
78
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:edit")
78
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:edit")
79 79
 //    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
80 80
 //    public Result<String> edit(@RequestBody AppSceneCostStandardVersion appSceneCostStandardVersion) {
81 81
 //        appSceneCostStandardVersionService.updateById(appSceneCostStandardVersion);
@@ -90,7 +90,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
90 90
 //     */
91 91
 //    @AutoLog(value = "app_scene_cost_standard_version-通过id删除")
92 92
 //    @ApiOperation(value = "app_scene_cost_standard_version-通过id删除", notes = "app_scene_cost_standard_version-通过id删除")
93
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:delete")
93
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:delete")
94 94
 //    @DeleteMapping(value = "/delete")
95 95
 //    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
96 96
 //        appSceneCostStandardVersionService.removeById(id);
@@ -105,7 +105,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
105 105
 //     */
106 106
 //    @AutoLog(value = "app_scene_cost_standard_version-批量删除")
107 107
 //    @ApiOperation(value = "app_scene_cost_standard_version-批量删除", notes = "app_scene_cost_standard_version-批量删除")
108
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:deleteBatch")
108
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:deleteBatch")
109 109
 //    @DeleteMapping(value = "/deleteBatch")
110 110
 //    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
111 111
 //        this.appSceneCostStandardVersionService.removeByIds(Arrays.asList(ids.split(",")));
@@ -135,7 +135,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
135 135
 //     * @param request
136 136
 //     * @param appSceneCostStandardVersion
137 137
 //     */
138
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:exportXls")
138
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:exportXls")
139 139
 //    @RequestMapping(value = "/exportXls")
140 140
 //    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostStandardVersion appSceneCostStandardVersion) {
141 141
 //        return super.exportXls(request, appSceneCostStandardVersion, AppSceneCostStandardVersion.class, "app_scene_cost_standard_version");
@@ -148,7 +148,7 @@ public class AppSceneCostStandardVersionController extends JeecgController<AppSc
148 148
 //     * @param response
149 149
 //     * @return
150 150
 //     */
151
-//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:importExcel")
151
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:importExcel")
152 152
 //    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
153 153
 //    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
154 154
 //        return super.importExcel(request, response, AppSceneCostStandardVersion.class);

+ 2
- 0
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/AppSceneCostCountServiceImpl.java Целия файл

@@ -2,6 +2,7 @@ package com.zzsmart.qomo.kn.cost.manage.service.impl;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.zzsmart.qomo.dao.entity.FlowDefinition;
5 6
 import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostCount;
6 7
 import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPartMissingInfo;
7 8
 import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostStandardVersion;
@@ -11,6 +12,7 @@ import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostPartMissingInfoMapper;
11 12
 import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostCountService;
12 13
 import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostStandardVersionService;
13 14
 import com.zzsmart.qomo.kn.cost.manage.vo.MissingComponentVO;
15
+import com.zzsmart.qomo.service.IDataFlowDefinitionService;
14 16
 import com.zzsmart.qomo.service.IDataFlowInstanceService;
15 17
 import org.springframework.beans.factory.annotation.Autowired;
16 18
 import org.springframework.stereotype.Service;

+ 7
- 7
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/BomTreeServiceImpl.java Целия файл

@@ -12,10 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
12 12
 import org.springframework.stereotype.Service;
13 13
 import org.springframework.transaction.annotation.Transactional;
14 14
 
15
-import java.util.ArrayList;
16
-import java.util.List;
17
-import java.util.Map;
18
-import java.util.TreeMap;
15
+import java.util.*;
19 16
 import java.util.stream.Collectors;
20 17
 
21 18
 @Service
@@ -53,9 +50,12 @@ public class BomTreeServiceImpl implements BomTreeService {
53 50
                 parentDataMap = parentNodeList.stream().collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));
54 51
             } else {
55 52
                 //父类结果有多个(找出最上级节点)
56
-                Map<Integer, List<AppSceneCostStandardDetail>> levelGroupMap = parentNodeList.stream().collect(Collectors.groupingBy(AppSceneCostStandardDetail::getLevel));
57
-                TreeMap<Integer, List<AppSceneCostStandardDetail>> levelTreeMap = new TreeMap<>(levelGroupMap);
58
-                parentDataMap = levelTreeMap.firstEntry().getValue().stream().collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));
53
+                Map<Integer, List<AppSceneCostStandardDetail>> levelGroupMap = new HashMap<>();
54
+                if (parentNodeList != null && parentNodeList.size() > 0) {
55
+                    levelGroupMap = parentNodeList.stream().filter(s->s.getLevel()!=null).collect(Collectors.groupingBy(AppSceneCostStandardDetail::getLevel));
56
+                    TreeMap<Integer, List<AppSceneCostStandardDetail>> levelTreeMap = new TreeMap<>(levelGroupMap);
57
+                    parentDataMap = levelTreeMap.firstEntry().getValue().stream().filter(s->s.getMaterialNumber()!=null).collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));
58
+                }
59 59
             }
60 60
             //查询所有父节点下的子节点(即第二层叶子节点)
61 61
             List<AppSceneCostStandardDetail> costStandardDetails = new ArrayList<>();

+ 11
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/util/BomTreeBuilder.java Целия файл

@@ -16,7 +16,17 @@ public class BomTreeBuilder {
16 16
             return result;
17 17
         }
18 18
         //1.把BOM信息分成按照物料号分组
19
-        Map<String, AppSceneCostStandardDetail> materialMap = sourceData.stream().filter(s -> s.getMaterialNumber() != null).collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));
19
+        Map<String, AppSceneCostStandardDetail> materialMap = sourceData.stream().filter(s->s.getMaterialNumber()!=null)
20
+                .collect(Collectors.toMap(
21
+                        // Key extractor
22
+                        AppSceneCostStandardDetail::getMaterialNumber,
23
+                        // Value mapper
24
+                        detail -> detail,
25
+                        // Merger function to handle duplicates
26
+                        (existing, replacement) -> existing
27
+                ));
28
+
29
+//        Map<String, AppSceneCostStandardDetail> materialMap = sourceData.stream().filter(s -> s.getMaterialNumber() != null).collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));
20 30
         //查找最顶端的父类节点
21 31
         if (parentDataMap == null || (parentDataMap != null && parentDataMap.size() < 1)) {
22 32
             parentDataMap = sourceData.stream().filter(s -> s.getParentMaterialNumber() == null).collect(Collectors.toMap(AppSceneCostStandardDetail::getMaterialNumber, vo -> vo));