feat(aroad): 解决sql不兼容的问题

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/entity/AttendanceTemplates.java

@@ -80,6 +80,6 @@ public class AttendanceTemplates extends Model<AttendanceTemplates> {
   /**
    * 是否删除
    */
-  private Boolean isDel;
+  private boolean isDel;
   
 }

src/main/resources/mapper/attendance/AttendanceMapper.xml

@@ -23,7 +23,7 @@
   <select id="getAttendance" resultMap="attendanceDtoMap">
       SELECT
         a.attendance_id,a.unit_id,a.time,t.shift_id,t.shift_name,COUNT(m.id) as count
-      FROM `attendance` a
+      FROM attendance a
       INNER JOIN attendance_templates  t
       ON a.shift_id = t.shift_id
       INNER JOIN attendance_members m

src/main/resources/mapper/attendance/AttendanceMembersMapper.xml

@@ -25,7 +25,7 @@
         a.time,
         t.shift_name,t.start_time,t.end_time,t.is_cross_day,
         m.id,m.name,m.phone
-      FROM `attendance` a
+      FROM attendance a
       INNER JOIN attendance_templates  t
       ON a.shift_id = t.shift_id
       INNER JOIN attendance_members m

src/main/resources/mapper/attendance/AttendanceTemplatesMapper.xml

@@ -25,7 +25,7 @@
         where
           unit_id = #{unitId}
         and
-          is_del=0
+          is_del='0'
   </select>
 
 
@@ -33,11 +33,11 @@
     select t.*,d.name as dept_name from attendance_templates t inner join sys_dept d
     on t.unit_id = d.dept_id
     where t.unit_id = #{unitId}
-    and is_del=0
+    and is_del='0'
   </select>
 
   <update id="delTemplate">
-      update attendance_templates set is_del=1
+      update attendance_templates set is_del='1'
       where  shift_id=#{shiftId}
   </update>
 </mapper>

src/main/resources/mapper/system/UserMapper.xml

@@ -66,21 +66,21 @@
     </resultMap>
 
     <sql id="userRoleSql">
-        `user`.user_id,
-		`user`.username,
-		`user`.`password`,
-		`user`.salt,
-		`user`.phone,
-		`user`.avatar,
-		`user`.wx_openid,
-		`user`.qq_openid,
-		`user`.dept_id,
-		`user`.create_time AS ucreate_time,
-		`user`.update_time AS uupdate_time,
-		`user`.del_flag AS udel_flag,
-		`user`.lock_flag AS lock_flag,
-		`user`.dept_id AS deptId,
-		`user`.tenant_id AS tenantId,
+        u.user_id,
+		u.username,
+		u.password,
+		u.salt,
+		u.phone,
+		u.avatar,
+		u.wx_openid,
+		u.qq_openid,
+		u.dept_id,
+		u.create_time AS ucreate_time,
+		u.update_time AS uupdate_time,
+		u.del_flag AS udel_flag,
+		u.lock_flag AS lock_flag,
+		u.dept_id AS deptId,
+		u.tenant_id AS tenantId,
 		r.role_id,
 		r.role_name,
 		r.role_code,
@@ -90,19 +90,19 @@
     </sql>
 
     <sql id="userRoleDeptSql">
-        `user`.user_id,
-		`user`.username,
-		`user`.`password`,
-		`user`.salt,
-		`user`.phone,
-		`user`.avatar,
-		`user`.wx_openid,
-		`user`.qq_openid,
-		`user`.create_time AS ucreate_time,
-		`user`.update_time AS uupdate_time,
-		`user`.del_flag AS udel_flag,
-		`user`.lock_flag AS lock_flag,
-		`user`.tenant_id AS tenantId,
+        u.user_id,
+		u.username,
+		u.password,
+		u.salt,
+		u.phone,
+		u.avatar,
+		u.wx_openid,
+		u.qq_openid,
+		u.create_time AS ucreate_time,
+		u.update_time AS uupdate_time,
+		u.del_flag AS udel_flag,
+		u.lock_flag AS lock_flag,
+		u.tenant_id AS tenantId,
 		r.role_id,
 		r.role_name,
 		r.role_code,
