77

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

@@ -170,9 +170,30 @@ public class ComProjectAuditDTO extends BaseDTO {
     /** 平均分 */
     @ApiModelProperty(value = "平均分", position = 4)
     private BigDecimal averageScore;
+    /** 技术专家总分 */
+    @ApiModelProperty(value = "技术专家总分", position = 4)
+    private BigDecimal technologyScore;
+    /** 技术专家平均分 */
+    @ApiModelProperty(value = "技术专家平均分", position = 4)
+    private BigDecimal technologyAverageScore;
+    /** 财务专家总分 */
+    @ApiModelProperty(value = "财务专家总分", position = 4)
+    private BigDecimal economyScore;
+    /** 财务专家平均分 */
+    @ApiModelProperty(value = "财务专家平均分", position = 4)
+    private BigDecimal economyAverageScore;
+    /** 计算得分 */
+    @ApiModelProperty(value = "计算得分", position = 4)
+    private BigDecimal calculateScore;
     /** 评分 */
     @ApiModelProperty(value = "评分", position = 4)
     private String gradeScore;
+    /** 评分 */
+    @ApiModelProperty(value = "评分", position = 4)
+    private String gradeScore1;
+    /** 评分 */
+    @ApiModelProperty(value = "评分", position = 4)
+    private String gradeScore2;
     /** 开始 */
     @ApiModelProperty(value = "开始", position = 4)
     private BigDecimal scoreStart;

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

@@ -38,7 +38,6 @@ public class ComProjectAssignController extends BaseController<ComProjectAssignS
     @GetMapping
     @RequestMapping("/getListByPage")
     public ResponseDataModel<Pagination<ComProjectAssignDTO>> getListByPage(@Validated ComProjectAssignQueryVO vo, BindingResult bindingResult) {
-        //vo.setProjType(SecurityUserHolder.projectType());
         return getPaginationResponseDataModel(vo);
     }
 
@@ -47,7 +46,6 @@ public class ComProjectAssignController extends BaseController<ComProjectAssignS
     @RequestMapping("/getAuditListByPage")
     public ResponseDataModel<Pagination<ComProjectAssignDTO>> getAuditListByPage(@Validated ComProjectAssignQueryVO vo, BindingResult bindingResult) {
         vo.setExpertId(SecurityUserHolder.getExpertId());
-        //vo.setProjType(SecurityUserHolder.projectType());
         return getPaginationResponseDataModel(vo);
     }
 
@@ -57,7 +55,6 @@ public class ComProjectAssignController extends BaseController<ComProjectAssignS
             page.getDataList().forEach((e) -> {
                 e.setCertId(hideAllIdCardNum(e.getCertId()));
                 e.setStateName(e.getAuditState().equals(2) ? "已评审" : e.getAuditState().equals(1) ? "未提交" : "未评审");
-//              e.setSpecList(comExpertSpecService.getListByExpertId(e.getExpertId()));
             });
         }
         return ResponseDataModel.ok(page);

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

@@ -12,6 +12,7 @@ import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.*;
 import com.yiboshi.science.param.query.ComProjectAuditQueryVO;
 import com.yiboshi.science.rest.BaseController;
+import com.yiboshi.science.service.ComProjectAssignService;
 import com.yiboshi.science.service.ComProjectAuditService;
 import com.yiboshi.science.service.ComUnitService;
 import io.swagger.annotations.Api;
@@ -38,6 +39,9 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
     @Autowired
     private ComProjectAuditService comProjectAuditService;
 
+    @Autowired
+    private ComProjectAssignService comProjectAssignService;
+
     private final SystemProperties properties;
 
     @Autowired
@@ -138,6 +142,9 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
             page.getDataList().forEach((e) -> {
                 if (null != e.getAuditResult())
                     e.setAuditResultName(CommonEnum.auditResult.getEnum(e.getAuditResult()).getDescription());
+                if(vo.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode())){
+                    e.setAssignList(comProjectAssignService.getAssignExpertList(e.getAuditObjectId()));
+                }
             });
         }
         return ResponseDataModel.ok(page);

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

@@ -34,7 +34,7 @@
     </select>
     <select id="getAssignExpertList" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO">
         SELECT
-            a.*, c.person_name as personName
+            a.*, c.person_name as personName,c.work_unit
         FROM com_project_assign a
         LEFT JOIN com_expert b ON a.expert_id = b.id
         LEFT JOIN com_person c ON b.person_id = c.id