2023年10月9日18:12:16

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cntr/entity/BCntrTypes.java

@@ -16,15 +16,19 @@
  */
 package org.springblade.los.basic.cntr.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.los.basic.utils.ExtendedData;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 基础资料-集装箱箱型实体类
@@ -165,6 +169,11 @@ public class BCntrTypes implements Serializable {
 	@ApiModelProperty(value = "JSON 对象数组，用于不查询的扩展数据")
 	private String extendedData;
 	/**
+	 * JSON 对象数组，用于不查询的扩展数据, 例如：[{name: "key1", value: "value1"}]
+	 */
+	@TableField(exist = false)
+	private List<ExtendedData> extendedDataArr = new ArrayList<>();
+	/**
 	 * 版本
 	 */
 	@ApiModelProperty(value = "版本")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorps.java

@@ -22,9 +22,11 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.los.basic.utils.ExtendedData;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -427,6 +429,11 @@ public class BCorps implements Serializable {
 	@ApiModelProperty(value = "JSON 对象数组，用于不查询的扩展数据")
 	private String extendedData;
 	/**
+	 * JSON 对象数组，用于不查询的扩展数据, 例如：[{name: "key1", value: "value1"}]
+	 */
+	@TableField(exist = false)
+	private List<ExtendedData> extendedDataArr = new ArrayList<>();
+	/**
 	 * 版本
 	 */
 	@ApiModelProperty(value = "版本")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/lines/entity/BLines.java

@@ -16,14 +16,18 @@
  */
 package org.springblade.los.basic.lines.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.los.basic.utils.ExtendedData;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 基础资料-航线实体类
@@ -114,6 +118,11 @@ public class BLines implements Serializable {
 	@ApiModelProperty(value = "JSON 对象数组，用于不查询的扩展数据")
 	private String extendedData;
 	/**
+	 * JSON 对象数组，用于不查询的扩展数据, 例如：[{name: "key1", value: "value1"}]
+	 */
+	@TableField(exist = false)
+	private List<ExtendedData> extendedDataArr = new ArrayList<>();
+	/**
 	 * 版本
 	 */
 	@ApiModelProperty(value = "版本")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/entity/BPorts.java

@@ -21,8 +21,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.los.basic.utils.ExtendedData;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -135,6 +137,11 @@ public class BPorts implements Serializable {
 	@ApiModelProperty(value = "JSON 对象数组，用于不查询的扩展数据")
 	private String extendedData;
 	/**
+	 * JSON 对象数组，用于不查询的扩展数据, 例如：[{name: "key1", value: "value1"}]
+	 */
+	@TableField(exist = false)
+	private List<ExtendedData> extendedDataArr = new ArrayList<>();
+	/**
 	 * 版本
 	 */
 	@ApiModelProperty(value = "版本")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/terms/entity/BServiceTerms.java

@@ -16,14 +16,18 @@
  */
 package org.springblade.los.basic.terms.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.los.basic.utils.ExtendedData;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 基础资料-服务条款实体类
@@ -104,6 +108,11 @@ public class BServiceTerms implements Serializable {
 	@ApiModelProperty(value = "JSON 对象数组，用于不查询的扩展数据")
 	private String extendedData;
 	/**
+	 * JSON 对象数组，用于不查询的扩展数据, 例如：[{name: "key1", value: "value1"}]
+	 */
+	@TableField(exist = false)
+	private List<ExtendedData> extendedDataArr = new ArrayList<>();
+	/**
 	 * 版本
 	 */
 	@ApiModelProperty(value = "版本")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/vessels/entity/BVessels.java

@@ -22,9 +22,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.los.basic.utils.ExtendedData;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 基础资料-船名实体类
@@ -160,6 +163,11 @@ public class BVessels implements Serializable {
 	@ApiModelProperty(value = "JSON 对象数组，用于不查询的扩展数据")
 	private String extendedData;
 	/**
+	 * JSON 对象数组，用于不查询的扩展数据, 例如：[{name: "key1", value: "value1"}]
+	 */
+	@TableField(exist = false)
+	private List<ExtendedData> extendedDataArr = new ArrayList<>();
+	/**
 	 * 版本
 	 */
 	@ApiModelProperty(value = "版本")

blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/controller/BCntrTypesController.java

@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -38,6 +40,8 @@ import org.springblade.los.basic.cntr.entity.BCntrTypes;
 import org.springblade.los.basic.cntr.service.IBCntrTypesService;
 import org.springblade.los.basic.cntr.vo.BCntrTypesVO;
 import org.springblade.los.basic.commodity.entity.BCommodity;
+import org.springblade.los.basic.packages.entity.BPackages;
+import org.springblade.los.basic.utils.ExtendedData;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -68,6 +72,16 @@ public class BCntrTypesController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入bCntrTypes")
 	public R<BCntrTypes> detail(BCntrTypes bCntrTypes) {
 		BCntrTypes detail = bCntrTypesService.getOne(Condition.getQueryWrapper(bCntrTypes));
+		if (ObjectUtils.isNotNull(detail.getExtendedData())) {
+			Gson gson = new Gson();
+			List<ExtendedData> list = gson.fromJson(detail.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+			}.getType());
+			if (ObjectUtils.isNotNull(list)) {
+				detail.setExtendedDataArr(list);
+			} else {
+				detail.setExtendedDataArr(new ArrayList<>());
+			}
+		}
 		return R.data(detail);
 	}
 
@@ -93,6 +107,18 @@ public class BCntrTypesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCntrTypes.getCode95()), BCntrTypes::getCode95, bCntrTypes.getCode95())
 			.orderByDesc(BCntrTypes::getCreateTime);
 		IPage<BCntrTypes> pages = bCntrTypesService.page(Condition.getPage(query), lambdaQueryWrapper);
+		for (BCntrTypes item : pages.getRecords()) {
+			if (ObjectUtils.isNotNull(item.getExtendedData())) {
+				Gson gson = new Gson();
+				List<ExtendedData> list = gson.fromJson(item.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+				}.getType());
+				if (ObjectUtils.isNotNull(list)) {
+					item.setExtendedDataArr(list);
+				} else {
+					item.setExtendedDataArr(new ArrayList<>());
+				}
+			}
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/mapper/CntrTypesMapper.xml

@@ -14,7 +14,7 @@
         <result column="update_user_name" property="updateUserName"/>
         <result column="update_time" property="updateTime"/>
         <result column="code" property="code"/>
-        <result column="code_95" property="code95"/>
+        <result column="code95" property="code95"/>
         <result column="customs_code" property="customsCode"/>
         <result column="cntr_type" property="cntrType"/>
         <result column="cntr_size" property="cntrSize"/>

blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/controller/BCommodityController.java

@@ -37,7 +37,6 @@ import org.springblade.los.basic.commodity.dto.BCommodityExecl;
 import org.springblade.los.basic.commodity.entity.BCommodity;
 import org.springblade.los.basic.commodity.service.IBCommodityService;
 import org.springblade.los.basic.commodity.vo.BCommodityVO;
-import org.springblade.system.feign.ISysClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -60,8 +59,6 @@ public class BCommodityController extends BladeController {
 
 	private final IBCommodityService bCommodityService;
 
-	private final ISysClient sysClient;
-
 	/**
 	 * 详情
 	 */

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java

@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -37,6 +39,8 @@ import org.springblade.los.basic.corps.dto.BCorpsExcel;
 import org.springblade.los.basic.corps.entity.BCorps;
 import org.springblade.los.basic.corps.service.IBCorpsService;
 import org.springblade.los.basic.corps.vo.BCorpsVO;
+import org.springblade.los.basic.utils.ExtendedData;
+import org.springblade.los.basic.vessels.entity.BVessels;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -67,6 +71,16 @@ public class BCorpsController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入bCorps")
 	public R<BCorps> detail(BCorps bCorps) {
 		BCorps detail = bCorpsService.detail(bCorps);
+		if (ObjectUtils.isNotNull(detail.getExtendedData())) {
+			Gson gson = new Gson();
+			List<ExtendedData> list = gson.fromJson(detail.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+			}.getType());
+			if (ObjectUtils.isNotNull(list)) {
+				detail.setExtendedDataArr(list);
+			} else {
+				detail.setExtendedDataArr(new ArrayList<>());
+			}
+		}
 		return R.data(detail);
 	}
 
@@ -91,6 +105,18 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getAdminProfiles()), BCorps::getAdminProfiles, bCorps.getAdminProfiles())
 			.orderByDesc(BCorps::getCreateTime);
 		IPage<BCorps> pages = bCorpsService.page(Condition.getPage(query), lambdaQueryWrapper);
+		for (BCorps item : pages.getRecords()) {
+			if (ObjectUtils.isNotNull(item.getExtendedData())) {
+				Gson gson = new Gson();
+				List<ExtendedData> list = gson.fromJson(item.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+				}.getType());
+				if (ObjectUtils.isNotNull(list)) {
+					item.setExtendedDataArr(list);
+				} else {
+					item.setExtendedDataArr(new ArrayList<>());
+				}
+			}
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/basic/lines/controller/BLinesController.java

@@ -19,6 +19,8 @@ package org.springblade.los.basic.lines.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,10 +37,12 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.los.basic.cntr.entity.BCntrTypes;
 import org.springblade.los.basic.countrys.dto.BCountrysExcel;
 import org.springblade.los.basic.countrys.entity.BCountrys;
 import org.springblade.los.basic.lines.dto.BLinesExcel;
 import org.springblade.los.basic.locations.entity.BLocations;
+import org.springblade.los.basic.utils.ExtendedData;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.basic.lines.entity.BLines;
@@ -72,6 +76,16 @@ public class BLinesController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入bLines")
 	public R<BLines> detail(BLines bLines) {
 		BLines detail = bLinesService.getOne(Condition.getQueryWrapper(bLines));
+		if (ObjectUtils.isNotNull(detail.getExtendedData())) {
+			Gson gson = new Gson();
+			List<ExtendedData> list = gson.fromJson(detail.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+			}.getType());
+			if (ObjectUtils.isNotNull(list)) {
+				detail.setExtendedDataArr(list);
+			} else {
+				detail.setExtendedDataArr(new ArrayList<>());
+			}
+		}
 		return R.data(detail);
 	}
 
@@ -91,6 +105,18 @@ public class BLinesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bLines.getEnName()), BLines::getEnName, bLines.getEnName())
 			.orderByDesc(BLines::getCreateTime);
 		IPage<BLines> pages = bLinesService.page(Condition.getPage(query), lambdaQueryWrapper);
+		for (BLines item : pages.getRecords()) {
+			if (ObjectUtils.isNotNull(item.getExtendedData())) {
+				Gson gson = new Gson();
+				List<ExtendedData> list = gson.fromJson(item.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+				}.getType());
+				if (ObjectUtils.isNotNull(list)) {
+					item.setExtendedDataArr(list);
+				} else {
+					item.setExtendedDataArr(new ArrayList<>());
+				}
+			}
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/basic/ports/controller/BPortsController.java

@@ -19,6 +19,8 @@ package org.springblade.los.basic.ports.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,7 +37,9 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.los.basic.lines.entity.BLines;
 import org.springblade.los.basic.ports.dto.BPortsExcel;
+import org.springblade.los.basic.utils.ExtendedData;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.basic.ports.entity.BPorts;
@@ -69,6 +73,16 @@ public class BPortsController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入bPorts")
 	public R<BPorts> detail(BPorts bPorts) {
 		BPorts detail = bPortsService.detail(bPorts);
+		if (ObjectUtils.isNotNull(detail.getExtendedData())) {
+			Gson gson = new Gson();
+			List<ExtendedData> list = gson.fromJson(detail.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+			}.getType());
+			if (ObjectUtils.isNotNull(list)) {
+				detail.setExtendedDataArr(list);
+			} else {
+				detail.setExtendedDataArr(new ArrayList<>());
+			}
+		}
 		return R.data(detail);
 	}
 
