项目信息导出

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesProjectController.java

@@ -10,6 +10,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.file.service.IFilesStorageService;
 import com.ruoyi.oa.domain.CmcProject;
 import com.ruoyi.oa.service.ICmcProjectService;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,6 +36,12 @@ public class FilesProjectController extends BaseController {
     @Autowired
     private ICmcProjectService cmcProjectService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Autowired
+    private ISysUserService userService;
+
     @Autowired
     private IFilesStorageService filesStorageService;
 
@@ -57,6 +65,10 @@ public class FilesProjectController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcProject cmcProject) {
         List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
+        for (CmcProject project : list) {
+            project.setUndertakingDeptName(deptIdToName(project));
+            project.setQualityInspectorName(inspectorIdToName(project));
+        }
         ExcelUtil<CmcProject> util = new ExcelUtil<CmcProject>(CmcProject.class);
         util.exportExcel(response, list, "项目管理数据");
     }
@@ -198,4 +210,26 @@ public class FilesProjectController extends BaseController {
         startPage();
         return getDataTable(cmcProjectService.selectCmcProjectByProjectNumbers(cmcProject));
     }
+    public String deptIdToName(CmcProject cmcProject) {
+        String underTakingDept = cmcProject.getUndertakingDept();
+        StringBuilder underTakingDeptName = new StringBuilder();
+        if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
+            for (String dept : underTakingDept.split(","))
+                underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
+            cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
+        }
+        return cmcProject.getUndertakingDeptName();
+    }
+
+    public String inspectorIdToName(CmcProject cmcProject) {
+        String qualityInspector = cmcProject.getQualityInspector();
+        StringBuilder qualityInspectorName = new StringBuilder();
+        if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
+            for (String inspector : qualityInspector.split(","))
+                qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
+            cmcProject.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+        }
+        return cmcProject.getQualityInspectorName();
+    }
+
 }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -66,13 +66,7 @@ public class CmcProjectController extends BaseController
         List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
-            String qualityInspector = project.getQualityInspector();
-            StringBuilder qualityInspectorName = new StringBuilder();
-            if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
-                for (String inspector : qualityInspector.split(","))
-                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
-                project.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
-            }
+            project.setQualityInspectorName(inspectorIdToName(project));
         }
         return getDataTable(list);
     }
@@ -87,13 +81,7 @@ public class CmcProjectController extends BaseController
         List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
-            String qualityInspector = project.getQualityInspector();
-            StringBuilder qualityInspectorName = new StringBuilder();
-            if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
-                for (String inspector : qualityInspector.split(","))
-                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
-                project.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
-            }
+            project.setQualityInspectorName(inspectorIdToName(project));
         }
         ExcelUtil<CmcProject> util = new ExcelUtil<CmcProject>(CmcProject.class);
         util.exportExcel(response, list, "cmc项目数据");
@@ -207,6 +195,17 @@ public class CmcProjectController extends BaseController
         return cmcProject.getUndertakingDeptName();
     }
 
