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

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -100,13 +100,14 @@ public class EpmetUserController {
     @RequirePermission(requirePermission = RequirePermissionEnum.MORE_PATROL_RECORD_LIST)
     public Result<List<StaffListResultDTO>> staffPatrolList(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
-        if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode())
+        //程序稳定 部分安全校验可省略
+        /*if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode())
                 && !"reportProjectCount".equals(formDTO.getSortCode()) && !"totalTime".equals(formDTO.getSortCode())) {
             throw new RenException("参数错误，排序条件值错误");
-        }
+        }*/
-        if (formDTO.getTime() != 1 && formDTO.getTime() != 3) {
+        /*if (formDTO.getTime() != 1 && formDTO.getTime() != 3) {
             throw new RenException("参数错误，最近时间值不正确");
-        }
+        }*/
         formDTO.setUserId(tokenDto.getUserId());
         return new Result<List<StaffListResultDTO>>().ok(epmetUserService.staffPatrolList(formDTO));
     }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml

@@ -76,8 +76,8 @@
                 AND cs.real_name = #{staffName}
             </if>
             <if test="gridIds != null and gridIds.size() > 0">
-                <foreach collection="gridIds" item="gridId" open="AND (" separator=" OR "  close=" )" >
+                <foreach collection="gridIds" item="gridId" open="AND ssp.grid_id IN (" separator="," close=")">
-                    ssp.grid_id = #{gridId}
+                    #{gridId}
                 </foreach>
             </if>
             GROUP BY ssp.grid_id, ssp.staff_id

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java

@@ -84,7 +84,7 @@ public class IndexController {
 
     /**
      * 5、下级部门指数排行（安宁数据段用）
-     *
+     * 工作端小程序：下级组织指数排行也调用的此接口。
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO>>
      * @Author zhangyong
@@ -154,7 +154,7 @@ public class IndexController {
     /**
      * @param formDTO
      * @author yinzuomei
-     * @description 8、平阴大屏-下级街道or网格指数排行
+     * @description 8、平阴大屏-下级街道or网格指数排行 默认查询上个月
      * @Date 2021/2/28 14:33
      **/
     @PostMapping("subagencyindexrank-py")

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

@@ -107,24 +107,24 @@ public interface ScreenIndexDataMonthlyDao{
     List<PeerComparisonResultDTO> getSingleIndexRank(SubSingleIndexRankFormDTO formDTO);
 
     /**
-     * @param yearId
+     * @param monthId
      * @param areaCode
      * @Description 根据areaCode查询下级指数
      * @author yinzuomei
      */
     List<SubAgencyIndexRankResultDTO> selectSubStreetByAreaCode(@Param("customerId") String customerId,
-                                                                @Param("yearId") String yearId,
+                                                                @Param("monthId") String monthId,
                                                                 @Param("areaCode") String areaCode,
                                                                 @Param("topNum") int topNum);
 
     /**
-     * @param yearId
+     * @param monthId
      * @param areaCode
      * @Description 根据areaCode查询网格指数
      * @author yinzuomei
      */
     List<SubAgencyIndexRankResultDTO> selectSubGridByAreaCode(@Param("customerId") String customerId,
-                                                              @Param("yearId") String yearId,
+                                                              @Param("monthId") String monthId,
                                                               @Param("areaCode") String areaCode,
                                                               @Param("topNum") int topNum);
 

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

@@ -90,7 +90,7 @@ public interface IndexService {
     /**
      * @param formDTO
      * @author yinzuomei
-     * @description 8、平阴大屏-下级街道or网格指数排行
+     * @description 8、平阴大屏-下级街道or网格指数排行 默认查询上个月
      * @Date 2021/2/28 14:33
      **/
     List<SubAgencyIndexRankResultDTO> subAgencyIndexRankPy(SubAgencyIndexRankPyFormDTO formDTO);

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

@@ -426,7 +426,8 @@ public class IndexServiceImpl implements IndexService {
     /**
      * @param formDTO
      * @author yinzuomei
-     * @description 8、平阴大屏-下级街道or网格指数排行
+     * @description 8、平阴大屏-下级街道or网格指数排行 默认查询上个月
+     * 改为默认查询上个月，
      * @Date 2021/2/28 14:33
      **/
     @Override
@@ -435,10 +436,10 @@ public class IndexServiceImpl implements IndexService {
         if (!"street".equals(formDTO.getType()) && !"grid".equals(formDTO.getType())) {
             throw new RenException("type传参错误,街道：street;网格：grid");
         }
-        LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE);
+        String monthId=DateUtils.getBeforeNMonth(1);
-        String yearId = String.valueOf(now.getYear());
         if("street".equals(formDTO.getType())){
-            List<SubAgencyIndexRankResultDTO> streetList = screenIndexDataMonthlyDao.selectSubStreetByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum());
+            // 默认查询8个街道，平阴大屏，不会跟随中央区变化
+            List<SubAgencyIndexRankResultDTO> streetList = screenIndexDataMonthlyDao.selectSubStreetByAreaCode(formDTO.getCustomerId(),monthId,formDTO.getAreaCode(),formDTO.getTopNum());
             // 小数四舍五入
             streetList.forEach(indexRank -> {
                 indexRank.setOrgType("street");
@@ -449,7 +450,8 @@ public class IndexServiceImpl implements IndexService {
             });
             return streetList;
         }
-        List<SubAgencyIndexRankResultDTO> gridList = screenIndexDataMonthlyDao.selectSubGridByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum());
+        // 网格会根据中央区选择具体某个街道，变化
+        List<SubAgencyIndexRankResultDTO> gridList = screenIndexDataMonthlyDao.selectSubGridByAreaCode(formDTO.getCustomerId(),monthId,formDTO.getAreaCode(),formDTO.getTopNum());
         // 小数四舍五入
         gridList.forEach(indexRank -> {
             indexRank.setOrgType("grid");

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

@@ -360,17 +360,16 @@
     <select id="selectSubStreetByAreaCode" parameterType="map" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
         SELECT
             sca.AGENCY_NAME AS NAME,
-            sy.govern_ablity AS governAbility,
+            sy.govern_ablity * sy.GOVERN_ABLITY_WEIGHT AS governAbility,
-            sy.party_dev_ablity AS partyDevAbility,
+            sy.party_dev_ablity * sy.PARTY_DEV_WEIGHT AS partyDevAbility,
-            sy.service_ablity AS serviceAbility,
+            sy.service_ablity * sy.SERVICE_ABLITY_WEIGHT AS serviceAbility,
             sy.ORG_ID as orgId,
             sca.area_code as areaCode
         FROM screen_customer_agency sca
-        left join screen_index_data_yearly sy
+        left join screen_index_data_monthly sy
          on(sca.AGENCY_ID=sy.ORG_ID
            and sy.DEL_FLAG='0'
-            and sy.ORG_TYPE != 'department'
+           and sy.MONTH_ID=#{monthId}
-            and sy.YEAR_ID=#{yearId}
            )
         WHERE
             sca.del_flag = '0'
@@ -383,17 +382,17 @@
     <select id="selectSubGridByAreaCode" parameterType="map" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
         SELECT
             scg.GRID_NAME AS NAME,
-            sy.govern_ablity AS governAbility,
+            sy.govern_ablity * sy.GOVERN_ABLITY_WEIGHT AS governAbility,
-            sy.party_dev_ablity AS partyDevAbility,
+            sy.party_dev_ablity * sy.PARTY_DEV_WEIGHT AS partyDevAbility,
-            sy.service_ablity AS serviceAbility,
+            sy.service_ablity * sy.SERVICE_ABLITY_WEIGHT AS serviceAbility,
             sy.ORG_ID as orgId,
             scg.area_code as areaCode
         FROM screen_customer_grid  scg
-        left join screen_index_data_yearly sy
+        left join screen_index_data_monthly sy
            on(scg.GRID_ID=sy.ORG_ID
                and sy.DEL_FLAG='0'
                and sy.ORG_TYPE != 'department'
-                and sy.YEAR_ID=#{yearId}
+                and sy.MONTH_ID=#{monthId}
                )
         WHERE
             scg.del_flag = '0'

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

@@ -162,4 +162,12 @@ public interface PartymemberInfoService extends BaseService<PartymemberInfoEntit
      * @Date 2020/7/22 12:14
      **/
     List<PartymemberInfoDTO> listPartymemberInfoByGridId(List<String> gridIdList);
+
+    /**
+     * 获取党员信息
+     * @param customerId
+     * @param userId
+     * @return
+     */
+    PartymemberInfoDTO getPartyMemberInfoByUser(String customerId, String userId);
 }

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

@@ -191,7 +191,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		//党员信息存入党员认证信息表
 		PartymemberInfoEntity partyMemberInfoEntity = ConvertUtils.sourceToTarget(partyMemberInfoDTO,
 				PartymemberInfoEntity.class);
-
+		PartymemberInfoDTO info = partymemberInfoService.getPartyMemberInfoByUser(partyMemberInfoDTO.getCustomerId(), partyMemberInfoDTO.getUserId());
+		if (null != info) {
+			partyMemberInfoDTO.setId(info.getId());
+		}
 		if (confirmAutoDTO == null || !confirmAutoDTO.getComparisonResults()) {
 			log.info("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO));
 			//将访问记录更新到热心居民申请行为记录表

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

@@ -17,6 +17,7 @@
 
 package com.epmet.modules.partymember.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -25,6 +26,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.PartyMemberConstant;
 import com.epmet.dto.form.CreatedTimeByUserIdFormDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
@@ -41,6 +43,7 @@ import com.epmet.resi.partymember.dto.partymember.form.CertifiedDetailFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.CertifiedDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyAuthProcessingCountResultDTO;
+import kotlin.jvm.internal.Lambda;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -235,4 +238,14 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		List<PartymemberInfoDTO> list = baseDao.selectListPartymemberInfoByGridId(gridIdList);
 		return list;
 	}
+
+	@Override
+	public PartymemberInfoDTO getPartyMemberInfoByUser(String customerId, String userId) {
+		LambdaQueryWrapper<PartymemberInfoEntity> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PartymemberInfoEntity :: getCustomerId, customerId);
+		wrapper.eq(PartymemberInfoEntity :: getUserId, userId);
+		wrapper.ne(PartymemberInfoEntity :: getConfirmResult, PartyMemberConstant.REJECTED);
+		PartymemberInfoEntity entity = baseDao.selectOne(wrapper);
+		return ConvertUtils.sourceToTarget(entity, PartymemberInfoDTO.class);
+	}
 }