Browse Source

Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili

dev
sunyuchao 3 years ago
parent
commit
96e7242dcb
  1. 8
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java
  2. 33
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CategorySelfOrgFormDTO.java
  3. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java
  4. 5
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListResultDTO.java
  5. 20
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SelfOrgCategoryTotalResDTO.java
  6. 43
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java
  7. 12
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
  8. 8
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcCommunitySelfOrganizationDao.java
  9. 8
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
  10. 29
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java
  11. 9
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
  12. 70
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
  13. 15
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
  14. 62
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml
  15. 23
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
  16. 1
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java

8
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java

@ -17,6 +17,7 @@
package com.epmet.dto; package com.epmet.dto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -42,6 +43,7 @@ public class IcCommunitySelfOrganizationPersonnelDTO implements Serializable {
/** /**
* 客户ID * 客户ID
*/ */
@JsonIgnore
private String customerId; private String customerId;
/** /**
@ -62,31 +64,37 @@ public class IcCommunitySelfOrganizationPersonnelDTO implements Serializable {
/** /**
* *
*/ */
@JsonIgnore
private Integer delFlag; private Integer delFlag;
/** /**
* 乐观锁 * 乐观锁
*/ */
@JsonIgnore
private String revision; private String revision;
/** /**
* 创建人 * 创建人
*/ */
@JsonIgnore
private String createdBy; private String createdBy;
/** /**
* 创建时间 * 创建时间
*/ */
@JsonIgnore
private Date createdTime; private Date createdTime;
/** /**
* 更新人 * 更新人
*/ */
@JsonIgnore
private String updatedBy; private String updatedBy;
/** /**
* 更新时间 * 更新时间
*/ */
@JsonIgnore
private Date updatedTime; private Date updatedTime;
} }

33
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CategorySelfOrgFormDTO.java

@ -0,0 +1,33 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@Data
public class CategorySelfOrgFormDTO extends PageFormDTO implements Serializable {
/**
* 默认展示全部此列可空
*/
private String categoryCode;
/**
* token中获取
*/
@NotBlank(message = "customerId不能为空",groups = PageFormDTO.AddUserInternalGroup.class)
private String customerId;
/**
* token中获取
*/
@NotBlank(message = "staffId不能为空",groups = PageFormDTO.AddUserInternalGroup.class)
private String staffId;
/**
* 当前登录用户所属组织id
*/
private String agencyId;
}

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java

@ -48,4 +48,6 @@ public class CommunitySelfOrganizationListFormDTO implements Serializable {
private Integer ranking; private Integer ranking;
private String remark; private String remark;
private String categoryCode;
} }

5
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListResultDTO.java

@ -24,4 +24,9 @@ public class PartyUnitListResultDTO implements Serializable {
* 协办单位名字 * 协办单位名字
*/ */
private String assistanceUnitName; private String assistanceUnitName;
/**
* 协办单位类型1社区自组织2联建单位
*/
private String assistanceUnitType;
} }

20
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SelfOrgCategoryTotalResDTO.java

@ -0,0 +1,20 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* 多元主体分析-社区自组织饼图
*/
@Data
public class SelfOrgCategoryTotalResDTO implements Serializable {
private String categoryCode;
private String categoryName;
/**
* 当前分类下的社区自组织数量
*/
private Integer total;
}

43
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java

