FengChaoYu 9 bulan lalu
induk
melakukan
4a0d382507

+ 2 - 0
mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/WebsitSalesManagerDetail.java

@@ -4,7 +4,9 @@ import com.gree.mall.manager.plus.entity.OrderEnginBase;
 import com.gree.mall.manager.plus.entity.WebsitSalesManager;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class WebsitSalesManagerDetail extends WebsitSalesManager {
 

+ 0 - 9
mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyBankAccountVO.java

@@ -1,9 +1,5 @@
 package com.gree.mall.manager.bean.settle.repair;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +13,6 @@ import java.util.Date;
 public class DailyBankAccountVO {
 
     @ApiModelProperty(value = "银行账户id")
-    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     @ApiModelProperty(value = "服务人员名称")
@@ -45,18 +40,14 @@ public class DailyBankAccountVO {
     private String remark;
 
     @ApiModelProperty(value = "创建人")
-    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "操作人")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
     @ApiModelProperty(value = "操作时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 }

+ 4 - 6
mall-server-api/src/main/resources/mapper/DailyMapper.xml

@@ -9,9 +9,8 @@
             JOIN
             settle_daily_reduce_cost c
                 ON c.repair_worker_name = a.nick_name AND c.repair_worker_mobile = a.mobile AND c.websit_number = b.websit_id
-        SET c.worker_number = b.worker_number,
-            c.company_wechat_id = a.company_wechat_id,
-            c.company_wechat_name = a.company_name
+        SET
+            c.worker_number = b.worker_number
         WHERE
             c.company_wechat_id = #{companyWechatId}
             AND c.import_batch_no = #{importBatchNo}
@@ -23,9 +22,8 @@
             websit_user b ON b.user_id = a.user_id
             JOIN settle_daily_import_summary_item c
                 ON c.repair_worker_name = a.nick_name AND c.repair_worker_mobile = a.mobile AND c.websit_number = b.websit_id
-        SET c.worker_number = b.worker_number,
-            c.company_wechat_id = a.company_wechat_id,
-            c.company_wechat_name = a.company_name
+        SET
+            c.worker_number = b.worker_number
         WHERE
             c.company_wechat_id = #{companyWechatId}
             AND c.import_batch_no = #{importBatchNo}