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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-02-17 20:43:58 +08:00
parent 7d6eb74a7c e57f0a8358
commit 608b8237ea
160 changed files with 409 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+6 -6
View File
@@ -173,12 +173,12 @@ public class TodoTaskController extends BaseAction {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String data = sdf.format(entry.getValue().get(0).get("createTime"));
res.setAcceptTime(data);
//获取新的流程名称
QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
queryWrapper1.eq("P_ID",res.getPrcId());
queryWrapper1.eq("TASK_ID",res.getTaskIds());
BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
res.setPrcName(busProcessNew != null ? (StringUtils.isNotBlank(busProcessNew.getPrcName()) ? busProcessNew.getPrcName() : "") : "" );
// //获取新的流程名称
// QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
// queryWrapper1.eq("P_ID",res.getPrcId());
// queryWrapper1.eq("TASK_ID",res.getTaskIds());
// BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
// res.setPrcName(busProcessNew != null ? (StringUtils.isNotBlank(busProcessNew.getPrcName()) ? busProcessNew.getPrcName() : "") : "" );
todoList.add(res);
}
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java
+68 -3
View File
@@ -53,7 +53,7 @@ public class BusProcessModelHisController {
@ApiOperation(value = "|onlyOffice接收文件")
@PostMapping("/recieveFile")
public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String pid, String taskId){
public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String fileId){
logger.info("**********进入onlyoffice接收文档接口************");
try {
PrintWriter writer = response.getWriter();
@@ -77,6 +77,70 @@ public class BusProcessModelHisController {
logger.info("**********onlyoffice接收文档接口获得结果body************" + body);
int status = (Integer) jsonObj.get("status");
int saved = 0;
if (status == 2 || status == 3)//MustSave, Corrupted
{
String downloadUri = (String) jsonObj.get("url");
try {
logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri);
if (StringUtils.isNotEmpty(downloadUri)) {
StringBuilder builder=new StringBuilder();
builder.append(standEditFilePath);
builder.append(standNo).append("/");
builder.append(fileNm);
String saveFileUrl = builder.toString();
File file = new File(saveFileUrl);
downloadNetFile(downloadUri, file);
// 更新在线编辑当前节点编辑状态
busProcessModelHisService.modelHisOneUpdStatusById(fileId);
}
} catch (Exception ex) {
saved = 1;
logger.info("**********onlyoffice接收文档接口异常************" + ex.getMessage());
logger.error(ex.getMessage(),ex);
}
} else if (status == 4) {
logger.info("**********onlyoffice接收文档接口开始修改文件状态状态4************");
logger.info("**********onlyoffice接收文档接口修改文件状态成功状态4************");
}
logger.info("onlyoffice编辑完成--------------");
writer.write("{\"error\":" + saved + "}");
} catch (IOException e) {
logger.info("**********onlyoffice接收文档接口异常************" + e.getMessage());
logger.error(e.getMessage(),e);
return;
}
}
@ApiOperation(value = "|onlyOffice接收文件")
@PostMapping("/recieveFileBefore")
public void recieveFileBefore(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String pid, String taskId){
logger.info("**********进入onlyoffice接收文档接口************");
try {
PrintWriter writer = response.getWriter();
String body = "";
try {
Scanner scanner = new Scanner(request.getInputStream());
scanner.useDelimiter("\\A");
body = scanner.hasNext() ? scanner.next() : "";
scanner.close();
} catch (Exception ex) {
writer.write("get request.getInputStream error:" + ex.getMessage());
return;
}
if (body.isEmpty()) {
writer.write("empty request.getInputStream");
return;
}
net.sf.json.JSONObject jsonObj = net.sf.json.JSONObject.fromObject(body);
logger.info("**********onlyoffice接收文档接口获得结果body************" + body);
int status = (Integer) jsonObj.get("status");
int saved = 0;
if (status == 2 || status == 3)//MustSave, Corrupted
{
@@ -139,9 +203,10 @@ public class BusProcessModelHisController {
return modelHisOne;
}
@ApiOperation(value = "|model| 传入 模板文档名称（不带后缀）默认 docx")
@GetMapping("/saveEditFile")
public BusProcessModelHis saveEditFile() {
return busProcessModelHisService.saveEditFile();
public BusProcessModelHis saveEditFile(String model) {
return busProcessModelHisService.saveEditFile(model);
}
@GetMapping("/processModelHisOneUpdStatus")
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java
+3 -1
View File
@@ -17,6 +17,8 @@ import java.util.List;
*/
public interface IBusProcessModelHisService extends IService<BusProcessModelHis> {
BusProcessModelHis modelHisOneUpdStatusById(String id);
BusProcessModelHis modelHisOneUpdStatus(String pid,String taskId);
BusProcessModelHis modelHisOneCount(String pid);
@@ -25,7 +27,7 @@ public interface IBusProcessModelHisService extends IService<BusProcessModelHis>
BusProcessModelHis modelHisOne(String pid,String taskId);
BusProcessModelHis saveEditFile();
BusProcessModelHis saveEditFile(String model);
List<BusProcessModelHis> modelHisList(String pid);
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java
+12 -3
View File
@@ -49,7 +49,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
private String downloadUrl;
@Override
public BusProcessModelHis saveEditFile(){
public BusProcessModelHis saveEditFile(String model){
BusProcessModelHis modelHis = new BusProcessModelHis();
try {
@@ -67,7 +67,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
if (!dir.exists()) {
dir.mkdirs();
}
String sourcePath = builderModel.toString()+"model.docx";
String sourcePath = builderModel.toString()+model+".docx";
StringBuilder builder=new StringBuilder();
builder.append("model").append("/");
@@ -78,7 +78,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
file.mkdirs();
}
String targetPath = builder.toString()+taskId+"_"+topId+"node.docx";
String targetPath = builder.toString()+taskId+"_"+topId+"_node.docx";
File sourceFile = new File(filePath+sourcePath);
File targetFile = new File(filePath+targetPath);
@@ -183,6 +183,15 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
return builder.toString();
}
@Override
public BusProcessModelHis modelHisOneUpdStatusById(String id){
BusProcessModelHis modelHis = new BusProcessModelHis();
modelHis.setId(id);
modelHis.setEditStatus("1");
this.baseMapper.updateById(modelHis);
return modelHis;
}
@Override
public BusProcessModelHis modelHisOneUpdStatus(String pid,String taskId){
BusProcessModelHis modelHis = new BusProcessModelHis();
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class JSFAuditAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("15");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class JSFFillinformationAfter implements TaskListener {
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) {
one1.setPrcName("加入标准化协会信息备案-流程结束");
// one1.setPrcName("加入标准化协会信息备案-流程结束");
one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/AdminReviewAfter.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class AdminReviewAfter implements TaskListener {
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/DeptLeaderReviewAfter.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class DeptLeaderReviewAfter implements TaskListener {
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/DistributionAfter.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class DistributionAfter implements TaskListener {
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/FeedBackAfter.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class FeedBackAfter implements TaskListener {
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/MinisterReviewAfter.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class MinisterReviewAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/ReLaunchAfter.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class ReLaunchAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class SubMinisterReviewAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/ViceDirectorAfter.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class ViceDirectorAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class DockingApprovalAfter implements TaskListener {
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("8");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class SelectDockUserAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("8");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java
+1 -1
View File
@@ -104,7 +104,7 @@ public class SelectResponUserAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("8");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java
+1 -2
View File
@@ -50,12 +50,11 @@ public class StartSurveyAfter implements TaskListener {
String standName= object1.getString("standId");
delegateTask.setVariable("number",standName);
String prcName = standName+"-未符合项整改";
String prcName = standName+"-"+object1.getString("standName")+"-未符合项整改";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("8");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentAfter.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class UploadCommentAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("8");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class PRFApproveAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("14");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class PRFEngineerreviewAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("14");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class PRFFillinformationAfter implements TaskListener {
if (one1 != null) {
one1.setPrcType("14");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class PRFReviewdockAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("14");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class PRFUnderengineerAfter implements TaskListener {
if (one1 != null) {
one1.setPrcType("14");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class PCAbafgManagerApproveAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class PCAbzManagerApproveAfter implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java
+1 -1
View File
@@ -226,7 +226,7 @@ public class PCAdlApproveAfter implements TaskListener {
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class PCAffLiableApproveAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java
+1 -1
View File
@@ -169,7 +169,7 @@ public class PCAffLiableDistributeAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class PCAgcManagerApproveAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class PCAgcManagerDeliverAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class PCAjgManagerApproveAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class PCAjgManagerDistributeAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAsumAfter.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class PCAsumAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class RAApproveAfter implements TaskListener {
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) {
one1.setPrcName("外部署名推荐批准-入库流程结束");
// one1.setPrcName("外部署名推荐批准-入库流程结束");
one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class RAAuditAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("16");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class RAModifyInformationAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("16");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class RASignAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("16");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class RAValidationAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("16");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class DirectorVerifyAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("22");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setOverTime(OVERTIME);
one1.setCreatUserName(username);
src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class MemberUploadInfoAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("22");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java
+1 -2
View File
@@ -60,14 +60,13 @@ public class StartSurveyAfter implements TaskListener {
object.put("uniques",uniques);
delegateTask.setVariable("uniqueMark",uniques);
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
delegateTask.setVariable("userName",username);
delegateTask.setVariable("user",user);
delegateTask.setVariable("cid",standName);
String prcName = standName+"-标准征求意见流程-责任部门对接人选择责任人";
String prcName = standName+"-征求意见";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class Step10After implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java
+2 -2
View File
@@ -77,7 +77,7 @@ public class Step1After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -116,7 +116,7 @@ public class Step1After implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人选择责任人");
busProcessNewNext.setTaskInfo("意见反馈");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class Step2After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class Step3After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class Step4After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class Step5After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step6After.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class Step6After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class Step7After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class Step8After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9After.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class Step9After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class DirectorSignAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class DockingApprovalAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class PresidentSignAfter implements TaskListener {
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ResponUserSignAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class SummarySurveyAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class UploadResearchResultAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class ChargeVerifyAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class DirectorChooseAfter implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class EngineerReviseAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setOverTime(OVERTIME);
one1.setCreatUser(user);
one1.setCreatUserName(username);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class LeaderVerifyAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class ManageSignAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class PresidentVerifyAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class WriteMemberInfoAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java
+3 -3
View File
@@ -64,7 +64,7 @@ public class DirectorSignAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -91,7 +91,7 @@ public class DirectorSignAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("工程研究总院院长批准");
busProcessNewNext.setTaskInfo("批准");
busProcessNewNext.setUserId(delegateTask.getVariable("presidentUser", String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
@@ -103,7 +103,7 @@ public class DirectorSignAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setTaskInfo("调研结果处理");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java
+3 -3
View File
@@ -50,7 +50,7 @@ public class DockingApprovalAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -98,7 +98,7 @@ public class DockingApprovalAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setTaskInfo("调研结果处理");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
@@ -110,7 +110,7 @@ public class DockingApprovalAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任人上传调研结果");
busProcessNewNext.setTaskInfo("调研结果反馈");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("responUser",String.class));
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java
+2 -2
View File
@@ -56,7 +56,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -120,7 +120,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setTaskInfo("调研结果处理");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class PresidentSignAfter implements TaskListener {
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+2 -2
View File
@@ -60,7 +60,7 @@ public class ResponUserSignAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -132,7 +132,7 @@ public class ResponUserSignAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setTaskInfo("调研结果处理");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
+3 -6
View File
@@ -53,7 +53,6 @@ public class StartSurveyAfter implements TaskListener {
delegateTask.setVariable("dockUserList",dockUserList);
List<String> userList = new ArrayList<>(dockUserList);
// userList.add(object.getString("dockUser"));
userList.add(object.getString("ministerUser"));
delegateTask.setVariable("userList",userList);
@@ -63,19 +62,17 @@ public class StartSurveyAfter implements TaskListener {
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("startUser");
String username = object.getString("startUserName");
delegateTask.setVariable("startId",user);
delegateTask.setVariable("startName",username);
String standName = object.getString("title");
String standName = object.getString("processName");
delegateTask.setVariable("title",standName);
String prcName = standName+"-标准调研流程";
String prcName = standName;
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
@@ -118,7 +115,7 @@ public class StartSurveyAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人选择责任人");
busProcessNewNext.setTaskInfo("任务分发");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class SummarySurveyAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
+2 -2
View File
@@ -74,7 +74,7 @@ public class UploadResearchResultAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -87,7 +87,7 @@ public class UploadResearchResultAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人审批");
busProcessNewNext.setTaskInfo("调研结果审批");
busProcessNewNext.setUserId(os.getString("dockUser"));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class ProcessStep1After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class ProcessStep2After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class ProcessStep3After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ProcessStep4After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ProcessStep5After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class ProcessStep6After implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java
+14 -41
View File
@@ -43,7 +43,7 @@ public class BussFs2After implements TaskListener{
delegateTask.setVariable("bussFsUser3",object.getString("bussFsUser3"));
nextUserList.add(object.getString("bussFsUser3"));
}else {
throw new ActivitiException("1#2发起人不存在,请配置相关人员");
throw new ActivitiException("1#2标准法规部高级经理不存在,请配置相关人员");
}
@@ -54,7 +54,7 @@ public class BussFs2After implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = "企标复审流程-发起人汇总结果";
String prcName = "企标复审流程-标准法规部高级经理批准";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
@@ -68,16 +68,6 @@ public class BussFs2After implements TaskListener{
busProcessNameService.saveOrUpdate(one1);
}
/**
* 当子任务结束时存储
*/
Integer commentCount=delegateTask.getVariable("commentCount",Integer.class);
if(commentCount==null)commentCount=0;
commentCount++;
delegateTask.setVariable("count",commentCount);
Collection commentUserList=delegateTask.getVariable("bussFsSubList",Collection.class);
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
@@ -90,35 +80,18 @@ public class BussFs2After implements TaskListener{
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(commentCount>=commentUserList.size()){
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}else {
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one2 = busBean.getOne(queryWrapper1);
if (one1 != null) {
one2.setMsgType("clause");
one2.setPId(delegateTask.getProcessInstanceId());
one2.setMesg(object.toJSONString());
one2.setFinishFlag("0");
one2.setTaskInfo(delegateTask.getName());
one2.setPrcName(prcName);
one2.setCommitFlag("0");
one2.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one2);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java
+9 -6
View File
@@ -1,5 +1,8 @@
package com.ydw.bat.wkflow.listener.bussFs;
import com.alibaba.fastjson.JSON;
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.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
@@ -28,17 +31,17 @@ public class BussFs2Before implements TaskListener{
/**
* 汇总企标编写文件列表
*/
// String msg = one1.getMesg();
// JSONObject jsonObject = JSON.parseObject(msg);
// JSONArray fileList=delegateTask.getVariable("fileModelList",JSONArray.class);
// jsonObject.put("fileModelList",fileList);
// one1.setMesg(jsonObject.toJSONString());
String msg = one1.getMesg();
JSONObject jsonObject = JSON.parseObject(msg);
JSONArray fileList=delegateTask.getVariable("fileModelList",JSONArray.class);
jsonObject.put("fileModelList",fileList);
one1.setMesg(jsonObject.toJSONString());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("BussFs2?prcType=buss3");
one1.setLink("bussFs2?prcType=buss3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java
+7 -2
View File
@@ -2,9 +2,11 @@ package com.ydw.bat.wkflow.listener.bussFs;
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.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.entity.EsRevisePlanDTO;
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;
@@ -30,6 +32,7 @@ public class BussFs3After implements TaskListener{
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -49,6 +52,7 @@ public class BussFs3After implements TaskListener{
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String standSort = object.get("standSort") == null ? "" : object.get("standSort").toString();
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
@@ -72,6 +76,7 @@ public class BussFs3After implements TaskListener{
if(StringUtils.isNotBlank(approvalOpinion)){
if ("0".equalsIgnoreCase(approvalOpinion)) {
BussUtils.endFunAll(delegateTask, prcName,busBean, object, "0", busProcessNameService,"buss3");
delegateTask.setVariable("bussFs3Flag", 0);
} else {
if(StringUtils.isNotBlank(object.getString("bussFsUserC2"))) {
BusProcessNew busProcessNew = new BusProcessNew();
@@ -81,8 +86,8 @@ public class BussFs3After implements TaskListener{
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("xdUserId"));
busProcessNew.setPrcName(prcName);
busProcessNew.setUserId(object.getString("bussFsUserC2"));
busProcessNew.setPrcName("企标复审流程-重新发起人汇总结果");
busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class BussFs3Before implements TaskListener{
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("BussFs3?prcType=buss3");
one1.setLink("bussFs3?prcType=buss3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class BussFsC2After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class BussFsC2Before implements TaskListener{
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("BussFsC2?prcType=buss3");
one1.setLink("bussFsC2?prcType=buss3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class BussFsSub1Before implements TaskListener{
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("BussFsSub1?prcType=buss3");
one1.setLink("bussFsSub1?prcType=buss3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java
+24 -9
View File
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.listener.bussFs;
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.BusProcessName;
@@ -54,7 +55,16 @@ public class BussFsSub2After implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = "企标复审流程-复审人选择复审结果";
String prcName = "企标复审流程-发起人汇总结果";
Integer commentCount=delegateTask.getVariable("count",Integer.class);
if(commentCount==null)commentCount=0;
commentCount++;
delegateTask.setVariable("count",commentCount);
Collection commentUserList=delegateTask.getVariable("bussFsSubList",Collection.class);
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
@@ -62,7 +72,9 @@ public class BussFsSub2After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
one1.setPrcName(prcName);
if(commentCount>=commentUserList.size()) {
one1.setPrcName(prcName);
}
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -71,12 +83,13 @@ public class BussFsSub2After implements TaskListener{
/**
* 当子任务结束时存储
*/
Integer commentCount=delegateTask.getVariable("commentCount",Integer.class);
if(commentCount==null)commentCount=0;
commentCount++;
delegateTask.setVariable("count",commentCount);
JSONArray fileList =delegateTask.getVariable("fileModelList", JSONArray.class);
if (fileList==null) {
fileList=new JSONArray();
}
Collection commentUserList=delegateTask.getVariable("bussFsSubList",Collection.class);
fileList.addAll(object.getJSONArray("fileModelList"));
delegateTask.setVariable("fileModelList",fileList);
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
@@ -108,8 +121,10 @@ public class BussFsSub2After implements TaskListener{
}else {
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one2 = busBean.getOne(queryWrapper1);
if (one1 != null) {
queryWrapper.isNotNull("PRC_NAME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
if (!list.isEmpty()) {
BusProcessNew one2 = list.get(0);
one2.setMsgType("clause");
one2.setPId(delegateTask.getProcessInstanceId());
one2.setMesg(object.toJSONString());
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class BussFsSub2Before implements TaskListener{
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("BussFsSub2?prcType=buss3");
one1.setLink("bussFsSub2?prcType=buss3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1After.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class ProcessStep1After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("23");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2After.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class ProcessStep2After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("23");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class ProcessStep1After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("25");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class ProcessStep2After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("25");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class ProcessStep3After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("25");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+1 -1
View File
@@ -149,7 +149,7 @@ public class ProcessStep4After implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("25");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class ProcessStep5After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("25");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);

Some files were not shown because too many files have changed in this diff Show More