@ -34,8 +34,10 @@ import com.epmet.constants.ImportTaskConstants;
import com.epmet.dto.IcCommunitySelfOrganizationDTO; import com.epmet.dto.IcCommunitySelfOrganizationDTO;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO;
import com.epmet.dto.result.CommunitySelfOrganizationListDTO;
import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO; import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO;
import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO;
import com.epmet.dto.result.SelfOrgCategoryTotalResDTO;
import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.demand.OptionDTO;
import com.epmet.excel.ExportCommunitySelfOrganizationExcel; import com.epmet.excel.ExportCommunitySelfOrganizationExcel;
import com.epmet.excel.IcCommunitySelfOrganizationExcel; import com.epmet.excel.IcCommunitySelfOrganizationExcel;
@ -281,4 +283,45 @@ public class IcCommunitySelfOrganizationController {
ValidatorUtils.validateEntity(formDTO,ServiceQueryFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO,ServiceQueryFormDTO.AddUserInternalGroup.class);
return new Result<List<OptionDTO>>().ok(icCommunitySelfOrganizationService.queryServiceList(formDTO)); return new Result<List<OptionDTO>>().ok(icCommunitySelfOrganizationService.queryServiceList(formDTO));
} }
/**
* 多元主体分析-各分类下的社区自组织数量饼图
*
* @param tokenDto
* @return
*/
@PostMapping("/total-pie")
public Result<List<SelfOrgCategoryTotalResDTO>> totalPie(@LoginUser TokenDto tokenDto) {
return new Result<List<SelfOrgCategoryTotalResDTO>>().ok(icCommunitySelfOrganizationService.querySelfOrgCategoryTotal(tokenDto.getCustomerId(), tokenDto.getUserId()));
}
/**
* 多元主体分析-分类下的社区自组织列表
*
* @param tokenDto
* @param formDTO
* @return
*/
@PostMapping("/category-list")
public Result<PageData<CommunitySelfOrganizationListDTO>> queryCategoryList(@LoginUser TokenDto tokenDto, @RequestBody CategorySelfOrgFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId());
formDTO.setIsPage(true);
return new Result<PageData<CommunitySelfOrganizationListDTO>>().ok(icCommunitySelfOrganizationService.queryCategoryList(formDTO));
}
/**
* 003多元主题分析-地图详情信息已包含
* @param tokenDto
* @param formDTO
* @return
*/
@PostMapping("/coordinate-list")
public Result<PageData<CommunitySelfOrganizationListDTO>> queryCoordinateList(@LoginUser TokenDto tokenDto, @RequestBody CategorySelfOrgFormDTO formDTO){
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId());
formDTO.setIsPage(false);
return new Result<PageData<CommunitySelfOrganizationListDTO>>().ok(icCommunitySelfOrganizationService.queryCoordinateList(formDTO));
}
} }

12
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@ -264,4 +264,16 @@ public class IcPartyUnitController {
public Result<List<PartyUnitListResultDTO>> getPartyUnitList(@RequestBody PartyUnitListFormDTO formDTO){ public Result<List<PartyUnitListResultDTO>> getPartyUnitList(@RequestBody PartyUnitListFormDTO formDTO){
return new Result<List<PartyUnitListResultDTO>>().ok(icPartyUnitService.getPartyUnitList(formDTO)); return new Result<List<PartyUnitListResultDTO>>().ok(icPartyUnitService.getPartyUnitList(formDTO));
} }
/**
* Desc: 协办单位列表
* @param tokenDto
* @author zxc
* @date 2022/5/18 13:37
*/
@PostMapping("assistanceUnitList")
public Result<List<PartyUnitListResultDTO>> getAssistanceUnitList(@LoginUser TokenDto tokenDto){
return new Result<List<PartyUnitListResultDTO>>().ok(icPartyUnitService.getAssistanceUnitList(tokenDto));
}
} }

8
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcCommunitySelfOrganizationDao.java

@ -19,8 +19,10 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.IcCommunitySelfOrganizationDTO; import com.epmet.dto.IcCommunitySelfOrganizationDTO;
import com.epmet.dto.form.CategorySelfOrgFormDTO;
import com.epmet.dto.form.CommunitySelfOrganizationListFormDTO; import com.epmet.dto.form.CommunitySelfOrganizationListFormDTO;
import com.epmet.dto.result.CommunitySelfOrganizationListDTO; import com.epmet.dto.result.CommunitySelfOrganizationListDTO;
import com.epmet.dto.result.SelfOrgCategoryTotalResDTO;
import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.demand.OptionDTO;
import com.epmet.entity.IcCommunitySelfOrganizationEntity; import com.epmet.entity.IcCommunitySelfOrganizationEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -65,4 +67,10 @@ public interface IcCommunitySelfOrganizationDao extends BaseDao<IcCommunitySelfO
*/ */
List<String> selectOrgByOrgName(@Param("names")List<String> names, @Param("customerId") String customerId); List<String> selectOrgByOrgName(@Param("names")List<String> names, @Param("customerId") String customerId);
List<IcCommunitySelfOrganizationDTO> selectOrgByCustomerId(@Param("customerId") String customerId); List<IcCommunitySelfOrganizationDTO> selectOrgByCustomerId(@Param("customerId") String customerId);
List<SelfOrgCategoryTotalResDTO> selectCountGroupByCategory(@Param("customerId") String customerId,@Param("agencyId") String agencyId);
List<CommunitySelfOrganizationListDTO> queryCategoryList(CategorySelfOrgFormDTO formDTO);
List<CommunitySelfOrganizationListDTO> queryCoordinateList(CategorySelfOrgFormDTO formDTO);
} }

8
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java

@ -84,4 +84,12 @@ public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
* @date 2022/5/17 18:51 * @date 2022/5/17 18:51
*/ */
List<PartyUnitListResultDTO> getCommunitySelfList(@Param("ids") List<String> ids); List<PartyUnitListResultDTO> getCommunitySelfList(@Param("ids") List<String> ids);
/**
* Desc: 协办单位列表
* @param agencyId
* @author zxc
* @date 2022/5/18 13:48
*/
List<PartyUnitListResultDTO> getAssistanceUnitList(@Param("agencyId")String agencyId);
} }

29
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java

@ -21,12 +21,11 @@ import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.dto.IcCommunitySelfOrganizationDTO; import com.epmet.dto.IcCommunitySelfOrganizationDTO;
import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO; import com.epmet.dto.form.*;
import com.epmet.dto.form.CommunitySelfOrganizationListFormDTO;
import com.epmet.dto.form.DelCommunitySelfOrganizationFormDTO;
import com.epmet.dto.form.EditCommunitySelfOrganizationFormDTO;
import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO;
import com.epmet.dto.result.CommunitySelfOrganizationListDTO;
import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO; import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO;
import com.epmet.dto.result.SelfOrgCategoryTotalResDTO;
import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.demand.OptionDTO;
import com.epmet.entity.IcCommunitySelfOrganizationEntity; import com.epmet.entity.IcCommunitySelfOrganizationEntity;
@ -160,4 +159,26 @@ public interface IcCommunitySelfOrganizationService extends BaseService<IcCommun
void importCommunitySelfOrganization(TokenDto tokenDto, HttpServletResponse response, InputStream inputStream, String taskId) throws IOException; void importCommunitySelfOrganization(TokenDto tokenDto, HttpServletResponse response, InputStream inputStream, String taskId) throws IOException;
List<IcCommunitySelfOrganizationEntity> queryListById(List<String> communityOrgIds); List<IcCommunitySelfOrganizationEntity> queryListById(List<String> communityOrgIds);
/**
* 多元主体分析-各分类下的社区自组织数量饼图
* @param customerId
* @param userId
* @return
*/
List<SelfOrgCategoryTotalResDTO> querySelfOrgCategoryTotal(String customerId, String userId);
/**
* 多元主体分析-分类下的社区自组织列表
* @param formDTO
* @return
*/
PageData<CommunitySelfOrganizationListDTO> queryCategoryList(CategorySelfOrgFormDTO formDTO);
/**
* 多元主体分析-地图坐标及详情
* @param formDTO
* @return
*/
PageData<CommunitySelfOrganizationListDTO> queryCoordinateList(CategorySelfOrgFormDTO formDTO);
} }

9
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java

@ -152,4 +152,13 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
* @date 2022/5/17 17:53 * @date 2022/5/17 17:53
*/ */
List<PartyUnitListResultDTO> getPartyUnitList(PartyUnitListFormDTO formDTO); List<PartyUnitListResultDTO> getPartyUnitList(PartyUnitListFormDTO formDTO);
/**
* Desc: 协办单位列表
* @param tokenDto
* @author zxc
* @date 2022/5/18 13:37
*/
List<PartyUnitListResultDTO> getAssistanceUnitList(TokenDto tokenDto);
} }

