|
@@ -801,7 +801,14 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
|
|
|
//危货附证
|
|
|
if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
|
|
|
- String wxhwzyfz = xkzfzService.findByJyrid(gkjyr.getId()).get(0).getFzsqh();
|
|
|
+ List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
|
|
|
+ String wxhwzyfz = "";
|
|
|
+ if(list!= null && list.size()>0){
|
|
|
+ for(XkzfzEntity entity : list){
|
|
|
+ wxhwzyfz = wxhwzyfz + entity.getFzsqh()+",";
|
|
|
+ }
|
|
|
+ wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
|
|
|
+ }
|
|
|
gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
|
|
|
}
|
|
|
|
|
@@ -978,7 +985,14 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
gkjyrVo.setQyxz(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getId() : "");
|
|
|
|
|
|
if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
|
|
|
- String wxhwzyfz = xkzfzService.findByJyrid(gkjyr.getId()).get(0).getFzsqh();
|
|
|
+ List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
|
|
|
+ String wxhwzyfz = "";
|
|
|
+ if(list!= null && list.size()>0){
|
|
|
+ for(XkzfzEntity entity : list){
|
|
|
+ wxhwzyfz = wxhwzyfz + entity.getFzsqh()+",";
|
|
|
+ }
|
|
|
+ wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
|
|
|
+ }
|
|
|
gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
|
|
|
}
|
|
|
|
|
@@ -1178,7 +1192,14 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
gkjyrVo.setCgzrl(cgzrl + "");
|
|
|
//危货附证
|
|
|
if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
|
|
|
- String wxhwzyfz = xkzfzService.findByJyrid(gkjyr.getId()).get(0).getFzsqh();
|
|
|
+ List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
|
|
|
+ String wxhwzyfz = "";
|
|
|
+ if(list!= null && list.size()>0){
|
|
|
+ for(XkzfzEntity entity : list){
|
|
|
+ wxhwzyfz = wxhwzyfz + entity.getFzsqh()+",";
|
|
|
+ }
|
|
|
+ wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
|
|
|
+ }
|
|
|
gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
|
|
|
}
|
|
|
|
|
@@ -1332,7 +1353,14 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
|
|
|
//危货附证
|
|
|
if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
|
|
|
- String wxhwzyfz = xkzfzService.findByJyrid(gkjyr.getId()).get(0).getFzsqh();
|
|
|
+ List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
|
|
|
+ String wxhwzyfz = "";
|
|
|
+ if(list!= null && list.size()>0){
|
|
|
+ for(XkzfzEntity entity : list){
|
|
|
+ wxhwzyfz = wxhwzyfz + entity.getFzsqh()+",";
|
|
|
+ }
|
|
|
+ wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
|
|
|
+ }
|
|
|
gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
|
|
|
}
|
|
|
|