航运基础资料完善

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

@@ -90,7 +90,7 @@ public class TAddressController extends BaseController
      * @param tAddress
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('shipping:address:selectPortName')")
+    //@PreAuthorize("@ss.hasPermi('shipping:address:selectPortName')")
     @GetMapping("/selectPortName")
     public TableDataInfo selectPortName(TAddress tAddress)
     {
@@ -103,7 +103,7 @@ public class TAddressController extends BaseController
      * @param tAddress
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('shipping:address:selectWharfName')")
+    //@PreAuthorize("@ss.hasPermi('shipping:address:selectWharfName')")
     @GetMapping("/selectWharfName")
     public TableDataInfo selectWharfName(TAddress tAddress)
     {
@@ -116,7 +116,7 @@ public class TAddressController extends BaseController
      * @param tAddress
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('shipping:address:selectStorageName')")
+    //@PreAuthorize("@ss.hasPermi('shipping:address:selectStorageName')")
     @GetMapping("/selectStorageName")
     public TableDataInfo selectStorageName(TAddress tAddress)
     {
@@ -129,7 +129,7 @@ public class TAddressController extends BaseController
      * @param tAddress
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('shipping:address:selectAirLineName')")
+    //@PreAuthorize("@ss.hasPermi('shipping:address:selectAirLineName')")
     @GetMapping("/selectAirLineName")
     public TableDataInfo selectAirLineName(TAddress tAddress)
     {
@@ -228,7 +228,7 @@ public class TAddressController extends BaseController
     /**
      * 获取地点基础信息（港口 码头 堆场 航线）详细信息
      */
-    @PreAuthorize("@ss.hasPermi('shipping:address:selectAddressFno')")
+    //@PreAuthorize("@ss.hasPermi('shipping:address:selectAddressFno')")
     @PostMapping(value = "/selectAddressFno")
     public AjaxResult selectAddressFno(@RequestBody TAddress tAddress)
     {
@@ -246,7 +246,7 @@ public class TAddressController extends BaseController
     /**
      * 获取地点基础信息（港口 码头 堆场 航线）详细信息
      */
-    @PreAuthorize("@ss.hasPermi('shipping:address:selectAddressFName')")
+    //@PreAuthorize("@ss.hasPermi('shipping:address:selectAddressFName')")
     @PostMapping(value = "/selectAddressFName")
     public AjaxResult getInfo(@RequestBody TAddress tAddress)
     {
@@ -263,12 +263,12 @@ public class TAddressController extends BaseController
     /**
      * 查询地点基础信息（港口 码头 堆场 航线）列表
      */
-    @PreAuthorize("@ss.hasPermi('shipping:address:selectadress')")
+    //@PreAuthorize("@ss.hasPermi('shipping:address:selectadress')")
     @GetMapping("/selectadress")
     public TableDataInfo selectadress( )
     {
         startPage();
-        List<Map<String, Object>> list = tAddressService.selectadress();
+        List<TAddress> list = tAddressService.selectadress();
         return getDataTable(list);
     }
 }

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

@@ -128,7 +128,7 @@ public class TCntrController extends BaseController
     /**
      * 查询集装箱编号
      */
-    @PreAuthorize("@ss.hasPermi('shipping:cntr:selectRcntrName')")
+    //@PreAuthorize("@ss.hasPermi('shipping:cntr:selectRcntrName')")
     @GetMapping("/selectRcntrName")
     public TableDataInfo selectRcntrName(TCntr tCntr)
     {
@@ -139,7 +139,7 @@ public class TCntrController extends BaseController
     /**
      * 获取集装箱编号
      */
-    @PreAuthorize("@ss.hasPermi('shipping:cntr:selectTcnrFno')")
+    //@PreAuthorize("@ss.hasPermi('shipping:cntr:selectTcnrFno')")
     @GetMapping(value = "/selectTcnrFno/{fNo}")
     public AjaxResult selectTcnrFno(@PathVariable("fNo") String fNo)
     {
@@ -152,9 +152,9 @@ public class TCntrController extends BaseController
 
     }
     /**
-     * 获取集装箱详细信息
+     * 获取集装箱名称
      */
-    @PreAuthorize("@ss.hasPermi('shipping:cntr:selectTcnrFName')")
+    //@PreAuthorize("@ss.hasPermi('shipping:cntr:selectTcnrFName')")
     @GetMapping(value = "/selectTcnrFName/{fName}")
     public AjaxResult selectTcnrFName(@PathVariable("fName") String fName)
     {

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

@@ -160,7 +160,7 @@ public class TCntrnoController extends BaseController
     /**
      * 查询集装箱动态分布标签
      */
-    @PreAuthorize("@ss.hasPermi('shipping:cntrno:getTCntrnoChange')")
+    //@PreAuthorize("@ss.hasPermi('shipping:cntrno:getTCntrnoChange')")
     @GetMapping("/getTCntrnoChange")
     public TableDataInfo getTCntrnoChange(TCntrno tCntrno)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -194,4 +194,10 @@ public class SysUserController extends BaseController {
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUserStatus(user));
     }
+    @GetMapping("/selectUserNameFO")
+    public TableDataInfo selectUserNameFO() {
+        startPage();
+        List<Map<String, Object>> list = userService.selectUserNameFO();
+        return getDataTable(list);
+    }
 }

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

@@ -84,11 +84,11 @@ public class TAddress extends BaseEntity
     /** 默认 T ,正常T 停用F 下拉选择 */
     @Excel(name = "默认 T ,正常T 停用F 下拉选择")
     private String fStatus;
-    @TableField(exist = false)
+    //航线中文名称
     private String portName;
-    @TableField(exist = false)
+    //地点类型中文名称
     private String typesName;
-    @TableField(exist = false)
+    //港口类型中文名称
     private String havenName;
     //查询时间区间
     private List<String> cLoadDate;

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

@@ -145,5 +145,5 @@ public interface TAddressMapper
      * @param
      * @return
      */
-    public List<Map<String, Object>> selectadress();
+    public List<TAddress> selectadress();
 }

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

@@ -139,5 +139,5 @@ public interface ITAddressService
      * 查询地点
      * @return
      */
-    public List<Map<String, Object>> selectadress();
+    public List<TAddress> selectadress();
 }

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

@@ -170,7 +170,7 @@ public class TAddressServiceImpl implements ITAddressService
     }
 
     @Override
-    public List<Map<String, Object>> selectadress() {
+    public List<TAddress> selectadress() {
         return tAddressMapper.selectadress();
     }
 }

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

@@ -71,6 +71,7 @@ public class TCntrnoServiceImpl implements ITCntrnoService
         tCntrno.setCreateTime(DateUtils.getNowDate());
         tCntrno.setCreateBy(SecurityUtils.getUsername());
         tCntrno.setfUpdatetime(DateUtils.getNowDate());
+        tCntrno.setfStatus("T");
         return tCntrnoMapper.insertTCntrno(tCntrno);
     }
 
@@ -241,6 +242,7 @@ public class TCntrnoServiceImpl implements ITCntrnoService
     public TCntrtracking  setfield(TCntrno tCntrno){
         TCntrtracking tCntrtracking = new TCntrtracking();
         BeanUtils.copyProperties(tCntrno,tCntrtracking);
+        tCntrtracking.setfId(null);
         return tCntrtracking;
     }
     public List<String> GetMapKey(List<Map<String, Object>> listResult)

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

@@ -228,7 +228,7 @@
     <!--批量更新数据状态-->
     <update id="updateTAddressStatus" parameterType="string">
         update t_address
-        set f_status = F
+        set f_status = 'F'
         where f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">
             #{fId}
@@ -270,7 +270,7 @@
         t_address t
         LEFT JOIN t_address d ON t.f_portid = d.f_id
         LEFT JOIN sys_dict_data pro ON pro.dict_value = t.f_types and pro.dict_type = 'f_types'
-        LEFT JOIN sys_dict_data pros ON pros.dict_value = t.f_types and pros.dict_type = 'f_port'
+        LEFT JOIN sys_dict_data pros ON pros.dict_value = t.f_port and pros.dict_type = 'f_port'
         <where>
             t.f_status = 'T'
             and pro.dict_label = '堆场'
@@ -335,7 +335,7 @@
         t_address t
         LEFT JOIN t_address d ON t.f_portid = d.f_id
         LEFT JOIN sys_dict_data pro ON pro.dict_value = t.f_types and pro.dict_type = 'f_types'
-        LEFT JOIN sys_dict_data pros ON pros.dict_value = t.f_types and pros.dict_type = 'f_port'
+        LEFT JOIN sys_dict_data pros ON pros.dict_value = t.f_port and pros.dict_type = 'f_port'
         <where>
             t.f_status = 'T'
             and pro.dict_label = '码头'
@@ -459,7 +459,7 @@
         t_address t
         LEFT JOIN t_address d ON t.f_laneid = d.f_id
         LEFT JOIN sys_dict_data pro ON pro.dict_value = t.f_types and pro.dict_type = 'f_types'
-        LEFT JOIN sys_dict_data pros ON pros.dict_value = t.f_types and pros.dict_type = 'f_port'
+        LEFT JOIN sys_dict_data pros ON pros.dict_value = t.f_port and pros.dict_type = 'f_port'
         <where>
             t.f_status = 'T'
             and pro.dict_label = '港口'
@@ -507,9 +507,10 @@
         and f_name = #{fName}
         ORDER BY  CONVERT(f_name USING gbk) asc
     </select>
-    <select id="selectadress" resultType="map">
+    <select id="selectadress" parameterType="TAddress" resultMap="TAddressResult">
         SELECT
-            t.f_name fName,
+            t.f_id,
+            t.f_name ,
             pro.dict_label typesName
         FROM
             t_address t

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

@@ -90,6 +90,7 @@
         LEFT JOIN sys_dict_data prs ON prs.dict_value = t.f_cntrsize
         AND prs.dict_type = 'f_cntrsize'
         <where>
+            tc.f_status = 'T'
             <if test="fNo != null  and fNo != ''">and tc.f_no = #{fNo}</if>
             <if test="fTypeid != null ">and tc.f_typeid = #{fTypeid}</if>
             <if test="fOwner != null  and fOwner != ''">and tc.f_owner = #{fOwner}</if>
@@ -107,6 +108,8 @@
                 and tc.create_time &lt;= #{cLoadDate[1]}
             </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
     </select>
 
     <select id="selectTCntrnoById" parameterType="Long" resultMap="TCntrnoResult">
@@ -228,7 +231,7 @@
     <!--批量更新数据状态-->
     <update id="updateTcntrnoStatus" parameterType="string">
         update t_cntrno
-        set f_status = F
+        set f_status = 'F'
         where f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">
             #{fId}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户表 数据层
@@ -150,4 +151,8 @@ public interface SysUserMapper {
      * @return  结果
      */
     SysUser warehouseSelectUserByTel(String phonenumber);
+    /**
+     * 凯和获取航线管理员
+     */
+    List<Map<String, Object>>selectUserNameFO();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.service;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户 业务层
@@ -164,4 +165,10 @@ public interface ISysUserService {
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 凯和获取航线管理员
+     * @return
+     */
+    public List<Map<String, Object>>selectUserNameFO();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -31,6 +31,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户 业务层处理
@@ -439,6 +440,11 @@ public class SysUserServiceImpl implements ISysUserService {
         return successMsg.toString();
     }
 
+    @Override
+    public List<Map<String, Object>> selectUserNameFO() {
+        return userMapper.selectUserNameFO();
+    }
+
     /**
      * 小程序授权小程序
      *

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -239,5 +239,15 @@
 			#{userId}
 		</foreach>
 	</delete>
+	<select id="selectUserNameFO" resultType="map">
+		SELECT
+			user_id userId,
+			user_name userName
+		FROM
+			sys_user
+		WHERE status = '0'
+		ORDER BY
+			user_id
+	</select>
 
 </mapper>