70
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@ -35,10 +35,7 @@ import com.epmet.dao.IcUserDemandRecDao;
import com.epmet.dto.IcCommunitySelfOrganizationDTO; import com.epmet.dto.IcCommunitySelfOrganizationDTO;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO;
import com.epmet.dto.result.CommunitySelfOrganizationListDTO; import com.epmet.dto.result.*;
import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO;
import com.epmet.dto.result.ServicePointDTO;
import com.epmet.dto.result.UploadImgResultDTO;
import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.demand.OptionDTO;
import com.epmet.entity.IcCommunitySelfOrganizationEntity; import com.epmet.entity.IcCommunitySelfOrganizationEntity;
import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity; import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity;
@ -709,4 +706,69 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
/**
* 多元主体分析-各分类下的社区自组织数量饼图
*
* @param customerId
* @param staffId
* @return
*/
@Override
public List<SelfOrgCategoryTotalResDTO> querySelfOrgCategoryTotal(String customerId, String staffId) {
Result<Map<String, String>> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SELF_ORG_CATEGORY.getCode());
if (!dictMapRes.success() || MapUtils.isEmpty(dictMapRes.getData())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "社区自组织分类查询异常");
}
CustomerStaffInfoCacheResult staffInfo=getStaffInfo(customerId,staffId);
List<SelfOrgCategoryTotalResDTO> list = baseDao.selectCountGroupByCategory(customerId, staffInfo.getAgencyId());
Map<String, Integer> map = list.stream().collect(Collectors.toMap(SelfOrgCategoryTotalResDTO::getCategoryCode, SelfOrgCategoryTotalResDTO::getTotal, (key1, key2) -> key2));
List<SelfOrgCategoryTotalResDTO> resultList = new ArrayList<>();
for (String key : dictMapRes.getData().keySet()) {
SelfOrgCategoryTotalResDTO resDTO = new SelfOrgCategoryTotalResDTO();
resDTO.setCategoryCode(key);
resDTO.setCategoryName(dictMapRes.getData().get(key));
resDTO.setTotal(map.containsKey(key) ? map.get(key) : NumConstant.ZERO);
resultList.add(resDTO);
}
return resultList;
}
private CustomerStaffInfoCacheResult getStaffInfo(String customerId, String staffId) {
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId);
if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前工作人员信息异常");
}
return staffInfo;
}
/**
* 多元主体分析-分类下的社区自组织列表
*
* @param formDTO
* @return
*/
@Override
public PageData<CommunitySelfOrganizationListDTO> queryCategoryList(CategorySelfOrgFormDTO formDTO) {
CustomerStaffInfoCacheResult staffInfo=getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId());
formDTO.setAgencyId(staffInfo.getAgencyId());
PageInfo<CommunitySelfOrganizationListDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.queryCategoryList(formDTO));
return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
}
/**
* 多元主体分析-地图坐标及详情
*
* @param formDTO
* @return
*/
@Override
public PageData<CommunitySelfOrganizationListDTO> queryCoordinateList(CategorySelfOrgFormDTO formDTO) {
CustomerStaffInfoCacheResult staffInfo=getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId());
formDTO.setAgencyId(staffInfo.getAgencyId());
PageInfo<CommunitySelfOrganizationListDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.queryCoordinateList(formDTO));
return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
}
} }

