From 16251d361ba14201006c431e0a5ec3b84a57566a Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 27 Nov 2019 15:12:53 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/AppMenuTemplateDTO.java | 20 ++++++------- .../epdc/controller/SysDeptController.java | 28 +++++++++++++++++-- .../epdc/entity/AppMenuTemplateEntity.java | 19 +++++++------ .../esua/epdc/service/SysDeptService.java | 20 +++++++++++++ .../epdc/service/impl/SysDeptServiceImpl.java | 18 +++++++++++- 5 files changed, 83 insertions(+), 22 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java index c4f268061..d6a2ab5b5 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java @@ -31,32 +31,27 @@ import lombok.Data; @Data public class AppMenuTemplateDTO implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -1917600597335070111L; /** * 主键 */ private String id; - /** - * 是否渐变色（0否1是） - */ - private String gradationFlag; - /** * 背景颜色（渐变色为0时使用） */ private String backgroundColor; /** - * 开始色（渐变色为1时使用） + * CSS类名 */ - private String startColor; + private String className; /** - * 终止色（渐变色为1时使用） + * 备用CSS类名 */ - private String endColor; + private String spareClassName; /** * 标签颜色 @@ -74,6 +69,11 @@ public class AppMenuTemplateDTO implements Serializable { */ private String templateName; + /** + * 模块列数 + */ + private Integer columnAmount; + /** * 乐观锁 */ diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 02e44f4d6..8211c895d 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -60,7 +60,7 @@ public class SysDeptController { /*** * 通过编码得到党委编码 * @param partyCode - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/9/20 19:56 */ @@ -135,7 +135,7 @@ public class SysDeptController { * 通过街道ID获取项目可流转部门 * * @Params: [deptId] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/16 17:00 */ @@ -145,5 +145,29 @@ public class SysDeptController { return new Result>().ok(data); } + /** + * 根据部门id，获取所有上级部门id，英文逗号隔开拼接字符串 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/11/27 15:07 + */ + @GetMapping("getParentDeptIds/{deptId}") + public Result getParentDeptIds(@PathVariable("deptId") Long deptId) { + return sysDeptService.getParentDeptIds(deptId); + } + /** + * 根据部门id，获取部门所在四级机构的所有机构名称 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2019/11/27 15:08 + */ + @GetMapping("getCompleteDeptList/{deptId}") + public Result> getCompleteDeptList(@PathVariable("deptId") Long deptId) { + return sysDeptService.getCompleteDeptList(deptId); + } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuTemplateEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuTemplateEntity.java index 886668972..5bab43736 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuTemplateEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuTemplateEntity.java @@ -36,12 +36,8 @@ import java.util.Date; @TableName("sys_app_menu_template") public class AppMenuTemplateEntity extends BaseEpdcEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 3771232002180783503L; - /** - * 是否渐变色（0否1是） - */ - private String gradationFlag; /** * 背景颜色（渐变色为0时使用） @@ -49,14 +45,14 @@ public class AppMenuTemplateEntity extends BaseEpdcEntity { private String backgroundColor; /** - * 开始色（渐变色为1时使用） + * CSS类名 */ - private String startColor; + private String className; /** - * 终止色（渐变色为1时使用） + * 备用CSS类名 */ - private String endColor; + private String spareClassName; /** * 标签颜色 @@ -73,4 +69,9 @@ public class AppMenuTemplateEntity extends BaseEpdcEntity { */ private String templateName; + /** + * 模块列数 + */ + private Integer columnAmount; + } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 700e5d1b9..c1194b91d 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -112,4 +112,24 @@ public interface SysDeptService extends BaseService { * @date 2019/10/24 15:26 */ List selectListGridForLeader(List gridIdList); + + /** + * 根据部门id，获取所有上级部门id，英文逗号隔开拼接字符串 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/11/27 15:09 + */ + Result getParentDeptIds(Long deptId); + + /** + * 根据部门id，获取部门所在四级机构的所有机构名称 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2019/11/27 15:09 + */ + Result> getCompleteDeptList(Long deptId); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 8d62456c8..42d1c7010 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -30,6 +30,7 @@ import com.elink.esua.epdc.entity.SysDeptEntity; import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.service.SysDeptService; import com.elink.esua.epdc.service.SysUserService; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -253,8 +254,23 @@ public class SysDeptServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("party_code", dto.getPartyCode()); Long id = dto.getId(); - wrapper.ne(id!=null, "id", dto.getId()); + wrapper.ne(id != null, "id", dto.getId()); return baseDao.selectCount(wrapper); } + @Override + public Result getParentDeptIds(Long deptId) { + return new Result().ok(getPidList(deptId)); + } + + @Override + public Result> getCompleteDeptList(Long deptId) { + CompleteDeptDTO completeDept = this.baseDao.getCompleteDept(deptId); + List list = Lists.newArrayList(); + list.add(completeDept.getDistrict()); + list.add(completeDept.getStreet()); + list.add(completeDept.getCommunity()); + list.add(completeDept.getGrid()); + return new Result().ok(list); + } } From e301339219aac4b05a6b5a5dc5973ddee00686b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Wed, 27 Nov 2019 15:37:49 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=A0=87=E7=AD=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/IssueServiceImpl.java | 25 +++++-- .../events/form/EpdcEventSubmitFormDTO.java | 64 +++++++++++------- .../events/entity/EpdcEventsEntity.java | 67 ++++++++++++------- .../resources/mapper/events/EpdcEventsDao.xml | 6 +- .../main/resources/mapper/issue/IssueDao.xml | 36 +++++----- .../main/resources/mapper/item/ItemDao.xml | 42 ++++++------ 6 files changed, 141 insertions(+), 99 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 146c72c36..047a99302 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java @@ -15,6 +15,7 @@ import com.elink.esua.epdc.feign.OssFeignClient; import com.elink.esua.epdc.service.IssueService; import me.chanjar.weixin.mp.api.WxMpMaterialService; import me.chanjar.weixin.mp.api.WxMpService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -61,12 +62,24 @@ public class IssueServiceImpl implements IssueService { // 获取该网格所有上级机构 Result deptDTOResult = adminFeignClient.getCompleteDept(userDetail.getGridId()); CompleteDeptDTO deptDTO = deptDTOResult.getData(); - formDto.setArea(deptDTO.getDistrict()); - formDto.setAreaId(deptDTO.getDistrictId()); - formDto.setStreet(deptDTO.getStreet()); - formDto.setStreetId(deptDTO.getStreetId()); - formDto.setCommunity(deptDTO.getCommunity()); - formDto.setCommunityId(deptDTO.getCommunityId()); +// formDto.setArea(deptDTO.getDistrict()); +// formDto.setAreaId(deptDTO.getDistrictId()); +// formDto.setStreet(deptDTO.getStreet()); +// formDto.setStreetId(deptDTO.getStreetId()); +// formDto.setCommunity(deptDTO.getCommunity()); +// formDto.setCommunityId(deptDTO.getCommunityId()); + // 父所有部门（包含街道、社区） + String deptNames = (StringUtils.isNotEmpty(deptDTO.getStreet()) ? deptDTO.getStreet() : ""); + deptNames += (StringUtils.isNotEmpty(deptDTO.getCommunity()) ? ","+deptDTO.getCommunity() : ""); + String deptIds = (deptDTO.getStreetId()!=null && deptDTO.getStreetId()!= 0 ? deptDTO.getStreetId().toString() : ""); + deptIds += (deptDTO.getCommunityId()!=null && deptDTO.getCommunityId()!= 0 ? ","+deptDTO.getCommunityId().toString() : ""); + formDto.setParentDeptIds(deptIds); + formDto.setParentDeptNames(deptNames); + // 所有部门（包含街道、社区、网格） + deptNames += (StringUtils.isNotEmpty(deptDTO.getGrid()) ? ","+deptDTO.getGrid() : ""); + deptIds += (deptDTO.getGridId()!=null && deptDTO.getGridId()!= 0 ? ","+deptDTO.getGridId().toString() : ""); + formDto.setAllDeptIds(deptIds); + formDto.setAllDeptNames(deptNames); formDto.setGrid(deptDTO.getGrid()); formDto.setGridId(deptDTO.getGridId()); // 用户信息 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java index ceaa3581a..f25440e52 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java @@ -39,42 +39,58 @@ public class EpdcEventSubmitFormDTO implements Serializable { * 图片 */ private List images; +// /** +// * 区 +// */ +// private String area; +// /** +// * 区ID +// */ +// private Long areaId; +// /** +// * 街道 +// */ +// private String street; +// /** +// * 街道ID +// */ +// private Long streetId; +// /** +// * 社区 +// */ +// private String community; +// /** +// * 社区ID +// */ +// private Long communityId; + /** - * 区 - */ - private String area; - /** - * 区ID - */ - @NotNull(message = "用户区ID不能为空") - private Long areaId; - /** - * 街道 + * 网格 */ - private String street; + private String grid; /** - * 街道ID + * 网格ID */ - @NotNull(message = "用户街道ID不能为空") - private Long streetId; + @NotNull(message = "用户网格ID不能为空") + private Long gridId; /** - * 社区 + * 父所有部门ID */ - private String community; + @NotNull(message = "父所有部门ID不能为空") + private String parentDeptIds; /** - * 社区ID + * 父所有部门 */ - @NotNull(message = "用户社区ID不能为空") - private Long communityId; + private String parentDeptNames; /** - * 网格 + * 所有部门ID */ - private String grid; + @NotNull(message = "所有部门ID不能为空") + private String allDeptIds; /** - * 网格ID + * 所有部门 */ - @NotNull(message = "用户网格ID不能为空") - private Long gridId; + private String allDeptNames; /** * 用户ID */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java index 2453b2ddc..dd5126baf 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; @@ -66,30 +67,48 @@ public class EpdcEventsEntity extends BaseEpdcEntity { * 议题内容 */ private String eventContent; - /** - * 区 - */ - private String area; - /** - * 区ID - */ - private Long areaId; - /** - * 街道 - */ - private String street; - /** - * 街道ID - */ - private Long streetId; - /** - * 社区 - */ - private String community; - /** - * 社区ID - */ - private Long communityId; + +// /** +// * 区 +// */ +// private String area; +// /** +// * 区ID +// */ +// private Long areaId; +// /** +// * 街道 +// */ +// private String street; +// /** +// * 街道ID +// */ +// private Long streetId; +// /** +// * 社区 +// */ +// private String community; +// /** +// * 社区ID +// */ +// private Long communityId; + + /** + * 父所有部门ID + */ + private String parentDeptIds; + /** + * 父所有部门 + */ + private String parentDeptNames; + /** + * 所有部门ID + */ + private String allDeptIds; + /** + * 所有部门 + */ + private String allDeptNames; /** * 网格 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 3f2f93a6a..4f452809f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -69,10 +69,12 @@ AND temp.grid_id = #{gridId} - AND find_in_set(#{streetId},temp.PARENT_DEPT_IDS) + AND (find_in_set(#{streetId},temp.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},temp.ALL_DEPT_IDS)) - AND find_in_set(#{communityId},temp.PARENT_DEPT_IDS) + AND (find_in_set(#{communityId},temp.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},temp.ALL_DEPT_IDS)) AND temp.EVENT_STATE = 0 ORDER BY temp.CREATED_TIME DESC diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index e7935fa61..b1b0f4b90 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -27,10 +27,12 @@ AND issue.GRID_ID = #{gridId} - AND find_in_set(#{streetId},issue.PARENT_DEPT_IDS) + AND (find_in_set(#{streetId},issue.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},issue.ALL_DEPT_IDS)) - AND find_in_set(#{communityId},issue.PARENT_DEPT_IDS) + AND (find_in_set(#{communityId},issue.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},issue.ALL_DEPT_IDS)) ORDER BY issue.CREATED_TIME DESC @@ -62,15 +64,13 @@ i.ISSUE_ADDRESS, i.ISSUE_LATITUDE, i.ISSUE_LONGITUDE, - cate.CATEGORY_NAME, + i.CATEGORY_FULL_NAME as CATEGORY_NAME, CONCAT(i.AREA,i.STREET,i.COMMUNITY,i.GRID) AS ownGrid, img.IMG_URL FROM epdc_issue i LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON i.ISSUE_CATEGORY_ID = cate.ID - AND cate.DEL_FLAG = '0' WHERE i.DEL_FLAG = '0' AND i.ID = #{id} @@ -107,7 +107,7 @@ i.ISSUE_ADDRESS, i.ISSUE_LATITUDE, i.ISSUE_LONGITUDE, - cate.CATEGORY_NAME, + item.CATEGORY_FULL_NAME as CATEGORY_NAME, CONCAT(i.AREA,i.STREET,i.COMMUNITY,i.GRID) AS ownGrid FROM epdc_issue i @@ -115,8 +115,6 @@ AND e.DEL_FLAG = '0' LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON i.ISSUE_CATEGORY_ID = cate.ID - AND cate.DEL_FLAG = '0' WHERE i.DEL_FLAG = '0' AND i.ID = #{issueId} @@ -179,7 +177,7 @@ AND img.DEL_FLAG = '0' LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.id AND eve.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON issue.ISSUE_CATEGORY_ID = cate.id + LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code AND cate.DEL_FLAG = '0' WHERE issue.ID IN ( @@ -200,7 +198,7 @@ AND t1.ISSUE_CONTENT LIKE CONCAT('%',#{searchContent},'%') - AND t1.ISSUE_CATEGORY_ID = #{categoryId} + AND t1.category_code = #{categoryId} ORDER BY ( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC, @@ -228,7 +226,7 @@ - + @@ -248,7 +246,7 @@ issue.NICK_NAME, issue.USER_FACE, issue.ISSUE_ADDRESS, - issue.ISSUE_CATEGORY_ID, + issue.CATEGORY_CODE, eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.BROWSE_NUM, @@ -338,7 +336,7 @@ epdc_issue issue LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON issue.ISSUE_CATEGORY_ID = cate.ID + LEFT JOIN epdc_category cate ON issue.CATEGORY_CODE = cate.category_code AND cate.DEL_FLAG = '0' WHERE issue.DEL_FLAG = '0' @@ -377,7 +375,7 @@ epdc_events eve LEFT JOIN epdc_img img ON eve.ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON eve.ISSUE_CATEGORY_ID = cate.ID + LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code AND cate.DEL_FLAG = '0' WHERE eve.DEL_FLAG = '0' @@ -401,7 +399,7 @@ epdc_issue issue LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON issue.ISSUE_CATEGORY_ID = cate.ID + LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code AND cate.DEL_FLAG = '0' WHERE issue.DEL_FLAG = '0' @@ -459,15 +457,13 @@ issue.NICK_NAME, issue.USER_FACE, issue.IS_PARTY_MEMBER, - cate.CATEGORY_NAME, + issue.CATEGORY_FULL_NAME as CATEGORY_NAME, issue.DISTRIBUTE_TIME, ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS STATEMENT_NUM FROM epdc_issue issue LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.id AND eve.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON issue.ISSUE_CATEGORY_ID = cate.id - AND cate.DEL_FLAG = '0' WHERE issue.ID IN ( SELECT temp.ID FROM ( @@ -503,7 +499,7 @@ - + @@ -525,7 +521,7 @@ issue.NICK_NAME, issue.USER_FACE, issue.ISSUE_ADDRESS, - issue.ISSUE_CATEGORY_ID, + issue.CATEGORY_FULL_NAME, eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.BROWSE_NUM, diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 0ea4775a1..dedd9d01e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -55,7 +55,7 @@ epdc_item item LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID + LEFT JOIN epdc_category cate ON item.FIRST_CATEGORY_CODE = cate.category_code AND cate.DEL_FLAG = '0' LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' @@ -89,7 +89,7 @@ AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%') - AND t1.ISSUE_CATEGORY_ID = #{formDto.categoryId} + AND t1.CATEGORY_CODE = #{formDto.categoryId} AND t1.USER_ID = #{formDto.userId} @@ -125,7 +125,7 @@ eve.OPPOSE_NUM, eve.COMMENT_NUM, ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum, - cate.CATEGORY_NAME, + item.CATEGORY_FULL_NAME as CATEGORY_NAME, img.IMG_URL, hp.CREATED_TIME AS handleTime, hp.OUT_HANDLE_ADVICE, @@ -142,8 +142,6 @@ epdc_item item LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID - AND cate.DEL_FLAG = '0' LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID @@ -201,7 +199,7 @@ epdc_item item LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID + LEFT JOIN epdc_category cate ON item.FIRST_CATEGORY_CODE = cate.category_code AND cate.DEL_FLAG = '0' LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' @@ -234,7 +232,7 @@ AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%') - AND t1.ISSUE_CATEGORY_ID = #{formDto.categoryId} + AND t1.CATEGORY_CODE = #{formDto.categoryId} AND t1.USER_ID = #{formDto.userId} @@ -275,7 +273,7 @@ - + @@ -298,7 +296,7 @@ item.NICK_NAME, item.USER_FACE, item.ISSUE_ADDRESS, - item.ISSUE_CATEGORY_ID, + item.CATEGORY_CODE, eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.BROWSE_NUM, @@ -349,18 +347,18 @@ COUNT( item.ID ) AS itemNum, SUM( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.BROWSE_NUM + eve.COMMENT_NUM ) AS attitudeNum, cate.CATEGORY_NAME, - cate.ID AS categoryId + cate.CATEGORY_CODE AS categoryId FROM epdc_item item LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' - LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID + LEFT JOIN epdc_category cate ON item.CATEGORY_CODE = cate.category_code AND cate.DEL_FLAG = '0' WHERE item.DEL_FLAG = '0' AND item.ITEM_STATE IN (0, 10) AND item.GRID_ID = #{gridId} - AND item.ISSUE_CATEGORY_ID = #{categoryId} + AND item.CATEGORY_CODE = #{categoryId} SELECT lp.field_value AS mainLable, - t.GRADATION_FLAG AS gradationFlag, + t.COLUMN_AMOUNT AS columnAmount, t.BACKGROUND_COLOR AS backgroundColor, - t.START_COLOR AS startColor, - t.END_COLOR AS endColor, + t.CLASS_NAME AS className, + t.SPARE_CLASS_NAME AS spareClassName, t.LABLE_COLOR AS lableColor, t.TEMPLATE_CODE AS templateCode, lc.field_value AS lable, From 01df1812cfbf5b6b950455ad5f31a726366151a5 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Wed, 27 Nov 2019 16:32:03 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A1=A8=20=E7=94=A8=E6=88=B7=E5=85=B3=E7=B3=BB=E8=A1=A8?= =?UTF-8?q?=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/entity/UserEntity.java | 29 ------------------ .../epdc/entity/UserGridRelationEntity.java | 30 ------------------- 2 files changed, 59 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java index 24c1a946b..a931693b4 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java @@ -213,35 +213,6 @@ public class UserEntity extends BaseEpdcEntity { */ private String state; - /** - * 区县 - */ - private String district; - - /** - * 区县ID - */ - private Long districtId; - - /** - * 街道 - */ - private String street; - - /** - * 街道ID - */ - private Long streetId; - - /** - * 社区 - */ - private String community; - - /** - * 社区ID - */ - private Long communityId; /** * 网格 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java index 4da14f1ee..0f8514f36 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java @@ -43,36 +43,6 @@ public class UserGridRelationEntity extends BaseEpdcEntity { */ private String userId; - /** - * 区县 - */ - private String district; - - /** - * 区县ID - */ - private Long districtId; - - /** - * 街道 - */ - private String street; - - /** - * 街道ID - */ - private Long streetId; - - /** - * 社区 - */ - private String community; - - /** - * 社区ID - */ - private Long communityId; - /** * 所属网格 */ From 1127752757dbf60dd37a9357f3658532ffbf3c4a Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 27 Nov 2019 16:56:39 +0800 Subject: [PATCH 6/8] =?UTF-8?q?app=E8=8F=9C=E5=8D=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/AppMenuDTO.java | 7 ++- .../esua/epdc/dto/AppMenuTemplateDTO.java | 6 --- .../epdc/result/EpdcAppChildNavResultDTO.java | 47 ++++++++++--------- .../result/EpdcAppIndexPanelResultDTO.java | 2 +- .../result/EpdcAppTemplateInfoResultDTO.java | 5 -- .../epdc/entity/AppMenuTemplateEntity.java | 5 -- .../src/main/resources/mapper/AppMenuDao.xml | 11 +++-- 7 files changed, 39 insertions(+), 44 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java index 87d2fd04d..0903569c0 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java @@ -41,7 +41,7 @@ import javax.validation.constraints.NotNull; @Data public class AppMenuDTO extends TreeNode implements Serializable { - private static final long serialVersionUID = -319379699436244053L; + private static final long serialVersionUID = 6519576943595915555L; /** * id @@ -76,6 +76,11 @@ public class AppMenuDTO extends TreeNode implements Serializable { */ private String permissions; + /** + * 样式名称 + */ + private String calssName; + /** * 排序 */ diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java index d6a2ab5b5..9ccf57c11 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java @@ -53,12 +53,6 @@ public class AppMenuTemplateDTO implements Serializable { */ private String spareClassName; - /** - * 标签颜色 - */ - private String lableColor; - - /** * 模板编码(tem-1,tem-2,tem-3) */ diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppChildNavResultDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppChildNavResultDTO.java index 87c31d765..a08c4f74c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppChildNavResultDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppChildNavResultDTO.java @@ -11,25 +11,30 @@ import java.io.Serializable; */ @Data public class EpdcAppChildNavResultDTO implements Serializable { - private static final long serialVersionUID = 1883432894888014315L; - - /** - * 菜单名 - */ - private String lable; - - /** - * 菜单编码 - */ - private String navCode; - - /** - * 备注 - */ - private String remark; - - /** - * 菜单图标 - */ - private String icon; + private static final long serialVersionUID = 1883432894888014315L; + + /** + * 菜单名 + */ + private String label; + + /** + * 菜单编码 + */ + private String navCode; + + /** + * 备注 + */ + private String remark; + + /** + * 菜单图标 + */ + private String icon; + + /** + * 样式名称 + */ + private String className; } diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIndexPanelResultDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIndexPanelResultDTO.java index b21f79aef..41d9305a7 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIndexPanelResultDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIndexPanelResultDTO.java @@ -16,7 +16,7 @@ public class EpdcAppIndexPanelResultDTO implements Serializable { /** * 主菜单名 */ - private String mainLable; + private String mainLabel; /** * 子菜单模板信息 diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppTemplateInfoResultDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppTemplateInfoResultDTO.java index cdc96f8b9..43d8438f1 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppTemplateInfoResultDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppTemplateInfoResultDTO.java @@ -29,11 +29,6 @@ public class EpdcAppTemplateInfoResultDTO implements Serializable { */ private String spareClassName; - /** - * 标签颜色 - */ - private String lableColor; - /** * 模板编码(tmp-1,tmp-2,tmp-3) */ diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuTemplateEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuTemplateEntity.java index 5bab43736..f274f40b7 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuTemplateEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuTemplateEntity.java @@ -54,11 +54,6 @@ public class AppMenuTemplateEntity extends BaseEpdcEntity { */ private String spareClassName; - /** - * 标签颜色 - */ - private String lableColor; - /** * 模板编码(tem-1,tem-2,tem-3) */ diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml index d562e9cda..d36590d60 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml @@ -69,34 +69,35 @@ - + - - + +