提交 d554338d authored 作者: zjm's avatar zjm

修改

上级 6c69b053
流水线 #49 已取消 于阶段
package com.zjty.tynotes.job.basic.controller; package com.zjty.tynotes.job.basic.controller;
import com.zjty.tynotes.job.basic.entity.database.ScoreCoefficient; import com.zjty.tynotes.job.basic.entity.database.ScoreCoefficient;
import com.zjty.tynotes.job.basic.entity.request.ScRo;
import com.zjty.tynotes.job.basic.entity.response.JobResponse; import com.zjty.tynotes.job.basic.entity.response.JobResponse;
import com.zjty.tynotes.job.basic.service.ScoreCoefficientService; import com.zjty.tynotes.job.basic.service.ScoreCoefficientService;
import com.zjty.tynotes.job.common.Action; import com.zjty.tynotes.job.common.Action;
...@@ -37,12 +38,12 @@ public class ScController { ...@@ -37,12 +38,12 @@ public class ScController {
this.scoreCoefficientService = scoreCoefficientService; this.scoreCoefficientService = scoreCoefficientService;
} }
@PostMapping("/") @PostMapping("/save")
@ApiOperation(value = "新增考评信息.", notes = "新增不可在数据中附带id.成功时返回新增数据保存的id.") @ApiOperation(value = "新增考评信息.", notes = "新增不可在数据中附带id.成功时返回新增数据保存的id.")
public ResponseEntity<JobResponse> add(@RequestBody ScoreCoefficient scoreCoefficient, public ResponseEntity<JobResponse> add(@RequestBody ScRo scRo
@RequestParam String userId) { ) {
String saveId = scoreCoefficientService.add(scoreCoefficient); String saveId = scoreCoefficientService.add(scRo.toDb());
businessTreeManagement.saveAction(userId,scoreCoefficient.getWordId(),Action.APPRAISAL_WORD,new Date(),""); businessTreeManagement.saveAction(scRo.getUserId(),scRo.getWordId(),Action.APPRAISAL_WORD,new Date(),"");
return ok(new JobResponse(saveId)); return ok(new JobResponse(saveId));
} }
......
package com.zjty.tynotes.job.basic.entity.database; package com.zjty.tynotes.job.basic.entity.database;
import com.zjty.tynotes.misc.config.AutoDocument;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -8,6 +9,7 @@ import lombok.NoArgsConstructor; ...@@ -8,6 +9,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@AutoDocument
@NoArgsConstructor @NoArgsConstructor
@ApiModel(value = "评分", description = "评分对象") @ApiModel(value = "评分", description = "评分对象")
public class ScoreCoefficient { public class ScoreCoefficient {
......
package com.zjty.tynotes.job.basic.entity.request;
import com.zjty.tynotes.job.basic.entity.database.ScoreCoefficient;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(value = "请求新增考评对象", description = "新增考评对象")
public class ScRo {
/**
* 编号
*/
@ApiModelProperty(value = "编号", example = "id")
private String id;
/**
* 任务id
*/
@ApiModelProperty(value = "任务id", example = "任务id")
private String wordId;
/**
* 自评分
*/
@ApiModelProperty(value = "自评分", example = "score1")
private String score1;
/**
* 自评评语
*/
@ApiModelProperty(value = "自评评语", example = "comments1")
private String comments1;
/**
* 发布者评价
*/
@ApiModelProperty(value = "发布者评价", example = "score2")
private String score2;
/**
* 发布者评语
*/
@ApiModelProperty(value = "发布者评语", example = "comments2")
private String comments2;
/**
* 最终工作量
*/
@ApiModelProperty(value = "最终工作量", example = "endWorkLoad")
private int endWorkLoad;
@ApiModelProperty(value = "用户id", example = "userId")
private String userId;
public ScoreCoefficient toDb(){
return new ScoreCoefficient(id,wordId,score1,comments1,score2,comments2,endWorkLoad);
}
}
...@@ -9,7 +9,6 @@ import lombok.NoArgsConstructor; ...@@ -9,7 +9,6 @@ import lombok.NoArgsConstructor;
import java.util.List; import java.util.List;
@AutoDocument
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
......
...@@ -13,7 +13,6 @@ import lombok.NoArgsConstructor; ...@@ -13,7 +13,6 @@ import lombok.NoArgsConstructor;
* <p>Date : 2019/5/13 15:53 * <p>Date : 2019/5/13 15:53
* <p>@author : C * <p>@author : C
*/ */
@AutoDocument
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论