Merge remote-tracking branch 'origin/master'

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

@@ -136,4 +136,11 @@ public class ComProjectAssignQueryVO extends PaginationVO {
     /** 项目类型  1 科研项目  2重点学科项目 */
     @ApiModelProperty(value = "项目名称", position = 1 )
     private Integer projType;
+    /** 姓名 */
+    @ExcelProperty("姓名")
+    @ApiModelProperty(value = "姓名", position = 3)
+    private String appUnitName;
+    /** 项目负责人 */
+    @ApiModelProperty(value = "项目负责人", position = 6 )
+    private String appPersonName;
 }

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

@@ -58,6 +58,9 @@ public class ComProjectAssignServiceImpl extends BaseServiceImpl<ComProjectAssig
         if (Objects.nonNull(vo.getTotalScore())) {
             criteria.eq("total_score", vo.getTotalScore());
         }
+        if (Objects.nonNull(vo.getAuditState())) {
+            criteria.eq("a.audit_state", vo.getAuditState());
+        }
         if (Objects.nonNull(vo.getCertId())) {
             criteria.like("c.cert_id", vo.getCertId());
         }
@@ -76,6 +79,10 @@ public class ComProjectAssignServiceImpl extends BaseServiceImpl<ComProjectAssig
         if (Objects.nonNull(vo.getProjNo())) {
             criteria.like("f.proj_no", vo.getProjNo());
         }
+        if (Objects.nonNull(vo.getAppUnitName())) {
+            criteria.like("i.unit_name", vo.getAppUnitName());
+        }
+
     }
 
     @Override

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

@@ -6,7 +6,7 @@
         t.id as id, t.expert_id as expertId, t.proj_id as projId, t.assign_year as assignYear, t.total_score as gradeScore, t.remark as remark, t.created as created, t.updated as updated
     </sql>
     <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO">
-        SELECT  a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,g.unit_name,d.name education_name,c.work_unit,
+        SELECT  a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,g.unit_name,d.name education_name,
                 e.name title_name,f.proj_name,f.app_no,f.proj_no,f.proj_class,h.total_funding, i.unit_name as app_unit_name, k.group_name
         FROM com_project_assign a
         LEFT JOIN com_expert b ON a.expert_id = b.id