From e3542042505bd10f103d2990c987225bb071a957 Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Tue, 4 Jun 2024 15:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dkingbase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/kingbase_trouble | 4 + pom.xml | 5 - .../system/exam/TdExamController.java | 2 - .../filemanager/TdFileExtractController.java | 3 - .../src/main/resources/application-druid.yml | 12 +- .../src/main/resources/application.yml | 4 +- .../resources/templates/system/check/add.html | 2 +- .../templates/system/check/check.html | 2 +- .../templates/system/check/detail.html | 2 +- .../templates/system/check/edit.html | 2 +- .../templates/system/check/selfcheck.html | 2 +- .../system/checkresult/checkresult.html | 2 +- .../templates/system/checkresult/docheck.html | 2 +- .../mapper/generator/GenTableColumnMapper.xml | 4 +- .../mapper/generator/GenTableMapper.xml | 32 +- .../src/main/resources/vm/sql/sql.vm | 12 +- .../mapper/quartz/SysJobLogMapper.xml | 2 +- .../resources/mapper/quartz/SysJobMapper.xml | 4 +- .../java/com/ruoyi/system/domain/TdCheck.java | 25 +- .../mapper/system/SysConfigMapper.xml | 14 +- .../resources/mapper/system/SysDeptMapper.xml | 12 +- .../mapper/system/SysDictDataMapper.xml | 4 +- .../mapper/system/SysDictTypeMapper.xml | 4 +- .../mapper/system/SysLogininforMapper.xml | 2 +- .../resources/mapper/system/SysMenuMapper.xml | 4 +- .../mapper/system/SysNoticeMapper.xml | 4 +- .../resources/mapper/system/SysPostMapper.xml | 4 +- .../resources/mapper/system/SysRoleMapper.xml | 14 +- .../resources/mapper/system/SysUserMapper.xml | 52 +-- .../resources/mapper/system/TdCheckMapper.xml | 12 +- sql/ry_20230223.sql | 316 +++++++++--------- 31 files changed, 277 insertions(+), 288 deletions(-) create mode 100644 doc/kingbase_trouble diff --git a/doc/kingbase_trouble b/doc/kingbase_trouble new file mode 100644 index 00000000..25436fce --- /dev/null +++ b/doc/kingbase_trouble @@ -0,0 +1,4 @@ +1.系统工具——————代码生成 +2.涉密人员统计——————打印 +3.检查结果管理——————报告人单位 +4.文件管理若干问题 diff --git a/pom.xml b/pom.xml index f5654fd7..32ed6b37 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,6 @@ com.ruoyi ruoyi 4.7.7 - - ruoyi - http://www.ruoyi.vip - 若依管理系统 - 4.7.7 UTF-8 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdExamController.java index 9138ccee..44655204 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdExamController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdExamController.java @@ -40,9 +40,7 @@ public class TdExamController extends BaseController{ public String index(ModelMap mmap){ SysUser user = getSysUser(); mmap.put("user", user); - return prefix + "/index"; - } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java index 4d96d573..819d60a3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java @@ -37,7 +37,6 @@ public class TdFileExtractController extends BaseController { mmap.put("sysuser",getSysUser()); return prefix + "/fileextract"; } - /** * 查询涉密文件接收列表 */ @@ -56,7 +55,6 @@ public class TdFileExtractController extends BaseController { } return getDataTable(tdFileReceives); } - /** * 导出涉密文件接收列表 */ @@ -70,7 +68,6 @@ public class TdFileExtractController extends BaseController { ExcelUtil util = new ExcelUtil(TdFileReceive.class); return util.exportExcel(list, "涉密文件接收数据"); } - /** * 涉密文件提取 */ diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 5f542841..91745eb1 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -2,19 +2,19 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver -# driverClassName: com.kingbase8.Driver +# driverClassName: com.mysql.cj.jdbc.Driver + driverClassName: com.kingbase8.Driver druid: # 主库数据源 master: - url: jdbc:mysql://192.168.254.123:3306/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# url: jdbc:kingbase8://192.168.254.197:54321/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://192.168.254.123:3306/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:kingbase8://192.168.254.197:54321/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 #username: root #password: qwer1234 username: ENC(ElFzIjuV3codlxGotvqqyA==) - password: ENC(aM81j4MP4WJC4ZQBNlDntx0jKsP3wwQZ) -# password: ENC(YgAg6bUSgw1uc1H17kDw0g==) +# password: ENC(aM81j4MP4WJC4ZQBNlDntx0jKsP3wwQZ) + password: ENC(YgAg6bUSgw1uc1H17kDw0g==) # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 1915d17c..393953b0 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -84,8 +84,8 @@ mybatis: # PageHelper分页插件 pagehelper: - helperDialect: mysql -# helperDialect: postgresql +# helperDialect: mysql + helperDialect: postgresql supportMethodsArguments: true params: count=countSql diff --git a/ruoyi-admin/src/main/resources/templates/system/check/add.html b/ruoyi-admin/src/main/resources/templates/system/check/add.html index d6338752..276b3271 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/add.html @@ -10,7 +10,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/check.html b/ruoyi-admin/src/main/resources/templates/system/check/check.html index dc72875f..fdc67f29 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/check.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/check.html @@ -123,7 +123,7 @@ } }, { - field: 'user', + field: 'adduser', title: '报告人' }, { diff --git a/ruoyi-admin/src/main/resources/templates/system/check/detail.html b/ruoyi-admin/src/main/resources/templates/system/check/detail.html index 435cd908..33e1323a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/detail.html @@ -11,7 +11,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/edit.html b/ruoyi-admin/src/main/resources/templates/system/check/edit.html index 6973286b..f6815f11 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/edit.html @@ -11,7 +11,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html b/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html index 1e8ca2d7..dceb6605 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html @@ -11,7 +11,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html index 645a2b9e..14bfe5a2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html @@ -114,7 +114,7 @@ } }, { - field: 'user', + field: 'adduser', title: '报告人' }, { diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html index e6cac1c1..e08aa531 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html @@ -95,7 +95,7 @@
- +
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 86f62ded..6438163d 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{dictType}, #{sort}, #{createBy}, - sysdate() + now() ) @@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dict_type = #{dictType}, sort = #{sort}, update_by = #{updateBy}, - update_time = sysdate() + update_time = now() where column_id = #{columnId} diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml index bc7cf527..0c772f6d 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table + select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from zhky."public".gen_table @@ -101,29 +101,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into gen_table ( + insert into zhky."public".gen_table ( table_name, table_comment, class_name, @@ -152,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{genPath}, #{remark}, #{createBy}, - sysdate() + now() ) @@ -161,7 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update gen_table + update zhky."public".gen_table table_name = #{tableName}, table_comment = #{tableComment}, @@ -179,13 +179,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" options = #{options}, update_by = #{updateBy}, remark = #{remark}, - update_time = sysdate() + update_time = now() where table_id = #{tableId} - delete from gen_table where table_id in + delete from zhky."public".gen_table where table_id in #{tableId} diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-generator/src/main/resources/vm/sql/sql.vm index d5121af6..585b8032 100644 --- a/ruoyi-generator/src/main/resources/vm/sql/sql.vm +++ b/ruoyi-generator/src/main/resources/vm/sql/sql.vm @@ -1,22 +1,22 @@ -- 菜单 SQL insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '${parentMenuId}', '1', '/${moduleName}/${businessName}', 'C', '0', '${permissionPrefix}:view', '#', 'admin', sysdate(), '', null, '${functionName}菜单'); +values('${functionName}', '${parentMenuId}', '1', '/${moduleName}/${businessName}', 'C', '0', '${permissionPrefix}:view', '#', 'admin', now(), '', null, '${functionName}菜单'); -- 按钮父菜单ID SELECT @parentId := LAST_INSERT_ID(); -- 按钮 SQL insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}查询', @parentId, '1', '#', 'F', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}查询', @parentId, '1', '#', 'F', '0', '${permissionPrefix}:list', '#', 'admin', now(), '', null, ''); insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}新增', @parentId, '2', '#', 'F', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}新增', @parentId, '2', '#', 'F', '0', '${permissionPrefix}:add', '#', 'admin', now(), '', null, ''); insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}修改', @parentId, '3', '#', 'F', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}修改', @parentId, '3', '#', 'F', '0', '${permissionPrefix}:edit', '#', 'admin', now(), '', null, ''); insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}删除', @parentId, '4', '#', 'F', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}删除', @parentId, '4', '#', 'F', '0', '${permissionPrefix}:remove', '#', 'admin', now(), '', null, ''); insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}导出', @parentId, '5', '#', 'F', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}导出', @parentId, '5', '#', 'F', '0', '${permissionPrefix}:export', '#', 'admin', now(), '', null, ''); diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index b412976f..a45d1a55 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{jobMessage}, #{status}, #{exceptionInfo}, - sysdate() + now() ) diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml index 5605c444..653b5a21 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, remark = #{remark}, update_by = #{updateBy}, - update_time = sysdate() + update_time = now() where job_id = #{jobId} @@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, - sysdate() + now() ) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java index 85da6f06..61b2d7bd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java @@ -22,7 +22,7 @@ public class TdCheck extends BaseEntity /** 人员 */ @Excel(name = "人员") - private String user; + private String adduser; /** 单位 */ @Excel(name = "单位") @@ -154,6 +154,14 @@ public class TdCheck extends BaseEntity @Excel(name = "备注1") private String remark1; + public String getAdduser() { + return adduser; + } + + public void setAdduser(String adduser) { + this.adduser = adduser; + } + /** 备注2 */ @Excel(name = "备注2") private String remark2; @@ -212,19 +220,6 @@ public class TdCheck extends BaseEntity { return checkId; } - public void setUser(String user) - { - this.user = user; - } - - public String getUser() - { - return user; - } - public void setDepart(String depart) - { - this.depart = depart; - } public String getDepart() { @@ -622,7 +617,7 @@ public class TdCheck extends BaseEntity public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("checkId", getCheckId()) - .append("user", getUser()) + .append("adduser", getAdduser()) .append("depart", getDepart()) .append("checkStartTime", getCheckStartTime()) .append("checkEndTime", getCheckEndTime()) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml index e64ba577..d09ef9e5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark - from sys_config + from zhky."public".sys_config @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_config ( + insert into zhky."public".sys_config ( config_name, config_key, config_value, @@ -85,12 +85,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{configType}, #{createBy}, #{remark}, - sysdate() + now() ) - update sys_config + update zhky."public".sys_config config_name = #{configName}, config_key = #{configKey}, @@ -98,17 +98,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" config_type = #{configType}, update_by = #{updateBy}, remark = #{remark}, - update_time = sysdate() + update_time = now() where config_id = #{configId} - delete from sys_config where config_id = #{configId} + delete from zhky."public".sys_config where config_id = #{configId} - delete from sys_config where config_id in + delete from zhky."public".sys_config where config_id in #{configId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 1368c3ef..ac10a6e2 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -64,11 +64,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.dept_id, d.parent_id, d.ancestors, d.dept_name,d.framework,d.area, d.order_num, d.leader, d.phone, d.email, d.status, - (select dept_name from sys_dept where dept_id = d.parent_id) parent_name + (select dept_name from zhky."public".sys_dept where dept_id = d.parent_id) parent_name from sys_dept d where d.dept_id = #{deptId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index 1f08c563..5057bc3f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -149,7 +149,7 @@ icon = #{icon}, remark = #{remark}, update_by = #{updateBy}, - update_time = sysdate() + update_time = now() where menu_id = #{menuId} @@ -184,7 +184,7 @@ #{icon}, #{remark}, #{createBy}, - sysdate() + now() ) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 58835739..a18784b3 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, - sysdate() + now() ) @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" notice_content = #{noticeContent}, status = #{status}, update_by = #{updateBy}, - update_time = sysdate() + update_time = now() where notice_id = #{noticeId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index 86e4751a..547eaf44 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, remark = #{remark}, update_by = #{updateBy}, - update_time = sysdate() + update_time = now() where post_id = #{postId} @@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, - sysdate() + now() ) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 92ba9b8d..2668b520 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -22,15 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status, r.del_flag, r.create_time, r.remark - from sys_role r - left join sys_user_role ur on ur.role_id = r.role_id - left join sys_user u on u.user_id = ur.user_id - left join sys_dept d on u.dept_id = d.dept_id + from zhky."public".sys_role r + left join zhky."public".sys_user_role ur on ur.role_id = r.role_id + left join zhky."public".sys_user u on u.user_id = ur.user_id + left join zhky."public".sys_dept d on u.dept_id = d.dept_id select r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status, r.del_flag, r.create_time, r.remark - from sys_role r + from zhky."public".sys_role r - select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate,d.dept_name, d.leader from sys_user u - left join sys_dept d on u.dept_id = d.dept_id + select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate,d.dept_name, d.leader from zhky."public".sys_user u + left join zhky."public".sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' AND u.user_id = #{userId} @@ -107,10 +107,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate - from sys_user u - left join sys_dept d on u.dept_id = d.dept_id - left join sys_user_role ur on u.user_id = ur.user_id - left join sys_role r on r.role_id = ur.role_id + from zhky."public".sys_user u + left join zhky."public".sys_dept d on u.dept_id = d.dept_id + left join zhky."public".sys_user_role ur on u.user_id = ur.user_id + left join zhky."public".sys_role r on r.role_id = ur.role_id where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL) - and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId}) + and u.user_id not in (select u.user_id from zhky."public".sys_user u inner join zhky."public".sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId}) AND u.login_name like concat('%', #{loginName}, '%') @@ -147,8 +147,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -164,15 +164,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_user set del_flag = '2' where user_id = #{userId} + update zhky."public".sys_user set del_flag = '2' where user_id = #{userId} - update sys_user set del_flag = '2' where user_id in + update zhky."public".sys_user set del_flag = '2' where user_id in #{userId} - update sys_user + update zhky."public".sys_user dept_id = #{deptId}, login_name = #{loginName}, @@ -220,13 +220,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" examine = #{examine}, examineuser = #{examineuser}, examinedate = #{examinedate}, - update_time = sysdate() + update_time = now() where user_id = #{userId} - insert into sys_user( + insert into zhky."public".sys_user( user_id, dept_id, login_name, @@ -283,7 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{examine}, #{examineuser}, #{examinedate}, - sysdate() + now() ) diff --git a/ruoyi-system/src/main/resources/mapper/system/TdCheckMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCheckMapper.xml index d7d78d70..f5a2f9ed 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdCheckMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdCheckMapper.xml @@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -54,13 +54,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select check_id, user, depart, check_start_time, check_end_time, check_type, check_content, check_result, address, departreault, area, framework, check_state, check_name, check_address, checkcontentry, checkcontentryjt, checkcontentrywj, checkcontentrywjjt, checkcontentrysb, checkcontentrysbjt, checkcontentryglzd, checkcontentryglzdjt, checkcontentryxmsj, checkcontentryxmsjjt, checkcontentryother, checkcontentryxmsjotherjt, checkresult1, checkresult2, checkresult3, checkresult4, checkresult5, checkresult6, remark1, remark2, remark3, remark4, remark5, remark6, checkownresult1, checkownresult2, checkownresult3, checkownresult4, checkownresult5, checkownresult6, checkownresulttime from td_check + select check_id, adduser, depart, check_start_time, check_end_time, check_type, check_content, check_result, address, departreault, area, framework, check_state, check_name, check_address, checkcontentry, checkcontentryjt, checkcontentrywj, checkcontentrywjjt, checkcontentrysb, checkcontentrysbjt, checkcontentryglzd, checkcontentryglzdjt, checkcontentryxmsj, checkcontentryxmsjjt, checkcontentryother, checkcontentryxmsjotherjt, checkresult1, checkresult2, checkresult3, checkresult4, checkresult5, checkresult6, remark1, remark2, remark3, remark4, remark5, remark6, checkownresult1, checkownresult2, checkownresult3, checkownresult4, checkownresult5, checkownresult6, checkownresulttime from td_check