+    public String inspectorIdToName(CmcProject cmcProject) {
+        String qualityInspector = cmcProject.getQualityInspector();
+        StringBuilder qualityInspectorName = new StringBuilder();
+        if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
+            for (String inspector : qualityInspector.split(","))
+                qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
+            cmcProject.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+        }
+        return cmcProject.getQualityInspectorName();
+    }
+
     public  List<SysUser> getManageId(String deptId, String partyAId) {
         List<SysUser> userList = new ArrayList<>();
         CmcManageDept cmcManageDept = new CmcManageDept();

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -29,12 +29,23 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目名称")
     private String projectName;
 
+    /** 合同编码 */
+    @Excel(name = "合同编码")
+    private String contractCode;
+
+    /** 合同编号 */
+    @Excel(name = "合同编号")
+    private String contractNumber;
+
+    /** 合同名称 */
+    @Excel(name = "合同名称")
+    private String contractName;
+
     /** 项目负责人 */
     @Excel(name = "项目负责人")
+    private String projectLeaderName;
     private Long projectLeader;
 
-    private String qualityInspector;
-
     /** 项目状态（0进行中、1已结束） */
     @Excel(name = "项目状态", readConverterExp = "0=进行中,1=已结束")
     private String isFinished;
@@ -45,8 +56,8 @@ public class CmcProject extends BaseEntity
 
     /** 甲方单位 */
     private String partyAId;
-
     @Excel(name = "甲方单位")
+    private String partyAName;
     private CmcPartyA partyA;
 
     /** 联系人 */
@@ -67,26 +78,36 @@ public class CmcProject extends BaseEntity
 
     /** 项目登记人 */
     @Excel(name = "项目登记人")
+    private String projectRegistrantName;
     private Long projectRegistrant;
 
-    /** 承担部门 */
-    private String undertakingDept;
-
     /** 承担部门 */
     @Excel(name = "承担部门")
     private String undertakingDeptName;
+    private String undertakingDept;
 
     /** 项目安排人 */
     @Excel(name = "项目安排人")
+    private String projectPlannerName;
     private Long projectPlanner;
 
     /** 现场负责人 */
     @Excel(name = "现场负责人")
+    private String siteLeaderName;
     private Long siteLeader;
 
-    /** 项目负责人 */
+    /** 技术负责人 */
+    @Excel(name = "技术负责人")
+    private String technicalDirectorName;
+
+    /** 技术设计人 */
+    @Excel(name = "技术设计人")
+    private String technicalDesignerName;
+
+    /** 质量检查员 */
     @Excel(name = "质量检查员")
     private String qualityInspectorName;
+    private String qualityInspector;
 
     /** 组织交底文档 */
 //    @Excel(name = "组织交底文档")
@@ -118,43 +139,43 @@ public class CmcProject extends BaseEntity
     private Date exitTime;
 
     /** 范围kml地址 */
-    @Excel(name = "范围kml地址")
+//    @Excel(name = "范围kml地址")
     private String projectKml;
 
     /** 控制点kml地址 */
-    @Excel(name = "控制点kml地址")
+//    @Excel(name = "控制点kml地址")
     private String projectCp;
 
     /** kml文件的中心位置经度 */
-    @Excel(name = "kml文件的中心位置经度")
+//    @Excel(name = "kml文件的中心位置经度")
     private String kmlLng;
 
     /** kml文件的中心位置纬度 */
-    @Excel(name = "kml文件的中心位置纬度")
+//    @Excel(name = "kml文件的中心位置纬度")
     private String kmlLat;
 
     /** 项目用车 */
-    @Excel(name = "项目用车")
+//    @Excel(name = "项目用车")
     private String cars;
 
     /** 项目驾驶员 */
-    @Excel(name = "项目驾驶员")
+//    @Excel(name = "项目驾驶员")
     private String drivers;
 
     /** 项目设备 */
-    @Excel(name = "项目设备")
+//    @Excel(name = "项目设备")
     private String devices;
 
     /** 项目参与人员 */
-    @Excel(name = "项目参与人员")
+//    @Excel(name = "项目参与人员")
     private String participates;
 
     /** 项目任务书 */
-    @Excel(name = "项目任务书")
+//    @Excel(name = "项目任务书")
     private String taskDocument;
 
     /** 项目提交要求 */
-    @Excel(name = "项目提交要求")
+//    @Excel(name = "项目提交要求")
     private String projectRequest;
 
     /** 内业负责人 */
@@ -177,6 +198,12 @@ public class CmcProject extends BaseEntity
 
     private SysUser projectRegistrantUser;
 
+    private SysUser projectPlannerUser;
+
+    private SysUser siteLeaderUser;
+
+    private CmcContract contract;
+
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
@@ -240,10 +267,11 @@ public class CmcProject extends BaseEntity
     {
         return partyAId;
     }
-//    public void setPartyA(CmcPartyA partyA)
-//    {
-//        this.partyA = partyA;
-//    }
+    public void setPartyA(CmcPartyA partyA)
+    {
+        this.partyA = partyA;
+        this.partyAName = partyA == null ? "" : partyA.getPartyAName();
+    }
 
     public CmcPartyA getPartyA()
     {
@@ -393,28 +421,31 @@ public class CmcProject extends BaseEntity
     {
         return exitTime;
     }
-//    public void setProjectLeaderUser(SysUser projectLeaderUser)
-//    {
-//        this.projectLeaderUser = projectLeaderUser;
-//    }
+    public void setProjectLeaderUser(SysUser projectLeaderUser)
+    {
+        this.projectLeaderUser = projectLeaderUser;
+        this.projectLeaderName = projectLeaderUser == null ? "" : projectLeaderUser.getNickName();
+    }
 
     public SysUser getProjectLeaderUser()
     {
         return projectLeaderUser;
     }
-//    public void setProjectRegistrantUser(SysUser projectRegistrantUser)
-//    {
-//        this.projectRegistrantUser = projectRegistrantUser;
-//    }
+    public void setProjectRegistrantUser(SysUser projectRegistrantUser)
+    {
+        this.projectRegistrantUser = projectRegistrantUser;
+        this.projectRegistrantName = projectRegistrantUser == null ? "" : projectRegistrantUser.getNickName();
+    }
 
     public SysUser getProjectRegistrantUser()
     {
         return projectRegistrantUser;
     }
-//    public void setTechnicalDirectorUser(SysUser technicalDirectorUser)
-//    {
-//        this.technicalDirectorUser = technicalDirectorUser;
-//    }
+    public void setTechnicalDirectorUser(SysUser technicalDirectorUser)
+    {
+        this.technicalDirectorUser = technicalDirectorUser;
+        this.technicalDirectorName = technicalDirectorUser == null ? "" : technicalDirectorUser.getNickName();
+    }
 
     public SysUser getTechnicalDirectorUser()
     {
@@ -429,15 +460,36 @@ public class CmcProject extends BaseEntity
     {
         return qualityInspector;
     }
-//    public void setTechnicalDesignerUser(SysUser technicalDesignerUser)
-//    {
-//        this.technicalDesignerUser = technicalDesignerUser;
-//    }
+    public void setTechnicalDesignerUser(SysUser technicalDesignerUser)
+    {
+        this.technicalDesignerUser = technicalDesignerUser;
+        this.technicalDesignerName = technicalDesignerUser == null ? "" : technicalDesignerUser.getNickName();
+    }
 
     public SysUser getTechnicalDesignerUser()
     {
         return technicalDesignerUser;
     }
+    public void setProjectPlannerUser(SysUser projectPlannerUser)
+    {
+        this.projectPlannerUser = projectPlannerUser;
+        this.projectPlannerName = projectPlannerUser == null ? "" : projectPlannerUser.getNickName();
+    }
+
+    public SysUser getProjectPlannerUser()
+    {
+        return projectPlannerUser;
+    }
+    public void setSiteLeaderUser(SysUser siteLeaderUser)
+    {
+        this.siteLeaderUser = siteLeaderUser;
+        this.siteLeaderName = siteLeaderUser == null ? "" : siteLeaderUser.getNickName();
+    }
+
+    public SysUser getSiteLeaderUser()
+    {
+        return siteLeaderUser;
+    }
     public void setQualityInspectorName(String qualityInspectorName)
     {
         this.qualityInspectorName = qualityInspectorName;
@@ -564,6 +616,18 @@ public class CmcProject extends BaseEntity
     {
         return joinDept;
     }
+    public void setContract(CmcContract contract)
+    {
+        this.contract = contract;
+        this.contractNumber = contract == null ? "" : contract.getContractNumber();
+        this.contractCode = contract == null ? "" : contract.getContractCode();
+        this.contractName = contract == null ? "" : contract.getContractName();
+    }
+
+    public CmcContract getContract()
+    {
+        return contract;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -44,9 +44,12 @@
         <result property="joinDept"    column="join_dept"    />
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
+        <association property="projectPlannerUser"    javaType="SysUser"         resultMap="ProjectPlannerResult" />
+        <association property="siteLeaderUser"    javaType="SysUser"         resultMap="SiteLeaderResult" />
         <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
         <association property="technicalDesignerUser"    javaType="SysUser"         resultMap="TechnicalDesignerResult" />
         <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
+        <association property="contract"    javaType="CmcContract"         resultMap="CmcContractResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="ProjectLeaderResult">
@@ -59,6 +62,16 @@
         <result property="nickName"    column="registrant_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="ProjectPlannerResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="planner_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SiteLeaderResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="site_nick_name"    />
+    </resultMap>
+
     <resultMap type="SysUser" id="TechnicalDirectorResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="director_nick_name"    />
@@ -66,7 +79,7 @@
 
     <resultMap type="SysUser" id="TechnicalDesignerResult">
         <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="design_nick_name"    />
+        <result property="nickName"    column="designer_nick_name"    />
     </resultMap>
 
     <resultMap type="CmcPartyA" id="CmcPartyAResult">
@@ -74,17 +87,29 @@
         <result property="partyAName"    column="party_a_name"    />
     </resultMap>
 
+    <resultMap type="CmcContract" id="CmcContractResult">
+        <result property="contractId"    column="contract_id"    />
+        <result property="contractNumber"    column="contract_number"    />
+        <result property="contractCode"    column="contract_code"    />
+        <result property="contractName"    column="contract_name"    />
+    </resultMap>
+
     <sql id="selectCmcProjectVo">
         select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a_id, pa.party_a_name, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time,
                p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, tp.technical_director, u2.nick_name as director_nick_name, tp.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
-               p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request, tp.technical_designer, u3.nick_name as design_nick_name, p.in_leader, p.out_leader, p.lead_dept, p.join_dept from cmc_project as p
+               p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request, tp.technical_designer, u3.nick_name as designer_nick_name, u4.nick_name as planner_nick_name,
+               u5.nick_name as site_nick_name, p.in_leader, p.out_leader, p.lead_dept, p.join_dept, pc.contract_id, c.contract_number, c.contract_code, c.contract_name from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical_plan as tp on tp.project_id = p.project_id
         left join sys_user as u2 on u2.user_id = tp.technical_director
         left join sys_user as u3 on u3.user_id = tp.technical_designer
+        left join sys_user as u4 on u4.user_id = p.project_planner
+        left join sys_user as u5 on u5.user_id = p.site_leader
         left join cmc_party_a as pa on pa.party_a_id = p.party_a_id
+        left join cmc_project_contract as pc on pc.project_id = p.project_id
+        left join cmc_contract as c on c.contract_id = pc.contract_id
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">