yinzuomei 2 years ago
parent
commit
b6884fadc9
  1. 15
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/EnterpriseCountPlaceTypeFormDTO.java
  2. 24
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeDetailDTO.java
  3. 17
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeResDTO.java
  4. 17
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java
  5. 11
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java
  6. 12
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java
  7. 52
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
  8. 20
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml

15
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/EnterpriseCountPlaceTypeFormDTO.java

@ -0,0 +1,15 @@
package com.epmet.dto.form.yt;
import lombok.Data;
/**
* @Description 九小场所分析
* @Author yzm
* @Date 2023/4/7 16:47
*/
@Data
public class EnterpriseCountPlaceTypeFormDTO {
private String orgId;
private String orgType;
}

24
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeDetailDTO.java

@ -0,0 +1,24 @@
package com.epmet.dto.result.yt;
import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
/**
* @Description 九小场所分析
* @Author yzm
* @Date 2023/4/7 16:48
*/
@Data
public class EnterpriseCountPlaceTypeDetailDTO {
private String placeType;
private String placeTypeName;
private Integer total;
public EnterpriseCountPlaceTypeDetailDTO() {
this.total = NumConstant.ZERO;
}
}

17
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/EnterpriseCountPlaceTypeResDTO.java

@ -0,0 +1,17 @@
package com.epmet.dto.result.yt;
import lombok.Data;
import java.util.List;
/**
* @Description 九小场所分析
* @Author yzm
* @Date 2023/4/7 16:47
*/
@Data
public class EnterpriseCountPlaceTypeResDTO {
private Integer total;
private List<EnterpriseCountPlaceTypeDetailDTO> list;
}

17
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java

@ -22,14 +22,15 @@ import com.epmet.commons.tools.utils.*;
import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.constants.ImportTaskConstants;
import com.epmet.dto.IcEnterpriseChangeRecordDTO;
import com.epmet.dto.form.EnterpriseFormDTO;
import com.epmet.dto.form.EnterprisePageFormDTO;
import com.epmet.dto.form.EnterprisePatrolFormDTO;
import com.epmet.dto.form.ImportTaskCommonFormDTO;
import com.epmet.dto.form.yt.EnterpriseCountPlaceTypeFormDTO;
import com.epmet.dto.result.EnterpriseDetailDTO;
import com.epmet.dto.result.EnterprisePatrolResultDTO;
import com.epmet.dto.result.ImportTaskCommonResultDTO;
import com.epmet.dto.result.yt.EnterpriseCountPlaceTypeResDTO;
import com.epmet.excel.EnterpriseExportExcelDTO;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.service.IcEnterpriseService;
@ -69,6 +70,7 @@ public class IcEnterpriseController implements ResultDataResolver {
private IcEnterpriseService icEnterpriseService;
@Autowired
private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
/**
* 企事业单位巡查新增/编辑
*
@ -359,4 +361,17 @@ public class IcEnterpriseController implements ResultDataResolver {
icEnterpriseService.qrCodeExport(formDTO,response);
}
/**
* 九小场所分析:返回各个场所类型的数量
*
* @param formDTO
* @return
*/
@PostMapping("count-type")
public Result<EnterpriseCountPlaceTypeResDTO> countType(@RequestBody EnterpriseCountPlaceTypeFormDTO formDTO) {
return new Result<EnterpriseCountPlaceTypeResDTO>().ok(icEnterpriseService.countType(formDTO.getOrgId(), formDTO.getOrgType()));
}
}

11
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEnterpriseDao.java

@ -3,6 +3,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.form.EnterprisePageFormDTO;
import com.epmet.dto.result.EnterpriseDetailDTO;
import com.epmet.dto.result.yt.EnterpriseCountPlaceTypeDetailDTO;
import com.epmet.entity.IcEnterpriseEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -32,4 +33,14 @@ public interface IcEnterpriseDao extends BaseDao<IcEnterpriseEntity> {
List<EnterpriseDetailDTO> selectList(EnterprisePageFormDTO formDTO);
List<IcEnterpriseEntity> selectForUniqueName(@Param("gridId") String gridId, @Param("placeOrgName") String placeOrgName, @Param("enterpriseId") String enterpriseId);
/**
* 按场所类型
* @param orgId
* @param orgType
* @return
*/
List<EnterpriseCountPlaceTypeDetailDTO> selectCountByPlaceType(@Param("customerId")String customerId,
@Param("orgId") String orgId,
@Param("orgType") String orgType);
}

12
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java

