样品单

hx-admin/src/main/resources/application-dev.yml

@@ -69,6 +69,10 @@ spring:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_dingding?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
+                ehsd:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
 
     # redis 配置
     redis:

hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/po/Sample.java

@@ -193,9 +193,7 @@ public class Sample extends BasePo {
     /**
      * 版本号
      */
-    @TableField(fill = FieldFill.INSERT)
-    @Version
-    private Long version;
+    private String versions;
 
     /**
      * 交期

hx-ehsd/src/main/java/com/fjhx/ehsd/flow/SampleFlow.java

@@ -2,10 +2,12 @@ package com.fjhx.ehsd.flow;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.FlowStatusEnum;
 import com.fjhx.ehsd.entity.sample.po.Sample;
 import com.fjhx.ehsd.entity.sample.po.SampleProduct;
@@ -30,6 +32,7 @@ import java.util.List;
  * @DATE:2023/4/3 17:38
  */
 @Component
+@DS(SourceConstant.EHSD)
 public class SampleFlow extends FlowDelegate {
 
 

hx-ehsd/src/main/resources/mapper/sample/SampleMapper.xml

@@ -3,50 +3,7 @@
 <mapper namespace="com.fjhx.ehsd.mapper.sample.SampleMapper">
     <select id="getPage" resultType="com.fjhx.ehsd.entity.sample.vo.SampleVo">
         select
-            s.id,
-            s.code,
-            s.contract_type,
-            s.contract_template_id,
-            s.sell_corporation_id,
-            s.sell_contact_name,
-            s.sell_contact_number,
-            s.sell_country_id,
-            s.sell_province_id,
-            s.sell_city_id,
-            s.sell_address,
-            s.buy_corporation_id,
-            s.buy_contact_name,
-            s.buy_contact_number,
-            s.buy_country_id,
-            s.buy_province_id,
-            s.buy_city_id,
-            s.buy_address,
-            s.buy_postal_code,
-            s.status,
-            s.contract_status,
-            s.refund_status,
-            s.currency,
-            s.amount,
-            s.payment_method,
-            s.trade_methods,
-            s.advance_ratio,
-            s.transport_method,
-            s.transport_remark,
-            s.shroff_account_id,
-            s.warranty,
-            s.approved_date,
-            s.process_instance_id,
-            s.remark,
-            s.version,
-            s.delivery_time,
-            s.settlement_status,
-            s.currency_rate_json,
-            s.create_user,
-            s.user_name,
-            s.ehsd_json,
-            s.create_time,
-            s.update_user,
-            s.update_time
+           *
         from sample s
             ${ew.customSqlSegment}
     </select>