update

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java

@@ -334,4 +334,11 @@ public class UpdateLngCustomerDto implements Serializable {
       */
      @ApiModelProperty("数据权限id")
      private Long ruleUserId;
+     
+     /**
+      * 是否基础设施使用方
+      */
+     @LogField(name="是否基础设施使用方",index=31)
+     @ApiModelProperty("是否基础设施使用方")
+     private String facSign;
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.pictc.annotations.datalog.LogField;
 import com.xjrsoft.module.system.vo.LngFileUploadVo;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -276,7 +277,12 @@ public class LngCustomerVo {
     @ApiModelProperty("数据权限id")
     private Long ruleUserId;
     
-    
+    /**
+     * 是否基础设施使用方
+     */
+    @LogField(name="是否基础设施使用方",index=31)
+    @ApiModelProperty("是否基础设施使用方")
+    private String facSign;
 
 
     /**

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java

@@ -164,7 +164,18 @@ public class CustomerController {
     @ApiOperation(value = "删除")
     @SaCheckPermission("customer:delete")
     public R delete(@Valid @RequestBody List<Long> ids){
-    		return R.ok(customerService.delete(ids));
+    		//return R.ok(customerService.delete(ids));
+	    	return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class,ids, new DataOperationListener<UpdateLngCustomerDto>() {
+	            @Override
+	            public UpdateLngCustomerDto before(DataOperationContent<UpdateLngCustomerDto> content) {
+	                return null;
+	            }
+	
+	            @Override
+	            public UpdateLngCustomerDto after(DataOperationContent<UpdateLngCustomerDto> content) {
+	                return null;
+	            }
+	        }));
 
     }
     
@@ -172,7 +183,18 @@ public class CustomerController {
     @ApiOperation(value = "启用LngCustomer")
     @SaCheckPermission("customer:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids));
+
+    	 	return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids, new DataOperationListener<UpdateLngCustomerDto>() {
+                @Override
+                public UpdateLngCustomerDto before(DataOperationContent<UpdateLngCustomerDto> content) {
+                    return null;
+                }
+
+                @Override
+                public UpdateLngCustomerDto after(DataOperationContent<UpdateLngCustomerDto> content) {
+                    return null;
+                }
+            }));
     }
     
     
@@ -180,7 +202,18 @@ public class CustomerController {
     @ApiOperation(value = "禁用LngCustomer")
     @SaCheckPermission("customer:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids));
+    		//return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids));
+    		return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids, new DataOperationListener<UpdateLngCustomerDto>() {
+                @Override
+                public UpdateLngCustomerDto before(DataOperationContent<UpdateLngCustomerDto> content) {
+                    return null;
+                }
+
+                @Override
+                public UpdateLngCustomerDto after(DataOperationContent<UpdateLngCustomerDto> content) {
+                    return null;
+                }
+            }));
     }
 
    

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomer.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.yulichang.annotation.EntityMapping;
 import com.pictc.annotations.datalog.JoinCaseType;
 import com.pictc.annotations.datalog.JoinType;
+import com.pictc.annotations.datalog.LogField;
 import com.pictc.annotations.datalog.LogJoin;
 import com.pictc.annotations.datalog.LogJoinColumn;
 import com.pictc.annotations.datalog.ValueDirectionType;
@@ -266,6 +267,11 @@ public class LngCustomer implements Serializable {
     @TableField(fill = FieldFill.INSERT)
     private Long ruleUserId;
     
+    /**
+     * 是否基础设施使用方
+     */
+    @ApiModelProperty(name="是否基础设施使用方")
+    private String facSign;
 
     /**
     * lngCustomerAttrPower

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java

@@ -20,7 +20,6 @@ import com.pictc.datalog.DataOperationContent;
 import com.pictc.datalog.DataOperationListener;
 import com.pictc.enums.BusinessCode;
 import com.pictc.enums.ExceptionCommonCode;
-import com.xjrsoft.common.advice.tran.CustomerDataProvider;
 import com.xjrsoft.common.advice.tran.SupplierDataProvider;
 import com.xjrsoft.common.exception.BusinessException;
 import com.xjrsoft.common.model.result.R;
@@ -161,7 +160,18 @@ public class SupplierController {
     @ApiOperation(value = "删除")
     @SaCheckPermission("supplier:delete")
     public R delete(@Valid @RequestBody List<Long> ids){
-    		return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids));
+    		//return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids));
+    		return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class,ids, new DataOperationListener<UpdateLngSupplierDto>() {
+                @Override
+                public UpdateLngSupplierDto before(DataOperationContent<UpdateLngSupplierDto> content) {
+                    return null;
+                }
+
+                @Override
+                public UpdateLngSupplierDto after(DataOperationContent<UpdateLngSupplierDto> content) {
+                    return null;
+                }
+            }));
 
     }
     
@@ -169,7 +179,18 @@ public class SupplierController {
     @ApiOperation(value = "启用LngSupplier")
     @SaCheckPermission("supplier:enable")
     public R enable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids));
+    		//return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids));
+    		return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids, new DataOperationListener<UpdateLngSupplierDto>() {
+                @Override
+                public UpdateLngSupplierDto before(DataOperationContent<UpdateLngSupplierDto> content) {
+                    return null;
+                }
+
+                @Override
+                public UpdateLngSupplierDto after(DataOperationContent<UpdateLngSupplierDto> content) {
+                    return null;
+                }
+            }));
     }
     
     
@@ -177,7 +198,18 @@ public class SupplierController {
     @ApiOperation(value = "禁用LngSupplier")
     @SaCheckPermission("supplier:disable")
     public R disable(@Valid @RequestBody List<Long> ids){
-    		return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids));
+    		//return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids));
+    		return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids, new DataOperationListener<UpdateLngSupplierDto>() {
+                @Override
+                public UpdateLngSupplierDto before(DataOperationContent<UpdateLngSupplierDto> content) {
+                    return null;
+                }
+
+                @Override
+                public UpdateLngSupplierDto after(DataOperationContent<UpdateLngSupplierDto> content) {
+                    return null;
+                }
+            }));
     }