getModelData() {
+ return modelData;
+ }
+
+ public void setEntNumber(String entNumber) {
+ this.entNumber = entNumber;
+ }
+ public String getEntNumber() {
+ return entNumber;
+ }
+
+ public void setCnName(String cnName) {
+ this.cnName = cnName;
+ }
+ public String getCnName() {
+ return cnName;
+ }
+
+ public void setEnName(String enName) {
+ this.enName = enName;
+ }
+ public String getEnName() {
+ return enName;
+ }
+
+ public void setEntCategory(String entCategory) {
+ this.entCategory = entCategory;
+ }
+ public String getEntCategory() {
+ return entCategory;
+ }
+
+ public void setReplaceNumber(String replaceNumber) {
+ this.replaceNumber = replaceNumber;
+ }
+ public String getReplaceNumber() {
+ return replaceNumber;
+ }
+
+ public void setReplacedNumber(String replacedNumber) {
+ this.replacedNumber = replacedNumber;
+ }
+ public String getReplacedNumber() {
+ return replacedNumber;
+ }
+
+ public void setReleaseDate(String releaseDate) {
+ this.releaseDate = releaseDate;
+ }
+ public String getReleaseDate() {
+ return releaseDate;
+ }
+
+ public void setImplementDate(String implementDate) {
+ this.implementDate = implementDate;
+ }
+ public String getImplementDate() {
+ return implementDate;
+ }
+
+ public void setReviewDate(String reviewDate) {
+ this.reviewDate = reviewDate;
+ }
+ public String getReviewDate() {
+ return reviewDate;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/RoleForm.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/RoleForm.java
new file mode 100644
index 00000000..98b184ea
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/RoleForm.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright 2022 bejson.com
+ */
+package com.ydw.bat.wkflow.business_main.datas.entity.standState;
+
+/**
+ * Auto-generated: 2022-06-23 15:31:2
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class RoleForm {
+
+ private String prcCreateUserName = "";
+ private String prcCreateUser= "";
+ private String dockUser= "";
+ private String dockUserName= "";
+ private String bussFsSubUser2= "";
+ private String bussFsSubUser2Name= "";
+ private String bussFsUser2= "";
+ private String bussFsUser2Name= "";
+ private String bussFsUserC2= "";
+ private String bussFsUserC2Name= "";
+ private String bussFsUser3= "";
+ private String bussFsUser3Name= "";
+ public void setPrcCreateUserName(String prcCreateUserName) {
+ this.prcCreateUserName = prcCreateUserName;
+ }
+ public String getPrcCreateUserName() {
+ return prcCreateUserName;
+ }
+
+ public void setPrcCreateUser(String prcCreateUser) {
+ this.prcCreateUser = prcCreateUser;
+ }
+ public String getPrcCreateUser() {
+ return prcCreateUser;
+ }
+
+ public void setDockUser(String dockUser) {
+ this.dockUser = dockUser;
+ }
+ public String getDockUser() {
+ return dockUser;
+ }
+
+ public void setDockUserName(String dockUserName) {
+ this.dockUserName = dockUserName;
+ }
+ public String getDockUserName() {
+ return dockUserName;
+ }
+
+ public void setBussFsSubUser2(String bussFsSubUser2) {
+ this.bussFsSubUser2 = bussFsSubUser2;
+ }
+ public String getBussFsSubUser2() {
+ return bussFsSubUser2;
+ }
+
+ public void setBussFsSubUser2Name(String bussFsSubUser2Name) {
+ this.bussFsSubUser2Name = bussFsSubUser2Name;
+ }
+ public String getBussFsSubUser2Name() {
+ return bussFsSubUser2Name;
+ }
+
+ public void setBussFsUser2(String bussFsUser2) {
+ this.bussFsUser2 = bussFsUser2;
+ }
+ public String getBussFsUser2() {
+ return bussFsUser2;
+ }
+
+ public void setBussFsUser2Name(String bussFsUser2Name) {
+ this.bussFsUser2Name = bussFsUser2Name;
+ }
+ public String getBussFsUser2Name() {
+ return bussFsUser2Name;
+ }
+
+ public void setBussFsUserC2(String bussFsUserC2) {
+ this.bussFsUserC2 = bussFsUserC2;
+ }
+ public String getBussFsUserC2() {
+ return bussFsUserC2;
+ }
+
+ public void setBussFsUserC2Name(String bussFsUserC2Name) {
+ this.bussFsUserC2Name = bussFsUserC2Name;
+ }
+ public String getBussFsUserC2Name() {
+ return bussFsUserC2Name;
+ }
+
+ public void setBussFsUser3(String bussFsUser3) {
+ this.bussFsUser3 = bussFsUser3;
+ }
+ public String getBussFsUser3() {
+ return bussFsUser3;
+ }
+
+ public void setBussFsUser3Name(String bussFsUser3Name) {
+ this.bussFsUser3Name = bussFsUser3Name;
+ }
+ public String getBussFsUser3Name() {
+ return bussFsUser3Name;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/StandStateDraft.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/StandStateDraft.java
new file mode 100644
index 00000000..4b887ee3
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/StandStateDraft.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright 2022 bejson.com
+ */
+package com.ydw.bat.wkflow.business_main.datas.entity.standState;
+
+/**
+ * Auto-generated: 2022-06-23 15:31:2
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class StandStateDraft {
+
+ private String taskInfo="起草";
+ private RoleForm roleForm;
+ private QbfsForm qbfsForm;
+ private String commentText= "";
+ public void setTaskInfo(String taskInfo) {
+ this.taskInfo = taskInfo;
+ }
+ public String getTaskInfo() {
+ return taskInfo;
+ }
+
+ public void setRoleForm(RoleForm roleForm) {
+ this.roleForm = roleForm;
+ }
+ public RoleForm getRoleForm() {
+ return roleForm;
+ }
+
+ public void setQbfsForm(QbfsForm qbfsForm) {
+ this.qbfsForm = qbfsForm;
+ }
+ public QbfsForm getQbfsForm() {
+ return qbfsForm;
+ }
+
+ public void setCommentText(String commentText) {
+ this.commentText = commentText;
+ }
+ public String getCommentText() {
+ return commentText;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessEvaluationHisMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessEvaluationHisMapper.java
new file mode 100644
index 00000000..c0060053
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 流程评分历史表 Mapper 接口
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Repository
+public interface BusProcessEvaluationHisMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessModelHisMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessModelHisMapper.java
new file mode 100644
index 00000000..53d795c0
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessModelHisMapper.java
@@ -0,0 +1,19 @@
+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 com.ydw.bat.wkflow.business_main.datas.entity.BusProcessModelHis;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * 流程模块历史表 Mapper 接口
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Repository
+public interface BusProcessModelHisMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java
index 9abffa86..eda674e8 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.business_main.datas.mapper;
+import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,6 @@ public interface BusProcessNameMapper extends BaseMapper {
//查询符合要求的 name 信息
List findBusProcessNameForEnd(String taskId);
+ List todoTask(@Param("task") TaskCommonQuery taskCommonQuery);
+
}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java
index fedd1769..9743050e 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java
@@ -26,4 +26,12 @@ public interface BusProcessNewMapper extends BaseMapper {
List findNoExecuteBusProcessNewForEnd(@Param("taskIds")List taskIds);
// String queryTaskName(@Param("id")String id);
+ List findLastworkPeople(@Param("key")String key,@Param("pId")String pId);
+
+ List findLastworkPeople2(@Param("key")String key,@Param("pId")String pId);
+
+ List everyDayTenOlock();
+
+ List everyDayTenOlockSAM();
+
}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/EsPrcRelationMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/EsPrcRelationMapper.java
new file mode 100644
index 00000000..28f4ae56
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/EsPrcRelationMapper.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.EsPrcRelation;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * 企标计划和技术标准流程关联表 Mapper 接口
+ *
+ *
+ * @author iyawei
+ * @since 2022-11-18
+ */
+@Repository
+public interface EsPrcRelationMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/EsTechRelationMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/EsTechRelationMapper.java
new file mode 100644
index 00000000..2f395eea
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/EsTechRelationMapper.java
@@ -0,0 +1,9 @@
+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.EsTechRelation;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface EsTechRelationMapper extends BaseMapper {
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/OaTaskExecMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/OaTaskExecMapper.java
new file mode 100644
index 00000000..10f7b6e4
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/OaTaskExecMapper.java
@@ -0,0 +1,16 @@
+package com.ydw.bat.wkflow.business_main.datas.mapper;
+
+import com.ydw.bat.wkflow.business_main.datas.entity.OaTaskExec;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * OA 干活任务执行表 Mapper 接口
+ *
+ *
+ * @author Super_liu
+ * @since 2021-09-24
+ */
+public interface OaTaskExecMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/SendTodoLogMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/SendTodoLogMapper.java
new file mode 100644
index 00000000..fb6d03b2
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/SendTodoLogMapper.java
@@ -0,0 +1,18 @@
+package com.ydw.bat.wkflow.business_main.datas.mapper;
+
+import com.ydw.bat.wkflow.business_main.datas.entity.SendTodoLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * OA日志表 Mapper 接口
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Repository
+public interface SendTodoLogMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/TbTaskMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/TbTaskMapper.java
new file mode 100644
index 00000000..284cd61a
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/TbTaskMapper.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.TbTask;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * 动态定时任务表 Mapper 接口
+ *
+ *
+ * @author super_liu
+ * @since 2022-05-27
+ */
+@Repository
+public interface TbTaskMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessEvaluationHisService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessEvaluationHisService.java
new file mode 100644
index 00000000..cb96b3f7
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessEvaluationHisService.java
@@ -0,0 +1,26 @@
+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;
+import java.util.Map;
+
+/**
+ *
+ * 流程评分历史表 服务类
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+public interface IBusProcessEvaluationHisService extends IService {
+
+ Map evaluationHisListRepSum(String pid);
+
+ BusProcessEvaluationHis evaluationHisListByOne(String pid,String taskInfo);
+
+ List evaluationHisListRep(String pid);
+
+ List evaluationHisList(String pid);
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java
new file mode 100644
index 00000000..2d83050d
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java
@@ -0,0 +1,39 @@
+package com.ydw.bat.wkflow.business_main.datas.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessModelHis;
+
+import java.util.List;
+
+/**
+ *
+ * 流程模块历史表 服务类
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+public interface IBusProcessModelHisService extends IService {
+
+ BusProcessModelHis modelHisOneUpdStatusById(String id);
+
+ BusProcessModelHis modelHisOneUpdStatus(String pid,String taskId);
+
+ BusProcessModelHis modelHisOneCount(String pid);
+
+ BusProcessModelHis processEditFile(String id);
+
+ BusProcessModelHis modelHisOne(String pid,String taskId);
+
+ BusProcessModelHis saveEditFile(String model);
+
+ List modelHisList(String pid);
+
+ String saveBussModelFile(String pid, String taskId);
+
+ String mergeModelFile(String pid, String taskId,String fileSuffix);
+
+ void saveBussTemplateFile(JSONObject object, String pid);
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java
index ef1a600f..4f4d534e 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.business_main.datas.service;
+import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,4 +18,10 @@ import java.util.List;
public interface IBusProcessNameService extends IService {
List findBusProcessNameForEnd(String prcNum);
+
+ //新查询代办接口 初步测试中
+ List todoTask(TaskCommonQuery taskCommonQuery);
+
+
+ String delDB(List id);
}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java
index d97452f8..96d479ee 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.business_main.datas.service;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.baomidou.mybatisplus.extension.service.IService;
import org.activiti.engine.task.Task;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -28,5 +29,11 @@ public interface IBusProcessNewService extends IService {
List findTaskDetailByTaskIds(List taskIdList);
List findNoExecuteBusProcessNewForEnd(List taskIdList);
+ //子流程 获取 阶段数据 专用 BY yzh
+ List findLastworkPeople(@Param("key")String key, @Param("pId")String pId);
+ List findLastworkPeople2(@Param("key")String key, @Param("pId")String pId);
+
+ List everyDayTenOlock();
+ List everyDayTenOlockSAM();
}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsPrcRelationService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsPrcRelationService.java
new file mode 100644
index 00000000..b3577bec
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsPrcRelationService.java
@@ -0,0 +1,45 @@
+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.EsPrcRelation;
+
+import java.util.List;
+
+public interface IEsPrcRelationService extends IService {
+ /**
+ *
+ * @param esId
+ * @return
+ */
+ List list(String esId);
+
+ /**
+ *
+ * @return
+ */
+ Boolean listJudge(EsPrcRelation esPrcRelation);
+
+ /**
+ *
+ * @param esId
+ * @param prcId
+ * @return
+ */
+ int addEsPrcRelation(String esId, String prcId, String prcIdGk);
+
+ /**
+ *
+ * @param esId
+ * @param prcId
+ * @param oaFlag
+ * @return
+ */
+ int modifyEsPrcRelation(String esId, String prcId, String oaFlag, String prcIdGk);
+
+ /**
+ *
+ * @param esId
+ * @return
+ */
+ int delEsPrcRelation(String esId);
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsTechRelationService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsTechRelationService.java
new file mode 100644
index 00000000..552a01ea
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsTechRelationService.java
@@ -0,0 +1,8 @@
+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.EsTechRelation;
+
+public interface IEsTechRelationService extends IService {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IOaTaskExecService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IOaTaskExecService.java
new file mode 100644
index 00000000..394d3f6c
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IOaTaskExecService.java
@@ -0,0 +1,21 @@
+package com.ydw.bat.wkflow.business_main.datas.service;
+
+import com.ydw.bat.wkflow.business_main.datas.entity.OaTaskExec;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ *
+ * OA 干活任务执行表 服务类
+ *
+ *
+ * @author Super_liu
+ * @since 2021-09-24
+ */
+public interface IOaTaskExecService extends IService {
+
+ Map execTask(String todoId);
+
+ String endTime(String pId);
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ISendTodoLogService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ISendTodoLogService.java
new file mode 100644
index 00000000..46c0fed2
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ISendTodoLogService.java
@@ -0,0 +1,16 @@
+package com.ydw.bat.wkflow.business_main.datas.service;
+
+import com.ydw.bat.wkflow.business_main.datas.entity.SendTodoLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * OA日志表 服务类
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+public interface ISendTodoLogService extends IService {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ITbTaskService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ITbTaskService.java
new file mode 100644
index 00000000..27ba3271
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/ITbTaskService.java
@@ -0,0 +1,16 @@
+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.TbTask;
+
+/**
+ *
+ * 动态定时任务表 服务类
+ *
+ *
+ * @author super_liu
+ * @since 2022-05-27
+ */
+public interface ITbTaskService extends IService {
+
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessEvaluationHisServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessEvaluationHisServiceImpl.java
new file mode 100644
index 00000000..7f32880b
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessEvaluationHisServiceImpl.java
@@ -0,0 +1,130 @@
+package com.ydw.bat.wkflow.business_main.datas.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
+import com.ydw.bat.wkflow.business_main.datas.entity.ResponseMessage;
+import com.ydw.bat.wkflow.business_main.datas.entity.UserVO;
+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 com.ydw.bat.wkflow.util.Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * 流程评分历史表 服务实现类
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Service
+public class BusProcessEvaluationHisServiceImpl extends ServiceImpl implements IBusProcessEvaluationHisService {
+
+ @Autowired
+ private LawsUserInfoService lawsUserInfoService;
+
+ @Override
+ public BusProcessEvaluationHis evaluationHisListByOne(String pid,String taskInfo){
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.eq("P_ID",pid);
+ wrapper.like("TASK_INFO",taskInfo);
+ wrapper.orderByDesc("CREATE_TIME","TASK_INFO");
+ List list = this.baseMapper.selectList(wrapper);
+ BusProcessEvaluationHis his = new BusProcessEvaluationHis();
+ if(!list.isEmpty()){
+ his = list.get(0);
+ }
+ return his;
+ }
+
+ @Override
+ public Map evaluationHisListRepSum(String pid){
+ Map map = new HashMap<>();
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.eq("P_ID",pid);
+ wrapper.orderByDesc("CREATE_TIME","TASK_INFO");
+ List list = this.baseMapper.selectList(wrapper);
+ List evaluationHis = new ArrayList<>();
+ Map> listMap = new TreeMap<>();
+
+ // 按 相同数据分组
+ listMap = list.stream().collect(
+ Collectors.groupingBy(a -> Utils.format("{0}#{1}#{2}", a.getPId(),a.getTaskInfo(),a.getUserId())));
+
+ if(!listMap.isEmpty()){
+ listMap.forEach((key, value) -> {
+ if(!value.isEmpty()){
+ evaluationHis.add(value.get(0));
+ }
+ });
+ }
+
+ Map> listMapFilter = new TreeMap<>();
+ listMapFilter = evaluationHis.stream().collect(
+ Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo())));
+ if(!listMapFilter.isEmpty()){
+ listMapFilter.forEach((key, value) -> {
+ if(!value.isEmpty()){
+ int sum = 0;
+ for (BusProcessEvaluationHis his : value) {
+ List valueArr = JSONArray.parseArray(his.getMesg(),JSONObject.class);
+ if(!valueArr.isEmpty()){
+ sum = sum + Integer.parseInt(valueArr.get(0).getString("sum").trim());
+ }
+ }
+ String keyV = value.get(0).getTaskInfo();
+ int ave = value.size();
+ map.put(keyV,sum/ave);
+ }
+ });
+ }
+ return map;
+ }
+
+ @Override
+ public List evaluationHisListRep(String pid){
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.eq("P_ID",pid);
+ wrapper.orderByDesc("CREATE_TIME","TASK_INFO");
+ List list = this.baseMapper.selectList(wrapper);
+ List evaluationHis = new ArrayList<>();
+ Map> listMap = new TreeMap<>();
+
+ // 按 相同数据分组
+ listMap = list.stream().collect(
+ Collectors.groupingBy(a -> Utils.format("{0}#{1}#{2}", a.getPId(),a.getTaskInfo(),a.getUserId())));
+
+ if(!listMap.isEmpty()){
+ listMap.forEach((key, value) -> {
+ if(!value.isEmpty()){
+ ResponseMessage byId = lawsUserInfoService.getById(value.get(0).getUserId());
+ value.get(0).setUserName(byId == null ? "" : byId.getData().getUname());
+ evaluationHis.add(value.get(0));
+ }
+ });
+ }
+
+ if(!evaluationHis.isEmpty()){
+ evaluationHis.sort(Comparator.comparing(BusProcessEvaluationHis::getCreateTime).reversed().thenComparing(BusProcessEvaluationHis::getTaskInfo));
+ }
+ return evaluationHis;
+ }
+
+ @Override
+ public List evaluationHisList(String pid){
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.eq("P_ID",pid);
+ wrapper.orderByDesc("CREATE_TIME","TASK_INFO");
+ return this.baseMapper.selectList(wrapper);
+ }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java
new file mode 100644
index 00000000..200e9d04
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java
@@ -0,0 +1,259 @@
+package com.ydw.bat.wkflow.business_main.datas.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+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.entity.BusProcessModelHis;
+import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessEvaluationHisMapper;
+import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessModelHisMapper;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessModelHisService;
+import com.ydw.bat.wkflow.listener.bussLibrary.Utils.PoiUtil;
+import com.ydw.bat.wkflow.listener.bussLibrary.Utils.PoiWord;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ *
+ * 流程模块历史表 服务实现类
+ *
+ *
+ * @author super_liu
+ * @since 2021-09-17
+ */
+@Service
+public class BusProcessModelHisServiceImpl extends ServiceImpl implements IBusProcessModelHisService {
+
+ private static final Logger logger = LoggerFactory.getLogger(BusProcessModelHisServiceImpl.class);
+
+
+ @Value("${buss.edit.file.path}")
+ private String filePath;//文件存储路径
+
+ /**
+ * 文件下载路径
+ */
+ @Value("${buss.down.file.path}")
+ private String downloadUrl;
+
+ @Override
+ public BusProcessModelHis saveEditFile(String model){
+ BusProcessModelHis modelHis = new BusProcessModelHis();
+ try {
+
+ String preUuid2 = UUID.randomUUID().toString();
+ String changUuid = preUuid2.substring(0,8);
+ String taskId = "task_"+changUuid;
+ String topId = "top_"+changUuid;
+
+ StringBuilder builderModel=new StringBuilder();
+ builderModel.append("model").append("/");
+ builderModel.append("model").append("/");
+
+
+ File dir = new File(filePath+builderModel.toString());
+ if (!dir.exists()) {
+ dir.mkdirs();
+ }
+ String sourcePath = builderModel.toString()+model+".docx";
+
+ StringBuilder builder=new StringBuilder();
+ builder.append("model").append("/");
+ builder.append(taskId).append("/");
+
+ File file = new File(filePath+builder.toString());
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+
+ String targetPath = builder.toString()+taskId+"_"+topId+"_node.docx";
+
+ File sourceFile = new File(filePath+sourcePath);
+ File targetFile = new File(filePath+targetPath);
+ FileUtils.copyFile(sourceFile, targetFile);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+ modelHis.setTaskId(taskId);
+ modelHis.setPId(topId);
+ modelHis.setEditFilePath(targetPath);
+ modelHis.setCreateTime(sdf.format(new Date()));
+ modelHis.setUpdateTime(sdf.format(new Date()));
+ this.baseMapper.insert(modelHis);
+ }catch (Exception e){
+ logger.error(e.getMessage());
+ }
+ return modelHis;
+ }
+
+ @Override
+ public String mergeModelFile(String pid, String taskId,String fileSuffix){
+
+ String fileSavePath = "bussEdit"+ getUUIDPath(pid,taskId);
+
+ StringBuilder builder=new StringBuilder();
+ builder.append(filePath);
+ builder.append("buss").append("/");
+ builder.append(pid).append("/");
+ String saveFileUrl = builder.toString();
+ String modelPath = saveFileUrl+"model.docx";
+
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.eq("P_ID",pid);
+ wrapper.eq("EDIT_TYPE","node");
+ List