|
|
@@ -105,13 +105,19 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
|
|
|
/**
|
|
|
* 一览
|
|
|
- * @param page 分页
|
|
|
+ *
|
|
|
+ * @param page
|
|
|
+ * 分页
|
|
|
* @param model
|
|
|
* @param request
|
|
|
- * @param xmmc 项目信息
|
|
|
- * @param szdid 所在地ID
|
|
|
- * @param szgkid 所在港口ID
|
|
|
- * @param szgqid 所在港区ID
|
|
|
+ * @param xmmc
|
|
|
+ * 项目信息
|
|
|
+ * @param szdid
|
|
|
+ * 所在地ID
|
|
|
+ * @param szgkid
|
|
|
+ * 所在港口ID
|
|
|
+ * @param szgqid
|
|
|
+ * 所在港区ID
|
|
|
* @param menuid
|
|
|
* @param dqzt
|
|
|
* @param xmfr
|
|
|
@@ -131,36 +137,26 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
if (StringUtils.isNotEmpty(xmmc)) {
|
|
|
list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmmc + "%"));
|
|
|
} else if (isGET(request)) {
|
|
|
- // list.add(cb.like(root.get("xmmc").as(String.class), "%" +
|
|
|
- // SearchCondition.jsxmmc + "%"));
|
|
|
CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "xmmc");
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(xmfr)) {
|
|
|
list.add(cb.like(root.get("xmfr").as(String.class), "%" + xmfr + "%"));
|
|
|
} else if (isGET(request)) {
|
|
|
- // list.add(cb.like(root.get("xmfr").as(String.class), "%" +
|
|
|
- // SearchCondition.jsxmfr + "%"));
|
|
|
CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "xmfr");
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(szdid)) {
|
|
|
list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
|
|
|
} else if (isGET(request)) {
|
|
|
- // list.add(cb.like(root.get("szd").get("id").as(String.class),
|
|
|
- // "%" + SearchCondition.jsszd + "%"));
|
|
|
CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szd", "szdid");
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(szgkid)) {
|
|
|
list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
|
|
|
} else if (isGET(request)) {
|
|
|
- // list.add(cb.like(root.get("szgk").get("id").as(String.class),
|
|
|
- // "%" + SearchCondition.jsszgk + "%"));
|
|
|
CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgk", "szgkid");
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(szgqid)) {
|
|
|
list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
|
|
|
} else if (isGET(request)) {
|
|
|
- // list.add(cb.like(root.get("szgq").get("id").as(String.class),
|
|
|
- // "%" + SearchCondition.jsszgq + "%"));
|
|
|
CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgq", "szgqid");
|
|
|
}
|
|
|
Subquery<TaskInfoEntity> subquery = query.subquery(TaskInfoEntity.class);
|
|
|
@@ -256,6 +252,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
}
|
|
|
page.setSort("id");
|
|
|
page.setOrder("desc");
|
|
|
+ page.setPage(3);
|
|
|
Page<XmxxglEntity> list = query.findAll(spec, toPageRequest(page), XmxxglEntity.class);
|
|
|
|
|
|
List<XmxxglVo> voList = new ArrayList<XmxxglVo>();
|
|
|
@@ -329,6 +326,9 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
isjyr = "1";
|
|
|
} else {
|
|
|
isjyr = "0";
|
|
|
+ if ("admin".equals(securityMgr.getCurrUser().getUname())) {
|
|
|
+ isjyr = "2";
|
|
|
+ }
|
|
|
}
|
|
|
model.addAttribute("isjyr", isjyr);
|
|
|
model.addAttribute("list", voList);
|
|
|
@@ -346,7 +346,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return "gkjsgl/jsjdgl/jsjdglmain";
|
|
|
}
|
|
|
|
|
|
- //保存附件
|
|
|
+ // 保存附件
|
|
|
@RequestMapping(value = "/savefj")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult savefj(Model model, JsjdfjEntity fjzd) {
|
|
|
@@ -365,7 +365,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //同步省级数据
|
|
|
+ // 同步省级数据
|
|
|
@RequestMapping(value = "/saveTbzt")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult saveTbzt(Model model, String id, String spflag) {
|
|
|
@@ -396,7 +396,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //保存数据
|
|
|
+ // 保存数据
|
|
|
@RequestMapping(value = "/save")
|
|
|
@RequiresPermissions("jsjdgl:add")
|
|
|
@ResponseBody
|
|
|
@@ -610,7 +610,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //编辑数据
|
|
|
+ // 编辑数据
|
|
|
@RequestMapping(value = "/edit")
|
|
|
@RequiresPermissions("jsjdgl:edit")
|
|
|
public String edit(Model model, String id, String flag, String fhbz, String path, String type) {
|
|
|
@@ -728,12 +728,17 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
sfjyr = "1";
|
|
|
model.addAttribute("sfjyr", sfjyr);
|
|
|
} else {
|
|
|
- model.addAttribute("sfjyr", "");
|
|
|
+
|
|
|
+ if ("admin".equals(securityMgr.getCurrUser().getUname())) {
|
|
|
+ model.addAttribute("sfjyr", "2");
|
|
|
+ } else {
|
|
|
+ model.addAttribute("sfjyr", "");
|
|
|
+ }
|
|
|
}
|
|
|
return "gkjsgl/jsjdgl/jsjdgledit";
|
|
|
}
|
|
|
|
|
|
- //流程历史
|
|
|
+ // 流程历史
|
|
|
public void Tasklist(Model model, List<TaskInfoEntity> list, String id) {
|
|
|
if (list != null & list.size() > 0) {
|
|
|
TaskInfoEntity taskinfo = list.get(0);
|
|
|
@@ -805,7 +810,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //查看
|
|
|
+ // 查看
|
|
|
@RequestMapping(value = "/view")
|
|
|
@RequiresPermissions("jsjdgl:main")
|
|
|
public String view(Model model, String id, String flag, String fhbz, String menuid) {
|
|
|
@@ -994,7 +999,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //其他附件
|
|
|
+ // 其他附件
|
|
|
public void qtfjgtview(Model model, List<AccessoryEntity> acclist, String opflag) {
|
|
|
SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
List<JsjdfjVo> fjvolist = new ArrayList<JsjdfjVo>();
|
|
|
@@ -1022,14 +1027,14 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
|
|
|
}
|
|
|
|
|
|
- //新增
|
|
|
+ // 新增
|
|
|
@RequestMapping(value = "/add")
|
|
|
@RequiresPermissions("jsjdgl:add")
|
|
|
public String add(Model model) {
|
|
|
return "gkjsgl/jsjdgl/jsjdgladd";
|
|
|
}
|
|
|
|
|
|
- //保存附件
|
|
|
+ // 保存附件
|
|
|
@RequestMapping(value = "/saveFile")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult saveFile(String ssid, MultipartFile filename, Model model) {
|
|
|
@@ -1044,7 +1049,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //删除附件
|
|
|
+ // 删除附件
|
|
|
@RequestMapping(value = "/delFjzd")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult delFjzd(String id, Model model) {
|
|
|
@@ -1115,7 +1120,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //选择项目
|
|
|
+ // 选择项目
|
|
|
@RequestMapping(value = "/choose")
|
|
|
public String choose(Model model, String id) {
|
|
|
XmxxglEntity entity = xmxxglService.findOne(id);
|
|
|
@@ -1183,7 +1188,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return "gkjsgl/jsjdgl/jsjdgladd";
|
|
|
}
|
|
|
|
|
|
- //获取泊位信息
|
|
|
+ // 获取泊位信息
|
|
|
public void getbwlist(Model model, String bwids) {
|
|
|
if (!StringUtils.isEmpty(bwids)) {
|
|
|
List<BwVo> slist = new ArrayList<BwVo>();
|
|
|
@@ -1253,7 +1258,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //提交信息
|
|
|
+ // 提交信息
|
|
|
@RequestMapping(value = "/submit")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult submit(Model model, XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, String qtfjzdids, String qtfjids, String delid11, String zyhbwflid) {
|
|
|
@@ -1417,6 +1422,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
|
|
|
/**
|
|
|
* 审核流程
|
|
|
+ *
|
|
|
* @param code
|
|
|
* @param spflag
|
|
|
* @param fjzdids
|
|
|
@@ -1465,7 +1471,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
*/
|
|
|
@RequestMapping(value = "/audit")
|
|
|
@ResponseBody
|
|
|
- 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 delid83, String delid84, String delid85, String opflag, String sfjyr, String zyhbwflid) {
|
|
|
+ public WebJsonResult audit(XmxxglEntity code, String sfjyr, 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 delid83, String delid84, String delid85, String opflag, String zyhbwflid) {
|
|
|
try {
|
|
|
shyj = URLDecoder.decode(shyj, "UTF-8");
|
|
|
} catch (UnsupportedEncodingException e1) {
|
|
|
@@ -1660,22 +1666,25 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
wr.setMessage("操作失败!");
|
|
|
return wr;
|
|
|
}
|
|
|
- try {
|
|
|
- if (xmxxgl.getXmlx().getId().equals("2202")) {
|
|
|
- if (xmxxgljggzService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), code.getId()) != null) {
|
|
|
- xmxxgljggzService.claim(code.getId(), SecUtils.getCurrUser().getId().toString());
|
|
|
- }
|
|
|
- xmxxgljggzService.changeAudit(shyj, xmxxgl, flag);
|
|
|
- } else {
|
|
|
- if (xmxxglService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), code.getId()) != null) {
|
|
|
- xmxxglService.claim(code.getId(), SecUtils.getCurrUser().getId().toString());
|
|
|
+ if (!"2".equals(sfjyr)) {
|
|
|
+ try {
|
|
|
+ if (xmxxgl.getXmlx().getId().equals("2202")) {
|
|
|
+ if (xmxxgljggzService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), code.getId()) != null) {
|
|
|
+ xmxxgljggzService.claim(code.getId(), SecUtils.getCurrUser().getId().toString());
|
|
|
+ }
|
|
|
+ xmxxgljggzService.changeAudit(shyj, xmxxgl, flag);
|
|
|
+ } else {
|
|
|
+ if (xmxxglService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), code.getId()) != null) {
|
|
|
+ xmxxglService.claim(code.getId(), SecUtils.getCurrUser().getId().toString());
|
|
|
+ }
|
|
|
+ xmxxglService.changeAudit(shyj, xmxxgl, flag);
|
|
|
}
|
|
|
- xmxxglService.changeAudit(shyj, xmxxgl, flag);
|
|
|
+
|
|
|
+ } catch (Exception e) {
|
|
|
+ wr.setSuccess(false);
|
|
|
+ wr.setMessage("操作失败！");
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
- } catch (Exception e) {
|
|
|
- wr.setSuccess(false);
|
|
|
- wr.setMessage("操作失败！");
|
|
|
- e.printStackTrace();
|
|
|
}
|
|
|
return wr;
|
|
|
}
|
|
|
@@ -1913,7 +1922,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //编辑
|
|
|
+ // 编辑
|
|
|
@RequestMapping(value = "/xiugai")
|
|
|
public String xiugai(Model model, String id) {
|
|
|
// 附件
|
|
|
@@ -1992,7 +2001,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return "gkjsgl/jsjdgl/jsjdglxiugai";
|
|
|
}
|
|
|
|
|
|
- //保存其他附件
|
|
|
+ // 保存其他附件
|
|
|
@RequestMapping(value = "/saveQtfj")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult saveQtfj(String opflag, MultipartFile qtfilename, Model model) {
|
|
|
@@ -2009,7 +2018,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //新增其他附件
|
|
|
+ // 新增其他附件
|
|
|
@RequestMapping(value = "/xinzengqtfj")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult xinzengqtfj(String opflag, String qtfjid, String id, Model model, String qtfbdw, Date qtfbsj, String qtwjh) {
|
|
|
@@ -2066,7 +2075,7 @@ public class JsjdglCtl extends BaseWebCtl {
|
|
|
return jsjd;
|
|
|
}
|
|
|
|
|
|
- //显示其他附件
|
|
|
+ // 显示其他附件
|
|
|
@RequestMapping(value = "/showqtfj")
|
|
|
@ResponseBody
|
|
|
public List<JsjdfjVo> showqtfj(String id, String opflag, Model model) {
|
ld_xuhx