Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-health-science

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

@@ -59,6 +59,19 @@ public class ComProjectAssign extends BaseEntity {
     private BigDecimal score16;
     @ApiModelProperty(value = "score17", position = 4)
     private BigDecimal score17;
+    @ApiModelProperty(value = "score18", position = 4)
+    private BigDecimal score18;
+    @ApiModelProperty(value = "score19", position = 4)
+    private BigDecimal score19;
+    /** 附加项 */
+    @ApiModelProperty(value = "附加项", position = 9)
+    private BigDecimal additionalScore;
+    /** 申请经费 */
+    @ApiModelProperty(value = "申请经费", position = 9)
+    private BigDecimal applyFunding;
+    /** 建议财政支持经费 */
+    @ApiModelProperty(value = "建议财政支持经费", position = 9)
+    private BigDecimal recommendFunding;
     /** 总分 */
     @ApiModelProperty(value = "总分", position = 9)
     private BigDecimal totalScore;

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

@@ -62,6 +62,19 @@ public class ComProjectAssignDTO extends BaseDTO {
     private BigDecimal score16;
     @ApiModelProperty(value = "score17", position = 4)
     private BigDecimal score17;
+    @ApiModelProperty(value = "score18", position = 4)
+    private BigDecimal score18;
+    @ApiModelProperty(value = "score19", position = 4)
+    private BigDecimal score19;
+    /** 附加项 */
+    @ApiModelProperty(value = "附加项", position = 9)
+    private BigDecimal additionalScore;
+    /** 申请经费 */
+    @ApiModelProperty(value = "申请经费", position = 9)
+    private BigDecimal applyFunding;
+    /** 建议财政支持经费 */
+    @ApiModelProperty(value = "建议财政支持经费", position = 9)
+    private BigDecimal recommendFunding;
     /** 总分 */
     @ApiModelProperty(value = "总分", position = 9)
     private BigDecimal totalScore;
@@ -85,6 +98,17 @@ public class ComProjectAssignDTO extends BaseDTO {
 
     /** 评审状态 */
     private String stateName;
+
+    /** 姓名 */
+    @ExcelProperty("姓名")
+    @ApiModelProperty(value = "姓名", position = 3)
+    private String appUnitName;
+
+    /** 姓名 */
+    @ExcelProperty("姓名")
+    @ApiModelProperty(value = "姓名", position = 3)
+    private String appPersonName;
+
     /** 证件号 */
     @ExcelProperty("证件号")
     @ApiModelProperty(value = "证件号", position = 1)
@@ -129,6 +153,7 @@ public class ComProjectAssignDTO extends BaseDTO {
     /** 用户名 */
     @ApiModelProperty(value = "用户名", position = 13)
     private String username;
+
     /** 项目名称 */
     @ApiModelProperty(value = "项目名称", position = 1 )
     private String projName;

science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectAssignQueryVO.java

@@ -63,6 +63,19 @@ public class ComProjectAssignQueryVO extends PaginationVO {
     private BigDecimal score16;
     @ApiModelProperty(value = "score17", position = 4)
     private BigDecimal score17;
+    @ApiModelProperty(value = "score18", position = 4)
+    private BigDecimal score18;
+    @ApiModelProperty(value = "score19", position = 4)
+    private BigDecimal score19;
+    /** 附加项 */
+    @ApiModelProperty(value = "附加项", position = 9)
+    private BigDecimal additionalScore;
+    /** 申请经费 */
+    @ApiModelProperty(value = "申请经费", position = 9)
+    private BigDecimal applyFunding;
+    /** 建议财政支持经费 */
+    @ApiModelProperty(value = "建议财政支持经费", position = 9)
+    private BigDecimal recommendFunding;
     /** 总分 */
     @ApiModelProperty(value = "总分", position = 9)
     private BigDecimal totalScore;

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

@@ -346,9 +346,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(dto.getId());
         dto.setMembers(memList);
 
-        // 项目绩效目标表
-        LoadProjectKPIInfo(dto);
-
 //        // 项目合作单位
 //        List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(), 1);
 //        dto.setCooperativeUnits(cooperativeUnits);
@@ -381,6 +378,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
         dto.setUnitPayment(unitPaymentList);
 
+        // 项目绩效目标表
+        LoadProjectKPIInfo(dto);
+
         // 项目安排及阶段目标
         List<ComProjectStageGoalDTO> stageGoals = comProjectStageGoalService.getListByObjectId(id);
         dto.setStageGoals(stageGoals);