Procházet zdrojové kódy

业务提问模块

lizhenhao před 2 roky
rodič
revize
e243e0937a

+ 5 - 2
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/klgBase/question/mapper/xml/KlgBaseQuestionsMapper.xml

@@ -127,8 +127,10 @@
 
     <select id="getReplyList" resultType="com.jeeplus.test.klgBase.question.service.dto.KlgBaseReplyDTO">
         select
-        <include refid="Kbr_Column_List"></include>
+        <include refid="Kbr_Column_List"></include>,
+        su.name as replyName
         from klg_base_reply kbr
+        left join sys_user su on su.id = kbr.reply_by and su.del_flag = '0'
         where kbr.del_flag = '0' and kbr.question_id = #{id}
     </select>
 
@@ -155,7 +157,8 @@
         kbr.sort
         from klg_base_reply kbr
         where kbr.question_id = #{id}
-        order by CONVERT(sort,SIGNED) desc
+--         order by CONVERT(sort,SIGNED) desc
+        order by sort desc
         limit 1
     </select>
 </mapper>

+ 2 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/klgBase/question/service/KlgBaseQuestionsService.java

@@ -106,6 +106,8 @@ public class KlgBaseQuestionsService extends ServiceImpl<KlgBaseQuestionsMapper,
                         }else{
                             klgBaseReply.setSort("0");
                         }
+                        klgBaseReply.setReplyBy(UserUtils.getCurrentUserDTO().getId());
+                        klgBaseReply.setQuestionId(klgBaseQuestions.getId());
                         klgBaseReplyMapper.insert(klgBaseReply);
                     }
                 });

+ 5 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/klgBase/question/service/dto/KlgBaseReplyDTO.java

@@ -35,6 +35,11 @@ public class KlgBaseReplyDTO extends BaseDTO {
     private String replyBy;
 
     /**
+     * 回复人姓名
+     */
+    private String replyName;
+
+    /**
      * 回复时间
      */
     private Date replyDate;

+ 1 - 0
jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/model/TaskComment.java

@@ -15,6 +15,7 @@ public class TaskComment {
     private String message;    // 任务意见
     private String fullMessage; // status + '_FLOW_ACTION_' + message
     private String level; //显示级别 info danger success
+    private String candidateUserList;
 
     public static final String prefix = "COMMENT_";
     public String getFullMessage(){

+ 10 - 0
jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.flowable.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,6 +20,7 @@ import com.jeeplus.flowable.service.converter.json.FlowModelService;
 import com.jeeplus.flowable.utils.FlowableUtils;
 import com.jeeplus.flowable.utils.ProcessDefCache;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.bpmn.constants.BpmnXMLConstants;
@@ -674,6 +676,14 @@ public class FlowTaskService {
             managementService.executeCommand (new BackUserTaskCmd (runtimeService,
                     taskId, backTaskDefKey));
         }
+        if (ObjectUtil.isNotEmpty(comment)) {
+            if (StringUtils.isNotBlank(comment.getCandidateUserList())) {
+                String[] split = comment.getCandidateUserList().split(",");
+                for (String i : split) {
+                    taskService.addCandidateUser(task.getId(),i);
+                }
+            }
+        }
 
         return task.getProcessInstanceId ();
     }