不予通报、脱离接口

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjTrackShipCompanyController.java

@@ -1,13 +1,14 @@
 package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.bo.BjTrackShipCompanyBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.service.IBjTrackShipCompanyService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -80,6 +81,28 @@ public class BjTrackShipCompanyController extends BaseController {
     }
 
     /**
+     * 不予通报
+     */
+    @Operation(summary = "不予通报")
+//    @RequiresPermissions("business:trackShipCompany:edit")
+    @Log(title = "不予通报", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateReportFlag")
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+        return toAjax(bjTrackShipCompanyService.updateFlag(bo));
+    }
+
+    /**
+     * 脱离
+     */
+    @Operation(summary = "脱离")
+//    @RequiresPermissions("business:trackShipCompany:edit")
+    @Log(title = "脱离", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateBreak")
+    public AjaxResult updateBreak(@RequestBody BreakBo bo) throws ParseException {
+        return toAjax(bjTrackShipCompanyService.updateBreak(bo));
+    }
+
+    /**
      * 删除重点跟踪航运公司
      *
      * @param trackShipCompanyId 主键串

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

@@ -85,6 +85,31 @@ public class BjTrackShipCompany extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 是否删除  0：未删除  1：已删除
      */
     private String delFlag;

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

@@ -78,6 +78,31 @@ public class BjTrackShipCompanyBo extends BaseEntity {
     private String releaseFlag;
 
     /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
+
+    /**
      * 开始时间搜索使用
      */
     private String startAddDate;

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

@@ -0,0 +1,21 @@
+package com.ruoyi.business.domain.bo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BreakBo implements Serializable {
+
+    private String id;
+
+    private String[] breakDate;
+
+    private String breakReason;
+}

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

@@ -0,0 +1,21 @@
+package com.ruoyi.business.domain.bo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReportFlagBo implements Serializable {
+
+    private String id;
+
+    private String reportReason;
+
+    private String reportFile;
+}

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

@@ -77,4 +77,28 @@ public class BjTrackShipCompanyVo implements Serializable {
      */
     private String releaseFlag;
 
+    /**
+     * 不予通报  true  false
+     */
+    private String reportFlag;
+
+    /**
+     * 不予通报原因
+     */
+    private String reportReason;
+
+    /**
+     * 不予通报附近
+     */
+    private String reportFile;
+
+    /**
+     * 脱离日期
+     */
+    private String breakDate;
+
+    /**
+     * 脱离原因
+     */
+    private String breakReason;
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjTrackShipCompanyService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.bo.BjTrackShipCompanyBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjTrackShipCompanyVo;
 
 import java.text.ParseException;
@@ -55,4 +57,9 @@ public interface IBjTrackShipCompanyService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    Boolean updateFlag(ReportFlagBo bo);
+
+    Boolean updateBreak(BreakBo bo);
+
 }

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

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import com.ruoyi.business.domain.BjTrackShipCompany;
 import com.ruoyi.business.domain.bo.BjTrackShipCompanyBo;
+import com.ruoyi.business.domain.bo.BreakBo;
+import com.ruoyi.business.domain.bo.ReportFlagBo;
 import com.ruoyi.business.domain.vo.BjTrackShipCompanyVo;
 import com.ruoyi.business.mapper.BjTrackShipCompanyMapper;
 import com.ruoyi.business.service.IBjTrackShipCompanyService;
@@ -117,4 +119,23 @@ public class BjTrackShipCompanyServiceImpl implements IBjTrackShipCompanyService
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+
+    @Override
+    public Boolean updateFlag(ReportFlagBo bo) {
+        BjTrackShipCompany trackShipCompany = baseMapper.selectById(bo.getId());
+        trackShipCompany.setReleaseFlag("1");
+        trackShipCompany.setReportReason(bo.getReportReason());
+        trackShipCompany.setReportFile(bo.getReportFile());
+        return baseMapper.updateById(trackShipCompany) > 0;
+    }
+
+    @Override
+    public Boolean updateBreak(BreakBo bo) {
+        BjTrackShipCompany trackShipCompany = baseMapper.selectById(bo.getId());
+        String[] breakDate = bo.getBreakDate();
+        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

@@ -15,6 +15,11 @@
         <result property="releaseDate" column="release_date"/>
         <result property="file" column="file"/>
         <result property="releaseFlag" column="release_flag"/>
+        <result property="reportFlag" column="report_flag"/>
+        <result property="reportReason" column="report_reason"/>
+        <result property="reportFile" column="report_file"/>
+        <result property="breakDate" column="break_date"/>
+        <result property="breakReason" column="break_reason"/>
     </resultMap>
     <select id="queryTrackShipCompanyList" resultMap="trackShipCompanyVoList">
         select track_ship_company_id,
@@ -27,7 +32,12 @@
                concat(date_format(add_start_date,'%Y-%m-%d'), '/', date_format(add_end_date,'%Y-%m-%d')) as add_date,
                release_date,
                file,
-               release_flag
+               release_flag,
+               report_flag,
+               report_reason,
+               report_file,
+               break_date,
+               break_reason
         from bj_track_ship_company
         where del_flag = '0'
         <if test="bo.companyName != null and bo.companyName != ''">