diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 4223c428..07a67b75 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -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 { diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java index 44064b20..e589fd93 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java @@ -47,5 +47,13 @@ public class BusProcessNewController extends BaseAction { return findtodotask; } + @ApiOperation(value = "每天十点需要启动 政策课题后续流程") + @GetMapping("/everyDayTenOlock") + public List everyDayTenOlock() { + List findtodotask = iBusProcessNewService.everyDayTenOlock(); + return findtodotask; + } + + } 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 986f222f..250e500a 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 @@ -28,4 +28,6 @@ public interface BusProcessNewMapper extends BaseMapper { List findLastworkPeople(@Param("key")String key,@Param("pId")String pId); + List everyDayTenOlock(); + } 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 a078b9c2..c699cf84 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 @@ -32,4 +32,6 @@ public interface IBusProcessNewService extends IService { //子流程 获取 阶段数据 专用 BY yzh List findLastworkPeople(@Param("key")String key, @Param("pId")String pId); + List everyDayTenOlock(); + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index 448756e1..85e6da57 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -73,4 +73,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl findLastworkPeople(String key, String pId) { return baseMapper.findLastworkPeople(key,pId); } + + @Override + public List everyDayTenOlock() { + return baseMapper.everyDayTenOlock(); + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java index e3a7a1c1..ba7910f6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java @@ -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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java index 75578a70..24ddab89 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java @@ -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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java index 72420410..2d79823b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java @@ -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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java index f725c571..6c2403c9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java @@ -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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java index afa5b5e5..122e8e0a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java @@ -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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index ad69ddd7..56d0bb54 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -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(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java index b4fbeece..15766599 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java @@ -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) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 59aa9518..e0d2bdf9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -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 diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index 7bb28260..a49542f8 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -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} + + +