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

# Conflicts:
#	science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
#	science-admin/src/main/resources/mapper/ComProjectAuditDAO.xml

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

@@ -209,6 +209,8 @@ public class ComProjectAuditDTO extends BaseDTO {
     @ApiModelProperty(value = "答辩总得分", position = 4)
     private BigDecimal defenseScore;
 
+
+
     /** 评分 */
     @ApiModelProperty(value = "评分", position = 4)
     private String gradeScore;

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

@@ -240,4 +240,7 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
     public ResponseDataModel<String> updateDefenseScore(@RequestBody ComProject e) {
         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/impl/ComProjectServiceImpl.java

@@ -1115,6 +1115,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         return list;
     }
 
+
+
+
     public String updateDefenseScore (String id, BigDecimal defenseTechnologyScore, BigDecimal defenseEconomyScore) {
         ComProject e = new ComProject();
         e.setId(id);

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

@@ -7,6 +7,7 @@
         t.id as id, t.report_year as reportYear, t.audit_type as auditType, t.audit_object_id as reportObjectId, t.audit_unit_id as auditUnitId, t.audit_content as auditContent, t.audit_result as auditResult, t.audit_date as auditDate,
         t.unit_level as unitLevel, t.com_person as comPerson, t.created as created
     </sql>
+
     <select id="getListByPage"  resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
         SELECT
         a.*,d.unit_name,e.person_name