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

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -369,7 +369,7 @@ public interface UserFeignClient {
 
     /**
      * 志愿者认证
-     *
+     *needCachingUserInfoByUserId
      * @param userId
      * @return
      */

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -741,7 +741,10 @@ public class AppUserServiceImpl implements AppUserService {
         // IP地址
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
 
-        return this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request), formDto.getInviteUserId(), formDto.getGridId());
+
+        Result<EpdcAppAuthorizationDTO> result = this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request), formDto.getInviteUserId(), formDto.getGridId());
+
+        return result;
     }
 
     @Override
@@ -758,16 +761,6 @@ public class AppUserServiceImpl implements AppUserService {
         }
         epdcAppUserRegisterFormDTO.setWxCode(formDto.getWxCode());
         Result<EpdcAppAuthorizationDTO> maV2Token = this.getMaV2Token(epdcAppUserRegisterFormDTO);
-        // 注册埋点
-        if (maV2Token.success()) {
-            PointLogFormDTO pointLogFormDTO = new PointLogFormDTO();
-            pointLogFormDTO.setType(BehaviorEnum.POINTS_REGISTER_RULES.getValue());
-            pointLogFormDTO.setUserId(maV2Token.getData().getUserId());
-            pointFeignClient.updataPoint(pointLogFormDTO);
-        } else {
-            log.error("报错："+maV2Token.getMsg() + "-" + maV2Token.toString());
-        }
-
         return maV2Token;
     }
 
