Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java

@@ -34,7 +34,7 @@ public class PublicPartiProfileResultDTO implements Serializable {
 
     /**
      * 较上月趋势：incr上升，decr下降
-     * */
+     */
     private String issueCompareLatestTrend = "";
 
     /**
@@ -42,6 +42,9 @@ public class PublicPartiProfileResultDTO implements Serializable {
      */
     private BigDecimal averageJoin = new BigDecimal(NumConstant.ZERO);
 
+    /**
+     * 较上月百分比
+     */
     private String joinCompareLatestMonth = "";
 
     private String joinCompareLatestTrend = "";

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

@@ -108,18 +108,17 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         UserJoinIndicatorGrowthRateResultDTO latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId);
         //保证获取公众参与概率数据的最大可能性
         int time = NumConstant.TWELVE;
-        while(null == latest && time > NumConstant.ONE)
+        while (null == latest && time > NumConstant.ONE) {
-            {
+            time--;
-                time --;
+            monthId = dateUtils.getPreviousMonthIdByDest(null, monthId);
-                monthId = dateUtils.getPreviousMonthIdByDest(null,monthId);
+            latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId);
-                latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId);
+        }
-            }
 
-        if(null == latest) return new PublicPartiProfileResultDTO();
+        if (null == latest) return new PublicPartiProfileResultDTO();
-        PublicPartiProfileResultDTO result = ConvertUtils.sourceToTarget(latest,PublicPartiProfileResultDTO.class);
+        PublicPartiProfileResultDTO result = ConvertUtils.sourceToTarget(latest, PublicPartiProfileResultDTO.class);
-        result.setMonthIncr(convertPercentStr(latest.getMonthIncr(),NumConstant.ZERO));
+        result.setMonthIncr(convertPercentStr(latest.getMonthIncr(), NumConstant.ZERO));
-        result.setJoinCompareLatestMonth(convertPercentStr(latest.getJoinCompareLatestMonth(),NumConstant.ZERO));
+        result.setJoinCompareLatestMonth(convertPercentStr(latest.getJoinCompareLatestMonth().abs(), NumConstant.ZERO));
-        result.setIssueCompareLatestMonth(convertPercentStr(latest.getIssueCompareLatestMonth(),NumConstant.ZERO));
+        result.setIssueCompareLatestMonth(convertPercentStr(latest.getIssueCompareLatestMonth().abs(), NumConstant.ZERO));
         return result;
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -17,6 +17,7 @@ import com.epmet.dao.stats.DimDateDao;
 import com.epmet.dao.stats.DimMonthDao;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.extract.form.ScreenExtractFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
@@ -657,7 +658,7 @@ public class DemoController {
     private PartyGuideService partyGuideService;
 
     @PostMapping("zxczxc")
-    public Result getZxcZxc(@RequestBody ScreenExtractFormDTO formDTO){
+    public Result getZxcZxc(@RequestBody ExtractScreenFormDTO formDTO){
         partyGuideService.partyGuideExtract(formDTO);
         return new Result();
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java

@@ -1,6 +1,5 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
@@ -12,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 
 /**
  * 原始数据清洗
@@ -43,7 +40,7 @@ public class FactOriginExtractController {
      */
     @PostMapping("extractall")
     public Result extractAll(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) {
-        if (StringUtils.isNotBlank(extractOriginFormDTO.getStartDate()) && StringUtils.isNotBlank(extractOriginFormDTO.getEndDate())) {
+        /*if (StringUtils.isNotBlank(extractOriginFormDTO.getStartDate()) && StringUtils.isNotBlank(extractOriginFormDTO.getEndDate())) {
             List<String> daysBetween = DateUtils.getDaysBetween(extractOriginFormDTO.getStartDate(), extractOriginFormDTO.getEndDate());
             for (int i = 0; i < daysBetween.size(); i++) {
                 String dateDimId = daysBetween.get(i);
@@ -52,7 +49,7 @@ public class FactOriginExtractController {
             }
         } else {
             factOriginExtractService.extractAll(extractOriginFormDTO);
-        }
+        }*/
         factOriginExtractService.extractAll(extractOriginFormDTO);
         return new Result();
     }

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

@@ -1,6 +1,6 @@
 package com.epmet.service.evaluationindex.extract.toscreen;
 
-import com.epmet.dto.extract.form.ScreenExtractFormDTO;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 
 /**
  * @Author zxc
@@ -10,10 +10,10 @@ public interface PartyGuideService {
 
     /**
      * @Description  党建引领抽取
-     * @param screenExtractFormDTO
+     * @param formDTO
      * @author zxc
      * @date 2020/9/24 5:10 下午
      */
-    Boolean partyGuideExtract(ScreenExtractFormDTO screenExtractFormDTO);
+    Boolean partyGuideExtract(ExtractScreenFormDTO formDTO);
 
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.ScreenConstant;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.extract.form.ScreenExtractFormDTO;
 import com.epmet.dto.extract.form.ScreenPartyBranchDataFormDTO;
 import com.epmet.dto.extract.form.ScreenPartyLinkMassesDataFormDTO;
@@ -64,7 +65,7 @@ public class PartyGuideServiceImpl implements PartyGuideService {
      * @date 2020/9/24 5:10 下午
      */
     @Override
-    public Boolean partyGuideExtract(ScreenExtractFormDTO screenExtractFormDTO) {
+    public Boolean partyGuideExtract(ExtractScreenFormDTO screenExtractFormDTO) {
         int pageNo = NumConstant.ONE;
         int pageSize = NumConstant.ONE_HUNDRED;
         List<String> customerIds = new ArrayList<>();
@@ -181,14 +182,18 @@ public class PartyGuideServiceImpl implements PartyGuideService {
      */
     public void disPoseParty(List<CustomerAgencyInfoResultDTO> agencyIdList, Boolean isGrid, String customerId, String monthId) {
         List<ScreenPartyLinkMassesDataFormDTO> result = new ArrayList<>();
+        // 判断当前级别agency是否为空
         if (!CollectionUtils.isEmpty(agencyIdList)){
+            // 获取agencyIds
             List<String> orgIds = agencyIdList.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
             if (isGrid == true){
                 agencyIdList.forEach(agency -> {
+                    // 计算社区级别的下级（实际就是网格）
                     GridPartyGuideDTO gridPartyGuideDTO = communityLevelSubGrid(customerId, monthId, agency);
                     orgIds.addAll(gridPartyGuideDTO.getOrgIds());
                     result.addAll(gridPartyGuideDTO.getResult());
                 });
+                // 根据agencyId分组，计算各个社区的
                 Map<String, List<ScreenPartyLinkMassesDataFormDTO>> groupByAgency = result.stream().collect(Collectors.groupingBy(ScreenPartyLinkMassesDataFormDTO::getParentId));
                 groupByAgency.forEach((agencyId,gridList) -> {
                     ScreenPartyLinkMassesDataFormDTO form = new ScreenPartyLinkMassesDataFormDTO();
@@ -224,6 +229,7 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                     // 不为空 存在直属网格
                     if (!CollectionUtils.isEmpty(disGridIds)){
                         List<ScreenPartyLinkMassesDataFormDTO> gridResult = new ArrayList<>();
+                        // 查询党员创建组，组内成员数
                         List<ScreenPartyLinkMassesDataFormDTO> partyLinkMassesDataList = groupMainService.selectPartyCreateGroupInfo(customerId, monthId, disGridIds);
                         List<OrgNameResultDTO> orgNameList = agencyService.selectOrgNameGrid(partyLinkMassesDataList.stream().map(m -> m.getOrgId()).collect(Collectors.toList()));
                         if (!CollectionUtils.isEmpty(partyLinkMassesDataList)){
@@ -239,6 +245,7 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                         }
                         delAndInsertLink(gridResult,customerId,monthId,disGridIds);
                     }
+                    // 查询直属网格的信息 + 下级机关的信息 = agency的机关信息
                     List<ScreenPartyLinkMassesDataFormDTO> screenPartyLinkMassesDataGrid = groupMainService.selectPartyCreateGroupInfo(customerId, monthId, disGridIds);
                     List<ScreenPartyLinkMassesDataFormDTO> screenPartyLinkMassesDataList = linkMassesDataService.selectPartyLinkMassesInfo(customerId, monthId, agencyId);
                     screenPartyLinkMassesDataList.addAll(screenPartyLinkMassesDataGrid);
@@ -262,6 +269,12 @@ public class PartyGuideServiceImpl implements PartyGuideService {
 
     /**
      * @Description  处理【参与人数，组织次数】
+     * eg:假设 组织A：A1     组织的直属网格：A1-G1
+     * 统计 A1的参与人数、组织次数应为
+     *
+     * 组织次数：以A1的名义组织活动次数  + 以A1-G1的名义组织活动次数 = A1组织活动总次数
+     * 参与人数：以A1的名义组织活动参与人数和  + 以A1-G1的名义组织活动参与人数和 = A1组织活动参与人数总数
+     *
      * @Param agencyIdList
      * @Param isGrid
      * @Param customerId
@@ -271,7 +284,9 @@ public class PartyGuideServiceImpl implements PartyGuideService {
      */
     public void disPoseOrganize(List<CustomerAgencyInfoResultDTO> agencyIdList, Boolean isGrid, String customerId, String monthId){
         if (!CollectionUtils.isEmpty(agencyIdList)){
+            // 包括 gridId 和 agencyId
             List<String> orgIds = new ArrayList<>();
+            // orgIdsAgency  客户下某个级别的所有agencyId
             List<String> orgIdsAgency = agencyIdList.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
             orgIds.addAll(orgIdsAgency);
             orgIdsAgency.forEach(orgId -> {
@@ -283,8 +298,11 @@ public class PartyGuideServiceImpl implements PartyGuideService {
             if (isGrid == false){
                 orgIds.addAll(directGridIds.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
             }
+            // 查询客户下所有机关，网格下的参与人数
             List<JoinUserCountResultDTO> joinUserCountList = actUserRelationService.selectJoinUserCount(customerId, monthId, null);
+            // 查询机关界别的组织次数
             List<ScreenPartyBranchDataFormDTO> screenPartyBranchDataByAgencyList = actInfoService.selectActInfo(customerId, monthId, ScreenConstant.AGENCY, orgIds);
+            // 查询客户下所有网格和所有机关
             List<ScreenPartyBranchDataFormDTO> screenPartyBranchData = agencyService.selectAllAgencyIdToOrganize(customerId, monthId);
             List<ScreenPartyBranchDataFormDTO> screenPartyBranchDataListAgencyAll = gridService.selectAllGridIdToOrganize(customerId, monthId);
             screenPartyBranchDataListAgencyAll.addAll(screenPartyBranchData);
@@ -296,10 +314,10 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                     }
                 });
             });
+            // 查询所有机关、网格组织次数
             List<ScreenPartyBranchDataFormDTO> screenPartyBranchDataList = actInfoService.selectActInfo(customerId, monthId, null, orgIds);
             if (isGrid == true){
                 agencyIdList.forEach(agency -> {
-
                     finalResult.forEach(fl -> {
                         screenPartyBranchDataList.forEach(sp -> {
                             if (fl.getOrgId().equals(sp.getOrgId())){
@@ -324,6 +342,7 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                                 if (fl.getOrgId().equals(agencyId)){
                                     fl.setOrganizeCount(actList.stream().collect(Collectors.summingInt(ScreenPartyBranchDataFormDTO::getOrganizeCount)));
                                     fl.setJoinUserCount(actList.stream().collect(Collectors.summingInt(ScreenPartyBranchDataFormDTO::getJoinUserCount)));
+                                    // 如果存在本级名义的， 下级机关 + 本级
                                     screenPartyBranchDataByAgencyList.forEach(organize -> {
                                         if (organize.getOrgId().equals(agencyId)){
                                             fl.setOrganizeCount(calAdd(organize.getOrganizeCount(),actList.stream().collect(Collectors.summingInt(ScreenPartyBranchDataFormDTO::getOrganizeCount))));
@@ -377,6 +396,7 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                             if (form.getOrgId().equals(agencyId)) {
                                 form.setJoinUserCount(screenPartyBranchDataByParentList.stream().collect(Collectors.summingInt(ScreenPartyBranchDataFormDTO::getJoinUserCount)));
                                 form.setOrganizeCount(screenPartyBranchDataByParentList.stream().collect(Collectors.summingInt(ScreenPartyBranchDataFormDTO::getOrganizeCount)));
+                                // 如果存在本级名义的， 下级机关 + 本级
                                 screenPartyBranchDataByParentList.forEach(organize -> {
                                     if (organize.getOrgId().equals(agencyId)) {
                                         form.setOrganizeCount(calAdd(organize.getOrganizeCount(), screenPartyBranchDataByParentList.stream().collect(Collectors.summingInt(ScreenPartyBranchDataFormDTO::getOrganizeCount))));
@@ -397,6 +417,13 @@ public class PartyGuideServiceImpl implements PartyGuideService {
         }
     }
 
+    /**
+     * @Description  加法运算
+     * @Param a
+     * @Param b
+     * @author zxc
+     * @date 2020/9/28 3:17 下午
+     */
     public Integer calAdd(Integer a, Integer b){
         if (null != a && null != b){
             return a + b;
@@ -473,7 +500,7 @@ public class PartyGuideServiceImpl implements PartyGuideService {
     }
 
     /**
-     * @Description
+     * @Description  【组织次数，参与人数】添加
      * @Param result
      * @Param customerId
      * @Param monthId
@@ -489,6 +516,14 @@ public class PartyGuideServiceImpl implements PartyGuideService {
         });
     }
 
+    /**
+     * @Description  【组织次数，参与人数】旧纪录删除
+     * @Param customerId
+     * @Param monthId
+     * @Param orgIds
+     * @author zxc
+     * @date 2020/9/28 3:18 下午
+     */
     @Transactional(rollbackFor = Exception.class)
     public void delOrganize(String customerId, String monthId, List<String> orgIds){
         Integer delNum;

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

@@ -29,6 +29,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     @Autowired
     private PartyBaseInfoService partyBaseInfoService;
     @Autowired
+    private PartyGuideService partyGuideService;
+    @Autowired
     private PioneerDataExtractService pioneerDataExtractService;
     @Autowired
     private PublicPartExtractService publicPartExtractService;
@@ -140,5 +142,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         orgRankExtractService.extractGridData(customerId, monthId);
         orgRankExtractService.extractCommunityData(customerId, monthId);
         orgRankExtractService.extractStreetData(customerId, monthId);
+
+        // 党建引领 screen_party_branch_data,screen_party_link_masses_data
+        partyGuideService.partyGuideExtract(formDTO);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -59,7 +59,7 @@
         </if>
     </select>
     <select id="selectSatisfactionRecordByCustomer" resultType="com.epmet.dto.project.ProcessInfoDTO">
-        SELECT
+        SELECT DISTINCT
             p.AGENCY_ID,
             psd.PROJECT_ID,
             psd.SATISFACTION AS "operation",
@@ -69,7 +69,7 @@
         FROM project_satisfaction_detail psd
         INNER JOIN project p ON psd.PROJECT_ID = p.ID
         LEFT JOIN project_related_personnel resiuser ON psd.PROJECT_ID = resiuser.PROJECT_ID
-        AND resiuser.APP = 'resi' AND resiuser.USER_ID = psd.CREATED_BY
+        AND resiuser.APP = 'resi'
         WHERE p.CUSTOMER_ID = #{customerId}
         <if test="date != null and date.trim() != ''">
             AND DATE_FORMAT(psd.CREATED_TIME, '%Y%m%d') = #{date}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java

@@ -27,6 +27,6 @@ public class CommonPageUserFormDTO implements Serializable {
 
     private Integer pageSize = 10;
 
-    @NotBlank(message = "获取不到用户Id" , groups = PageUserGroup.class)
+    @NotBlank(message = "获取不到客户Id" , groups = PageUserGroup.class)
     private String customerId;
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -7,8 +7,10 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CodeConstant;
+import com.epmet.constant.ModuleConstant;
 import com.epmet.dao.AuthorizationInfoDao;
 import com.epmet.dao.ComponentAccessTokenDao;
 import com.epmet.dao.MiniInfoDao;
@@ -17,7 +19,9 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
+import com.epmet.redis.RedisThird;
 import com.epmet.service.*;
+import com.epmet.wxapi.constant.WxMaCodeConstant;
 import com.epmet.wxapi.param.*;
 import com.epmet.wxapi.result.*;
 import com.epmet.wxapi.service.WxMaCodeService;
@@ -27,6 +31,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -71,6 +76,11 @@ public class CodeServiceImpl implements CodeService {
 	private MiniInfoDao miniInfoDao;
 	@Autowired
 	private OperCrmOpenFeignClient operCrmOpenFeignClient;
+	@Autowired
+	private RedisThird redisThird;
+
+	@Value("${third.platform.appId}")
+	private String componentAppId;
 
 	@Override
 	public List<TemplateListResultDTO> templateList() {
@@ -117,29 +127,42 @@ public class CodeServiceImpl implements CodeService {
 		if (null == authInfo) {
 			throw new RenException("未授权");
 		}
-		/*CustomerDTO customerFormDTO = new CustomerDTO();
+		String customerName = "";
-		customerFormDTO.setId(formDTO.getCustomerId());
+		Result<List<CustomerDTO>> customerList =  operCrmOpenFeignClient.getAllCustomerList();
-		Result<CustomerDTO> result = operCrmOpenFeignClient.getCustomerInfo(customerFormDTO);
+		if (customerList.success()) {
-		if (!result.success()) {
+			for (CustomerDTO dto : customerList.getData()) {
-			throw new RenException(result.getCode(), result.getMsg());
+				if(formDTO.getCustomerId().equals(dto.getId())) {
-		}*/
+					customerName = dto.getCustomerName();
+				}
+			}
+		}
+		String resiName = "";
+		String workName = "";
+		if(CodeConstant.RESI.equals(formDTO.getClientType())) {
+			resiName = getNickName(authInfo.getAuthorizerAppid());
+			AuthorizationInfoDTO workAuthInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), CodeConstant.WORK);
+			workName = getNickName(workAuthInfo.getAuthorizerAppid());
+		} else {
+			workName = getNickName(authInfo.getAuthorizerAppid());
+			AuthorizationInfoDTO resiAuthInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), CodeConstant.RESI);
+			resiName = getNickName(resiAuthInfo.getAuthorizerAppid());
+		}
 		//获取小程序居民端与工作端名称
-		String resiName = miniInfoDao.getNickName(formDTO.getCustomerId(), CodeConstant.RESI);
+
-		String workName = miniInfoDao.getNickName(formDTO.getCustomerId(), CodeConstant.WORK);
 		String extJson = getExtJson(formDTO);
 		WxExtJson wxExtJson = JSONObject.parseObject(extJson, WxExtJson.class);
 		wxExtJson.setExtAppid(authInfo.getAuthorizerAppid());
 		wxExtJson.getExt().setExtAppid(authInfo.getAuthorizerAppid());
 		wxExtJson.getExt().setResiName(resiName);
 		wxExtJson.getExt().setWorkName(workName);
-		//wxExtJson.getExt().setCustomerName(null == result.getData().getCustomerName()?"":result.getData().getCustomerName());
+		wxExtJson.getExt().setCustomerName(customerName);
-		wxExtJson.getExt().setCustomerName("");
 		if (CodeConstant.RESI.equals(formDTO.getClientType())) {
 			wxExtJson.getWindow().setNavigationBarTitleText(resiName);
 		} else {
 			wxExtJson.getWindow().setNavigationBarTitleText(workName);
 		}
 		extJson = JSON.toJSONString(wxExtJson);
+		log.info(extJson);
 		CodeExtDTO codeExtDTO = codeExtService.getExtByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
 		if (null == codeExtDTO) {
 			codeExtDTO = new CodeExtDTO();
@@ -729,4 +752,15 @@ public class CodeServiceImpl implements CodeService {
 		codeOperationHistoryService.save(operationDTO);
 	}
 
+	private String getNickName(String appId) {
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put(ModuleConstant.COMPONENT_APP_ID,componentAppId);
+		jsonObject.put(ModuleConstant.AUTHORIZER_APP_ID,appId);
+		String componentAccessToken = componentAccessTokenDao.getComponentAccessToken();
+		String data = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_GET_AUTHORIZER_INFO + componentAccessToken , JSON.toJSONString(jsonObject)).getData();
+		Map map = JSON.parseObject(data, Map.class);
+		Map authInfo = (Map) map.get(ModuleConstant.AUTHORIZER_INFO);
+		return ConvertUtils.mapToEntity(authInfo, MiniInfoFormDTO.class).getNick_name();
+	}
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -458,6 +458,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectStaffDTO projectStaffDTO = projectStaffService.getProjectStaffInfo(fromDTO.getProjectProcessId());
 		ProjectStaffEntity projectStaff = ConvertUtils.sourceToTarget(projectStaffDTO, ProjectStaffEntity.class);
 		projectStaff.setId(null);
+		//防止将被退回的项目相关人员节点的创建时间赋值给新增的相关人员节点的创建时间，否则数据统计将出现误差
+		projectStaff.setCreatedTime(null);
+		projectStaff.setUpdatedTime(null);
 		projectStaff.setProcessId(projectProcessEntity.getId());
 		projectStaff.setIsHandle(ProjectConstant.UNHANDLED);
 		projectStaffService.insert(projectStaff);

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

@@ -225,7 +225,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 
 			//人工审核数据状态设为通过
 			PartymemberConfirmManualDTO partymemberConfirmManualDTO =
-					partymemberConfirmManualService.getInfoByPartyMemberInfoId(partyMemberInfoDTO.getId());
+					partymemberConfirmManualService.getInfoByPartyMemberInfoId(partyMemberInfoEntity.getId());
 			if (null != partymemberConfirmManualDTO) {
 				partymemberConfirmManualDTO.setAuditStatus(PartyMemberConstant.APPROVED);
 				partymemberConfirmManualService.updateById(ConvertUtils.sourceToTarget(partymemberConfirmManualDTO,