@ -2,19 +2,17 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.IcEnterpriseChangeRecordDTO;
import com.epmet.dto.form.EnterpriseFormDTO;
import com.epmet.dto.form.EnterprisePageFormDTO;
import com.epmet.dto.form.EnterprisePatrolFormDTO;
import com.epmet.dto.result.EnterpriseDetailDTO;
import com.epmet.dto.result.EnterprisePatrolResultDTO;
import com.epmet.dto.result.yt.EnterpriseCountPlaceTypeResDTO;
import com.epmet.entity.IcEnterpriseEntity;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
/**
@ -103,4 +101,12 @@ public interface IcEnterpriseService extends BaseService<IcEnterpriseEntity> {
*/
void qrCodeExport(EnterprisePageFormDTO formDTO, HttpServletResponse response) throws IOException;
/**
* 九小场所分析:返回各个场所类型的数量
*
* @param orgId
* @param orgType
* @return
*/
EnterpriseCountPlaceTypeResDTO countType(String orgId, String orgType);
}

52
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java

@ -29,10 +29,11 @@ import com.epmet.constants.ImportTaskConstants;
import com.epmet.dao.*;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.dto.result.yt.EnterpriseCountPlaceTypeDetailDTO;
import com.epmet.dto.result.yt.EnterpriseCountPlaceTypeResDTO;
import com.epmet.entity.*;
import com.epmet.excel.EnterpriseImportExcelDTO;
import com.epmet.excel.handler.IcEnterpriseExcelImportListener;
import com.epmet.feign.EpmetAdminOpenFeignClient;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.feign.EpmetMessageOpenFeignClient;
import com.epmet.feign.OssFeignClient;
@ -85,8 +86,6 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
@Autowired
private IcEnterprisePatrolRecordDao enterprisePatrolRecordDao;
@Autowired
private EpmetAdminOpenFeignClient adminOpenFeignClient;
@Autowired
private IcCoverageCategoryDictDao coverageCategoryDictDao;
@Autowired
private OssFeignClient ossFeignClient;
@ -101,8 +100,6 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
@Autowired
private IcEnterpriseChangeRecordService icEnterpriseChangeRecordService;
@Autowired
private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
@Autowired
private LoginUserUtil loginUserUtil;
@ -678,4 +675,49 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
zip.close();
}
/**
* 九小场所分析:返回各个场所类型的数量
*
* @param orgId
* @param orgType
* @return
*/
@Override
public EnterpriseCountPlaceTypeResDTO countType(String orgId, String orgType) {
if (StringUtils.isBlank(orgId)) {
CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId());
orgId = staffInfoCacheResult.getAgencyId();
orgType = "agency";
}
// 查字典
List<IcCoverageCategoryDictListResultDTO> dictList = SpringContextUtils.getBean(CoverageService.class).dictMap(EpmetRequestHolder.getLoginUserCustomerId(), CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode());
if (CollectionUtils.isEmpty(dictList)) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "场所类型字典为空", "场所类型字典为空");
}
//
List<EnterpriseCountPlaceTypeDetailDTO> placeTypeCountList = baseDao.selectCountByPlaceType(EpmetRequestHolder.getLoginUserCustomerId(),orgId, orgType);
Map<String, EnterpriseCountPlaceTypeDetailDTO> map = CollectionUtils.isEmpty(placeTypeCountList) ? new HashMap<>() : placeTypeCountList.stream().collect(Collectors.toMap(EnterpriseCountPlaceTypeDetailDTO::getPlaceType, o -> o));;
List<EnterpriseCountPlaceTypeDetailDTO> list = new ArrayList<>();
int total = 0;
for (IcCoverageCategoryDictListResultDTO placeType : dictList) {
EnterpriseCountPlaceTypeDetailDTO detailDTO = new EnterpriseCountPlaceTypeDetailDTO();
detailDTO.setPlaceType(placeType.getValue());
detailDTO.setPlaceTypeName(placeType.getLabel());
detailDTO.setTotal(NumConstant.ZERO);
if (map.containsKey(placeType.getValue())) {
detailDTO.setTotal(map.get(placeType.getValue()).getTotal());
}
list.add(detailDTO);
total += detailDTO.getTotal();
}
EnterpriseCountPlaceTypeResDTO resDTO = new EnterpriseCountPlaceTypeResDTO();
resDTO.setList(list);
resDTO.setTotal(total);
return resDTO;
}
}

20
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml

@ -108,4 +108,24 @@
and ie.id != #{enterpriseId}
</if>
</select>
<!-- 按场所类型 -->
<select id="selectCountByPlaceType" parameterType="map" resultType="com.epmet.dto.result.yt.EnterpriseCountPlaceTypeDetailDTO">
SELECT
ie.PLACE_TYPE as placeType,
count( ie.id ) AS total
FROM
ic_enterprise ie
WHERE
ie.CUSTOMER_ID = #{customerId}
AND ie.DEL_FLAG = '0'
<if test="orgType == 'grid'">
and ie.GRID_ID= #{orgId}
</if>
<if test="orgType == 'agency'">
and ( ie.AGENCY_ID=#{orgId} or ie.AGENCY_PIDS like CONCAT('%',#{orgId},'%') )
</if>
GROUP BY
ie.PLACE_TYPE
</select>
</mapper>
Loading…
Cancel
Save