|
|
@@ -168,14 +168,21 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 一览查询
|
|
|
+ *
|
|
|
* @param functionId
|
|
|
* @param pageable
|
|
|
- * @param jyr 企业
|
|
|
- * @param szd 所在地
|
|
|
- * @param gq 港区
|
|
|
- * @param whdj 危货等级
|
|
|
- * @param lcStatus 流程状态
|
|
|
- * @param fddbr 法定代表人
|
|
|
+ * @param jyr
|
|
|
+ * 企业
|
|
|
+ * @param szd
|
|
|
+ * 所在地
|
|
|
+ * @param gq
|
|
|
+ * 港区
|
|
|
+ * @param whdj
|
|
|
+ * 危货等级
|
|
|
+ * @param lcStatus
|
|
|
+ * 流程状态
|
|
|
+ * @param fddbr
|
|
|
+ * 法定代表人
|
|
|
* @return
|
|
|
*/
|
|
|
@Log(Type.QUERY)
|
|
|
@@ -195,8 +202,9 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
BaseEntity.RECORD_STATE_DELETE));
|
|
|
// 根据 申请单位 过滤
|
|
|
if (null != jyr && !"".equals(jyr)) {
|
|
|
- list.add(cb.like(
|
|
|
- root.get("jyrVo").get("gkjyr").as(String.class), "%" + jyr + "%"));
|
|
|
+ list.add(cb
|
|
|
+ .like(root.get("jyrVo").get("gkjyr")
|
|
|
+ .as(String.class), "%" + jyr + "%"));
|
|
|
}
|
|
|
// 根据所在地过滤
|
|
|
if (null != szd) {
|
|
|
@@ -281,9 +289,10 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
}
|
|
|
// 根据 申请单位 过滤
|
|
|
if (!"".equals(param.get(1))) {
|
|
|
- list.add(cb.like(
|
|
|
- root.get("jyrVo").get("gkjyr").as(String.class),
|
|
|
- "%"+param.get(1)+"%"));
|
|
|
+ list.add(cb
|
|
|
+ .like(root.get("jyrVo").get("gkjyr")
|
|
|
+ .as(String.class), "%" + param.get(1)
|
|
|
+ + "%"));
|
|
|
}
|
|
|
// 根据港区过滤
|
|
|
if (!"".equals(param.get(2))) {
|
|
|
@@ -2793,7 +2802,8 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
@Log(Type.QUERY)
|
|
|
public BusinessContext listFzxx(Pageable pageable, final JyrEntity jyr,
|
|
|
final CodeEntity szd, final GqEntity gq, final Date yxrq1,
|
|
|
- final Date yxrq2, final String wxpm) {
|
|
|
+ final Date yxrq2, final String wxpm, final CodeEntity szqy,
|
|
|
+ final CodeEntity zycs) {
|
|
|
try {
|
|
|
Specification<GkwxhwzyfzblFzEntity> spec = new Specification<GkwxhwzyfzblFzEntity>() {
|
|
|
|
|
|
@@ -2814,11 +2824,11 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
.as(String.class)));
|
|
|
}
|
|
|
if (null != szd)
|
|
|
- list.add(cb.like(root.get("jyr").get("szd").get("id")
|
|
|
+ list.add(cb.like(root.get("fzsq").get("szd").get("id")
|
|
|
.as(String.class), szd.getId() + "%"));
|
|
|
if (null != gq)
|
|
|
list.add(cb.equal(
|
|
|
- root.get("jyr").get("szgq").as(GqEntity.class),
|
|
|
+ root.get("fzsq").get("ssgq").as(GqEntity.class),
|
|
|
gq));
|
|
|
if (null != jyr)
|
|
|
list.add(cb.equal(root.get("jyr").as(JyrEntity.class),
|
|
|
@@ -2833,6 +2843,13 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
if (null != wxpm)
|
|
|
list.add(cb.like(root.get("wxhwm").as(String.class),
|
|
|
"%" + wxpm + "%"));
|
|
|
+ if (null != szqy)
|
|
|
+ list.add(cb.equal(
|
|
|
+ root.get("fzsq").get("ssgq").get("gqszsylx")
|
|
|
+ .as(CodeEntity.class), szqy));
|
|
|
+ if (null != zycs)
|
|
|
+ list.add(cb.equal(
|
|
|
+ root.get("zycs").as(CodeEntity.class), zycs));
|
|
|
return cb.and(list.toArray(new Predicate[] {}));
|
|
|
}
|
|
|
};
|
|
|
@@ -2853,12 +2870,12 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
@RequestMapping(value = "jyxkzAndFz", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@RemotingExclude
|
|
|
- public void jyxkzAndFz(String filePath,HttpServletResponse response,
|
|
|
+ public void jyxkzAndFz(String filePath, HttpServletResponse response,
|
|
|
HttpServletRequest request) {
|
|
|
List<CodeEntity> szds = codeService// .findSzdByParent(90011l);
|
|
|
.findSzdByParent(Constants.SZD_ID_PROVINCE);
|
|
|
if (szds != null && szds.size() > 0) {
|
|
|
- System.out.println("szd:" + szds.size() + "个!");
|
|
|
+ System.out.println("szd:" + szds.size() + "个!");
|
|
|
}
|
|
|
for (CodeEntity szd : szds) {
|
|
|
List<PredicateModel> filterList = new ArrayList<PredicateModel>();
|
|
|
@@ -2869,8 +2886,8 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
.searchByPredicateModels(filterList);
|
|
|
List<JyrEntity> jyrList = jyrService.findAll(spec);
|
|
|
if (jyrList != null && jyrList.size() > 0) {
|
|
|
- System.out
|
|
|
- .println(szd.getBz() + "的经营人" + jyrList.size() + "个!");
|
|
|
+ System.out
|
|
|
+ .println(szd.getBz() + "的经营人" + jyrList.size() + "个!");
|
|
|
}
|
|
|
for (JyrEntity jyr : jyrList) {
|
|
|
// 经营许可证扫描件
|
|
|
@@ -2960,4 +2977,92 @@ public class GkwxhwzyfzblhhzController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ public Collection<String[]> printFzxx(final List<String> param)
|
|
|
+ throws ParseException {
|
|
|
+ Collection<GkwxhwzyfzblFzEntity> dataset = null;
|
|
|
+ try {
|
|
|
+ Specification<GkwxhwzyfzblFzEntity> spec = new Specification<GkwxhwzyfzblFzEntity>() {
|
|
|
+ @Override
|
|
|
+ public Predicate toPredicate(Root<GkwxhwzyfzblFzEntity> root,
|
|
|
+ CriteriaQuery<?> query, CriteriaBuilder cb) {
|
|
|
+ List<Predicate> list = new ArrayList<Predicate>();
|
|
|
+ list.add(cb.notEqual(
|
|
|
+ root.get("recordStatus").as(String.class),
|
|
|
+ BaseEntity.RECORD_STATE_DELETE));
|
|
|
+ list.add(cb.isNotNull(root.get("fzsq").as(
|
|
|
+ GkwxhwzyfzblhhzEntity.class)));
|
|
|
+ if (root.get("fzsq") != null) {
|
|
|
+ list.add(cb.equal(root.get("fzsq").get("recordStatus")
|
|
|
+ .as(String.class),
|
|
|
+ BaseEntity.RECORD_STATE_COMPLETED));
|
|
|
+ list.add(cb.isNotNull(root.get("fzsq").get("fzjg")
|
|
|
+ .as(String.class)));
|
|
|
+ }
|
|
|
+ if (null != param.get(0) && !"".equals(param.get(0)))
|
|
|
+ list.add(cb.like(root.get("fzsq").get("szd").get("id")
|
|
|
+ .as(String.class),param.get(0) + "%"));
|
|
|
+ if (null != param.get(1) && !"".equals(param.get(1)))
|
|
|
+ list.add(cb.equal(
|
|
|
+ root.get("fzsq").get("ssgq").get("id").as(Long.class),
|
|
|
+ Long.parseLong( param.get(1))));
|
|
|
+ if (null != param.get(2) && !"".equals(param.get(2)))
|
|
|
+ list.add(cb.equal(root.get("jyr").get("id").as(Long.class),
|
|
|
+ Long.parseLong( param.get(2))));
|
|
|
+ if (null != param.get(3) && !"".equals(param.get(3))) {
|
|
|
+ try {
|
|
|
+ list.add(cb.greaterThanOrEqualTo( root.get("fzsq").get("yxqjssj").as(Date.class), sdf.parse(param.get(3))));
|
|
|
+ } catch (ParseException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (null != param.get(4) && !"".equals(param.get(4))) {
|
|
|
+ try {
|
|
|
+ list.add(cb.lessThan(root.get("fzsq").get("yxqjssj")
|
|
|
+ .as(Date.class), DateUtil.addDate(
|
|
|
+ sdf.parse(param.get(4)), 1)));
|
|
|
+ } catch (ParseException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (null != param.get(5) && !"".equals(param.get(5)))
|
|
|
+ list.add(cb.like(root.get("wxhwm").as(String.class),
|
|
|
+ "%" + param.get(5) + "%"));
|
|
|
+ if (null != param.get(6) && !"".equals(param.get(6)))
|
|
|
+ list.add(cb.equal(
|
|
|
+ root.get("fzsq").get("ssgq").get("gqszsylx").get("id").as(Long.class),Long.parseLong(param.get(6))));
|
|
|
+ if (null != param.get(7) && !"".equals(param.get(7)))
|
|
|
+ list.add(cb.equal(
|
|
|
+ root.get("zycs").get("id").as(Long.class),Long.parseLong(param.get(7))));
|
|
|
+ return cb.and(list.toArray(new Predicate[] {}));
|
|
|
+ }
|
|
|
+ };
|
|
|
+ dataset = gkwxhwzyfzService.findAll(spec, sort);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ Collection<String[]> strings = new ArrayList<String[]>();
|
|
|
+ int i = 1;
|
|
|
+ if (dataset != null)
|
|
|
+ for (GkwxhwzyfzblFzEntity entity : dataset) {
|
|
|
+ String[] ss = new String[] {
|
|
|
+ i + "",
|
|
|
+ null==entity.getFzsq()?"":entity.getFzsq().getByzd1(),
|
|
|
+ null == entity.getJyr() ? "" : entity.getJyr().getGkjyr(),
|
|
|
+ entity.getQynbmc(),
|
|
|
+ entity.getFzcsbh(),
|
|
|
+ entity.getByzd5(),
|
|
|
+ null==entity.getFzsq()?"":entity.getFzsq().getFzjg(),
|
|
|
+ (null==entity.getFzsq()||null==entity.getFzsq().getFzsj())?"":sdf.format(entity.getFzsq().getFzsj()),
|
|
|
+ (null==entity.getFzsq()||null==entity.getFzsq().getYxqjssj())?"":sdf.format(entity.getFzsq().getYxqjssj()),
|
|
|
+ (null==entity.getFzsq()||null==entity.getFzsq().getSsgq()) ? "" : entity.getFzsq().getSsgq()
|
|
|
+ .getGqmc(),
|
|
|
+ (null==entity.getFzsq()||null==entity.getFzsq().getSzd()) ? "" : resource
|
|
|
+ .getString(entity.getFzsq().getSzd().getName())
|
|
|
+ };
|
|
|
+ strings.add(ss);
|
|
|
+ i++;
|
|
|
+ }
|
|
|
+ return strings;
|
|
|
+ }
|
|
|
}
|
ld_liufl