|
@@ -269,7 +269,7 @@ public class SssbCtl extends BaseWebCtl {
|
|
@RequestMapping(value = "/save")
|
|
@RequestMapping(value = "/save")
|
|
@RequiresPermissions("sssbxx:add")
|
|
@RequiresPermissions("sssbxx:add")
|
|
@ResponseBody
|
|
@ResponseBody
|
|
- public WebJsonResult save(Model model, String path, SssbEntity code, String szdid, String szgkid, String szgqid, String ssjyrid, String yjflid, String ejflid,String sbszzyqid) {
|
|
|
|
|
|
+ public WebJsonResult save(Model model, String path, SssbEntity code, String szdid, String szgkid, String szgqid, String ssjyrid, String sldwid, String yjflid, String ejflid, String sbszzyqid) {
|
|
// how:如果是新增直接保存,如果更新,先取出数据库中记录,然后更新页面传过来的字段
|
|
// how:如果是新增直接保存,如果更新,先取出数据库中记录,然后更新页面传过来的字段
|
|
// why:这样的话一些在前台无需显示的字段保证不会丢失,同时一个个字段设置有助于bug排查
|
|
// why:这样的话一些在前台无需显示的字段保证不会丢失,同时一个个字段设置有助于bug排查
|
|
WebJsonResult wr = success();
|
|
WebJsonResult wr = success();
|
|
@@ -279,7 +279,7 @@ public class SssbCtl extends BaseWebCtl {
|
|
entity.setSsmc(code.getSsmc());
|
|
entity.setSsmc(code.getSsmc());
|
|
entity.setGgxh(code.getGgxh());
|
|
entity.setGgxh(code.getGgxh());
|
|
entity.setSl(code.getSl());
|
|
entity.setSl(code.getSl());
|
|
- entity.setSldw(code.getSldw());
|
|
|
|
|
|
+// entity.setSldw(code.getSldw());
|
|
/*
|
|
/*
|
|
* entity.setYjfl(code.getYjfl());
|
|
* entity.setYjfl(code.getYjfl());
|
|
* entity.setEjfl(code.getEjfl());
|
|
* entity.setEjfl(code.getEjfl());
|
|
@@ -291,6 +291,10 @@ public class SssbCtl extends BaseWebCtl {
|
|
entity.setBz(code.getBz());
|
|
entity.setBz(code.getBz());
|
|
entity.setBh(code.getBh());
|
|
entity.setBh(code.getBh());
|
|
|
|
|
|
|
|
+ if (!StringUtils.isEmpty(sldwid)) {
|
|
|
|
+ CodeEntity sldw = new CodeEntity(sldwid);
|
|
|
|
+ entity.setSldw(sldw);
|
|
|
|
+ }
|
|
if (!StringUtils.isEmpty(yjflid)) {
|
|
if (!StringUtils.isEmpty(yjflid)) {
|
|
CodeEntity yjfl = new CodeEntity(yjflid);
|
|
CodeEntity yjfl = new CodeEntity(yjflid);
|
|
entity.setYjfl(yjfl);
|
|
entity.setYjfl(yjfl);
|
|
@@ -349,6 +353,10 @@ public class SssbCtl extends BaseWebCtl {
|
|
GqEntity gq = gqService.findOne(szgqid);
|
|
GqEntity gq = gqService.findOne(szgqid);
|
|
code.setSsgkglbm(gq != null ? gq.getSsgkglbm() : null);
|
|
code.setSsgkglbm(gq != null ? gq.getSsgkglbm() : null);
|
|
|
|
|
|
|
|
+ if (!StringUtils.isEmpty(sldwid)) {
|
|
|
|
+ CodeEntity sldw = new CodeEntity(sldwid);
|
|
|
|
+ code.setSldw(sldw);
|
|
|
|
+ }
|
|
if (!StringUtils.isEmpty(yjflid)) {
|
|
if (!StringUtils.isEmpty(yjflid)) {
|
|
CodeEntity yjfl = new CodeEntity(yjflid);
|
|
CodeEntity yjfl = new CodeEntity(yjflid);
|
|
code.setYjfl(yjfl);
|
|
code.setYjfl(yjfl);
|
|
@@ -392,6 +400,132 @@ public class SssbCtl extends BaseWebCtl {
|
|
}
|
|
}
|
|
return wr;
|
|
return wr;
|
|
}
|
|
}
|
|
|
|
+// @RequestMapping(value = "/save")
|
|
|
|
+// @RequiresPermissions("sssbxx:add")
|
|
|
|
+// @ResponseBody
|
|
|
|
+// public WebJsonResult save(Model model, String path, SssbEntity code, String szdid, String szgkid, String szgqid, String ssjyrid, String yjflid, String ejflid,String sbszzyqid) {
|
|
|
|
+// // how:如果是新增直接保存,如果更新,先取出数据库中记录,然后更新页面传过来的字段
|
|
|
|
+// // why:这样的话一些在前台无需显示的字段保证不会丢失,同时一个个字段设置有助于bug排查
|
|
|
|
+// WebJsonResult wr = success();
|
|
|
|
+// try {
|
|
|
|
+// if (!StringUtils.isEmpty(code.getId())) {
|
|
|
|
+// SssbEntity entity = sssbService.findOne(code.getId());
|
|
|
|
+// entity.setSsmc(code.getSsmc());
|
|
|
|
+// entity.setGgxh(code.getGgxh());
|
|
|
|
+// entity.setSl(code.getSl());
|
|
|
|
+// entity.setSldw(code.getSldw());
|
|
|
|
+// /*
|
|
|
|
+// * entity.setYjfl(code.getYjfl());
|
|
|
|
+// * entity.setEjfl(code.getEjfl());
|
|
|
|
+// */
|
|
|
|
+// entity.setCfcs(code.getCfcs());
|
|
|
|
+// entity.setYxq(code.getYxq());
|
|
|
|
+// entity.setTbr(code.getTbr());
|
|
|
|
+// entity.setLxdh(code.getLxdh());
|
|
|
|
+// entity.setBz(code.getBz());
|
|
|
|
+// entity.setBh(code.getBh());
|
|
|
|
+//
|
|
|
|
+// if (!StringUtils.isEmpty(yjflid)) {
|
|
|
|
+// CodeEntity yjfl = new CodeEntity(yjflid);
|
|
|
|
+// entity.setYjfl(yjfl);
|
|
|
|
+// }
|
|
|
|
+// if (!StringUtils.isEmpty(ejflid)) {
|
|
|
|
+// CodeEntity ejfl = new CodeEntity(ejflid);
|
|
|
|
+// entity.setEjfl(ejfl);
|
|
|
|
+// }
|
|
|
|
+// if (!StringUtils.isEmpty(sbszzyqid)) {
|
|
|
|
+// ZyqEntity zyq = new ZyqEntity();
|
|
|
|
+// zyq.setId(sbszzyqid);
|
|
|
|
+// entity.setSzzyq(zyq);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// CodeEntity szd = new CodeEntity(szdid);
|
|
|
|
+// entity.setSzd(szd);
|
|
|
|
+//
|
|
|
|
+// GkEntity szgk = new GkEntity();
|
|
|
|
+// szgk.setId(szgkid);
|
|
|
|
+// entity.setSzgk(szgk);
|
|
|
|
+//
|
|
|
|
+// GqEntity szgq = new GqEntity();
|
|
|
|
+// szgq.setId(szgqid);
|
|
|
|
+// entity.setSzgq(szgq);
|
|
|
|
+//
|
|
|
|
+// GkjyrEntity ssjyr = new GkjyrEntity();
|
|
|
|
+// ssjyr.setId(ssjyrid);
|
|
|
|
+// entity.setSsjyr(ssjyr);
|
|
|
|
+//
|
|
|
|
+// GqEntity gq = gqService.findOne(szgqid);
|
|
|
|
+// entity.setSsgkglbm(gq != null ? gq.getSsgkglbm() : null);
|
|
|
|
+// if (!StringUtils.isEmpty(path) && path.indexOf("bg") > 0) {
|
|
|
|
+// if (path.indexOf("add") > 0) {
|
|
|
|
+// entity.setRecordStatus(BaseEntity.RECORE_STATE_COPY);
|
|
|
|
+// } else {
|
|
|
|
+// entity.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// sssbService.save(entity);
|
|
|
|
+// } else {
|
|
|
|
+// CodeEntity szd = new CodeEntity(szdid);
|
|
|
|
+// code.setSzd(szd);
|
|
|
|
+//
|
|
|
|
+// GkEntity szgk = new GkEntity();
|
|
|
|
+// szgk.setId(szgkid);
|
|
|
|
+// code.setSzgk(szgk);
|
|
|
|
+//
|
|
|
|
+// GqEntity szgq = new GqEntity();
|
|
|
|
+// szgq.setId(szgqid);
|
|
|
|
+// code.setSzgq(szgq);
|
|
|
|
+//
|
|
|
|
+// GkjyrEntity ssjyr = new GkjyrEntity();
|
|
|
|
+// ssjyr.setId(ssjyrid);
|
|
|
|
+// code.setSsjyr(ssjyr);
|
|
|
|
+//
|
|
|
|
+// GqEntity gq = gqService.findOne(szgqid);
|
|
|
|
+// code.setSsgkglbm(gq != null ? gq.getSsgkglbm() : null);
|
|
|
|
+//
|
|
|
|
+// if (!StringUtils.isEmpty(yjflid)) {
|
|
|
|
+// CodeEntity yjfl = new CodeEntity(yjflid);
|
|
|
|
+// code.setYjfl(yjfl);
|
|
|
|
+// }
|
|
|
|
+// if (!StringUtils.isEmpty(ejflid)) {
|
|
|
|
+// CodeEntity ejfl = new CodeEntity(ejflid);
|
|
|
|
+// code.setEjfl(ejfl);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// if (!StringUtils.isEmpty(sbszzyqid)) {
|
|
|
|
+// ZyqEntity zyq = new ZyqEntity();
|
|
|
|
+// zyq.setId(sbszzyqid);
|
|
|
|
+// code.setSzzyq(zyq);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// if (!StringUtils.isEmpty(path) && path.indexOf("bg") > 0) {
|
|
|
|
+// if (path.indexOf("add") > 0) {
|
|
|
|
+// code.setRecordStatus(BaseEntity.RECORE_STATE_COPY);
|
|
|
|
+// } else {
|
|
|
|
+// code.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// sssbService.save(code);
|
|
|
|
+// }
|
|
|
|
+// // 如果是市级新增或者修改,保存后同步到省级
|
|
|
|
+// try {
|
|
|
|
+// if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {
|
|
|
|
+// SssbWebService webService = sssbService.getWebService(null);
|
|
|
|
+// webService.save(code);
|
|
|
|
+// code.setTbzt(Constants.YES);
|
|
|
|
+// sssbService.save(code);
|
|
|
|
+// }
|
|
|
|
+// } catch (Exception e) {
|
|
|
|
+// code.setTbzt(Constants.NO);
|
|
|
|
+// sssbService.save(code);
|
|
|
|
+// }
|
|
|
|
+// } catch (Exception e) {
|
|
|
|
+// wr.setSuccess(false);
|
|
|
|
+// wr.setMessage("操作失败!");
|
|
|
|
+// e.printStackTrace();
|
|
|
|
+// }
|
|
|
|
+// return wr;
|
|
|
|
+// }
|
|
|
|
|
|
@RequestMapping(value = "/edit")
|
|
@RequestMapping(value = "/edit")
|
|
@RequiresPermissions("sssbxx:edit")
|
|
@RequiresPermissions("sssbxx:edit")
|
|
@@ -431,12 +565,14 @@ public class SssbCtl extends BaseWebCtl {
|
|
vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
|
|
vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
|
|
vo.setYjflzw(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
|
|
vo.setYjflzw(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
|
|
vo.setEjflzw(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
|
|
vo.setEjflzw(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
|
|
|
|
+ vo.setSldwzw(entity.getSldw() != null ? entity.getSldw().getText() : "");
|
|
vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
|
|
vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
|
|
vo.setYjfl(entity.getYjfl() != null ? entity.getYjfl().getId() : "");
|
|
vo.setYjfl(entity.getYjfl() != null ? entity.getYjfl().getId() : "");
|
|
vo.setEjfl(entity.getEjfl() != null ? entity.getEjfl().getId() : "");
|
|
vo.setEjfl(entity.getEjfl() != null ? entity.getEjfl().getId() : "");
|
|
|
|
+ vo.setSldw(entity.getSldw() != null ? entity.getSldw().getId() : "");
|
|
vo.setSzzyq(entity.getSzzyq() !=null ? entity.getSzzyq().getId() : "");
|
|
vo.setSzzyq(entity.getSzzyq() !=null ? entity.getSzzyq().getId() : "");
|
|
vo.setSzzyqzw(entity.getSzzyq() !=null ? entity.getSzzyq().getZyqmc() : "");
|
|
vo.setSzzyqzw(entity.getSzzyq() !=null ? entity.getSzzyq().getZyqmc() : "");
|
|
model.addAttribute("record", vo);
|
|
model.addAttribute("record", vo);
|
|
@@ -460,12 +596,14 @@ public class SssbCtl extends BaseWebCtl {
|
|
vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
|
|
vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
|
|
vo.setYjflzw(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
|
|
vo.setYjflzw(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
|
|
vo.setEjflzw(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
|
|
vo.setEjflzw(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
|
|
|
|
+ vo.setSldwzw(entity.getSldw() != null ? entity.getSldw().getText() : "");
|
|
vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
|
|
vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
|
|
vo.setYjfl(entity.getYjfl() != null ? entity.getYjfl().getId() : "");
|
|
vo.setYjfl(entity.getYjfl() != null ? entity.getYjfl().getId() : "");
|
|
vo.setEjfl(entity.getEjfl() != null ? entity.getEjfl().getId() : "");
|
|
vo.setEjfl(entity.getEjfl() != null ? entity.getEjfl().getId() : "");
|
|
|
|
+ vo.setSldw(entity.getSldw() != null ? entity.getSldw().getId() : "");
|
|
vo.setSzzyq(entity.getSzzyq() !=null ? entity.getSzzyq().getId() : "");
|
|
vo.setSzzyq(entity.getSzzyq() !=null ? entity.getSzzyq().getId() : "");
|
|
vo.setSzzyqzw(entity.getSzzyq() !=null ? entity.getSzzyq().getZyqmc() : "");
|
|
vo.setSzzyqzw(entity.getSzzyq() !=null ? entity.getSzzyq().getZyqmc() : "");
|
|
if (null != entity.getYxq()) {
|
|
if (null != entity.getYxq()) {
|
|
@@ -571,6 +709,13 @@ public class SssbCtl extends BaseWebCtl {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @RequestMapping(value = "/selectSldw")
|
|
|
|
+ @ResponseBody
|
|
|
|
+ public List<CodeEntity> selectSldw(Model model) {
|
|
|
|
+ List<CodeEntity> sldwlist = securityMgr.codeService().findValidCodesByGroupCode("SLDW");
|
|
|
|
+ return sldwlist;
|
|
|
|
+ }
|
|
|
|
+
|
|
@RequestMapping(value = "/exportExcelAll")
|
|
@RequestMapping(value = "/exportExcelAll")
|
|
public String exportExcelAll(HttpServletResponse response, final String ssmc, final String szgkid, final String jyr, final String szgqid, final String szdid) {
|
|
public String exportExcelAll(HttpServletResponse response, final String ssmc, final String szgkid, final String jyr, final String szgqid, final String szdid) {
|
|
// 查询条件
|
|
// 查询条件
|
|
@@ -644,6 +789,7 @@ public class SssbCtl extends BaseWebCtl {
|
|
vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
|
|
vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
|
|
vo.setYjflzw(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
|
|
vo.setYjflzw(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
|
|
vo.setEjflzw(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
|
|
vo.setEjflzw(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
|
|
|
|
+ vo.setSldwzw(entity.getSldw() != null ? entity.getSldw().getText() :"");
|
|
vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|