达梦适配修改

mhd-user-center/src/main/resources/mapper/UserMapper.xml

@@ -716,7 +716,7 @@
         SELECT u.user_id, u.user_name, u.user_area_address, u.user_area_county_id, u.user_area_name ,u.user_phone,u.has_default_address,b.shipper_id,b.shipper_enterprise_name
         FROM "USER" u
                  LEFT JOIN user_shipper b ON u.user_id = b.user_id
-                 left join (select user_id, LISTAGG(r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName
+                 left join (select user_id, LISTAGG(r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName
                             from role r
                                      left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1
                             where r.del_flag = 1
@@ -738,7 +738,7 @@
         SELECT
             user_shipper.shipper_enterprise_name
         FROM
-            user u
+            "USER" u
                 INNER JOIN
             user_shipper ON u.user_id = user_shipper.user_id
         WHERE

mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml

@@ -142,7 +142,7 @@
                b.freight_node
         FROM "USER" a
                  LEFT JOIN user_shipper b ON a.user_id = b.user_id
-                 left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName
+                 left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName
                             from role r
                                      left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1
                             where r.del_flag = 1

mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java

@@ -1,5 +1,6 @@
 package com.linke.transport.application.service.warehouse.material.command;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
@@ -25,6 +26,7 @@ public class CreateMaterialCommand {
   private String name;
 
   @ApiModelProperty(value = "物料型号")
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
 
   @NotBlank(message = "物料单位不能为空")

mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java

@@ -1,5 +1,6 @@
 package com.linke.transport.application.service.warehouse.material.command;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
@@ -24,6 +25,7 @@ public class UpdateMaterialCommand {
   @ApiModelProperty(value = "物料名称")
   private String name;
   @ApiModelProperty(value = "物料型号")
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
   @ApiModelProperty(value = "物料单位")
   private String unit;

mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java

@@ -1,5 +1,6 @@
 package com.linke.transport.application.service.warehouse.material.query;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +17,7 @@ public class MaterialQueryCommand {
   @ApiModelProperty(name = "名称")
   private String name;
   @ApiModelProperty(name = "型号")
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
   @ApiModelProperty("物料编码")
   private String materialCode;

mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java

@@ -1,5 +1,6 @@
 package com.linke.transport.application.service.warehouse.material.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
@@ -24,6 +25,7 @@ public class MaterialVO{
   @ApiModelProperty("名称")
   private String name;
   @ApiModelProperty("型号")
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
   @ApiModelProperty("单位")
   private String unit;

mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java

@@ -1,5 +1,6 @@
 package com.linke.transport.domain.warehouse.material.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.linke.transport.domain.warehouse.material.MaterialCodeGenerator;
 import com.linke.transport.domain.warehouse.material.exception.MaterialDomainException;
 import com.mhd.common.core.utils.StringUtils;
@@ -20,8 +21,10 @@ public class Material {
   private Long ownerId;
   private String category;
   private String name;
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
   private String unit;
+  @TableField("\"VALUE\"")  // 字段名转义
   private BigDecimal value;
   private boolean codeManaged;
   private String remark;

mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java

@@ -21,6 +21,7 @@ public class MaterialDO {
   private Long ownerId;
   private String category;
   private String name;
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
   private String unit;
   private BigDecimal value;