|
|
@@ -88,135 +88,186 @@ public class BwCtl extends BaseWebCtl {
|
|
|
*/
|
|
|
@RequestMapping(value = "/main")
|
|
|
@RequiresPermissions("bwxx:main")
|
|
|
- public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String ssjyr, final String szdid, final String szgkid, final String szgqid, final String bwmc, final String menuid, final String wxpbwid, final String bwsxid, final String fwlxid,final String sfdwkfid,final String bwbwyt) throws JsonProcessingException {
|
|
|
- final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"bwxx");
|
|
|
+ public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String ssjyr, final String ssmt, final String szdid, final String szgkid, final String szgqid, final String bwmc, final String menuid, final String wxpbwid, final String bwsxid, final String fwlxid, final String sfdwkfid, final String bwbwyt, final String bz) throws JsonProcessingException {
|
|
|
+ final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "bwxx");
|
|
|
final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
-
|
|
|
+
|
|
|
// 查詢條件
|
|
|
Specification<BwEntity> spec = new Specification<BwEntity>() {
|
|
|
|
|
|
@Override
|
|
|
public Predicate toPredicate(Root<BwEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
|
|
|
List<Predicate> list = new ArrayList<Predicate>();
|
|
|
+ //标志位，判断查询条件
|
|
|
+ String flag = bz;
|
|
|
+ if (flag != null) {
|
|
|
|
|
|
- if (StringUtils.isNotEmpty(szdid)) {
|
|
|
- list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
|
|
|
- } else if(isGET(request)){
|
|
|
- String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
|
|
|
- if(StringUtils.isNotEmpty(v)){
|
|
|
- list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
|
|
|
+// if (StringUtils.isNotEmpty(ssjyr)) {
|
|
|
+// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
|
|
|
+// } else if (isGET(request)) {
|
|
|
+// String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssjyr");
|
|
|
+// if (StringUtils.isNotEmpty(v)) {
|
|
|
+// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));
|
|
|
+// }
|
|
|
+// }
|
|
|
+ if (cacheSCmap != null) {
|
|
|
+ cacheSCmap.remove("ssjyr");
|
|
|
}
|
|
|
- }
|
|
|
-// else if (StringUtils.isNotEmpty(SearchCondition.bwszd) && isGET(request)) {
|
|
|
-// list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.bwszd + "%"));
|
|
|
-// }
|
|
|
- if (StringUtils.isNotEmpty(szgkid)) {
|
|
|
- list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
|
|
|
- } else if(isGET(request)){
|
|
|
- String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
|
|
|
- if(StringUtils.isNotEmpty(v)){
|
|
|
- list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ if (StringUtils.isNotEmpty(ssmt)) {
|
|
|
+ list.add(cb.like(root.get("ssmt").get("id").as(String.class), "%" + ssmt + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssmt");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("ssmt").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-// else if (StringUtils.isNotEmpty(SearchCondition.bwszgk) && isGET(request)) {
|
|
|
-// list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.bwszgk + "%"));
|
|
|
-// }
|
|
|
- if (StringUtils.isNotEmpty(szgqid)) {
|
|
|
- list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
|
|
|
- }else if(isGET(request)){
|
|
|
- String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
|
|
|
- if(StringUtils.isNotEmpty(v)){
|
|
|
- list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
|
|
|
+
|
|
|
+
|
|
|
+ } else {
|
|
|
+ //清除ssmt的缓存数据
|
|
|
+ if (cacheSCmap != null) {
|
|
|
+ cacheSCmap.remove("ssmt");
|
|
|
+
|
|
|
}
|
|
|
- }
|
|
|
-// else if (StringUtils.isNotEmpty(SearchCondition.bwszgq) && isGET(request)) {
|
|
|
-// list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.bwszgq + "%"));
|
|
|
-// }
|
|
|
- if (StringUtils.isNotEmpty(ssjyr)) {
|
|
|
- list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
|
|
|
- }else if(isGET(request)){
|
|
|
- String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssjyr");
|
|
|
- if(StringUtils.isNotEmpty(v)){
|
|
|
- list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));
|
|
|
+ if (StringUtils.isNotEmpty(szdid)) {
|
|
|
+ list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-// else if (StringUtils.isNotEmpty(SearchCondition.bwssjyr) && isGET(request)) {
|
|
|
-// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + SearchCondition.bwssjyr + "%"));
|
|
|
-// }
|
|
|
- if (StringUtils.isNotEmpty(bwmc)) {
|
|
|
- list.add(cb.like(root.get("bwmc").as(String.class), "%" + bwmc + "%"));
|
|
|
- }else if(isGET(request)){
|
|
|
- String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwmc");
|
|
|
- if(StringUtils.isNotEmpty(v)){
|
|
|
- list.add(cb.like(root.get("bwmc").as(String.class), "%" +v + "%"));
|
|
|
+ // else if (StringUtils.isNotEmpty(SearchCondition.bwszd) &&
|
|
|
+ // isGET(request)) {
|
|
|
+ // list.add(cb.like(root.get("szd").get("id").as(String.class),
|
|
|
+ // "%" + SearchCondition.bwszd + "%"));
|
|
|
+ // }
|
|
|
+ if (StringUtils.isNotEmpty(szgkid)) {
|
|
|
+ list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-// else if (StringUtils.isNotEmpty(SearchCondition.bwmc) && isGET(request)) {
|
|
|
-// list.add(cb.like(root.get("bwmc").as(String.class), "%" + SearchCondition.bwmc + "%"));
|
|
|
-// }
|
|
|
- if (StringUtils.isNotEmpty(wxpbwid)) {
|
|
|
- list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + wxpbwid + "%"));
|
|
|
- }else if(isGET(request)){
|
|
|
- String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "wxpbwid");
|
|
|
- if(StringUtils.isNotEmpty(v)){
|
|
|
- list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + v + "%"));
|
|
|
+
|
|
|
+ // else if (StringUtils.isNotEmpty(SearchCondition.bwszgk)
|
|
|
+ // && isGET(request)) {
|
|
|
+ // list.add(cb.like(root.get("szgk").get("id").as(String.class),
|
|
|
+ // "%" + SearchCondition.bwszgk + "%"));
|
|
|
+ // }
|
|
|
+ if (StringUtils.isNotEmpty(szgqid)) {
|
|
|
+ list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-// else if (StringUtils.isNotEmpty(SearchCondition.wxpbw) && isGET(request)) {
|
|
|
-// list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + SearchCondition.wxpbw + "%"));
|
|
|
-// }
|
|
|
- if (StringUtils.isNotEmpty(bwsxid)) {
|
|
|
- list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + bwsxid + "%"));
|
|
|
- } else if(isGET(request)){
|
|
|
- String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwsxid");
|
|
|
- if(StringUtils.isNotEmpty(v)){
|
|
|
- list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ // else if (StringUtils.isNotEmpty(SearchCondition.bwszgq)
|
|
|
+ // && isGET(request)) {
|
|
|
+ // list.add(cb.like(root.get("szgq").get("id").as(String.class),
|
|
|
+ // "%" + SearchCondition.bwszgq + "%"));
|
|
|
+ // }
|
|
|
+ if (StringUtils.isNotEmpty(ssjyr)) {
|
|
|
+ list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssjyr");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-// else if (StringUtils.isNotEmpty(SearchCondition.bwsx) && isGET(request)) {
|
|
|
-// list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + SearchCondition.bwsx + "%"));
|
|
|
-// }
|
|
|
- if (StringUtils.isNotEmpty(fwlxid)) {
|
|
|
- list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + fwlxid + "%"));
|
|
|
- }else if(isGET(request)){
|
|
|
- String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fwlxid");
|
|
|
- if(StringUtils.isNotEmpty(v)){
|
|
|
- list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ // else if (StringUtils.isNotEmpty(SearchCondition.bwssjyr)
|
|
|
+ // && isGET(request)) {
|
|
|
+ // list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class),
|
|
|
+ // "%" + SearchCondition.bwssjyr + "%"));
|
|
|
+ // }
|
|
|
+ if (StringUtils.isNotEmpty(bwmc)) {
|
|
|
+ list.add(cb.like(root.get("bwmc").as(String.class), "%" + bwmc + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwmc");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("bwmc").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-// else if (StringUtils.isNotEmpty(SearchCondition.fwlx) && isGET(request)) {
|
|
|
-// list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + SearchCondition.fwlx + "%"));
|
|
|
-// }
|
|
|
- if (StringUtils.isNotEmpty(sfdwkfid)) {
|
|
|
- list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + sfdwkfid + "%"));
|
|
|
- }else if(isGET(request)){
|
|
|
- String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfdwkfid");
|
|
|
- if(StringUtils.isNotEmpty(v)){
|
|
|
- list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ // else if (StringUtils.isNotEmpty(SearchCondition.bwmc) &&
|
|
|
+ // isGET(request)) {
|
|
|
+ // list.add(cb.like(root.get("bwmc").as(String.class), "%" +
|
|
|
+ // SearchCondition.bwmc + "%"));
|
|
|
+ // }
|
|
|
+ if (StringUtils.isNotEmpty(wxpbwid)) {
|
|
|
+ list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + wxpbwid + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "wxpbwid");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-// else if (StringUtils.isNotEmpty(SearchCondition.sfdwkfbw) && isGET(request)) {
|
|
|
-// list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + SearchCondition.sfdwkfbw + "%"));
|
|
|
-// }
|
|
|
- if (StringUtils.isNotEmpty(bwbwyt)) {
|
|
|
- list.add(cb.like(root.get("bwyt").as(String.class), "%" + bwbwyt + "%"));
|
|
|
- } else if(isGET(request)){
|
|
|
- String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwbwyt");
|
|
|
- if(StringUtils.isNotEmpty(v)){
|
|
|
- list.add(cb.like(root.get("bwyt").as(String.class), "%" + v + "%"));
|
|
|
+ // else if (StringUtils.isNotEmpty(SearchCondition.wxpbw) &&
|
|
|
+ // isGET(request)) {
|
|
|
+ // list.add(cb.like(root.get("wxpbw").get("id").as(String.class),
|
|
|
+ // "%" + SearchCondition.wxpbw + "%"));
|
|
|
+ // }
|
|
|
+ if (StringUtils.isNotEmpty(bwsxid)) {
|
|
|
+ list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + bwsxid + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwsxid");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // else if (StringUtils.isNotEmpty(SearchCondition.bwsx) &&
|
|
|
+ // isGET(request)) {
|
|
|
+ // list.add(cb.like(root.get("bwsx").get("id").as(String.class),
|
|
|
+ // "%" + SearchCondition.bwsx + "%"));
|
|
|
+ // }
|
|
|
+ if (StringUtils.isNotEmpty(fwlxid)) {
|
|
|
+ list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + fwlxid + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fwlxid");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // else if (StringUtils.isNotEmpty(SearchCondition.fwlx) &&
|
|
|
+ // isGET(request)) {
|
|
|
+ // list.add(cb.like(root.get("fwlx").get("id").as(String.class),
|
|
|
+ // "%" + SearchCondition.fwlx + "%"));
|
|
|
+ // }
|
|
|
+ if (StringUtils.isNotEmpty(sfdwkfid)) {
|
|
|
+ list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + sfdwkfid + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfdwkfid");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // else if (StringUtils.isNotEmpty(SearchCondition.sfdwkfbw)
|
|
|
+ // && isGET(request)) {
|
|
|
+ // list.add(cb.like(root.get("sfdwkf").get("id").as(String.class),
|
|
|
+ // "%" + SearchCondition.sfdwkfbw + "%"));
|
|
|
+ // }
|
|
|
+ if (StringUtils.isNotEmpty(bwbwyt)) {
|
|
|
+ list.add(cb.like(root.get("bwyt").as(String.class), "%" + bwbwyt + "%"));
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwbwyt");
|
|
|
+ if (StringUtils.isNotEmpty(v)) {
|
|
|
+ list.add(cb.like(root.get("bwyt").as(String.class), "%" + v + "%"));
|
|
|
+ }
|
|
|
}
|
|
|
+ // else if (StringUtils.isNotEmpty(SearchCondition.bwbwyt)
|
|
|
+ // && isGET(request)) {
|
|
|
+ // list.add(cb.like(root.get("bwyt").as(String.class), "%" +
|
|
|
+ // SearchCondition.bwbwyt + "%"));
|
|
|
+ // }
|
|
|
+ // 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
|
|
|
}
|
|
|
-// else if (StringUtils.isNotEmpty(SearchCondition.bwbwyt) && isGET(request)) {
|
|
|
-// list.add(cb.like(root.get("bwyt").as(String.class), "%" + SearchCondition.bwbwyt + "%"));
|
|
|
-// }
|
|
|
- // 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
|
|
|
if (isJyr()) {
|
|
|
list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
|
|
|
} else {
|
|
|
In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
|
|
|
@SuppressWarnings("unchecked")
|
|
|
- List<String> gqlist = (List<String>) Utils.getSession()
|
|
|
- .getAttribute("gqList");
|
|
|
+ List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
|
|
|
if (gqlist != null && gqlist.size() > 0) {
|
|
|
for (int i = 0; i < gqlist.size(); i++) {
|
|
|
in.value(gqlist.get(i));
|
|
|
@@ -224,7 +275,8 @@ public class BwCtl extends BaseWebCtl {
|
|
|
list.add(in);
|
|
|
}
|
|
|
}
|
|
|
- //状态为0,9,10,11不显示
|
|
|
+
|
|
|
+ // 状态为0,9,10,11不显示
|
|
|
list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
|
|
|
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.RECORE_STATE_BGFLAG));
|
|
|
@@ -233,12 +285,11 @@ public class BwCtl extends BaseWebCtl {
|
|
|
}
|
|
|
};
|
|
|
|
|
|
-
|
|
|
- //判断登录用户是否和上次登录用户相同，若不同则清空查询条件
|
|
|
+ // 判断登录用户是否和上次登录用户相同，若不同则清空查询条件
|
|
|
String user1 = (String) Utils.getSession().getAttribute("user");
|
|
|
String user2 = SecUtils.getCurrUser().getId();
|
|
|
- if(user2!=null){
|
|
|
- if(!user2.equals(user1)){
|
|
|
+ if (user2 != null) {
|
|
|
+ if (!user2.equals(user1)) {
|
|
|
SearchCondition.bwpage = 1;
|
|
|
SearchCondition.bwmc = "";
|
|
|
SearchCondition.bwssjyr = "";
|
|
|
@@ -248,17 +299,17 @@ public class BwCtl extends BaseWebCtl {
|
|
|
SearchCondition.wxpbw = "";
|
|
|
SearchCondition.bwsx = "";
|
|
|
SearchCondition.fwlx = "";
|
|
|
- SearchCondition.sfdwkfbw="";
|
|
|
+ SearchCondition.sfdwkfbw = "";
|
|
|
SearchCondition.bwbwyt = "";
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
Utils.getSession().setAttribute("user", user2);
|
|
|
-
|
|
|
-// if (page.getPage() < 1) {
|
|
|
-// page.setPage(SearchCondition.bwpage);
|
|
|
-// }
|
|
|
+
|
|
|
+ // if (page.getPage() < 1) {
|
|
|
+ // page.setPage(SearchCondition.bwpage);
|
|
|
+ // }
|
|
|
if (page.getPage() < 1) {
|
|
|
Object bwpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwpage");
|
|
|
if (StringUtils.isEmpty(bwpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(bwpage))) {
|
|
|
@@ -322,57 +373,58 @@ public class BwCtl extends BaseWebCtl {
|
|
|
vo.setSclx(entity.getSclx() != null ? entity.getSclx().getId() : "");
|
|
|
vo.setJgxs(entity.getJgxs() != null ? entity.getJgxs().getId() : "");
|
|
|
vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
|
|
|
-
|
|
|
- vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId():"");
|
|
|
- vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc():"");
|
|
|
- vo.setZls(entity.getZls() != null ? entity.getZls().getId():"");
|
|
|
- vo.setZlszw(entity.getZls() != null ? entity.getZls().getText():"");
|
|
|
- vo.setXp(entity.getXp() != null ? entity.getXp().getId():"");
|
|
|
- vo.setXpzw(entity.getXp() != null ? entity.getXp().getText():"");
|
|
|
-
|
|
|
+
|
|
|
+ vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId() : "");
|
|
|
+ vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc() : "");
|
|
|
+ vo.setZls(entity.getZls() != null ? entity.getZls().getId() : "");
|
|
|
+ vo.setZlszw(entity.getZls() != null ? entity.getZls().getText() : "");
|
|
|
+ vo.setXp(entity.getXp() != null ? entity.getXp().getId() : "");
|
|
|
+ vo.setXpzw(entity.getXp() != null ? entity.getXp().getText() : "");
|
|
|
+
|
|
|
voList.add(vo);
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-// if (isPOST(request)) {
|
|
|
-// model.addAttribute("bwmc", bwmc);
|
|
|
-// model.addAttribute("ssjyr", ssjyr);
|
|
|
-// model.addAttribute("szd", szdid);
|
|
|
-// model.addAttribute("szgk", szgkid);
|
|
|
-// model.addAttribute("szgq", szgqid);
|
|
|
-// model.addAttribute("sfwxpbw", wxpbwid);
|
|
|
-// model.addAttribute("bwsx", bwsxid);
|
|
|
-// model.addAttribute("fwlx", fwlxid);
|
|
|
-// model.addAttribute("sfdwkfbw",sfdwkfid);
|
|
|
-// model.addAttribute("bwyt",bwbwyt);
|
|
|
-//
|
|
|
-// SearchCondition.bwpage = page.getPage();
|
|
|
-// SearchCondition.bwmc = bwmc;
|
|
|
-// SearchCondition.bwssjyr = ssjyr;
|
|
|
-// SearchCondition.bwszd = szdid;
|
|
|
-// SearchCondition.bwszgk = szgkid;
|
|
|
-// SearchCondition.bwszgq = szgqid;
|
|
|
-// SearchCondition.wxpbw = wxpbwid;
|
|
|
-// SearchCondition.bwsx = bwsxid;
|
|
|
-// SearchCondition.fwlx = fwlxid;
|
|
|
-// SearchCondition.sfdwkfbw=sfdwkfid;
|
|
|
-// SearchCondition.bwbwyt = bwbwyt;
|
|
|
-//
|
|
|
-// } else {
|
|
|
-// model.addAttribute("bwmc", SearchCondition.bwmc);
|
|
|
-// model.addAttribute("ssjyr", SearchCondition.bwssjyr);
|
|
|
-// model.addAttribute("szd", SearchCondition.bwszd);
|
|
|
-// model.addAttribute("szgk", SearchCondition.bwszgk);
|
|
|
-// model.addAttribute("szgq", SearchCondition.bwszgq);
|
|
|
-// model.addAttribute("sfwxpbw", SearchCondition.wxpbw);
|
|
|
-// model.addAttribute("bwsx", SearchCondition.bwsx);
|
|
|
-// model.addAttribute("fwlx", SearchCondition.fwlx);
|
|
|
-// model.addAttribute("sfdwkfbw",SearchCondition.sfdwkfbw);
|
|
|
-// model.addAttribute("bwyt",SearchCondition.bwbwyt);
|
|
|
-// }
|
|
|
-// model.addAttribute("list", voList);
|
|
|
-// model.addAttribute("menuid", menuid);
|
|
|
+ // if (isPOST(request)) {
|
|
|
+ // model.addAttribute("bwmc", bwmc);
|
|
|
+ // model.addAttribute("ssjyr", ssjyr);
|
|
|
+ // model.addAttribute("szd", szdid);
|
|
|
+ // model.addAttribute("szgk", szgkid);
|
|
|
+ // model.addAttribute("szgq", szgqid);
|
|
|
+ // model.addAttribute("sfwxpbw", wxpbwid);
|
|
|
+ // model.addAttribute("bwsx", bwsxid);
|
|
|
+ // model.addAttribute("fwlx", fwlxid);
|
|
|
+ // model.addAttribute("sfdwkfbw",sfdwkfid);
|
|
|
+ // model.addAttribute("bwyt",bwbwyt);
|
|
|
+ //
|
|
|
+ // SearchCondition.bwpage = page.getPage();
|
|
|
+ // SearchCondition.bwmc = bwmc;
|
|
|
+ // SearchCondition.bwssjyr = ssjyr;
|
|
|
+ // SearchCondition.bwszd = szdid;
|
|
|
+ // SearchCondition.bwszgk = szgkid;
|
|
|
+ // SearchCondition.bwszgq = szgqid;
|
|
|
+ // SearchCondition.wxpbw = wxpbwid;
|
|
|
+ // SearchCondition.bwsx = bwsxid;
|
|
|
+ // SearchCondition.fwlx = fwlxid;
|
|
|
+ // SearchCondition.sfdwkfbw=sfdwkfid;
|
|
|
+ // SearchCondition.bwbwyt = bwbwyt;
|
|
|
+ //
|
|
|
+ // } else {
|
|
|
+ // model.addAttribute("bwmc", SearchCondition.bwmc);
|
|
|
+ // model.addAttribute("ssjyr", SearchCondition.bwssjyr);
|
|
|
+ // model.addAttribute("szd", SearchCondition.bwszd);
|
|
|
+ // model.addAttribute("szgk", SearchCondition.bwszgk);
|
|
|
+ // model.addAttribute("szgq", SearchCondition.bwszgq);
|
|
|
+ // model.addAttribute("sfwxpbw", SearchCondition.wxpbw);
|
|
|
+ // model.addAttribute("bwsx", SearchCondition.bwsx);
|
|
|
+ // model.addAttribute("fwlx", SearchCondition.fwlx);
|
|
|
+ // model.addAttribute("sfdwkfbw",SearchCondition.sfdwkfbw);
|
|
|
+ // model.addAttribute("bwyt",SearchCondition.bwbwyt);
|
|
|
+ // }
|
|
|
+ // model.addAttribute("list", voList);
|
|
|
+ // model.addAttribute("menuid", menuid);
|
|
|
if (isPOST(request)) {
|
|
|
cacheSCmap.put("bwpage", page.getPage());
|
|
|
CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
|
|
|
@@ -383,6 +435,7 @@ public class BwCtl extends BaseWebCtl {
|
|
|
model.addAttribute("list", voList);
|
|
|
model.addAttribute("bwmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwmc"));
|
|
|
model.addAttribute("ssjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssjyr"));
|
|
|
+ model.addAttribute("ssmt", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssmt"));
|
|
|
model.addAttribute("szd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));
|
|
|
model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
|
|
|
model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));
|
|
|
@@ -435,7 +488,7 @@ public class BwCtl extends BaseWebCtl {
|
|
|
@RequestMapping(value = "/save")
|
|
|
@ResponseBody
|
|
|
@RequiresPermissions("bwxx:add")
|
|
|
- public WebJsonResult save(Model model, String path, BwEntity code,String bwszhdid, String szdid, String szgkid, String szgqid, String ssjyrid, String ssmtid, String bwsxid, String fwlxid, String wxpbwid, String zyhbwflid, String sffzid, String sfdwkfid, String bwszsxid, String sclxid, String jgxsid,String sszyqid,String zlsid,String xpid,String kbcblxid) {
|
|
|
+ public WebJsonResult save(Model model, String path, BwEntity code, String bwszhdid, String szdid, String szgkid, String szgqid, String ssjyrid, String ssmtid, String bwsxid, String fwlxid, String wxpbwid, String zyhbwflid, String sffzid, String sfdwkfid, String bwszsxid, String sclxid, String jgxsid, String sszyqid, String zlsid, String xpid, String kbcblxid) {
|
|
|
WebJsonResult wr = success();
|
|
|
if (StringUtils.isEmpty(szdid)) {
|
|
|
wr.setSuccess(false);
|
|
|
@@ -471,16 +524,16 @@ public class BwCtl extends BaseWebCtl {
|
|
|
entity.setBwcd(code.getBwcd());
|
|
|
entity.setBwmc(code.getBwmc());
|
|
|
/* entity.setBwszsx(code.getBwszsx()); */
|
|
|
- if(code.getBwyt()!=null&&code.getBwyt().startsWith(",")){
|
|
|
+ if (code.getBwyt() != null && code.getBwyt().startsWith(",")) {
|
|
|
entity.setBwyt(code.getBwyt().substring(1));
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
entity.setBwyt(code.getBwyt());
|
|
|
}
|
|
|
entity.setHckpnl(code.getHckpnl());
|
|
|
entity.setJd(code.getJd());
|
|
|
entity.setJgysnf(code.getJgysnf());
|
|
|
entity.setJtjgisdyidh(code.getJtjgisdyidh());
|
|
|
- /*entity.setNhwtgnl(code.getNhwtgnl());*/
|
|
|
+ /* entity.setNhwtgnl(code.getNhwtgnl()); */
|
|
|
entity.setNwxhwttl(code.getNwxhwttl());
|
|
|
entity.setQysjsh(code.getQysjsh());
|
|
|
entity.setQysjss(code.getQysjss());
|
|
|
@@ -494,7 +547,7 @@ public class BwCtl extends BaseWebCtl {
|
|
|
entity.setDtsj(code.getDtsj());
|
|
|
entity.setBwdm(code.getBwdm());
|
|
|
/* entity.setSfdwkf(code.getSfdwkf()); */
|
|
|
- /*entity.setNjzxtgnl(code.getNjzxtgnl());*/
|
|
|
+ /* entity.setNjzxtgnl(code.getNjzxtgnl()); */
|
|
|
/* entity.setSclx(code.getSclx()); */
|
|
|
entity.setJgxs(code.getJgxs());
|
|
|
entity.setHcnlxztj(code.getHcnlxztj());
|
|
|
@@ -534,7 +587,6 @@ public class BwCtl extends BaseWebCtl {
|
|
|
MtEntity ssmt = new MtEntity();
|
|
|
ssmt.setId(ssmtid);
|
|
|
entity.setSsmt(ssmt);
|
|
|
-
|
|
|
|
|
|
if (!StringUtils.isEmpty(sffzid)) {
|
|
|
CodeEntity sffz = new CodeEntity(sffzid);
|
|
|
@@ -573,29 +625,30 @@ public class BwCtl extends BaseWebCtl {
|
|
|
CodeEntity jgxs = new CodeEntity(jgxsid);
|
|
|
entity.setJgxs(jgxs);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!StringUtils.isEmpty(sszyqid)) {
|
|
|
ZyqEntity zyq = new ZyqEntity();
|
|
|
zyq.setId(sszyqid);
|
|
|
entity.setSszyq(zyq);
|
|
|
}
|
|
|
- if(!StringUtils.isEmpty(zlsid)){
|
|
|
+ if (!StringUtils.isEmpty(zlsid)) {
|
|
|
CodeEntity zls = new CodeEntity(zlsid);
|
|
|
entity.setZls(zls);
|
|
|
}
|
|
|
- if(!StringUtils.isEmpty(xpid)){
|
|
|
+ if (!StringUtils.isEmpty(xpid)) {
|
|
|
CodeEntity xp = new CodeEntity(xpid);
|
|
|
- entity.setXp(xp);;
|
|
|
+ entity.setXp(xp);
|
|
|
+ ;
|
|
|
}
|
|
|
- if(!StringUtils.isEmpty(bwszhdid)){
|
|
|
- CodeEntity bwszhd= new CodeEntity(bwszhdid);
|
|
|
+ if (!StringUtils.isEmpty(bwszhdid)) {
|
|
|
+ CodeEntity bwszhd = new CodeEntity(bwszhdid);
|
|
|
entity.setBwszhd(bwszhd);
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(kbcblxid)) {
|
|
|
CodeEntity kbcblx = new CodeEntity(kbcblxid);
|
|
|
entity.setKbcblx(kbcblx);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!StringUtils.isEmpty(path) && path.indexOf("bg") > 0) {
|
|
|
if (path.indexOf("add") > 0) {
|
|
|
entity.setRecordStatus(BaseEntity.RECORE_STATE_COPY);
|
|
|
@@ -664,22 +717,23 @@ public class BwCtl extends BaseWebCtl {
|
|
|
CodeEntity jgxs = new CodeEntity(jgxsid);
|
|
|
code.setJgxs(jgxs);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!StringUtils.isEmpty(sszyqid)) {
|
|
|
ZyqEntity zyq = new ZyqEntity();
|
|
|
zyq.setId(sszyqid);
|
|
|
code.setSszyq(zyq);
|
|
|
}
|
|
|
- if(!StringUtils.isEmpty(zlsid)){
|
|
|
+ if (!StringUtils.isEmpty(zlsid)) {
|
|
|
CodeEntity zls = new CodeEntity(zlsid);
|
|
|
code.setZls(zls);
|
|
|
}
|
|
|
- if(!StringUtils.isEmpty(xpid)){
|
|
|
+ if (!StringUtils.isEmpty(xpid)) {
|
|
|
CodeEntity xp = new CodeEntity(xpid);
|
|
|
- code.setXp(xp);;
|
|
|
+ code.setXp(xp);
|
|
|
+ ;
|
|
|
}
|
|
|
- if(!StringUtils.isEmpty(bwszhdid)){
|
|
|
- CodeEntity bwszhd= new CodeEntity(bwszhdid);
|
|
|
+ if (!StringUtils.isEmpty(bwszhdid)) {
|
|
|
+ CodeEntity bwszhd = new CodeEntity(bwszhdid);
|
|
|
code.setBwszhd(bwszhd);
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(kbcblxid)) {
|
|
|
@@ -755,28 +809,28 @@ public class BwCtl extends BaseWebCtl {
|
|
|
vo.setBwszsxzw(entity.getBwszsx() != null ? entity.getBwszsx().getText() : "");
|
|
|
vo.setSclxzw(entity.getSclx() != null ? entity.getSclx().getText() : "");
|
|
|
vo.setJgxszw(entity.getJgxs() != null ? entity.getJgxs().getText() : "");
|
|
|
-
|
|
|
- vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId():"");
|
|
|
- vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc():"");
|
|
|
- vo.setZls(entity.getZls() != null ? entity.getZls().getId():"");
|
|
|
- vo.setZlszw(entity.getZls() != null ? entity.getZls().getText():"");
|
|
|
- vo.setXp(entity.getXp() != null ? entity.getXp().getId():"");
|
|
|
- vo.setXpzw(entity.getXp() != null ? entity.getXp().getText():"");
|
|
|
- vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getId():"");
|
|
|
- vo.setKbcblx(entity.getKbcblx()!=null?entity.getKbcblx().getId():"");
|
|
|
+
|
|
|
+ vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId() : "");
|
|
|
+ vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc() : "");
|
|
|
+ vo.setZls(entity.getZls() != null ? entity.getZls().getId() : "");
|
|
|
+ vo.setZlszw(entity.getZls() != null ? entity.getZls().getText() : "");
|
|
|
+ vo.setXp(entity.getXp() != null ? entity.getXp().getId() : "");
|
|
|
+ vo.setXpzw(entity.getXp() != null ? entity.getXp().getText() : "");
|
|
|
+ vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getId() : "");
|
|
|
+ vo.setKbcblx(entity.getKbcblx() != null ? entity.getKbcblx().getId() : "");
|
|
|
if (entity.getBwyt() != null) {
|
|
|
String bwytzw = "";
|
|
|
String[] s = entity.getBwyt().split(",");
|
|
|
for (String string : s) {
|
|
|
- bwytzw += securityMgr.codeService().findOne(string)!=null?securityMgr.codeService().findOne(string).getText():"";
|
|
|
+ bwytzw += securityMgr.codeService().findOne(string) != null ? securityMgr.codeService().findOne(string).getText() : "";
|
|
|
}
|
|
|
vo.setBwytzw(bwytzw);
|
|
|
}
|
|
|
|
|
|
- if(!StringUtils.isEmpty(entity.getSsjyr())){
|
|
|
- model.addAttribute("jyrzyid", entity.getSsjyr().getZyid()!=null? entity.getSsjyr().getZyid():"");
|
|
|
+ if (!StringUtils.isEmpty(entity.getSsjyr())) {
|
|
|
+ model.addAttribute("jyrzyid", entity.getSsjyr().getZyid() != null ? entity.getSsjyr().getZyid() : "");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
|
vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
|
vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
|
@@ -791,12 +845,12 @@ public class BwCtl extends BaseWebCtl {
|
|
|
vo.setBwszsx(entity.getBwszsx() != null ? entity.getBwszsx().getId() : "");
|
|
|
vo.setSclx(entity.getSclx() != null ? entity.getSclx().getId() : "");
|
|
|
vo.setJgxs(entity.getJgxs() != null ? entity.getJgxs().getId() : "");
|
|
|
-
|
|
|
- if(!StringUtils.isEmpty(entity.getSsjyr())){
|
|
|
- model.addAttribute("jyrzyid", entity.getSsjyr().getZyid()!=null? entity.getSsjyr().getZyid():"");
|
|
|
+
|
|
|
+ if (!StringUtils.isEmpty(entity.getSsjyr())) {
|
|
|
+ model.addAttribute("jyrzyid", entity.getSsjyr().getZyid() != null ? entity.getSsjyr().getZyid() : "");
|
|
|
}
|
|
|
-
|
|
|
- if(StringUtils.isEmpty(vo.getZyid())){
|
|
|
+
|
|
|
+ if (StringUtils.isEmpty(vo.getZyid())) {
|
|
|
SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
|
|
|
String zyid = dateTimeFormat.format(new Date());
|
|
|
vo.setZyid(zyid);
|
|
|
@@ -834,15 +888,15 @@ public class BwCtl extends BaseWebCtl {
|
|
|
vo.setSclxzw(entity.getSclx() != null ? entity.getSclx().getText() : "");
|
|
|
vo.setJgxszw(entity.getJgxs() != null ? entity.getJgxs().getText() : "");
|
|
|
vo.setKbcblxzw(entity.getKbcblx() != null ? entity.getKbcblx().getText() : "");
|
|
|
-
|
|
|
- vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId():"");
|
|
|
- vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc():"");
|
|
|
- vo.setZls(entity.getZls() != null ? entity.getZls().getId():"");
|
|
|
- vo.setZlszw(entity.getZls() != null ? entity.getZls().getText():"");
|
|
|
- vo.setXp(entity.getXp() != null ? entity.getXp().getId():"");
|
|
|
- vo.setXpzw(entity.getXp() != null ? entity.getXp().getText():"");
|
|
|
- vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getText():"");
|
|
|
-
|
|
|
+
|
|
|
+ vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId() : "");
|
|
|
+ vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc() : "");
|
|
|
+ vo.setZls(entity.getZls() != null ? entity.getZls().getId() : "");
|
|
|
+ vo.setZlszw(entity.getZls() != null ? entity.getZls().getText() : "");
|
|
|
+ vo.setXp(entity.getXp() != null ? entity.getXp().getId() : "");
|
|
|
+ vo.setXpzw(entity.getXp() != null ? entity.getXp().getText() : "");
|
|
|
+ vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getText() : "");
|
|
|
+
|
|
|
if (entity.getBwyt() != null) {
|
|
|
String bwytzw = "";
|
|
|
String[] s = entity.getBwyt().split(",");
|
|
|
@@ -905,12 +959,12 @@ public class BwCtl extends BaseWebCtl {
|
|
|
model.addAttribute("jyr", getSsjyr() != null ? JSONObject.fromObject(getSsjyr()).toString() : null);
|
|
|
}
|
|
|
model.addAttribute("path", path);
|
|
|
- if(SecUtils.getCurrUser() != null){
|
|
|
+ if (SecUtils.getCurrUser() != null) {
|
|
|
List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
|
|
|
- model.addAttribute("sz",list.size()==1?list.get(0).getId():"");
|
|
|
- if(list.size()==1){
|
|
|
+ model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");
|
|
|
+ if (list.size() == 1) {
|
|
|
List<GkEntity> gklist = gkService.findBySzd(list.get(0).getId());
|
|
|
- model.addAttribute("gk",gklist.size()==1?gklist.get(0).getId():"");
|
|
|
+ model.addAttribute("gk", gklist.size() == 1 ? gklist.get(0).getId() : "");
|
|
|
}
|
|
|
}
|
|
|
SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
|
|
|
@@ -925,14 +979,14 @@ public class BwCtl extends BaseWebCtl {
|
|
|
List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_BWSZHD);
|
|
|
return list;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/selectBwxs")
|
|
|
@ResponseBody
|
|
|
public List<CodeEntity> selectBwxs() {
|
|
|
List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_BWXS);
|
|
|
return list;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/selectSffz")
|
|
|
@ResponseBody
|
|
|
public List<CodeEntity> selectSffz() {
|
|
|
@@ -992,10 +1046,11 @@ public class BwCtl extends BaseWebCtl {
|
|
|
@RequestMapping(value = "/selectZyhbwfl")
|
|
|
@ResponseBody
|
|
|
public List<CodeEntity> selectZyhbwfl(String flag) {
|
|
|
- List<CodeEntity> list =new ArrayList<CodeEntity>();;
|
|
|
- if(!StringUtils.isEmpty(flag)){
|
|
|
- if("1".equals(flag)){
|
|
|
- list= securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_ZYHBWFL);
|
|
|
+ List<CodeEntity> list = new ArrayList<CodeEntity>();
|
|
|
+ ;
|
|
|
+ if (!StringUtils.isEmpty(flag)) {
|
|
|
+ if ("1".equals(flag)) {
|
|
|
+ list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_ZYHBWFL);
|
|
|
return list;
|
|
|
}
|
|
|
}
|
|
|
@@ -1039,21 +1094,21 @@ public class BwCtl extends BaseWebCtl {
|
|
|
List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_MTJGXS);
|
|
|
return list;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/selectZls")
|
|
|
@ResponseBody
|
|
|
public List<CodeEntity> selectZls() {
|
|
|
List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode("BWXSZLS");
|
|
|
return list;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/selectCblx")
|
|
|
@ResponseBody
|
|
|
public List<CodeEntity> selectCblx() {
|
|
|
List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_CBLX);
|
|
|
return list;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/selectXp")
|
|
|
@ResponseBody
|
|
|
public List<CodeEntity> selectXp() {
|
xt_yuanxd