From 5e78e4f25428e09dd1056e5312eff97e3f8c2a1c Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Wed, 11 Aug 2021 17:01:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/PartyOrgController.java | 8 +-- .../com/elink/esua/epdc/dao/PartyOrgDao.java | 14 +++++ .../elink/esua/epdc/excel/PartyOrgExcel.java | 61 ++----------------- .../esua/epdc/service/PartyOrgService.java | 12 +++- .../service/impl/PartyOrgServiceImpl.java | 12 ++-- .../src/main/resources/mapper/PartyOrgDao.xml | 18 ++++++ .../main/resources/mapper/PartyOrgTypeDao.xml | 1 + 7 files changed, 60 insertions(+), 66 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java index ba09196..9f8a7fc 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java +++ b/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 params, HttpServletResponse response) throws Exception { - List list = partyOrgService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, PartyOrgExcel.class); + List list = partyOrgService.selectListPartyOrg(params); + ExcelUtils.exportExcelToTarget(response, "党组织管理", list, PartyOrgExcel.class); } -} \ No newline at end of file +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java index 7a973e2..09ccbb6 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java +++ b/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 { * @Date 14:34 2021-08-06 **/ Integer isPartyOrgExistByPartyOrgType(@Param("typeCode") String typeCode); + + /** + * PC 首页查询 + * + * @param params + * @return java.util.List + * @Author zhangyong + * @Date 15:21 2021-08-11 + **/ + List selectListPartyOrg(Map params); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java index 8c3032a..69462dc 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java +++ b/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; -} \ No newline at end of file +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java index df5af53..3ed40df 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java @@ -92,4 +92,14 @@ public interface PartyOrgService extends BaseService { * @date 2021-08-06 */ void delete(String[] ids); -} \ No newline at end of file + + /** + * PC 首页查询 + * + * @param params + * @return java.util.List + * @Author zhangyong + * @Date 15:21 2021-08-11 + **/ + List selectListPartyOrg(Map params); +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java index 9a6c45f..5b80de8 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java @@ -56,11 +56,9 @@ public class PartyOrgServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PartyOrgDTO.class); + IPage page = getPage(params); + List list = baseDao.selectListPartyOrg(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -133,4 +131,8 @@ public class PartyOrgServiceImpl extends BaseServiceImpl selectListPartyOrg(Map params) { + return baseDao.selectListPartyOrg(params); + } } diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml index 44e5f52..c658311 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml @@ -33,4 +33,22 @@ WHERE DEL_FLAG = '0' AND TYPE_CODE = #{typeCode} + + diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml index b3ec3dc..7af2277 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml +++ b/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'