更换数据库

sd-business/src/main/java/com/sd/business/entity/department/dto/DepartmentSelectDto.java

@@ -20,9 +20,9 @@ public class DepartmentSelectDto extends BaseSelectDto {
     private String name;
 
     /**
-     * 售价体系 字典:department_sellingPriceSystem
+     * 售价体系id
      */
-    private String sellingPriceSystem;
+    private Long priceSystemId;
 
     /**
      * 联系人

sd-business/src/main/java/com/sd/business/entity/department/vo/DepartmentVo.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class DepartmentVo extends Department {
 
+    /**
+     * 售价体系名称
+     */
+    private String priceSystemName;
+
 }

sd-business/src/main/java/com/sd/business/service/department/impl/DepartmentServiceImpl.java

@@ -52,7 +52,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         IWrapper<Department> wrapper = getWrapper();
         wrapper.orderByDesc("d", Department::getId);
         wrapper.like("d", Department::getName, dto.getName());
-        wrapper.eq("d", Department::getSellingPriceSystem, dto.getSellingPriceSystem());
+        wrapper.eq("d", Department::getPriceSystemId, dto.getPriceSystemId());
         wrapper.like("d", Department::getContactPerson, dto.getContactPerson());
         Page<DepartmentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;

sd-business/src/main/resources/mapper/department/DepartmentMapper.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.department.DepartmentMapper">
+
     <select id="getPage" resultType="com.sd.business.entity.department.vo.DepartmentVo">
         select d.id,
                d.admin_username,
@@ -10,19 +11,21 @@
                d.address,
                d.contact_person,
                d.contact_number,
-               d.selling_price_system,
+               d.price_system_id,
                d.order_mode,
                d.commission_rule,
                d.status,
                d.line_credit,
                d.used_credit,
-               d.wln_warehouse_coding,
+               d.wln_warehouse_code,
                d.wln_brand,
                d.create_user,
                d.create_time,
                d.update_user,
-               d.update_time
+               d.update_time,
+               ps.name priceSystemName
         from department d
+                 left join price_system ps on d.price_system_id = ps.id
             ${ew.customSqlSegment}
     </select>
 

sd-starter/src/main/resources/application-dev.yml

@@ -6,11 +6,11 @@ spring:
       primary: base
       datasource:
         base:
-          url: jdbc:mysql://36.134.91.96:12333/sd_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://121.37.194.75:30102/sd_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
           password: 5fWD*oa^nso@kmKa
         business:
-          url: jdbc:mysql://36.134.91.96:12333/sd_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://121.37.194.75:30102/sd_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
           password: 5fWD*oa^nso@kmKa
 

sd-starter/src/main/resources/application-test.yml

@@ -6,13 +6,13 @@ spring:
       primary: base
       datasource:
         base:
-          url: jdbc:mysql://36.134.91.96:12333/sd_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:30102/sd_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
-          password: Fjhx@pwd123
+          password: 5fWD*oa^nso@kmKa
         business:
-          url: jdbc:mysql://36.134.91.96:12333/sd_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:30102/sd_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
-          password: Fjhx@pwd123
+          password: 5fWD*oa^nso@kmKa
 
   # redis 配置
   redis: