luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

大屏组织插入时 添加是否显示字段 默认为 显示

master
jianjun 5 years ago
parent
79c8e0fa32
commit
fd5796353e
5 changed files with 49 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
  2. 10
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
  3. 12
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
  4. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataDetailFormDTO.java
  5. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenDifficultyDataDao.xml

23
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
View File

@ -33,8 +33,8 @@ import java.util.List;
public interface ScreenCustomerAgencyDao {
/**
* @Description 查询客户根组织ID
* @param customerId
* @Description 查询客户根组织ID
* @author zxc
* @date 2020/8/18 2:44 下午
*/
@ -43,8 +43,8 @@ public interface ScreenCustomerAgencyDao {
TreeResultDTO selectRootAgencyIdByBizType(@Param("customerId") String customerId, @Param("bizType") String bizType);
/**
* @Description 查询下级机关的 名称和id
* @param subAgencyPids
* @Description 查询下级机关的 名称和id
* @author zxc
* @date 2020/8/18 4:48 下午
*/
@ -53,8 +53,8 @@ public interface ScreenCustomerAgencyDao {
List<TreeResultDTO> selectSubAgencyListByBizType(@Param("subAgencyPids") String subAgencyPids);
/**
* @Description 查询当前机关的区域信息
* @param agencyId
* @Description 查询当前机关的区域信息
* @author zxc
* @date 2020/8/18 4:51 下午
*/
@ -63,25 +63,26 @@ public interface ScreenCustomerAgencyDao {
CompartmentResultDTO getAgencyAreaInfoByBizType(@Param("agencyId") String agencyId, @Param("bizType") String bizType);
/**
* @Description 查询子级区域分布信息【机关级别】
* @param agencyId
* @Description 查询子级区域分布信息【机关级别】
* @author zxc
* @date 2020/8/18 5:12 下午
*/
List<AgencyDistributionResultDTO> selectSubDistribution(@Param("agencyId") String agencyId);
List<AgencyDistributionResultDTO> selectSubDistributionByType(@Param("agencyId") String agencyId, @Param("bizType") String bizType);
/**
* @Description 查询子级用户分布【机关级别】
* @param parentId
* @Description 查询子级用户分布【机关级别】
* @author zxc
* @date 2020/8/19 9:33 上午
*/
List<UserDistributionResultDTO> selectUserDistributionAgency(@Param("parentId") String parentId);
/**
* @Description 查询子级党员分布【机关级别】
* @param parentId
* @Description 查询子级党员分布【机关级别】
* @author zxc
* @date 2020/8/19 10:30 上午
*/
@ -93,4 +94,14 @@ public interface ScreenCustomerAgencyDao {
* @author sun
*/
int selectRootAgency(@Param("agencyId") String agencyId);
/**
* desc: 根据orgId获取组织信息
*
* @param agencyId
* @return com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO
* @author LiuJanJun
* @date 2020/10/23 3:54 下午
*/
CompartmentResultDTO getAgencyInfoByAegncyId(@Param("agencyId") String agencyId);
}

10
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
View File

@ -70,7 +70,7 @@ public class FactIndexServiceImpl implements FactIndexService {
//组织层级数据
if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
//3.根据组织Id查询组织信息
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId());
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyInfoByAegncyId(formDTO.getOrgId());
if (null == agency) {
//throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
return resultList;
@ -172,7 +172,7 @@ public class FactIndexServiceImpl implements FactIndexService {
//组织层级数据
if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
//2.根据组织Id查询组织信息
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId());
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyInfoByAegncyId(formDTO.getOrgId());
if (null == agency) {
//throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
return resultList;
@ -220,7 +220,7 @@ public class FactIndexServiceImpl implements FactIndexService {
//组织层级数据
if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
//3.根据组织Id查询组织信息
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId());
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyInfoByAegncyId(formDTO.getOrgId());
if (null == agency) {
//throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
return resultList;
@ -291,7 +291,7 @@ public class FactIndexServiceImpl implements FactIndexService {
//组织层级数据
if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
//2.根据组织Id查询组织信息
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId());
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyInfoByAegncyId(formDTO.getOrgId());
if (null == agency) {
//throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
return resultList;
@ -359,7 +359,7 @@ public class FactIndexServiceImpl implements FactIndexService {
//组织层级数据
if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
//3.根据组织Id查询组织信息
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId());
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyInfoByAegncyId(formDTO.getOrgId());
if (null == agency) {
//throw new RenException(String.format("查询组织信息失败,组织Id:%s", formDTO.getOrgId()));
return resultList;

12
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
View File

@ -49,6 +49,7 @@
screen_customer_agency
WHERE
del_flag = 0
and is_display = 1
AND agency_id = #{agencyId}
</select>
@ -184,4 +185,15 @@
AND sca.pid = #{agencyId}
</select>
<select id="getAgencyInfoByAegncyId" resultType="com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO">
SELECT
agency_id AS agencyId,
agency_name AS name,
level AS level
FROM
screen_customer_agency
WHERE
del_flag = 0
AND agency_id = #{agencyId}
</select>
</mapper>

5
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataDetailFormDTO.java
View File

@ -48,6 +48,11 @@ public class DifficultyDataDetailFormDTO implements Serializable {
*/
private String eventSource;
/**
* 事件标题
*/
private String eventTitle;
/**
* 事件内容
*/

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenDifficultyDataDao.xml
View File

@ -18,6 +18,7 @@
PARENT_ID,
ORG_NAME,
EVENT_ID,
EVENT_TITLE,
EVENT_IMG_URL,
EVENT_SOURCE,
EVENT_CONTENT,
@ -47,6 +48,7 @@
#{item.parentId},
#{item.orgName},
#{item.eventId},
#{item.eventTitle},
#{item.eventImgUrl},
#{item.eventSource},
#{item.eventContent},

Write Preview
Loading…
Cancel
Save