diff --git a/db/updatesql/20260306-信创system删表语句.sql b/db/updatesql/20260306-信创system删表语句.sql index 7f24c19..f444298 100644 --- a/db/updatesql/20260306-信创system删表语句.sql +++ b/db/updatesql/20260306-信创system删表语句.sql @@ -75,6 +75,7 @@ DROP TABLE "REP_DEMO_EMPLOYEE"; DROP TABLE "REP_DEMO_GONGSI"; DROP TABLE "REP_DEMO_JIANPIAO"; DROP TABLE "SYS_APP_VERSION_QH"; +DROP TABLE "SYS_DEPART_COPY1"; DROP TABLE "SYS_DEPART_GPS_QH"; DROP TABLE "SYS_DEPART_QH"; DROP TABLE "SYS_LOG_QH"; @@ -97,4 +98,14 @@ DROP TABLE "TEST_ORDER_PRODUCT"; DROP TABLE "TEST_SHOPTYPE_TREE"; DROP TABLE "TEST_V3_HELLO"; DROP TABLE "TMP_REPORT_DATA_1"; -DROP TABLE "TMP_REPORT_DATA_INCOME"; \ No newline at end of file +DROP TABLE "TMP_REPORT_DATA_INCOME"; +DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_INBODY"; +DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_LEFU"; +DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_ONE"; +DROP TABLE "REMOTE_WEIGHT_MANUFACTURER_TWO"; +DROP TABLE "REMOTE_WEIGHT_NORMATIVE_DATA"; +DROP TABLE "HEALTH_USER_DOCTOR_BASE_EX"; +DROP TABLE "HOSPITAL_DEPARTMENT"; +DROP TABLE "STATION_HOSPITAL"; +DROP TABLE "SYS_APP_VERSION"; +DROP TABLE "USER_INFORMATION"; diff --git a/db/updatesql/20260310-修改system数据库表名.sql b/db/updatesql/20260310-修改system数据库表名.sql new file mode 100644 index 0000000..55b69ca --- /dev/null +++ b/db/updatesql/20260310-修改system数据库表名.sql @@ -0,0 +1,92 @@ +-- ============================================================ +-- System 服务数据库表名修改脚本（达梦 DM8） +-- 规则：统一以 QH_ 开头，第二级三字母业务模块前缀，总长度 ≤ 25 位 +-- 生成日期：2026-03-10 +-- 涉及表数：76 张 +-- ============================================================ + +-- ===== COM 公共模块（4 张）===== +ALTER TABLE "COMMON_EXPORTS_INFO" RENAME TO "QH_COM_EXPORTS_INFO"; +ALTER TABLE "COMMON_EXPORTS_ITEM" RENAME TO "QH_COM_EXPORTS_ITEM"; +ALTER TABLE "COMMON_IMPORTS" RENAME TO "QH_COM_IMPORTS"; +ALTER TABLE "COMMON_IMPORTS_DETAIL" RENAME TO "QH_COM_IMPORTS_DETAIL"; + +-- ===== HLT 健康模块（6 张）===== +ALTER TABLE "HEALTH_CONSULT_RESOURCE" RENAME TO "QH_HLT_CONSULT_RESOURCE"; +ALTER TABLE "HEALTH_HOLIDAY" RENAME TO "QH_HLT_HOLIDAY"; +ALTER TABLE "HEALTH_USER_DOCTOR_EX" RENAME TO "QH_HLT_DOCTOR_EX"; +ALTER TABLE "HEALTH_USER_EMPLOYEE_EX" RENAME TO "QH_HLT_USER_EMPLOYEE_EX"; +ALTER TABLE "HEALTH_USER_OPERATOR_EX" RENAME TO "QH_HLT_USER_OPERATOR_EX"; +ALTER TABLE "HEALTH_USER_STATION_EX" RENAME TO "QH_HLT_USER_STATION_EX"; + +-- ===== SCL 体测模块（2 张）===== +ALTER TABLE "SCALE_HEIGHT" RENAME TO "QH_SCL_HEIGHT"; +ALTER TABLE "SCALE_PERSONAL" RENAME TO "QH_SCL_PERSONAL"; + +-- ===== SYS 系统模块（52 张）===== +ALTER TABLE "SYS_ANNOUNCEMENT" RENAME TO "QH_SYS_ANNOUNCEMENT"; +ALTER TABLE "SYS_ANNOUNCEMENT_SEND" RENAME TO "QH_SYS_ANNOUNCEMENT_SEND"; +ALTER TABLE "SYS_BANNER" RENAME TO "QH_SYS_BANNER"; +ALTER TABLE "SYS_CATEGORY" RENAME TO "QH_SYS_CATEGORY"; +ALTER TABLE "SYS_CHECK_RULE" RENAME TO "QH_SYS_CHECK_RULE"; +ALTER TABLE "SYS_COMMENT" RENAME TO "QH_SYS_COMMENT"; +ALTER TABLE "SYS_CONFIG" RENAME TO "QH_SYS_CONFIG"; +ALTER TABLE "SYS_DATA_LOG" RENAME TO "QH_SYS_DATA_LOG"; +ALTER TABLE "SYS_DATA_SOURCE" RENAME TO "QH_SYS_DATA_SOURCE"; +ALTER TABLE "SYS_DEPART" RENAME TO "QH_SYS_DEPART"; +ALTER TABLE "SYS_DEPART_GPS" RENAME TO "QH_SYS_DEPART_GPS"; +ALTER TABLE "SYS_DEPART_PERMISSION" RENAME TO "QH_SYS_DEPART_PERMISSION"; +ALTER TABLE "SYS_DEPART_ROLE" RENAME TO "QH_SYS_DEPART_ROLE"; +ALTER TABLE "SYS_DEPART_ROLE_PERMISSION" RENAME TO "QH_SYS_DEPT_ROLE_PERM"; +ALTER TABLE "SYS_DEPART_ROLE_USER" RENAME TO "QH_SYS_DEPART_ROLE_USER"; +ALTER TABLE "SYS_DICT" RENAME TO "QH_SYS_DICT"; +ALTER TABLE "SYS_DICT_ITEM" RENAME TO "QH_SYS_DICT_ITEM"; +ALTER TABLE "SYS_FILES" RENAME TO "QH_SYS_FILES"; +ALTER TABLE "SYS_FILL_RULE" RENAME TO "QH_SYS_FILL_RULE"; +ALTER TABLE "SYS_FORM_FILE" RENAME TO "QH_SYS_FORM_FILE"; +ALTER TABLE "SYS_GATEWAY_ROUTE" RENAME TO "QH_SYS_GATEWAY_ROUTE"; +ALTER TABLE "SYS_IOS_REDEEM" RENAME TO "QH_SYS_IOS_REDEEM"; +ALTER TABLE "SYS_LOG" RENAME TO "QH_SYS_LOG"; +ALTER TABLE "SYS_MESSAGE_NOTICE" RENAME TO "QH_SYS_MSG_NOTICE"; +ALTER TABLE "SYS_MESSAGE_NOTICE_SCOPE" RENAME TO "QH_SYS_MSG_NOTICE_SCOPE"; +ALTER TABLE "SYS_MESSAGE_REMIND" RENAME TO "QH_SYS_MSG_REMIND"; +ALTER TABLE "SYS_NOTICE" RENAME TO "QH_SYS_NOTICE"; +ALTER TABLE "SYS_NOTICE_READ_RECORD" RENAME TO "QH_SYS_NOTICE_READ_RECORD"; +ALTER TABLE "SYS_PACK_PERMISSION" RENAME TO "QH_SYS_PACK_PERMISSION"; +ALTER TABLE "SYS_PERMISSION" RENAME TO "QH_SYS_PERMISSION"; +ALTER TABLE "SYS_PERMISSION_DATA_RULE" RENAME TO "QH_SYS_PERM_DATA_RULE"; +ALTER TABLE "SYS_PERMISSION_V2" RENAME TO "QH_SYS_PERMISSION_V2"; +ALTER TABLE "SYS_POSITION" RENAME TO "QH_SYS_POSITION"; +ALTER TABLE "SYS_POSITION_CLASSIFY" RENAME TO "QH_SYS_POSITION_CLASSIFY"; +ALTER TABLE "SYS_QUARTZ_JOB" RENAME TO "QH_SYS_QUARTZ_JOB"; +ALTER TABLE "SYS_ROLE" RENAME TO "QH_SYS_ROLE"; +ALTER TABLE "SYS_ROLE_INDEX" RENAME TO "QH_SYS_ROLE_INDEX"; +ALTER TABLE "SYS_ROLE_PERMISSION" RENAME TO "QH_SYS_ROLE_PERMISSION"; +ALTER TABLE "SYS_SMS" RENAME TO "QH_SYS_SMS"; +ALTER TABLE "SYS_SMS_TEMPLATE" RENAME TO "QH_SYS_SMS_TEMPLATE"; +ALTER TABLE "SYS_TENANT" RENAME TO "QH_SYS_TENANT"; +ALTER TABLE "SYS_TENANT_PACK" RENAME TO "QH_SYS_TENANT_PACK"; +ALTER TABLE "SYS_TENANT_PACK_PERMS" RENAME TO "QH_SYS_TENANT_PACK_PERMS"; +ALTER TABLE "SYS_TENANT_PACK_USER" RENAME TO "QH_SYS_TENANT_PACK_USER"; +ALTER TABLE "SYS_THIRD_ACCOUNT" RENAME TO "QH_SYS_THIRD_ACCOUNT"; +ALTER TABLE "SYS_USER" RENAME TO "QH_SYS_USER"; +ALTER TABLE "SYS_USER_AGENT" RENAME TO "QH_SYS_USER_AGENT"; +ALTER TABLE "SYS_USER_DEPART" RENAME TO "QH_SYS_USER_DEPART"; +ALTER TABLE "SYS_USER_DEPART_CHANGE_APPLY" RENAME TO "QH_SYS_DEPT_CHG_APPLY"; +ALTER TABLE "SYS_USER_DEVICE" RENAME TO "QH_SYS_USER_DEVICE"; +ALTER TABLE "SYS_USER_EMERGENCY_CONTACT" RENAME TO "QH_SYS_USR_EMERG_CONTACT"; +ALTER TABLE "SYS_USER_FAMILY_MEMBERS" RENAME TO "QH_SYS_USR_FAMILY_MBR"; +ALTER TABLE "SYS_USER_FAMILY_MEMBERS_REQUEST" RENAME TO "QH_SYS_USR_FAM_MBR_REQ"; +ALTER TABLE "SYS_USER_POST" RENAME TO "QH_SYS_USER_POST"; +ALTER TABLE "SYS_USER_ROLE" RENAME TO "QH_SYS_USER_ROLE"; +ALTER TABLE "SYS_USER_TENANT" RENAME TO "QH_SYS_USER_TENANT"; +ALTER TABLE "SYS_VERSION_APP" RENAME TO "QH_SYS_VERSION_APP"; +ALTER TABLE "SYS_VERSION_INFO" RENAME TO "QH_SYS_VERSION_INFO"; + +-- ===== USR 用户模块（12 张）===== +ALTER TABLE "TBL_USER_WX_RELATION" RENAME TO "QH_USR_WX_RELATION"; +ALTER TABLE "USER_DATA_RECORD_BLOOD_ABO" RENAME TO "QH_USR_DATA_RCD_BLOOD_ABO"; +ALTER TABLE "USER_DATA_RECORD_BLOOD_PRESSURE" RENAME TO "QH_USR_DATA_RCD_BLD_PRS"; +ALTER TABLE "USER_DATA_RECORD_BMI" RENAME TO "QH_USR_DATA_RCD_BMI"; +ALTER TABLE "USER_DATA_RECORD_BWH" RENAME TO "QH_USR_DATA_RCD_BWH"; +ALTER TABLE "USER_WEIGHT_BIND" RENAME TO "QH_USR_WEIGHT_BIND"; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java index d7431b1..5c28db4 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java @@ -367,28 +367,28 @@ public interface CommonConstant { Integer USER_IDENTITY_2 = 2; /** - * sys_user 表 username 唯一键索引 + * QH_SYS_USER 表 username 唯一键索引 */ String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "uniq_sys_user_username"; /** - * sys_user 表 work_no 唯一键索引 + * QH_SYS_USER 表 work_no 唯一键索引 */ String SQL_INDEX_UNIQ_SYS_USER_WORK_NO = "uniq_sys_user_work_no"; /** - * sys_user 表 phone 唯一键索引 + * QH_SYS_USER 表 phone 唯一键索引 */ String SQL_INDEX_UNIQ_SYS_USER_PHONE = "uniq_sys_user_phone"; /** - * 达梦数据库升提示。违反表[SYS_USER]唯一性约束 + * 达梦数据库升提示。违反表[QH_SYS_USER]唯一性约束 */ String SQL_INDEX_UNIQ_SYS_USER = "唯一性约束"; /** - * sys_user 表 email 唯一键索引 + * QH_SYS_USER 表 email 唯一键索引 */ String SQL_INDEX_UNIQ_SYS_USER_EMAIL = "uniq_sys_user_email"; /** - * sys_quartz_job 表 job_class_name 唯一键索引 + * QH_SYS_QUARTZ_JOB 表 job_class_name 唯一键索引 */ String SQL_INDEX_UNIQ_JOB_CLASS_NAME = "uniq_job_class_name"; /** @@ -396,15 +396,15 @@ public interface CommonConstant { */ String SQL_INDEX_UNIQ_CODE = "uniq_code"; /** - * sys_role 表 code 唯一键索引 + * QH_SYS_ROLE 表 code 唯一键索引 */ String SQL_INDEX_UNIQ_SYS_ROLE_CODE = "uniq_sys_role_role_code"; /** - * sys_depart 表 code 唯一键索引 + * QH_SYS_DEPART 表 code 唯一键索引 */ String SQL_INDEX_UNIQ_DEPART_ORG_CODE = "uniq_depart_org_code"; /** - * sys_category 表 code 唯一键索引 + * QH_SYS_CATEGORY 表 code 唯一键索引 */ String SQL_INDEX_UNIQ_CATEGORY_CODE = "idx_sc_code"; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java index 0dbff6c..bf8b23a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java @@ -9,8 +9,8 @@ package org.jeecg.common.constant; public class DynamicTableConstant { /** * 角色首页配置表 - * vue2表名: sys_role_index + * vue2表名: QH_SYS_ROLE_INDEX * vue3表名: sys_role_index_vue3 */ - public static final String SYS_ROLE_INDEX = "sys_role_index"; + public static final String QH_SYS_ROLE_INDEX = "QH_SYS_ROLE_INDEX"; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartGps.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartGps.java index d9866cb..23862a4 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartGps.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartGps.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; * @date 2023/12/4 11:01 */ @Data -@TableName("sys_depart") +@TableName("QH_SYS_DEPART_GPS") public class SysDepartGps implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserModel.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserModel.java index 6c37107..cfff4cc 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserModel.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserModel.java @@ -12,7 +12,7 @@ import java.util.Date; * @date 2023-04-19 15:26 */ @Data -@Schema(title = "sys_user对象", description = "sys_user") +@Schema(title = "sys_user对象", description = "QH_SYS_USER") public class SysUserModel { /** * id diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java index 9379067..277b229 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java @@ -17,13 +17,13 @@ public abstract class AbstractQueryBlackListHandler { * key-表名 * value-字段名，多个逗号隔开 * 两种配置方式-- 全部配置成小写 - * ruleMap.put("sys_user", "*")sys_user所有的字段不支持查询 - * ruleMap.put("sys_user", "username,password")sys_user中的username和password不支持查询 + * ruleMap.put("QH_SYS_USER", "*")sys_user所有的字段不支持查询 + * ruleMap.put("QH_SYS_USER", "username,password")sys_user中的username和password不支持查询 */ public static Map ruleMap = new HashMap<>(); static { - ruleMap.put("sys_user", "password,salt"); + ruleMap.put("QH_SYS_USER", "password,salt"); } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java index d753a73..abfb1b6 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java @@ -60,13 +60,13 @@ public class MybatisPlusSaasConfig { //1.需要租户隔离的表请在此配置 if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { //a.系统管理表 - TENANT_TABLE.add("sys_role"); - TENANT_TABLE.add("sys_user_role"); - TENANT_TABLE.add("sys_depart"); - TENANT_TABLE.add("sys_category"); - TENANT_TABLE.add("sys_data_source"); + TENANT_TABLE.add("QH_SYS_ROLE"); + TENANT_TABLE.add("QH_SYS_USER_ROLE"); + TENANT_TABLE.add("QH_SYS_DEPART"); + TENANT_TABLE.add("QH_SYS_CATEGORY"); + TENANT_TABLE.add("QH_SYS_DATA_SOURCE"); TENANT_TABLE.add("sys_position"); - TENANT_TABLE.add("sys_announcement"); + TENANT_TABLE.add("QH_SYS_ANNOUNCEMENT"); } //2.示例测试 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java index 6590274..0cf9b3f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java @@ -36,7 +36,7 @@ public class HttpUtils { public static SortedMap getAllParams(HttpServletRequest request) throws IOException { SortedMap result = new TreeMap<>(); - // 获取URL上最后带逗号的参数变量 sys/dict/getDictItems/sys_user,realname,username + // 获取URL上最后带逗号的参数变量 sys/dict/getDictItems/QH_SYS_USER,realname,username String pathVariable = request.getRequestURI().substring(request.getRequestURI().lastIndexOf("/") + 1); if (pathVariable.contains(SymbolConstant.COMMA)) { log.info(" pathVariable: {}", pathVariable); @@ -74,7 +74,7 @@ public class HttpUtils { throws IOException { SortedMap result = new TreeMap<>(); - // 获取URL上最后带逗号的参数变量 sys/dict/getDictItems/sys_user,realname,username + // 获取URL上最后带逗号的参数变量 sys/dict/getDictItems/QH_SYS_USER,realname,username String pathVariable = url.substring(url.lastIndexOf("/") + 1); if (pathVariable.contains(SymbolConstant.COMMA)) { log.info(" pathVariable: {}", pathVariable); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml index e50ec19..2b0ebb2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml @@ -3,7 +3,7 @@ - insert into sys_log (id, log_type, log_content, method, operate_type, request_url, request_type, request_param, + insert into QH_SYS_LOG (id, log_type, log_content, method, operate_type, request_url, request_type, request_param, ip, userid, username, cost_time, create_time,create_by, tenant_id) values( #{dto.id,jdbcType=VARCHAR}, diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/controller/CommonExportsInfoController.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/controller/CommonExportsInfoController.java index be91fff..eabeb59 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/controller/CommonExportsInfoController.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/controller/CommonExportsInfoController.java @@ -38,7 +38,7 @@ import java.util.List; * @Date: 2023-05-29 * @Version: V1.0 */ -@Tag(name = "common_exports_info") +@Tag(name = "QH_COM_EXPORTS_INFO") @RestController @RequestMapping("/sys/common/commonExportsInfo") @Slf4j @@ -57,8 +57,8 @@ public class CommonExportsInfoController extends JeecgController> queryPageList(CommonExportsInfo commonExportsInfo, @@ -89,9 +89,9 @@ public class CommonExportsInfoController extends JeecgController add(@RequestBody CommonExportsInfo commonExportsInfo) { commonExportsInfoService.save(commonExportsInfo); @@ -104,9 +104,9 @@ public class CommonExportsInfoController extends JeecgController edit(@RequestBody CommonExportsInfo commonExportsInfo) { commonExportsInfoService.saveOrUpdate(commonExportsInfo); @@ -119,9 +119,9 @@ public class CommonExportsInfoController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { commonExportsInfoService.removeById(id); @@ -134,9 +134,9 @@ public class CommonExportsInfoController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.commonExportsInfoService.removeByIds(Arrays.asList(ids.split(","))); @@ -149,8 +149,8 @@ public class CommonExportsInfoController extends JeecgController queryById(@RequestParam(name = "id", required = true) String id) { CommonExportsInfo commonExportsInfo = commonExportsInfoService.getById(id); @@ -166,10 +166,10 @@ public class CommonExportsInfoController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, CommonExportsInfo.class); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/entity/CommonExportsInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/entity/CommonExportsInfo.java index b6845e1..931ee91 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/entity/CommonExportsInfo.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/entity/CommonExportsInfo.java @@ -17,16 +17,16 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: common_exports_info + * @Description: QH_COM_EXPORTS_INFO * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 */ @Data -@TableName("common_exports_info") +@TableName("QH_COM_EXPORTS_INFO") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(title = "common_exports_info对象", description = "common_exports_info") +@Schema(title = "common_exports_info对象", description = "QH_COM_EXPORTS_INFO") public class CommonExportsInfo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/mapper/CommonExportsInfoMapper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/mapper/CommonExportsInfoMapper.java index ab29da5..ded7ee3 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/mapper/CommonExportsInfoMapper.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/mapper/CommonExportsInfoMapper.java @@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.exports.entity.CommonExportsInfo; /** - * @Description: common_exports_info + * @Description: QH_COM_EXPORTS_INFO * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/service/ICommonExportsInfoService.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/service/ICommonExportsInfoService.java index 067b48b..00f92ef 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/service/ICommonExportsInfoService.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/service/ICommonExportsInfoService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.exports.entity.CommonExportsInfo; /** - * @Description: common_exports_info + * @Description: QH_COM_EXPORTS_INFO * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/service/impl/CommonExportsInfoServiceImpl.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/service/impl/CommonExportsInfoServiceImpl.java index e8bf369..166d998 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/service/impl/CommonExportsInfoServiceImpl.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/service/impl/CommonExportsInfoServiceImpl.java @@ -9,7 +9,7 @@ import org.jeecg.modules.exports.service.ICommonExportsInfoService; import org.springframework.stereotype.Service; /** - * @Description: common_exports_info + * @Description: QH_COM_EXPORTS_INFO * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsController.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsController.java index cfc739f..899f3af 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsController.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsController.java @@ -31,7 +31,7 @@ import java.util.Arrays; * @Date: 2023-05-29 * @Version: V1.0 */ -@Tag(name = "common_imports") +@Tag(name = "QH_COM_IMPORTS") @RestController @RequestMapping("/sys/common/commonImports") @Slf4j @@ -76,7 +76,7 @@ public class CommonImportsController extends JeecgController add(@RequestBody CommonImports commonImports) { commonImportsService.save(commonImports); @@ -91,7 +91,7 @@ public class CommonImportsController extends JeecgController edit(@RequestBody CommonImports commonImports) { commonImportsService.updateById(commonImports); @@ -171,10 +171,10 @@ public class CommonImportsController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, CommonImports.class); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsDetailController.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsDetailController.java index 409deb6..6001c15 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsDetailController.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsDetailController.java @@ -29,7 +29,7 @@ import java.util.List; * @Date: 2023-05-29 * @Version: V1.0 */ -@Tag(name = "common_imports_detail") +@Tag(name = "QH_COM_IMPORTS_DETAIL") @RestController @RequestMapping("/sys/common/commonImportsDetail") @Slf4j @@ -67,7 +67,7 @@ public class CommonImportsDetailController extends JeecgController add(@RequestBody CommonImportsDetail CommonImportsDetail) { commonImportsDetailService.save(CommonImportsDetail); @@ -82,7 +82,7 @@ public class CommonImportsDetailController extends JeecgController edit(@RequestBody CommonImportsDetail CommonImportsDetail) { commonImportsDetailService.updateById(CommonImportsDetail); @@ -113,7 +113,7 @@ public class CommonImportsDetailController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { commonImportsDetailService.removeById(id); @@ -128,7 +128,7 @@ public class CommonImportsDetailController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.commonImportsDetailService.removeByIds(Arrays.asList(ids.split(","))); @@ -180,7 +180,7 @@ public class CommonImportsDetailController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, CommonImportsDetail.class); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsInfoController.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsInfoController.java index 5ea7ce6..008d3b5 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsInfoController.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsInfoController.java @@ -26,7 +26,7 @@ import java.util.Arrays; * @Date: 2023-05-29 * @Version: V1.0 */ -//@Tag(name = "common_exports_item") +//@Tag(name = "QH_COM_EXPORTS_ITEM") @RestController //@RequestMapping("/sys/common/commonImportsInfo") @Slf4j @@ -64,7 +64,7 @@ public class CommonImportsInfoController extends JeecgController add(@RequestBody CommonImportsInfo commonImportsInfo) { commonImportsInfoService.save(commonImportsInfo); @@ -79,7 +79,7 @@ public class CommonImportsInfoController extends JeecgController edit(@RequestBody CommonImportsInfo commonImportsInfo) { commonImportsInfoService.updateById(commonImportsInfo); @@ -137,10 +137,10 @@ public class CommonImportsInfoController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, CommonImportsInfo.class); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImports.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImports.java index 00992d7..7b99dca 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImports.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImports.java @@ -22,10 +22,10 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("common_imports") +@TableName("QH_COM_IMPORTS") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(title = "common_imports对象", description = "common_imports") +@Schema(title = "common_imports对象", description = "QH_COM_IMPORTS") public class CommonImports implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImportsDetail.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImportsDetail.java index 765fd9d..ffb8731 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImportsDetail.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImportsDetail.java @@ -20,10 +20,10 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("common_imports_detail") +@TableName("QH_COM_IMPORTS_DETAIL") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(title = "common_imports_detail对象", description = "common_imports_detail") +@Schema(title = "common_imports_detail对象", description = "QH_COM_IMPORTS_DETAIL") public class CommonImportsDetail implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImportsInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImportsInfo.java index 31f6689..7d2fac7 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImportsInfo.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImportsInfo.java @@ -22,10 +22,10 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("common_exports_item") +@TableName("QH_COM_EXPORTS_ITEM") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(title = "common_exports_item对象", description = "common_exports_item") +@Schema(title = "common_exports_item对象", description = "QH_COM_EXPORTS_ITEM") public class CommonImportsInfo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsDetailMapper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsDetailMapper.java index a8a1380..deba58f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsDetailMapper.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsDetailMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.imports.entity.CommonImportsDetail; /** - * @Description: common_exports_item + * @Description: QH_COM_EXPORTS_ITEM * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsInfoMapper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsInfoMapper.java index 1e7b933..2280018 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsInfoMapper.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsInfoMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.imports.entity.CommonImportsInfo; /** - * @Description: common_exports_item + * @Description: QH_COM_EXPORTS_ITEM * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsMapper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsMapper.java index 54f03f3..4525198 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsMapper.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.imports.entity.CommonImports; /** - * @Description: common_exports_item + * @Description: QH_COM_EXPORTS_ITEM * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsDetailService.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsDetailService.java index 1701e2c..d489cff 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsDetailService.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsDetailService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.imports.entity.CommonImportsDetail; /** - * @Description: common_exports_item + * @Description: QH_COM_EXPORTS_ITEM * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsInfoService.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsInfoService.java index 7a271ce..5cd8941 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsInfoService.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsInfoService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.imports.entity.CommonImportsInfo; /** - * @Description: common_exports_item + * @Description: QH_COM_EXPORTS_ITEM * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsService.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsService.java index 40f55f0..5e7a573 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsService.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsService.java @@ -7,7 +7,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.web.multipart.MultipartFile; /** - * @Description: common_exports_item + * @Description: QH_COM_EXPORTS_ITEM * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ImportsUtilService.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ImportsUtilService.java index 6bfa006..d2e9158 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ImportsUtilService.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ImportsUtilService.java @@ -5,7 +5,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.web.multipart.MultipartFile; /** - * @Description: common_exports_item + * @Description: QH_COM_EXPORTS_ITEM * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsDetailServiceImpl.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsDetailServiceImpl.java index 1106680..64c9083 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsDetailServiceImpl.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsDetailServiceImpl.java @@ -7,7 +7,7 @@ import org.jeecg.modules.imports.service.ICommonImportsDetailService; import org.springframework.stereotype.Service; /** - * @Description: common_exports_item + * @Description: QH_COM_EXPORTS_ITEM * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsInfoServiceImpl.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsInfoServiceImpl.java index 9074a6c..ecb59e8 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsInfoServiceImpl.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsInfoServiceImpl.java @@ -7,7 +7,7 @@ import org.jeecg.modules.imports.service.ICommonImportsInfoService; import org.springframework.stereotype.Service; /** - * @Description: common_exports_item + * @Description: QH_COM_EXPORTS_ITEM * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsServiceImpl.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsServiceImpl.java index 58e4d58..24d9c59 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsServiceImpl.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsServiceImpl.java @@ -32,7 +32,7 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; /** - * @Description: common_exports_item + * @Description: QH_COM_EXPORTS_ITEM * @Author: jeecg-boot * @Date: 2023-05-29 * @Version: V1.0 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/HealthUserEmployeeEx.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/HealthUserEmployeeEx.java index 6b06ff9..4f8bbbb 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/HealthUserEmployeeEx.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/HealthUserEmployeeEx.java @@ -21,7 +21,7 @@ import java.util.List; * @Version: V1.0 */ @Data -@TableName("health_user_employee_ex") +@TableName("QH_HLT_USER_EMPLOYEE_EX") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @Schema(title = "health_user_employee_ex对象", description = "员工") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysDepart.java index d75f97f..015730f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysDepart.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysDepart.java @@ -24,7 +24,7 @@ import java.util.Objects; * @Since 2019-01-22 */ @Data -@TableName("sys_depart") +@TableName("QH_SYS_DEPART") public class SysDepart implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java index 71c774b..2dfdd40 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java @@ -26,6 +26,7 @@ import java.util.*; * @Author scott * @since 2018-12-20 */ +@TableName("QH_SYS_USER") @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @@ -197,8 +198,8 @@ public class SysUser implements Serializable { /** * 负责部门 */ - @Excel(name = "负责部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") - @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @Excel(name = "负责部门", width = 15, dictTable = "QH_SYS_DEPART", dicText = "depart_name", dicCode = "id") + @Dict(dictTable = "QH_SYS_DEPART", dicText = "depart_name", dicCode = "id") private String departIds; @TableField(exist = false) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysUserEmergencyContact.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysUserEmergencyContact.java index 4fe82fe..2518f5a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysUserEmergencyContact.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysUserEmergencyContact.java @@ -13,16 +13,16 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; /** - * @Description: sys_user_emergency_contact + * @Description: QH_SYS_USR_EMERG_CONTACT * @Author: jeecg-boot * @Date: 2023-07-03 * @Version: V1.0 */ @Data -@TableName("sys_user_emergency_contact") +@TableName("QH_SYS_USR_EMERG_CONTACT") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(title = "sys_user_emergency_contact对象", description = "sys_user_emergency_contact") +@Schema(title = "sys_user_emergency_contact对象", description = "QH_SYS_USR_EMERG_CONTACT") public class SysUserEmergencyContact implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/bean/entity/UserDataRecordBWH.java b/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/bean/entity/UserDataRecordBWH.java index d867404..bcea831 100644 --- a/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/bean/entity/UserDataRecordBWH.java +++ b/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/bean/entity/UserDataRecordBWH.java @@ -25,7 +25,7 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -@TableName(value = "user_data_record_bwh") +@TableName("QH_USR_DATA_RCD_BWH") public class UserDataRecordBWH implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/bean/entity/UserDataRecordBmi.java b/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/bean/entity/UserDataRecordBmi.java index a2dba0a..aa268dd 100644 --- a/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/bean/entity/UserDataRecordBmi.java +++ b/jeecg-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/bean/entity/UserDataRecordBmi.java @@ -26,7 +26,7 @@ import java.util.List; @ToString @AllArgsConstructor @NoArgsConstructor -@TableName(value = "user_data_record_bmi") +@TableName("QH_USR_DATA_RCD_BMI") public class UserDataRecordBmi implements Serializable { public static final String COL_ID = "id"; public static final String COL_USER_ID = "user_id"; diff --git a/jeecg-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/bean/request/SysUserEmergencyContactDO.java b/jeecg-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/bean/request/SysUserEmergencyContactDO.java index a767f11..3c05a19 100644 --- a/jeecg-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/bean/request/SysUserEmergencyContactDO.java +++ b/jeecg-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/bean/request/SysUserEmergencyContactDO.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank; import java.io.Serializable; /** - * @Description: sys_user_emergency_contact + * @Description: QH_SYS_USR_EMERG_CONTACT * @Author: jeecg-boot * @Date: 2023-07-03 * @Version: V1.0 diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java index aeaf6cd..61a600f 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java @@ -19,7 +19,7 @@ import org.springframework.format.annotation.DateTimeFormat; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("sys_sms") +@TableName("QH_SYS_SMS") public class SysMessage extends JeecgEntity { /** * 推送内容 diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java index b831a05..ba5c2d4 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java @@ -16,7 +16,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("sys_sms_template") +@TableName("QH_SYS_SMS_TEMPLATE") public class SysMessageTemplate extends JeecgEntity { /** * 模板CODE diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java index 3a8345e..ab92afc 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java @@ -20,6 +20,6 @@ public interface SysMessageTemplateMapper extends BaseMapper * @param code 模板CODE * @return List */ - @Select("SELECT * FROM sys_sms_template WHERE template_code = #{code}") + @Select("SELECT * FROM QH_SYS_SMS_TEMPLATE WHERE template_code = #{code}") List selectByCode(String code); } diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java index de53065..445b753 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java @@ -18,7 +18,7 @@ import java.io.Serializable; * @Version: V1.0 */ @Data -@TableName("sys_quartz_job") +@TableName("QH_SYS_QUARTZ_JOB") public class QuartzJob implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml index 34e95cd..74f288e 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml @@ -3,6 +3,6 @@ diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/entity/UserWeightBind.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/entity/UserWeightBind.java index 9252614..4552ee3 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/entity/UserWeightBind.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/entity/UserWeightBind.java @@ -25,7 +25,7 @@ import java.util.Date; @ToString @AllArgsConstructor @NoArgsConstructor -@TableName(value = "user_weight_bind") +@TableName("QH_USR_WEIGHT_BIND") public class UserWeightBind implements Serializable { public static final String COL_ID = "id"; public static final String COL_USER_ID = "user_id"; diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/mapper/UserDataRecordBmiMapper.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/mapper/UserDataRecordBmiMapper.java index 9a0b1e7..573414b 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/mapper/UserDataRecordBmiMapper.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/mapper/UserDataRecordBmiMapper.java @@ -21,8 +21,8 @@ public interface UserDataRecordBmiMapper extends MPJBaseMapper= #{dateTimeStr} GROUP BY user_id ) temp " + + "FROM QH_USR_DATA_RCD_BMI record " + + "JOIN ( SELECT user_id, MAX( data_date ) AS latest_date FROM QH_USR_DATA_RCD_BMI WHERE data_date>= #{dateTimeStr} GROUP BY user_id ) temp " + "ON record.user_id = temp.user_id AND record.data_date = temp.latest_date;") List queryAllUserNewRecord(@Param("dateTimeStr") String dateTimeStr); @@ -31,7 +31,7 @@ public interface UserDataRecordBmiMapper extends MPJBaseMapper " + - " SELECT t.* FROM user_data_record_bmi t " + - " INNER JOIN ( SELECT user_id, MAX( data_date ) AS data_date FROM user_data_record_bmi " + + " SELECT t.* FROM QH_USR_DATA_RCD_BMI t " + + " INNER JOIN ( SELECT user_id, MAX( data_date ) AS data_date FROM QH_USR_DATA_RCD_BMI " + " where user_id in #{item} GROUP BY user_id ) dt " + " ON t.user_id = dt.user_id AND t.data_date = dt.data_date " + " ") diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/mapper/xml/RemoteWeightManufacturerOneMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/mapper/xml/RemoteWeightManufacturerOneMapper.xml index f12576e..87518ac 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/mapper/xml/RemoteWeightManufacturerOneMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/remote/mapper/xml/RemoteWeightManufacturerOneMapper.xml @@ -116,7 +116,7 @@ SELECT t1.user_id, t1.fat_rate - FROM user_data_record_bmi t1 + FROM QH_USR_DATA_RCD_BMI t1 RIGHT JOIN ( SELECT user_id, max(create_time) maxTime - FROM user_data_record_bmi + FROM QH_USR_DATA_RCD_BMI AND fat_rate IS NOT NULL @@ -67,7 +67,7 @@ DISTINCT user_id FROM - user_data_record_bmi + QH_USR_DATA_RCD_BMI and weight is not null and data_source in ('2','4') @@ -81,8 +81,8 @@ - select name from health_consult_resource where id = #{id} + select name from QH_HLT_CONSULT_RESOURCE where id = #{id} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserDoctorExMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserDoctorExMapper.xml index f9dbedd..aa3ba63 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserDoctorExMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserDoctorExMapper.xml @@ -40,7 +40,7 @@ resultType="org.jeecg.modules.system.entity.HealthUserDoctorEx"> select - from health_user_doctor_ex a + from QH_HLT_DOCTOR_EX a and a.del_flag = '0' diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml index 501e436..971fcd5 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserEmployeeExMapper.xml @@ -101,8 +101,8 @@ a.care_liaison_phone, a.lifeguard_name, a.lifeguard_phone - from health_user_employee_ex a - left join sys_user b on a.id = b.id + from QH_HLT_USER_EMPLOYEE_EX a + left join QH_SYS_USER b on a.id = b.id @@ -334,13 +334,13 @@ @@ -358,9 +358,9 @@ su.org_code AS orgCode, su.sex AS sex FROM - sys_user su + QH_SYS_USER su LEFT JOIN - health_user_employee_ex he ON su.id = he.id + QH_HLT_USER_EMPLOYEE_EX he ON su.id = he.id WHERE 1 = 1 @@ -626,8 +626,8 @@ t1.emp_type, t1.emp_education, t1.current_age as age - FROM health_user_employee_ex t1 - LEFT JOIN sys_user t2 ON t1.id = t2.id + FROM QH_HLT_USER_EMPLOYEE_EX t1 + LEFT JOIN QH_SYS_USER t2 ON t1.id = t2.id - SELECT *,id as userId FROM sys_user + SELECT *,id as userId FROM QH_SYS_USER WHERE del_flag = 0 AND user_group = 'a' @@ -1069,10 +1069,10 @@ t2.username, t3.depart_name as secondDepart, t4.depart_name as thirdDepart - FROM health_user_employee_ex t1 - LEFT JOIN sys_user t2 ON t1.id = t2.id - LEFT JOIN sys_depart t3 ON LEFT (t2.org_code, 6) = t3.org_code - LEFT JOIN sys_depart t4 ON LEFT (t2.org_code, 9) = t4.org_code + FROM QH_HLT_USER_EMPLOYEE_EX t1 + LEFT JOIN QH_SYS_USER t2 ON t1.id = t2.id + LEFT JOIN QH_SYS_DEPART t3 ON LEFT (t2.org_code, 6) = t3.org_code + LEFT JOIN QH_SYS_DEPART t4 ON LEFT (t2.org_code, 9) = t4.org_code and t2.realname like CONCAT('%',#{filter.realName},'%') @@ -1099,17 +1099,17 @@ - UPDATE health_user_employee_ex he + UPDATE QH_HLT_USER_EMPLOYEE_EX he SET he.current_age = ( SELECT FLOOR((CURRENT_DATE - TO_DATE(SUBSTRING(REPLACE(su.id_card, ' ', ''), 7, 8), 'YYYYMMDD')) / 365) - FROM sys_user su + FROM QH_SYS_USER su WHERE he.id = su.id AND LENGTH(REPLACE(su.id_card, ' ', '')) = 18 AND su.person_type = '1' AND su.del_flag = 0 ) WHERE EXISTS ( - SELECT 1 FROM sys_user su + SELECT 1 FROM QH_SYS_USER su WHERE he.id = su.id AND LENGTH(REPLACE(su.id_card, ' ', '')) = 18 AND su.person_type = '1' diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserOperatorExMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserOperatorExMapper.xml index 3ff28d8..0164ff7 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserOperatorExMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserOperatorExMapper.xml @@ -41,8 +41,8 @@ t2.realname as realName, t2.phone as phone, - from health_user_operator_ex a - left join sys_user t2 on a.user_id = t2.id + from QH_HLT_USER_OPERATOR_EX a + left join QH_SYS_USER t2 on a.user_id = t2.id and a.del_flag = '0' @@ -71,8 +71,8 @@ select a.id, b.realname - from health_user_station_ex a - left join sys_user b on a.id = b.id + from QH_HLT_USER_STATION_EX a + left join QH_SYS_USER b on a.id = b.id where a.hospital_id = #{hospitalId} and a.status = 1 and a.del_flag = 0 order by a.create_time desc diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserStationExMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserStationExMapper.xml index 05995e1..2b6a46e 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserStationExMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/HealthUserStationExMapper.xml @@ -8,8 +8,8 @@ t1.hospital_name hospitalName, t2.realname AS realName, t2.username as userName - FROM health_user_station_ex t1 - LEFT JOIN sys_user t2 ON t1.id = t2.id + FROM QH_HLT_USER_STATION_EX t1 + LEFT JOIN QH_SYS_USER t2 ON t1.id = t2.id t1.status = 1 and t1.del_flag = 0 @@ -30,7 +30,7 @@ @@ -45,8 +45,8 @@ t2.sex, t2.phone, t2.avatar - FROM health_user_station_ex t1 - LEFT JOIN sys_user t2 ON t1.id = t2.id + FROM QH_HLT_USER_STATION_EX t1 + LEFT JOIN QH_SYS_USER t2 ON t1.id = t2.id WHERE t1.STATUS = 1 AND t1.del_flag = '0' diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/ScalePersonalMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/ScalePersonalMapper.xml index ec5b413..cd290d7 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/ScalePersonalMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/ScalePersonalMapper.xml @@ -9,8 +9,8 @@ t2.work_no, t2.org_code as userOrgCode FROM - scale_personal t1 - LEFT JOIN sys_user t2 on t1.bind_user_id = t2.id + QH_SCL_PERSONAL t1 + LEFT JOIN QH_SYS_USER t2 on t1.bind_user_id = t2.id and @@ -50,9 +50,9 @@ t2.id_card as idCard, t3.current_age as age, t2.org_code as userOrgCode - FROM scale_personal t1 - LEFT JOIN sys_user t2 ON t1.bind_user_id = t2.id - LEFT JOIN health_user_employee_ex t3 ON t1.bind_user_id = t3.id + FROM QH_SCL_PERSONAL t1 + LEFT JOIN QH_SYS_USER t2 ON t1.bind_user_id = t2.id + LEFT JOIN QH_HLT_USER_EMPLOYEE_EX t3 ON t1.bind_user_id = t3.id and t1.del_flag = 0 @@ -87,9 +87,9 @@ t3.height as heightNew, t3.weight as weightNew, t1.code - FROM scale_personal t1 - LEFT JOIN sys_user t2 ON t1.bind_user_id = t2.id - LEFT JOIN health_user_employee_ex t3 ON t1.bind_user_id = t3.id + FROM QH_SCL_PERSONAL t1 + LEFT JOIN QH_SYS_USER t2 ON t1.bind_user_id = t2.id + LEFT JOIN QH_HLT_USER_EMPLOYEE_EX t3 ON t1.bind_user_id = t3.id where t1.code = #{code} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml index 6f7b8b5..6efc5fc 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml @@ -32,11 +32,11 @@ @@ -47,8 +47,8 @@ b.read_flag, b.star_flag, b.id as send_id - from sys_announcement a - join sys_announcement_send b on b.annt_id = a.id + from QH_SYS_ANNOUNCEMENT a + join QH_SYS_ANNOUNCEMENT_SEND b on b.annt_id = a.id where a.send_status = '1' and a.del_flag = '0' and b.user_id = #{userId} and a.sender = #{fromUser} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml index 490b6e1..bdbc238 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml @@ -18,7 +18,7 @@ @@ -39,8 +39,8 @@ sa.open_type as open_type, sa.open_page as open_page, sa.msg_abstract - from sys_announcement_send sas - left join sys_announcement sa ON sas.annt_id = sa.id + from QH_SYS_ANNOUNCEMENT_SEND sas + left join QH_SYS_ANNOUNCEMENT sa ON sas.annt_id = sa.id where sa.send_status = '1' and sa.del_flag = '0' and sas.user_id = #{announcementSendModel.userId} @@ -83,8 +83,8 @@ sa.open_type as open_type, sa.open_page as open_page, sa.msg_abstract - from sys_announcement_send sas - left join sys_announcement sa ON sas.annt_id = sa.id + from QH_SYS_ANNOUNCEMENT_SEND sas + left join QH_SYS_ANNOUNCEMENT sa ON sas.annt_id = sa.id where sa.send_status = '1' and sa.del_flag = '0' and sas.id = #{sendId} @@ -93,7 +93,7 @@ - update sys_announcement_send set read_flag = '1' + update QH_SYS_ANNOUNCEMENT_SEND set read_flag = '1' where user_id = #{userId} and annt_id in diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysBannerMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysBannerMapper.xml index f91c782..cb04de9 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysBannerMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysBannerMapper.xml @@ -2,7 +2,7 @@ - select name from sys_category where id = #{id} + select name from QH_SYS_CATEGORY where id = #{id} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCommentMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCommentMapper.xml index cbda545..0b63d3f 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCommentMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCommentMapper.xml @@ -40,9 +40,9 @@ c.url, c.file_type, c.store_type - from sys_comment a - left join sys_form_file b on b.table_name = 'sys_comment' and b.table_data_id = a.id - left join sys_files c on b.file_id = c.id and c.del_flag = '0' + from QH_SYS_COMMENT a + left join QH_SYS_FORM_FILE b on b.table_name = 'QH_SYS_COMMENT' and b.table_data_id = a.id + left join QH_SYS_FILES c on b.file_id = c.id and c.del_flag = '0' where a.table_name = #{tableName, jdbcType=VARCHAR} and a.table_data_id = #{formDataId, jdbcType=VARCHAR} order by a.create_time asc @@ -58,9 +58,9 @@ c.url, c.file_type as type, c.store_type - from sys_comment a - join sys_form_file b on b.table_name = 'sys_comment' and b.table_data_id = a.id - join sys_files c on b.file_id = c.id + from QH_SYS_COMMENT a + join QH_SYS_FORM_FILE b on b.table_name = 'QH_SYS_COMMENT' and b.table_data_id = a.id + join QH_SYS_FILES c on b.file_id = c.id where c.del_flag = '0' and a.table_name = #{tableName, jdbcType=VARCHAR} and a.table_data_id = #{formDataId, jdbcType=VARCHAR} @@ -69,7 +69,7 @@ - select max(data_version) as mvn from sys_data_log + select max(data_version) as mvn from QH_SYS_DATA_LOG where data_table = #{tableName} and data_id =#{dataId} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml index 38a6ccd..916aa0a 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml @@ -3,19 +3,19 @@ - select id from sys_depart where del_flag = '0' and org_code like concat((select org_code from sys_depart where + select id from QH_SYS_DEPART where del_flag = '0' and org_code like concat((select org_code from QH_SYS_DEPART where id=#{departId}),'%') - select * from sys_depart where del_flag = '0' and org_category='1' and org_code= #{orgCode,jdbcType=VARCHAR} + select * from QH_SYS_DEPART where del_flag = '0' and org_category='1' and org_code= #{orgCode,jdbcType=VARCHAR} - SELECT * FROM sys_depart + SELECT * FROM QH_SYS_DEPART WHERE @@ -101,7 +101,7 @@ work_no as workNo, org_code as orgCode, id_card as idCard - FROM sys_user + FROM QH_SYS_USER and del_flag = 0 and status = 1 @@ -117,41 +117,41 @@ - insert into sys_depart_gps (id, depart_id, lng, lat) + insert into QH_SYS_DEPART_GPS (id, depart_id, lng, lat) values (REPLACE(UUID(), '-', ''), #{id}, #{lng}, #{lat}) - update sys_depart_gps set lng=#{lng},lat=#{lat} where depart_id=#{id} + update QH_SYS_DEPART_GPS set lng=#{lng},lat=#{lat} where depart_id=#{id} @@ -164,7 +164,7 @@ a.org_code as "orgCode", b.lng, b.lat - from sys_depart a left join sys_depart_gps b on a.id = b.depart_id + from QH_SYS_DEPART a left join QH_SYS_DEPART_GPS b on a.id = b.depart_id where INSTR(',' || #{departId} || ',', ',' || a.id || ',') > 0 @@ -175,13 +175,13 @@ lng, lat, depart_id as "departId" - from sys_depart_gps where depart_id = #{departId} + from QH_SYS_DEPART_GPS where depart_id = #{departId} - SELECT * FROM sys_depart_role WHERE depart_id IN ( - SELECT id FROM sys_depart WHERE id IN (SELECT dep_id FROM sys_user_depart WHERE user_id=#{userId}) + SELECT * FROM QH_SYS_DEPART_ROLE WHERE depart_id IN ( + SELECT id FROM QH_SYS_DEPART WHERE id IN (SELECT dep_id FROM QH_SYS_USER_DEPART WHERE user_id=#{userId}) AND org_code LIKE CONCAT(#{orgCode},'%') ) diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml index 7f91a0c..e7b5efe 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml @@ -3,15 +3,15 @@ @@ -23,8 +23,8 @@ item.item_text AS "text", item.item_value AS "value" FROM - sys_dict_item item - INNER JOIN sys_dict dict ON dict.id = item.dict_id + QH_SYS_DICT_ITEM item + INNER JOIN QH_SYS_DICT dict ON dict.id = item.dict_id WHERE dict.dict_code IN ( #{dictCode} @@ -35,8 +35,8 @@ @@ -47,8 +47,8 @@ item.item_text AS "text", item.item_value AS "value" FROM - sys_dict_item item - INNER JOIN sys_dict dict ON dict.id = item.dict_id + QH_SYS_DICT_ITEM item + INNER JOIN QH_SYS_DICT dict ON dict.id = item.dict_id WHERE dict.dict_code IN ( #{dictCode} @@ -124,14 +124,14 @@ @@ -242,7 +242,7 @@ select count(1) - from sys_log + from QH_SYS_LOG where log_type = 1 @@ -32,7 +32,7 @@ ,count(distinct(ip)) as ip ,DATE_FORMAT(create_time, '%Y-%m-%d') as tian ,DATE_FORMAT(create_time, '%m-%d') as type - from sys_log + from QH_SYS_LOG where log_type = 1 and create_time >= #{dayStart} and create_time < #{dayEnd} group by tian,type order by tian asc @@ -42,7 +42,7 @@ ,count(distinct(ip)) as ip ,to_char(create_time, 'yyyy-mm-dd') as tian ,to_char(create_time, 'mm-dd') as type - from sys_log + from QH_SYS_LOG where log_type = 1 and create_time >= #{dayStart} and create_time < #{dayEnd} group by to_char(create_time, 'yyyy-mm-dd'),to_char(create_time, 'mm-dd') order by to_char(create_time, 'yyyy-mm-dd') asc @@ -52,7 +52,7 @@ ,count(distinct(ip)) as ip ,to_char(create_time, 'yyyy-mm-dd') as tian ,to_char(create_time, 'mm-dd') as type - from sys_log + from QH_SYS_LOG where log_type = 1 and create_time >= #{dayStart} and create_time < #{dayEnd} group by tian,type order by tian asc @@ -62,7 +62,7 @@ ,count(distinct(ip)) as ip ,CONVERT(varchar(100), create_time, 23) as tian ,RIGHT(CONVERT(varchar(100), create_time, 23),5) as type - from sys_log + from QH_SYS_LOG where log_type = 1 and create_time >= #{dayStart} and create_time < #{dayEnd} group by CONVERT(varchar(100), create_time, 23),RIGHT(CONVERT(varchar(100), create_time, 23),5) order by CONVERT(varchar(100), create_time, 23) asc diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysMessageRemindMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysMessageRemindMapper.xml index 655c89e..a16a069 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysMessageRemindMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysMessageRemindMapper.xml @@ -3,7 +3,7 @@ - select permission_id from sys_tenant_pack_perms + select permission_id from QH_SYS_TENANT_PACK_PERMS where pack_id = #{packId} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml index b1e228c..39c7e32 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml @@ -1,23 +1,23 @@ - + diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml index 8e37957..c3ba592 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml @@ -25,7 +25,7 @@ ,name ,icon ,is_leaf - FROM sys_permission + FROM QH_SYS_PERMISSION WHERE 1=1 @@ -40,28 +40,28 @@ select sum(cnt) from ( select count(*) as cnt - from sys_role_permission a - join sys_permission b on a.permission_id = b.id - join sys_role c on a.role_id = c.id - join sys_user_role d on d.role_id = c.id - join sys_user e on d.user_id = e.id + from QH_SYS_ROLE_PERMISSION a + join QH_SYS_PERMISSION b on a.permission_id = b.id + join QH_SYS_ROLE c on a.role_id = c.id + join QH_SYS_USER_ROLE d on d.role_id = c.id + join QH_SYS_USER e on d.user_id = e.id where e.username = #{username} and b.id = #{permission.id} @@ -90,11 +90,11 @@ union all select count(*) as cnt - from sys_permission z - join sys_depart_role_permission y on z.id = y.permission_id - join sys_depart_role x on y.role_id = x.id - join sys_depart_role_user w on w.drole_id = x.id - join sys_user v on w.user_id = v.id + from QH_SYS_PERMISSION z + join QH_SYS_DEPT_ROLE_PERM y on z.id = y.permission_id + join QH_SYS_DEPART_ROLE x on y.role_id = x.id + join QH_SYS_DEPART_ROLE_USER w on w.drole_id = x.id + join QH_SYS_USER v on w.user_id = v.id where v.username = #{username} and z.id = #{permission.id} @@ -108,10 +108,10 @@ diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml index 6c26839..ad19d19 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml @@ -3,7 +3,7 @@ - SELECT pack_code, count(*) as user_count FROM sys_tenant_pack a - join sys_tenant_pack_user b on a.id = b.pack_id + SELECT pack_code, count(*) as user_count FROM QH_SYS_TENANT_PACK a + join QH_SYS_TENANT_PACK_USER b on a.id = b.pack_id where a.tenant_id = #{tenantId} and a.pack_code in ('superAdmin', 'accountAdmin', 'appAdmin') and b.status = 1 @@ -51,8 +51,8 @@ - SELECT count(*) FROM sys_tenant_pack a - join sys_tenant_pack_user b on a.id = b.pack_id + SELECT count(*) FROM QH_SYS_TENANT_PACK a + join QH_SYS_TENANT_PACK_USER b on a.id = b.pack_id where a.pack_code = 'superAdmin' and a.tenant_id = #{tenantId} and b.user_id = #{userId} @@ -70,9 +70,9 @@ - SELECT c.id as user_id,a.depart_name FROM sys_user c - join sys_user_depart b on c.id = b.user_id - join sys_depart a on a.id = b.dep_id + SELECT c.id as user_id,a.depart_name FROM QH_SYS_USER c + join QH_SYS_USER_DEPART b on c.id = b.user_id + join QH_SYS_DEPART a on a.id = b.dep_id where c.status = 1 and c.del_flag = 0 and c.id in @@ -97,7 +97,7 @@ - SELECT c.id, c.username, c.realname, c.phone, c.avatar, a.pack_name, a.id as pack_id FROM sys_user c - join sys_tenant_pack_user b on c.id = b.user_id - join sys_tenant_pack a on a.id = b.pack_id + SELECT c.id, c.username, c.realname, c.phone, c.avatar, a.pack_name, a.id as pack_id FROM QH_SYS_USER c + join QH_SYS_TENANT_PACK_USER b on c.id = b.user_id + join QH_SYS_TENANT_PACK a on a.id = b.pack_id where c.status = 1 and c.del_flag = 0 and b.status = #{status} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAccountMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAccountMapper.xml index b015128..cf7caca 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAccountMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAccountMapper.xml @@ -3,11 +3,11 @@ diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartChangeApplyMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartChangeApplyMapper.xml index db00388..3ba52f1 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartChangeApplyMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartChangeApplyMapper.xml @@ -7,8 +7,8 @@ t2.work_no as workNo, t2.realname as userName FROM - sys_user_depart_change_apply t1 - LEFT JOIN sys_user t2 on t1.user_id = t2.id + QH_SYS_DEPT_CHG_APPLY t1 + LEFT JOIN QH_SYS_USER t2 on t1.user_id = t2.id and t1.del_flag = 0 @@ -55,11 +55,11 @@ t3.realname AS applyUserName, t5.realname AS opUserName, t4.current_age AS age - FROM sys_user_depart_change_apply t1 - LEFT JOIN sys_user t2 ON t1.user_id = t2.id - LEFT JOIN sys_user t3 ON t1.apply_user_id = t3.id - LEFT JOIN health_user_employee_ex t4 ON t1.user_id = t4.id - LEFT JOIN sys_user t5 ON t1.op_user_id = t5.id + FROM QH_SYS_DEPT_CHG_APPLY t1 + LEFT JOIN QH_SYS_USER t2 ON t1.user_id = t2.id + LEFT JOIN QH_SYS_USER t3 ON t1.apply_user_id = t3.id + LEFT JOIN QH_HLT_USER_EMPLOYEE_EX t4 ON t1.user_id = t4.id + LEFT JOIN QH_SYS_USER t5 ON t1.op_user_id = t5.id and t1.del_flag = 0 @@ -137,7 +137,7 @@ user_id, create_time FROM - sys_user_depart_change_apply + QH_SYS_DEPT_CHG_APPLY and create_time between #{beginOfYear} and #{endOfYear} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml index f03c17e..3c1b6b4 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml @@ -2,7 +2,7 @@ - insert into sys_user_depart (id,user_id, dep_id) + insert into QH_SYS_USER_DEPART (id,user_id, dep_id) values (#{t.id}, #{t.userId}, #{t.depId}) @@ -11,15 +11,15 @@ - select a.*, c.depart_name as org_code_txt from sys_user a - join sys_user_depart b on b.user_id = a.id - join sys_depart c on b.dep_id = c.id + select a.*, c.depart_name as org_code_txt from QH_SYS_USER a + join QH_SYS_USER_DEPART b on b.user_id = a.id + join QH_SYS_DEPART c on b.dep_id = c.id where a.del_flag = 0 and a.status = 1 and c.org_code like #{bindOrgCode} and a.username!='_reserve_user_external' @@ -70,9 +70,9 @@ - select DISTINCT a.* from sys_user a - left join sys_user_depart b on b.user_id = a.id - left join sys_depart c on b.dep_id = c.id + select DISTINCT a.* from QH_SYS_USER a + left join QH_SYS_USER_DEPART b on b.user_id = a.id + left join QH_SYS_DEPART c on b.dep_id = c.id where a.del_flag = 0 and a.status = 1 @@ -101,14 +101,14 @@ and a.id in ( - select user_id from sys_user_tenant where tenant_id = #{tenantId} and status = '1' + select user_id from QH_SYS_USER_TENANT where tenant_id = #{tenantId} and status = '1' ) - select * from sys_user_depart + select * from QH_SYS_USER_DEPART where user_id = #{userId} and dep_id in( - select id from sys_depart where tenant_id = #{tenantId} + select id from QH_SYS_DEPART where tenant_id = #{tenantId} ) - delete from sys_user_depart + delete from QH_SYS_USER_DEPART where user_id = #{userId} and dep_id in( - select id from sys_depart where tenant_id = #{tenantId} + select id from QH_SYS_DEPART where tenant_id = #{tenantId} ) diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDeviceMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDeviceMapper.xml index 5dbe582..669d120 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDeviceMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDeviceMapper.xml @@ -7,7 +7,7 @@ id, device_type as deviceType, user_id as userId - from sys_user_device + from QH_SYS_USER_DEVICE where user_id = #{userId} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserFrozenMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserFrozenMapper.xml index d9b0560..121cdb3 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserFrozenMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserFrozenMapper.xml @@ -15,9 +15,9 @@ t4.emp_worktime as empWorkTime, t4.emp_job FROM sys_user_frozen t1 - LEFT JOIN sys_user t2 on t1.user_id = t2.id - LEFT JOIN sys_user t3 on t1.apply_user_id = t3.id - left join health_user_employee_ex t4 on t1.user_id = t4.id + LEFT JOIN QH_SYS_USER t2 on t1.user_id = t2.id + LEFT JOIN QH_SYS_USER t3 on t1.apply_user_id = t3.id + left join QH_HLT_USER_EMPLOYEE_EX t4 on t1.user_id = t4.id and t1.type = #{filter.type} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml index af9f429..ed3cd12 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml @@ -2,7 +2,7 @@ - insert into sys_user (id, username, realname, password, salt, avatar, birthday, id_card,person_type, sex, + insert into QH_SYS_USER (id, username, realname, password, salt, avatar, birthday, id_card,person_type, sex, email, phone, org_code, work_no, post, create_time, update_time, user_identity) values @@ -15,16 +15,16 @@ - select d.depart_name,ud.user_id from sys_user_depart ud,sys_depart d where d.id = ud.dep_id and ud.user_id in + select d.depart_name,ud.user_id from QH_SYS_USER_DEPART ud,QH_SYS_DEPART d where d.id = ud.dep_id and ud.user_id in #{id} @@ -41,9 +41,9 @@ - select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_role where role_id=#{roleId}) + select * from QH_SYS_USER where del_flag = 0 and id in (select user_id from QH_SYS_USER_ROLE where role_id=#{roleId}) and username like concat('%',#{username},'%') @@ -64,7 +64,7 @@ - UPDATE sys_user SET + UPDATE QH_SYS_USER SET org_code = #{orgCode} ,login_tenant_id = #{loginTenantId} @@ -80,25 +80,25 @@ FROM - sys_depart - INNER JOIN sys_user_depart ON sys_user_depart.dep_id = sys_depart.id - INNER JOIN sys_user ON sys_user.id = sys_user_depart.user_id + QH_SYS_DEPART + INNER JOIN QH_SYS_USER_DEPART ON QH_SYS_USER_DEPART.dep_id = QH_SYS_DEPART.id + INNER JOIN QH_SYS_USER ON QH_SYS_USER.id = QH_SYS_USER_DEPART.user_id WHERE @@ -106,14 +106,14 @@ - sys_user.del_flag = 0 AND sys_depart.org_code LIKE #{bindOrgCode} + QH_SYS_USER.del_flag = 0 AND QH_SYS_DEPART.org_code LIKE #{bindOrgCode} - AND sys_user.realname LIKE concat(concat('%',#{userParams.realname}),'%') + AND QH_SYS_USER.realname LIKE concat(concat('%',#{userParams.realname}),'%') - AND sys_user.work_no LIKE concat(concat('%',#{userParams.workNo}),'%') + AND QH_SYS_USER.work_no LIKE concat(concat('%',#{userParams.workNo}),'%') @@ -121,21 +121,21 @@ @@ -146,7 +146,7 @@ - delete from sys_user_role + delete from QH_SYS_USER_ROLE where role_id in #{id} @@ -154,7 +154,7 @@ - delete from sys_role_permission + delete from QH_SYS_ROLE_PERMISSION where role_id in #{id} @@ -163,13 +163,13 @@ UPDATE - sys_user + QH_SYS_USER SET del_flag = 0, update_by = #{entity.updateBy}, @@ -184,7 +184,7 @@ - DELETE FROM sys_user WHERE del_flag = 1 AND id IN + DELETE FROM QH_SYS_USER WHERE del_flag = 1 AND id IN #{userId} @@ -192,7 +192,7 @@ - UPDATE sys_user + UPDATE QH_SYS_USER SET email = NULL WHERE email = '' @@ -203,9 +203,9 @@ - select DISTINCT a.* from sys_user a - left join sys_user_role ur on ur.user_id = a.id + select DISTINCT a.* from QH_SYS_USER a + left join QH_SYS_USER_ROLE ur on ur.user_id = a.id where a.del_flag = 0 and a.status = 1 and a.username!='_reserve_user_external' @@ -231,15 +231,15 @@ and a.id in ( - select user_id from sys_user_tenant where tenant_id = #{tenantId} and status = '1' + select user_id from QH_SYS_USER_TENANT where tenant_id = #{tenantId} and status = '1' ) - select realname from sys_user where id = #{id} + select realname from QH_SYS_USER where id = #{id} @@ -292,13 +292,13 @@ birthday, id_card as "idCard", org_code as "orgCode" - from sys_user where id = #{id} and del_flag = 0 + from QH_SYS_USER where id = #{id} and del_flag = 0 @@ -309,9 +309,9 @@ realname as realName, org_code as orgCode, status - FROM sys_user + FROM QH_SYS_USER - AND id NOT IN (SELECT user_id FROM sys_user_role WHERE role_id = #{roleId}) + AND id NOT IN (SELECT user_id FROM QH_SYS_USER_ROLE WHERE role_id = #{roleId}) AND username = #{username} @@ -332,11 +332,11 @@ realname as realName, org_code as orgCode, status - FROM sys_user + FROM QH_SYS_USER AND org_code like CONCAT (#{orgCode},'%') AND del_flag = 0 - AND id NOT IN (SELECT user_id FROM sys_user_role WHERE role_id = #{secondId} or role_id = #{thirdId}) + AND id NOT IN (SELECT user_id FROM QH_SYS_USER_ROLE WHERE role_id = #{secondId} or role_id = #{thirdId}) AND username = #{username} @@ -352,11 +352,11 @@ org_code as orgCode, id_card as idCard, status - FROM sys_user + FROM QH_SYS_USER AND org_code like CONCAT (#{orgCode},'%') AND del_flag = 0 - AND id NOT IN (SELECT user_id FROM sys_user_role WHERE role_id = #{roleId}) + AND id NOT IN (SELECT user_id FROM QH_SYS_USER_ROLE WHERE role_id = #{roleId}) AND username = #{username} @@ -399,12 +399,12 @@ SELECT id - FROM sys_user + FROM QH_SYS_USER status = 1 AND del_flag = 0 AND person_type = 1 @@ -430,14 +430,14 @@ @@ -452,7 +452,7 @@ user_group, user_group_update_time FROM - sys_user + QH_SYS_USER and status = 1 and del_flag = 0 @@ -489,7 +489,7 @@ order by user_group_update_time desc UPDATE - health_user_employee_ex + QH_HLT_USER_EMPLOYEE_EX SET del_flag = 0 WHERE @@ -636,7 +636,7 @@ SELECT count(*) - FROM health_user_employee_ex t2 left join sys_user t1 on t1.id = t2.id + FROM QH_HLT_USER_EMPLOYEE_EX t2 left join QH_SYS_USER t1 on t1.id = t2.id where t1.person_type = '1' and t1.del_flag = 0 and length(t1.org_code) >=6 @@ -856,7 +856,7 @@ t1.user_group as columnInfo, count(*) as count FROM - sys_user t1 left join health_user_employee_ex t2 on t1.id = t2.id + QH_SYS_USER t1 left join QH_HLT_USER_EMPLOYEE_EX t2 on t1.id = t2.id WHERE t1.person_type = 1 and t1.del_flag = 0 and length(t1.org_code) >= 6 @@ -922,7 +922,7 @@ user_group as columnDesc, count(id) as count FROM - sys_user + QH_SYS_USER WHERE person_type = 1 and del_flag = 0 and org_code is not null and org_code != '' and @@ -939,8 +939,8 @@ t1.user_group as columnDesc, count(t1.id) as count FROM - sys_user t1 - LEFT JOIN health_user_employee_ex t2 on t1.id = t2.id + QH_SYS_USER t1 + LEFT JOIN QH_HLT_USER_EMPLOYEE_EX t2 on t1.id = t2.id where t1.person_type = 1 and t1.del_flag = 0 and t1.org_code is not null and t1.org_code != '' and t2.job_level in @@ -981,8 +981,8 @@ e.height AS height, e.current_age AS age FROM - sys_user u - LEFT JOIN health_user_employee_ex e on u.id = e.id + QH_SYS_USER u + LEFT JOIN QH_HLT_USER_EMPLOYEE_EX e on u.id = e.id WHERE u.id IN #{id} @@ -1012,8 +1012,8 @@ e.height AS height, e.current_age AS age FROM - sys_user u - LEFT JOIN health_user_employee_ex e on u.id = e.id + QH_SYS_USER u + LEFT JOIN QH_HLT_USER_EMPLOYEE_EX e on u.id = e.id WHERE 1=1 AND INSTR(',' || #{ex.sex} || ',', ',' || u.sex || ',') > 0 @@ -1085,15 +1085,15 @@ SELECT count(*) FROM - health_user_employee_ex t1 - LEFT JOIN sys_user t2 ON t1.id = t2.id + QH_HLT_USER_EMPLOYEE_EX t1 + LEFT JOIN QH_SYS_USER t2 ON t1.id = t2.id @@ -1101,7 +1101,7 @@ @@ -1177,7 +1177,7 @@ select id as userId, id_card as idCard, phone as mobile - from sys_user + from QH_SYS_USER and id in @@ -1197,8 +1197,8 @@ t1.id as userId, t2.height as heightNew, t2.weight as weightNew - from sys_user t1 - LEFT JOIN health_user_employee_ex t2 ON t1.id = t2.id + from QH_SYS_USER t1 + LEFT JOIN QH_HLT_USER_EMPLOYEE_EX t2 ON t1.id = t2.id and t1.del_flag = 0 @@ -1227,7 +1227,7 @@ ELSE user_group END AS processed_group, COUNT(1) AS user_count - FROM sys_user + FROM QH_SYS_USER WHERE del_flag = 0 AND org_code LIKE @@ -1243,7 +1243,7 @@ @@ -32,14 +32,14 @@ t3.person_type as personType, t4.id as departId, t4.depart_name as depart - FROM sys_user_role t1 - LEFT JOIN sys_role t2 on t1.role_id = t2.id - LEFT JOIN sys_user t3 ON t1.user_id = t3.id - LEFT JOIN sys_depart t4 ON t3.org_code = t4.org_code + FROM QH_SYS_USER_ROLE t1 + LEFT JOIN QH_SYS_ROLE t2 on t1.role_id = t2.id + LEFT JOIN QH_SYS_USER t3 ON t1.user_id = t3.id + LEFT JOIN QH_SYS_DEPART t4 ON t3.org_code = t4.org_code WHERE t2.role_code = 'second_manager' and t4.org_code LIKE CONCAT(#{departCode},'%') diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml index 389e755..135e7be 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml @@ -3,8 +3,8 @@ - SELECT user_id FROM sys_user_tenant + SELECT user_id FROM QH_SYS_USER_TENANT WHERE status = '1' and @@ -30,7 +30,7 @@ @@ -38,8 +38,8 @@ SELECT sut.user_id - FROM sys_user_tenant sut - JOIN sys_tenant st on sut.tenant_id = st.id + FROM QH_SYS_USER_TENANT sut + JOIN QH_SYS_TENANT st on sut.tenant_id = st.id WHERE sut.tenant_id = #{tenantId} AND st.del_flag = 0 @@ -70,9 +70,9 @@ - SELECT tenant_id FROM sys_user_tenant + SELECT tenant_id FROM QH_SYS_USER_TENANT WHERE user_id = #{userId} @@ -74,8 +74,8 @@ svi.update_time as updateTime, svi.app_status as appStatus from - sys_version_info svi - left join sys_version_app sva on sva.id=svi.app_id + QH_SYS_VERSION_INFO svi + left join QH_SYS_VERSION_APP sva on sva.id=svi.app_id where svi.app_id=#{appId} and @@ -102,8 +102,8 @@ svi.update_time as updateTime, svi.app_status as appStatus from - sys_version_info svi - left join sys_version_app sva on sva.id = svi.app_id + QH_SYS_VERSION_INFO svi + left join QH_SYS_VERSION_APP sva on sva.id = svi.app_id where svi.app_status = 1 and svi.device_type = #{deviceType} and sva.package_name = #{packageName} diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/UserDataRecordBWHMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/UserDataRecordBWHMapper.xml index d4e6252..cd6b466 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/UserDataRecordBWHMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/UserDataRecordBWHMapper.xml @@ -9,8 +9,8 @@ t1.hip, t1.waist FROM - user_data_record_bwh t1 - RIGHT JOIN ( SELECT user_id, max( create_time ) maxTime FROM user_data_record_bwh + QH_USR_DATA_RCD_BWH t1 + RIGHT JOIN ( SELECT user_id, max( create_time ) maxTime FROM QH_USR_DATA_RCD_BWH AND user_id in @@ -31,9 +31,9 @@ SELECT t1.id, t1.user_id, t1.waist - FROM user_data_record_bwh t1 + FROM QH_USR_DATA_RCD_BWH t1 RIGHT JOIN (SELECT user_id, max(id) maxId - FROM user_data_record_bwh + FROM QH_USR_DATA_RCD_BWH and waist IS NOT NULL @@ -49,8 +49,8 @@