|
@@ -44,7 +44,7 @@ public class JsjdcbsjServiceImpl extends BaseWorkFlowServiceImpl<JsjdcbsjEntity,
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public <S extends JsjdcbsjEntity> S submit(S entity) {
|
|
|
+ public <S extends JsjdcbsjEntity> S submit(S entity, String userids) {
|
|
|
if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {
|
|
|
entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
|
|
|
entity = this.save(entity);
|
|
@@ -58,10 +58,14 @@ public class JsjdcbsjServiceImpl extends BaseWorkFlowServiceImpl<JsjdcbsjEntity,
|
|
|
entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
|
|
|
entity = this.save(entity);
|
|
|
Map<String, Object> variables = new HashMap<String, Object>();
|
|
|
- variables.put("role_ld", Constants.ROLE_LD);
|
|
|
- variables.put("role_fgld", Constants.ROLE_FGLD);
|
|
|
- variables.put("role_ks", Constants.ROLE_KS);
|
|
|
- variables.put("role_jbr", Constants.ROLE_JBR);
|
|
|
+ List<String> lists = new ArrayList<String>();
|
|
|
+ if (!StringUtils.isEmpty(userids)) {
|
|
|
+ String[] users = userids.split(",");
|
|
|
+ for (String userid : users) {
|
|
|
+ lists.add(userid);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ variables.put("assigneeList", lists);
|
|
|
WorkFlowParam param = new WorkFlowParam();
|
|
|
param.put(WorkFlowParam.DESCRIPTION, entity.getXmmc() + "的项目建设初步设计");
|
|
|
|
|
@@ -115,10 +119,10 @@ public class JsjdcbsjServiceImpl extends BaseWorkFlowServiceImpl<JsjdcbsjEntity,
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public JsjdcbsjWebService getWebService(String szdId) {
|
|
|
+ public JsjdcbsjWebService getWebService(String szdId) {
|
|
|
URL wsdlLocation;
|
|
|
if (null == szdId && GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
|
|
|
- // 市级取省级的
|
|
|
+ // 市级取省级的8/
|
|
|
wsdlLocation = com.xt.jygl.gkjsgl.jsjdcbsj.client.JsjdcbsjService.getWsdlLocationByIp(GlobalData.WEBSERVICE_IP_MAIN, GlobalData.WEBSERVICE_PORT_MAIN);
|
|
|
} else {// 省级取市级的webservice 根据数据的所在地
|
|
|
// TODO
|
|
@@ -131,4 +135,10 @@ public class JsjdcbsjServiceImpl extends BaseWorkFlowServiceImpl<JsjdcbsjEntity,
|
|
|
return webService;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<JsjdcbsjEntity> findByTbzt() {
|
|
|
+
|
|
|
+ return dao.findByTbzt();
|
|
|
+ }
|
|
|
+
|
|
|
}
|