@@ -80,6 +94,18 @@ public class BPortsController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入bPorts")
 	public R<IPage<BPorts>> list(BPorts bPorts, Query query) {
 		IPage<BPorts> pages = bPortsService.page(Condition.getPage(query), Condition.getQueryWrapper(bPorts));
+		for (BPorts item : pages.getRecords()) {
+			if (ObjectUtils.isNotNull(item.getExtendedData())) {
+				Gson gson = new Gson();
+				List<ExtendedData> list = gson.fromJson(item.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+				}.getType());
+				if (ObjectUtils.isNotNull(list)) {
+					item.setExtendedDataArr(list);
+				} else {
+					item.setExtendedDataArr(new ArrayList<>());
+				}
+			}
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/basic/terms/controller/BServiceTermsController.java

@@ -19,6 +19,8 @@ package org.springblade.los.basic.terms.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,7 +37,9 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.los.basic.ports.entity.BPorts;
 import org.springblade.los.basic.terms.dto.BServiceTermsExcel;
+import org.springblade.los.basic.utils.ExtendedData;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.basic.terms.entity.BServiceTerms;
@@ -69,6 +73,16 @@ public class BServiceTermsController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入bServiceTerms")
 	public R<BServiceTerms> detail(BServiceTerms bServiceTerms) {
 		BServiceTerms detail = bServiceTermsService.getOne(Condition.getQueryWrapper(bServiceTerms));
+		if (ObjectUtils.isNotNull(detail.getExtendedData())) {
+			Gson gson = new Gson();
+			List<ExtendedData> list = gson.fromJson(detail.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+			}.getType());
+			if (ObjectUtils.isNotNull(list)) {
+				detail.setExtendedDataArr(list);
+			} else {
+				detail.setExtendedDataArr(new ArrayList<>());
+			}
+		}
 		return R.data(detail);
 	}
 
