Skip to content

A
apps-collaboration
Commit 8a8e7b7c authored by chenfeng's avatar chenfeng
Browse files
Options

增加流程暂停状态

parent 8b960103
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 11 deletions
src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java
View file @ 8a8e7b7c
......@@ -2383,10 +2383,10 @@ public class CollaborationController extends BaseController {
try {
Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
if(!(Boolean) respnose.get("success")){
colManager.updateColSummaryGeneralStateBySource(code,4);
colManager.updateColSummaryGeneralStateBySource(code,5);
}
} catch(Exception e){
colManager.updateColSummaryGeneralStateBySource(code,4);
colManager.updateColSummaryGeneralStateBySource(code,5);
}
}
// 判断是外部调用下单的流程
......@@ -2562,10 +2562,10 @@ public class CollaborationController extends BaseController {
// restTemplate.getMessageConverters().add(new StringHttpMessageConverter(Charset.forName("utf-8")));
Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
if(!(Boolean) respnose.get("success")){
colManager.updateColSummaryGeneralStateBySource(code,4);
colManager.updateColSummaryGeneralStateBySource(code,5);
}
} catch(Exception e){
colManager.updateColSummaryGeneralStateBySource(code,4);
colManager.updateColSummaryGeneralStateBySource(code,5);
}
}
......@@ -2792,10 +2792,10 @@ public class CollaborationController extends BaseController {
try {
Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
if(!(Boolean) respnose.get("success")){
colManager.updateColSummaryGeneralStateBySource(code,5);
colManager.updateColSummaryGeneralStateBySource(code,6);
}
} catch(Exception e){
colManager.updateColSummaryGeneralStateBySource(code,5);
colManager.updateColSummaryGeneralStateBySource(code,6);
}
} else if (null != ctpTemplate.getTempleteNumber() && "XDLC".equals(ctpTemplate.getTempleteNumber())){
String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ;
......@@ -2809,10 +2809,10 @@ public class CollaborationController extends BaseController {
try {
Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
if(!(Boolean) respnose.get("success")){
colManager.updateColSummaryGeneralStateBySource(code,5);
colManager.updateColSummaryGeneralStateBySource(code,6);
}
} catch(Exception e){
colManager.updateColSummaryGeneralStateBySource(code,5);
colManager.updateColSummaryGeneralStateBySource(code,6);
}
}
}
......
src/main/java/com/seeyon/apps/timer/FalseDoTimer.java
View file @ 8a8e7b7c
......@@ -74,14 +74,15 @@ public class FalseDoTimer {
Timer timer = new Timer();
timer.schedule(new TimerTask() {
public void run() {
//System.out.println("定时器启动");
RestTemplate restTemplate = new RestTemplate();
ColSummary summary = null;
List<ColSummary> data = null;
Map<String, Object> respnose=new HashMap<>();
try {
List<Integer> genneral = new ArrayList<>();
genneral.add(4);
genneral.add(5);
genneral.add(6);
data = colManager.getFalseData(genneral);
for (ColSummary coldata : data) {
......@@ -93,7 +94,7 @@ public class FalseDoTimer {
//校稿流程
if ("JGLC".equals(ctpTemplate.getTempleteNumber())) {
if (oastate == 4) {
if (oastate == 5) {
String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ;
InputStream in = new BufferedInputStream(new FileInputStream(filePath));
Properties p = new Properties();
......@@ -109,7 +110,7 @@ public class FalseDoTimer {
} else if (oastate == 5) { //终止流程
} else if (oastate == 6) { //终止流程
String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ;
InputStream in = new BufferedInputStream(new FileInputStream(filePath));
Properties p = new Properties();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment