|
|
@@ -73,16 +73,19 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.client.GkjyrWebService;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyEntity;
|
|
|
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyzsEntity;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.GkjyrVo;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.RyVo;
|
|
|
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.RyzsVo;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.qytz.ctl.QytzCtl;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.qytz.vo.QytzVo;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.ry.ctl.RyCtl;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
|
|
|
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyzsService;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.sssb.ctl.SssbCtl;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
|
|
|
@@ -156,7 +159,8 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
private XkzfzService xkzfzService;
|
|
|
@Autowired
|
|
|
private AxService axService;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private RyzsService ryzsService;
|
|
|
/**
|
|
|
* 经营人基础信息
|
|
|
*/
|
|
|
@@ -661,7 +665,7 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
if (!StringUtils.isEmpty(gkjyrEntity.getId())) {// 修改保存
|
|
|
yjyr = gkjyrService.findOne(gkjyrEntity.getId());
|
|
|
}
|
|
|
- // BeanUtils.copyProperties(yjyr, gkjyrEntity);
|
|
|
+ // BeanUtils.copyProperties(yjyr, gkjyrEntity);
|
|
|
gkjyrEntity.setCreateDateTime(yjyr.getCreateDateTime());
|
|
|
gkjyrEntity.setCreateUser(yjyr.getCreateUser());
|
|
|
gkjyrEntity.setAqid(yjyr.getAqid());
|
|
|
@@ -734,17 +738,18 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
gkjyrEntity.setBgjyrid(yjyr.getBgjyrid());
|
|
|
gkjyrService.save(gkjyrEntity);
|
|
|
// 如果是市级新增或者修改，保存后同步到省级
|
|
|
-// try {
|
|
|
-// if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {
|
|
|
-// GkjyrWebService webService = gkjyrService.getWebService(null);
|
|
|
-// webService.save(gkjyrEntity);
|
|
|
-// gkjyrEntity.setTbzt(Constants.YES);
|
|
|
-// gkjyrService.save(gkjyrEntity);
|
|
|
-// }
|
|
|
-// } catch (Exception e) {
|
|
|
-// gkjyrEntity.setTbzt(Constants.NO);
|
|
|
-// gkjyrService.save(gkjyrEntity);
|
|
|
-// }
|
|
|
+ // try {
|
|
|
+ // if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) &&
|
|
|
+ // needWS()) {
|
|
|
+ // GkjyrWebService webService = gkjyrService.getWebService(null);
|
|
|
+ // webService.save(gkjyrEntity);
|
|
|
+ // gkjyrEntity.setTbzt(Constants.YES);
|
|
|
+ // gkjyrService.save(gkjyrEntity);
|
|
|
+ // }
|
|
|
+ // } catch (Exception e) {
|
|
|
+ // gkjyrEntity.setTbzt(Constants.NO);
|
|
|
+ // gkjyrService.save(gkjyrEntity);
|
|
|
+ // }
|
|
|
} catch (Exception e) {
|
|
|
wr.setSuccess(false);
|
|
|
wr.setMessage("操作失败！");
|
|
|
@@ -837,8 +842,8 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
GkjyrEntity gkjyr = gkjyrService.findOne(id);
|
|
|
GkjyrVo gkjyrVo = new GkjyrVo();
|
|
|
BeanUtils.copyProperties(gkjyr, gkjyrVo);
|
|
|
-
|
|
|
- //岸线
|
|
|
+
|
|
|
+ // 岸线
|
|
|
List<AxEntity> axEntities = axService.findByJyrid(gkjyr.getId());
|
|
|
if (axEntities == null) {
|
|
|
axEntities = new ArrayList<AxEntity>();
|
|
|
@@ -847,16 +852,16 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
for (AxEntity axEntity : axEntities) {
|
|
|
axcd += axEntity == null ? 0 : axEntity.getAxcd();
|
|
|
}
|
|
|
- //岸线长度
|
|
|
- gkjyrVo.setAxcd(axcd+"");
|
|
|
-
|
|
|
- //码头泊位
|
|
|
+ // 岸线长度
|
|
|
+ gkjyrVo.setAxcd(axcd + "");
|
|
|
+
|
|
|
+ // 码头泊位
|
|
|
List<BwEntity> bwList = bwService.findByJyrid(gkjyr.getId());
|
|
|
- if(bwList==null){
|
|
|
- bwList= new ArrayList<BwEntity>();
|
|
|
+ if (bwList == null) {
|
|
|
+ bwList = new ArrayList<BwEntity>();
|
|
|
}
|
|
|
- //码头泊位总数
|
|
|
- gkjyrVo.setMtbwzs(bwList.size()+"");
|
|
|
+ // 码头泊位总数
|
|
|
+ gkjyrVo.setMtbwzs(bwList.size() + "");
|
|
|
int scxbw = 0;
|
|
|
int fscxbw = 0;
|
|
|
double zdkbnl = 0;
|
|
|
@@ -868,11 +873,11 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
if (bwEntity.getSclx() != null) {
|
|
|
if (bwEntity.getSclx().getId().equals("2601") && bwEntity.getSclx().getId().equals("2602")) {
|
|
|
scxbw++;
|
|
|
- }else if (bwEntity.getSclx().getId().equals("2603") && bwEntity.getSclx().getId().equals("2604")) {
|
|
|
+ } else if (bwEntity.getSclx().getId().equals("2603") && bwEntity.getSclx().getId().equals("2604")) {
|
|
|
fscxbw++;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
sjtgnl = bwEntity.getSjtgnl() == null ? 0 : bwEntity.getSjtgnl();
|
|
|
zdkbnl += sjtgnl;
|
|
|
if (sjtgnl >= 10000) {
|
|
|
@@ -881,19 +886,19 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
bwzcd += bwEntity.getBwcd() == null ? 0 : bwEntity.getBwcd();
|
|
|
sjntgnl += bwEntity.getNhwtgnl() == null ? 0 : Double.parseDouble(bwEntity.getNhwtgnl());
|
|
|
}
|
|
|
- //泊位生产类型
|
|
|
- gkjyrVo.setScxbw(scxbw+"");
|
|
|
- gkjyrVo.setFscxbw(fscxbw+"");
|
|
|
- //最大靠泊能力
|
|
|
- gkjyrVo.setZdkbnl(zdkbnl+"");
|
|
|
- //万吨级以上泊位
|
|
|
- gkjyrVo.setWdjysbwsl(wdjysbw+"");
|
|
|
- //泊位总长度
|
|
|
- gkjyrVo.setBwzcd(bwzcd+"");
|
|
|
- //设计年通过能力
|
|
|
- gkjyrVo.setSjntgnl(sjntgnl+"");
|
|
|
-
|
|
|
- //仓库
|
|
|
+ // 泊位生产类型
|
|
|
+ gkjyrVo.setScxbw(scxbw + "");
|
|
|
+ gkjyrVo.setFscxbw(fscxbw + "");
|
|
|
+ // 最大靠泊能力
|
|
|
+ gkjyrVo.setZdkbnl(zdkbnl + "");
|
|
|
+ // 万吨级以上泊位
|
|
|
+ gkjyrVo.setWdjysbwsl(wdjysbw + "");
|
|
|
+ // 泊位总长度
|
|
|
+ gkjyrVo.setBwzcd(bwzcd + "");
|
|
|
+ // 设计年通过能力
|
|
|
+ gkjyrVo.setSjntgnl(sjntgnl + "");
|
|
|
+
|
|
|
+ // 仓库
|
|
|
List<CkEntity> ckEntities = ckService.findByJyrid(gkjyr.getId());
|
|
|
if (ckEntities == null) {
|
|
|
ckEntities = new ArrayList<CkEntity>();
|
|
|
@@ -902,10 +907,10 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
for (CkEntity ckEntity : ckEntities) {
|
|
|
ckzmj += ckEntity.getCkzmj() == null ? 0 : ckEntity.getCkzmj();
|
|
|
}
|
|
|
- //仓库总面积
|
|
|
- gkjyrVo.setCkzmj(ckzmj+"");
|
|
|
-
|
|
|
- //堆场
|
|
|
+ // 仓库总面积
|
|
|
+ gkjyrVo.setCkzmj(ckzmj + "");
|
|
|
+
|
|
|
+ // 堆场
|
|
|
List<DcEntity> dcEntities = dcService.findByJyrid(gkjyr.getId());
|
|
|
if (dcEntities == null) {
|
|
|
dcEntities = new ArrayList<DcEntity>();
|
|
|
@@ -914,10 +919,10 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
for (DcEntity dcEntity : dcEntities) {
|
|
|
dczmj += dcEntity.getDczmj() == null ? 0 : dcEntity.getDczmj();
|
|
|
}
|
|
|
- //堆场总面积
|
|
|
- gkjyrVo.setTczmj(dczmj+"");
|
|
|
-
|
|
|
- //储罐
|
|
|
+ // 堆场总面积
|
|
|
+ gkjyrVo.setTczmj(dczmj + "");
|
|
|
+
|
|
|
+ // 储罐
|
|
|
List<CgEntity> cgEntities = cgService.findByJyrid(gkjyr.getId());
|
|
|
if (cgEntities == null) {
|
|
|
cgEntities = new ArrayList<CgEntity>();
|
|
|
@@ -926,11 +931,11 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
for (CgEntity cgEntity : cgEntities) {
|
|
|
cgzrl += cgEntity.getCgrj() == null ? 0 : cgEntity.getCgrj();
|
|
|
}
|
|
|
- //储罐数量
|
|
|
- gkjyrVo.setCgsl(cgEntities.size()+"");
|
|
|
- //储罐总容量
|
|
|
- gkjyrVo.setCgzrl(cgzrl+"");
|
|
|
-
|
|
|
+ // 储罐数量
|
|
|
+ gkjyrVo.setCgsl(cgEntities.size() + "");
|
|
|
+ // 储罐总容量
|
|
|
+ gkjyrVo.setCgzrl(cgzrl + "");
|
|
|
+
|
|
|
gkjyrVo.setSzdzw(null != gkjyr.getSzd() ? gkjyr.getSzd().getText() : "");
|
|
|
gkjyrVo.setSzgkzw(null != gkjyr.getSzgk() ? gkjyr.getSzgk().getGkmc() : "");
|
|
|
gkjyrVo.setSzgqzw(null != gkjyr.getSzgq() ? gkjyr.getSzgq().getGqmc() : "");
|
|
|
@@ -1056,9 +1061,8 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
GkjyrEntity gkjyr = gkjyrService.findOne(id);
|
|
|
GkjyrVo gkjyrVo = new GkjyrVo();
|
|
|
BeanUtils.copyProperties(gkjyr, gkjyrVo);
|
|
|
-
|
|
|
|
|
|
- //岸线
|
|
|
+ // 岸线
|
|
|
List<AxEntity> axEntities = axService.findByJyrid(gkjyr.getId());
|
|
|
if (axEntities == null) {
|
|
|
axEntities = new ArrayList<AxEntity>();
|
|
|
@@ -1067,16 +1071,16 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
for (AxEntity axEntity : axEntities) {
|
|
|
axcd += axEntity == null ? 0 : axEntity.getAxcd();
|
|
|
}
|
|
|
- //岸线长度
|
|
|
- gkjyrVo.setAxcd(axcd+"");
|
|
|
-
|
|
|
- //码头泊位
|
|
|
+ // 岸线长度
|
|
|
+ gkjyrVo.setAxcd(axcd + "");
|
|
|
+
|
|
|
+ // 码头泊位
|
|
|
List<BwEntity> bwList = bwService.findByJyrid(gkjyr.getId());
|
|
|
- if(bwList==null){
|
|
|
- bwList= new ArrayList<BwEntity>();
|
|
|
+ if (bwList == null) {
|
|
|
+ bwList = new ArrayList<BwEntity>();
|
|
|
}
|
|
|
- //码头泊位总数
|
|
|
- gkjyrVo.setMtbwzs(bwList.size()+"");
|
|
|
+ // 码头泊位总数
|
|
|
+ gkjyrVo.setMtbwzs(bwList.size() + "");
|
|
|
int scxbw = 0;
|
|
|
int fscxbw = 0;
|
|
|
double zdkbnl = 0;
|
|
|
@@ -1088,11 +1092,11 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
if (bwEntity.getSclx() != null) {
|
|
|
if (bwEntity.getSclx().getId().equals("2601") && bwEntity.getSclx().getId().equals("2602")) {
|
|
|
scxbw++;
|
|
|
- }else if (bwEntity.getSclx().getId().equals("2603") && bwEntity.getSclx().getId().equals("2604")) {
|
|
|
+ } else if (bwEntity.getSclx().getId().equals("2603") && bwEntity.getSclx().getId().equals("2604")) {
|
|
|
fscxbw++;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
sjtgnl = bwEntity.getSjtgnl() == null ? 0 : bwEntity.getSjtgnl();
|
|
|
zdkbnl += sjtgnl;
|
|
|
if (sjtgnl >= 10000) {
|
|
|
@@ -1101,19 +1105,19 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
bwzcd += bwEntity.getBwcd() == null ? 0 : bwEntity.getBwcd();
|
|
|
sjntgnl += bwEntity.getNhwtgnl() == null ? 0 : Double.parseDouble(bwEntity.getNhwtgnl());
|
|
|
}
|
|
|
- //泊位生产类型
|
|
|
- gkjyrVo.setScxbw(scxbw+"");
|
|
|
- gkjyrVo.setFscxbw(fscxbw+"");
|
|
|
- //最大靠泊能力
|
|
|
- gkjyrVo.setZdkbnl(zdkbnl+"");
|
|
|
- //万吨级以上泊位
|
|
|
- gkjyrVo.setWdjysbwsl(wdjysbw+"");
|
|
|
- //泊位总长度
|
|
|
- gkjyrVo.setBwzcd(bwzcd+"");
|
|
|
- //设计年通过能力
|
|
|
- gkjyrVo.setSjntgnl(sjntgnl+"");
|
|
|
-
|
|
|
- //仓库
|
|
|
+ // 泊位生产类型
|
|
|
+ gkjyrVo.setScxbw(scxbw + "");
|
|
|
+ gkjyrVo.setFscxbw(fscxbw + "");
|
|
|
+ // 最大靠泊能力
|
|
|
+ gkjyrVo.setZdkbnl(zdkbnl + "");
|
|
|
+ // 万吨级以上泊位
|
|
|
+ gkjyrVo.setWdjysbwsl(wdjysbw + "");
|
|
|
+ // 泊位总长度
|
|
|
+ gkjyrVo.setBwzcd(bwzcd + "");
|
|
|
+ // 设计年通过能力
|
|
|
+ gkjyrVo.setSjntgnl(sjntgnl + "");
|
|
|
+
|
|
|
+ // 仓库
|
|
|
List<CkEntity> ckEntities = ckService.findByJyrid(gkjyr.getId());
|
|
|
if (ckEntities == null) {
|
|
|
ckEntities = new ArrayList<CkEntity>();
|
|
|
@@ -1122,10 +1126,10 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
for (CkEntity ckEntity : ckEntities) {
|
|
|
ckzmj += ckEntity.getCkzmj() == null ? 0 : ckEntity.getCkzmj();
|
|
|
}
|
|
|
- //仓库总面积
|
|
|
- gkjyrVo.setCkzmj(ckzmj+"");
|
|
|
-
|
|
|
- //堆场
|
|
|
+ // 仓库总面积
|
|
|
+ gkjyrVo.setCkzmj(ckzmj + "");
|
|
|
+
|
|
|
+ // 堆场
|
|
|
List<DcEntity> dcEntities = dcService.findByJyrid(gkjyr.getId());
|
|
|
if (dcEntities == null) {
|
|
|
dcEntities = new ArrayList<DcEntity>();
|
|
|
@@ -1134,10 +1138,10 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
for (DcEntity dcEntity : dcEntities) {
|
|
|
dczmj += dcEntity.getDczmj() == null ? 0 : dcEntity.getDczmj();
|
|
|
}
|
|
|
- //堆场总面积
|
|
|
- gkjyrVo.setTczmj(dczmj+"");
|
|
|
-
|
|
|
- //储罐
|
|
|
+ // 堆场总面积
|
|
|
+ gkjyrVo.setTczmj(dczmj + "");
|
|
|
+
|
|
|
+ // 储罐
|
|
|
List<CgEntity> cgEntities = cgService.findByJyrid(gkjyr.getId());
|
|
|
if (cgEntities == null) {
|
|
|
cgEntities = new ArrayList<CgEntity>();
|
|
|
@@ -1146,12 +1150,11 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
for (CgEntity cgEntity : cgEntities) {
|
|
|
cgzrl += cgEntity.getCgrj() == null ? 0 : cgEntity.getCgrj();
|
|
|
}
|
|
|
- //储罐数量
|
|
|
- gkjyrVo.setCgsl(cgEntities.size()+"");
|
|
|
- //储罐总容量
|
|
|
- gkjyrVo.setCgzrl(cgzrl+"");
|
|
|
-
|
|
|
-
|
|
|
+ // 储罐数量
|
|
|
+ gkjyrVo.setCgsl(cgEntities.size() + "");
|
|
|
+ // 储罐总容量
|
|
|
+ gkjyrVo.setCgzrl(cgzrl + "");
|
|
|
+
|
|
|
gkjyrVo.setSzdzw(null != gkjyr.getSzd() ? gkjyr.getSzd().getText() : "");
|
|
|
gkjyrVo.setSzgkzw(null != gkjyr.getSzgk() ? gkjyr.getSzgk().getGkmc() : "");
|
|
|
gkjyrVo.setSzgqzw(null != gkjyr.getSzgq() ? gkjyr.getSzgq().getGqmc() : "");
|
|
|
@@ -2031,7 +2034,7 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_SF);
|
|
|
return list;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/selectXzqh")
|
|
|
@ResponseBody
|
|
|
public List<CodeEntity> selectXzqh(Model model, String gk) {
|
|
|
@@ -2242,7 +2245,7 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
}
|
|
|
return nodeList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/exportExcelAll")
|
|
|
public String exportExcelAll(HttpServletResponse response, final String bwyt, final String whfzbh, final String sfcswhzy, final String sfcyxkz, final String gkjyr, final String szdid, final String szgkid, final String szgqid, final String gkjyxkzh, final String fddbr, final Date xkzstartDate, final Date xkzendDate, final Date fzstartDate, final Date fzendDate, final String jyrxkzsfdq) {
|
|
|
Specification<GkjyrEntity> spec = new Specification<GkjyrEntity>() {
|
|
|
@@ -2310,10 +2313,11 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
subquery2.where(subQueryPredicates2.toArray(new Predicate[] {}));
|
|
|
list.add(cb.exists(subquery2));
|
|
|
}
|
|
|
-// // 企业性质
|
|
|
-// if (StringUtils.isNotEmpty(qyxz)) {
|
|
|
-// list.add(cb.like(root.get("qyxz").as(String.class), "%" + qyxz + "%"));
|
|
|
-// }
|
|
|
+ // // 企业性质
|
|
|
+ // if (StringUtils.isNotEmpty(qyxz)) {
|
|
|
+ // list.add(cb.like(root.get("qyxz").as(String.class), "%" +
|
|
|
+ // qyxz + "%"));
|
|
|
+ // }
|
|
|
|
|
|
// 危货附证有效期
|
|
|
if (fzstartDate != null) {
|
|
|
@@ -2382,7 +2386,7 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
};
|
|
|
List<GkjyrEntity> list = query.findAll(spec, GkjyrEntity.class);
|
|
|
List<GkjyrVo> voList = entityToVo(list);
|
|
|
-
|
|
|
+
|
|
|
response.setContentType("application/binary;charset=iso-8859-1");
|
|
|
try {
|
|
|
ServletOutputStream outputStream = response.getOutputStream();
|
|
|
@@ -2394,7 +2398,7 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
public List<GkjyrVo> entityToVo(List<GkjyrEntity> list) {
|
|
|
List<GkjyrVo> voList = new ArrayList<GkjyrVo>();
|
|
|
|
|
|
@@ -2420,7 +2424,7 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
gkjyrVo.setMtjgxszw(null != entity.getMtjgxs() ? entity.getMtjgxs().getText() : "");
|
|
|
gkjyrVo.setQyxzzw(null != entity.getQyxz() ? entity.getQyxz().getText() : "");
|
|
|
gkjyrVo.setFzrqstr(transFormatDate(entity.getFzrq()));
|
|
|
-
|
|
|
+
|
|
|
voList.add(gkjyrVo);
|
|
|
}
|
|
|
}
|
|
|
@@ -2428,100 +2432,301 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/exportJyr")
|
|
|
- public String exportJyr(HttpServletResponse response,final String id,final String jyr){
|
|
|
- //经营人信息
|
|
|
+ public String exportJyr(HttpServletResponse response, final String id, final String jyr) {
|
|
|
+ // 经营人信息
|
|
|
GkjyrEntity gkjyrEntity = gkjyrService.findOne(id);
|
|
|
List<GkjyrEntity> list = new ArrayList<>();
|
|
|
list.add(gkjyrEntity);
|
|
|
List<GkjyrVo> voList = entityToVo(list);
|
|
|
- //许可证信息
|
|
|
+ // 许可证信息
|
|
|
List<XkzxxVo> xkzxxVos = exportXkzxx(id);
|
|
|
- //许可证附证
|
|
|
+ // 许可证附证
|
|
|
List<CodeEntity> listZycs = securityMgr.codeService().findValidCodesByGroupCode("ZYCS");
|
|
|
List<GqEntity> listgq = gqService.findGq();
|
|
|
List<GkEntity> listgk = gkService.findGk();
|
|
|
List<XkzfzVo> xkzfzVos = exportXkzfz(id);
|
|
|
- //码头
|
|
|
+ // 码头
|
|
|
List<MtVo> mtVos = exportMt(id);
|
|
|
- //泊位
|
|
|
+ // 泊位
|
|
|
List<BwVo> bwVos = exportBw(id);
|
|
|
- //储罐
|
|
|
+ // 储罐
|
|
|
List<CgVo> cgVos = expotrCg(id);
|
|
|
- //仓库
|
|
|
- List<CkVo> ckVos = expotrCk(id);
|
|
|
- //堆场
|
|
|
+ // 仓库
|
|
|
+ List<CkVo> ckVos = expotrCk(id);
|
|
|
+ // 堆场
|
|
|
List<DcVo> dcVos = expotrDc(id);
|
|
|
- //人员及特征
|
|
|
+ // 人员及特征
|
|
|
List<RyVo> ryVos = expotrRy(id);
|
|
|
- //设施设备
|
|
|
+ // 设施设备
|
|
|
List<SssbVo> sssbVos = exportSssb(id);
|
|
|
- //企业投资
|
|
|
+ // 企业投资
|
|
|
List<QytzVo> qytzVos = expotrQytz(id);
|
|
|
- //装卸机械
|
|
|
+ // 装卸机械
|
|
|
List<ZxjxVo> zxjxVos = expotrZxjx(id);
|
|
|
response.setContentType("application/binary;charset=iso-8859-1");
|
|
|
try {
|
|
|
ServletOutputStream outputStream = response.getOutputStream();
|
|
|
- String fileName = new String((jyr+"信息").getBytes(), "iso-8859-1");
|
|
|
+ String fileName = new String((gkjyrEntity.getGkjyr() + "信息").getBytes(), "iso-8859-1");
|
|
|
response.setHeader("Content-disposition", "attachment; filename=" + fileName + ".xlsx");// 组装附件名称和格式
|
|
|
-// gkjyrService.exportJyr(voList, xkzfzVos, mtVos, bwVos, cgVos, ckVos, dcVos, ryVos, sssbVos, qytzVos, zxjxVos, outputStream, listZycs, listgq, listgk);
|
|
|
+ // gkjyrService.exportJyr(voList, xkzfzVos, mtVos, bwVos, cgVos,
|
|
|
+ // ckVos, dcVos, ryVos, sssbVos, qytzVos, zxjxVos, outputStream,
|
|
|
+ // listZycs, listgq, listgk);
|
|
|
gkjyrService.exportJyr(voList, xkzxxVos, xkzfzVos, mtVos, bwVos, cgVos, ckVos, dcVos, ryVos, sssbVos, qytzVos, zxjxVos, outputStream, listZycs, listgq, listgk);
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 许可证信息
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
public List<XkzxxVo> exportXkzxx(final String id) {
|
|
|
List<XkzxxEntity> list = xkzxxService.findByJyrid(id);
|
|
|
- XkzxxCtl xkzxxCtl = new XkzxxCtl();
|
|
|
- List<XkzxxVo> voList = xkzxxCtl.entityToVo(list);
|
|
|
+ List<XkzxxVo> voList = new ArrayList<XkzxxVo>();
|
|
|
+ for (XkzxxEntity entity : list) {
|
|
|
+ XkzxxVo vo = new XkzxxVo();
|
|
|
+ if (null != entity) {
|
|
|
+ if (entity != null) {
|
|
|
+ BeanUtils.copyProperties(entity, vo);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (vo.getGkjyr() != null) {
|
|
|
+ String idString = vo.getGkjyr();
|
|
|
+ GkjyrEntity gkjyrentity = gkjyrService.findOne(idString);
|
|
|
+ if (null != gkjyrentity) {
|
|
|
+ vo.setGkjyrzw(gkjyrentity.getGkjyr());
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ if (vo.getSsgq() != null) {
|
|
|
+ GqEntity gq = gqService.findOne(vo.getSsgq());
|
|
|
+ if (null != gq) {
|
|
|
+ vo.setSsgqzw(gq.getGqmc());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ voList.add(vo);
|
|
|
+ }
|
|
|
+ }
|
|
|
return voList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 许可证附证
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
public List<XkzfzVo> exportXkzfz(final String id) {
|
|
|
List<XkzfzEntity> list = xkzfzService.findByJyrid(id);
|
|
|
- XkzfzCtl xkzfzCtl = new XkzfzCtl();
|
|
|
- List<XkzfzVo> voList = xkzfzCtl.entityToVo(list);
|
|
|
+ List<XkzfzVo> voList = new ArrayList<XkzfzVo>();
|
|
|
+ for (XkzfzEntity entity : list) {
|
|
|
+ XkzfzVo vo = new XkzfzVo();
|
|
|
+ if (null != entity) {
|
|
|
+ BeanUtils.copyProperties(entity, vo);
|
|
|
+ vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
|
|
|
+ vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
|
|
|
+ vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
|
|
|
+ vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
|
|
|
+
|
|
|
+ vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
|
+ vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
|
+ vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
|
+ vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
|
|
|
+ if (null != entity.getFzsj()) {
|
|
|
+ vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
|
|
|
+ }
|
|
|
+ if (null != entity.getYxqkssj()) {
|
|
|
+ vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
|
|
|
+ }
|
|
|
+ if (null != entity.getYxqjssj()) {
|
|
|
+ vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
|
|
|
+ }
|
|
|
+
|
|
|
+ // zycs cq whdj
|
|
|
+
|
|
|
+ if (vo.getZycs() != null) {
|
|
|
+ CodeEntity zycs = securityMgr.codeService().findOne(vo.getZycs());
|
|
|
+ if (null != zycs) {
|
|
|
+ vo.setZycszw(zycs.getText());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (vo.getCq() != null) {
|
|
|
+ CodeEntity cq = securityMgr.codeService().findOne(vo.getCq());
|
|
|
+ if (null != cq) {
|
|
|
+ vo.setCqzw(cq.getText());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (vo.getWhdj() != null) {
|
|
|
+ CodeEntity whdj = securityMgr.codeService().findOne(vo.getWhdj());
|
|
|
+ if (null != whdj) {
|
|
|
+ vo.setWhdjzw(whdj.getText());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ voList.add(vo);
|
|
|
+ }
|
|
|
+ }
|
|
|
return voList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 码头
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
public List<MtVo> exportMt(final String id) {
|
|
|
List<MtEntity> list = mtService.findByJyrid(id);
|
|
|
- MtCtl mtCtl = new MtCtl();
|
|
|
- List<MtVo> voList = mtCtl.entityToVo(list);
|
|
|
+
|
|
|
+ List<MtVo> voList = new ArrayList<MtVo>();
|
|
|
+
|
|
|
+ for (MtEntity entity : list) {
|
|
|
+ MtVo vo = new MtVo();
|
|
|
+ if (null != entity) {
|
|
|
+ BeanUtils.copyProperties(entity, vo);
|
|
|
+ vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
|
|
|
+ vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
|
|
|
+ vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
|
|
|
+ vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
|
|
|
+ vo.setSfdwkfzw(entity.getSfdwkf() != null ? entity.getSfdwkf().getText() : "");
|
|
|
+ vo.setSfwhpzw(entity.getSfwhp() != null ? entity.getSfwhp().getText() : "");
|
|
|
+ vo.setMtsfwarszw(entity.getMtsfwars() != null ? entity.getMtsfwars().getText() : "");
|
|
|
+ vo.setFwlxzw(entity.getFwlx() != null ? entity.getFwlx().getText() : "");
|
|
|
+ /* vo.setMtytzw(entity.getMtyt()!=null?entity.getMtyt().getText():""); */
|
|
|
+ vo.setMtxsdmzw(entity.getMtxsdm() != null ? entity.getMtxsdm().getText() : "");
|
|
|
+ vo.setSzzyqzw(entity.getSzzyq() != null ? entity.getSzzyq().getZyqmc() : "");
|
|
|
+ vo.setSzaxzw(entity.getSzax() != null ? entity.getSzax().getAxmc() : "");
|
|
|
+
|
|
|
+ vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
|
+ vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
|
+ vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
|
+ vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
|
|
|
+ vo.setSfdwkf(entity.getSfdwkf() != null ? entity.getSfdwkf().getId() : "");
|
|
|
+ vo.setSfwhp(entity.getSfwhp() != null ? entity.getSfwhp().getId() : "");
|
|
|
+ vo.setMtsfwars(entity.getMtsfwars() != null ? entity.getMtsfwars().getId() : "");
|
|
|
+ vo.setFwlx(entity.getFwlx() != null ? entity.getFwlx().getId() : "");
|
|
|
+ /* vo.setMtyt(entity.getMtyt()!=null?entity.getMtyt().getId():""); */
|
|
|
+ vo.setMtxsdm(entity.getMtxsdm() != null ? entity.getMtxsdm().getId() : "");
|
|
|
+ vo.setSzzyq(entity.getSzzyq() != null ? entity.getSzzyq().getId() : "");
|
|
|
+ vo.setSzax(entity.getSzax() != null ? entity.getSzax().getId() : "");
|
|
|
+ if (null != entity.getJcrq()) {
|
|
|
+ vo.setJcrqfmt(new SimpleDateFormat("yyyy-MM-dd").format(entity.getJcrq()));
|
|
|
+ }
|
|
|
+
|
|
|
+ String mtytName = "";
|
|
|
+ if (entity.getMtyt() != null) {
|
|
|
+ String[] mtytNameArray = entity.getMtyt().split(",");
|
|
|
+ /*
|
|
|
+ * for (String m : mtytNameArray) { mtytName +=
|
|
|
+ * codeService.findOne(m).getText() + " "; mtytName +=
|
|
|
+ * securityMgr.codeService().findOne(m).getText() + " "; }
|
|
|
+ */
|
|
|
+ for (int i = 0; i < mtytNameArray.length; i++) {
|
|
|
+ if (i != mtytNameArray.length - 1) {
|
|
|
+ mtytName += securityMgr.codeService().findOne(mtytNameArray[i]).getText() + ",";
|
|
|
+ } else {
|
|
|
+ mtytName += securityMgr.codeService().findOne(mtytNameArray[i]).getText();
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ vo.setMtytzw(mtytName);
|
|
|
+
|
|
|
+ voList.add(vo);
|
|
|
+ }
|
|
|
+ }
|
|
|
return voList;
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 泊位
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
public List<BwVo> exportBw(final String id) {
|
|
|
List<BwEntity> list = bwService.findByJyrid(id);
|
|
|
- BwCtl bwCtl = new BwCtl();
|
|
|
- List<BwVo> voList = bwCtl.entityToVo(list);
|
|
|
+
|
|
|
+ List<BwVo> voList = new ArrayList<BwVo>();
|
|
|
+
|
|
|
+ for (BwEntity entity : list) {
|
|
|
+ BwVo vo = new BwVo();
|
|
|
+ if (null != entity) {
|
|
|
+ BeanUtils.copyProperties(entity, vo);
|
|
|
+ vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
|
|
|
+ vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
|
|
|
+ vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
|
|
|
+ vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
|
|
|
+ vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");
|
|
|
+ vo.setBwsxzw(entity.getBwsx() != null ? entity.getBwsx().getText() : "");
|
|
|
+ vo.setFwlxzw(entity.getFwlx() != null ? entity.getFwlx().getText() : "");
|
|
|
+ vo.setWxpbwzw(entity.getWxpbw() != null ? entity.getWxpbw().getText() : "");
|
|
|
+ vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
|
|
|
+ vo.setSffzzw(entity.getSffz() != null ? entity.getSffz().getText() : "");
|
|
|
+ vo.setSfdwkfzw(entity.getSfdwkf() != null ? entity.getSfdwkf().getText() : "");
|
|
|
+ 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.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() : "");
|
|
|
+
|
|
|
+ if (entity.getBwyt() != null) {
|
|
|
+ String bwytzw = "";
|
|
|
+ String[] s = entity.getBwyt().split(",");
|
|
|
+ /*
|
|
|
+ * for (String string : s) { bwytzw +=
|
|
|
+ * securityMgr.codeService().findOne(string).getText(); }
|
|
|
+ */
|
|
|
+ for (int i = 0; i < s.length; i++) {
|
|
|
+ CodeEntity ce = securityMgr.codeService().findOne(s[i]);
|
|
|
+ if (ce != null) {
|
|
|
+ bwytzw += ce.getText();
|
|
|
+ if (i != s.length - 1) {
|
|
|
+ bwytzw += ",";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ vo.setBwytzw(bwytzw);
|
|
|
+ }
|
|
|
+ vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
|
+ vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
|
+ vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
|
+ vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
|
|
|
+ vo.setSsmt(entity.getSsmt() != null ? entity.getSsmt().getId() : "");
|
|
|
+ vo.setBwsx(entity.getBwsx() != null ? entity.getBwsx().getId() : "");
|
|
|
+ vo.setFwlx(entity.getFwlx() != null ? entity.getFwlx().getId() : "");
|
|
|
+ vo.setWxpbw(entity.getWxpbw() != null ? entity.getWxpbw().getId() : "");
|
|
|
+ vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
|
|
|
+ vo.setSffz(entity.getSffz() != null ? entity.getSffz().getId() : "");
|
|
|
+ vo.setSfdwkf(entity.getSfdwkf() != null ? entity.getSfdwkf().getId() : "");
|
|
|
+ vo.setBwszsx(entity.getBwszsx() != null ? entity.getBwszsx().getId() : "");
|
|
|
+ vo.setSclx(entity.getSclx() != null ? entity.getSclx().getId() : "");
|
|
|
+ vo.setJgxs(entity.getJgxs() != null ? entity.getJgxs().getId() : "");
|
|
|
+
|
|
|
+ voList.add(vo);
|
|
|
+ }
|
|
|
+ }
|
|
|
return voList;
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 储罐
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -2531,9 +2736,10 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
List<CgVo> voList = cgCtl.entityToVo(list);
|
|
|
return voList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 仓库
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -2542,10 +2748,12 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
CkCtl ckCtl = new CkCtl();
|
|
|
List<CkVo> voList = ckCtl.entityToVo(list);
|
|
|
return voList;
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 堆场
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -2555,33 +2763,87 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
List<DcVo> voList = dcCtl.entityToVo(list);
|
|
|
return voList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 人员及特征
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
public List<RyVo> expotrRy(final String id) {
|
|
|
List<RyEntity> list = ryService.findByJyrid(id);
|
|
|
- RyCtl ryCtl = new RyCtl();
|
|
|
- List<RyVo> voList = ryCtl.entityToVo(list);
|
|
|
+
|
|
|
+ List<RyVo> voList = new ArrayList<RyVo>();
|
|
|
+
|
|
|
+ for (RyEntity entity : list) {
|
|
|
+ RyVo vo = new RyVo();
|
|
|
+ if (null != entity) {
|
|
|
+ BeanUtils.copyProperties(entity, vo);
|
|
|
+ vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
|
|
|
+ vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
|
|
|
+ vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
|
|
|
+ vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
|
|
|
+ vo.setXbzw(entity.getXb() != null ? entity.getXb().getText() : "");
|
|
|
+ vo.setRylxzw(entity.getRylx() != null ? entity.getRylx().getText() : "");
|
|
|
+ vo.setZjlxzw(entity.getZjlx() != null ? entity.getZjlx().getText() : "");
|
|
|
+
|
|
|
+ vo.setZjlx(entity.getZjlx() != null ? entity.getZjlx().getId() : "");
|
|
|
+ vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
|
+ vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
|
|
|
+ vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
|
|
|
+ vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
|
|
|
+ vo.setXb(entity.getXb() != null ? entity.getXb().getId() : "");
|
|
|
+ vo.setRylx(entity.getRylx() != null ? entity.getRylx().getId() : "");
|
|
|
+ // 出生日期格式化
|
|
|
+ if (null != entity.getCsrq()) {
|
|
|
+ vo.setCsrqfmt(new SimpleDateFormat("yyyy-MM-dd").format(entity.getCsrq()));
|
|
|
+ }
|
|
|
+
|
|
|
+ List<RyzsEntity> ryzslist = ryService.findZs(entity);
|
|
|
+ if (ryzslist.size() == 0) {
|
|
|
+ ryzslist = ryzsService.findZsBysfzh(entity.getSfzh());
|
|
|
+ }
|
|
|
+ List<RyzsVo> ryvoList = new ArrayList<RyzsVo>();
|
|
|
+ for (RyzsEntity zsentity : ryzslist) {
|
|
|
+ RyzsVo zsvo = new RyzsVo();
|
|
|
+ if (zsentity != null) {
|
|
|
+ BeanUtils.copyProperties(zsentity, zsvo);
|
|
|
+ zsvo.setId(zsentity.getId());
|
|
|
+ zsvo.setZsmc(zsentity.getZsmc());
|
|
|
+ zsvo.setZsbh(zsentity.getZsbh());
|
|
|
+ zsvo.setFzbm(zsentity.getFzbm());
|
|
|
+ zsvo.setZszl(zsentity.getZszl());
|
|
|
+ if (null != zsentity.getYxq()) {
|
|
|
+ zsvo.setYxqfmt(new SimpleDateFormat("yyyy-MM-dd").format(zsentity.getYxq()));
|
|
|
+ }
|
|
|
+ zsvo.setRyzw(zsentity.getRyid() != null ? zsentity.getRyid().getXm() : "");
|
|
|
+ zsvo.setRyid(zsentity.getRyid() != null ? zsentity.getRyid().getId() : "");
|
|
|
+ ryvoList.add(zsvo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ voList.add(vo);
|
|
|
+ }
|
|
|
+ }
|
|
|
return voList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 设施设备
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
- public List<SssbVo> exportSssb(final String id){
|
|
|
+ public List<SssbVo> exportSssb(final String id) {
|
|
|
List<SssbEntity> list = sssbService.findByJyrid(id);
|
|
|
SssbCtl sssbCtl = new SssbCtl();
|
|
|
List<SssbVo> voList = sssbCtl.entityToVo(list);
|
|
|
return voList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 企业投资
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -2591,9 +2853,10 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
List<QytzVo> voList = qytzCtl.entityToVo(list);
|
|
|
return voList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 装卸机械
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -2603,5 +2866,5 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
List<ZxjxVo> voList = zxjxCtl.entityToVo(list);
|
|
|
return voList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
ld_liqk