企业修改

src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java

@@ -59,6 +59,7 @@ public class ProjectEnterpriseController {
             @ApiImplicitParam(name = "projectSn", value = "项目sn或企业sn", paramType = "body", required = true, dataType = "String"),
             @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "cbsProjectType", value = "项目类型（字典）", paramType = "body", required = true, dataType = "Integer"),
     })
     @PostMapping(value = "/list")
     public Result<IPage<EnterpriseInfo>> queryPageList(@RequestBody Map<String, Object> map) {

src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml

@@ -1,7 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper">
-    <select id="selectProjectEnterprisePage" resultType="com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo">
+    <resultMap id="selectProjectEnterprisePageMap" type="com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo"
+               autoMapping="true">
+        <id column="id" property="id"/>
+        <association property="projectEnterprise" javaType="com.zhgd.xmgl.modules.project.entity.ProjectEnterprise"
+                     columnPrefix="pe_" autoMapping="true">
+            <id column="id" property="id"/>
+        </association>
+    </resultMap>
+    <sql id="dicMap">
+        SELECT
+        *
+        FROM
+        dictionary_item
+        WHERE
+        dictionary_encoding =
+        IF
+        ((
+        SELECT
+        COUNT(*)
+        FROM
+        dictionary_item di
+        WHERE
+        di.dictionary_encoding = CONCAT( 'project_enterprise_cbs_project_type_', #{param.projectSn} )) > 0,(
+        CONCAT( 'project_enterprise_cbs_project_type_', #{param.projectSn} )),'project_enterprise_cbs_project_type')
+    </sql>
+    <select id="selectProjectEnterprisePage" resultMap="selectProjectEnterprisePageMap">
         SELECT a.*,
         b.id
         project_enterprise_id,
@@ -11,11 +36,48 @@
         b.project_director_phone,
         b.parent_enterprise_id,
         b.sort_num,
-        b.department_type
+        b.department_type,
+        b.id as pe_id,
+        b.project_sn as pe_project_sn,
+        b.enterprise_id as pe_enterprise_id,
+        b.enterprise_type_id as pe_enterprise_type_id,
+        b.parent_enterprise_id as pe_parent_enterprise_id,
+        b.type as pe_type,
+        b.project_director_name as pe_project_director_name,
+        b.project_director_phone as pe_project_director_phone,
+        b.sort_num as pe_sort_num,
+        b.department_type as pe_department_type,
+        b.ancestors as pe_ancestors,
+        b.parent_project_enterprise_id as pe_parent_project_enterprise_id,
+        b.project_manage as pe_project_manage,
+        b.longitude as pe_longitude,
+        b.latitude as pe_latitude,
+        b.project_number as pe_project_number,
+        b.project_acreage as pe_project_acreage,
+        b.start_work_date as pe_start_work_date,
+        b.project_tel as pe_project_tel,
+        b.project_type as pe_project_type,
+        b.structure_type as pe_structure_type,
+        b.bulid_status as pe_bulid_status,
+        b.construction_stage as pe_construction_stage,
+        b.layout_image as pe_layout_image,
+        b.construction_map_url as pe_construction_map_url,
+        b.cbs_name as pe_cbs_name,
+        b.project_build_area as pe_project_build_area,
+        b.completion_date as pe_completion_date,
+        b.cbs_project_type as pe_cbs_project_type,
+        t1.name as pe_cbs_project_type_name
         FROM enterprise_info a
         LEFT JOIN project_enterprise b ON a.id = b.enterprise_id
         LEFT JOIN enterprise_type c ON b.enterprise_type_id = c.id
+        left join (
+        <include refid="com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper.dicMap">
+        </include>
+        ) t1 on t1.data = b.cbs_project_type
         WHERE b.project_sn = #{param.projectSn}
+        <if test="param.cbsProjectType != null and param.cbsProjectType != ''">
+            and b.cbs_project_type = #{param.cbsProjectType}
+        </if>
         <if test="param.enterpriseTypeId != null and param.enterpriseTypeId != ''">
             and b.enterprise_type_id = #{param.enterpriseTypeId}
         </if>
@@ -30,6 +92,7 @@
         </if>
         order by b.sort_num
     </select>
+
     <select id="selectProjectEnterpriseList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap" parameterType="map">
         SELECT a.*,
         b.id project_enterprise_id,

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java

@@ -182,7 +182,7 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
         projectEnterprise.setSortNum(enterpriseInfo.getSortNum());
         projectEnterprise.setEnterpriseId(enterpriseInfo.getId());
         projectEnterprise.setDepartmentType(enterpriseInfo.getDepartmentType());
-
+        setFieldToProjectEnterprise(enterpriseInfo, projectEnterprise);
         boolean top = projectEnterprise.getParentEnterpriseId() == null || projectEnterprise.getParentEnterpriseId() == 0;
         if (top) {
             projectEnterprise.setParentProjectEnterpriseId(0L);
@@ -291,12 +291,7 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
         queryWrapper1.lambda().eq(ProjectEnterprise::getEnterpriseId, enterpriseInfo.getId())
                 .eq(ProjectEnterprise::getProjectSn, enterpriseInfo.getProjectSn());
         ProjectEnterprise projectEnterpris = projectEnterpriseMapper.selectOne(queryWrapper1);
-        projectEnterpris.setEnterpriseTypeId(enterpriseInfo.getEnterpriseTypeId());
+        setFieldToProjectEnterprise(enterpriseInfo, projectEnterpris);
-        projectEnterpris.setParentEnterpriseId(enterpriseInfo.getParentEnterpriseId());
-        projectEnterpris.setProjectDirectorName(enterpriseInfo.getProjectDirectorName());
-        projectEnterpris.setProjectDirectorPhone(enterpriseInfo.getProjectDirectorPhone());
-        projectEnterpris.setSortNum(enterpriseInfo.getSortNum());
-        projectEnterpris.setDepartmentType(enterpriseInfo.getDepartmentType());
         boolean top = projectEnterpris.getParentEnterpriseId() == null || projectEnterpris.getParentEnterpriseId() == 0;
         if (top) {
             projectEnterpris.setParentProjectEnterpriseId(0L);
@@ -315,6 +310,36 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
         return enterpriseInfo;
     }
 
+    private void setFieldToProjectEnterprise(EnterpriseInfo enterpriseInfo, ProjectEnterprise projectEnterpris) {
+        projectEnterpris.setEnterpriseTypeId(enterpriseInfo.getEnterpriseTypeId());
+        projectEnterpris.setParentEnterpriseId(enterpriseInfo.getParentEnterpriseId());
+        projectEnterpris.setProjectDirectorName(enterpriseInfo.getProjectDirectorName());
+        projectEnterpris.setProjectDirectorPhone(enterpriseInfo.getProjectDirectorPhone());
+        projectEnterpris.setSortNum(enterpriseInfo.getSortNum());
+        projectEnterpris.setDepartmentType(enterpriseInfo.getDepartmentType());
+
+        if (enterpriseInfo.getProjectEnterprise() != null) {
+            projectEnterpris.setProjectManage(enterpriseInfo.getProjectEnterprise().getProjectManage());
+            projectEnterpris.setLongitude(enterpriseInfo.getProjectEnterprise().getLongitude());
+            projectEnterpris.setLatitude(enterpriseInfo.getProjectEnterprise().getLatitude());
+            projectEnterpris.setProjectNumber(enterpriseInfo.getProjectEnterprise().getProjectNumber());
+            projectEnterpris.setProjectAcreage(enterpriseInfo.getProjectEnterprise().getProjectAcreage());
+            projectEnterpris.setStartWorkDate(enterpriseInfo.getProjectEnterprise().getStartWorkDate());
+            projectEnterpris.setProjectTel(enterpriseInfo.getProjectEnterprise().getProjectTel());
+            projectEnterpris.setProjectType(enterpriseInfo.getProjectEnterprise().getProjectType());
+            projectEnterpris.setStructureType(enterpriseInfo.getProjectEnterprise().getStructureType());
+            projectEnterpris.setBulidStatus(enterpriseInfo.getProjectEnterprise().getBulidStatus());
+            projectEnterpris.setConstructionStage(enterpriseInfo.getProjectEnterprise().getConstructionStage());
+            projectEnterpris.setLayoutImage(enterpriseInfo.getProjectEnterprise().getLayoutImage());
+            projectEnterpris.setConstructionMapUrl(enterpriseInfo.getProjectEnterprise().getConstructionMapUrl());
+            projectEnterpris.setCbsName(enterpriseInfo.getProjectEnterprise().getCbsName());
+            projectEnterpris.setProjectBuildArea(enterpriseInfo.getProjectEnterprise().getProjectBuildArea());
+            projectEnterpris.setCompletionDate(enterpriseInfo.getProjectEnterprise().getCompletionDate());
+            projectEnterpris.setCbsProjectType(enterpriseInfo.getProjectEnterprise().getCbsProjectType());
+
+        }
+    }
+
     @Override
     public List<EnterpriseInfo> getAllEnterpriseList(Map<String, Object> map) {
         return enterpriseInfoMapper.getAllEnterpriseList(map);