藏品转拍卖品2

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/SysSpecialPerformanceController.java

@@ -5,15 +5,14 @@ import com.wwdz.ch.admin.service.SysSpecialPerformanceService;
 import com.wwdz.ch.admin.service.SysSupplierItemService;
 import com.wwdz.ch.core.consts.ResultCode;
 import com.wwdz.ch.core.type.Result;
-import com.wwdz.ch.db.domain.distribution.SpecialPerformanceConfig;
 import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceConfigRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import com.xxdxxs.service.FormHandler;
+import com.xxdxxs.validation.Validator;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -53,8 +52,13 @@ public class SysSpecialPerformanceController {
     @PostMapping("/create")
     public Result create(@RequestBody SpecialPerformanceRequestDto dto) {
         logger.info("新增拍卖专场,请求参数:{}", JSON.toJSONString(dto));
-        if (dto.getSpecialPerformanceId() == null) {
-            return Result.failed(ResultCode.PARAM_ERROR);
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("title", "专场标题").must().string()
+                .set("startTime", "开始时间").must().string()
+                .set("endTime", "结束时间").must().string()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
         }
         return sysSpecialPerformanceService.create(dto);
     }

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSpecialPerformanceServiceImpl.java

@@ -57,6 +57,8 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
     @Override
     public Result findList(SpecialPerformanceRequestDto dto) {
         try {
+            //排除已经删除的专场
+            dto.setFilterState(SpecialPerformanceEnum.StateEnum.DELETED.getCode());
             List<SpecialPerformance> list = specialPerformanceDao.find(dto);
             PageInfo pageInfo = new PageInfo(list);
             List<SpecialPerformanceVo> specialPerformanceVos = new ArrayList<>();

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/SpecialPerformanceRequestDto.java

@@ -57,6 +57,11 @@ public class SpecialPerformanceRequestDto extends BaseRequestDto implements Enti
      */
     private Integer state;
 
+    /**
+     * 排除的状态
+     */
+    private Integer filterState;
+
     private Date startQueryTime;
 
     private Date endQueryTime;

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SpecialPerformanceDaoImpl.java

@@ -26,6 +26,7 @@ public class SpecialPerformanceDaoImpl implements SpecialPerformanceDao {
         SpecialPerformanceExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
         JdbcHelper.ifPresent(dto.getState(), criteria::andStateEqualTo);
+        JdbcHelper.ifPresent(dto.getFilterState(), criteria::andStateNotEqualTo);
         JdbcHelper.ifPresent(dto.getStartQueryTime(), criteria::andStartTimeLessThanOrEqualTo);
         JdbcHelper.ifPresent(dto.getEndQueryTime(), criteria::andStartTimeGreaterThanOrEqualTo);
         example.setOrderByClause(" update_time desc");