企业信息列表查询 pc端

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java

@@ -54,7 +54,7 @@ public class EnterpriseInfoController {
 
     @GetMapping("page")
     public Result<PageData<EnterpriseInfoDTO>> page(@RequestParam Map<String, Object> params) {
-        PageData<EnterpriseInfoDTO> page = enterpriseInfoService.page(params);
+        PageData<EnterpriseInfoDTO> page = enterpriseInfoService.getEnterpriseInfoPageFromPc(params);
         return new Result<PageData<EnterpriseInfoDTO>>().ok(page);
     }
 
@@ -90,7 +90,7 @@ public class EnterpriseInfoController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<EnterpriseInfoDTO> list = enterpriseInfoService.list(params);
+        List<EnterpriseInfoDTO> list = enterpriseInfoService.listExport(params);
         ExcelUtils.exportExcelToTarget(response, null, list, EnterpriseInfoExcel.class);
     }
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java

@@ -18,12 +18,16 @@
 package com.elink.esua.epdc.modules.enterprise.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
 import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
 import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
 import com.elink.esua.epdc.modules.enterprise.entity.EnterpriseInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 企业信息表
  *
@@ -49,4 +53,13 @@ public interface EnterpriseInfoDao extends BaseDao<EnterpriseInfoEntity> {
      * @Param [userId]
      **/
     EnterpriseInfoResultDTO selectOneEnterpriseInfo(@Param("userId") String userId);
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO>
+     * @Description 企业信息列表查询pc端
+     * @Author songyunpeng
+     * @Date 2020/2/29
+     * @Param [params]
+     **/
+    List<EnterpriseInfoDTO> selectEnterpriseInfoPageFromPc(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/excel/EnterpriseInfoExcel.java

@@ -31,22 +31,19 @@ import java.util.Date;
 @Data
 public class EnterpriseInfoExcel {
 
-    @Excel(name = "主键")
-    private String id;
-
-    @Excel(name = "用户id")
-    private String userId;
-
-    @Excel(name = "用户姓名")
+    @Excel(name = "姓名")
     private String realName;
 
-    @Excel(name = "性别 0女  1男")
+    @Excel(name = "性别", replace = {"男_1", "女_0", "保密_2"})
     private String sex;
 
-    @Excel(name = "联系电话")
+    @Excel(name = "手机号")
     private String mobile;
 
-    @Excel(name = "企业名称")
+    @Excel(name = "所属网格")
+    private String allDeptNames;
+
+    @Excel(name = "企业全称")
     private String enterpriseName;
 
     @Excel(name = "统一社会信用代码")
@@ -55,7 +52,7 @@ public class EnterpriseInfoExcel {
     @Excel(name = "企业地址")
     private String enterpriseAddress;
 
-    @Excel(name = "法定代表人")
+    @Excel(name = "企业法人")
     private String legalPerson;
 
     @Excel(name = "注册资金(万元)")
@@ -70,38 +67,5 @@ public class EnterpriseInfoExcel {
     @Excel(name = "经营范围")
     private String businessScope;
 
-    @Excel(name = "居住网格id")
-    private Long deptId;
-
-    @Excel(name = "父所有部门")
-    private String parentDeptIds;
-
-    @Excel(name = "父所有部门")
-    private String parentDeptNames;
-
-    @Excel(name = "所有部门ID")
-    private String allDeptIds;
-
-    @Excel(name = "所有部门名称")
-    private String allDeptNames;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "删除标识 0：否，1：是")
-    private String delFlag;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
 
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/EnterpriseInfoService.java

@@ -99,20 +99,20 @@ public interface EnterpriseInfoService extends BaseService<EnterpriseInfoEntity>
     void delete(String[] ids);
 
     /**
-     * @Description   企业信息完善
+     * @return void
+     * @Description 企业信息完善
      * @Author songyunpeng
-     * @Date  2020/2/28
+     * @Date 2020/2/28
      * @Param [enterpriseInfoDTO]
-     * @return void
      **/
     void completeEnterpriseInfo(EnterpriseInfoFormDTO enterpriseInfoFormDTO);
 
     /**
-     * @Description  查询企业信息
+     * @return com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO
+     * @Description 查询企业信息
      * @Author songyunpeng
-     * @Date  2020/2/28
+     * @Date 2020/2/28
      * @Param [userId]
-     * @return com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO
      **/
     EnterpriseInfoResultDTO selectOneEnterpriseInfo(String userId);
 
@@ -125,4 +125,22 @@ public interface EnterpriseInfoService extends BaseService<EnterpriseInfoEntity>
      * @date 2020/2/28 13:44
      */
     Result completeRequisiteInfo(CompleteRequisiteInfoDTO fromDto);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO>
+     * @Description 企业信息pc端列表查询
+     * @Author songyunpeng
+     * @Date 2020/2/29
+     * @Param [params]
+     **/
+    PageData<EnterpriseInfoDTO> getEnterpriseInfoPageFromPc(Map<String, Object> params);
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO>
+     * @Description 企业信息pc端列表导出
+     * @Author songyunpeng
+     * @Date 2020/2/29
+     * @Param [params]
+     **/
+    List<EnterpriseInfoDTO> listExport(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.EpidemicDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
 import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
@@ -172,4 +173,16 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
 
         return new Result();
     }
+
+    @Override
+    public PageData<EnterpriseInfoDTO> getEnterpriseInfoPageFromPc(Map<String, Object> params) {
+        IPage<EnterpriseInfoDTO> page = getPage(params);
+        List<EnterpriseInfoDTO> list = baseDao.selectEnterpriseInfoPageFromPc(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<EnterpriseInfoDTO> listExport(Map<String, Object> params) {
+        return baseDao.selectEnterpriseInfoPageFromPc(params);
+    }
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml

@@ -25,8 +25,11 @@
         UPDATE epdc_enterprise_info
         <trim prefix="set" suffixOverrides=",">
             <if test="legalPerson != null and legalPerson != ''">LEGAL_PERSON=#{legalPerson},</if>
-            <if test="registeredCapital != null and registeredCapital != 0">REGISTERED_CAPITAL=#{registeredCapital},</if>
-            <if test="employedPopulation != null and  employedPopulation != 0">EMPLOYED_POPULATION=#{employedPopulation},</if>
+            <if test="registeredCapital != null and registeredCapital != 0">REGISTERED_CAPITAL=#{registeredCapital},
+            </if>
+            <if test="employedPopulation != null and  employedPopulation != 0">
+                EMPLOYED_POPULATION=#{employedPopulation},
+            </if>
             <if test="industry != null and industry != ''">INDUSTRY=#{industry},</if>
             <if test="businessScope != null and businessScope != ''">BUSINESS_SCOPE=#{businessScope},</if>
         </trim>
@@ -34,10 +37,39 @@
     </update>
 
     <select id="selectOneEnterpriseInfo" resultMap="enterpriseInfoMap">
-        select t.ID,t.USER_ID,t.REAL_NAME,t.SEX,MOBILE,t.ENTERPRISE_NAME,t.UNIFORM_SOCIAL_CREDIT_CODE,t.ENTERPRISE_ADDRESS,
+        select t.ID,t.USER_ID,t.REAL_NAME,t.SEX,t.MOBILE,t.ENTERPRISE_NAME,t.UNIFORM_SOCIAL_CREDIT_CODE,t.ENTERPRISE_ADDRESS,
                 t.LEGAL_PERSON,t.REGISTERED_CAPITAL,t.EMPLOYED_POPULATION,t.INDUSTRY,t.BUSINESS_SCOPE,t.DEPT_ID,t.ALL_DEPT_NAMES
         from epdc_enterprise_info t
         where t.USER_ID = #{userId}
     </select>
-
+    <select id="selectEnterpriseInfoPageFromPc" resultType="com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO">
+        select * from epdc_enterprise_info
+        where DEL_FLAG = '0'
+        <if test="enterpriseName != null and enterpriseName != ''">
+            AND ENTERPRISE_NAME = #{enterpriseName}
+        </if>
+        <if test="mobile != null and mobile != ''">
+            AND MOBILE = #{mobile}
+        </if>
+        <if test="uniformSocialCreditCode != null and uniformSocialCreditCode != ''">
+            AND UNIFORM_SOCIAL_CREDIT_CODE = #{uniformSocialCreditCode}
+        </if>
+        <if test="legalPerson != null and legalPerson != ''">
+            AND LEGAL_PERSON = #{legalPerson}
+        </if>
+        <if test="streetId != null and streetId != ''">
+            AND (find_in_set(#{streetId},PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND (find_in_set(#{communityId},PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND (find_in_set(#{gridId},PARENT_DEPT_IDS)
+            OR find_in_set(#{gridId},ALL_DEPT_IDS))
+        </if>
+        ORDER BY
+        CREATED_TIME DESC
+    </select>
 </mapper>