|
@@ -189,14 +189,14 @@ public class JsjdcbsjCtl extends BaseWebCtl {
|
|
|
vo.setTaskState(Constants.IS_MY_TASK);
|
|
|
}
|
|
|
}
|
|
|
- }else{
|
|
|
- if("1".equals(entity.getFlowstatus())){
|
|
|
+ } else {
|
|
|
+ if ("1".equals(entity.getFlowstatus())) {
|
|
|
vo.setCurrentname("退回地市");
|
|
|
- }else if("2".equals(entity.getFlowstatus())){
|
|
|
+ } else if ("2".equals(entity.getFlowstatus())) {
|
|
|
vo.setCurrentname("完成");
|
|
|
}
|
|
|
}
|
|
|
- }else if(entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED){
|
|
|
+ } else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
|
|
|
vo.setCurrentname("完成");
|
|
|
}
|
|
|
vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
|
|
@@ -223,7 +223,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
|
|
|
} else {
|
|
|
vo.setShowjsjd("N");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
List<TaskInfoEntity> listtask = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
|
|
|
String flag = "";
|
|
|
if (listtask.size() != 0 || entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
|
|
@@ -679,13 +679,14 @@ public class JsjdcbsjCtl extends BaseWebCtl {
|
|
|
}
|
|
|
// 如果是市级新增或者修改,保存后同步到省级
|
|
|
try {
|
|
|
- if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {
|
|
|
+ if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
|
|
|
JsjdcbsjWebService webService = jsjdcbsjService.getWebService(null);
|
|
|
- System.out.print(1111);
|
|
|
-
|
|
|
+ webService.save(jsjdcbsj);
|
|
|
+ jsjdcbsj.setTbzt("Y");
|
|
|
+ jsjdcbsjService.save(jsjdcbsj);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
-
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
wr.setSuccess(false);
|
|
@@ -892,13 +893,22 @@ public class JsjdcbsjCtl extends BaseWebCtl {
|
|
|
}
|
|
|
|
|
|
boolean flowflag = jsjdcbsjService.changeAudit(shyj, entity, flag, userids);
|
|
|
- if(flowflag){
|
|
|
- if(flag){
|
|
|
+ if (flowflag) {
|
|
|
+ if (flag) {// 流程完成状态 2.审核通过1.退回地市
|
|
|
entity.setFlowstatus("2");
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
entity.setFlowstatus("1");
|
|
|
}
|
|
|
- jsjdcbsjService.save(entity);
|
|
|
+ entity = jsjdcbsjService.save(entity);
|
|
|
+ // 如果是省级审核通过或不通过后同步到市级
|
|
|
+ try {
|
|
|
+ JsjdcbsjWebService webService = jsjdcbsjService.getWebService(null);
|
|
|
+ webService.save(entity);
|
|
|
+ entity.setTbzt("Y");
|
|
|
+ jsjdcbsjService.save(entity);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
wr.setSuccess(false);
|