@@ -117,53 +117,53 @@
         SELECT
         <include refid="userRoleSql"/>
         FROM
-        sys_user AS `user`
-        LEFT JOIN sys_user_role AS ur ON ur.user_id = `user`.user_id
+        sys_user AS u
+        LEFT JOIN sys_user_role AS ur ON ur.user_id = u.user_id
         LEFT JOIN sys_role AS r ON r.role_id = ur.role_id
-        WHERE `user`.username = #{username}
+        WHERE u.username = #{username}
     </select>
 
     <select id="getUserVoById" resultMap="userVoResultMap">
         SELECT
         <include refid="userRoleDeptSql"/>
         FROM
-        sys_user AS `user`
-        LEFT JOIN sys_user_role AS ur ON ur.user_id = `user`.user_id
+        sys_user AS u
+        LEFT JOIN sys_user_role AS ur ON ur.user_id = u.user_id
         LEFT JOIN sys_role AS r ON r.role_id = ur.role_id
-        LEFT JOIN sys_dept AS d ON d.dept_id = `user`.dept_id
+        LEFT JOIN sys_dept AS d ON d.dept_id = u.dept_id
         WHERE
-        `user`.user_id = #{id}
+        u.user_id = #{id}
     </select>
 
     <select id="getUserVosPage" resultMap="BaseResultMap">
         SELECT
-        `user`.user_id,
-        `user`.username,
-        `user`.`password`,
-        `user`.salt,
-        `user`.phone,
-        `user`.avatar,
-        `user`.wx_openid,
-        `user`.qq_openid,
-        `user`.dept_id,
-        `user`.create_time AS ucreate_time,
-        `user`.update_time AS uupdate_time,
-        `user`.del_flag AS udel_flag,
-        `user`.lock_flag AS lock_flag,
-        `user`.dept_id AS deptId,
-        `user`.tenant_id AS tenantId
+        u.user_id,
+        u.username,
+        u.password,
+        u.salt,
+        u.phone,
+        u.avatar,
+        u.wx_openid,
+        u.qq_openid,
+        u.dept_id,
+        u.create_time AS ucreate_time,
+        u.update_time AS uupdate_time,
+        u.del_flag AS udel_flag,
+        u.lock_flag AS lock_flag,
+        u.dept_id AS deptId,
+        u.tenant_id AS tenantId
         FROM
-        sys_user AS `user`
-        LEFT JOIN sys_dept AS d ON d.dept_id = `user`.dept_id
+        sys_user AS u
+        LEFT JOIN sys_dept AS d ON d.dept_id = u.dept_id
         <where>
             <if test="query.username != null and query.username != ''">
-                and `user`.username LIKE CONCAT('%',#{query.username},'%')
+                and u.username LIKE CONCAT('%',#{query.username},'%')
             </if>
             <if test="query.deptId != null and query.deptId != ''">
-                and `user`.dept_id = #{query.deptId}
+                and u.dept_id = #{query.deptId}
             </if>
         </where>
-        ORDER BY `user`.create_time DESC
+        ORDER BY u.create_time DESC
     </select>
 
     <select id="getSelfAndChildUsers" resultMap="userDeptResultMap">

src/test/java/com/elephant/framework/galaxy/travel/mapper/DepartmentMapperTests.java

-//package com.elephant.framework.galaxy.travel.mapper;
-//
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.elephant.framework.galaxy.travel.module.system.mapper.DepartmentMapper;
-//import com.elephant.framework.galaxy.travel.module.system.entity.Department;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-//import java.util.Date;
-//import java.util.List;
-//
-//@RunWith(SpringRunner.class)
-//@SpringBootTest
-//public class DepartmentMapperTests {
+package com.elephant.framework.galaxy.travel.mapper;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Slf4j
+public class DepartmentMapperTests {
 //
 //    @Autowired
 //    private DepartmentMapper departmentMapper;
-//
+
 //    @Test
 //    public void testSelect() {
 //        // 查询全部
@@ -51,5 +49,7 @@
 //        department.setTenantId(1);
 //        departmentMapper.insert(department);
 //    }
-//
-//}
+
+}
+
+