打卡内容审核bug修改

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/ModuleName.java

@@ -13,7 +13,7 @@ public enum ModuleName {
     ISSUE_SUBMIT("issue_submit","议题项目-我要报事"),
     ISSUE_COMMENT("issue_comment","议题项目-评论"),
     ITEM_SATISFACTION("item_satisfaction","项目详情-满意度评价"),
-    PARTY_GROUP_TOPIC("party_group_topic","党群1+1-发布话题"),
+    PARTY_GROUP_TOPIC("party_group_topic","党群1+1-发个新话题"),
     PARTY_GROUP_TOPIC_COMMENT("party_group_topic_comment","党群1+1-评论"),
     HELP_SIGNIN("help_signIn","初心互助-已报名活动-我要打卡");
 

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

@@ -52,6 +52,8 @@ public class ItemServiceImpl implements ItemService {
             return new Result<ItemDetailResultDTO>().error("获取用户信息失败");
         }
         evaluationFormDTO.setUserId(userDetail.getUserId());
+        evaluationFormDTO.setUserName(userDetail.getNickname());
+        evaluationFormDTO.setDeptId(userDetail.getGridId());
         return itemFeignClient.evaluation(evaluationFormDTO);
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java

@@ -25,6 +25,9 @@ public class EvaluationFormDTO implements Serializable {
     private String evaluationContent;
 
     private String userId;
+    private String userName;
+    private Long deptId;
+
 
     /**
      *是否提交为内容待审核状态

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -311,24 +311,20 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if (itemEntityResult.getUserId().equals(evaluationFormDTO.getUserId()) && itemEntityResult.getEvaluationScore() == null) {
             //内容审核 - start
             Boolean isConReview = evaluationFormDTO.getIsConReview();
-            String userName = null;
-            if(null != SecurityUser.getUser()){
-                userName = SecurityUser.getUser().getUsername();
-            }
             String mobile = null;
             Result<UserDTO> user =  userFeignClient.getUserInfoById(evaluationFormDTO.getUserId());
             if(null != user.getData()){
                 mobile = user.getData().getMobile();
             }
             // 获取所有上级机构名称和ID拼接
-            ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
+            ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(evaluationFormDTO.getDeptId()).getData();
             List<String> textList = new ArrayList<>();
             textList.add(evaluationFormDTO.getEvaluationContent());
             CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
             if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
-                        userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one,
+                        evaluationFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one,
                         ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult,
                         null,null,mobile,"0",deptDto);
                 contentSecurityFeign.insertViolationsRecord(record);
@@ -348,7 +344,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             //接口异常，保存至待审核信息
             if(contentResult == null && !isConReview) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
-                        userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList,
+                        evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList,
                         null, itemEntity.getId(),null,null, null,mobile,"1",deptDto);
                 contentSecurityFeign.insertRecords(record);
             }
@@ -364,7 +360,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
-                            userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
+                            evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
                             null,itemEntity.getId(), null,null,twoTypes,mobile,"0",deptDto);
                     contentSecurityFeign.insertRecords(record);
                 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java

@@ -673,6 +673,17 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     @Override
     @Transactional
     public Result rejectActClockInfo(RejectRecordDTO dto) {
+        //判断是否只打过一次卡，打过一次则更新关系表状态为 审核成功
+        ActUserClockLogEntity actUserClockLogEntity = actUserClockLogDao.selectById(dto.getRelationId());
+        Map<String,Object> queryMap = new HashMap<>();
+        queryMap.put("ACT_USER_ID",actUserClockLogEntity.getActUserId());
+        List<ActUserClockLogEntity> actUserClockLogEntities = actUserClockLogDao.selectByMap(queryMap);
+        if(actUserClockLogEntities.size()==1){
+            ActUserRelationEntity actUserRelationEntity = new ActUserRelationEntity();
+            actUserRelationEntity.setId(actUserClockLogEntity.getActUserId());
+            actUserRelationEntity.setStatus("1");
+            actUserRelationDao.updateById(actUserRelationEntity);
+        }
         actUserClockLogDao.rejectActClockInfo(dto.getRelationId());
         actClockPicDao.rejectActClockPicInfo(dto.getRelationId());
         return new Result();