diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java index 5afc0b5..90ea731 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.modules.conflict.controller; +import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -50,6 +51,7 @@ public class ConflictMediateController { private ConflictMediateService conflictMediateService; @GetMapping("page") + @DataFilter(tableAlias = "ecm", isPendingCreator = false, prefix = "AND") public Result> page(@RequestParam Map params){ PageData page = conflictMediateService.page(params); return new Result>().ok(page); diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java index 9804559..6a37f8b 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java @@ -31,70 +31,75 @@ import java.util.Date; * @since v1.0.0 2020-06-10 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("epdc_conflict_mediate") public class ConflictMediateEntity extends DeptScope { - private static final long serialVersionUID = 4325729627079127823L; + private static final long serialVersionUID = 4325729627079127823L; /** * 提交人ID */ - private Long userId; + private Long userId; - /** - * 提交人 - */ - private String userName; + /** + * 提交人 + */ + private String userName; /** * 矛盾纠纷类型 */ - private String conflictType; + private String conflictType; /** * 行成原因 */ - private String conflictReason; + private String conflictReason; /** * 涉及人数 */ - private Integer involvedNum; + private Integer involvedNum; /** * 挑头骨干人员 */ - private String mainstayLeader; + private String mainstayLeader; /** * 责任单位 */ - private String responsibleDept; + private String responsibleDept; /** * 责任人 */ - private String responsiblePeople; + private String responsiblePeople; /** * 主要采取措施 */ - private String majorMeasures; + private String majorMeasures; /** * 目前稳控情况 */ - private String currentSituation; + private String currentSituation; /** * 备注 */ - private String remark; + private String remark; /** * 提报时间 */ - private Date submitTime; + private Date submitTime; + + /** + * 所属部门 + */ + private Long deptId; } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/redis/ConflictMediateRedis.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/redis/ConflictMediateRedis.java deleted file mode 100644 index 5b9b9e6..0000000 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/redis/ConflictMediateRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.conflict.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 矛盾纠纷调解情况 - * - * @author zhangyuan qu@elink-cn.com - * @since v1.0.0 2020-06-10 - */ -@Component -public class ConflictMediateRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java index c26b603..1f5a2d6 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java @@ -47,16 +47,6 @@ public interface ConflictMediateService extends BaseService page(Map params); - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-06-10 - */ - List list(Map params); - /** * 导出 * diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java index a16c2d9..32b413f 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java @@ -17,11 +17,9 @@ package com.elink.esua.epdc.modules.conflict.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -38,10 +36,8 @@ import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO; import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO; import com.elink.esua.epdc.modules.conflict.dao.ConflictMediateDao; import com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity; -import com.elink.esua.epdc.modules.conflict.redis.ConflictMediateRedis; import com.elink.esua.epdc.modules.conflict.service.ConflictMediateService; import com.elink.esua.epdc.modules.feign.AdminFeignClient; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -59,9 +55,6 @@ import java.util.Map; @Service public class ConflictMediateServiceImpl extends BaseServiceImpl implements ConflictMediateService { - @Autowired - private ConflictMediateRedis conflictMediateRedis; - @Autowired private AdminFeignClient adminFeignClient; @@ -73,31 +66,15 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl(list, page.getTotal()); } - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ConflictMediateDTO.class); - } - @Override public List export(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + List entityList = baseDao.selectListOfConflictMediate(params); for (int i = 0; i < entityList.size(); i++) { - entityList.get(i).setId(i + 1 + ""); + entityList.get(i).setId(String.valueOf(i + NumConstant.ONE)); } return ConvertUtils.sourceToTarget(entityList, ConflictMediateDTO.class); } - private QueryWrapper getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - @Override public ConflictMediateDTO get(String id) { ConflictMediateEntity entity = baseDao.selectById(id); @@ -134,6 +111,7 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(gridId); - ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDeptDTOResult.getData(); + Result adminResult = adminFeignClient.getParentAndAllDept(gridId); - if (!parentAndAllDeptDTOResult.success()) { - throw new RenException(parentAndAllDeptDTOResult.getMsg()); + if (!adminResult.success()) { + throw new RenException(adminResult.getMsg()); } - return parentAndAllDeptDTO; + return adminResult.getData(); } } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistController.java index f854939..fe55413 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistController.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.modules.psychology.controller; +import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; diff --git a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml index 1819821..e6cbe80 100644 --- a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml @@ -6,14 +6,14 @@ ID, USER_ID, USER_NAME, CONFLICT_TYPE, CONFLICT_REASON, INVOLVED_NUM, MAINSTAY_LEADER, RESPONSIBLE_DEPT, RESPONSIBLE_PEOPLE, MAJOR_MEASURES, CURRENT_SITUATION, REMARK, DATE_FORMAT( SUBMIT_TIME, '%Y-%m-%d' ) AS SUBMIT_TIME, - DEL_FLAG, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, PARENT_DEPT_IDS, + DEL_FLAG, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, PARENT_DEPT_IDS, DEPT_ID , PARENT_DEPT_NAMES, ALL_DEPT_IDS, ALL_DEPT_NAMES