xujun

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/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>