项目库基础表关联项目名称,相关人员查询

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java

@@ -117,16 +117,16 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 	}
 
 	/**
-	 * 通过id查询
+	 * 通过projectId查询
 	 *
-	 * @param id
+	 * @param projectId
 	 * @return
 	 */
-	@AutoLog(value = "项目库-相关人员维护表-通过id查询")
+	@AutoLog(value = "项目库-相关人员维护表-通过projectId查询")
-	@ApiOperation(value="项目库-相关人员维护表-通过id查询", notes="项目库-相关人员维护表-通过id查询")
+	@ApiOperation(value="项目库-相关人员维护表-通过projectId查询", notes="项目库-相关人员维护表-通过projectId查询")
-	@GetMapping(value = "/queryById")
+	@GetMapping(value = "/queryByProjectId")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<?> queryById(@RequestParam(name="projectId",required=true) String projectId) {
-		ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryById(id);
+		ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectId(projectId);
 		if(projectRelatedPersonnel==null) {
 			return Result.error("未找到对应数据");
 		}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java

@@ -9,6 +9,7 @@ import com.jero.common.aspect.annotation.Dict;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -35,10 +36,12 @@ public class ProjectRelatedPersonnel implements Serializable {
     private java.lang.String projectId;
 
     /**责任领域*/
+    @Excel(name = "责任领域", width = 15,orderNum = "1")
     @Dict(dicCode = "duty_territory")
     private java.lang.String dutyTerritory;
 
     /**法规工程师*/
+    @Excel(name = "法规工程师", width = 15,orderNum = "2")
     private java.lang.String lawEngineer;
     @TableField(exist = false)
     private java.lang.String lawEngineerName;
@@ -47,6 +50,7 @@ public class ProjectRelatedPersonnel implements Serializable {
 
 
     /**工程接口人*/
+    @Excel(name = "工程接口人", width = 15,orderNum = "3")
     private java.lang.String engineeringInterfacePerson;
     @TableField(exist = false)
     private java.lang.String engineeringInterfacePersonName;
@@ -54,6 +58,7 @@ public class ProjectRelatedPersonnel implements Serializable {
     private java.lang.String engineeringInterfacePersonEnName;
 
     /**认证工程师*/
+    @Excel(name = "认证工程师", width = 15,orderNum = "4")
     private java.lang.String certificationEngineer;
     @TableField(exist = false)
     private java.lang.String certificationEngineerName;
@@ -61,6 +66,7 @@ public class ProjectRelatedPersonnel implements Serializable {
     private java.lang.String certificationEngineerEnName;
 
     /**备注*/
+    @Excel(name = "备注", width = 15,orderNum = "5")
     private java.lang.String remark;
 
     /**创建人*/

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java

@@ -15,4 +15,6 @@ import java.util.Map;
 public interface ProjectRelatedPersonnelMapper extends BaseMapper<ProjectRelatedPersonnel> {
 
     IPage<ProjectRelatedPersonnel> queryPageList(IPage page, Map<String, Object> params);
+
+    ProjectRelatedPersonnel queryByProjectId(String projectId);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml

@@ -25,8 +25,7 @@
     <sql id="select_item">
         select
             plb.id,
-            plb.project_name,
+            pni.project_name as project_name,
-
             plb.target_market,
             plb.project_status,
             plb.studio_engineer,
@@ -45,11 +44,11 @@
             updateuser.username as update_user_name,
             plb.update_time
         from project_library_base as plb
-
+        left join project_name_info as pni on  plb.project_name=pni.id
-
         left join sys_user as studiouser on plb.studio_engineer=studiouser.id
         left join sys_user as createuser on plb.create_user_id=createuser.id
         left join sys_user as updateuser on plb.update_user_id=updateuser.id
+
     </sql>
 
     <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml

@@ -14,8 +14,7 @@
         <result column="certification_engineer" property="certificationEngineer" />
         <result column="remark" property="remark" />
     </resultMap>
-    <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
+    <sql id="select_item">
-        SELECT
             prp.id,
             prp.project_id,
             prp.duty_territory,
@@ -29,6 +28,11 @@
             prp.create_time,
             prp.update_user_id,
             prp.update_time
+    </sql>
+    <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
+        SELECT
+        <include refid="select_item"/>
+
         FROM
             project_related_personnel AS prp
                 LEFT JOIN sys_user AS lawuser ON prp.law_engineer = lawuser.id
@@ -36,4 +40,17 @@
 
         order by prp.create_time desc
     </select>
+
+    <select id="queryByProjectId" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
+        SELECT
+        <include refid="select_item"/>
+        FROM
+        project_related_personnel AS prp
+        LEFT JOIN sys_user AS lawuser ON prp.law_engineer = lawuser.id
+        LEFT JOIN sys_user AS enguser ON prp.engineering_interface_person = enguser.id
+        <where>
+            prp.project_id=#{projectId}
+        </where>
+        order by prp.create_time desc
+    </select>
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java

@@ -49,10 +49,10 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
 	/**
 	 * 通过id查询
 	 *
-	 * @param id
+	 * @param projectId
 	 * @return
 	 */
-    ProjectRelatedPersonnel queryById(String id);
+    ProjectRelatedPersonnel queryByProjectId(String projectId);
 
     /**
 	 * 列表查询

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java

@@ -88,15 +88,16 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
     }
 
 	/**
-	 * 通过id查询
+	 * 通过projectId查询
 	 *
-	 * @param id
+	 * @param projectId
 	 * @return
 	 */
 	@Override
-    public ProjectRelatedPersonnel queryById(String id) {
+    public ProjectRelatedPersonnel queryByProjectId(String projectId) {
-        return getById(id);
+		ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelMapper.queryByProjectId(projectId);
-    }
+		return disposeData(projectRelatedPersonnel);
+	}
 
     /**
 	 * 列表查询
@@ -120,11 +121,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		IPage page = new Page(pageNo, pageSize);
 		IPage<ProjectRelatedPersonnel> result = projectRelatedPersonnelMapper.queryPageList(page, params);
 		List<ProjectRelatedPersonnel> records = result.getRecords();
-		disposeData(records);
+		for (ProjectRelatedPersonnel projectRelatedPersonnel:records) {
+			disposeData(projectRelatedPersonnel);
+		}
 		return result;
 	}
-	public void disposeData(List<ProjectRelatedPersonnel> records) {
+
-		for (ProjectRelatedPersonnel projectRelatedPersonnel:records) {
+	public ProjectRelatedPersonnel disposeData(ProjectRelatedPersonnel projectRelatedPersonnel) {
+
 			//法规工程师
 			List<SysUser> lawEngineerUsers = new ArrayList<>();
 			List<String> lawEngineerIdList = Arrays.asList(projectRelatedPersonnel.getLawEngineer().split(","));
@@ -214,7 +218,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 
 			}
 
-		}
+		return projectRelatedPersonnel;
 	}
 
 }