Browse Source

Merge remote-tracking branch 'origin/dev'

dev_shibei_match
yinzuomei 4 years ago
parent
commit
0f15129fac
  1. 2
      epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
  2. 2
      epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
  3. 2
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
  4. 3
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java
  5. 14
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
  6. 69
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
  7. 67
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
  8. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
  9. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java
  10. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
  11. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
  12. 7
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
  13. 1
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml
  14. 5
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
  15. 15
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
  16. 3
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java
  17. 24
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
  18. 7
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml

2
epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java

@ -290,7 +290,7 @@ public class SsoServiceImpl implements SsoService {
//3.根据华为openId查询用户是否存在历史登陆信息
Result<StaffLatestAgencyResultDTO> latestStaffWechat = epmetUserOpenFeignClient.getLatestStaffWechatLoginRecord(userInfo.getOpenId());
if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) {
logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
logger.warn(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
throw new RenException(EpmetErrorCode.PLEASE_LOGIN.getCode());
}
StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();

2
epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@ -164,7 +164,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
//2.根据openid查询用户是否存在历史登陆信息
Result<StaffLatestAgencyResultDTO> latestStaffWechat = epmetUserOpenFeignClient.getLatestStaffWechatLoginRecord(userWechatDTO.getWxOpenId());
if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) {
logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
logger.warn(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
throw new RenException(EpmetErrorCode.PLEASE_LOGIN.getCode());
}
StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();

2
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java

@ -127,4 +127,6 @@ public interface ScreenIndexDataMonthlyDao{
@Param("yearId") String yearId,
@Param("areaCode") String areaCode,
@Param("topNum") int topNum);
List<AnNingSubAgencyIndexRankResultDTO> selectKczSubAgencyOrGridIndexMonthlyRank(SubAgencyIndexRankYMFormDTO formDTO);
}

3
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java

@ -51,4 +51,7 @@ public interface ScreenIndexDataYearlyDao{
* @Date 09:38 2020-09-08
**/
List<AnNingSubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexYearlyRank(SubAgencyIndexRankYMFormDTO formDTO);
List<AnNingSubAgencyIndexRankResultDTO> selectKczSubAgencyIndexYearlyRank(SubAgencyIndexRankYMFormDTO formDTO);
}

14
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@ -260,13 +260,23 @@ public class IndexServiceImpl implements IndexService {
List<AnNingSubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
if (ScreenConstant.YEAR_ID.equals(formDTO.getType())) {
// 年 指数排行
subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO);
if("1234085031077498881".equals(formDTO.getAgencyId())){
// 孔村单独处理,查询下下级
subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectKczSubAgencyIndexYearlyRank(formDTO);
}else{
subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO);
}
} else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())) {
// 月(上一个月) 指数排行
if (StringUtils.isBlank(formDTO.getMonthId())) {
formDTO.setMonthId(DateUtils.getBeforeNMonth(1));
}
subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyOrGridIndexMonthlyRank(formDTO);
if("1234085031077498881".equals(formDTO.getAgencyId())){
// 孔村单独处理,查询下下级
subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectKczSubAgencyOrGridIndexMonthlyRank(formDTO);
}else{
subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyOrGridIndexMonthlyRank(formDTO);
}
subAgencyIndexRankResultDTOS.forEach(rank -> {
rank.setPartyDevAbility(getRound(rank.getPartyDevAbility()));
rank.setGovernAbility(getRound(rank.getGovernAbility()));

69
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@ -385,4 +385,73 @@
ORDER BY (sy.govern_ablity+sy.party_dev_ablity+sy.service_ablity) DESC
LIMIT #{topNum}
</select>
<select id="selectKczSubAgencyOrGridIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO"
resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
SELECT
score.org_name AS `NAME`,
score.service_ablity * score.SERVICE_ABLITY_WEIGHT AS serviceAbility,
score.party_dev_ablity * score.PARTY_DEV_WEIGHT AS partyDevAbility,
score.govern_ablity * score.GOVERN_ABLITY_WEIGHT AS governAbility,
score.PARTY_DEV_WEIGHT AS partyWeight,
score.GOVERN_ABLITY_WEIGHT AS governWeight,
score.SERVICE_ABLITY_WEIGHT AS serviceWeight,
score.ORG_ID orgId,
score.ORG_TYPE orgType
FROM
screen_index_data_monthly score
WHERE score.del_flag = '0'
AND score.month_id = #{monthId,jdbcType=VARCHAR}
<if test="customerId != null and customerId != ''">
AND score.CUSTOMER_ID = #{customerId}
</if>
<if test="orgType != null and orgType != ''">
<choose>
<when test="orgType == 'grid'">
and score.ORG_ID in(
SELECT
scg.GRID_ID
FROM
screen_customer_grid scg
WHERE
scg.DEL_FLAG = '0'
AND scg.PARENT_AGENCY_ID = #{agencyId}
)
</when>
<when test="orgType == 'agency'">
and score.ORG_ID in(
SELECT
sca.AGENCY_ID
FROM
screen_customer_agency sca
WHERE
sca.DEL_FLAG = '0'
AND sca.PIDS LIKE concat(#{agencyId},'%')
AND sca.`LEVEL` = 'community'
)
</when>
<when test="orgType == 'department'">
and score.ORG_ID in(
SELECT
scd.DEPT_ID
FROM
screen_customer_dept scd
WHERE
scd.DEL_FLAG = '0'
AND scd.PARENT_AGENCY_ID = #{agencyId}
)
</when>
</choose>
</if>
<choose>
<when test="orgType != null and orgType != ''">
AND score.ORG_TYPE = #{orgType,jdbcType=VARCHAR}
</when>
<otherwise>
AND score.ORG_TYPE != 'department'
</otherwise>
</choose>
ORDER BY score.index_total ${sort}
LIMIT #{topNum}
</select>
</mapper>

67
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml

@ -65,4 +65,71 @@
ORDER BY index_total ${sort}
LIMIT #{topNum}
</select>
<select id="selectKczSubAgencyIndexYearlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO"
resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
SELECT
score.org_name AS `NAME`,
score.govern_ablity AS governAbility,
score.party_dev_ablity AS partyDevAbility,
score.service_ablity AS serviceAbility,
score.ORG_ID orgId,
score.ORG_TYPE orgType
FROM
screen_index_data_yearly score
WHERE
score.del_flag = '0'
AND score.year_id = YEAR(CURDATE())
<if test="customerId != null and customerId != ''">
AND score.CUSTOMER_ID = #{customerId}
</if>
<if test="orgType != null and orgType != ''">
<choose>
<when test="orgType == 'grid'">
and score.ORG_ID in(
SELECT
scg.GRID_ID
FROM
screen_customer_grid scg
WHERE
scg.DEL_FLAG = '0'
AND scg.PARENT_AGENCY_ID = #{agencyId}
)
</when>
<when test="orgType == 'agency'">
and score.ORG_ID in(
SELECT
sca.AGENCY_ID
FROM
screen_customer_agency sca
WHERE
sca.DEL_FLAG = '0'
AND sca.PIDS LIKE concat(#{agencyId},'%')
AND sca.`LEVEL` = 'community'
)
</when>
<when test="orgType == 'department'">
and score.ORG_ID in(
SELECT
scd.DEPT_ID
FROM
screen_customer_dept scd
WHERE
scd.DEL_FLAG = '0'
AND scd.PARENT_AGENCY_ID = #{agencyId}
)
</when>
</choose>
</if>
<choose>
<when test="orgType != null and orgType != ''">
AND score.ORG_TYPE = #{orgType,jdbcType=VARCHAR}
</when>
<otherwise>
AND score.ORG_TYPE != 'department'
</otherwise>
</choose>
ORDER BY index_total ${sort}
LIMIT #{topNum}
</select>
</mapper>

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java

@ -54,7 +54,7 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
* @param projectId
* @return int
*/
int deleteByProjectId(@Param("projectId") String projectId);
int deleteByProjectId(@Param("customerId") String customerId, @Param("projectId") String projectId);
/**
* 根据项目ID删除数据
@ -63,7 +63,7 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
* @param list
* @return int
*/
void deleteByProjectIds(@Param("list") List<String> list);
void deleteByProjectIds(@Param("customerId") String customerId, @Param("list") List<String> list);
int updateProjectSatisfactionScore(@Param("projectId")String projectId, @Param("score")BigDecimal score);
int updateProjectSatisfactionScore(@Param("projectId")String projectId, @Param("score")BigDecimal score);
}

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java

@ -38,5 +38,5 @@ public interface ScreenProjectImgDataDao extends BaseDao<ScreenProjectImgDataEnt
void insertBatch(@Param("list") List<ScreenProjectImgDataDTO> list);
int deleteByProjectId(@Param("projectId") String projectId);
int deleteByProjectId(@Param("customerId") String customerId, @Param("projectId") String projectId);
}

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@ -286,13 +286,13 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
entity.setJoinTotal(0);
entity.setJoinTotalUpRate(new BigDecimal("0"));
entity.setJoinTotalUpFlag("");
entity.setJoinTotalUpFlag(GovernConstant.EQ);
entity.setAvgIssue(new BigDecimal(0));
entity.setAvgIssueUpRate(new BigDecimal("0"));
entity.setAvgIssueUpFlag("");
entity.setAvgIssueUpFlag(GovernConstant.EQ);
entity.setAvgJoin(new BigDecimal(0));
entity.setAgvgJoinUpRate(new BigDecimal("0"));
entity.setAgvgJoinUpFlag("");
entity.setAgvgJoinUpFlag(GovernConstant.EQ);
entity.setAvgIssueFz(NumConstant.ZERO);
entity.setAvgIssueFm(NumConstant.ZERO);
entity.setAvgJoinFz(NumConstant.ZERO);

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@ -168,8 +168,8 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
}
}
//先删除该projectId对应的旧数据
baseDao.deleteByProjectId(item.getProjectId());
screenProjectImgDataDao.deleteByProjectId(item.getProjectId());
baseDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
screenProjectImgDataDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
//如果orgType未知,获取一下
// if ("unknown".equals(item.getOrgType())){

7
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@ -49,15 +49,16 @@
<delete id="deleteByProjectId">
delete from screen_project_data
where PROJECT_ID = #{projectId}
AND customer_id = #{customerId}
</delete>
<delete id="deleteByProjectIds">
delete from screen_project_data
<where>
<foreach collection="list" item="projectId" separator=" or ">
where 1=1
AND customer_id = #{customerId}
<foreach collection="list" item="projectId" open="AND (" separator=" OR " close=" )">
PROJECT_ID = #{projectId}
</foreach>
</where>
</delete>
<select id="checkIfExisted" resultType="int">

1
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml

@ -29,6 +29,7 @@
<delete id="deleteByProjectId">
delete from screen_project_img_data
where PROJECT_ID = #{projectId}
and customer_id = #{customerId}
</delete>

5
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java

@ -10,10 +10,10 @@ import com.epmet.dto.form.AuditedPartyMemberFormDTO;
import com.epmet.dto.form.AuditingPartyMemberFormDTO;
import com.epmet.dto.form.CertifiedDetailFormDTO;
import com.epmet.dto.form.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedDetailResultDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.dto.result.AuditedPartyMemberResultDTO;
import com.epmet.dto.result.AuditingPartyMemberResultDTO;
import com.epmet.dto.result.CertifiedDetailResultDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO;
import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO;
@ -122,6 +122,7 @@ public class ResiPartyMemberController {
@PostMapping("auditingdetail")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITING_DETAIL)
public Result<AuditingDetailResultDTO> auditingDetail(@RequestBody AuditingDetailFromDTO fromDTO) {
ValidatorUtils.validateEntity(fromDTO);
return resiPartyMemberService.auditingDetail(fromDTO);
}

15
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java

@ -9,11 +9,10 @@ import com.epmet.dto.form.AuditedPartyMemberFormDTO;
import com.epmet.dto.form.AuditingPartyMemberFormDTO;
import com.epmet.dto.form.CertifiedDetailFormDTO;
import com.epmet.dto.form.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedDetailResultDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.feign.ResiPartymemberFeignClient;
import com.epmet.dto.result.AuditedPartyMemberResultDTO;
import com.epmet.dto.result.AuditingPartyMemberResultDTO;
import com.epmet.dto.result.CertifiedDetailResultDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.feign.ResiPartymemberFeignClient;
import com.epmet.resi.partymember.dto.partymember.form.*;
import com.epmet.resi.partymember.dto.partymember.result.*;
@ -23,8 +22,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
@ -45,11 +42,11 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService {
UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, UnderReviewParyMemberFormDTO.class);
Result<List<UnderReviewParyMemberResultDTO>> result = resiPartymemberFeignClient.auditingPartyMember(underReviewParyMemberFormDTO);
if (!result.success()) {
logger.error(String.format("调用%s服务查询单元认证-待审核列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
logger.warn(String.format("调用%s服务查询单元认证-待审核列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
}
if (null == result.getData() || result.getData().isEmpty()) {
logger.info(String.format("调用%s服务查询党员认证-待审核列表,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
logger.warn(String.format("调用%s服务查询党员认证-待审核列表,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
return list;
}
list = ConvertUtils.sourceToTarget(result.getData(), AuditingPartyMemberResultDTO.class);
@ -62,11 +59,11 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService {
ReviewedParyMemberFormDTO reviewedParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, ReviewedParyMemberFormDTO.class);
Result<List<ReviewedParyMemberResultDTO>> result = resiPartymemberFeignClient.auditedPartyMember(reviewedParyMemberFormDTO);
if (!result.success()) {
logger.error(String.format("调用%s服务查询党员认证-审核历史列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
logger.warn(String.format("调用%s服务查询党员认证-审核历史列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
}
if (null == result.getData() || result.getData().isEmpty()) {
logger.info(String.format("调用%s服务查询党员认证-审核历史列表为空,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
logger.warn(String.format("调用%s服务查询党员认证-审核历史列表为空,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
return list;
}
list = ConvertUtils.sourceToTarget(result.getData(), AuditedPartyMemberResultDTO.class);

3
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java

@ -2,6 +2,7 @@ package com.epmet.resi.partymember.dto.partymember.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
@ -12,9 +13,11 @@ import java.io.Serializable;
@Data
public class AuditingDetailFromDTO implements Serializable {
private static final long serialVersionUID = 1L;
public interface AddUserInternalGroup {}
/**
* 党员认证信息表ID
*/
@NotBlank(message = "党员认证信息表ID",groups =AddUserInternalGroup.class)
private String partyMemberId;
/**

24
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@ -374,17 +374,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
resultDTO.setAutoId(fromDTO.getAutoId());
resultDTO.setManualId(fromDTO.getManualId());
//获取人工审核信息
PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId());
if(null!=manualEntity){
//人工审核信息设为已读
manualEntity.setReadFlag(PartyMemberConstant.READ);
partymemberConfirmManualService.updateById(manualEntity);
}else{
log.error(String.format("入参%s,查询partymember_confirm_manual为空", JSON.toJSONString(fromDTO)));
throw new RenException("数据异常,根据manualId查询partymember_confirm_manual为空");
}
//获取党员认证信息
PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId());
resultDTO.setUserId(partyMemberInfoEntity.getUserId());
@ -392,8 +381,19 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
resultDTO.setIdCard(partyMemberInfoEntity.getIdCard());
resultDTO.setMobile(partyMemberInfoEntity.getMobile());
resultDTO.setAddress(partyMemberInfoEntity.getStreet() + partyMemberInfoEntity.getEstate() + partyMemberInfoEntity.getBuilding());
resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()/1000);
resultDTO.setCertifyTime(partyMemberInfoEntity.getCreatedTime().getTime() / 1000);
//获取人工审核信息
PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId());
if(null!=manualEntity){
//人工审核信息设为已读
manualEntity.setReadFlag(PartyMemberConstant.READ);
resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()/1000);
partymemberConfirmManualService.updateById(manualEntity);
}else{
log.warn(String.format("入参%s,查询partymember_confirm_manual为空", JSON.toJSONString(fromDTO)));
// throw new RenException("数据异常,根据manualId("+fromDTO.getManualId()+")查询partymember_confirm_manual为空");
}
//获取党员自动认证信息
List<String> failedReason = new ArrayList<>();

7
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml

@ -82,17 +82,18 @@
pi.USER_ID AS userId,
concat( pi.SURNAME, pi.NAME ) AS realName,
unix_timestamp(pi.CREATED_TIME) AS applyTime,
pcm.READ_FLAG AS readFlag,
IFNULL(pcm.READ_FLAG,'') AS readFlag,
pi.id as partyMemberId,
pca.id as autoId,
pcm.id as manualId
IFNULL(pcm.id,'') as manualId
FROM
partymember_info pi
LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID AND pcm.DEL_FLAG = '0'and pcm.AUDIT_STATUS='under_auditting')
LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID AND pcm.DEL_FLAG = '0')
LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID AND pca.del_flag='0')
WHERE
pi.DEL_FLAG = '0'
AND pi.CONFIRM_RESULT = 'auto_confirm_failed'
AND pcm.AUDIT_STATUS='under_auditting'
AND pi.EXTRA_ORGANIZATION IS NOT NULL
AND pi.GRID_ID = #{gridId}
ORDER BY

Loading…
Cancel
Save