Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -69,3 +69,6 @@ UPDATE sys_privilege SET related = '2014' WHERE (id = '110');
 -- 2023/08/16
 ALTER TABLE `t_b_user_archives_allocation`
     CHANGE COLUMN `crm_no` `crm_no` VARCHAR(100) NOT NULL COMMENT 'crm单号' ;
+
+-- 2023/08/17
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('2015', '公共接口-查询服务单元列表', '/api/admin/common/query_service_unit', 'URL', '64', '25', 'SYS', '1', '1', '0');

sop-server/src/main/java/com/qmth/sop/server/api/SysController.java

@@ -16,10 +16,7 @@ import com.qmth.sop.business.bean.dto.OrgDtoNotTree;
 import com.qmth.sop.business.bean.dto.RoleDto;
 import com.qmth.sop.business.bean.dto.UserDto;
 import com.qmth.sop.business.bean.params.LoginParam;
-import com.qmth.sop.business.bean.result.AttachmentResult;
-import com.qmth.sop.business.bean.result.EditResult;
-import com.qmth.sop.business.bean.result.LoginResult;
-import com.qmth.sop.business.bean.result.MenuResult;
+import com.qmth.sop.business.bean.result.*;
 import com.qmth.sop.business.cache.CommonCacheService;
 import com.qmth.sop.business.entity.*;
 import com.qmth.sop.business.service.*;
@@ -93,6 +90,9 @@ public class SysController {
     @Resource
     CacheService cacheService;
 
+    @Resource
+    TBServiceService tbServiceService;
+
     @ApiOperation(value = "登录")
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = LoginResult.class)})
@@ -451,4 +451,24 @@ public class SysController {
         }
         return ResultUtil.ok(map);
     }
+
+    @ApiOperation(value = "公共接口-查询服务单元列表")
+    @RequestMapping(value = "/query_service_unit", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = TBService.class)})
+    public Result queryServiceUnit(@ApiParam(value = "业务类型") @RequestParam(required = false) ProductTypeEnum type,
+                                   @ApiParam(value = "服务状态") @RequestParam(required = false) ServiceStatusEnum status,
+                                   @ApiParam(value = "服务单元名称") @RequestParam(required = false) String name) {
+        QueryWrapper<TBService> queryWrapper = new QueryWrapper<>();
+        if (Objects.nonNull(type)) {
+            queryWrapper.lambda().eq(TBService::getType, type);
+        }
+        if (Objects.nonNull(status)) {
+            queryWrapper.lambda().eq(TBService::getStatus, status);
+        }
+        if (name != null && name.length() > 0) {
+            queryWrapper.lambda().like(TBService::getName, SystemConstant.translateSpecificSign(name));
+        }
+        List<TBService> tbServiceList = tbServiceService.list(queryWrapper);
+        return ResultUtil.ok(tbServiceList);
+    }
 }