隐患问题功能实现

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -21,6 +21,7 @@ import com.xunmei.core.question.dto.QuestionPageDto;
 import com.xunmei.core.question.dto.QuestionReformDto;
 import com.xunmei.core.question.vo.QuestionFlowVo;
 import com.xunmei.core.question.QuestionSrcType;
+import com.xunmei.core.question.vo.QuestionStepEnum;
 import com.xunmei.core.question.vo.QuestionVo;
 import com.xunmei.core.question.domain.QuestionFlow;
 import com.xunmei.core.question.mapper.QuestionFlowMapper;
@@ -160,7 +161,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             flow.setExecuteTime(new Date());
             flow.setExecutorId(SecurityUtils.getUserId());
             flow.setExecutorName(SecurityUtils.getLoginUser().getName());
-            flow.setExecuteStatus(QuestionConfirmEnum.Confirmed.getValue());
+            flow.setExecuteStatus(0);
+            flow.setExecuteStep(QuestionStepEnum.confirm.getValue());
             questionFlowMapper.insert(flow);
         } else {
             question.setConfirmStatus(QuestionConfirmEnum.Unconfirm.getValue());
@@ -231,13 +233,13 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         flow.setExecuteTime(new Date());
         flow.setExecutorId(SecurityUtils.getUserId());
         flow.setExecutorName(SecurityUtils.getLoginUser().getName());
+        flow.setExecuteStatus(confirmDto.getStatus());
+        flow.setExecuteStep(QuestionStepEnum.confirm.getValue());
 
         updateWrapper.eq(Question::getId, confirmDto.getId());
         if (ObjectUtil.equal(confirmDto.getStatus(), 0)) {
-            flow.setExecuteStatus(QuestionConfirmEnum.Confirmed.getValue());
             updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed);
         } else {
-            flow.setExecuteStatus(QuestionConfirmEnum.Dissent.getValue());
             updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Dissent);
         }
 
@@ -248,7 +250,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     }
 
     /**
-     * 确认
+     * 异议审批
      *
      * @return
      */
@@ -270,10 +272,15 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         flow.setExecuteTime(new Date());
         flow.setExecutorId(SecurityUtils.getUserId());
         flow.setExecutorName(SecurityUtils.getLoginUser().getName());
+        flow.setExecuteStatus(confirmDto.getStatus());
+        flow.setExecuteStep(QuestionStepEnum.confirmDissent.getValue());
 
         updateWrapper.eq(Question::getId, confirmDto.getId());
-        flow.setExecuteStatus(QuestionConfirmEnum.Confirmed.getValue());
-        updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed);
+        if (ObjectUtil.equal(confirmDto.getStatus(), 0)) {
+            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Closed.getValue());
+        } else {
+            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed.getValue());
+        }
 
         questionFlowMapper.insert(flow);
         int count = baseMapper.update(null, updateWrapper);
@@ -318,6 +325,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         flow.setExecutorName(SecurityUtils.getLoginUser().getName());
         flow.setImages(reformDto.getImages());
         flow.setReformDate(reformDto.getReformDate());
+        flow.setExecuteStatus(0);
+        flow.setExecuteStep(QuestionStepEnum.reform.getValue());
 
         questionFlowMapper.insert(flow);
         int count = baseMapper.update(null, updateWrapper);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/vo/QuestionStepEnum.java

@@ -0,0 +1,18 @@
+package com.xunmei.core.question.vo;
+
+public enum QuestionStepEnum {
+    unconfirm(0),
+    confirm(1),
+    confirmDissent(2),
+    reform(11);
+
+    private Integer value;
+
+    public Integer getValue() {
+        return value;
+    }
+
+    QuestionStepEnum(Integer value) {
+        this.value = value;
+    }
+}