15
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@ -614,6 +614,21 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
return result; return result;
} }
/**
* Desc: 协办单位列表
* @param tokenDto
* @author zxc
* @date 2022/5/18 13:37
*/
@Override
public List<PartyUnitListResultDTO> getAssistanceUnitList(TokenDto tokenDto) {
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
if (null == staffInfo){
throw new EpmetException("未查询到此工作人员信息"+tokenDto.getUserId());
}
return baseDao.getAssistanceUnitList(staffInfo.getAgencyId());
}
private String getServiceMatter(Map<String, String> map, String matter) { private String getServiceMatter(Map<String, String> map, String matter) {
List<String> matters = Arrays.asList(matter.split(StrConstant.COLON)); List<String> matters = Arrays.asList(matter.split(StrConstant.COLON));
List<String> list = matters.stream().map(map::get).collect(Collectors.toList()); List<String> list = matters.stream().map(map::get).collect(Collectors.toList());

62
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@ -38,7 +38,10 @@
<select id="selectPerson" resultType="com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO"> <select id="selectPerson" resultType="com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO">
select select
person_name AS personName, person_name AS personName,
person_phone as personPhone person_phone as personPhone,
ID,
CUSTOMER_ID,
ORG_ID
from ic_community_self_organization_personnel from ic_community_self_organization_personnel
where org_id = #{orgId} where org_id = #{orgId}
and del_flag = 0 and del_flag = 0
@ -117,4 +120,61 @@
AND customer_id = #{customerId} AND customer_id = #{customerId}
</select> </select>
<select id="selectCountGroupByCategory" parameterType="map" resultType="com.epmet.dto.result.SelfOrgCategoryTotalResDTO">
SELECT
i.CATEGORY_CODE AS categoryCode,
count( i.ID ) AS total
FROM
ic_community_self_organization i
WHERE
i.DEL_FLAG = '0'
AND I.CATEGORY_CODE IS NOT NULL
AND I.CATEGORY_CODE !=''
AND i.CUSTOMER_ID = #{customerId}
AND ( i.ORG_ID = #{agencyId} OR i.PIDS LIKE concat('%',#{agencyId},'%') )
GROUP BY
i.CATEGORY_CODE
</select>
<select id="queryCategoryList" parameterType="com.epmet.dto.form.CategorySelfOrgFormDTO" resultType="com.epmet.dto.result.CommunitySelfOrganizationListDTO">
SELECT
so.ORGANIZATION_NAME AS organizationName,
so.CATEGORY_CODE AS categoryCode,
so.ID as orgId
FROM ic_community_self_organization so
WHERE so.DEL_FLAG = 0
AND so.CATEGORY_CODE IS NOT NULL
AND so.CATEGORY_CODE !=''
AND (so.ORG_ID = #{agencyId} or so.PIDS LIKE concat('%',#{agencyId},'%'))
AND so.CUSTOMER_ID = #{customerId}
<if test="null != categoryCode and categoryCode != '' ">
AND so.CATEGORY_CODE =#{categoryCode}
</if>
ORDER BY so.ORG_ID ASC,so.ORGANIZATION_CREATED_TIME DESC
</select>
<select id="queryCoordinateList" resultMap="selectCommunitySelfOrganizationListMap" parameterType="com.epmet.dto.form.CommunitySelfOrganizationListFormDTO">
SELECT
so.ORGANIZATION_NAME AS organizationName,
so.CATEGORY_CODE AS categoryCode,
so.ORGANIZATION_PERSON_COUNT AS organizationPersonCount,
IFNULL(DATE_FORMAT(so.ORGANIZATION_CREATED_TIME,'%Y-%m-%d'),DATE_FORMAT(so.CREATED_TIME,'%Y-%m-%d')) AS organizationCreatedTime,
so.PRINCIPAL_NAME AS principalName,
so.PRINCIPAL_PHONE AS principalPhone,
so.SERVICE_ITEM AS serviceItem,
so.LONGITUDE AS longitude,
so.LATITUDE AS latitude,
so.ID as orgId,
so.remark
FROM ic_community_self_organization so
WHERE so.DEL_FLAG = 0
AND so.CATEGORY_CODE IS NOT NULL
AND so.CATEGORY_CODE !=''
AND (so.ORG_ID = #{agencyId} or so.PIDS LIKE concat('%',#{agencyId},'%'))
AND so.CUSTOMER_ID = #{customerId}
<if test="null != categoryCode and categoryCode != '' ">
AND so.CATEGORY_CODE =#{categoryCode}
</if>
ORDER BY so.ORG_ID ASC,so.ORGANIZATION_CREATED_TIME DESC
</select>
</mapper> </mapper>

23
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml

@ -102,6 +102,29 @@
) )
</select> </select>
<!-- 协办单位列表 -->
<select id="getAssistanceUnitList" resultType="com.epmet.dto.result.PartyUnitListResultDTO">
SELECT t.* FROM (
SELECT
ID AS assistanceUnitId,
UNIT_NAME AS assistanceUnitName,
'2' AS assistanceUnitType,
CREATED_TIME
FROM ic_party_unit
WHERE DEL_FLAG = '0'
AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
UNION ALL
SELECT
ID AS assistanceUnitId,
ORGANIZATION_NAME AS assistanceUnitName,
'1' AS assistanceUnitType,
CREATED_TIME
FROM ic_community_self_organization
WHERE DEL_FLAG = '0'
AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
) t ORDER BY CREATED_TIME desc
</select>
<update id="updateSatisfaction" parameterType="map"> <update id="updateSatisfaction" parameterType="map">
update ic_party_unit update ic_party_unit
set SATISFACTION=#{satisfaction},UPDATED_TIME=NOW() set SATISFACTION=#{satisfaction},UPDATED_TIME=NOW()

1
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java

@ -69,7 +69,6 @@ public class ProjectManageListResultDTO implements Serializable {
@JsonIgnore @JsonIgnore
private Date updatedTime; private Date updatedTime;
@JsonIgnore
private String isHandle; private String isHandle;
public ProjectManageListResultDTO() { public ProjectManageListResultDTO() {

Loading…
Cancel
Save