Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java

@@ -25,7 +25,9 @@ import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.swing.text.html.Option;
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * 公共字段，自动填充值
@@ -80,15 +82,16 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
     }
 
     public Object getCreatedByFieldValue(MetaObject metaObject) {
-        Object value = loginUserUtil.getLoginUserId();
-        if (value == null) {
+        Object value = null;
+
             if (metaObject.hasGetter(FieldConstant.CREATED_BY_HUMP)) {
                 value = metaObject.getValue(FieldConstant.CREATED_BY_HUMP);
             }
             if (value == null) {
-                value = Constant.APP_USER_FLAG;
+
+                value = Optional.ofNullable(loginUserUtil.getLoginUserId()).orElse(Constant.APP_USER_FLAG);
             }
-        }
+
         return value;
     }
 
@@ -115,15 +118,15 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
     }
 
     public Object getUpdatedByFieldValue(MetaObject metaObject) {
-        Object value = loginUserUtil.getLoginUserId();
-        if (value == null) {
+        Object value = null;
+
             if (metaObject.hasGetter(FieldConstant.UPDATED_BY_HUMP)) {
                 value = metaObject.getValue(FieldConstant.UPDATED_BY_HUMP);
             }
             if (value == null) {
-                value = Constant.APP_USER_FLAG;
+                value = Optional.ofNullable(loginUserUtil.getLoginUserId()).orElse(Constant.APP_USER_FLAG);
             }
-        }
+
         return value;
     }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -345,6 +345,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 applicationParam.put(ModuleConstants.FIELD_JAVA_TOPIC_ID, param.getTopicId());
                 List<IssueApplicationDTO> applicationList = applicationService.list(applicationParam);
                 List<String> applyIds = new LinkedList<>();
+                boolean ifRepeat = false;
                 //没有历史提交记录
                 if (CollectionUtils.isEmpty(applicationList)) {
                     //审核开关开启
@@ -358,6 +359,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     }
                 } else {
                     //重新提交 或 工作端审核议题 更新application
+                    if(!isStaffAudition) ifRepeat = true;
                     if (applicationList.size() > NumConstant.ONE)
                         logger.error("com.epmet.service.impl.IssueServiceImpl.topicShiftedToIssueV2，查出多条转移提提交记录，话题Id：{}", param.getTopicId());
 
@@ -376,19 +378,21 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
                         applyIds.add(apply.getId());
                     });
+
+                if(!ifRepeat) {
                     //新增history
                     applyIds.forEach(id -> {
 
-                            IssueApplicationHistoryDTO history = new IssueApplicationHistoryDTO();
-                            history.setActionType(defaultStatusUnderAuditing);
-                            history.setCreatedTime(param.getCreatedTime());
-                            history.setCustomerId(param.getCustomerId());
-                            history.setIssueApplicationId(id);
-                            history.setReason(isStaffAudition ? param.getAudition().getReason() : null);
-                            history.setStaffName(isStaffAudition ? param.getAudition().getStaffName() : null);
+                        IssueApplicationHistoryDTO history = new IssueApplicationHistoryDTO();
+                        history.setActionType(defaultStatusUnderAuditing);
+                        history.setCreatedTime(param.getCreatedTime());
+                        history.setCustomerId(param.getCustomerId());
+                        history.setIssueApplicationId(id);
+                        history.setReason(isStaffAudition ? param.getAudition().getReason() : null);
+                        history.setStaffName(isStaffAudition ? param.getAudition().getStaffName() : null);
 
-                            historyService.save(history);
-                        if(!ifOpen){
+                        historyService.save(history);
+                        if (!ifOpen) {
                             IssueApplicationHistoryDTO repeatApplyRecord = new IssueApplicationHistoryDTO();
                             repeatApplyRecord.setActionType(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING);
                             repeatApplyRecord.setCreatedTime(param.getCreatedTime());
@@ -399,6 +403,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                         }
                     });
 
+                }
                     result.setIssueApplicationId(applyIds.iterator().next());
 
 

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -129,6 +129,9 @@ public class IssueServiceImpl implements IssueService {
     @Override
     public VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId) {
         Result<VotingTrendResultDTO> votingTrendResultDTOResult = govIssueFeignClient.votingTrend(issueId);
+        if (!votingTrendResultDTOResult.success()){
+            throw new RenException("查询议题表决折线图失败");
+        }
         return votingTrendResultDTOResult.getData();
     }
 
@@ -172,7 +175,11 @@ public class IssueServiceImpl implements IssueService {
         GridIdFormDTO gridIdFormDTO = new GridIdFormDTO();
         gridIdFormDTO.setGridId(gridId.getGridId());
         gridIdFormDTO.setUserId(tokenDto.getUserId());
-        CheckJoinTeamResultDTO check = resiGroupFeignClient.checkjointeam(gridIdFormDTO).getData();
+        Result<CheckJoinTeamResultDTO> checkJoinTeam = resiGroupFeignClient.checkjointeam(gridIdFormDTO);
+        if (!checkJoinTeam.success()){
+            throw new RenException("查询校验用户是否加入小组失败");
+        }
+        CheckJoinTeamResultDTO check = checkJoinTeam.getData();
         //未加入小组
         if (check.getVoteAuthorization()==false){
             voteResultDTOResult.setVoteFlag(false);
@@ -180,7 +187,11 @@ public class IssueServiceImpl implements IssueService {
             voteResultDTOResult.setOppositionCount(NumConstant.ZERO);
             voteResultDTOResult.setSupportCount(NumConstant.ZERO);
         }else {
-            voteResultDTOResult = govIssueFeignClient.voteCount(issueId).getData();
+            Result<VoteResultDTO> voteResult = govIssueFeignClient.voteCount(issueId);
+            if (!voteResult.success()){
+                throw new RenException("查询表决中议题详情——支持、反对数失败");
+            }
+            voteResultDTOResult = voteResult.getData();
             voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
         }
         return voteResultDTOResult;