|
|
@@ -6,7 +6,6 @@ import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.UUID;
|
|
|
|
|
|
import javax.persistence.criteria.CriteriaBuilder;
|
|
|
import javax.persistence.criteria.CriteriaQuery;
|
|
|
@@ -38,7 +37,6 @@ import com.xt.jygl.common.GlobalData;
|
|
|
import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
|
|
|
import com.xt.jygl.gkjcxx.gk.service.GkService;
|
|
|
import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
|
|
|
-import com.xt.jygl.gkjsgl.jsjdcbsj.client.JsjdcbsjWebService;
|
|
|
import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
|
|
|
import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjfjEntity;
|
|
|
import com.xt.jygl.gkjsgl.jsjdcbsj.service.JsjdcbsjService;
|
|
|
@@ -428,9 +426,9 @@ public class JsjdcbsjCtl extends BaseWebCtl {
|
|
|
code.setAxspjb(axspjbdx);
|
|
|
}
|
|
|
jsjdcbsjService.submit(code);
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
+ // rtx提醒
|
|
|
+ rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计申请待办事务，请及时处理！");
|
|
|
} catch (Exception e) {
|
|
|
wr.setSuccess(false);
|
|
|
wr.setMessage("操作失败！");
|
|
|
@@ -518,6 +516,8 @@ public class JsjdcbsjCtl extends BaseWebCtl {
|
|
|
jsjdcbsjService.claim(jsjdcbsj.getId(), SecUtils.getCurrUser().getId().toString());
|
|
|
}
|
|
|
jsjdcbsjService.changeAudit(null, jsjdcbsj, true, null);
|
|
|
+ // rtx提醒
|
|
|
+ rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计申请待办事务，请及时处理！");
|
|
|
} catch (Exception e) {
|
|
|
wr.setSuccess(false);
|
|
|
wr.setMessage("操作失败！");
|
|
|
@@ -634,8 +634,8 @@ public class JsjdcbsjCtl extends BaseWebCtl {
|
|
|
}
|
|
|
jsjdcbsj = jsjdcbsjService.save(jsjdcbsj);
|
|
|
} else {
|
|
|
- //String id = UUID.randomUUID().toString().replaceAll("-", "");
|
|
|
- //code.setId(id);
|
|
|
+ // String id = UUID.randomUUID().toString().replaceAll("-", "");
|
|
|
+ // code.setId(id);
|
|
|
if (!StringUtils.isEmpty(ssjyrid)) {
|
|
|
GkjyrEntity jyr = new GkjyrEntity();
|
|
|
jyr.setId(ssjyrid);
|
|
|
@@ -681,20 +681,16 @@ public class JsjdcbsjCtl extends BaseWebCtl {
|
|
|
jsjdcbsj = jsjdcbsjService.save(code);
|
|
|
}
|
|
|
// 如果是市级新增或者修改，保存后同步到省级
|
|
|
- try {
|
|
|
-
|
|
|
- if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
|
|
|
-
|
|
|
- JsjdcbsjWebService webService = jsjdcbsjService.getWebService(null);
|
|
|
-
|
|
|
-
|
|
|
- webService.saveJsjdcbsj(jsjdcbsj, null, null);
|
|
|
- jsjdcbsj.setTbzt("Y");
|
|
|
- jsjdcbsjService.save(jsjdcbsj);
|
|
|
- }
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
+ /*
|
|
|
+ * try {
|
|
|
+ *
|
|
|
+ * if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
|
|
|
+ * JsjdcbsjWebService webService =
|
|
|
+ * jsjdcbsjService.getWebService(null);
|
|
|
+ * webService.saveJsjdcbsj(jsjdcbsj, null, null);
|
|
|
+ * jsjdcbsj.setTbzt("Y"); jsjdcbsjService.save(jsjdcbsj); } } catch
|
|
|
+ * (Exception e) { e.printStackTrace(); }
|
|
|
+ */
|
|
|
} catch (Exception e) {
|
|
|
wr.setSuccess(false);
|
|
|
wr.setMessage("操作失败！");
|
|
|
@@ -883,6 +879,41 @@ public class JsjdcbsjCtl extends BaseWebCtl {
|
|
|
public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids) {
|
|
|
WebJsonResult wr = success();
|
|
|
JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
|
|
|
+ String role = "";
|
|
|
+ try {
|
|
|
+
|
|
|
+ List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
|
|
|
+ if (list != null & list.size() > 0) {
|
|
|
+ TaskInfoEntity taskinfo = list.get(0);
|
|
|
+ if ("ldbl".equals(taskinfo.getTaskKey())) {
|
|
|
+ role = Constants.ROLE_FGLD;
|
|
|
+ } else if ("fgldbl".equals(taskinfo.getTaskKey())) {
|
|
|
+ role = Constants.ROLE_KS;
|
|
|
+ } else if ("ksbl".equals(taskinfo.getTaskKey())) {
|
|
|
+ role = Constants.ROLE_JBR;
|
|
|
+ } else if ("jbrbl".equals(taskinfo.getTaskKey())) {
|
|
|
+
|
|
|
+ } else if ("kscs".equals(taskinfo.getTaskKey())) {
|
|
|
+ role = Constants.ROLE_FGLD;
|
|
|
+ } else if ("fgldcs".equals(taskinfo.getTaskKey())) {
|
|
|
+ role = Constants.ROLE_LD;
|
|
|
+ } else if ("ldcs".equals(taskinfo.getTaskKey())) {
|
|
|
+ role = Constants.ROLE_ZJPS;
|
|
|
+ } else if ("zjps".equals(taskinfo.getTaskKey())) {
|
|
|
+
|
|
|
+ } else if ("cnxk".equals(taskinfo.getTaskKey())) {
|
|
|
+ role = Constants.ROLE_FGLD;
|
|
|
+ } else if ("fgldsh".equals(taskinfo.getTaskKey())) {
|
|
|
+ role = Constants.ROLE_LD;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ } catch (Exception e) {
|
|
|
+ wr.setSuccess(false);
|
|
|
+ wr.setMessage("操作失败！");
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+
|
|
|
if (!StringUtils.isEmpty(accid)) {
|
|
|
// 关联附件
|
|
|
String[] ssids = accid.split(",");
|
|
|
@@ -908,23 +939,25 @@ public class JsjdcbsjCtl extends BaseWebCtl {
|
|
|
}
|
|
|
entity = jsjdcbsjService.save(entity);
|
|
|
// 如果是省级审核通过或不通过后同步到市级
|
|
|
- try {
|
|
|
- JsjdcbsjWebService webService = jsjdcbsjService.getWebService(null);
|
|
|
- List<JsjdcbsjfjEntity> fjlist = jsjdcbsjfjService.findBySsid(id);
|
|
|
- List<AccessoryEntity> lists= new ArrayList<AccessoryEntity>();
|
|
|
- if (fjlist != null && fjlist.size() > 0) {
|
|
|
- for(JsjdcbsjfjEntity fj:fjlist){
|
|
|
- AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
|
|
|
- if(acc != null){
|
|
|
- lists.add(acc);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- webService.saveJsjdcbsj(entity,fjlist,lists);
|
|
|
- entity.setTbzt("Y");
|
|
|
- jsjdcbsjService.save(entity);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
+ /*
|
|
|
+ * try { JsjdcbsjWebService webService =
|
|
|
+ * jsjdcbsjService.getWebService(null); List<JsjdcbsjfjEntity>
|
|
|
+ * fjlist = jsjdcbsjfjService.findBySsid(id);
|
|
|
+ * List<AccessoryEntity> lists = new
|
|
|
+ * ArrayList<AccessoryEntity>(); if (fjlist != null &&
|
|
|
+ * fjlist.size() > 0) { for (JsjdcbsjfjEntity fj : fjlist) {
|
|
|
+ * AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
|
|
|
+ * if (acc != null) { lists.add(acc); } } }
|
|
|
+ * webService.saveJsjdcbsj(entity, fjlist, lists);
|
|
|
+ * entity.setTbzt("Y"); jsjdcbsjService.save(entity); } catch
|
|
|
+ * (Exception e) { e.printStackTrace(); }
|
|
|
+ */
|
|
|
+ } else {
|
|
|
+ // rtx提醒
|
|
|
+ if (!StringUtils.isEmpty(userids)) {
|
|
|
+ rtxSend(userids, "", "你有一条建设进度初步设计申请待办事务，请及时处理！");
|
|
|
+ } else {
|
|
|
+ rtxSend("", role, "你有一条建设进度初步设计申请待办事务，请及时处理！");
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|
ld_xuhx