@@ -987,6 +980,11 @@ public class AppUserServiceImpl implements AppUserService {
         Result<CachingUserInfoDTO> cachingUserResult = userFeignClient.needCachingUserInfoByUserId(tokenDto.getUserId());
         CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData();
         EpdcAppAuthorizationDTO authorizationDto = cachingUserInfoForAuthorization(cachingUserInfoDTO, user.getGrid(), user.getState());
+        // 注册埋点
+        PointLogFormDTO pointLogFormDTO = new PointLogFormDTO();
+        pointLogFormDTO.setType(BehaviorEnum.POINTS_REGISTER_RULES.getValue());
+        pointLogFormDTO.setUserId(authorizationDto.getUserId());
+        pointFeignClient.updataPoint(pointLogFormDTO);
 
         // 党员认证失败
         if (100006001 == completeResult.getCode()) {
@@ -996,10 +994,11 @@ public class AppUserServiceImpl implements AppUserService {
         }
         // 更新社群用户党员标识并加入关联的所有网格党员群
         boolean partyFlag = UserTagUtils.containIdentity(cachingUserInfoDTO.getUserTagInfos(), UserTagEnum.PARTY_MEMBER);
+
         if (partyFlag) {
             initPartyGroupInfo(cachingUserInfoDTO);
             //  积分埋点  党员认证规则
-            PointLogFormDTO pointLogFormDTO = new PointLogFormDTO();
+            pointLogFormDTO = new PointLogFormDTO();
             pointLogFormDTO.setType(BehaviorEnum.POINTS_PARTY_AUTHENTICATION_RULES.getValue());
             pointLogFormDTO.setUserId(tokenDto.getUserId());
             pointFeignClient.updataPoint(pointLogFormDTO);

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -512,7 +512,7 @@
         <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        and date_format( CREATED_TIME, '%Y-%m-%d' ) > date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' )
+        <![CDATA[ and date_format( CREATED_TIME, '%Y-%m-%d' ) > date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' ) ]]>
     </select>
 
     <resultMap id="workIssueList" type="com.elink.esua.epdc.dto.issue.result.WorkIssueListResultDTO">

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -842,6 +842,7 @@
         WHERE
             DEL_FLAG = '0'
             AND GRID_ID = #{deptId}
+            AND EVENT_ID is not null
             AND ITEM_STATE = #{state}
             AND ID NOT IN (
             SELECT

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java

@@ -161,11 +161,14 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl<ActivePointLogDao
         if (BehaviorEnum.POINTS_SIGN_RULES.getValue().equals(formDTO.getType())) {
             // 获取五天之内签到次数
             int signCount = baseDao.selectDoubleTimeCount(formDTO);
-            if (signCount >= 5) {
+            if (signCount >= Integer.parseInt(doubleTime)) {
                 // 开启加倍
                 points = Integer.parseInt(points) * 2 + "";
             }
         }
+        if ("0".equals(priod)) {
+            priod = "3";
+        }
         // 查询当前用户积分状态 判断是否上线（次数） （上限）
         Map<String, String> parames = new HashMap<>();
         parames.put("userId", formDTO.getUserId());
@@ -173,36 +176,35 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl<ActivePointLogDao
         parames.put("priod", priod);
         UserPointInfo pointInfo = baseDao.selectByType(parames);
         //  只允许加一次积分 并且 已经加过了
-        if ("0".equals(priod) && pointInfo.getPointTimeCount() != 0) {
+        if (pointInfo.getPointTimeCount() >= Integer.parseInt(time) || pointInfo.getPointCount() >= Integer.parseInt(limit)) {
             return;
         }
         //没达到上限可以继续添加积分操作
         ActivePointLogEntity logEntity = new ActivePointLogEntity();
-        if (pointInfo.getPointCount() < Integer.parseInt(limit) && pointInfo.getPointTimeCount() < Integer.parseInt(time)) {
+        // 获取用户真实姓名
-            // 获取用户真实姓名
+        Result<EpdcUserInfoResultDTO> infoById = userFeignClient.getInfoById(formDTO.getUserId());
-            Result<EpdcUserInfoResultDTO> infoById = userFeignClient.getInfoById(formDTO.getUserId());
+
-
+        logEntity.setUserId(formDTO.getUserId());
-            logEntity.setUserId(formDTO.getUserId());
+        logEntity.setOperationType(PointsOperationConstant.OPERATION_ADD);
-            logEntity.setOperationType(PointsOperationConstant.OPERATION_ADD);
+        logEntity.setPoints(Integer.parseInt(points));
-            logEntity.setPoints(Integer.parseInt(points));
+        logEntity.setOperationCode(operationCode);
-            logEntity.setOperationCode(operationCode);
+        logEntity.setOperationDesc(operationDesc);
-            logEntity.setOperationDesc(operationDesc);
+        logEntity.setOperationTime(new Date());
-            logEntity.setOperationTime(new Date());
+        logEntity.setUserName(infoById.getData().getRealName());
-            logEntity.setUserName(infoById.getData().getRealName());
+
-
+        logEntity.setDeptId(infoById.getData().getGridId());
-            logEntity.setDeptId(infoById.getData().getGridId());
+        logEntity.setDeptName(infoById.getData().getGridName());
-            logEntity.setDeptName(infoById.getData().getRealName());
+        logEntity.setParentDeptIds(infoById.getData().getParentDeptIds());
-            logEntity.setParentDeptIds(infoById.getData().getRealName());
+        logEntity.setParentDeptNames(infoById.getData().getParentDeptNames());
-            logEntity.setParentDeptNames(infoById.getData().getRealName());
+        logEntity.setAllDeptIds(infoById.getData().getAllDeptIds());
-            logEntity.setAllDeptIds(infoById.getData().getRealName());
+        logEntity.setMobile(infoById.getData().getMobile());
-            logEntity.setAllDeptNames(infoById.getData().getRealName());
+        logEntity.setAllDeptNames(infoById.getData().getAllDeptNames());
-            baseDao.insert(logEntity);
+        baseDao.insert(logEntity);
-            // 更新用户表积分
+        // 更新用户表积分
-            UserPointsFormDTO userPointsFormDTO = new UserPointsFormDTO();
+        UserPointsFormDTO userPointsFormDTO = new UserPointsFormDTO();
-            userPointsFormDTO.setPoints(Integer.parseInt(points));
+        userPointsFormDTO.setPoints(Integer.parseInt(points));
-            userPointsFormDTO.setUserId(formDTO.getUserId());
+        userPointsFormDTO.setUserId(formDTO.getUserId());
-            userFeignClient.updataUserPoint(userPointsFormDTO);
+        userFeignClient.updataUserPoint(userPointsFormDTO);
-        }
 
 
     }

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml

@@ -75,10 +75,11 @@
         pl.USER_ID = #{userId}
         AND pl.OPERATION_CODE = #{type}
         AND pl.DEL_FLAG = '0'
-        <if test='priod ="1"'>
+
+        <if test='priod != null and priod != "" and priod == "1"'>
             AND DATE_FORMAT(pl.CREATED_TIME, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d')
         </if>
-        <if test='priod ="2"'>
+        <if test='priod != null and priod != "" and priod == "2"'>
             AND DATE_FORMAT(pl.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
         </if>
     </select>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java

@@ -269,5 +269,5 @@ public class UserEntity extends DeptScope {
     /**
      * 活跃积分
      */
-    private int activePoints;
+    private Integer activePoints;
 }

esua-epdc/kettle-Code/esua_epdc_analysis_job/analysis_extracting/epdc_issue_item_statistics_plantform_item_extracting.ktr

@@ -605,6 +605,7 @@
 				 AND eigp.DEL_FLAG = '0' 
 				WHERE
 				 item.DEL_FLAG = '0' 
+                and item.EVENT_ID is not null
 				GROUP BY
 				 item.GRID_ID)c
 			 GROUP BY

esua-epdc/kettle-Code/esua_epdc_behavior/behavior.kjb

@@ -515,7 +515,7 @@
       <to>behavior_basic</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
-      <enabled>Y</enabled>
+      <enabled>N</enabled>
       <evaluation>Y</evaluation>
       <unconditional>Y</unconditional>
     </hop>
@@ -524,7 +524,7 @@
       <to>behavior_participate</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
-      <enabled>Y</enabled>
+      <enabled>N</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
@@ -542,7 +542,7 @@
       <to>epdc_active_user_info</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
-      <enabled>Y</enabled>
+      <enabled>N</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
@@ -551,7 +551,7 @@
       <to>成功</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
-      <enabled>Y</enabled>
+      <enabled>N</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
@@ -560,10 +560,19 @@
       <to>behavior_party</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
-      <enabled>Y</enabled>
+      <enabled>N</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
+    <hop>
+      <from>Start</from>
+      <to>epdc_active_user_info</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
   </hops>
   <notepads>
   </notepads>

esua-epdc/kettle-Code/esua_epdc_behavior/behavior_basic.kjb

@@ -541,7 +541,7 @@ true;
       <fields>
         <field>
           <variable_name>statDays</variable_name>
-          <variable_value>1</variable_value>
+          <variable_value>8</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
       </fields>
@@ -610,7 +610,7 @@ true;
       <to>if(statDays>0)</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
-      <enabled>Y</enabled>
+      <enabled>N</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
@@ -664,7 +664,7 @@ true;
       <to>统计天数减1</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
-      <enabled>Y</enabled>
+      <enabled>N</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>

esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_TYPICAL_CASE.ktr

@@ -591,8 +591,8 @@
 			4 
 	) + 
 	IF(
-			sum( IF ( entity.BONUS_CATEGORY = '2', IFNULL( entity.BONUS, 0 ), 0 ) ) < 3,
+			sum( IF ( entity.BONUS_CATEGORY = '3', IFNULL( entity.BONUS, 0 ), 0 ) ) < 3,
-			sum( IF ( entity.BONUS_CATEGORY = '2', IFNULL( entity.BONUS, 0 ), 0 ) ),
+			sum( IF ( entity.BONUS_CATEGORY = '3', IFNULL( entity.BONUS, 0 ), 0 ) ),
 			3
 	)
 	,2) AS TYPICAL_CASE,