党组织管理

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java

@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("partyorg")
 public class PartyOrgController {
-    
+
     @Autowired
     private PartyOrgService partyOrgService;
 
@@ -87,8 +87,8 @@ public class PartyOrgController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<PartyOrgDTO> list = partyOrgService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, PartyOrgExcel.class);
+        List<PartyOrgDTO> list = partyOrgService.selectListPartyOrg(params);
+        ExcelUtils.exportExcelToTarget(response, "党组织管理", list, PartyOrgExcel.class);
     }
 
-}
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java

@@ -18,10 +18,14 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyOrgDTO;
 import com.elink.esua.epdc.entity.PartyOrgEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 党组织表 党组织表
  *
@@ -40,4 +44,14 @@ public interface PartyOrgDao extends BaseDao<PartyOrgEntity> {
      * @Date 14:34 2021-08-06
      **/
     Integer isPartyOrgExistByPartyOrgType(@Param("typeCode") String typeCode);
+
+    /**
+     * PC 首页查询
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.PartyOrgDTO>
+     * @Author zhangyong
+     * @Date 15:21 2021-08-11
+     **/
+    List<PartyOrgDTO> selectListPartyOrg(Map<String, Object> params);
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java

@@ -31,65 +31,14 @@ import java.util.Date;
 @Data
 public class PartyOrgExcel {
 
-    @Excel(name = "标识号")
-    private String id;
+    @Excel(name = "所属组织")
+    private String allDeptNames;
 
     @Excel(name = "党组织名称")
     private String partyOrgName;
 
-    @Excel(name = "党组织介绍")
-    private String introduction;
-
-    @Excel(name = "两委干部")
-    private String twoCommittees;
-
-    @Excel(name = "党员数量")
-    private Integer partyMemberNum;
-
-    @Excel(name = "经度")
-    private String longitude;
-
-    @Excel(name = "纬度")
-    private String latitude;
-
-    @Excel(name = "所属组织名称")
-    private String deptName;
-
-    @Excel(name = "所属组织ID")
-    private String deptId;
-
-    @Excel(name = "党组织类型编码")
-    private String typeCode;
-
-    @Excel(name = "父所有部门ID")
-    private String parentDeptIds;
-
-    @Excel(name = "父所有部门名称")
-    private String parentDeptNames;
-
-    @Excel(name = "所有部门ID")
-    private String allDeptIds;
-
-    @Excel(name = "所有部门名称")
-    private String allDeptNames;
-
-    @Excel(name = "删除标识 0-否，1-是")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
+    @Excel(name = "党组织类型")
+    private String typeName;
 
 
-}
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java

@@ -92,4 +92,14 @@ public interface PartyOrgService extends BaseService<PartyOrgEntity> {
      * @date 2021-08-06
      */
     void delete(String[] ids);
-}
+
+    /**
+     * PC 首页查询
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.PartyOrgDTO>
+     * @Author zhangyong
+     * @Date 15:21 2021-08-11
+     **/
+    List<PartyOrgDTO> selectListPartyOrg(Map<String, Object> params);
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java

@@ -56,11 +56,9 @@ public class PartyOrgServiceImpl extends BaseServiceImpl<PartyOrgDao, PartyOrgEn
 
     @Override
     public PageData<PartyOrgDTO> page(Map<String, Object> params) {
-        IPage<PartyOrgEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, PartyOrgDTO.class);
+        IPage<PartyOrgDTO> page = getPage(params);
+        List<PartyOrgDTO> list = baseDao.selectListPartyOrg(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
@@ -133,4 +131,8 @@ public class PartyOrgServiceImpl extends BaseServiceImpl<PartyOrgDao, PartyOrgEn
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<PartyOrgDTO> selectListPartyOrg(Map<String, Object> params) {
+        return baseDao.selectListPartyOrg(params);
+    }
 }

epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml

@@ -33,4 +33,22 @@
         WHERE DEL_FLAG = '0'
         AND TYPE_CODE = #{typeCode}
     </select>
+
+    <select id="selectListPartyOrg" resultType="com.elink.esua.epdc.dto.PartyOrgDTO">
+        SELECT
+            o.ID id,
+            REPLACE(o.ALL_DEPT_NAMES, '平阴县-', '') allDeptNames,
+            o.PARTY_ORG_NAME partyOrgName,
+            t.TYPE_NAME typeName
+        FROM epdc_party_org o
+        LEFT JOIN epdc_party_org_type t ON o.TYPE_CODE = t.TYPE_CODE AND t.DEL_FLAG ='0'
+        WHERE o.DEL_FLAG ='0'
+        <if test="deptId != null and deptId.trim() != ''">
+            AND o.ALL_DEPT_IDS LIKE CONCAT( '%', #{deptId}, '%' )
+        </if>
+        <if test="partyOrgName != null and partyOrgName.trim() != ''">
+            AND o.PARTY_ORG_NAME LIKE CONCAT( '%', #{partyOrgName}, '%' )
+        </if>
+        ORDER BY o.CREATED_TIME DESC
+    </select>
 </mapper>

epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml

@@ -45,5 +45,6 @@
             TYPE_NAME tagName
         FROM epdc_party_org_type
         WHERE DEL_FLAG = '0'
+        AND ENABLE = '1'
     </select>
 </mapper>