diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/EnterpriseInterviewDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/EnterpriseInterviewDao.java index 5ca678f389..f10b41783a 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/EnterpriseInterviewDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/EnterpriseInterviewDao.java @@ -20,5 +20,5 @@ public interface EnterpriseInterviewDao extends BaseDao search(@Param("unitName") String unitName, @Param("staffs") String staffs, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("interviewType") String interviewType, @Param("problem") String problem, - @Param("remark") String remark); + @Param("remark") String remark, @Param("ids") List ids); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/EnterpriseInvestigateDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/EnterpriseInvestigateDao.java index 98c4b339c1..190239bc4b 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/EnterpriseInvestigateDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/EnterpriseInvestigateDao.java @@ -19,5 +19,6 @@ public interface EnterpriseInvestigateDao extends BaseDao search(@Param("unitName") String unitName, @Param("title") String title, @Param("startTime") String startTime, @Param("endTime") String endTime, - @Param("consequence") String consequence, @Param("remark") String remark); + @Param("consequence") String consequence, @Param("remark") String remark, + @Param("ids") List ids); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/KeyEnterpriseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/KeyEnterpriseDao.java index fb943fd7b5..04a449a598 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/KeyEnterpriseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/KeyEnterpriseDao.java @@ -15,6 +15,6 @@ import java.util.List; @Mapper public interface KeyEnterpriseDao extends BaseDao { - List search(@Param("unitName") String unitName, @Param("unitType") String unitType); + List search(@Param("unitName") String unitName, @Param("unitType") String unitType, @Param("orgIdPath") String orgIdPath); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/KeyEnterpriseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/KeyEnterpriseEntity.java index 2d7b0bf633..678d3cc050 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/KeyEnterpriseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/KeyEnterpriseEntity.java @@ -58,4 +58,9 @@ public class KeyEnterpriseEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 组织ID路径 + */ + private String orgIdPath; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/EnterpriseInterviewServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/EnterpriseInterviewServiceImpl.java index 30c5aac06f..4c86107cde 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/EnterpriseInterviewServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/EnterpriseInterviewServiceImpl.java @@ -8,12 +8,16 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.EnterpriseInterviewDao; import com.epmet.dto.EnterpriseInterviewDTO; +import com.epmet.dto.KeyEnterpriseDTO; import com.epmet.dto.form.EnterpriseInterviewFormDTO; +import com.epmet.dto.form.KeyEnterpriseFormDTO; import com.epmet.entity.EnterpriseInterviewEntity; import com.epmet.service.EnterpriseInterviewService; +import com.epmet.service.KeyEnterpriseService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,6 +27,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 日照：企业走访 @@ -33,6 +38,9 @@ import java.util.Map; @Service public class EnterpriseInterviewServiceImpl extends BaseServiceImpl implements EnterpriseInterviewService { + @Autowired + private KeyEnterpriseService enterpriseService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -93,9 +101,17 @@ public class EnterpriseInterviewServiceImpl extends BaseServiceImpl search(EnterpriseInterviewFormDTO formDto) { + List enterprise = enterpriseService.search(new KeyEnterpriseFormDTO()).getList(); + List enterpriseIds; + if (null != enterprise && enterprise.size() > 0) { + enterpriseIds = enterprise.stream().map(enter -> enter.getId()).collect(Collectors.toList()); + } else { + return new PageData<>(new ArrayList<>(), 0); + } + List ids = enterpriseIds; PageInfo pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage()) .doSelectPageInfo(() -> baseDao.search(formDto.getUnitName(), formDto.getStaffs(), formDto.getStartTime(), formDto.getEndTime(), formDto.getInterviewType(), - formDto.getProblem(), formDto.getRemark())); + formDto.getProblem(), formDto.getRemark(),ids)); return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal()); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/EnterpriseInvestigateServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/EnterpriseInvestigateServiceImpl.java index b01a8699fa..c99e859f16 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/EnterpriseInvestigateServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/EnterpriseInvestigateServiceImpl.java @@ -8,12 +8,16 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.EnterpriseInvestigateDao; import com.epmet.dto.EnterpriseInvestigateDTO; +import com.epmet.dto.KeyEnterpriseDTO; import com.epmet.dto.form.EnterpriseInvestigateFormDTO; +import com.epmet.dto.form.KeyEnterpriseFormDTO; import com.epmet.entity.EnterpriseInvestigateEntity; import com.epmet.service.EnterpriseInvestigateService; +import com.epmet.service.KeyEnterpriseService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,6 +27,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 日照：企业排查管理 @@ -33,6 +38,10 @@ import java.util.Map; @Service public class EnterpriseInvestigateServiceImpl extends BaseServiceImpl implements EnterpriseInvestigateService { + + @Autowired + private KeyEnterpriseService enterpriseService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -97,9 +106,17 @@ public class EnterpriseInvestigateServiceImpl extends BaseServiceImpl search(EnterpriseInvestigateFormDTO formDto) { + List enterprise = enterpriseService.search(new KeyEnterpriseFormDTO()).getList(); + List enterpriseIds; + if (null != enterprise && enterprise.size() > 0) { + enterpriseIds = enterprise.stream().map(enter -> enter.getId()).collect(Collectors.toList()); + } else { + return new PageData<>(new ArrayList<>(), 0); + } + List ids = enterpriseIds; PageInfo pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage()) .doSelectPageInfo(() -> baseDao.search(formDto.getUnitName(), formDto.getTitle(), formDto.getStartTime(), formDto.getEndTime(), - formDto.getConsequence(), formDto.getRemark())); + formDto.getConsequence(), formDto.getRemark(), ids)); return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal()); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/KeyEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/KeyEnterpriseServiceImpl.java index 9f62b5f50c..91d74629e5 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/KeyEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/KeyEnterpriseServiceImpl.java @@ -9,7 +9,9 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.KeyEnterpriseDao; import com.epmet.dto.KeyEnterpriseDTO; import com.epmet.dto.form.KeyEnterpriseFormDTO; +import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.entity.KeyEnterpriseEntity; +import com.epmet.remote.EpmetUserRemoteService; import com.epmet.service.KeyEnterpriseService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -17,6 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -29,6 +32,9 @@ import java.util.Map; @Service public class KeyEnterpriseServiceImpl extends BaseServiceImpl implements KeyEnterpriseService { + @Resource + private EpmetUserRemoteService remoteService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -41,16 +47,16 @@ public class KeyEnterpriseServiceImpl extends BaseServiceImpl list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, KeyEnterpriseDTO.class); } private QueryWrapper getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); - + String orgPath = remoteService.getLoginUserDetails().getOrgIdPath(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - + wrapper.likeRight(StringUtils.isNotBlank(orgPath), "ORG_ID_PATH", orgPath); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @@ -64,6 +70,9 @@ public class KeyEnterpriseServiceImpl extends BaseServiceImpl search(KeyEnterpriseFormDTO formDto) { + String orgIdPath = remoteService.getLoginUserDetails().getOrgIdPath(); PageInfo pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage()) - .doSelectPageInfo(() -> baseDao.search(formDto.getUnitName(), formDto.getUnitType())); + .doSelectPageInfo(() -> baseDao.search(formDto.getUnitName(), formDto.getUnitType(), orgIdPath)); return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal()); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/EnterpriseInterviewDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/EnterpriseInterviewDao.xml index 870f78fd12..b8132c7a2a 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/EnterpriseInterviewDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/EnterpriseInterviewDao.xml @@ -39,6 +39,12 @@ LEFT JOIN key_enterprise ke ON ei.ENTERPRISE_ID = ke.ID ei.DEL_FLAG = 0 + + AND ei.ENTERPRISE_ID IN + + #{id} + + AND ke.UNIT_NAME LIKE concat( '%', #{unitName}, '%') diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/EnterpriseInvestigateDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/EnterpriseInvestigateDao.xml index d60ada3bb0..14d163de88 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/EnterpriseInvestigateDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/EnterpriseInvestigateDao.xml @@ -37,6 +37,12 @@ LEFT JOIN key_enterprise ke ON ei.ENTERPRISE_ID = ke.ID ei.DEL_FLAG = 0 + + AND ei.ENTERPRISE_ID IN + + #{id} + + AND ke.UNIT_NAME LIKE concat( '%', #{unitName}, '%') diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/KeyEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/KeyEnterpriseDao.xml index 3f46ffdfa6..7be1ed9dfd 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/KeyEnterpriseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/KeyEnterpriseDao.xml @@ -13,6 +13,7 @@ + @@ -36,7 +37,7 @@ FROM key_enterprise ke - ke.DEL_FLAG = 0 + ke.DEL_FLAG = 0 AND ke.ORG_ID_PATH LIKE concat(#{orgIdPath},'%') AND ke.UNIT_NAME LIKE concat( '%', #{unitName}, '%')