提交 21105623 authored 作者: 李瑞鑫's avatar 李瑞鑫

//首次回显过磅电子磅单,其他情况回显用户上传的图片

上级 b960241e
...@@ -4,6 +4,8 @@ import com.clx.performance.mapper.OrderChildWeighPictureMapper; ...@@ -4,6 +4,8 @@ import com.clx.performance.mapper.OrderChildWeighPictureMapper;
import com.clx.performance.model.OrderChildWeighPicture; import com.clx.performance.model.OrderChildWeighPicture;
import com.msl.common.dao.BaseDao; import com.msl.common.dao.BaseDao;
import java.util.List;
/** /**
* @author liruixin * @author liruixin
* Date 2024-08-02 * Date 2024-08-02
...@@ -11,4 +13,6 @@ import com.msl.common.dao.BaseDao; ...@@ -11,4 +13,6 @@ import com.msl.common.dao.BaseDao;
*/ */
public interface OrderChildWeighPictureDao extends BaseDao<OrderChildWeighPictureMapper, OrderChildWeighPicture, Integer> { public interface OrderChildWeighPictureDao extends BaseDao<OrderChildWeighPictureMapper, OrderChildWeighPicture, Integer> {
List<OrderChildWeighPicture> getImages(String childNo);
} }
...@@ -6,6 +6,8 @@ import com.clx.performance.model.OrderChildWeighPicture; ...@@ -6,6 +6,8 @@ import com.clx.performance.model.OrderChildWeighPicture;
import com.msl.common.dao.impl.BaseDaoImpl; import com.msl.common.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List;
/** /**
* @author liruixin * @author liruixin
* Date 2024-08-02 * Date 2024-08-02
...@@ -13,4 +15,10 @@ import org.springframework.stereotype.Repository; ...@@ -13,4 +15,10 @@ import org.springframework.stereotype.Repository;
*/ */
@Repository @Repository
public class OrderChildWeighPictureDaoImpl extends BaseDaoImpl<OrderChildWeighPictureMapper, OrderChildWeighPicture, Integer> implements OrderChildWeighPictureDao { public class OrderChildWeighPictureDaoImpl extends BaseDaoImpl<OrderChildWeighPictureMapper, OrderChildWeighPicture, Integer> implements OrderChildWeighPictureDao {
@Override
public List<OrderChildWeighPicture> getImages(String childNo) {
return list(lQrWrapper()
.eq(OrderChildWeighPicture::getChildNo, childNo)
);
}
} }
...@@ -238,6 +238,10 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -238,6 +238,10 @@ public class OrderChildServiceImpl implements OrderChildService {
private Environment environment; private Environment environment;
@Autowired @Autowired
private DocumentFeign documentFeign; private DocumentFeign documentFeign;
@Autowired
private OrderChildWeighPictureDao pictureDao;
@PostConstruct @PostConstruct
public void init(){ public void init(){
...@@ -1940,6 +1944,13 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -1940,6 +1944,13 @@ public class OrderChildServiceImpl implements OrderChildService {
item -> Objects.equals(item.getType(), OrderChildImage.Type.UNLOAD.getCode())).map( item -> Objects.equals(item.getType(), OrderChildImage.Type.UNLOAD.getCode())).map(
item -> item.getImage()).collect(Collectors.toList())); item -> item.getImage()).collect(Collectors.toList()));
if(CollectionUtils.isEmpty(result.getUnloadImageList())){
List<OrderChildWeighPicture> images = pictureDao.getImages(childNo);
result.setUnloadImageList(images.stream().filter(
item -> Objects.equals(item.getType(), 2)).map(
item -> item.getOriginalImg()).collect(Collectors.toList()));
}
result.setArriveSendTime(orderChild.getArriveSendTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getArriveSendTime())); result.setArriveSendTime(orderChild.getArriveSendTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getArriveSendTime()));
result.setFirstLoadTime(orderChild.getFirstLoadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getFirstLoadTime())); result.setFirstLoadTime(orderChild.getFirstLoadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getFirstLoadTime()));
result.setArriveReceiveTime(orderChild.getArriveReceiveTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getArriveReceiveTime())); result.setArriveReceiveTime(orderChild.getArriveReceiveTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getArriveReceiveTime()));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论