|
|
@@ -57,7 +57,9 @@ import com.xt.jygl.gkjsgl.jsjdgl.vo.XmyjhxxVo;
|
|
|
import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
|
|
|
import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
|
|
|
import com.xt.jygl.gkjsgl.tzjhgl.vo.TzjhglVo;
|
|
|
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;
|
|
|
import com.xt.jygl.gkjsgl.xmxxgl.entity.XmxxglEntity;
|
|
|
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmbwglbService;
|
|
|
import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxglService;
|
|
|
import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxgljggzService;
|
|
|
import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
|
|
|
@@ -93,6 +95,8 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
private XmyjhxxService xmyjhxxService;
|
|
|
@Autowired
|
|
|
private TzjhglService tzjhglService;
|
|
|
+ @Autowired
|
|
|
+ private XmbwglbService xmbwglbService;
|
|
|
|
|
|
@RequestMapping(value = "/main")
|
|
|
@RequiresPermissions("jsjdgl:main")
|
|
|
@@ -345,6 +349,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
WebJsonResult wr = success();
|
|
|
XmxxglEntity entity = xmxxglService.findOne(id);
|
|
|
entity.setSftb(Constants.YES);
|
|
|
+ entity.setFlowstatus("0");
|
|
|
xmxxglService.save(entity);
|
|
|
String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;
|
|
|
if ("2".equals(entity.getFlowstatus())) {
|
|
|
@@ -642,6 +647,21 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
|
|
|
vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
|
|
|
vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
|
|
|
+ if (StringUtils.isNotEmpty(entity.getXmbm())) {
|
|
|
+ String codeid = entity.getXmbm().substring(4, 10);
|
|
|
+ CodeEntity code = securityMgr.codeService().findOne(codeid);
|
|
|
+ model.addAttribute("xzqhname", code.getText());
|
|
|
+ }
|
|
|
+ String bwids = "";
|
|
|
+ List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());
|
|
|
+ if (bwlist != null && bwlist.size() > 0) {
|
|
|
+ model.addAttribute("bwgs", bwlist.size());
|
|
|
+ for (XmbwglbEntity xmbw : bwlist) {
|
|
|
+ bwids = bwids + xmbw.getBwid() + ",";
|
|
|
+ }
|
|
|
+ bwids = bwids.substring(0, bwids.length() - 1);
|
|
|
+ }
|
|
|
+ vo.setBwids(bwids);
|
|
|
model.addAttribute("record", vo);
|
|
|
model.addAttribute("jyr", entity.getJyrid());
|
|
|
|
|
|
@@ -847,6 +867,21 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
}
|
|
|
vo.setBwytzw(bwytzw);
|
|
|
}
|
|
|
+ if (StringUtils.isNotEmpty(entity.getXmbm())) {
|
|
|
+ String codeid = entity.getXmbm().substring(4, 10);
|
|
|
+ CodeEntity code = securityMgr.codeService().findOne(codeid);
|
|
|
+ model.addAttribute("xzqhname", code.getText());
|
|
|
+ }
|
|
|
+ String bwids = "";
|
|
|
+ List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());
|
|
|
+ if (bwlist != null && bwlist.size() > 0) {
|
|
|
+ model.addAttribute("bwgs", bwlist.size());
|
|
|
+ for (XmbwglbEntity xmbw : bwlist) {
|
|
|
+ bwids = bwids + xmbw.getBwid() + ",";
|
|
|
+ }
|
|
|
+ bwids = bwids.substring(0, bwids.length() - 1);
|
|
|
+ }
|
|
|
+ vo.setBwids(bwids);
|
|
|
model.addAttribute("record", vo);
|
|
|
model.addAttribute("menuid", menuid);
|
|
|
// 附件字段
|
|
|
@@ -1096,7 +1131,21 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
}
|
|
|
vo.setBwytzw(bwytzw);
|
|
|
}
|
|
|
-
|
|
|
+ if (StringUtils.isNotEmpty(entity.getXmbm())) {
|
|
|
+ String codeid = entity.getXmbm().substring(4, 10);
|
|
|
+ CodeEntity code = securityMgr.codeService().findOne(codeid);
|
|
|
+ model.addAttribute("xzqhname", code.getText());
|
|
|
+ }
|
|
|
+ String bwids = "";
|
|
|
+ List<XmbwglbEntity> list = xmbwglbService.findByXmid(entity.getId());
|
|
|
+ if (list != null && list.size() > 0) {
|
|
|
+ model.addAttribute("bwgs", list.size());
|
|
|
+ for (XmbwglbEntity xmbw : list) {
|
|
|
+ bwids = bwids + xmbw.getBwid() + ",";
|
|
|
+ }
|
|
|
+ bwids = bwids.substring(0, bwids.length() - 1);
|
|
|
+ }
|
|
|
+ vo.setBwids(bwids);
|
|
|
vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
|
|
|
vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
|
|
|
vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
|
|
|
@@ -1272,7 +1321,8 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
|
|
|
@RequestMapping(value = "/audit")
|
|
|
@ResponseBody
|
|
|
- public WebJsonResult audit(XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, boolean flag, String shyj, String qtfjzdids, String qtfjids, String delid11, String delid21, String delid31, String delid32, String delid33, String delid41, String delid42, String delid51, String delid52, String delid53, String delid54, String delid55, String delid56, String delid61, String delid62, String delid71, String delid72, String delid81, String delid82, String opflag, String sfjyr, String zyhbwflid) {
|
|
|
+ public WebJsonResult audit(XmxxglEntity code,String spflag, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, boolean flag, String shyj, String qtfjzdids, String qtfjids, String delid11, String delid21,
|
|
|
+ String delid31, String delid32, String delid33,String delid34, String delid35, String delid36,String delid37, String delid38, String delid41, String delid42, String delid51, String delid52, String delid53, String delid54, String delid55, String delid56, String delid61, String delid62, String delid71, String delid72, String delid81, String delid82, String opflag, String sfjyr, String zyhbwflid) {
|
|
|
try {
|
|
|
shyj = URLDecoder.decode(shyj, "UTF-8");
|
|
|
} catch (UnsupportedEncodingException e1) {
|
|
|
@@ -1382,6 +1432,26 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
}
|
|
|
+ }else{
|
|
|
+ if("3".equals(spflag)){
|
|
|
+ if(StringUtils.isEmpty(delid34)){
|
|
|
+ wr.setSuccess(false);
|
|
|
+ wr.setMessage("请上传审查会议纪要!");
|
|
|
+ return wr;
|
|
|
+ }else if(StringUtils.isEmpty(delid35)){
|
|
|
+ wr.setSuccess(false);
|
|
|
+ wr.setMessage("请上传专家审查意见!");
|
|
|
+ return wr;
|
|
|
+ }else if(StringUtils.isEmpty(delid36)){
|
|
|
+ wr.setSuccess(false);
|
|
|
+ wr.setMessage("请上传对审查意见的答复!");
|
|
|
+ return wr;
|
|
|
+ }else if(StringUtils.isEmpty(delid38)){
|
|
|
+ wr.setSuccess(false);
|
|
|
+ wr.setMessage("请上传初步设计文件报批稿!");
|
|
|
+ return wr;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
XmxxglEntity xmxxgl = null;
|
|
|
try {
|
|
|
@@ -1962,23 +2032,6 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
|
|
|
list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
|
|
|
}
|
|
|
-
|
|
|
- Subquery<TaskInfoEntity> subquery = query.subquery(TaskInfoEntity.class);
|
|
|
- Root<TaskInfoEntity> dpRoot = subquery.from(TaskInfoEntity.class);
|
|
|
- subquery.select(dpRoot);
|
|
|
- List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
|
|
|
-
|
|
|
- subQueryPredicates.add(cb.equal(root.get("id").as(String.class), dpRoot.get("busId").as(String.class)));
|
|
|
-
|
|
|
-
|
|
|
- subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "施工图设计审批支撑文件审查" + "%"));
|
|
|
- subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "开工备案支撑文件审查" + "%"));
|
|
|
- subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "交工验收" + "%"));
|
|
|
- subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "试运行备案" + "%"));
|
|
|
- subQueryPredicates.add(cb.equal(dpRoot.get("state").as(String.class), "3"));
|
|
|
- subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
|
|
|
- list.add(cb.exists(subquery));
|
|
|
-
|
|
|
list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
|
|
|
list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_COMPLETED));
|
|
|
list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_SUBMIT));
|
ld_xuhx