|
@@ -85,22 +85,31 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
|
|
|
/**
|
|
|
* 一览
|
|
|
- * @param page 分页
|
|
|
+ *
|
|
|
+ * @param page
|
|
|
+ * 分页
|
|
|
* @param model
|
|
|
- * @param lczt 流程状态
|
|
|
- * @param szdid 所在地ID
|
|
|
- * @param szgkid 所在港口ID
|
|
|
- * @param szgqid 所在港区ID
|
|
|
- * @param gkjyr 经营人
|
|
|
- * @param fddbr 法定代表人
|
|
|
- * @param bgdd 办公地址
|
|
|
+ * @param lczt
|
|
|
+ * 流程状态
|
|
|
+ * @param szdid
|
|
|
+ * 所在地ID
|
|
|
+ * @param szgkid
|
|
|
+ * 所在港口ID
|
|
|
+ * @param szgqid
|
|
|
+ * 所在港区ID
|
|
|
+ * @param gkjyr
|
|
|
+ * 经营人
|
|
|
+ * @param fddbr
|
|
|
+ * 法定代表人
|
|
|
+ * @param bgdd
|
|
|
+ * 办公地址
|
|
|
* @param menuid
|
|
|
* @return
|
|
|
* @throws JsonProcessingException
|
|
|
*/
|
|
|
@RequestMapping(value = "/main")
|
|
|
@RequiresPermissions("lhsq:main")
|
|
|
- public String main(SimplePageRequest page,final HttpServletRequest request, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
|
|
|
+ public String main(SimplePageRequest page, final HttpServletRequest request, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
|
|
|
UserEntity user = securityMgr.getCurrUser();
|
|
|
GkjyrEntity jyr = new GkjyrEntity();
|
|
|
if (!StringUtils.isEmpty(user.getSsjyr())) {
|
|
@@ -223,9 +232,9 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
|
|
|
}
|
|
|
model.addAttribute("lczt", lczt);
|
|
|
- model.addAttribute("gkjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr"));
|
|
|
- model.addAttribute("fddbr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr"));
|
|
|
- model.addAttribute("bgdd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd"));
|
|
|
+ model.addAttribute("gkjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr"));
|
|
|
+ model.addAttribute("fddbr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr"));
|
|
|
+ model.addAttribute("bgdd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd"));
|
|
|
model.addAttribute("list", voList);
|
|
|
model.addAttribute("menuid", menuid);
|
|
|
// 翻页共通
|
|
@@ -278,7 +287,9 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
// 编辑
|
|
|
@RequestMapping(value = "/edit")
|
|
|
@RequiresPermissions("lhsq:edit")
|
|
|
- public String edit(Model model, String id, String flag) {
|
|
|
+ public String edit(Model model, String id, String flag, String path, String type) {
|
|
|
+ model.addAttribute("path", path);
|
|
|
+ model.addAttribute("type", type);
|
|
|
model.addAttribute("flag", flag);
|
|
|
LhsqEntity lhsq = lhsqService.findOne(id);
|
|
|
model.addAttribute("record", lhsq);
|
|
@@ -316,7 +327,9 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
|
|
|
// 查看
|
|
|
@RequestMapping(value = "/view")
|
|
|
- public String view(Model model, String id, String flag) {
|
|
|
+ public String view(Model model, String id, String flag, String path, String type) {
|
|
|
+ model.addAttribute("path", path);
|
|
|
+ model.addAttribute("type", type);
|
|
|
model.addAttribute("flag", flag);
|
|
|
LhsqEntity lhsq = lhsqService.findOne(id);
|
|
|
model.addAttribute("record", lhsq);
|
|
@@ -326,7 +339,7 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
model.addAttribute("fjlist", list);
|
|
|
for (LhsqfjEntity fj : list) {
|
|
|
AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
|
|
|
- if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
|
|
|
+ if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
|
|
|
try {
|
|
|
Ftp f = getftp();
|
|
|
// 本地目录
|
|
@@ -640,7 +653,7 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //同步 到省级
|
|
|
+ // 同步 到省级
|
|
|
@RequestMapping(value = "/saveTbzt")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult saveTbzt(Model model, String id) {
|
|
@@ -739,6 +752,7 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
|
|
|
/**
|
|
|
* 退回提交
|
|
|
+ *
|
|
|
* @param code
|
|
|
* @param accid
|
|
|
* @param userids
|
|
@@ -797,9 +811,13 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
|
|
|
/**
|
|
|
* 审核流程
|
|
|
- * @param shyj 审核意见
|
|
|
- * @param id 主键ID
|
|
|
- * @param flag 同意true 不同意 false
|
|
|
+ *
|
|
|
+ * @param shyj
|
|
|
+ * 审核意见
|
|
|
+ * @param id
|
|
|
+ * 主键ID
|
|
|
+ * @param flag
|
|
|
+ * 同意true 不同意 false
|
|
|
* @param userids
|
|
|
* @return
|
|
|
*/
|
|
@@ -831,7 +849,7 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
|
|
|
// 许可证信息
|
|
|
GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());
|
|
|
- if(jyr != null){
|
|
|
+ if (jyr != null) {
|
|
|
XkzxxEntity xkz = new XkzxxEntity();
|
|
|
xkz.setGkjyr(jyr.getId());
|
|
|
// xkz.setZyqyfw(jyfwstr2);
|
|
@@ -860,7 +878,7 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
code = securityMgr.codeService().findOne(code.getPid());
|
|
|
}
|
|
|
szd = szd + "港经证";
|
|
|
-
|
|
|
+
|
|
|
xkz.setGkjyxkzh("");
|
|
|
xkz.setFzrq(new Date());
|
|
|
xkz.setYxqq(new Date());
|
|
@@ -876,9 +894,9 @@ public class LhsqCtl extends BaseWebCtl {
|
|
|
xkz.setOpid(entity.getId());
|
|
|
xkz = xkzxxService.save(xkz);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
- //退回地市,同步
|
|
|
+ // 退回地市,同步
|
|
|
if (!flag) {
|
|
|
entity.setSftb(Constants.YES);
|
|
|
entity = lhsqService.save(entity);
|