Merge remote-tracking branch 'origin/master'

YYC

2023-10-21 d48d966dfde7a0c31bd81466559e5e8d681dc200

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1103.java

@@ -11,11 +11,13 @@
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.NumberUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -73,7 +75,7 @@
            dto.setFdjg(building.getRoof());
            dto.setFjjg(building.getRoofTruss());
            dto.setDmjg(building.getGround());
            dto.setSjcr("0");
            dto.setSjcr(building.getStorage() == null ? "0" : NumberUtil.keepPrecision(building.getStorage()/1000,1) + "");
            dto.setCwc(building.getLength() == null ? "0" : building.getLength() + "");
            dto.setCwk(building.getWidth() == null ? "0" : building.getWidth() + "");
            dto.setCwyg(building.getHeight() == null ? "0" : building.getHeight() + "");