diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index 56ea2171d..0e0f6dad5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -117,16 +117,16 @@ public class ProjectRelatedPersonnelController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryById(id); + @AutoLog(value = "项目库-相关人员维护表-通过projectId查询") + @ApiOperation(value="项目库-相关人员维护表-通过projectId查询", notes="项目库-相关人员维护表-通过projectId查询") + @GetMapping(value = "/queryByProjectId") + public Result queryById(@RequestParam(name="projectId",required=true) String projectId) { + ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectId(projectId); if(projectRelatedPersonnel==null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index 9e8660b5b..ab2f6b1c0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/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; /**创建人*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java index 602bce8ad..8ef6fb58f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java +++ b/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 { IPage queryPageList(IPage page, Map params); + + ProjectRelatedPersonnel queryByProjectId(String projectId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index c6e62a759..f96d02fcd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -25,8 +25,7 @@ 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 + - SELECT + prp.id, prp.project_id, prp.duty_territory, @@ -29,6 +28,11 @@ prp.create_time, prp.update_user_id, prp.update_time + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index 439cd1ca2..faa75c83e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -49,10 +49,10 @@ public interface IProjectRelatedPersonnelService extends IService result = projectRelatedPersonnelMapper.queryPageList(page, params); List records = result.getRecords(); - disposeData(records); + for (ProjectRelatedPersonnel projectRelatedPersonnel:records) { + disposeData(projectRelatedPersonnel); + } return result; } - public void disposeData(List records) { - for (ProjectRelatedPersonnel projectRelatedPersonnel:records) { + + public ProjectRelatedPersonnel disposeData(ProjectRelatedPersonnel projectRelatedPersonnel) { + //法规工程师 List lawEngineerUsers = new ArrayList<>(); List lawEngineerIdList = Arrays.asList(projectRelatedPersonnel.getLawEngineer().split(",")); @@ -214,7 +218,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl