Merge branch 'master' of ssh://www.yixzm.cn:22022/Dim5-ideal/bj-maritime-dcds

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/BjTrackShipCompany.java

@@ -110,6 +110,11 @@ public class BjTrackShipCompany extends BaseEntity {
     private String breakReason;
 
     /**
+     * 脱离状态
+     */
+    private String breakStatus;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BjTrackShipCompanyBo.java

@@ -103,6 +103,11 @@ public class BjTrackShipCompanyBo extends BaseEntity {
     private String breakReason;
 
     /**
+     * 脱离状态
+     */
+    private String breakStatus;
+
+    /**
      * 开始时间搜索使用
      */
     private String startAddDate;

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjTrackShipCompanyVo.java

@@ -101,4 +101,9 @@ public class BjTrackShipCompanyVo implements Serializable {
      * 脱离原因
      */
     private String breakReason;
+
+    /**
+     * 脱离状态
+     */
+    private String breakStatus;
 }

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;
@@ -134,6 +140,7 @@ public class BjTrackShipCompanyServiceImpl implements IBjTrackShipCompanyService
     public Boolean updateBreak(BreakBo bo) {
         BjTrackShipCompany trackShipCompany = baseMapper.selectById(bo.getId());
         String[] breakDate = bo.getBreakDate();
+        trackShipCompany.setBreakStatus("1");
         trackShipCompany.setBreakDate(breakDate[0].split(" ")[0].concat("/").concat(breakDate[1].split(" ")[0]));
         trackShipCompany.setBreakReason(bo.getBreakReason());
         return baseMapper.updateById(trackShipCompany) > 0;

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjTrackShipCompanyMapper.xml

@@ -20,6 +20,7 @@
         <result property="reportFile" column="report_file"/>
         <result property="breakDate" column="break_date"/>
         <result property="breakReason" column="break_reason"/>
+        <result property="breakStatus" column="break_status"/>
     </resultMap>
     <select id="queryTrackShipCompanyList" resultMap="trackShipCompanyVoList">
         select track_ship_company_id,
@@ -37,7 +38,8 @@
                report_reason,
                report_file,
                break_date,
-               break_reason
+               break_reason,
+               break_status
         from bj_track_ship_company
         where del_flag = '0'
         <if test="bo.companyName != null and bo.companyName != ''">