xujun

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

@@ -106,8 +106,14 @@ public class ComProject extends BaseEntity {
     /** 计算得分 */
     @ApiModelProperty(value = "计算得分", position = 4)
     private BigDecimal calculateScore;
-    /** 答辩分数 */
-    @ApiModelProperty(value = "答辩分数", position = 4)
+    /** 答辩技术专家评分 */
+    @ApiModelProperty(value = "答辩技术专家评分", position = 4)
+    private BigDecimal defenseTechnologyScore;
+    /** 答辩账务专家评分 */
+    @ApiModelProperty(value = "答辩账务专家评分", position = 4)
+    private BigDecimal defenseEconomyScore;
+    /** 答辩总得分 */
+    @ApiModelProperty(value = "答辩总得分", position = 4)
     private BigDecimal defenseScore;
     /** 项目完成状态 */
     @ApiModelProperty(value = "项目完成状态", position = 38 )

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

@@ -199,8 +199,14 @@ public class ComProjectAuditDTO extends BaseDTO {
     /** 计算得分 */
     @ApiModelProperty(value = "计算得分", position = 4)
     private BigDecimal calculateScore;
-    /** 答辩分数 */
-    @ApiModelProperty(value = "答辩分数", position = 4)
+    /** 答辩技术专家评分 */
+    @ApiModelProperty(value = "答辩技术专家评分", position = 4)
+    private BigDecimal defenseTechnologyScore;
+    /** 答辩账务专家评分 */
+    @ApiModelProperty(value = "答辩账务专家评分", position = 4)
+    private BigDecimal defenseEconomyScore;
+    /** 答辩总得分 */
+    @ApiModelProperty(value = "答辩总得分", position = 4)
     private BigDecimal defenseScore;
 
     /** 评分 */

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

@@ -238,6 +238,6 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
     @PostMapping
     @PreAuthorize("hasAnyRole('GOV')")
     public ResponseDataModel<String> updateDefenseScore(@RequestBody ComProject e) {
-        return ResponseDataModel.ok(comProjectService.updateDefenseScore(e.getId(), e.getDefenseScore()));
+        return ResponseDataModel.ok(comProjectService.updateDefenseScore(e.getId(), e.getDefenseTechnologyScore(), e.getDefenseEconomyScore()));
     }
 }
\ No newline at end of file

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

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

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

@@ -18,6 +18,7 @@ import com.yiboshi.science.param.query.ComProjectQueryVO;
 import com.yiboshi.science.service.*;
 import com.yiboshi.science.utils.*;
 import lombok.AllArgsConstructor;
+import org.apache.poi.hpsf.Decimal;
 import org.apache.velocity.VelocityContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -1114,10 +1115,21 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         return list;
     }
 
-    public String updateDefenseScore (String id, BigDecimal defenseScore) {
+    public String updateDefenseScore (String id, BigDecimal defenseTechnologyScore, BigDecimal defenseEconomyScore) {
         ComProject e = new ComProject();
         e.setId(id);
+        if (Objects.nonNull(defenseTechnologyScore))
+            e.setDefenseTechnologyScore(defenseTechnologyScore);
+        if (Objects.nonNull(defenseEconomyScore))
+            e.setDefenseEconomyScore(defenseEconomyScore);
+        if (Objects.nonNull(defenseTechnologyScore) && Objects.nonNull(defenseEconomyScore)) {
+            // 答辩总得分=答辩技术专家评分*80%+答辩账务专家评分*20%
+            BigDecimal multiplierTech = BigDecimal.valueOf(0.8);
+            BigDecimal multiplierEcon = BigDecimal.valueOf(0.2);
+            BigDecimal defenseScore = defenseTechnologyScore.multiply(multiplierTech).add(defenseEconomyScore.multiply(multiplierEcon));
             e.setDefenseScore(defenseScore);
+        }
+
         return this.update(e);
     }
 }
\ No newline at end of file

science-admin/src/main/resources/mapper/ComProjectAuditDAO.xml

@@ -20,7 +20,8 @@
     <select id="getProjectAuditListByPage"  resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
         SELECT
         a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,c.start_date,c.end_date,c.proj_state,c.knowledge_id,
-        c.total_score,c.average_score,c.technology_score,c.technology_average_score,c.economy_score,c.economy_average_score,c.calculate_score,c.defense_score,
+        c.total_score,c.average_score,c.technology_score,c.technology_average_score,c.economy_score,c.economy_average_score,c.calculate_score,
+        c.defense_technology_score,c.defense_economy_score,c.defense_score,
         d.unit_name app_unit_name,e.person_name app_person_name,p.name as knowledgeName,p1.name as knowledgeParentName, f.total_funding, f.gov_funding,
         (case when g.unit_name = d.unit_name then '直属' else REPLACE(g.unit_name,'卫生健康局','') end) as upUnitName
         FROM com_project_audit a