xujun

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

@@ -141,6 +141,9 @@ public class ComProjectAssignQueryVO extends PaginationVO {
     @ApiModelProperty(value = "姓名", position = 3)
     private String appUnitName;
     /** 项目负责人 */
-    @ApiModelProperty(value = "项目负责人", position = 6 )
+    @ApiModelProperty(value = "项目负责人", position = 6)
     private String appPersonName;
+    /** 项目组Id */
+    @ApiModelProperty(value = "项目组Id", position = 6)
+    private String groupId;
 }

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

@@ -52,6 +52,9 @@ public class ComProjectAssignServiceImpl extends BaseServiceImpl<ComProjectAssig
         if (Objects.nonNull(vo.getProjId())) {
             criteria.eq("a.proj_id", vo.getProjId());
         }
+        if (Objects.nonNull(vo.getGroupId())) {
+            criteria.eq("k.id", vo.getGroupId());
+        }
         if (Objects.nonNull(vo.getAssignYear())) {
             criteria.eq("assign_year", vo.getAssignYear());
         }