xujun

science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java

@@ -106,6 +106,9 @@ public class ComProject extends BaseEntity {
     /** 计算得分 */
     @ApiModelProperty(value = "计算得分", position = 4)
     private BigDecimal calculateScore;
+    /** 答辩分数 */
+    @ApiModelProperty(value = "答辩分数", position = 4)
+    private BigDecimal defenseScore;
     /** 项目完成状态 */
     @ApiModelProperty(value = "项目完成状态", position = 38 )
     private String completeStatus;

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java

@@ -99,7 +99,9 @@ public class ComProjectDTO extends BaseDTO {
     /** 计算得分 */
     @ApiModelProperty(value = "计算得分", position = 4)
     private BigDecimal calculateScore;
-
+    /** 答辩分数 */
+    @ApiModelProperty(value = "答辩分数", position = 4)
+    private BigDecimal defenseScore;
 
     /** 项目Id */
     @ApiModelProperty(value="项目Id")

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectController.java

@@ -201,8 +201,7 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
     @ApiOperation(value = "项目导入", httpMethod = "POST", notes = "项目导入")
     @RequestMapping("/projectImport")
     @PostMapping
-    public ResponseDataModel<List<ProjectImportDTO>> projectImport
-            (@Validated @RequestBody List<ProjectImportDTO> list) throws IOException {
+    public ResponseDataModel<List<ProjectImportDTO>> projectImport (@Validated @RequestBody List<ProjectImportDTO> list) throws IOException {
         return ResponseDataModel.ok(comProjectService.projectImport(list));
     }
 
@@ -234,4 +233,11 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
         }
     }
 
+    @ApiOperation(value = "1.02", httpMethod = "POST", notes = "1.02 修改人员状态")
+    @RequestMapping("/updateDefenseScore")
+    @PostMapping
+    @PreAuthorize("hasAnyRole('GOV')")
+    public ResponseDataModel<String> updateDefenseScore(@RequestBody ComProject e) {
+        return ResponseDataModel.ok(comProjectService.updateDefenseScore(e.getId(), e.getDefenseScore()));
+    }
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java

@@ -125,4 +125,5 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro
      */
     List<ProjectImportDTO> projectImport(List<ProjectImportDTO> list) throws IOException;
 
+    String updateDefenseScore (String id, BigDecimal defenseScore);
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -1113,4 +1113,11 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
 //        excelUtils.writeExcel2(list);
         return list;
     }
+
+    public String updateDefenseScore (String id, BigDecimal defenseScore) {
+        ComProject e = new ComProject();
+        e.setId(id);
+        e.setDefenseScore(defenseScore);
+        return this.update(e);
+    }
 }
\ No newline at end of file