2024年4月18日17:31:17

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/activity/entity/Activity.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.activity.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;
@@ -76,6 +77,7 @@ public class Activity implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/activity/entity/ActivityItems.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.activity.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -72,6 +73,7 @@ public class ActivityItems implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/BrandFigure.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -104,6 +105,7 @@ public class BrandFigure implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 花纹

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjAccountManagement.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -78,6 +79,7 @@ public class PjAccountManagement implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjBrandDesc.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.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;
@@ -100,6 +101,7 @@ public class PjBrandDesc implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjBrandFiles.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -115,6 +116,7 @@ public class PjBrandFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsAddr.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
@@ -84,6 +85,7 @@ public class PjCorpsAddr implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsAttn.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.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;
@@ -83,6 +84,7 @@ public class PjCorpsAttn implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsDesc.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.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;
@@ -81,6 +82,7 @@ public class PjCorpsDesc implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsFiles.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
@@ -113,6 +114,7 @@ public class PjCorpsFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsType.java

@@ -16,10 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -123,6 +120,7 @@ public class PjCorpsType implements Serializable {
 	 */
 	//@TableLogic
 	@ApiModelProperty(value = "是否已删除")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 父级名称

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsDesc.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.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;
@@ -80,6 +81,7 @@ public class PjGoodsDesc implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsFiles.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -116,6 +117,7 @@ public class PjGoodsFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsType.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.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;
@@ -126,6 +127,7 @@ public class PjGoodsType implements Serializable {
 	 */
 	//@TableLogic
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjHistory.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -81,6 +82,7 @@ public class PjHistory implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -112,6 +113,7 @@ public class PjOrder implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrderItems.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.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;
@@ -92,6 +93,7 @@ public class PjOrderItems implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjPayment.java

@@ -17,6 +17,8 @@
 package org.springblade.salesPart.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -82,6 +84,7 @@ public class PjPayment implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunch.java

@@ -18,6 +18,7 @@ package org.springblade.salesPart.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 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;
@@ -82,6 +83,7 @@ public class PjProductLaunch implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunchFiles.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -116,6 +117,7 @@ public class PjProductLaunchFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjSettlement.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.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;
@@ -75,6 +76,7 @@ public class PjSettlement implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjSettlementItems.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -85,6 +86,7 @@ public class PjSettlementItems implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShip.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -152,6 +153,7 @@ public class PjShip implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShipItems.java

@@ -17,6 +17,8 @@
 package org.springblade.salesPart.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -92,6 +94,7 @@ public class PjShipItems implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShoppingCart.java

@@ -19,6 +19,7 @@ package org.springblade.salesPart.entity;
 import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -98,6 +99,7 @@ public class PjShoppingCart implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjStockDesc.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.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;
@@ -81,6 +82,7 @@ public class PjStockDesc implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjStorageDesc.java

@@ -17,6 +17,8 @@
 package org.springblade.salesPart.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -80,6 +82,7 @@ public class PjStorageDesc implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjpfFiles.java

@@ -1,5 +1,7 @@
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -76,6 +78,7 @@ public class PjpfFiles implements Serializable {
     /**
      * 状态（0 正常 1停用）
      */
+	@TableLogic(value = "0", delval = "1")
     private Integer status;
 
     /**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/ProjectGoods.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.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;
@@ -170,6 +171,7 @@ public class ProjectGoods implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 供应商

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/ProjectGoodsFiles.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -102,6 +103,7 @@ public class ProjectGoodsFiles implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/QbProject.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -77,6 +78,7 @@ public class QbProject implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 图片地址

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/QbProjectItem.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.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;
@@ -80,6 +81,7 @@ public class QbProjectItem implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 图片地址

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/extemalOrder/entity/ExternalOrder.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.extemalOrder.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;
@@ -77,6 +78,7 @@ public class ExternalOrder implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/extemalOrder/entity/ExternalOrderItem.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.extemalOrder.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -75,6 +76,7 @@ public class ExternalOrderItem implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/Maintenance.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.maintenance.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -183,6 +184,7 @@ public class Maintenance implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 创建人

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/MaintenanceFees.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.maintenance.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -114,6 +115,7 @@ public class MaintenanceFees implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/MaintenanceFiles.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.maintenance.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -102,6 +103,7 @@ public class MaintenanceFiles implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/MaintenanceLog.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.maintenance.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -72,6 +73,7 @@ public class MaintenanceLog implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 创建人

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/record/entity/LimitRecord.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.record.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -69,6 +70,7 @@ public class LimitRecord implements Serializable {
 	 * 是否已删除（0 否 1是）
 	 */
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 租户id

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

@@ -633,28 +633,14 @@ public class CorpsDescController extends BladeController {
 			.eq(PjCorpsDesc::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjCorpsDesc::getCorpType, "KH");
 		//客户总数量
-		List<PjCorpsDesc> corpsDescList = corpsDescService.list(corpsDescQueryWrapper);
-		for (PjCorpsDesc corpsDesc : corpsDescList) {
-			PjOrder order = new PjOrder();
-			order.setCustomerId(corpsDesc.getId());
-			order.setBsType("XS");
-			order.setActualPaymentStatus(2);
-			order.setCorpType("1");
-			int count = orderService.corpAnalysis(order);
-			if (count == 0) {
-				unsales++;
-			}
-			order.setCorpType("2");
-			int count1 = orderService.corpAnalysis(order);
-			if (count1 > 0) {
-				coreCorp++;
-			}
-		}
+		int count = corpsDescService.count(corpsDescQueryWrapper);
+		 coreCorp = orderService.coreCorp(AuthUtil.getTenantId(),"XS",AuthUtil.getDeptId());
+		unsales = count - coreCorp;
 		if (unsales > 0) {
-			lossRate = lossRate.add(new BigDecimal(unsales).divide(new BigDecimal(corpsDescList.size()), MathContext.DECIMAL32));
+			lossRate = lossRate.add(new BigDecimal(unsales).divide(new BigDecimal(count), MathContext.DECIMAL32));
 		}
 
-		map.put("sumNumber", corpsDescList.size());
+		map.put("sumNumber", count);
 		map.put("coreCorp", coreCorp);
 		map.put("lossRate", lossRate);
 		return R.data(map);

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

@@ -84,4 +84,6 @@ public interface OrderMapper extends BaseMapper<PjOrder> {
 	Map<String, Object> sizeSalesVolumeProportionGetOne(@Param("statusDate") String statusDate, @Param("endDate") String endDate,
 														@Param("deptId") String deptId, @Param("tenantId") String tenantId,
 														@Param("goodsSize") String goodsSize);
+
+	int coreCorp(@Param("tenantId")String tenantId, @Param("bsType")String bsType, @Param("deptId")String deptId);
 }

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

@@ -116,6 +116,7 @@
         where pcd.corp_type = 'KH'
         and pcd.is_deleted = '0'
         and (po2.total_money is not null or po1.addAmount is not null or  po1.chargeAmount is not null)
+        and IF(po1.addAmount - po1.chargeAmount,po1.addAmount - po1.chargeAmount,0.00 ) !=0
         <if test="order.customerId!=null">
             and pcd.id = #{order.customerId}
         </if>
@@ -506,5 +507,22 @@
         ORDER BY
             number DESC
     </select>
+    <select id="coreCorp" resultType="java.lang.Integer">
+        select
+            count(DISTINCT customer_id)
+        from
+            pjpf_order
+        where
+            is_deleted = '0'
+            AND tenant_id = #{tenantId}
+            AND bs_type = #{bsType}
+        <if test="deptId!=null and deptId != ''">
+            AND find_in_set(sales_company_id,#{deptId})
+        </if>
+            AND (( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) )
+                OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))
+                OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
+            AND busines_date >= date_sub(CURDATE(), INTERVAL 6 MONTH)
+    </select>
 
 </mapper>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/IOrderService.java

@@ -189,4 +189,6 @@ public interface IOrderService extends IService<PjOrder> {
 	List<Map<String, Object>> sizeSalesVolumeProportion(String statusDate, String endDate, String deptId, String tenantId);
 
 	Map<String, Object> sizeSalesVolumeProportionGetOne(String statusDate, String endDate, String deptId, String tenantId, String goodsSize);
+
+	int coreCorp(String tenantId, String bsType, String deptId);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -1058,6 +1058,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		return baseMapper.sizeSalesVolumeProportionGetOne(statusDate, endDate, deptId, tenantId, goodsSize);
 	}
 
+	@Override
+	public int coreCorp(String tenantId, String bsType, String deptId) {
+		return baseMapper.coreCorp(tenantId,bsType,deptId);
+	}
+
 	/**
 	 * 保存订单信息
 	 */