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

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/JoinVoteResultDTO.java

@@ -17,4 +17,8 @@ public class JoinVoteResultDTO implements Serializable {
      */
     private Boolean joinVote;
 
+    /**
+     * 态度 - opposition（反对）support（赞成） 如果已投票，此列有值
+     */
+    private String attitude;
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java

@@ -116,7 +116,7 @@ public class IssueCustomerParameterController {
      */
     @PostMapping("reviewsave")
     public Result reviewSave(@RequestBody ParameterFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class);
         issueCustomerParameterService.reviewSave(formDTO);
         return new Result();
     }

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

@@ -145,6 +145,7 @@ public class IssueCustomerParameterServiceImpl extends BaseServiceImpl<IssueCust
         entity.setParameterKey(IssueConstant.AUDIT_SWITCH);
         entity.setParameterName(IssueConstant.AUDIT_SWITCH_NAME);
         entity.setParameterValue(formDTO.getAuditSwitch());
+        entity.setDescription("已开启审核：open； 无需审核：close");
         insert(entity);
     }
 

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

@@ -17,16 +17,16 @@
 
 package com.epmet.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 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.constant.FieldConstant;
 import com.epmet.constant.IssueConstant;
 import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueVoteDetailDao;
@@ -179,11 +179,24 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         checkTopicPublisher.setTopicId(issueDTO.getSourceId());
         CheckTopicPublisherResultDTO publisherResult = resiGroupFeignClient.checkTopicPublisher(checkTopicPublisher).getData();
         //校验是否投过票
-        Integer checkoutVoteCount = baseDao.checkoutVote(formDTO);
+        /*Integer checkoutVoteCount = baseDao.checkoutVote(formDTO);
         if (checkoutVoteCount > NumConstant.ZERO || issuePublisher > NumConstant.ZERO || publisherResult.getCheckTopicPublisher() > NumConstant.ZERO){
             resultDTO.setJoinVote(true);
         }else {
             resultDTO.setJoinVote(false);
+        }*/
+        IssueVoteDetailDTO issueVoteDetailDTO=baseDao.selectUserIssueDet(checkVoteFormDTO.getUserId(),checkVoteFormDTO.getIssueId());
+        if(null!=issueVoteDetailDTO){
+            resultDTO.setJoinVote(true);
+            resultDTO.setAttitude(issueVoteDetailDTO.getAttitude());
+            return resultDTO;
+        }
+        if (issuePublisher > NumConstant.ZERO || publisherResult.getCheckTopicPublisher() > NumConstant.ZERO){
+            resultDTO.setJoinVote(true);
+            resultDTO.setAttitude(StrConstant.EPMETY_STR);
+        }else {
+            resultDTO.setJoinVote(false);
+            resultDTO.setAttitude(StrConstant.EPMETY_STR);
         }
         return resultDTO;
     }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java

@@ -116,7 +116,7 @@ public class CustomerProjectParameterController {
      */
     @PostMapping("remindsave")
     public Result remindSave(@RequestBody ParameterFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class);
         customerProjectParameterService.remindSave(formDTO);
         return new Result();
     }

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

@@ -230,6 +230,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         detentionDays.setParameterKey(ParameterKeyConstant.DETENTION_DAYS);
         detentionDays.setParameterValue(formDTO.getDetentionDays());
         detentionDays.setParameterName(ParameterKeyConstant.DETENTION_DAYS_NAME);
+        detentionDays.setDescription("默5天");
         list.add(detentionDays);
         //计算方式 工作日work  日历天calendar
         CustomerProjectParameterEntity calculation = new CustomerProjectParameterEntity();
@@ -237,6 +238,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         calculation.setParameterKey(ParameterKeyConstant.CALCULATION);
         calculation.setParameterValue(formDTO.getCalculation());
         calculation.setParameterName(ParameterKeyConstant.CALCULATION_NAME);
+        calculation.setDescription("计算方式 工作日work  日历天calendar");
         list.add(calculation);
         //即将超期提醒时间
         CustomerProjectParameterEntity remindTime = new CustomerProjectParameterEntity();
