优化

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjTrackShipCompanyServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.business.mapper.BjTrackShipCompanyMapper;
 import com.ruoyi.business.service.IBjTrackShipCompanyService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,7 +44,12 @@ public class BjTrackShipCompanyServiceImpl implements IBjTrackShipCompanyService
     @Override
     public BjTrackShipCompanyVo queryById(String id) {
         BjTrackShipCompany trackShipCompany = baseMapper.selectById(id);
-        return BeanUtil.copyProperties(trackShipCompany, BjTrackShipCompanyVo.class);
+        BjTrackShipCompanyVo trackShipCompanyVo = BeanUtil.copyProperties(trackShipCompany, BjTrackShipCompanyVo.class);
+        if (trackShipCompany.getAddStartDate() != null && trackShipCompany.getAddEndDate() != null) {
+            trackShipCompanyVo.setAddDate(DateFormatUtils.format(trackShipCompany.getAddStartDate(), "yyyy-MM-dd")
+                    .concat("/").concat(DateFormatUtils.format(trackShipCompany.getAddEndDate(), "yyyy-MM-dd")));
+        }
+        return trackShipCompanyVo;
     }
 
     /**
@@ -124,7 +130,7 @@ public class BjTrackShipCompanyServiceImpl implements IBjTrackShipCompanyService
     @Override
     public Boolean updateFlag(ReportFlagBo bo) {
         BjTrackShipCompany trackShipCompany = baseMapper.selectById(bo.getId());
-        trackShipCompany.setReleaseFlag("1");
+        trackShipCompany.setReportFlag("1");
         trackShipCompany.setReportReason(bo.getReportReason());
         trackShipCompany.setReportFile(bo.getReportFile());
         return baseMapper.updateById(trackShipCompany) > 0;