Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrgReq.java

@@ -13,7 +13,7 @@ public class UpdateOrgReq {
     /**
      * 状态
      */
-    @NotNull(message = "状态不能为空", groups = {ValidationApi.updateStatus.class,ValidationApi.edit.class})
+    @NotNull(message = "状态不能为空", groups = {ValidationApi.edit.class})
     private Integer statusFlag;
     /**
      * 组织机构列表
@@ -32,6 +32,7 @@ public class UpdateOrgReq {
     private String areaName;
     private Integer levelFlag;
     private String dName;
+    @NotNull(message = "状态不能为空",groups = {ValidationApi.updateStatus.class})
     private Integer delFlag;
     private String findCode;
     @NotNull(message = "组织机构id不能为空",groups = {ValidationApi.edit.class})

jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java

@@ -44,11 +44,11 @@ public class TjController {
     /**
      * 根据组织机构统计装备的报表数据（外层数据）
      */
-    @PostMapping("/TjOrgEqs")
-    @ApiOperation("/装备统计报表")
-    public ApiRes<PageResult<TjOrgEqsDto>> TjOrgEqs(@RequestBody TjOrgEqsReq req){
-        return ApiRes.success(tjService.TjOrgEqs(req));
-    }
+//    @PostMapping("/TjOrgEqs")
+//    @ApiOperation("/装备统计报表")
+//    public ApiRes<PageResult<TjOrgEqsDto>> TjOrgEqs(@RequestBody TjOrgEqsReq req){
+//        return ApiRes.success(tjService.TjOrgEqs(req));
+//    }
 
     /**
   * 根据组织机构统计装备的报表数据（外层数据）
@@ -66,11 +66,11 @@ public class TjController {
     }
 
     //第二层数据
-    @PostMapping("/TjOrgEqsSecondList")
-    @ApiOperation("装备统计报表二层数据")
-    public ApiRes<List<TjOrgEqsDto>> TjOrgEqsSecondList(@RequestBody TjOrgEqsReq req){
-     return ApiRes.success(tjService.TjOrgEqsSecondList(req));
-    }
+//    @PostMapping("/TjOrgEqsSecondList")
+//    @ApiOperation("装备统计报表二层数据")
+//    public ApiRes<List<TjOrgEqsDto>> TjOrgEqsSecondList(@RequestBody TjOrgEqsReq req){
+//     return ApiRes.success(tjService.TjOrgEqsSecondList(req));
+//    }
 
     //第二层数据
     @PostMapping("/TjOrgEqsDetail")

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java

@@ -255,7 +255,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
             List<PubOrg> st = list(wp);
             st.forEach(p->
             {
-                p.setStatusFlag(req.getStatusFlag());
+                p.setDelFlag(req.getDelFlag());
 
             });
            return   this.updateBatchById(st);

jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml

@@ -461,7 +461,18 @@
                                     WHEN ( `bis`.`location_type` = 0 ) THEN
                                         `bis`.`destruction_number` ELSE 0
                                     END
-                            ),
+                            )+sum(
+                                CASE
+                                    WHEN(`bis`.`location_type` = 1) then
+                                        `bis`.`stock_number` ELSE 0
+                                    END
+                            )+SUM(
+                                CASE
+
+                                    WHEN ( `bis`.`location_type` = 1 ) THEN
+                                    `bis`.`outbound_number` ELSE 0
+                                    END
+                             ),
                         0
                 ) AS `total_number`,
             COALESCE ( sum( CASE WHEN ( `bis`.`location_type` = 0 ) THEN `bis`.`stock_number` ELSE 0 END ), 0 ) AS `ck_stock_number`,