凯和新需求添加

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TAddressController.java

@@ -57,6 +57,14 @@ public class TAddressController extends BaseController
         List<TAddress> list = tAddressService.selectTAddressList(tAddress);
         return getDataTable(list);
     }
+    @PreAuthorize("@ss.hasPermi('shipping:address:selectCarriageList')")
+    @GetMapping("/selectCarriageList")
+    public TableDataInfo selectCarriageList(TAddress tAddress)
+    {
+        startPage();
+        List<TAddress> list = tAddressService.selectCarriageList(tAddress);
+        return getDataTable(list);
+    }
 
     /**
      * 查询堆场信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TConditionAccessoryController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.shipping.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.shipping.domain.TConditionAccessory;
+import com.ruoyi.shipping.service.ITConditionAccessoryService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 凯和附件Controller
+ * 
+ * @author ruoyi
+ * @date 2021-04-01
+ */
+@RestController
+@RequestMapping("/shipping/accessory")
+public class TConditionAccessoryController extends BaseController
+{
+    @Autowired
+    private ITConditionAccessoryService tConditionAccessoryService;
+
+    /**
+     * 查询凯和附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('shipping:accessory:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TConditionAccessory tConditionAccessory)
+    {
+        startPage();
+        List<TConditionAccessory> list = tConditionAccessoryService.selectTConditionAccessoryList(tConditionAccessory);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出凯和附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('shipping:accessory:export')")
+    @Log(title = "凯和附件", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TConditionAccessory tConditionAccessory)
+    {
+        List<TConditionAccessory> list = tConditionAccessoryService.selectTConditionAccessoryList(tConditionAccessory);
+        ExcelUtil<TConditionAccessory> util = new ExcelUtil<TConditionAccessory>(TConditionAccessory.class);
+        return util.exportExcel(list, "accessory");
+    }
+
+    /**
+     * 获取凯和附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('shipping:accessory:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tConditionAccessoryService.selectTConditionAccessoryById(fId));
+    }
+
+    /**
+     * 新增凯和附件
+     */
+    @PreAuthorize("@ss.hasPermi('shipping:accessory:add')")
+    @Log(title = "凯和附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TConditionAccessory tConditionAccessory)
+    {
+        return toAjax(tConditionAccessoryService.insertTConditionAccessory(tConditionAccessory));
+    }
+
+    /**
+     * 修改凯和附件
+     */
+    @PreAuthorize("@ss.hasPermi('shipping:accessory:edit')")
+    @Log(title = "凯和附件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TConditionAccessory tConditionAccessory)
+    {
+        return toAjax(tConditionAccessoryService.updateTConditionAccessory(tConditionAccessory));
+    }
+
+    /**
+     * 删除凯和附件
+     */
+    @PreAuthorize("@ss.hasPermi('shipping:accessory:remove')")
+    @Log(title = "凯和附件", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tConditionAccessoryService.deleteTConditionAccessoryByIds(fIds));
+    }
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TCntrno.java

@@ -65,6 +65,9 @@ public class TCntrno extends BaseEntity
     /** 默认 T ,正常T 停用F 下拉选择 */
     @Excel(name = "默认 T ,正常T 停用F 下拉选择")
     private String fStatus;
+    /**数据字典 调箱动作*/
+    @Excel(name = "数据字典 调箱动作")
+    private String fOpctnstatus;
     //提单号
     private String fMblno;
     //箱主中文
@@ -101,7 +104,26 @@ public class TCntrno extends BaseEntity
     private Date foldtime;
     //修改信息
     private List<TCntrno> tCntrno;
-    public void setfId(Long fId) 
+    //附件信息
+    private List<TConditionAccessory> accessoryList;
+
+    public List<TConditionAccessory> getAccessoryList() {
+        return accessoryList;
+    }
+
+    public void setAccessoryList(List<TConditionAccessory> accessoryList) {
+        this.accessoryList = accessoryList;
+    }
+
+    public String getfOpctnstatus() {
+        return fOpctnstatus;
+    }
+
+    public void setfOpctnstatus(String fOpctnstatus) {
+        this.fOpctnstatus = fOpctnstatus;
+    }
+
+    public void setfId(Long fId)
     {
         this.fId = fId;
     }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TCntrtracking.java

@@ -66,6 +66,9 @@ public class TCntrtracking extends BaseEntity
     /** 默认 T ,正常T 停用F 下拉选择 */
     @Excel(name = "默认 T ,正常T 停用F 下拉选择")
     private String fStatus;
+    /**数据字典 调箱动作*/
+    @Excel(name = "数据字典 调箱动作")
+    private String fOpctnstatus;
     //箱主中文
     private String ownerName;
     //箱类型中文
@@ -83,6 +86,14 @@ public class TCntrtracking extends BaseEntity
     //地点中文名称
     private String addressName;
 
+    public String getfOpctnstatus() {
+        return fOpctnstatus;
+    }
+
+    public void setfOpctnstatus(String fOpctnstatus) {
+        this.fOpctnstatus = fOpctnstatus;
+    }
+
     public String getAddressName() {
         return addressName;
     }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TConditionAccessory.java

@@ -0,0 +1,167 @@
+package com.ruoyi.shipping.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 凯和附件对象 t_condition_accessory
+ * 
+ * @author ruoyi
+ * @date 2021-04-01
+ */
+public class TConditionAccessory extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long fId;
+
+    /** 对应主表id */
+    @Excel(name = "对应主表id")
+    private Long fPid;
+
+    /** 来源id */
+    @Excel(name = "来源id")
+    private Long fOrgId;
+
+    /** 行号 */
+    @Excel(name = "行号")
+    private Long fLineno;
+
+    /** 附件名称 */
+    @Excel(name = "附件名称")
+    private String fName;
+
+    /** 附件描述 */
+    @Excel(name = "附件描述")
+    private String fDesc;
+
+    /** 附件位置 */
+    @Excel(name = "附件位置")
+    private String fUrl;
+
+    /** 状态，默认 T ,正常T 停用F 下拉选择 */
+    @Excel(name = "状态，默认 T ,正常T 停用F 下拉选择")
+    private String fStatus;
+
+    /** 缩略图地址 */
+    @Excel(name = "缩略图地址")
+    private String fThumbnailUrl;
+
+    /** 删除状态 */
+    private String delFlag;
+
+    public void setfId(Long fId) 
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfPid(Long fPid) 
+    {
+        this.fPid = fPid;
+    }
+
+    public Long getfPid() 
+    {
+        return fPid;
+    }
+    public void setfOrgId(Long fOrgId) 
+    {
+        this.fOrgId = fOrgId;
+    }
+
+    public Long getfOrgId() 
+    {
+        return fOrgId;
+    }
+    public void setfLineno(Long fLineno) 
+    {
+        this.fLineno = fLineno;
+    }
+
+    public Long getfLineno() 
+    {
+        return fLineno;
+    }
+    public void setfName(String fName) 
+    {
+        this.fName = fName;
+    }
+
+    public String getfName() 
+    {
+        return fName;
+    }
+    public void setfDesc(String fDesc) 
+    {
+        this.fDesc = fDesc;
+    }
+
+    public String getfDesc() 
+    {
+        return fDesc;
+    }
+    public void setfUrl(String fUrl) 
+    {
+        this.fUrl = fUrl;
+    }
+
+    public String getfUrl() 
+    {
+        return fUrl;
+    }
+    public void setfStatus(String fStatus) 
+    {
+        this.fStatus = fStatus;
+    }
+
+    public String getfStatus() 
+    {
+        return fStatus;
+    }
+    public void setfThumbnailUrl(String fThumbnailUrl) 
+    {
+        this.fThumbnailUrl = fThumbnailUrl;
+    }
+
+    public String getfThumbnailUrl() 
+    {
+        return fThumbnailUrl;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fPid", getfPid())
+            .append("fOrgId", getfOrgId())
+            .append("fLineno", getfLineno())
+            .append("fName", getfName())
+            .append("fDesc", getfDesc())
+            .append("fUrl", getfUrl())
+            .append("fStatus", getfStatus())
+            .append("fThumbnailUrl", getfThumbnailUrl())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TAddressMapper.java

@@ -34,6 +34,14 @@ public interface TAddressMapper
      */
     public List<TAddress> selectTAddressList(TAddress tAddress);
 
+    /**
+     * 查看运输信息
+     * @param tAddress
+     * @return
+     */
+    public List<TAddress> selectCarriageList(TAddress tAddress);
+
+
     public List<Map<String, Object>> selectTAddressListMap(TAddress tAddress);
 
     /**

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TCntrnoMapper.java

@@ -40,7 +40,8 @@ public interface TCntrnoMapper
                                               @Param("address") String address,
                                               @Param("typeidName") String typeidName,
                                               @Param("cntrstatusName") String cntrstatusName,
-                                              @Param("updateEFName") String updateEFName);
+                                              @Param("updateEFName") String updateEFName,
+                                              @Param("cntrsize") Long cntrsize);
 
 
     /**

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TConditionAccessoryMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.shipping.mapper;
+
+import java.util.List;
+import com.ruoyi.shipping.domain.TConditionAccessory;
+
+/**
+ * 凯和附件Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-04-01
+ */
+public interface TConditionAccessoryMapper 
+{
+    /**
+     * 查询凯和附件
+     * 
+     * @param fId 凯和附件ID
+     * @return 凯和附件
+     */
+    public TConditionAccessory selectTConditionAccessoryById(Long fId);
+
+    /**
+     * 查询凯和附件列表
+     * 
+     * @param tConditionAccessory 凯和附件
+     * @return 凯和附件集合
+     */
+    public List<TConditionAccessory> selectTConditionAccessoryList(TConditionAccessory tConditionAccessory);
+
+    /**
+     * 新增凯和附件
+     * 
+     * @param tConditionAccessory 凯和附件
+     * @return 结果
+     */
+    public int insertTConditionAccessory(TConditionAccessory tConditionAccessory);
+
+    /**
+     * 修改凯和附件
+     * 
+     * @param tConditionAccessory 凯和附件
+     * @return 结果
+     */
+    public int updateTConditionAccessory(TConditionAccessory tConditionAccessory);
+
+    /**
+     * 删除凯和附件
+     * 
+     * @param fId 凯和附件ID
+     * @return 结果
+     */
+    public int deleteTConditionAccessoryById(Long fId);
+
+    /**
+     * 批量删除凯和附件
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTConditionAccessoryByIds(Long[] fIds);
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/ITAddressService.java

@@ -32,6 +32,12 @@ public interface ITAddressService
      * @return 地点基础信息（港口 码头 堆场 航线）集合
      */
     public List<TAddress> selectTAddressList(TAddress tAddress);
+    /**
+     * 查看运输信息
+     * @param tAddress
+     * @return
+     */
+    public List<TAddress> selectCarriageList(TAddress tAddress);
 
     public List<Map<String, Object>> selectTAddressListMap(TAddress tAddress);
 

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/ITConditionAccessoryService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.shipping.service;
+
+import java.util.List;
+import com.ruoyi.shipping.domain.TConditionAccessory;
+
+/**
+ * 凯和附件Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-04-01
+ */
+public interface ITConditionAccessoryService 
+{
+    /**
+     * 查询凯和附件
+     * 
+     * @param fId 凯和附件ID
+     * @return 凯和附件
+     */
+    public TConditionAccessory selectTConditionAccessoryById(Long fId);
+
+    /**
+     * 查询凯和附件列表
+     * 
+     * @param tConditionAccessory 凯和附件
+     * @return 凯和附件集合
+     */
+    public List<TConditionAccessory> selectTConditionAccessoryList(TConditionAccessory tConditionAccessory);
+
+    /**
+     * 新增凯和附件
+     * 
+     * @param tConditionAccessory 凯和附件
+     * @return 结果
+     */
+    public int insertTConditionAccessory(TConditionAccessory tConditionAccessory);
+
+    /**
+     * 修改凯和附件
+     * 
+     * @param tConditionAccessory 凯和附件
+     * @return 结果
+     */
+    public int updateTConditionAccessory(TConditionAccessory tConditionAccessory);
+
+    /**
+     * 批量删除凯和附件
+     * 
+     * @param fIds 需要删除的凯和附件ID
+     * @return 结果
+     */
+    public int deleteTConditionAccessoryByIds(Long[] fIds);
+
+    /**
+     * 删除凯和附件信息
+     * 
+     * @param fId 凯和附件ID
+     * @return 结果
+     */
+    public int deleteTConditionAccessoryById(Long fId);
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TAddressServiceImpl.java

@@ -55,6 +55,11 @@ public class TAddressServiceImpl implements ITAddressService
     }
 
     @Override
+    public List<TAddress> selectCarriageList(TAddress tAddress) {
+        return tAddressMapper.selectCarriageList(tAddress);
+    }
+
+    @Override
     public List<Map<String, Object>> selectTAddressListMap(TAddress tAddress) {
         return tAddressMapper.selectTAddressListMap(tAddress);
     }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrnoServiceImpl.java

@@ -8,14 +8,12 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.shipping.domain.TCntrtracking;
-import com.ruoyi.shipping.mapper.TAddressMapper;
-import com.ruoyi.shipping.mapper.TCntrMapper;
-import com.ruoyi.shipping.mapper.TCntrtrackingMapper;
+import com.ruoyi.shipping.domain.TConditionAccessory;
+import com.ruoyi.shipping.mapper.*;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.shipping.mapper.TCntrnoMapper;
 import com.ruoyi.shipping.domain.TCntrno;
 import com.ruoyi.shipping.service.ITCntrnoService;
 
@@ -38,6 +36,8 @@ public class TCntrnoServiceImpl implements ITCntrnoService
     private SysDictDataMapper sysDictDataMapper;
     @Autowired
     private TAddressMapper tAddressMapper;
+    @Autowired
+    private TConditionAccessoryMapper tConditionAccessoryMapper;
 
     /**
      * 查询集装箱号
@@ -91,6 +91,7 @@ public class TCntrnoServiceImpl implements ITCntrnoService
         int update = 0;
         if (CollectionUtils.isNotEmpty(tCntrno)){
             for (TCntrno cntrno : tCntrno) {
+                String remark = cntrno.getRemark();
                 cntrno.setUpdateTime(DateUtils.getNowDate());
                 cntrno.setUpdateBy(SecurityUtils.getUsername());
                 //最新时间
@@ -111,6 +112,9 @@ public class TCntrnoServiceImpl implements ITCntrnoService
                 if (StringUtils.isNotEmpty(cntrno.getFoldFCntrstatus())){
                     cntrno.setfCntrstatus(cntrno.getFoldFCntrstatus());
                 }
+                if (StringUtils.isNotEmpty(remark)){
+                    cntrno.setRemark(null);
+                }
                 //更改t_cntro表信息
                 update = tCntrnoMapper.updateTCntrno((cntrno));
                 //保存信息
@@ -120,8 +124,26 @@ public class TCntrnoServiceImpl implements ITCntrnoService
                 }else {
                     cntrnoById.setfStatus("F");
                 }
+                if (StringUtils.isNotEmpty(cntrno.getfMblno())){//提单号
+                    cntrnoById.setfMblno(cntrno.getfMblno());
+                }
+                if (StringUtils.isNotEmpty(cntrno.getfVoy())){//航次
+                    cntrnoById.setfVoy(cntrno.getfVoy());
+                }
+                if (StringUtils.isNotEmpty(cntrno.getfVsl())){//船名
+                    cntrnoById.setfVsl(cntrno.getfVsl());
+                }
+                if (StringUtils.isNotEmpty(remark)){
+                    cntrnoById.setRemark(remark);
+                }
                 TCntrtracking setfield = setfield(cntrnoById);
                 tCntrtrackingMapper.insertTCntrtracking(setfield);
+                if (CollectionUtils.isNotEmpty(cntrno.getAccessoryList())){
+                    for (TConditionAccessory tConditionAccessory : cntrno.getAccessoryList()) {
+                        tConditionAccessory.setfPid(setfield.getfId());
+                        tConditionAccessoryMapper.insertTConditionAccessory(tConditionAccessory);
+                    }
+                }
             }
         }
         return update;
@@ -180,7 +202,7 @@ public class TCntrnoServiceImpl implements ITCntrnoService
 
     @Override
     public List<TCntrno> selectTcntrnoMessage(TCntrno tCntrno) {
-        return tCntrnoMapper.selectTcntrnoMessage(tCntrno,null,null,null,null);
+        return tCntrnoMapper.selectTcntrnoMessage(tCntrno,null,null,null,null,null);
     }
 
     @Override
@@ -219,7 +241,7 @@ public class TCntrnoServiceImpl implements ITCntrnoService
         if (StringUtils.isNotEmpty(tCntrno.getUpdateEFName())){
             updateEFName = tCntrno.getUpdateEFName();
         }
-        return tCntrnoMapper.selectTcntrnoMessage(tCntrno,address,typeidName,cntrstatusName,updateEFName);
+        return tCntrnoMapper.selectTcntrnoMessage(tCntrno,address,typeidName,cntrstatusName,updateEFName,tCntrno.getCntrsize());
     }
 
     @Override

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TConditionAccessoryServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.shipping.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.shipping.mapper.TConditionAccessoryMapper;
+import com.ruoyi.shipping.domain.TConditionAccessory;
+import com.ruoyi.shipping.service.ITConditionAccessoryService;
+
+/**
+ * 凯和附件Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-04-01
+ */
+@Service
+public class TConditionAccessoryServiceImpl implements ITConditionAccessoryService 
+{
+    @Autowired
+    private TConditionAccessoryMapper tConditionAccessoryMapper;
+
+    /**
+     * 查询凯和附件
+     * 
+     * @param fId 凯和附件ID
+     * @return 凯和附件
+     */
+    @Override
+    public TConditionAccessory selectTConditionAccessoryById(Long fId)
+    {
+        return tConditionAccessoryMapper.selectTConditionAccessoryById(fId);
+    }
+
+    /**
+     * 查询凯和附件列表
+     * 
+     * @param tConditionAccessory 凯和附件
+     * @return 凯和附件
+     */
+    @Override
+    public List<TConditionAccessory> selectTConditionAccessoryList(TConditionAccessory tConditionAccessory)
+    {
+        return tConditionAccessoryMapper.selectTConditionAccessoryList(tConditionAccessory);
+    }
+
+    /**
+     * 新增凯和附件
+     * 
+     * @param tConditionAccessory 凯和附件
+     * @return 结果
+     */
+    @Override
+    public int insertTConditionAccessory(TConditionAccessory tConditionAccessory)
+    {
+        tConditionAccessory.setCreateTime(DateUtils.getNowDate());
+        return tConditionAccessoryMapper.insertTConditionAccessory(tConditionAccessory);
+    }
+
+    /**
+     * 修改凯和附件
+     * 
+     * @param tConditionAccessory 凯和附件
+     * @return 结果
+     */
+    @Override
+    public int updateTConditionAccessory(TConditionAccessory tConditionAccessory)
+    {
+        tConditionAccessory.setUpdateTime(DateUtils.getNowDate());
+        return tConditionAccessoryMapper.updateTConditionAccessory(tConditionAccessory);
+    }
+
+    /**
+     * 批量删除凯和附件
+     * 
+     * @param fIds 需要删除的凯和附件ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTConditionAccessoryByIds(Long[] fIds)
+    {
+        return tConditionAccessoryMapper.deleteTConditionAccessoryByIds(fIds);
+    }
+
+    /**
+     * 删除凯和附件信息
+     * 
+     * @param fId 凯和附件ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTConditionAccessoryById(Long fId)
+    {
+        return tConditionAccessoryMapper.deleteTConditionAccessoryById(fId);
+    }
+}

ruoyi-shipping/src/main/resources/mapper/shipping/TAddressMapper.xml

@@ -91,6 +91,65 @@
         </if>
         ORDER BY CONVERT(t.f_name USING gbk) asc
     </select>
+    <select id="selectCarriageList" parameterType="TAddress" resultMap="TAddressResult">
+        SELECT
+        t.f_id,
+        t.f_types,
+        t.f_no,
+        t.f_name,
+        t.f_ename,
+        t.f_laneid,
+        t.f_portid,
+        t.f_country,
+        t.f_province,
+        t.f_city,
+        t.f_tel,
+        t.f_email,
+        t.f_managerid,
+        su.user_name managerName,
+        t.f_uncode,
+        t.f_port,
+        CASE
+
+        WHEN t.f_status = 'T' THEN
+        '正常' ELSE '停用'
+        END AS f_status,
+        t.create_by,
+        t.create_time,
+        t.update_by,
+        t.update_time,
+        t.remark
+        FROM
+        t_address t
+        LEFT JOIN ( SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'f_types' ) s ON t.f_types =
+        s.dict_value
+        LEFT JOIN sys_user su ON su.user_id = t.f_managerid
+        WHERE
+        t.f_status = 'T'
+        AND s.dict_label = '运输'
+        <if test="fTypes != null  and fTypes != ''">and t.f_types = #{fTypes}</if>
+        <if test="fNo != null  and fNo != ''">and t.f_no = #{fNo}</if>
+        <if test="fName != null  and fName != ''">and t.f_name like concat('%', #{fName}, '%')</if>
+        <if test="fEname != null  and fEname != ''">and t.f_ename like concat('%', #{fEname}, '%')</if>
+        <if test="fLaneid != null ">and t.f_laneid = #{fLaneid}</if>
+        <if test="fPortid != null ">and t.f_portid = #{fPortid}</if>
+        <if test="fCountry != null  and fCountry != ''">and t.f_country = #{fCountry}</if>
+        <if test="fProvince != null  and fProvince != ''">and t.f_province = #{fProvince}</if>
+        <if test="fCity != null  and fCity != ''">and t.f_city = #{fCity}</if>
+        <if test="fTel != null  and fTel != ''">and t.f_tel = #{fTel}</if>
+        <if test="fEmail != null  and fEmail != ''">and t.f_email = #{fEmail}</if>
+        <if test="fManagerid != null ">and t.f_managerid = #{fManagerid}</if>
+        <if test="fUncode != null  and fUncode != ''">and t.f_uncode = #{fUncode}</if>
+        <if test="fPort != null  and fPort != ''">and t.f_port = #{fPort}</if>
+        <if test="fStatus != null  and fStatus != ''">and t.f_status = #{fStatus}</if>
+        <if test='cLoadDate != null and cLoadDate[0] != null and cLoadDate[0]!= ""'>
+            and t.create_time &gt;= #{cLoadDate[0]}
+        </if>
+        <if test='cLoadDate != null and cLoadDate[1] != null and cLoadDate[1]!= ""'>
+            and t.create_time &lt;= #{cLoadDate[1]}
+        </if>
+        ORDER BY CONVERT(t.f_name USING gbk) asc
+    </select>
 
     <select id="selectTAddressBasicList" parameterType="TAddress" resultMap="TAddressResult">
          select f_id, f_types, f_no, f_name from t_address

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrnoMapper.xml

@@ -21,10 +21,11 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="fOpctnstatus" column="f_opctnstatus"/>
     </resultMap>
 
     <sql id="selectTCntrnoVo">
-        select f_id, f_no, f_typeid, f_owner, f_source, f_rent, f_updatetime, f_updateaddress, f_updateEF, f_cntrstatus, case when f_status = 'T' then '正常' else '停用' end as f_status, create_by, create_time, update_by, update_time, remark from t_cntrno
+        select f_id, f_no, f_typeid, f_owner, f_source, f_rent, f_updatetime, f_updateaddress, f_updateEF, f_cntrstatus, case when f_status = 'T' then '正常' else '停用' end as f_status,f_opctnstatus,create_by, create_time, update_by, update_time, remark from t_cntrno
     </sql>
 
     <select id="selectTCntrnoList" parameterType="TCntrno" resultMap="TCntrnoResult">
@@ -40,6 +41,7 @@
             <if test="fUpdateef != null  and fUpdateef != ''">and f_updateEF = #{fUpdateef}</if>
             <if test="fCntrstatus != null  and fCntrstatus != ''">and f_cntrstatus = #{fCntrstatus}</if>
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
+            <if test="fOpctnstatus != null  and fOpctnstatus != ''">and f_opctnstatus = #{fOpctnstatus}</if>
             <if test='cLoadDate != null and cLoadDate[0] != null and cLoadDate[0]!= ""'>
                 and create_time &gt;= #{cLoadDate[0]}
             </if>
@@ -70,6 +72,7 @@
         tc.f_cntrstatus,
         pr.dict_label cntrstatusName,
         case when tc.f_status = 'T' then '正常' else '停用' end as f_status,
+        tc.f_opctnstatus,
         tc.create_by,
         tc.create_time,
         tc.update_by,
@@ -103,6 +106,7 @@
             <if test="tc.fUpdateef != null  and tc.fUpdateef != ''">and tc.f_updateEF = #{tc.fUpdateef}</if>
             <if test="tc.fCntrstatus != null  and tc.fCntrstatus != ''">and tc.f_cntrstatus = #{tc.fCntrstatus}</if>
             <if test="tc.fStatus != null  and tc.fStatus != ''">and tc.f_status = #{tc.fStatus}</if>
+            <if test="tc.fOpctnstatus != null  and tc.fOpctnstatus != ''">and tc.f_opctnstatus = #{tc.fOpctnstatus}</if>
             <if test='tc.cLoadDate != null and tc.cLoadDate[0] != null and tc.cLoadDate[0]!= ""'>
                 and tc.create_time &gt;= #{tc.cLoadDate[0]}
             </if>
@@ -113,6 +117,7 @@
             <if test="typeidName != null  and typeidName != ''">and t.f_name = #{typeidName}</if>
             <if test="cntrstatusName != null  and cntrstatusName != ''">and pr.dict_label = #{cntrstatusName}</if>
             <if test="updateEFName != null  and updateEFName != ''">and sdda.dict_label = #{updateEFName}</if>
+            <if test="cntrsize != null ">and t.f_cntrsize = #{cntrsize}</if>
         </where>
         ORDER BY tc.f_no,CONVERT(tc.f_updateaddress USING gbk),CONVERT(t.f_no USING gbk),
         tc.f_updateEF,tc.f_cntrstatus,tc.f_owner
@@ -140,6 +145,7 @@
         tc.f_cntrstatus,
         pr.dict_label cntrstatusName,
         case when tc.f_status = 'T' then '正常' else '停用' end as f_status,
+        tc.f_opctnstatus,
         tc.create_by,
         tc.create_time,
         tc.update_by,
@@ -178,6 +184,7 @@
             <if test="fUpdateef != null and fUpdateef != ''">f_updateEF,</if>
             <if test="fCntrstatus != null and fCntrstatus != ''">f_cntrstatus,</if>
             <if test="fStatus != null">f_status,</if>
+            <if test="fOpctnstatus != null  and fOpctnstatus != ''">f_opctnstatus,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -195,6 +202,7 @@
             <if test="fUpdateaddress != null and fUpdateaddress != ''">#{fUpdateaddress},</if>
             <if test="fUpdateef != null and fUpdateef != ''">#{fUpdateef},</if>
             <if test="fCntrstatus != null and fCntrstatus != ''">#{fCntrstatus},</if>
+            <if test="fOpctnstatus != null  and fOpctnstatus != ''">#{fOpctnstatus},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -217,6 +225,7 @@
             <if test="fUpdateef != null and fUpdateef != ''">f_updateEF = #{fUpdateef},</if>
             <if test="fCntrstatus != null and fCntrstatus != ''">f_cntrstatus = #{fCntrstatus},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
+            <if test="fOpctnstatus != null  and fOpctnstatus != ''">f_opctnstatus = #{fOpctnstatus},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrtrackingMapper.xml

@@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="fOpctnstatus" column="f_opctnstatus"/>
     </resultMap>
 
     <sql id="selectTCntrtrackingVo">
-        select f_id, f_no, f_mblno, f_typeid, f_owner, f_vsl, f_voy, f_updatetime, f_updateaddress, f_updateEF, f_cntrstatus, f_status, create_by, create_time, update_by, update_time, remark from t_cntrtracking
+        select f_id, f_no, f_mblno, f_typeid, f_owner, f_vsl, f_voy, f_updatetime, f_updateaddress, f_updateEF, f_cntrstatus, case when f_status = 'T' then '正常' else '停用' end as f_status,f_opctnstatus, create_by, create_time, update_by, update_time, remark from t_cntrtracking
     </sql>
 
     <select id="selectTCntrtrackingList" parameterType="TCntrtracking" resultMap="TCntrtrackingResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tc.f_cntrstatus,
         pr.dict_label cntrstatusName,
         case when tc.f_status = 'T' then '正常' else '停用' end as f_status,
+        tc.f_opctnstatus,
         tc.create_by,
         tc.create_time,
         tc.update_by,
@@ -78,11 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUpdateef != null  and fUpdateef != ''"> and tc.f_updateEF = #{fUpdateef}</if>
             <if test="fCntrstatus != null  and fCntrstatus != ''"> and tc.f_cntrstatus = #{fCntrstatus}</if>
             <if test="fStatus != null  and fStatus != ''"> and tc.f_status = #{fStatus}</if>
+            <if test="fOpctnstatus != null  and fOpctnstatus != ''">and f_opctnstatus = #{fOpctnstatus}</if>
             <if test='cLoadDate != null and cLoadDate[0] != null and cLoadDate[0]!= ""'>
-                and tc.create_time &gt;= #{cLoadDate[0]}
+                and tc.fUpdatetime &gt;= #{cLoadDate[0]}
             </if>
             <if test='cLoadDate != null and cLoadDate[1] != null and cLoadDate[1]!= ""'>
-                and tc.create_time &lt;= #{cLoadDate[1]}
+                and tc.fUpdatetime &lt;= #{cLoadDate[1]}
             </if>
         </where>
         ORDER BY tc.f_updatetime desc,tc.f_no
@@ -94,6 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTCntrtracking" parameterType="TCntrtracking">
+        <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="fId">
+            SELECT LAST_INSERT_ID() AS fId
+        </selectKey>
         insert into t_cntrtracking
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="fId != null">f_id,</if>
@@ -107,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUpdateaddress != null">f_updateaddress,</if>
             <if test="fUpdateef != null">f_updateEF,</if>
             <if test="fCntrstatus != null and fCntrstatus != ''">f_cntrstatus,</if>
+            <if test="fOpctnstatus != null  and fOpctnstatus != ''">f_opctnstatus,</if>
             <if test="fStatus != null">f_status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -126,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUpdateaddress != null">#{fUpdateaddress},</if>
             <if test="fUpdateef != null">#{fUpdateef},</if>
             <if test="fCntrstatus != null and fCntrstatus != ''">#{fCntrstatus},</if>
+            <if test="fOpctnstatus != null  and fOpctnstatus != ''">#{fOpctnstatus},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -149,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUpdateef != null">f_updateEF = #{fUpdateef},</if>
             <if test="fCntrstatus != null and fCntrstatus != ''">f_cntrstatus = #{fCntrstatus},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
+            <if test="fOpctnstatus != null  and fOpctnstatus != ''">f_opctnstatus = #{fOpctnstatus},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

ruoyi-shipping/src/main/resources/mapper/shipping/TConditionAccessoryMapper.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.shipping.mapper.TConditionAccessoryMapper">
+    
+    <resultMap type="TConditionAccessory" id="TConditionAccessoryResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fPid"    column="f_pid"    />
+        <result property="fOrgId"    column="f_org_id"    />
+        <result property="fLineno"    column="f_lineno"    />
+        <result property="fName"    column="f_name"    />
+        <result property="fDesc"    column="f_desc"    />
+        <result property="fUrl"    column="f_url"    />
+        <result property="fStatus"    column="f_status"    />
+        <result property="fThumbnailUrl"    column="f_thumbnail_url"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTConditionAccessoryVo">
+        select f_id, f_pid, f_org_id, f_lineno, f_name, f_desc, f_url, f_status, f_thumbnail_url, del_flag, create_by, create_time, update_by, update_time, remark from t_condition_accessory
+    </sql>
+
+    <select id="selectTConditionAccessoryList" parameterType="TConditionAccessory" resultMap="TConditionAccessoryResult">
+        <include refid="selectTConditionAccessoryVo"/>
+        <where>  
+            <if test="fPid != null "> and f_pid = #{fPid}</if>
+            <if test="fOrgId != null "> and f_org_id = #{fOrgId}</if>
+            <if test="fLineno != null "> and f_lineno = #{fLineno}</if>
+            <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
+            <if test="fDesc != null  and fDesc != ''"> and f_desc = #{fDesc}</if>
+            <if test="fUrl != null  and fUrl != ''"> and f_url = #{fUrl}</if>
+            <if test="fStatus != null  and fStatus != ''"> and f_status = #{fStatus}</if>
+            <if test="fThumbnailUrl != null  and fThumbnailUrl != ''"> and f_thumbnail_url = #{fThumbnailUrl}</if>
+        </where>
+    </select>
+    
+    <select id="selectTConditionAccessoryById" parameterType="Long" resultMap="TConditionAccessoryResult">
+        <include refid="selectTConditionAccessoryVo"/>
+        where f_id = #{fId}
+    </select>
+        
+    <insert id="insertTConditionAccessory" parameterType="TConditionAccessory" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_condition_accessory
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fPid != null">f_pid,</if>
+            <if test="fOrgId != null">f_org_id,</if>
+            <if test="fLineno != null">f_lineno,</if>
+            <if test="fName != null">f_name,</if>
+            <if test="fDesc != null">f_desc,</if>
+            <if test="fUrl != null">f_url,</if>
+            <if test="fStatus != null">f_status,</if>
+            <if test="fThumbnailUrl != null">f_thumbnail_url,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fPid != null">#{fPid},</if>
+            <if test="fOrgId != null">#{fOrgId},</if>
+            <if test="fLineno != null">#{fLineno},</if>
+            <if test="fName != null">#{fName},</if>
+            <if test="fDesc != null">#{fDesc},</if>
+            <if test="fUrl != null">#{fUrl},</if>
+            <if test="fStatus != null">#{fStatus},</if>
+            <if test="fThumbnailUrl != null">#{fThumbnailUrl},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTConditionAccessory" parameterType="TConditionAccessory">
+        update t_condition_accessory
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fPid != null">f_pid = #{fPid},</if>
+            <if test="fOrgId != null">f_org_id = #{fOrgId},</if>
+            <if test="fLineno != null">f_lineno = #{fLineno},</if>
+            <if test="fName != null">f_name = #{fName},</if>
+            <if test="fDesc != null">f_desc = #{fDesc},</if>
+            <if test="fUrl != null">f_url = #{fUrl},</if>
+            <if test="fStatus != null">f_status = #{fStatus},</if>
+            <if test="fThumbnailUrl != null">f_thumbnail_url = #{fThumbnailUrl},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTConditionAccessoryById" parameterType="Long">
+        delete from t_condition_accessory where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTConditionAccessoryByIds" parameterType="String">
+        delete from t_condition_accessory where f_id in 
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+    
+</mapper>