@@ -87,6 +101,18 @@ public class BServiceTermsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bServiceTerms.getEnName()), BServiceTerms::getEnName, bServiceTerms.getEnName())
 			.orderByDesc(BServiceTerms::getCreateTime);
 		IPage<BServiceTerms> pages = bServiceTermsService.page(Condition.getPage(query), lambdaQueryWrapper);
+		for (BServiceTerms item : pages.getRecords()) {
+			if (ObjectUtils.isNotNull(item.getExtendedData())) {
+				Gson gson = new Gson();
+				List<ExtendedData> list = gson.fromJson(item.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+				}.getType());
+				if (ObjectUtils.isNotNull(list)) {
+					item.setExtendedDataArr(list);
+				} else {
+					item.setExtendedDataArr(new ArrayList<>());
+				}
+			}
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/basic/vessels/controller/BVesselsController.java

@@ -19,6 +19,8 @@ package org.springblade.los.basic.vessels.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,6 +37,8 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.los.basic.terms.entity.BServiceTerms;
+import org.springblade.los.basic.utils.ExtendedData;
 import org.springblade.los.basic.vessels.dto.BVesselsExcel;
 import org.springblade.los.basic.voucher.entity.BVoucherType;
 import org.springframework.web.bind.annotation.*;
@@ -70,6 +74,16 @@ public class BVesselsController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入bVessels")
 	public R<BVessels> detail(BVessels bVessels) {
 		BVessels detail = bVesselsService.getOne(Condition.getQueryWrapper(bVessels));
+		if (ObjectUtils.isNotNull(detail.getExtendedData())) {
+			Gson gson = new Gson();
+			List<ExtendedData> list = gson.fromJson(detail.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+			}.getType());
+			if (ObjectUtils.isNotNull(list)) {
+				detail.setExtendedDataArr(list);
+			} else {
+				detail.setExtendedDataArr(new ArrayList<>());
+			}
+		}
 		return R.data(detail);
 	}
 
@@ -98,6 +112,18 @@ public class BVesselsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bVessels.getEnName()), BVessels::getEnName, bVessels.getEnName())
 			.orderByDesc(BVessels::getCreateTime);
 		IPage<BVessels> pages = bVesselsService.page(Condition.getPage(query), lambdaQueryWrapper);
+		for (BVessels item : pages.getRecords()) {
+			if (ObjectUtils.isNotNull(item.getExtendedData())) {
+				Gson gson = new Gson();
+				List<ExtendedData> list = gson.fromJson(item.getExtendedData(), new TypeToken<List<ExtendedData>>() {
+				}.getType());
+				if (ObjectUtils.isNotNull(list)) {
+					item.setExtendedDataArr(list);
+				} else {
+					item.setExtendedDataArr(new ArrayList<>());
+				}
+			}
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsStatisticsController.java

@@ -65,6 +65,7 @@ public class CorpsStatisticsController {
 				lambdaQueryWrapper.eq(PjOrder::getBsType, "CG");
 			}
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());
+			lambdaQueryWrapper.apply("(( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) ) OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' )))");
 			if (ObjectUtils.isNotNull(corpsDescDto1.getCreditLimit()) && ObjectUtils.isNotNull(corpsDescDto1.getUseCreditLimit())) {
 				corpsDescDto1.setCreditLimitBalance(corpsDescDto1.getCreditLimit().subtract(corpsDescDto1.getUseCreditLimit()));
 			}
@@ -76,7 +77,7 @@ public class CorpsStatisticsController {
 				//未付
 				corpsDescDto1.setUnpaidAmount(totalAmount.subtract(corpsDescDto1.getPaidAmount()));
 				corpsDescDto1.setTotalAmount(totalAmount);
-				corpsDescDto1.setNumber(orderList.stream().map(PjOrder::getGoodsTotalShipNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				corpsDescDto1.setNumber(orderList.stream().map(PjOrder::getGoodsTotalNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			} else {
 				//已付
 				corpsDescDto1.setPaidAmount(new BigDecimal("0.00"));
@@ -116,6 +117,7 @@ public class CorpsStatisticsController {
 				lambdaQueryWrapper.eq(PjOrder::getBsType, "CG");
 			}
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());
+			lambdaQueryWrapper.apply("(( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) ) OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' )))");
 			List<PjOrder> orderList = orderService.list(lambdaQueryWrapper);
 			if (ObjectUtils.isNotNull(orderList)) {
 				BigDecimal sumAmount = orderList.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -157,6 +159,7 @@ public class CorpsStatisticsController {
 			if (ObjectUtils.isNotNull(corpsDescDto1.getCreditLimit()) && ObjectUtils.isNotNull(corpsDescDto1.getUseCreditLimit())) {
 				corpsDescDto1.setCreditLimitBalance(corpsDescDto1.getCreditLimit().subtract(corpsDescDto1.getUseCreditLimit()));
 			}
+			lambdaQueryWrapper.apply("(( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) ) OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' )))");
 			List<PjOrder> orderList = orderService.list(lambdaQueryWrapper);
 			if (ObjectUtils.isNotNull(orderList)) {
 				BigDecimal totalAmount = orderList.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -165,7 +168,7 @@ public class CorpsStatisticsController {
 				//未付
 				corpsDescDto1.setUnpaidAmount(totalAmount.subtract(corpsDescDto1.getPaidAmount()));
 				corpsDescDto1.setTotalAmount(totalAmount);
-				corpsDescDto1.setNumber(orderList.stream().map(PjOrder::getGoodsTotalShipNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				corpsDescDto1.setNumber(orderList.stream().map(PjOrder::getGoodsTotalNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			} else {
 				//已付
 				corpsDescDto1.setPaidAmount(new BigDecimal("0.00"));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -92,7 +92,7 @@
         </if>
         GROUP BY po.customer_id) as po1 on pcd.id = po1.customer_id
         LEFT JOIN (SELECT
-        sum( po.total_money ) as total_money,
+        (sum( po.total_money )-sum( po.payment_amount_tl )) as total_money,
         po.customer_id as customer_id
         FROM
         pjpf_order po
@@ -266,6 +266,7 @@
         WHERE
             o.tenant_id = #{order.tenantId}
           AND o.is_deleted = '0'
+        and (( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) ) OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' )))
         <if test="order.customerId!=null">
             and o.customer_id = #{order.customerId}
         </if>
@@ -313,6 +314,7 @@
         WHERE
         o.tenant_id = #{order.tenantId}
         AND o.is_deleted = '0'
+        and (( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) ) OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' )))
         <if test="order.customerId!=null">
             and o.customer_id = #{order.customerId}
         </if>