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

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryOrgReq.java

@@ -13,7 +13,7 @@ public class QueryOrgReq {
     private String orgCode;
     @NotNull(message = "组织机构不能为空",groups = {ValidationApi.detail.class})
     private Long orgId;
-    private Long currentOrg;
+    private String currentOrg;
     private String orgName;
     private Long parentId;
     private Integer isDepartment;

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

@@ -30,7 +30,7 @@ public class ApplicationController {
     @Resource
     private ApplicationService applicationService;
     //获取应用信息的分页
-    @PostMapping(path="/GetAllUpdateCfg",name="获取应用信息的分页")
+    @PostMapping(path="/GetAllUpdateCfg",name="获取应用信息的分页#enable")
     @ApiOperation("获取应用信息的分页")
     public ApiRes<PageResult<Application>> GetAllUpdateCfg(@RequestBody ApplicationReq req){
         return ApiRes.success(applicationService.GetAllUpdateCfg(req));

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

@@ -42,13 +42,14 @@ public class BussinessController {
 
 
     //查看业务单（可以条件查询）
-    @PostMapping(path="/showBussinessOrder",name="查看业务单")
+
+    @PostMapping(path="/showBussinessOrder",name="查看业务单#enable")
     @ApiOperation("查看业务单")
     public ApiRes<PageResult<BusForm>> showBussinessOrder(@RequestBody QueryBusFormReq req){
         return ApiRes.success(busFormService.showBussinessOrder(req));
     }
     //根据业务单id查询出入库单据
-    @PostMapping(path="/showOrderByBusOrderId",name="根据业务单id查询出入库单据")
+    @PostMapping(path="/showOrderByBusOrderId",name="根据业务单id查询出入库单据#enable")
     @ApiOperation("根据业务单id查询出入库单据")
     public ApiRes<Object> showOrderByBusOrderId(@RequestBody QueryBusFormReq req){
         return ApiRes.success(busFormService.showOrderByBusOrderId(req));

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

@@ -49,7 +49,7 @@ public class BussinessInventoryController {
 
     //盘库申请
 
-    @PostMapping(path="/Check",name="预览盘点单")
+    @PostMapping(path="/Check",name="预览盘点单#enable")
     @ApiOperation("预览盘点单")
     public ApiRes<BussinessInventoryDto> Check (@RequestBody @Validated(ValidationApi.detail.class) BussinessInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改
@@ -64,14 +64,14 @@ public class BussinessInventoryController {
         return ApiRes.success(BussinessInventoryService.Start(req));
     }
     //查询列表
-    @PostMapping(path="/GetPage",name="查询列表")
+    @PostMapping(path="/GetPage",name="查询列表#enable")
     @ApiOperation("查询列表")
     public ApiRes<PageResult<BussinessInventory>> GetPage (@RequestBody  BussinessInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改
         return ApiRes.success(BussinessInventoryService.GetPage(req));
     }
     //盘库申请
-    @PostMapping(path="/GetById",name="查询详情")
+    @PostMapping(path="/GetById",name="查询详情#enable")
     @ApiOperation("查询详情")
     public ApiRes<BussinessInventoryDto> GetById (@RequestBody  BussinessInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改

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

@@ -81,23 +81,21 @@ public class CabinetController {
     }
 
     //通过单警柜id查询单个箱门及其箱门信息
-    @PostMapping(path="/ShowOneCabinet",name="查询单个单警柜及其箱门信息")
+    @PostMapping(path="/ShowOneCabinet",name="查询单个单警柜及其箱门信息#enable")
     @ApiOperation("查询单个单警柜及其箱门信息")
     public ApiRes<CabinetDto> showOneCabinet(@RequestBody @Validated(ValidationApi.detail.class) CabinetReq req){
         return ApiRes.success(cabinetService.showOneCabinet(req));
     }
 
-
-    //根据组织机构id查询出单警柜的详细信息(list)
-    @PostMapping(path="/ShowCabinetList",name="查询单警柜列表")
+    @PostMapping(path="/ShowCabinetList",name="查询单警柜列表#enable")
     @ApiOperation("查询单警柜列表")
     public ApiRes<List<CabinetDto>> showCabinetList(@RequestBody CabinetReq req){
         List<CabinetDto> allCabinetList = cabinetService.getAllCabinetList(req);
         return ApiRes.success(allCabinetList);
     }
 
-    //根据组织机构id查询出单警柜的详细信息(page)
-    @PostMapping(path="/ShowCabinetPage",name="查询单警柜列表")
+
+    @PostMapping(path="/ShowCabinetPage",name="查询单警柜列表#enable")
     @ApiOperation("查询单警柜列表")
     public ApiRes<PageResult<CabinetDto>> ShowCabinetPage(@RequestBody CabinetReq req){
         return ApiRes.success(cabinetService.ShowCabinetPage(req));
@@ -105,17 +103,7 @@ public class CabinetController {
 
 
 
-//    @PostMapping("/boxBindPolice")
-//    @ApiOperation("箱门绑定人员")
-//    public ApiRes<Boolean> boxBindPolice(@RequestBody CabinetBoxReq req) {
-//        boolean result = cabinetService.boxBindPolice(req);
-//        if (!result){
-//            return ApiRes.failure("操作失败");
-//        }
-//        return ApiRes.success(result);
-//    }
-
-    @PostMapping(path="/SearchOrgId",name="根据单警柜id查询组织机构id")
+    @PostMapping(path="/SearchOrgId",name="根据单警柜id查询组织机构id#enable")
     @ApiOperation("/根据单警柜id查询组织机构id")
     public ApiRes<Long> SearchOrgId(@RequestBody @Validated(ValidationApi.detail.class) CabinetReq req){
         return ApiRes.success(cabinetService.SearchOrgId(req));

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

@@ -43,14 +43,14 @@ public class DestoryUnitController {
     }
 
     //查询报废/销毁单位(list)
-    @PostMapping(path="/ShowDestoryUnitList",name="查询报废/销毁单位(list)")
+    @PostMapping(path="/ShowDestoryUnitList",name="查询报废/销毁单位(list)#enable")
     @ApiOperation("查询报废/销毁单位(list)")
     public ApiRes<List<DestoryUnit>> showDestoryUnitList(@RequestBody DestoryUnitReq req){
         return ApiRes.success(destoryUnitService.showDestoryUnitList(req));
     }
 
     //查询报废/销毁单位(page)
-    @PostMapping(path="/ShowDestoryUnitPage",name="修改报废/销毁单位(page)")
+    @PostMapping(path="/ShowDestoryUnitPage",name="修改报废/销毁单位(page)#enable")
     @ApiOperation("修改报废/销毁单位(page)")
     public ApiRes<PageResult<DestoryUnit>> showDestoryUnitPage(@RequestBody DestoryUnitReq req){
         return ApiRes.success(destoryUnitService.showDestoryUnitPage(req));

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

@@ -48,13 +48,13 @@ public class DeviceConfigController {
         return ApiRes.success(deviceConfigService.updateDeviceConfig(req));
     }
     //查询配置Page
-    @PostMapping("/showDeviceConfigPage")
+    @PostMapping(path="/showDeviceConfigPage",name="查询配置Page#enable")
     @ApiOperation("查询配置Page")
     public ApiRes<PageResult<DeviceConfig>> showDeviceConfigPage(@RequestBody QueryDeviceConfigReq req){
         return ApiRes.success(deviceConfigService.showDeviceConfigPage(req));
     }
     //查询配置List
-    @PostMapping("/showDeviceConfigList")
+    @PostMapping(path="/showDeviceConfigList",name="查询配置List#enable")
     @ApiOperation("查询配置List")
     public ApiRes<List<DeviceConfig>> showDeviceConfigList(@RequestBody QueryDeviceConfigReq req){
         return ApiRes.success(deviceConfigService.showDeviceConfigList(req));
@@ -73,7 +73,7 @@ public class DeviceConfigController {
         return ApiRes.success(warehouseDevService.updateWarehouseDev(req));
     }
     //查看除湿机配置
-    @PostMapping("/showWarehouseDevList")
+    @PostMapping(path="/showWarehouseDevList",name="查看除湿机配置#enable")
     @ApiOperation("查看除湿机配置")
     public ApiRes<List<WarehouseDev>> showWarehouseDevList(@RequestBody @Validated(ValidationApi.list.class) UpdateWarehouseDevReq req){
         return ApiRes.success(warehouseDevService.showWarehouseDevList(req));

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

@@ -48,19 +48,19 @@ public class EquipmentSizeController {
         return ApiRes.success(equipmentSizeService.deleteSize(req));
     }
 
-    @PostMapping("/GetOneSize")
+    @PostMapping(path="/GetOneSize",name="查询单个号型信息#enable")
     @ApiOperation("查询单个号型信息")
     public ApiRes<EquipmentSize> getOneSize(@RequestBody QueryEquipmentSizeReq req) {
         //ResponseResult returnMsg =
         return ApiRes.success(equipmentSizeService.getOneSize(req));
     }
 
-    @PostMapping("/ShowSize")
+    @PostMapping(path="/ShowSize",name="根据装备类型查询号型#enable")
     @ApiOperation("根据装备类型查询号型")
     public ApiRes<List<EquipmentSizeDto>> getAllSize(@RequestBody QueryEquipmentSizeReq req){
         return ApiRes.success(equipmentSizeService.getAllSize(req));
     }
-    @PostMapping("/GetSizePage")
+    @PostMapping(path="/GetSizePage",name="分页查询号型信息#enable")
     @ApiOperation("分页查询号型信息")
     public ApiRes<PageResult<EquipmentSizeDto>> getSizePage(@RequestBody QueryEquipmentSizeReq req){
         return ApiRes.success(equipmentSizeService.getSizePages(req));
@@ -79,7 +79,7 @@ public class EquipmentSizeController {
     }
 
     //根据typeId返回号型名称
-    @PostMapping("/searchByTypeIds")
+    @PostMapping(path="/searchByTypeIds",name="根据装备类型返回装备号型名称#enable")
     @ApiOperation("/根据装备类型返回装备号型名称")
     public ApiRes<List<String>> searchByTypeIds(@RequestBody QueryEquipmentSizeReq req ){
         return ApiRes.success(equipmentSizeService.getByTypeIds(req));

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

@@ -49,23 +49,25 @@ public class EquipmentTypeController {
         return ApiRes.success(equipmentTypeService.changeEquipmentState(req));
     }
 
-    @PostMapping("/ShowEquipmentList")
+    @PostMapping(path="/ShowEquipmentList",name="查询类别列表#enable")
     @ApiOperation("查询类别列表")
     public ApiRes<List<EquipmentTypeDto>> ShowEquipmentList(@RequestBody QueryEquipmentTypeReq req) {
         return ApiRes.success(equipmentTypeService.getEquipmentList(req));
     }
-    @PostMapping("/ShowEquipmentESList")
+
+    @PostMapping(path="/ShowEquipmentESList",name="查看业务单#enable")
     @ApiOperation("通过ES模糊检索类别列表")
     public ApiRes<ESTypeDto> ShowEquipmentESList(@RequestBody QueryEquipmentTypeReq req) throws IOException {
         return ApiRes.success(equipmentTypeService.getTypeTreeByEs(req));
     }
 
-    @PostMapping("/GetEquipmentDetail")
+
+    @PostMapping(path="/GetEquipmentDetail",name="查询单个物资信息#enable")
     @ApiOperation("查询单个物资信息")
     public ApiRes<EquipmentTypeDto> getEquipment(@RequestBody QueryEquipmentTypeReq req) {
         return ApiRes.success( equipmentTypeService.getEquipment(req));
     }
-    @PostMapping("/getLowType")
+    @PostMapping(path="/getLowType",name="根据上级物资查询下一级信息#enable")
     @ApiOperation("根据上级物资查询下一级信息")
     public ApiRes<List<EquipmentTypeDto>> getLowType(@RequestBody QueryEquipmentTypeReq req) {
         return ApiRes.success(equipmentTypeService.getLowType(req)) ;
@@ -87,7 +89,8 @@ public class EquipmentTypeController {
     }
 
     //返回整棵物资树
-    @PostMapping("/GetTypeTree")
+
+    @PostMapping(path="/GetTypeTree",name="获取整棵物资树#enable")
     @ApiOperation("/获取整棵物资树")
     public ApiRes<List<EquipmentTreeDto>> GetTypeTree(@RequestBody QueryEquipmentTypeReq req){
         return ApiRes.success(equipmentTypeService.GetTypeTree(req));

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

@@ -85,40 +85,42 @@ public class InventoryController {
     }
 
     //根据Epc获取装备信息
-    @PostMapping("/GetInvInfoByEpc")
+
+    @PostMapping(path="/GetInvInfoByEpc",name="根据EPC列表获取装备信息#enable")
     @ApiOperation("根据EPC列表获取装备信息")
     public ApiRes<List<InventoryDto>> GetInvInfoByEpc(@RequestBody InventoryReq req){
         return ApiRes.success(inventoryService.GetInvInfoByEpc(req));
     }
 
     //根据组织机构id/单警柜id/仓库id查询出库存的汇总信息(page)
-    @PostMapping("/GetEquipmentInfo")
+
+    @PostMapping(path="/GetEquipmentInfo",name="根据条件查询库存汇总信息#enable")
     @ApiOperation("根据条件查询库存汇总信息")
     public ApiRes<PageResult<InventorySummary>> getEquipmentInfo(@RequestBody InventorySumReq req) {
         return ApiRes.success(inventorySummaryService.getEquipmentInfo(req));
     }
 
-    @PostMapping("/GetEquipmentSummary")
+
+    @PostMapping(path="/GetEquipmentSummary",name="根据条件查询库存汇总信息#enable")
     @ApiOperation("根据条件查询库存汇总信息（仅类型）")
     public ApiRes<PageResult<InventorySummary>> GetEquipmentSummary(@RequestBody @Validated(ValidationApi.page.class) InventorySumReq req) {
         return ApiRes.success(inventorySummaryService.GetEquipmentSummary(req));
     }
-    @PostMapping("/GetEquipmentSummaryDetail")
+    @PostMapping(path="/GetEquipmentSummaryDetail",name="根据条件查询库存汇总信息#enable")
     @ApiOperation("根据条件查询库存汇总信息（号型）")
     public ApiRes<List<InventorySummary>> GetEquipmentSummaryDetail(@RequestBody InventorySumReq req) {
         return ApiRes.success(inventorySummaryService.GetEquipmentSummaryDetail(req));
     }
 
     //根据条件查询仓库/单警柜下的所有装备信息
-    @PostMapping("/GetDetailByTerms")
+    @PostMapping(path="/GetDetailByTerms",name="根据条件查询仓库#enable")
     @ApiOperation("根据条件查询仓库/单警柜下的所有装备信息")
     public ApiRes<PageResult<InventoryDto>> GetDetailByTerms(@RequestBody @Validated(ValidationApi.export.class) InventoryReq req){
         return ApiRes.success(inventoryService.GetDetailByTerms(req));
     }
 
 
-
-    @PostMapping("/getOne")
+    @PostMapping(path="/getOne",name="获取单个库存的数量#enable")
     @ApiOperation("获取单个库存的数量")
     public ApiRes<InventorySummary> getOne(@RequestBody InventorySumReq req){
         return ApiRes.success(inventorySummaryService.getOne(req));
@@ -127,7 +129,7 @@ public class InventoryController {
 
 
     //根据组织机构id/单警柜id/仓库id查询出库存汇总数量以及金额(和getEquipmentInfo同时调用，汇总出符合查询条件的装备)
-    @PostMapping("/getTotalNumberAndPrice")
+    @PostMapping(path="/getTotalNumberAndPrice",name="查询总金额以及各个汇总数量#enable")
     @ApiOperation("查询总金额以及各个汇总数量")
     public ApiRes<List<InventorySummary>> getTotalNumberAndPrice(@RequestBody InventorySumReq req){
         return ApiRes.success(inventorySummaryService.getTotalNumberAndPrice(req));
@@ -135,21 +137,23 @@ public class InventoryController {
 
 
     //根据装备id查询出装备的详细信息
-    @PostMapping("/GetDetail")
+    @PostMapping(path="/GetDetail",name="根据装备id查询装备明细信息#enable")
     @ApiOperation("根据装备id查询装备明细信息")
     public ApiRes<InventoryDto> getInventoryDetail(@RequestBody @Validated(ValidationApi.detail.class) InventoryReq req) {
         return  ApiRes.success(inventoryService.getInventoryDetail(req));
     }
 
     //查询箱门（cabinetBox下）所有装备简要信息列表（传递cabinetBoxId）
-    @PostMapping("/searchEqsByBoxId")
+
+    @PostMapping(path="/searchEqsByBoxId",name="查询某一箱门下的所有装备简要信息#enable")
     @ApiOperation("查询某一箱门下的所有装备简要信息(list)")
     public ApiRes<List<EqsBriefDto>> searchEqsByBoxId(@RequestBody @Validated(ValidationApi.detail.class) CabinetBoxReq req){
         return ApiRes.success(inventoryService.searchEqsByBoxId(req));
     }
 
     //查询箱门（cabinetBox下）所有装备简要信息列表page（传递cabinetBoxId）
-    @PostMapping("/searchEqsByBoxIdPage")
+
+    @PostMapping(path="/searchEqsByBoxIdPage",name="查询某一箱门下的所有装备简要信息#enable")
     @ApiOperation("查询某一箱门下的所有装备简要信息(page)")
     public ApiRes<PageResult<EqsBriefDto>> searchEqsByBoxIdPage(@RequestBody @Validated(ValidationApi.detail.class) CabinetBoxReq req){
         return ApiRes.success(inventoryService.searchEqsByBoxIdPage(req));
@@ -157,54 +161,61 @@ public class InventoryController {
 
 
     //查询单警柜箱门下的汇总信息（传递cabinetBoxId）
-    @PostMapping("/EqsByCabinetBoxId")
+
+    @PostMapping(path="/EqsByCabinetBoxId",name="查询箱门下的汇总信息#enable")
     @ApiOperation("查询箱门下的汇总信息(list)")
     public ApiRes<List<InventorySummary>> EqsByCabinetBoxId(@RequestBody @Validated(ValidationApi.detail.class)CabinetBoxReq req){
         return ApiRes.success(inventoryService.EqsByCabinetBoxId(req));
     }
 
     //查询单警柜箱门下的汇总信息（传递cabinetBoxId）
-    @PostMapping("/EqsByCabinetBoxIdPage")
+
+    @PostMapping(path="/EqsByCabinetBoxIdPage",name="查询箱门下的汇总信息#enable")
     @ApiOperation("查询箱门下的汇总信息(page)")
     public ApiRes<PageResult<InventorySummary>> EqsByCabinetBoxIdPage(@RequestBody @Validated(ValidationApi.detail.class)CabinetBoxReq req){
         return ApiRes.success(inventoryService.EqsByCabinetBoxIdPage(req));
     }
 
     //根据货架id查询装备信息汇总(list)
-    @PostMapping("/ShelfInventoryList")
+
+    @PostMapping(path="/ShelfInventoryList",name="根据货架id查询装备信息汇总#enable")
     @ApiOperation("根据货架id查询装备信息汇总(list)")
     public ApiRes<List<InventorySummary>> ShelfInventoryList(@RequestBody @Validated(ValidationApi.edit.class) ShelfReq req){
         return ApiRes.success(inventoryService.ShelfInventoryList(req));
     }
 
     //根据货架id查询装备信息汇总 (page)
-    @PostMapping("/ShelfInventoryPage")
+
+    @PostMapping(path="/ShelfInventoryPage",name="根据货架id查询装备信息汇总#enable")
     @ApiOperation("根据货架id查询装备信息汇总(page)")
     public ApiRes<PageResult<InventorySummary>> ShelfInventoryPage(@RequestBody @Validated(ValidationApi.edit.class) ShelfReq req){
         return ApiRes.success(inventoryService.ShelfInventoryPage(req));
     }
 
-    @PostMapping("/ShelfInventoryDetail")
+
+    @PostMapping(path="/ShelfInventoryDetail",name="通过货架id查询每件装备信息简要#enable")
     @ApiOperation(("/通过货架id查询每件装备信息简要(list)"))
     public ApiRes<List<EqsBriefDto>> AreaInventoryDetail(@RequestBody @Validated(ValidationApi.list.class) InventoryReq req){
         return ApiRes.success(inventoryService.ShelfInventoryDetail(req));
     }
 
-    @PostMapping("/ShelfEqsPage")
+
+    @PostMapping(path="/ShelfEqsPage",name="通过货架id查询每件装备信息简要#enable")
     @ApiOperation(("/通过货架id查询每件装备信息简要(page)"))
     public ApiRes<PageResult<EqsBriefDto>> ShelfInventoryPage(@RequestBody @Validated(ValidationApi.list.class) InventoryReq req){
         return ApiRes.success(inventoryService.ShelfInventoryPage(req));
     }
 
     //根据区域id查询装备信息汇总(list)
-    @PostMapping("/AreaInventoryList")
+
+    @PostMapping(path="/AreaInventoryList",name="根据区域id查询装备信息汇总#enable")
     @ApiOperation("根据区域id查询装备信息汇总(list)")
     public ApiRes<List<InventorySummary>> AreaInventoryList(@RequestBody @Validated(ValidationApi.edit.class) WarehouseAreaReq req){
         return ApiRes.success(inventoryService.AreaInventoryList(req));
     }
 
     //根据区域id查询装备信息汇总(page)
-    @PostMapping("/AreaInventoryPage")
+    @PostMapping(path="/AreaInventoryPage",name="根据区域id查询装备信息汇总#enable")
     @ApiOperation("根据区域id查询装备信息汇总(page)")
     public ApiRes<PageResult<InventorySummary>> AreaInventoryPage(@RequestBody @Validated(ValidationApi.edit.class) WarehouseAreaReq req){
         return ApiRes.success(inventoryService.AreaInventoryPage(req));
@@ -220,7 +231,8 @@ public class InventoryController {
 
     //根据条件（组织机构，装备类型id，装备型号id，装备型号名称）查询装备总数，在库数，出库数，单警柜在库数，单警柜出库数，报废数
     //查询装备数量报表
-    @PostMapping("/GetListEquipment")
+
+    @PostMapping(path="/GetListEquipment",name="根据条件查询数量汇总#enable")
     @ApiOperation("根据条件查询数量汇总")
     public ApiRes<List<EqsSumDto>> GetListEquipment(@RequestBody InventoryReq req){
         return ApiRes.success(inventoryService.GetListEquipment(req));
@@ -235,7 +247,8 @@ public class InventoryController {
     //根据仓库id和orgId查询出库存中存在的装备typeId
     //根据仓库id，orgId,type_id 查询出装备号型sizeId
     //根据仓库id，orgId，typeId，sizeId查询出单价和对应的数量
-    @PostMapping("/GetInventorySumInfo")
+
+    @PostMapping(path="/GetInventorySumInfo",name="查询出库存中的装备信息#enable")
     @ApiOperation("查询出库存中的装备信息")
     public ApiRes<List<InventorySumDto>> GetInventorySumInfo(@RequestBody InventorySumReq req){
         return ApiRes.success(inventorySummaryService.GetInventorySumInfo(req));
@@ -271,13 +284,15 @@ public class InventoryController {
         return ApiRes.success(inventorySummaryService.insertToSummary());
     }
 
-    @PostMapping("/selectTotalNum")
+
+    @PostMapping(path="/selectTotalNum",name="根据组织机构和装备查询库存#enable")
     @ApiOperation("根据组织机构和装备查询库存")
     public ApiRes<List<InventorySumDto>> selectTotalNum(@RequestBody SelectTotalNumReq req){
         return ApiRes.success(inventorySummaryService.selectTotalNum(req));
     }
 
-    @PostMapping("/selectSumByItems")
+
+    @PostMapping(path="/selectSumByItems",name="通过条件查询库存汇总#enable")
     @ApiOperation("通过条件查询库存汇总")
     public ApiRes<List<InventorySummary>> selectSumByItems(@RequestBody SelectTotalNumReq req){
         return ApiRes.success(inventorySummaryService.selectSumByItems(req));

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

@@ -41,18 +41,18 @@ public class PubOrgController {
         ResponseResult returnMsg = pubOrgService.setShortName(orgId);
         return returnMsg;
     }
-
-    @PostMapping("/GetOrgList")
+    @PostMapping(path="/GetOrgList",name="查询组织机构列表#enable")
     @ApiOperation("查询组织机构列表")
     public ApiRes<List<OrgDto>> getOrgList(@RequestBody QueryOrgReq req) {
         return ApiRes.success(pubOrgService.getOrgList(req));
     }
-    @PostMapping("/GetCurrentList")
+    @PostMapping(path="/GetCurrentList",name="根据当前组织机构列表查询#enable")
     @ApiOperation("根据当前组织机构列表查询")
     public ApiRes<OrgDto> GetCurrentList(@RequestBody @Validated(ValidationApi.detail.class) QueryOrgReq req) {
         return ApiRes.success(pubOrgService.getOrgHierarchy(req));
     }
-    @PostMapping("/GetCurrentESList")
+
+    @PostMapping(path="/GetCurrentESList",name="根据当前组织机构列表ES查询#enable")
     @ApiOperation("根据当前组织机构列表ES查询")
     public ApiRes<ESOrgDto> GetCurrentESList(@RequestBody  QueryOrgReq req) throws IOException {
         return ApiRes.success(pubOrgService.getOrgTreeByEs(req));
@@ -62,13 +62,14 @@ public class PubOrgController {
     public ApiRes<Boolean> changeOrgState(@RequestBody @Validated(ValidationApi.updateStatus.class) UpdateOrgReq req) {
         return ApiRes.success(pubOrgService.ChangeState(req));
     }
-    @PostMapping("/GetLowOrg")
+
+    @PostMapping(path="/GetLowOrg",name="根据组织机构查询下一级信息#enable")
     @ApiOperation("根据组织机构查询下一级信息")
     public ApiRes<List<OrgDto>> getLowOrg(@RequestBody QueryOrgReq req) {
         return ApiRes.success(pubOrgService.getLowOrg(req)) ;
     }
     //通过组织机构id获取上一层的组织机构数据
-    @PostMapping("getUpOrgInfo")
+    @PostMapping(path="/getUpOrgInfo",name="获取上级组织机构信息#enable")
     @ApiOperation("获取上级组织机构信息")
     public ApiRes<OrgDto> getUpOrgInfo(@RequestBody QueryOrgReq req){
         return ApiRes.success(pubOrgService.getUpOrgInfo(req));

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.Repository.PubOrgRepository;
 import com.junmp.jyzb.api.bean.dto.*;
@@ -377,7 +378,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
      * @return
      * @throws IOException
      */
-    public List<PubOrg> searchOrg(Integer pageNum, Integer pageSize, String keyword, Long currentOrg) throws IOException {
+    public List<PubOrg> searchOrg(Integer pageNum, Integer pageSize, String keyword, String currentOrg) throws IOException {
         if (pageNum < 0) pageNum = 0;
 
         SearchRequest request = new SearchRequest("org_pinyin");
@@ -397,8 +398,11 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
 
         // 添加过滤条件，orgParentIds 包含当前字段，或者 orgId 等于当前字段
         BoolQueryBuilder orgFilter = QueryBuilders.boolQuery();
+        if (StringUtils.isNotBlank(currentOrg) )
+        {
         orgFilter.should(QueryBuilders.wildcardQuery("orgParentIds", "*" + currentOrg + "*"));
         orgFilter.should(QueryBuilders.termQuery("orgId", currentOrg.toString()));
+        }
         boolQueryBuilder.filter(orgFilter);
 
         builder.query(boolQueryBuilder);
@@ -552,7 +556,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
 
 
         // 先进行搜索，获取前20条数据
-        List<PubOrg> searchResults = searchOrg(0, 20, req.getOrgName(),req.getCurrentOrg());
+        List<PubOrg> searchResults = searchOrg(0, 20, req.getOrgName(), req.getCurrentOrg());
         req.setDelFlag(1);
         // 获取所有组织机构数据
         List<PubOrg> orgsAll=searchAll(0, 3000);

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/FlowDefinitionController.java

@@ -28,7 +28,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/FlowDefinition")
-@Api(tags = "流程定义")
+@Api(tags = "[工作流]流程定义")
 public class FlowDefinitionController {
     @Autowired
     private IFlowDefinitionService FlowDefinitionService;

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/FlowInstanceController.java

@@ -18,7 +18,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/FlowInstance")
-@Api(tags = "流程实例")
+@Api(tags = "[工作流]流程实例")
 public class FlowInstanceController {
     @Autowired
     private IFlowInstanceService flowInstanceService;

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/FlowTaskController.java

@@ -31,7 +31,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @RequestMapping("/FlowTask")
-@Api(tags = "流程任务")
+@Api(tags = "[工作流]流程任务")
 public class FlowTaskController {
     @Autowired
     private IFlowTaskService FlowTaskService;

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/SysFormController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @RestController
 @RequestMapping("/SysForm")
-@Api(tags = "流程编辑")
+@Api(tags = "[工作流]流程编辑")
 public class SysFormController {
     @Autowired
     private ISysFormService SysFormService;
@@ -45,8 +45,8 @@ public class SysFormController {
         return  ApiRes.success(SysFormService.updateFormName(process));
     }
     @ApiOperation("获取全部可用的表单和审核流")
-    @GetMapping(value = "GetFormList")
-    public ApiRes<PageResult<TemplateGroupVo>> GetFormList(BaseRequest br) {
+    @PostMapping(value = "GetFormList")
+    public ApiRes<PageResult<TemplateGroupVo>> GetFormList(@RequestBody BaseRequest br) {
         return ApiRes.success(SysFormService.getFormList(br));
     }
 

jyzb-process/src/main/java/com/junmp/junmpProcess/entity/ProcessTemplates.java

@@ -29,7 +29,8 @@ public class ProcessTemplates {
     @TableField(exist = false)
     private String formId;
     private String formName;
-    private String orgId;
+    @TableField(value = "org_id")
+    private Long orgId;
     @TableField(exist = false)
     private Integer groupId;
     /**

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -210,7 +210,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
                             .formId(v.getTemplateId())
                             .remark(v.getRemark())
                             .formName(v.getFormName())
-                            .orgId(v.getOrgId())
+                            .orgId(String.valueOf(v.getOrgId()))
                             .isStop(v.getIsStop())
                             .updated(DateFormatUtils.format(v.getUpdated(),"yyyy年MM月dd日 HH时:mm分:ss秒"))
                             .templateId(v.getTemplateId())
@@ -278,7 +278,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
         ProcessTemplates processTemplates = ProcessTemplates.builder().build();
         String templateId = idWorker.nextId()+"";
-        processTemplates.setOrgId(req.getOrgId());
+        processTemplates.setOrgId(Long.valueOf(req.getOrgId()));
         processTemplates.setTemplateId(templateId);
         processTemplates.setFormName(req.getFormName());
         processTemplates.setRemark(req.getRemark());

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -793,6 +793,21 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         {
             vo.setTaskId(tasks.get(0).getId());
         }
+        //点击后消除已读消息,暂时不用，依赖前端处理
+        MessageReq reqmsg=new MessageReq();
+        reqmsg.setBizId(Long.valueOf(processInstanceId));
+        reqmsg.setReceiveUserId(StartUser.getUserId());
+        reqmsg.setReadFlag(0);
+        List<MessageRes> msgRes= messageApi.queryList(reqmsg);
+        if (msgRes.size()>0)
+        {
+            // 使用流将 id 取出，并用逗号拼接成字符串
+            String ids = msgRes.stream()
+                    .map(MessageRes::getMsgId)
+                    .map(String::valueOf) // 将 id 转换为字符串
+                    .collect(Collectors.joining(","));
+            messageApi.batchReadFlagByMessageIds(ids, MsgReadStateEnum.READ);
+        }
 
         String tempID= flowInstanceService.getFormIdByInstanceId(processInstanceId);//先拿到表单id，然后通过表单拿到初始表结构
         ProcessTemplates processTemplates = processTemplateService.getById(tempID);

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/SysFormServiceImpl.java

@@ -141,7 +141,11 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
 
     public PageResult<TemplateGroupVo> getFormList(BaseRequest br)
     {
+        Map<String, Object> params = br.getParams();
         LambdaQueryWrapper<ProcessTemplates> wrapper = new LambdaQueryWrapper<ProcessTemplates>();
+        wrapper.and(q -> q.eq(ProcessTemplates::getOrgId, params.get("orgId"))
+                .or()
+                .isNull(ProcessTemplates::getOrgId));
         wrapper.orderByDesc(ProcessTemplates::getUpdated);
         TemplateGroupMapper templateGroupMapper = SpringContextHolder.getBean(TemplateGroupMapper.class);
         Page<ProcessTemplates> allformAndGroups =this.page(PageFactory.getDefaultPage(),wrapper);
@@ -176,6 +180,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
                             .formId(v.getTemplateId())
                             .remark(v.getRemark())
                             .formName(v.getFormName())
+                            .orgId(String.valueOf(v.getOrgId()))
                             .isStop(v.getIsStop())
                             .updated(DateFormatUtils.format(v.getUpdated(),"yyyy年MM月dd日 HH时:mm分:ss秒"))
                             .templateId(v.getTemplateId())