|
|
|
@ -11,10 +11,7 @@ import cn.chjyj.szwh.mapper.GoodsMapper; |
|
|
|
import cn.chjyj.szwh.mapper.GoodsSourceMapper; |
|
|
|
import cn.chjyj.szwh.mapper.OperationLogMapper; |
|
|
|
import cn.chjyj.szwh.service.GoodsService; |
|
|
|
import cn.chjyj.szwh.utils.ProperUtils; |
|
|
|
import cn.chjyj.szwh.utils.RequestUtils; |
|
|
|
import cn.chjyj.szwh.utils.SignUtils; |
|
|
|
import cn.chjyj.szwh.utils.SzwhApiUtils; |
|
|
|
import cn.chjyj.szwh.utils.*; |
|
|
|
import cn.chjyj.szwh.vo.GoodsDetailVo; |
|
|
|
import cn.chjyj.szwh.vo.GoodsListVo; |
|
|
|
import cn.chjyj.szwh.vo.OrderDetailVo; |
|
|
|
@ -279,9 +276,13 @@ public class GoodsServiceImpl implements GoodsService { |
|
|
|
info.put("name",gs.getSourceName()); |
|
|
|
info.put("class",gs.getSourceType()); |
|
|
|
info.put("registerDate",sdjson.getString("registerDate")); |
|
|
|
info.put("filesize",filesize); |
|
|
|
info.put("filesize", SzFileUtils.fileSizeFormat(filesize)); |
|
|
|
info.put("identifier",sdjson.getString("identifier")); |
|
|
|
info.put("metadataFileFormat",sdjson.getString("metadataFileFormat")); |
|
|
|
//符合条件的数量
|
|
|
|
int count = goodsSourceMapper.countGoodSource(gdv.getGoods_islicode(),1,gs.getSourceidentify()); |
|
|
|
info.put("count",count); |
|
|
|
|
|
|
|
oneSource.add(info); |
|
|
|
} |
|
|
|
} |
|
|
|
|