feat: There is no way the,buss eval

src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessEvaluationHisController.java

@@ -0,0 +1,36 @@
+package com.ydw.bat.wkflow.business_main.datas.controller;
+
+
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * OA日志表 前端控制器
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@RestController
+@RequestMapping("/busProcessEvaluation")
+public class BusProcessEvaluationHisController {
+
+    @Autowired
+    private IBusProcessEvaluationHisService busProcessEvaluationHisService;
+
+    @GetMapping("/evaluationHisList")
+    public List<BusProcessEvaluationHis> evaluationHisList(String pid) {
+        List<BusProcessEvaluationHis> processEvaluationHis = busProcessEvaluationHisService.evaluationHisList(pid);
+        return processEvaluationHis;
+    }
+}
+

src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessEvaluationHis.java

@@ -0,0 +1,78 @@
+package com.ydw.bat.wkflow.business_main.datas.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * OA日志表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="BusProcessEvaluationHis对象", description="流程评分历史表")
+public class BusProcessEvaluationHis implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "ID", type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "标准id")
+    @TableField("STAND_ID")
+    private String standId;
+
+    @ApiModelProperty(value = "处理人")
+    @TableField("USER_ID")
+    private String userId;
+
+    @ApiModelProperty(value = "信息")
+    @TableField("MESG")
+    private String mesg;
+
+    @ApiModelProperty(value = "节点信息")
+    @TableField("TASK_INFO")
+    private String taskInfo;
+
+    @ApiModelProperty(value = "任务id")
+    @TableField("TASK_ID")
+    private String taskId;
+
+    @ApiModelProperty(value = "流程实例id")
+    @TableField("P_ID")
+    private String pId;
+
+    @ApiModelProperty(value = "流程名称")
+    @TableField("PRC_NAME")
+    private String prcName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updateTime;
+
+    @ApiModelProperty(value = "逻辑状态")
+    @TableField("FLAG")
+    private String flag;
+
+
+}

src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessEvaluationHisMapper.java

@@ -0,0 +1,18 @@
+package com.ydw.bat.wkflow.business_main.datas.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 流程评分历史表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Repository
+public interface BusProcessEvaluationHisMapper extends BaseMapper<BusProcessEvaluationHis> {
+
+}

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessEvaluationHisService.java

@@ -0,0 +1,19 @@
+package com.ydw.bat.wkflow.business_main.datas.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 流程评分历史表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+public interface IBusProcessEvaluationHisService extends IService<BusProcessEvaluationHis> {
+
+    List<BusProcessEvaluationHis> evaluationHisList(String pid);
+}

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessEvaluationHisServiceImpl.java

@@ -0,0 +1,32 @@
+package com.ydw.bat.wkflow.business_main.datas.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
+import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessEvaluationHisMapper;
+import com.ydw.bat.wkflow.business_main.datas.mapper.SendTodoLogMapper;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 流程评分历史表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Service
+public class BusProcessEvaluationHisServiceImpl extends ServiceImpl<BusProcessEvaluationHisMapper, BusProcessEvaluationHis> implements IBusProcessEvaluationHisService {
+
+
+    @Override
+    public List<BusProcessEvaluationHis> evaluationHisList(String pid){
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("P_ID",pid);
+        return this.baseMapper.selectList(wrapper);
+    }
+}

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java

@@ -54,10 +54,10 @@ public class BussLibrary11After implements TaskListener{
 
         if(StringUtils.isNotBlank(approvalOpinion)){
             if ("0".equalsIgnoreCase(approvalOpinion)) {
-                if(StringUtils.isNotBlank(object.getString("zqcUsrId"))){
+                if(StringUtils.isNotBlank(object.getString("pxUserId"))){
 
-                    delegateTask.setVariable("pxUserId",object.getString("zqcUsrId"));
-                    nextUserList.add(object.getString("zqcUsrId"));
+                    delegateTask.setVariable("pxUserId",object.getString("pxUserId"));
+                    nextUserList.add(object.getString("pxUserId"));
 
                     BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
                     delegateTask.setVariable("zrFlag", 0);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java

@@ -3,9 +3,11 @@ package com.ydw.bat.wkflow.listener.bussLibrary;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
@@ -82,6 +84,9 @@ public class BussLibrary5After implements TaskListener{
         busProcessNew.setTaskInfo(delegateTask.getName());
         busBean.save(busProcessNew);
 
+        // 评分存储
+        BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
+
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java

@@ -3,9 +3,11 @@ package com.ydw.bat.wkflow.listener.bussLibrary;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
@@ -15,7 +17,9 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,6 +31,8 @@ public class BussLibrary7After implements TaskListener{
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+        IBusProcessEvaluationHisService evaluationHisService = SpringContextUtil.getBean(IBusProcessEvaluationHisService.class);
+
 
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -44,11 +50,6 @@ public class BussLibrary7After implements TaskListener{
             throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
         }
 
-        JSONArray evaluationData =delegateTask.getVariable("evaluationList", JSONArray.class);
-        if (evaluationData==null) {
-            throw new ActivitiException("1#2评分关联数据不存在");
-        }
-
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
@@ -77,6 +78,9 @@ public class BussLibrary7After implements TaskListener{
         busProcessNew.setTaskInfo(delegateTask.getName());
         busBean.save(busProcessNew);
 
+        // 评分存储
+        BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
+
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java

@@ -60,6 +60,8 @@ public class BussLibrary8After implements TaskListener{
                     nextUserList.add(object.getString("bzUserId"));
 
                     BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    // 评分存储
+                    BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
                     delegateTask.setVariable("jsfzrFlag", 0);
                 }else {
                     throw new ActivitiException("1#2部长用户参数不存在,请配置相关用户");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java

@@ -60,6 +60,8 @@ public class BussLibrary9After implements TaskListener{
                     nextUserList.add(object.getString("fzrUserId"));
 
                     BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    // 评分存储
+                    BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
                     delegateTask.setVariable("bzFlag", 0);
                 }else {
                     throw new ActivitiException("1#2副主任用户参数不存在,请配置相关用户");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java

@@ -2,8 +2,10 @@ package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
@@ -20,6 +22,21 @@ import java.util.List;
  */
 public class BussUtils {
 
+    public static void evalSave(DelegateTask delegateTask, JSONObject object, String prcName, String localUser) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+        IBusProcessEvaluationHisService evaluationHisService = SpringContextUtil.getBean(IBusProcessEvaluationHisService.class);
+        BusProcessEvaluationHis evaluationHis = new BusProcessEvaluationHis();
+        evaluationHis.setPId(delegateTask.getProcessInstanceId());
+        evaluationHis.setMesg(object.getString("evaluationData"));
+        evaluationHis.setTaskInfo(delegateTask.getName());
+        evaluationHis.setUserId(localUser);
+        evaluationHis.setPrcName(prcName);
+        evaluationHis.setTaskId(delegateTask.getId());
+        evaluationHis.setCreateTime(sdf.format(new Date()));
+        evaluationHis.setUpdateTime(sdf.format(new Date()));
+        evaluationHisService.save(evaluationHis);
+    }
+
     public static void endFunc(DelegateTask delegateTask, String prcName,IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/resources/mapper/busProcessEvaluationHis/BusProcessEvaluationHisMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessEvaluationHisMapper">
+
+</mapper>