|
@@ -226,27 +226,6 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "sfwhqy", "sfcswhzy");
|
|
|
}
|
|
|
}
|
|
|
- // 是否有许可证
|
|
|
- if (StringUtils.isNotEmpty(sfcyxkz)) {
|
|
|
- if (!sfcyxkz.equals("all")) {
|
|
|
- if (!sfcyxkz.equals("201")) {
|
|
|
- list.add(cb.isNull(root.get("gkjyxkzh").as(String.class)));
|
|
|
- } else {
|
|
|
- list.add(cb.isNotNull(root.get("gkjyxkzh").as(String.class)));
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- } else if (isGET(request)) {
|
|
|
-
|
|
|
- String sfcyxkzval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfcyxkz");
|
|
|
- if (!"all".equals(sfcyxkzval) && StringUtils.isNotEmpty(sfcyxkzval)) {
|
|
|
- if (!"201".equals(sfcyxkzval)) {
|
|
|
- list.add(cb.isNull(root.get("gkjyxkzh").as(String.class)));
|
|
|
- } else {
|
|
|
- list.add(cb.isNotNull(root.get("gkjyxkzh").as(String.class)));
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
Subquery<BwEntity> subquery2 = query.subquery(BwEntity.class);
|
|
|
Root<BwEntity> dpRoot2 = subquery2.from(BwEntity.class);
|
|
@@ -333,18 +312,14 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
String xkzstartDateval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzstartDate");
|
|
|
Date xkzstartDate = null;
|
|
|
if (StringUtils.isNotEmpty(xkzstartDateval) && isGET(request)) {
|
|
|
-
|
|
|
try {
|
|
|
xkzstartDate = sdf.parse(xkzstartDateval);
|
|
|
} catch (ParseException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
-
|
|
|
subQueryPredicates.add(cb.greaterThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), xkzstartDate));
|
|
|
xkzflag = true;
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
if (xkzendDate != null) {
|
|
@@ -354,18 +329,47 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
String xkzendDateval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzendDate");
|
|
|
Date xkzendDate = null;
|
|
|
if (StringUtils.isNotEmpty(xkzendDateval) && isGET(request)) {
|
|
|
-
|
|
|
try {
|
|
|
xkzendDate = sdf.parse(xkzendDateval);
|
|
|
} catch (ParseException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
-
|
|
|
subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), xkzendDate));
|
|
|
xkzflag = true;
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
+ }
|
|
|
+ // 是否有许可证
|
|
|
+ if (StringUtils.isNotEmpty(sfcyxkz)) {
|
|
|
+ if (!sfcyxkz.equals("all")) {
|
|
|
+ if (!sfcyxkz.equals("201")) {
|
|
|
+ subQueryPredicates.add(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)));
|
|
|
+ subQueryPredicates.add(cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
|
|
|
+ subQueryPredicates.add(cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
|
|
|
+ xkzflag = true;
|
|
|
+ } else {
|
|
|
+ // subQueryPredicates.add(cb.or(cb.notEqual(dpRoot.get("gkjyr").as(String.class),
|
|
|
+ // root.get("id").as(String.class)),
|
|
|
+ // cb.and(cb.equal(dpRoot.get("gkjyr").as(String.class),
|
|
|
+ // root.get("id").as(String.class))),
|
|
|
+ // cb.notEqual(dpRoot.get("recordStatus").as(Integer.class),
|
|
|
+ // BaseEntity.RECORD_STATE_VALID)));
|
|
|
+ subQueryPredicates.add(cb.not(cb.and(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)), cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID), cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID))));
|
|
|
+ xkzflag = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if (isGET(request)) {
|
|
|
+ String sfcyxkzval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfcyxkz");
|
|
|
+ if (!"all".equals(sfcyxkzval) && StringUtils.isNotEmpty(sfcyxkzval)) {
|
|
|
+ if (!"201".equals(sfcyxkzval)) {
|
|
|
+ subQueryPredicates.add(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)));
|
|
|
+ subQueryPredicates.add(cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
|
|
|
+ subQueryPredicates.add(cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
|
|
|
+ xkzflag = true;
|
|
|
+ } else {
|
|
|
+ subQueryPredicates.add(cb.not(cb.and(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)), cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID), cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID))));
|
|
|
+ xkzflag = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 许可证是否将到期
|
|
@@ -424,7 +428,6 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
return cb.and(list.toArray(new Predicate[] {}));
|
|
|
}
|
|
|
};
|
|
|
-
|
|
|
|
|
|
if (page.getPage() < 1) {
|
|
|
page.setPage(SearchCondition.jyrpage);
|
|
@@ -455,7 +458,7 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
} else {
|
|
|
vo.setSfred("2");
|
|
|
}
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
vo.setXkzyxq(null);
|
|
|
vo.setXkzyxqfmt(null);
|
|
|
vo.setGkjyxkzh(null);
|
|
@@ -467,10 +470,10 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
}
|
|
|
|
|
|
if (isPOST(request)) {
|
|
|
- SearchCondition.jyrpage=page.getPage();
|
|
|
- //cacheSCmap.put("jyrpage", page.getPage());
|
|
|
+ SearchCondition.jyrpage = page.getPage();
|
|
|
+ // cacheSCmap.put("jyrpage", page.getPage());
|
|
|
CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
|
|
|
- //System.out.println(JSONObject.fromObject(cacheSCmap));
|
|
|
+ // System.out.println(JSONObject.fromObject(cacheSCmap));
|
|
|
}
|
|
|
System.out.println(isPOST(request));
|
|
|
|
|
@@ -491,7 +494,6 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
model.addAttribute("fzendDate", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fzendDate"));
|
|
|
model.addAttribute("xkzstartDate", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzstartDate"));
|
|
|
model.addAttribute("xkzendDate", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzendDate"));
|
|
|
-
|
|
|
|
|
|
// 翻页共通
|
|
|
putPageInfo(model, page, list);
|
|
@@ -798,16 +800,16 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
gkjyrVo.setCgsl(cgEntities.size() + "");
|
|
|
// 储罐总容量
|
|
|
gkjyrVo.setCgzrl(cgzrl + "");
|
|
|
-
|
|
|
- //危货附证
|
|
|
- if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
|
|
|
+
|
|
|
+ // 危货附证
|
|
|
+ if (StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())) {
|
|
|
List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
|
|
|
String wxhwzyfz = "";
|
|
|
- if(list!= null && list.size()>0){
|
|
|
- for(XkzfzEntity entity : list){
|
|
|
- wxhwzyfz = wxhwzyfz + entity.getFzsqh()+",";
|
|
|
+ if (list != null && list.size() > 0) {
|
|
|
+ for (XkzfzEntity entity : list) {
|
|
|
+ wxhwzyfz = wxhwzyfz + entity.getFzsqh() + ",";
|
|
|
}
|
|
|
- wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
|
|
|
+ wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length() - 1);
|
|
|
}
|
|
|
gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
|
|
|
}
|
|
@@ -984,18 +986,18 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
|
|
|
gkjyrVo.setQyxz(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getId() : "");
|
|
|
|
|
|
- if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
|
|
|
+ if (StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())) {
|
|
|
List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
|
|
|
String wxhwzyfz = "";
|
|
|
- if(list!= null && list.size()>0){
|
|
|
- for(XkzfzEntity entity : list){
|
|
|
- wxhwzyfz = wxhwzyfz + entity.getFzsqh()+",";
|
|
|
+ if (list != null && list.size() > 0) {
|
|
|
+ for (XkzfzEntity entity : list) {
|
|
|
+ wxhwzyfz = wxhwzyfz + entity.getFzsqh() + ",";
|
|
|
}
|
|
|
- wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
|
|
|
+ wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length() - 1);
|
|
|
}
|
|
|
gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(gkjyrVo.getZyid())) {
|
|
|
SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
|
|
|
String zyid = dateTimeFormat.format(new Date());
|
|
@@ -1190,15 +1192,15 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
gkjyrVo.setCgsl(cgEntities.size() + "");
|
|
|
// 储罐总容量
|
|
|
gkjyrVo.setCgzrl(cgzrl + "");
|
|
|
- //危货附证
|
|
|
- if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
|
|
|
+ // 危货附证
|
|
|
+ if (StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())) {
|
|
|
List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
|
|
|
String wxhwzyfz = "";
|
|
|
- if(list!= null && list.size()>0){
|
|
|
- for(XkzfzEntity entity : list){
|
|
|
- wxhwzyfz = wxhwzyfz + entity.getFzsqh()+",";
|
|
|
+ if (list != null && list.size() > 0) {
|
|
|
+ for (XkzfzEntity entity : list) {
|
|
|
+ wxhwzyfz = wxhwzyfz + entity.getFzsqh() + ",";
|
|
|
}
|
|
|
- wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
|
|
|
+ wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length() - 1);
|
|
|
}
|
|
|
gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
|
|
|
}
|
|
@@ -1350,20 +1352,20 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
|
|
|
gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
|
|
|
gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
|
|
|
-
|
|
|
- //危货附证
|
|
|
- if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
|
|
|
+
|
|
|
+ // 危货附证
|
|
|
+ if (StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())) {
|
|
|
List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
|
|
|
String wxhwzyfz = "";
|
|
|
- if(list!= null && list.size()>0){
|
|
|
- for(XkzfzEntity entity : list){
|
|
|
- wxhwzyfz = wxhwzyfz + entity.getFzsqh()+",";
|
|
|
+ if (list != null && list.size() > 0) {
|
|
|
+ for (XkzfzEntity entity : list) {
|
|
|
+ wxhwzyfz = wxhwzyfz + entity.getFzsqh() + ",";
|
|
|
}
|
|
|
- wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
|
|
|
+ wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length() - 1);
|
|
|
}
|
|
|
gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
model.addAttribute("gkjyrxx", gkjyrVo);
|
|
|
|
|
|
// 许可证信息
|