Merge remote-tracking branch 'origin/feature/0406-degree' into feature/0406-degree

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/EDegreeStatus.java

@@ -47,6 +47,6 @@ public enum EDegreeStatus implements BaseEnum<String, EDegreeStatus> {
      */
     @Override
     public String getCode() {
-        return null;
+        return this.code;
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DegreeWrapper.java

@@ -20,6 +20,9 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.cfg.defs.EANDef;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * 考级信息
  * 2023-04-10 10:24:25
@@ -79,22 +82,27 @@ public class DegreeWrapper {
         @ApiModelProperty("机构ID")
         private Integer tenantId;
 
-        @ApiModelProperty("分部ID")
+        @ApiModelProperty(value = "分部ID",required = true)
+        @NotBlank(message = "分部ID不能为空")
         private String organIds;
 
         @ApiModelProperty("分部名称")
         private List<String> organNames;
 
-        @ApiModelProperty("考级名称")
+        @ApiModelProperty(value = "考级名称",required = true)
+        @NotBlank(message = "考级名称不能为空")
         private String name;
 
-        @ApiModelProperty("报名开始时间")
+        @ApiModelProperty(value = "报名开始时间",required = true)
+        @NotNull(message = "报名开始时间不能为空")
         private Date startTime;
 
-        @ApiModelProperty("报名结束时间")
+        @ApiModelProperty(value = "报名结束时间",required = true)
+        @NotNull(message = "报名结束时间不能为空")
         private Date endTime;
 
-        @ApiModelProperty("登记时间")
+        @ApiModelProperty(value = "登记时间",required = true)
+        @NotNull(message = "登记时间不能为空")
         private Date registrationTime;
 
         @ApiModelProperty("报名人次")
@@ -109,9 +117,6 @@ public class DegreeWrapper {
         @ApiModelProperty("报名状态 NOT_START:未开始,START:报名中,END:报名结束")
         private EDegreeStatus status;
 
-        @ApiModelProperty("创建时间")
-        private Date createTime;
-
 
         public String jsonString() {
             return JSON.toJSONString(this);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.entity.Organization;
+import com.ym.mec.biz.dal.enums.EDegreeStatus;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,7 @@ import com.ym.mec.biz.service.DegreeService;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -95,18 +97,39 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
      * @return Boolean
      */
     @Override
-    public Boolean add(DegreeWrapper.Degree degree) {    	
+    public Boolean add(DegreeWrapper.Degree degree) {
+
+        Integer tenantId = TenantContextHolder.getTenantId();
+        degree.setTenantId(tenantId);
+        updateDegreeStatus(degree);
+
         
         return this.save(JSON.parseObject(degree.jsonString(), Degree.class));
     }
 
     /**
+     * 根据时间设置状态
+     * @param degree DegreeWrapper.Degree
+     */
+    private void updateDegreeStatus(DegreeWrapper.Degree degree) {
+        if (degree.getStartTime().compareTo(new Date()) > 0) {
+            degree.setStatus(EDegreeStatus.NOT_START);
+        } else if (degree.getStartTime().compareTo(new Date()) <= 0 && degree.getEndTime().compareTo(new Date()) >= 0) {
+            degree.setStatus(EDegreeStatus.START);
+        } else {
+            degree.setStatus(EDegreeStatus.END);
+        }
+
+    }
+
+    /**
      * 更新
      * @param degree DegreeWrapper.Degree
      * @return Boolean
      */
     @Override
     public Boolean update(DegreeWrapper.Degree degree){
+        updateDegreeStatus(degree);
 
         return this.updateById(JSON.parseObject(degree.jsonString(), Degree.class));       
     }

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeInfoController.java

@@ -56,30 +56,33 @@ public class DegreeInfoController extends BaseController {
 	}
     
     @ApiOperation(value = "新增", notes = "考级信息- 传入 DegreeWrapper.Degree")
-    @PreAuthorize("@pcs.hasPermissions('degree/save')")
+//    @PreAuthorize("@pcs.hasPermissions('degree/save')")
 	@PostMapping("/save")
-	public HttpResponseResult<JSONObject> add(@Validated @RequestBody Degree degree) {
+	public HttpResponseResult<JSONObject> add(@Validated @RequestBody DegreeWrapper.Degree degree) {
         
         // 新增数据
-        degreeService.save(degree);
+        degreeService.add(degree);
         
         return succeed();
 	}
     
     @ApiOperation(value = "修改", notes = "考级信息- 传入 DegreeWrapper.Degree")
-    @PreAuthorize("@pcs.hasPermissions('degree/update')")
+//    @PreAuthorize("@pcs.hasPermissions('degree/update')")
 	@PostMapping("/update")
-	public HttpResponseResult<JSONObject> update(@Validated @RequestBody Degree degree) {
-        
+	public HttpResponseResult<JSONObject> update(@Validated @RequestBody DegreeWrapper.Degree degree) {
+
+        if (degree.getId() == null) {
+            return failed("id不能为空");
+        }
         // 更新数据
-        degreeService.updateById(degree);
+        degreeService.update(degree);
         
         return succeed();
 	}
 
 	@ApiOperation(value = "删除", notes = "考级信息- 传入id")
     @PreAuthorize("@pcs.hasPermissions('degree/remove')")
-	@PostMapping("/remove")    
+//	@PostMapping("/remove")
 	public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
     
 		return succeed(degreeService.removeById(id));