@@ -244,6 +246,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         remindTime.setParameterKey(ParameterKeyConstant.REMIND_TIME);
         remindTime.setParameterValue(formDTO.getRemindTime());
         remindTime.setParameterName(ParameterKeyConstant.REMIND_TIME_NAME);
+        remindTime.setDescription("默认 当天");
         list.add(remindTime);
         //推送时间
         CustomerProjectParameterEntity pushTime = new CustomerProjectParameterEntity();
@@ -251,6 +254,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         pushTime.setParameterKey(ParameterKeyConstant.PUSH_TIME);
         pushTime.setParameterValue(formDTO.getPushTime());
         pushTime.setParameterName(ParameterKeyConstant.PUSH_TIME_NAME);
+        pushTime.setDescription("默认 上午8点");
         list.add(pushTime);
         //设定核算单位天开始时间
         CustomerProjectParameterEntity startTime = new CustomerProjectParameterEntity();
@@ -258,6 +262,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         startTime.setParameterKey(ParameterKeyConstant.START_TIME);
         startTime.setParameterValue(formDTO.getStartTime());
         startTime.setParameterName(ParameterKeyConstant.START_TIME_NAME);
+        startTime.setDescription("默认 00:00:00");
         list.add(startTime);
        //设定核算单位天结束时间
         CustomerProjectParameterEntity endTime = new CustomerProjectParameterEntity();
@@ -265,6 +270,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         endTime.setParameterKey(ParameterKeyConstant.END_TIME);
         endTime.setParameterValue(formDTO.getEndTime());
         endTime.setParameterName(ParameterKeyConstant.END_TIME_NAME);
+        endTime.setDescription("默认 23:59:00");
         list.add(endTime);
         insertBatch(list);
 

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml

@@ -31,6 +31,7 @@
     </select>
     <select id="getParameterByCustomer" resultType="com.epmet.dto.CustomerProjectParameterDTO">
         select
+            PARAMETER_KEY,
             PARAMETER_NAME,
             PARAMETER_VALUE
         from

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java

@@ -69,4 +69,9 @@ public class IssueDetailResultDTO implements Serializable {
      *  true已发表过想法，false未发表想法
      */
     private Boolean publishIdeaFlag;
+
+    /**
+     * 态度 - opposition（反对）support（赞成）
+     */
+    private String attitude;
 }

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/JoinVoteResultDTO.java

@@ -17,4 +17,8 @@ public class JoinVoteResultDTO implements Serializable {
      */
     private Boolean joinVote;
 
+    /**
+     * 态度 - opposition（反对）support（赞成） 如果已投票，此列有值
+     */
+    private String attitude;
 }

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

@@ -87,8 +87,14 @@ public class IssueServiceImpl implements IssueService {
         CheckVoteFormDTO formDTO = new CheckVoteFormDTO();
         formDTO.setIssueId(issueDetail.getIssueId());
         formDTO.setUserId(tokenDto.getUserId());
-        JoinVoteResultDTO data = govIssueFeignClient.joinVote(formDTO).getData();
+        Result<JoinVoteResultDTO> joinVoteResultDTOResult=govIssueFeignClient.joinVote(formDTO);
-        issueDetailResult.setJoinVote(data.getJoinVote());
+        if(joinVoteResultDTOResult.success()&&null!=joinVoteResultDTOResult.getData()){
+            issueDetailResult.setJoinVote(joinVoteResultDTOResult.getData().getJoinVote());
+            issueDetailResult.setAttitude(joinVoteResultDTOResult.getData().getAttitude());
+        }else{
+            issueDetailResult.setJoinVote(false);
+            issueDetailResult.setAttitude(StrConstant.EPMETY_STR);
+        }
         if (issueDetailResult.getIssueStatus().equals(HallConstat.SHIFT_PROJECT)){
             //校验项目是否结案
             IssueIdFormDTO issueId = new IssueIdFormDTO();