咨询机构管理:bug修复

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyManageController.java

@@ -25,7 +25,6 @@ import javax.validation.constraints.NotNull;
  * @author sxk
  * @since 2023-12-10 15:34:46
  */
-@Validated
 @RestController
 @RequestMapping("advisory/body")
 public class AdvisoryBodyManageController extends BaseController {
@@ -58,7 +57,7 @@ public class AdvisoryBodyManageController extends BaseController {
      * 获取合作项目明细
      */
     @GetMapping("/getCooperateProjectDetailList")
-    public TableDataInfo<CooperateProjectDetailSearchVo> getCooperateProjectDetailList(CooperateProjectDetailSearchBo cooperateProjectDetailSearchBo, PageQuery pageQuery) {
+    public TableDataInfo<CooperateProjectDetailSearchVo> getCooperateProjectDetailList(@Validated CooperateProjectDetailSearchBo cooperateProjectDetailSearchBo, PageQuery pageQuery) {
         return baseService.queryCooperateProjectDetailList(cooperateProjectDetailSearchBo, pageQuery);
     }
 
@@ -66,7 +65,7 @@ public class AdvisoryBodyManageController extends BaseController {
      * 获取项目详情
      */
     @GetMapping("/getProjectDetail")
-    public R<ProjectDetailVo> getProjectDetail(ProjectDetailBo projectDetailBo) {
+    public R<ProjectDetailVo> getProjectDetail(@Validated ProjectDetailBo projectDetailBo) {
         return R.ok(baseService.queryProjectDetail(projectDetailBo));
     }
 
@@ -74,7 +73,7 @@ public class AdvisoryBodyManageController extends BaseController {
      * 校验咨询机构是否存在
      */
     @GetMapping("/checkAdvisoryBodyExist")
-    public R<AdvisoryBodyExistVo> checkAdvisoryBodyExist(@NotBlank(message = "咨询机构名称不能为空") String advisoryBodyName) {
+    public R<AdvisoryBodyExistVo> checkAdvisoryBodyExist(@Validated @NotBlank(message = "咨询机构名称不能为空") String advisoryBodyName) {
         return R.ok(advisoryBodyService.checkAdvisoryBodyExist(advisoryBodyName));
     }
 
@@ -82,7 +81,7 @@ public class AdvisoryBodyManageController extends BaseController {
      * 新增咨询机构
      */
     @PostMapping("/addAdvisoryBody")
-    public R<Void> addAdvisoryBody(AddAdvisoryBodyBo addAdvisoryBodyBo) {
+    public R<Void> addAdvisoryBody(@Validated AddAdvisoryBodyBo addAdvisoryBodyBo) {
         return toAjax(advisoryBodyService.addAdvisoryBody(addAdvisoryBodyBo));
     }
 
@@ -90,7 +89,7 @@ public class AdvisoryBodyManageController extends BaseController {
      * 获取咨询机构自定义表单
      */
     @GetMapping("/getAdvisoryBodyCustomForm/{projectKey}")
-    public R<AdvisoryBodyCustomForm> getAdvisoryBodyCustomForm(@NotNull(message = "项目主键不能为空") @PathVariable Long projectKey) {
+    public R<AdvisoryBodyCustomForm> getAdvisoryBodyCustomForm(@Validated @NotNull(message = "项目主键不能为空") @PathVariable Long projectKey) {
         return R.ok(advisoryBodyCustomFormService.getById(projectKey));
     }
 
@@ -98,7 +97,7 @@ public class AdvisoryBodyManageController extends BaseController {
      * 新增咨询机构自定义表单
      */
     @PostMapping("/addAdvisoryBodyCustomForm")
-    public R<Void> addAdvisoryBodyCustomForm(AdvisoryBodyCustomForm advisoryBodyCustomForm) {
+    public R<Void> addAdvisoryBodyCustomForm(@Validated AdvisoryBodyCustomForm advisoryBodyCustomForm) {
         return toAjax(advisoryBodyCustomFormService.save(advisoryBodyCustomForm));
     }
 
@@ -106,7 +105,7 @@ public class AdvisoryBodyManageController extends BaseController {
      * 更新咨询机构自定义表单
      */
     @PutMapping("/updateAdvisoryBodyCustomForm")
-    public R<Void> updateAdvisoryBodyCustomForm(AdvisoryBodyCustomForm advisoryBodyCustomForm) {
+    public R<Void> updateAdvisoryBodyCustomForm(@Validated AdvisoryBodyCustomForm advisoryBodyCustomForm) {
         return toAjax(advisoryBodyCustomFormService.updateById(advisoryBodyCustomForm));
     }
 }
\ No newline at end of file

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/DProject.java

 package com.dsk.cscec.domain;
 
-import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,9 +11,8 @@ import java.util.Date;
  * @author sxk
  * @since 2023-12-10 15:34:49
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class DProject extends BaseEntity implements Serializable {
+public class DProject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**