diff --git a/mhd-modules/mhd-system/pom.xml b/mhd-modules/mhd-system/pom.xml index 28390c606..923472867 100644 --- a/mhd-modules/mhd-system/pom.xml +++ b/mhd-modules/mhd-system/pom.xml @@ -54,9 +54,14 @@ - + + + com.dameng + DmJdbcDriver18 + 8.1.1.193 diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml index 91f01d07c..284040ffe 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml @@ -17,7 +17,7 @@ a.update_by, a.update_by_name, a.del_flag - FROM `sys_city` a + FROM sys_city a WHERE a.del_flag = 1 @@ -43,7 +43,7 @@ a.update_by, a.update_by_name, a.del_flag - FROM `sys_city` a + FROM sys_city a WHERE a.del_flag = 1 @@ -71,7 +71,7 @@ city_name, city_remark FROM - `sys_city` + sys_city WHERE province_code = #{values} ORDER BY diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml index 90cb542f0..deec9ee50 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml @@ -17,7 +17,7 @@ a.update_by, a.update_by_name, a.del_flag - FROM `sys_county` a + FROM sys_county a WHERE a.del_flag = 1 @@ -43,7 +43,7 @@ a.update_by_name, a.del_flag FROM - `sys_county` a + sys_county a WHERE a.del_flag = 1 @@ -68,7 +68,7 @@ city_code, county_name, county_remark - FROM `sys_county` + FROM sys_county WHERE city_code = #{values} ORDER BY county_code_new DESC LIMIT 1 @@ -113,7 +113,7 @@ a.county_name as countyName, CONCAT( c.province_name, b.city_name, a.county_name ) AS provinceCityCountyName FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code WHERE diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml index 6868c63fa..abb06f115 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml @@ -15,7 +15,7 @@ a.update_by, a.update_by_name, a.del_flag - FROM `sys_province` a + FROM sys_province a WHERE a.del_flag = 1 @@ -41,7 +41,7 @@ a.update_by, a.update_by_name, a.del_flag - FROM `sys_province` a + FROM sys_province a WHERE a.del_flag = 1 @@ -62,7 +62,7 @@ SELECT a.* FROM (SELECT c.province_id as areaId, - "" as parentAreaCode, + '' as parentAreaCode, c.province_code AS areaCode, c.province_code AS areaCodeNew, c.province_name AS areaName, @@ -75,7 +75,7 @@ c.update_by_name, c.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code UNION @@ -94,7 +94,7 @@ b.update_by_name, b.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code UNION @@ -113,7 +113,7 @@ a.update_by_name, a.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code ) a @@ -134,7 +134,7 @@ resultType="com.mhd.basic.domain.areaAggregate.repository.po.SysAreaPO"> SELECT c.province_id as areaId, - "" as parentAreaCode, + '' as parentAreaCode, c.province_code AS areaCode, c.province_code AS areaCodeNew, c.province_name AS areaName, @@ -147,7 +147,7 @@ c.update_by_name, c.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code @@ -178,7 +178,7 @@ b.update_by_name, b.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code WHERE @@ -208,7 +208,7 @@ a.update_by_name, a.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code WHERE @@ -245,7 +245,7 @@ province_name, province_remark FROM - `sys_province` + sys_province ORDER BY province_code DESC LIMIT 1 diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml index da7d67cf7..394836c26 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml @@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT a.* FROM - `basic_agreement` a + basic_agreement a WHERE a.del_flag = 1 diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml index 910d27788..fa1c98742 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ab1.latitude AS receive_doorplate, ab1.address_plot AS receive_addressPlot FROM - `common_route` cr + common_route cr LEFT JOIN address_book ab ON ab.address_book_id = cr.send_address_id and ab.user_id = #{userId} @@ -180,7 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.doorplate, b.remark FROM - `manifest_throught` m + manifest_throught m LEFT JOIN address_book b ON m.address_book_id = b.address_book_id diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml index 23b958989..67845fb2f 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml @@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and material_base_info_id in (SELECT DISTINCT material_base_info_id - FROM `test_szwl_wms`.material_inventory + FROM test_szwl_wms.material_inventory WHERE allocation_quantity > 0 AND del_flag = 1) diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml index a14aaf78b..31a7e19b6 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select material_classify_id, organization_id, organization_name, top_organization_id, code, `name`, `level`, parent_code, parent_name, code_path, name_path, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from material_classify + select material_classify_id, organization_id, organization_name, top_organization_id, code, name, level, parent_code, parent_name, code_path, name_path, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from material_classify @@ -47,10 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and code = #{code} - and `name` like concat('%', #{name}, '%') + and name like concat('%', #{name}, '%') - and `level` = #{level} + and level = #{level} and parent_code = #{parentCode} @@ -93,6 +93,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE FIND_IN_SET(#{parentCode}, code_path) > 0 - ORDER BY `level` ASC + ORDER BY level ASC \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml index 618e0690c..52ca90bf2 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml @@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_by_name like concat('%', #{updateByName}, '%') - and `number` = #{number} + and number = #{number} and remark like concat('%',#{remark},'%') diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml index b90bf0cf4..d84fdfae9 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -29,7 +29,7 @@ - select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible,sys_type, status, ifnull(perms,'') as perms, icon, create_time + select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible,sys_type, status, ifnull(perms,'') as perms, icon, create_time from sys_menu @@ -54,13 +54,13 @@ DELETE FROM - `custom_auth_role` a + custom_auth_role a WHERE a.del_flag = 1 diff --git a/mhd-user-center/src/main/resources/mapper/CustomAuthUserMapper.xml b/mhd-user-center/src/main/resources/mapper/CustomAuthUserMapper.xml index 9b257e4fc..243a15427 100644 --- a/mhd-user-center/src/main/resources/mapper/CustomAuthUserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/CustomAuthUserMapper.xml @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.update_by, a.update_by_name FROM - `custom_auth_user` a + custom_auth_user a WHERE a.del_flag = 1 @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" DELETE - FROM `role` a + FROM role a WHERE a.del_flag = 1 and a.organization_id = #{value} @@ -167,9 +167,9 @@ DELETE FROM - `role_menu` a + role_menu a WHERE a.del_flag = 1 and a.role_id = #{roleId} diff --git a/mhd-user-center/src/main/resources/mapper/UserDataPermissionMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDataPermissionMapper.xml index d96b2d2aa..9b8599b67 100644 --- a/mhd-user-center/src/main/resources/mapper/UserDataPermissionMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserDataPermissionMapper.xml @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.user_data_personal_status, a.user_data_organization_status FROM - `user_data_permission` a + user_data_permission a SELECT a.driver_id - FROM `user_driver` a + FROM user_driver a WHERE a.del_flag = 1 AND a.user_id = #{values} @@ -323,9 +323,9 @@ SELECT u.user_name FROM - `user_driver` a + user_driver a LEFT JOIN - `user` u + "user" u ON u.user_id = a.user_id AND u.del_flag = 1 WHERE a.del_flag = 1 @@ -344,8 +344,8 @@ resultType = "java.lang.Integer"> select count(1) from ( select b.user_id - from user b - left join (select user_id, GROUP_CONCAT(r.role_name separator '&') roleName + from "USER" b + left join (select user_id, WM_CONCAT(r.role_name separator '&') 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 @@ -412,8 +412,8 @@ b.user_area_address, b.user_remark, dvb.vehicle_license_plate_number - FROM `user_driver` a - LEFT JOIN `user` b ON a.user_id = b.user_id + FROM user_driver a + LEFT JOIN "USER" b ON a.user_id = b.user_id LEFT JOIN driver_vehicle_bind dvb ON dvb.driver_bind_id = b.user_id AND dvb.del_flag = 1 AND default_flag = 1 WHERE a.del_flag = 1 AND b.del_flag = 1 @@ -459,8 +459,8 @@ a.user_id, a.driver_fill FROM - `user_driver` a - LEFT JOIN `user` b ON a.user_id = b.user_id + user_driver a + LEFT JOIN "USER" b ON a.user_id = b.user_id AND b.del_flag = 1 WHERE a.del_flag = 1 @@ -523,8 +523,8 @@ b.user_name, b.user_account FROM - `user_driver` a - LEFT JOIN `user` b ON a.user_id = b.user_id AND b.del_flag = 1 + user_driver a + LEFT JOIN "USER" b ON a.user_id = b.user_id AND b.del_flag = 1 WHERE a.del_flag = 1 AND a.driver_id IN @@ -720,7 +720,7 @@ SELECT m.motorcade_header_id, md.user_id, - GROUP_CONCAT( c.vehicle_license_plate_number ) AS vehicleLicensePlateNumber, + WM_CONCAT( c.vehicle_license_plate_number ) AS vehicleLicensePlateNumber, u.user_phone, u.user_name, u.avatar, @@ -732,7 +732,7 @@ AND c.del_flag = 1 LEFT JOIN user_driver ud ON md.user_id = ud.user_id AND ud.del_flag = 1 - LEFT JOIN `user` u ON ud.user_id = u.user_id + LEFT JOIN "USER" u ON ud.user_id = u.user_id LEFT JOIN motorcade m ON md.motorcade_id = m.motorcade_id WHERE md.del_flag = 1 @@ -754,7 +754,7 @@ SELECT vehicle_id FROM - `driver_vehicle_bind` + driver_vehicle_bind WHERE del_flag = 1 and driver_id = #{values} @@ -767,9 +767,9 @@ u.user_name, u.user_auth_status FROM - `user_driver` d + user_driver d LEFT JOIN - `user` u + "user" u ON d.user_id = u.user_id LEFT JOIN driver_vehicle_bind b @@ -818,11 +818,11 @@ r.roleCode FROM user_driver ud - LEFT JOIN `user` u ON ud.user_id = u.user_id + LEFT JOIN "USER" u ON ud.user_id = u.user_id AND u.del_flag = 1 LEFT JOIN (SELECT user_id, - GROUP_CONCAT( DISTINCT r.role_code SEPARATOR '&' ) roleCode + LISTAGG(DISTINCT r.role_code, '&') WITHIN GROUP(ORDER BY r.role_code) AS roleCode FROM role r LEFT JOIN user_role ur ON r.role_id = ur.role_id @@ -856,7 +856,7 @@ FROM user_driver d LEFT JOIN driver_vehicle_bind dvb ON d.user_id = dvb.driver_bind_id AND dvb.del_flag = 1 - LEFT JOIN `user` u ON d.user_id = u.user_id + LEFT JOIN "USER" u ON d.user_id = u.user_id LEFT JOIN user_driver_enterprise ude ON d.user_driver_enterprise_id = ude.user_driver_enterprise_id LEFT JOIN motorcade_driver md ON d.user_id = md.user_id and md.del_flag = 1 LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id @@ -884,7 +884,7 @@ FROM user_driver d LEFT JOIN driver_vehicle_bind dvb ON d.user_id = dvb.driver_bind_id AND dvb.del_flag = 1 - LEFT JOIN `user` u ON d.user_id = u.user_id + LEFT JOIN "USER" u ON d.user_id = u.user_id LEFT JOIN user_driver_enterprise ude ON d.user_driver_enterprise_id = ude.user_driver_enterprise_id LEFT JOIN motorcade_driver md ON d.user_id = md.user_id and md.del_flag = 1 LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id @@ -912,7 +912,7 @@ FROM user_driver d LEFT JOIN driver_vehicle_bind dvb ON d.user_id = dvb.driver_bind_id AND dvb.del_flag = 1 - LEFT JOIN `user` u ON d.user_id = u.user_id + LEFT JOIN "USER" u ON d.user_id = u.user_id LEFT JOIN motorcade_driver md ON d.user_id = md.user_id and md.del_flag = 1 LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id WHERE @@ -950,7 +950,7 @@ u.user_account, ude.user_driver_enterprise_id, ude.driver_enterprise_name - from user u + from "USER" u left join user_driver ud on ud.user_id = u.user_id and u.del_flag = 1 left join user_driver_enterprise ude on u.user_id = ude.user_id and ude.del_flag = 1 @@ -991,7 +991,7 @@ u.user_auth_status userAuthStatus, u.user_birthday userBirthday, concat(ude.driver_captain_fill,'') driverCaptainFill - from user u + from "USER" u left join user_driver_enterprise ude on u.user_id = ude.user_id and ude.del_flag = 1 where u.del_flag = 1 and ude.driver_captain_fill = 3 @@ -1010,7 +1010,7 @@ dvb.vehicle_type_name, ud.driver_fill from user_driver ud - left join user u on ud.user_id = u.user_id + left join "USER" u on ud.user_id = u.user_id left join driver_vehicle_bind dvb on ud.user_id = dvb.driver_bind_id and dvb.del_flag = 1 and dvb.default_flag = 1 where ud.del_flag = 1 and u.del_flag = 1 @@ -1035,9 +1035,9 @@ 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, GROUP_CONCAT(r.role_name separator '&') roleName + 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 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,9 +733,9 @@ SELECT user_shipper.shipper_enterprise_name FROM - `user` u + "USER" u INNER JOIN - `user_shipper` ON u.user_id = user_shipper.user_id + user_shipper ON u.user_id = user_shipper.user_id WHERE u.del_flag = 1 AND user_shipper.del_flag = 1 diff --git a/mhd-user-center/src/main/resources/mapper/UserMenuMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMenuMapper.xml index 9df5985c9..132ff3d9f 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMenuMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMenuMapper.xml @@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.user_id, a.menu_id FROM - `user_menu` a + user_menu a SELECT @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id - from user u + from "USER" u left join user_role ur on u.user_id = ur.user_id and ur.del_flag = 1 left join role r on r.role_id = ur.role_id and r.del_flag = 1 diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index 28c1fe696..2a08dadf1 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -65,8 +65,8 @@ a.esign_auth_status, a.esign_enterprise_status, a.esign_seal_auth_id - FROM `user_shipper` a - LEFT JOIN `user` b ON a.user_id = b.user_id + FROM user_shipper a + LEFT JOIN "USER" b ON a.user_id = b.user_id WHERE a.del_flag = 1 AND b.del_flag = 1 @@ -139,6 +139,10 @@ b.monthly_settlement_flag, a.user_auth_status, b.original_receipt_flag, + 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 b.freight_node,b.customer_nc_code FROM `user` a LEFT JOIN `user_shipper` b ON a.user_id = b.user_id @@ -186,15 +190,15 @@ SELECT b.shipper_id, a.user_id, - GROUP_CONCAT(r.role_code) AS roleCode, + WM_CONCAT(r.role_code) AS roleCode, b.shipper_fill, b.shipper_enterprise_fill, a.business_type FROM - `user` a - LEFT JOIN `user_shipper` b ON b.user_id = a.user_id + user a + LEFT JOIN user_shipper b ON b.user_id = a.user_id LEFT JOIN user_role ur ON b.user_id = ur.user_id - LEFT JOIN `role` r ON ur.role_id = r.role_id + LEFT JOIN role r ON ur.role_id = r.role_id AND r.del_flag = 1 WHERE a.del_flag = 1 @@ -346,8 +350,8 @@ select sum(case when us.shipper_fill = 2 then 1 end) + - sum(case when us.shipper_enterprise_fill = 2 then 1 end) as `count` - from user u + sum(case when us.shipper_enterprise_fill = 2 then 1 end) as count + from "USER" u left join user_shipper us on u.user_id = us.user_id u.del_flag = 1 @@ -378,11 +382,4 @@ and esign_enterprise_status = #{userShipperEntity.esignEnterpriseStatus} - - diff --git a/mhd_finance/pom.xml b/mhd_finance/pom.xml index 0be92c65a..b9e4a2be6 100644 --- a/mhd_finance/pom.xml +++ b/mhd_finance/pom.xml @@ -73,9 +73,14 @@ com.mhd mhd-common-redis - + + + com.dameng + DmJdbcDriver18 + 8.1.1.193 diff --git a/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml b/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml index 672a7f4ef..8b38b8d55 100644 --- a/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml +++ b/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml @@ -12,9 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + com.dameng + DmJdbcDriver18 + 8.1.1.193 diff --git a/mhd_product/src/main/java/com/linke/product/domain/menu/repository/mapper/MenuMapper.java b/mhd_product/src/main/java/com/linke/product/domain/menu/repository/mapper/MenuMapper.java index dfe2b49a8..ec8460925 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/menu/repository/mapper/MenuMapper.java +++ b/mhd_product/src/main/java/com/linke/product/domain/menu/repository/mapper/MenuMapper.java @@ -152,6 +152,6 @@ public interface MenuMapper extends BaseMapper { List selectListByProductIdList(@Param("list") List list); - @Select("SELECT * FROM `custom_auth` WHERE menu_id in (SELECT menu_id FROM sys_menu WHERE top_organization_id = #{organizationId})") + @Select("SELECT * FROM custom_auth WHERE menu_id in (SELECT menu_id FROM sys_menu WHERE top_organization_id = #{organizationId})") List getCustomAuthByOrganizationId(@Param("organizationId") Long organizationId); } diff --git a/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml b/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml index 31a715484..abddc0176 100644 --- a/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml +++ b/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml @@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.app_menu_id, a.app_id, me.modules_id from app_menu a - left join `sys_menu` me ON me.menu_id = a.menu_id + left join sys_menu me ON me.menu_id = a.menu_id where a.del_Flag = 1 and me.del_Flag = 1 @@ -91,8 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" me.menu_show, me.menu_perms from app_menu a - left join `app_config` co ON co.app_id = a.app_id - left join `sys_menu` me ON me.menu_id = a.menu_id + left join app_config co ON co.app_id = a.app_id + left join sys_menu me ON me.menu_id = a.menu_id where a.del_flag = 1 and me.del_flag = 1 diff --git a/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml b/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml index 2a25cec46..df01bddfd 100644 --- a/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml +++ b/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" me.menu_show, me.menu_perms from app_user_menu_settings a - left join `sys_menu` me ON me.menu_id = a.menu_id + left join sys_menu me ON me.menu_id = a.menu_id where a.del_flag = 1 and me.del_flag = 1 diff --git a/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml b/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml index d4811b8a0..0a1b4db45 100644 --- a/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml +++ b/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, del_flag FROM - `custom_auth_organization` + custom_auth_organization diff --git a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml index a3fd6cb14..a07ba8746 100644 --- a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml +++ b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml @@ -96,9 +96,9 @@ o1.interbank_number, o1.template_seal FROM - `sys_organization` o1 + sys_organization o1 LEFT JOIN - `sys_organization` o2 + sys_organization o2 ON o1.parent_organization_id = o2.organization_id @@ -120,7 +120,7 @@ - AND o1.organization_id NOT IN ( SELECT organization_id FROM `sys_organization_correlation` WHERE organization_id = #{organizationId} ) + AND o1.organization_id NOT IN ( SELECT organization_id FROM sys_organization_correlation WHERE organization_id = #{organizationId} ) order by o1.create_time desc @@ -134,7 +134,7 @@ SELECT organization_id FROM - `sys_organization` + sys_organization where tenants_id = #{value} and del_flag = 1 and organization_state = 1 @@ -148,9 +148,9 @@ b.tenants_simple_name, b.user_id FROM - `sys_organization` a - LEFT JOIN `sys_tenants` b ON a.tenants_id = b.tenants_id AND b.del_flag = 1 - LEFT JOIN `tenants_domain_name` c ON b.tenants_id = c.tenants_id AND c.del_flag = 1 + sys_organization a + LEFT JOIN sys_tenants b ON a.tenants_id = b.tenants_id AND b.del_flag = 1 + LEFT JOIN tenants_domain_name c ON b.tenants_id = c.tenants_id AND c.del_flag = 1 WHERE a.del_flag = 1 AND (b.tenants_domain_name = #{value} @@ -216,7 +216,7 @@ SELECT organization_id FROM - `sys_organization` + sys_organization where del_flag = 1 @@ -225,7 +225,7 @@ SELECT organization_id FROM - `sys_organization` + sys_organization where del_flag = 1 AND parent_organization_id in @@ -234,43 +234,66 @@ diff --git a/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml b/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml index 49559df7e..0fa9f1693 100644 --- a/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml +++ b/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spd.update_by, spd.del_flag FROM - `sys_product_details` spd + sys_product_details spd LEFT JOIN sys_modules sm ON spd.modules_id = sm.modules_id AND sm.del_flag = 1 diff --git a/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml b/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml index 828ab0ad9..631e6e0c1 100644 --- a/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml +++ b/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, del_flag FROM - `product_menu` + product_menu diff --git a/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml b/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml index e968b8b4b..7b506ffb5 100644 --- a/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml +++ b/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" p.product_icon, p.product_photo FROM - `tenants_product` p + tenants_product p LEFT JOIN sys_product po ON po.product_id = p.product_id diff --git a/mhd_thrid_party/pom.xml b/mhd_thrid_party/pom.xml index ed64ff6c6..7d5c8bdc4 100644 --- a/mhd_thrid_party/pom.xml +++ b/mhd_thrid_party/pom.xml @@ -80,9 +80,14 @@ seata-spring-boot-starter - + + + com.dameng + DmJdbcDriver18 + 8.1.1.193 diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml index 3bbe00014..64c31ee4d 100644 --- a/mhd_transport/pom.xml +++ b/mhd_transport/pom.xml @@ -74,9 +74,14 @@ mhd-common-redis - + + + com.dameng + DmJdbcDriver18 + 8.1.1.193 diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java index a62fbdef3..0aaa4c32c 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java +++ b/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 = "物料单位不能为空") diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java index 6100b5e86..3f237a7e6 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java +++ b/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; diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java index 6d5bfb356..1f46b11f5 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java +++ b/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; diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java index 528a9129e..b75b9d5c0 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java +++ b/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; diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java index 33397422d..329986365 100644 --- a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java +++ b/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; diff --git a/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java b/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java index ae350ed08..64f500bac 100644 --- a/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java +++ b/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; diff --git a/mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml b/mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml index cd6261d26..ad43e907e 100644 --- a/mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml +++ b/mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml @@ -33,12 +33,12 @@ i.material_id, m.category AS material_category, m.name AS material_name, - m.model AS material_model, + m."MODEL" AS material_model, i.quantity, m.unit, m.weight, m.code_managed, - m.value, + m."VALUE", i.machine_serial_no, i.created_at FROM @@ -91,7 +91,7 @@ i.material_id, m.category AS material_category, m.name AS material_name, - m.model AS material_model, + m."MODEL" AS material_model, i.quantity, m.unit, m.weight,