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

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

@@ -200,4 +200,9 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1038, '派单管理', '/api/admin/tb/crm/save', 'URL', 50, 7, 'AUTH', NULL, 1, 1, 0);
 UPDATE `sys_privilege` SET `name` = '派单管理', `url` = 'crm', `type` = 'MENU', `parent_id` = 50, `sequence` = 1, `property` = 'AUTH', `related` = '1032,1033,1035,1036,1037,1038', `enable` = 1, `default_auth` = 0, `front_display` = 1 WHERE `id` = 51;
 UPDATE `sys_privilege` SET `name` = '统计查询', `url` = 'crmCount', `type` = 'MENU', `parent_id` = 50, `sequence` = 2, `property` = 'AUTH', `related` = '1034', `enable` = 1, `default_auth` = 0, `front_display` = 1 WHERE `id` = 52;
--------------------------------
+-------------------------------
+
+---2023.8.16
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(1039, '客户表查询', '/api/sys/custom/list', 'URL', 64, 25, 'SYS', NULL, 1, 1, 0);

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

@@ -8,8 +8,9 @@ import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.SysCustomResult;
-import com.qmth.sop.business.bean.result.SysLevelResult;
-import com.qmth.sop.business.entity.*;
+import com.qmth.sop.business.entity.SysCustom;
+import com.qmth.sop.business.entity.SysSupplier;
+import com.qmth.sop.business.entity.TBTask;
 import com.qmth.sop.business.service.SysCustomRoleService;
 import com.qmth.sop.business.service.SysCustomService;
 import com.qmth.sop.business.service.TBTaskService;
@@ -21,7 +22,6 @@ import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -30,6 +30,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 客户表 控制器.
@@ -131,4 +132,15 @@ public class SysCustomController {
         TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
         return ResultUtil.ok(tbTask.getId());
     }
+
+    //按照类型状态查询客户
+    @ApiOperation(value = "客户表查询")
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysCustom.class )})
+    public Result list(@ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Boolean enable,
+                       @ApiParam(value = "类型", required = false) @RequestParam(required = false) ProductTypeEnum type) {
+        return ResultUtil.ok(sysCustomService.list(new QueryWrapper<SysCustom>().lambda().eq(Objects.nonNull(enable),SysCustom::getEnable, enable).eq(Objects.nonNull(type),SysCustom::getType, type)));
+    }
+
+
 }