Merge remote-tracking branch 'origin/master'

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

@@ -172,6 +172,9 @@ public class ComProjectAssignDTO extends BaseDTO {
     /** 项目类别  1 一般项目  2重点项目 */
     @ApiModelProperty(value = "项目类别", position = 1 )
     private Integer projClass;
+    /** 项目组名称 */
+    @ApiModelProperty(value = "项目组名称", position = 1)
+    private String groupName;
     /** 评审专业 */
     @ApiModelProperty(value = "评审专业", position = 13)
     private List<ComExpertSpecDTO> specList;

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

@@ -85,6 +85,10 @@ public class ComProjectGroupAssignDTO extends BaseDTO {
     @ApiModelProperty(value = "单位", position = 14)
     private String unitName;
 
+    /** 专家单位 */
+    @ApiModelProperty(value = "专家单位", position = 14)
+    private String workUnit;
+
     /** 项目组名称 */
     @ApiModelProperty(value = "项目组名称", position = 17)
     private String groupName;

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

@@ -61,6 +61,15 @@ public class ComProjectGroupDetailDTO extends BaseDTO {
     @ApiModelProperty(value = "姓名", position = 4)
     private String personName;
 
+    /** 申报单位Id */
+    @ApiModelProperty(value = "申报单位Id", position = 6)
+    @Length(max=36, message = "申报单位Id不能大于36")
+    private String appUnitId;
+
+    /** 申报单位名称 */
+    @ApiModelProperty(value = "申报单位名称", position = 7)
+    private String appUnitName;
+
     /** key */
     @ApiModelProperty(value = "key", position = 1)
     @Length(max=36, message = "key不能大于36")

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

@@ -14,6 +14,8 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Api(tags = "com-project-group-assign", description = "项目组分配表")
 @RestController
 @RequestMapping("/v1/science-admin/com-project-group-assign")
@@ -30,6 +32,13 @@ public class ComProjectGroupAssignController extends BaseController<ComProjectGr
         return ResponseDataModel.ok(page);
     }
 
+    @ApiOperation(value = "根据项目组Id获取专家明细", httpMethod = "GET", notes = "根据项目组Id获取专家明细")
+    @GetMapping
+    @RequestMapping("/getAssignExpertList")
+    public ResponseDataModel<List<ComProjectGroupAssignDTO>> getAssignExpertList(String groupId) {
+        return ResponseDataModel.ok(comProjectGroupAssignService.getAssignExpertList(groupId));
+    }
+
     @ApiOperation(value = "1.02 分页查询", httpMethod = "GET", notes = "1.02 根据参数获取列表")
     @GetMapping
     @RequestMapping("/getAssignGroupExpertById")

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

@@ -6,8 +6,8 @@
         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,e.name title_name,f.proj_name,f.app_no,f.proj_no,f.proj_class,h.total_funding
+        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
         LEFT JOIN com_person c ON b.person_id = c.id
@@ -16,6 +16,9 @@
         left join system_parameter e on c.title=e.id and e.type_id=7
         left join com_project f on a.proj_id=f.id
         left join com_project_basic h on f.id = h.proj_id
+        left join com_unit i on f.app_unit_id = i.id
+        left join com_project_group_detail j on f.id = j.proj_id
+        left join com_project_group k on j.group_id = k.id
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -21,7 +21,7 @@
     </select>
 
     <select id="getAssignExpertList" resultType="com.yiboshi.science.param.dto.ComProjectGroupAssignDTO">
-        select a.*, c.person_name, c.cert_id, c.sex from com_project_group_assign a
+        select a.*, c.person_name, c.cert_id, c.sex, c.work_unit, c.mobile, c.email from com_project_group_assign a
         LEFT JOIN com_expert b ON a.expert_id = b.id
         LEFT JOIN com_person c ON b.person_id = c.id
         where a.group_id = #{groupId} order by created

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

@@ -21,12 +21,13 @@
     </select>
 
     <select id="getProjectDetailListbyPage" resultType="com.yiboshi.science.param.dto.ComProjectGroupDetailDTO">
-        select a.*, b.proj_no, b.app_no, b.proj_class, b.proj_name, d.name as knowledge_name, c.cert_id, c.person_name
+        select a.*, b.app_unit_id, f.unit_name as app_unit_name, b.proj_no, b.app_no, b.proj_class, b.proj_name, d.name as knowledge_name, c.cert_id, c.person_name
         from com_project_group_detail a
         left join com_project b on a.proj_id = b.id
         left join com_person c on b.app_person_id = c.id
         left join system_parameter d on b.knowledge_id = d.id
         left join system_parameter e on d.parent_id = e.id
+        left join com_unit f on b.app_unit_id = f.id
         <where>
             ${ew.sqlSegment}
         </where>