个人长期车辆

snowy-admin-web/src/views/biz/bizship/detail.vue

@@ -11,7 +11,7 @@
 				</a-descriptions-item>
 
 				<a-descriptions-item label="荷载吨位" :span="2">{{ formData.shipLoad }}</a-descriptions-item>
-				<a-descriptions-item label="船舶所有人" :span="2">{{ formData.shipName }}</a-descriptions-item>
+				<a-descriptions-item label="船舶所有人" :span="2">{{ formData.shipOwner }}</a-descriptions-item>
 				<a-descriptions-item label="船舶身份信息" :span="2">{{ formData.shipIdentity }}</a-descriptions-item>
 				<a-descriptions-item label="联系人姓名" :span="2">{{ formData.contactName }}</a-descriptions-item>
 				<a-descriptions-item label="联系人电话" :span="2">{{ formData.contactPhone }}</a-descriptions-item>
@@ -26,7 +26,7 @@
 				<a-descriptions-item label="状态" :span="2" v-if="formData.status=='1'">启用</a-descriptions-item>
 				<a-descriptions-item label="状态" :span="2" v-else>关闭</a-descriptions-item>
 				<a-descriptions-item label="船舶注册号码" :span="2">{{ formData.registerNumber}}</a-descriptions-item>
-<!--				<a-descriptions-item label="船主" :span="2">{{ formData.shipName}}</a-descriptions-item>-->
+				<a-descriptions-item label="船主" :span="2">{{ formData.shipName}}</a-descriptions-item>
 			</a-descriptions>
 		</a-form>
 	</xn-form-container>

snowy-admin-web/src/views/biz/bizship/form.vue

@@ -36,7 +36,15 @@
 			<a-form-item label="荷载吨位：" name="shipLoad">
 				<a-input-number v-model:value="formData.shipLoad" style="width:90%"  :precision="2" :min="0.01" :max="9999999"  placeholder="请输入荷载吨位" allow-clear/><span style="margin-left:10px;">吨</span>
 			</a-form-item>
-			<a-form-item label="船舶所有人：" name="shipId">
+
+			<a-form-item label="船舶注册帐号：" name="registerNumber">
+				<a-input v-model:value="formData.registerNumber" placeholder="请输入船舶注册帐号" allow-clear />
+			</a-form-item>
+
+			<a-form-item label="船舶所有人：" name="shipOwner">
+				<a-input v-model:value="formData.shipOwner" placeholder="请输入船舶所有人" allow-clear />
+			</a-form-item>
+			<a-form-item label="船主：" name="shipId">
 				<xn-user-selector
 					:org-tree-api="selectorApiFunction.orgTreeApi"
 					:user-page-api="selectorApiFunction.userPageApi"
@@ -45,13 +53,6 @@
 					v-model:value="formData.shipId"
 				/>
 			</a-form-item>
-			<a-form-item label="船舶注册帐号：" name="registerNumber">
-				<a-input v-model:value="formData.registerNumber" placeholder="请输入船舶注册帐号" allow-clear />
-			</a-form-item>
-
-<!--			<a-form-item label="船舶所有人：" name="shipOwner">
-				<a-input v-model:value="formData.shipOwner" placeholder="请输入船舶所有人" allow-clear />
-			</a-form-item>-->
 			<a-form-item label="船舶身份信息：" name="shipIdentity">
 				<a-input v-model:value="formData.shipIdentity" placeholder="请输入船舶身份信息" allow-clear />
 			</a-form-item>

snowy-admin-web/src/views/biz/bizship/index.vue

@@ -124,7 +124,7 @@
 		},
 		{
 			title: '船舶所有人',
-			dataIndex: 'shipName',
+			dataIndex: 'shipOwner',
 			align:"center"
 		},
 		{

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizship/controller/BizShipController.java

@@ -125,4 +125,16 @@ public class BizShipController {
     public CommonResult<List<BizShipValue>> getShipTypeList() {
         return CommonResult.data(bizShipService.getShipTypeList());
     }
+
+    /**
+     * 个人长期船舶
+     *
+     * @author fanzherong
+     * @date  2025/07/12 15:32
+     */
+    @Operation(summary = "个人长期船舶")
+    @GetMapping("/biz/bizship/getShip")
+    public CommonResult<BizShip> getShip() {
+        return CommonResult.data(bizShipService.getShip());
+    }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizship/service/BizShipService.java

@@ -79,4 +79,9 @@ public interface BizShipService extends IService<BizShip> {
      * 获取船型下拉
      */
     List<BizShipValue> getShipTypeList();
+
+    /**
+     * 个人长期船舶
+     */
+    BizShip getShip();
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizship/service/impl/BizShipServiceImpl.java

@@ -67,7 +67,7 @@ public class BizShipServiceImpl extends ServiceImpl<BizShipMapper, BizShip> impl
         }
         //船舶所有人
         if(ObjectUtil.isNotEmpty(bizShipPageParam.getShipOwner())){
-            queryWrapper.like("su.name",bizShipPageParam.getShipOwner());
+            queryWrapper.like("bs.ship_owner",bizShipPageParam.getShipOwner());
         }
         //联系人姓名
         if(ObjectUtil.isNotEmpty(bizShipPageParam.getContactName())){
@@ -279,5 +279,14 @@ public class BizShipServiceImpl extends ServiceImpl<BizShipMapper, BizShip> impl
         return list;
     }
 
+    @Override
+    public BizShip getShip() {
+        BizShip ship = this.getOne(new QueryWrapper<BizShip>().lambda().
+                eq(BizShip::getShipId, StpLoginUserUtil.getLoginUser().getId()).
+                eq(BizShip::getStatus, "1").
+                last("limit 1"));
+        return ship;
+    }
+
 
 }