FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标准合规评估流程！！！

Browse Source
This commit is contained in:
yuezhihang
2021-10-27 09:21:10 +08:00
parent 1436a42e9d
commit 17197f2c38
14 changed files with 48 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+1 -1
View File
@@ -18,7 +18,7 @@ import java.util.Map;
import java.util.Set;
@Component
@FeignClient(value = "FotonLAWSSystemLeo",path="/api",url="")
@FeignClient(value = "FotonLAWSSystem",path="/api",url="")
@RequestMapping("/")
public interface LawsUserInfoService {
src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java
+8
View File
@@ -47,5 +47,13 @@ public class BusProcessNewController extends BaseAction {
return findtodotask;
}
@ApiOperation(value = "每天十点需要启动 政策课题后续流程")
@GetMapping("/everyDayTenOlock")
public List<BusProcessNew> everyDayTenOlock() {
List<BusProcessNew> findtodotask = iBusProcessNewService.everyDayTenOlock();
return findtodotask;
}
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java
+2
View File
@@ -28,4 +28,6 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
List<BusProcessNew> findLastworkPeople(@Param("key")String key,@Param("pId")String pId);
List<BusProcessNew> everyDayTenOlock();
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java
+2
View File
@@ -32,4 +32,6 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
//子流程 获取 阶段数据 专用 BY yzh
List<BusProcessNew> findLastworkPeople(@Param("key")String key, @Param("pId")String pId);
List<BusProcessNew> everyDayTenOlock();
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+5
View File
@@ -73,4 +73,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
public List<BusProcessNew> findLastworkPeople(String key, String pId) {
return baseMapper.findLastworkPeople(key,pId);
}
@Override
public List<BusProcessNew> everyDayTenOlock() {
return baseMapper.everyDayTenOlock();
}
}
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java
+16 -23
View File
@@ -2,29 +2,22 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
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.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
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.Arrays;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
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.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.Date;
public class RAApproveAfter implements TaskListener {
@Override
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java
-9
View File
@@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
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;
@@ -12,18 +9,12 @@ 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;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
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.Arrays;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class RAAuditAfter implements TaskListener {
@Override
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java
-11
View File
@@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
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;
@@ -12,18 +9,10 @@ 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;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
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.Arrays;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class RAModifyInformationAfter implements TaskListener {
@Override
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java
-9
View File
@@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
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;
@@ -12,18 +9,12 @@ 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;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
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.Arrays;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class RASignAfter implements TaskListener {
@Override
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java
-9
View File
@@ -1,11 +1,7 @@
package com.ydw.bat.wkflow.listener.RecommendedApproval;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
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;
@@ -13,18 +9,13 @@ 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;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
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.Arrays;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class RAValidationAfter implements TaskListener {
@Override
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java
+1 -13
View File
@@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
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;
@@ -12,19 +9,11 @@ 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;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
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.Arrays;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
//外部署名推荐批准
public class RAstartAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
@@ -56,7 +45,6 @@ public class RAstartAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
// delegateTask.setVariable("stId",object.getString("projectNumber"));
String prcName = delegateTask.getVariable("listName", String.class) + "-外部署名推荐批准-署名领导会签";
QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java
+1 -1
View File
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
//政策课题组入会
public class PRGEStartAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
src/main/resources/application.yml
+1 -1
View File
@@ -18,7 +18,7 @@ eureka:
defaultZone: http://62.234.136.153:8761/eureka/
spring:
application:
name: bat-wkflow-leo
name: bat-wkflow
http:
encoding:
charset: UTF-8
src/main/resources/mapper/datas/BusProcessNewMapper.xml
+11
View File
@@ -33,4 +33,15 @@
LEFT JOIN act_hi_taskinst aht ON bpn.TASK_ID = aht.ID_
WHERE bpn.P_ID = #{pId} and aht.TASK_DEF_KEY_ = #{key}
</select>
<select id="everyDayTenOlock" resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew">
SELECT
*
FROM
bus_process_new
WHERE
MESG -> '$.endTime' LIKE CONCAT(
'%',CONCAT(date_sub(DATE_FORMAT(NOW(), '%Y-%m-%d'),interval 1 day),'%'))
</select>
</mapper>