diff --git a/src/main/resources/modules/SpringBoot/java/action/screen/Index.java b/src/main/resources/modules/SpringBoot/java/action/screen/Index.java index 5d71ab17..16739537 100644 --- a/src/main/resources/modules/SpringBoot/java/action/screen/Index.java +++ b/src/main/resources/modules/SpringBoot/java/action/screen/Index.java @@ -1,6 +1,7 @@ package ${basePackage}.action.screen; import ${basePackage}.frame.base.Screen; +import ${basePackage}.frame.auth.LocalData; import org.springframework.ui.Model; import java.util.HashMap; import javax.servlet.http.HttpServletRequest; @@ -18,5 +19,6 @@ public class Index extends Screen { prop.put("tran", false);//是否展示动画 prop.put("full", false);//是否全屏 model.addAttribute("prop", prop); + model.addAttribute("token", LocalData.getToken()); } } diff --git a/src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java b/src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java index a38c24e8..cb22d9be 100644 --- a/src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java @@ -65,58 +65,4 @@ public class WebMvcConfig implements WebMvcConfigurer { } } } - -// @Bean -// @Profile("prod") -// public ServletWebServerFactory servletContainer() { -// TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory(); -// -// // 基本参数 -// String keyStore = "1754557_www.wbsite.xyz.pfx"; -// String keyStorePassword = "s98n7CLd"; -// String keyStoreType = "PKCS12"; -// int httpsPort = 443; -// -// File keystore = null; -// // 正常开发可以通过getFile()获取，打包jar后无法直接获取File对象，需将文件考出 -// try { -// keystore = new ClassPathResource(keyStore).getFile(); -// } catch (IOException ex) { -// try { -// ApplicationHome home = new ApplicationHome(getClass()); -// // 当前运行jar文件 -// File jarFile = home.getSource(); -// //jar同目录 -// keystore = new File(jarFile.getParent(), keyStore); -// -// InputStream inputStream = new ClassPathResource(keyStore).getInputStream(); -// byte[] bytes = new byte[inputStream.available()]; -// -// inputStream.read(bytes); -// -// inputStream.close(); -// -// FileOutputStream fileOutputStream = new FileOutputStream(keystore); -// fileOutputStream.write(bytes); -// fileOutputStream.close(); -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// -// // 创建Connector -// Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol"); -// Http11NioProtocol protocol = (Http11NioProtocol) connector.getProtocolHandler(); -// connector.setScheme("https"); -// connector.setSecure(true); -// connector.setPort(httpsPort); -// protocol.setSSLEnabled(true); -// protocol.setKeystoreFile(keystore.getAbsolutePath()); -// protocol.setKeystorePass(keyStorePassword); -// protocol.setKeystoreType(keyStoreType); -// -// // 添加 -// tomcat.addAdditionalTomcatConnectors(connector); -// return tomcat; -// } } \ No newline at end of file diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserMapper.xml index b2e1eac6..feb54170 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserMapper.xml @@ -136,10 +136,8 @@ UPDATE SET - USER_NAME = ${r"#"}{request.userName,jdbcType=VARCHAR}, USER_CODE = ${r"#"}{request.userCode,jdbcType=VARCHAR}, USER_ALIAS = ${r"#"}{request.userAlias,jdbcType=VARCHAR}, - USER_PWD = ${r"#"}{request.userPwd,jdbcType=VARCHAR}, USER_STATUS = ${r"#"}{request.userStatus,jdbcType=VARCHAR}, DEPT_ID = ${r"#"}{request.deptId,jdbcType=BIGINT}, DEPT_CODE = ${r"#"}{request.deptCode,jdbcType=VARCHAR}, diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/DeptUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/DeptUpdateRequest.java index 55c21cd9..c14175dd 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/DeptUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/DeptUpdateRequest.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank; * @version 0.0.1 * @since 2017-01-01 */ -public class DeptUpdateRequest extends BaseUpdateRequest { +public class DeptUpdateRequest extends BaseUpdateRequest { /** * 主键 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/DictItemUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/DictItemUpdateRequest.java index 4d1f64ef..0f0e2f9d 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/DictItemUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/DictItemUpdateRequest.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; * @version 0.0.1 * @since 2017-01-01 */ -public class DictItemUpdateRequest extends BaseUpdateRequest { +public class DictItemUpdateRequest extends BaseUpdateRequest { /** * 主键 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/DictUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/DictUpdateRequest.java index 56d450c4..654daf41 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/DictUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/DictUpdateRequest.java @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull; * @version 0.0.1 * @since 2017-01-01 */ -public class DictUpdateRequest extends BaseUpdateRequest { +public class DictUpdateRequest extends BaseUpdateRequest { /** * 主键 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrUpdateRequest.java index 4854717b..aba6cb49 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrUpdateRequest.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull; * @version 0.0.1 * @since 2017-01-01 */ -public class LogErrUpdateRequest extends BaseUpdateRequest { +public class LogErrUpdateRequest extends BaseUpdateRequest { /** * 主键 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java index 81b496ff..f911c908 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java @@ -13,7 +13,7 @@ import ${basePackage}.frame.validation.Dict; * @version 0.0.1 * @since 2017-01-01 */ -public class ResUpdateRequest extends BaseUpdateRequest { +public class ResUpdateRequest extends BaseUpdateRequest { /** * 主键 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/RoleResUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/RoleResUpdateRequest.java index c9fb6555..a0123d18 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/RoleResUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/RoleResUpdateRequest.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank; * @version 0.0.1 * @since 2017-01-01 */ -public class RoleResUpdateRequest extends BaseUpdateRequest { +public class RoleResUpdateRequest extends BaseUpdateRequest { /** * 主键 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/RoleUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/RoleUpdateRequest.java index 53a31a6c..22b70b9a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/RoleUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/RoleUpdateRequest.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank; * @version 0.0.1 * @since 2017-01-01 */ -public class RoleUpdateRequest extends BaseUpdateRequest { +public class RoleUpdateRequest extends BaseUpdateRequest { /** * 主键 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/TokensUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/TokensUpdateRequest.java index f04cabcc..68c1f3df 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/TokensUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/TokensUpdateRequest.java @@ -14,7 +14,7 @@ import ${basePackage}.frame.validation.Dict; * @version 0.0.1 * @since 2017-01-01 */ -public class TokensUpdateRequest extends BaseUpdateRequest { +public class TokensUpdateRequest extends BaseUpdateRequest { /** * 主键 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/UserRoleUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/UserRoleUpdateRequest.java index a72c1856..f026524e 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/UserRoleUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/UserRoleUpdateRequest.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull; * @version 0.0.1 * @since 2017-01-01 */ -public class UserRoleUpdateRequest extends BaseUpdateRequest { +public class UserRoleUpdateRequest extends BaseUpdateRequest { /** * 主键 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/UserUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/UserUpdateRequest.java index b58c5ddf..abd52a12 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/UserUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/UserUpdateRequest.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull; * @version 0.0.1 * @since 2017-01-01 */ -public class UserUpdateRequest extends BaseUpdateRequest { +public class UserUpdateRequest extends BaseUpdateRequest { /** * 主键 @@ -22,6 +22,12 @@ public class UserUpdateRequest extends BaseUpdateRequest { @NotNull(message = "[id]主键不能为NULL") private Long id; + /** + * 用户代码 + */ + @Length(min = 0, max = 50, message = "[userCode]用户代码长度不合法(0-50)") + private String userCode; + /** * 用户别名 */ @@ -60,6 +66,14 @@ public class UserUpdateRequest extends BaseUpdateRequest { this.id = id; } + public String getUserCode() { + return this.userCode; + } + + public void setUserCode(String userCode) { + this.userCode = userCode; + } + public String getUserAlias() { return this.userAlias; } diff --git a/src/main/resources/modules/SpringBoot/test/datainit/DictInit.java b/src/main/resources/modules/SpringBoot/test/datainit/DictInit.java index 0b3a81e4..89f58990 100644 --- a/src/main/resources/modules/SpringBoot/test/datainit/DictInit.java +++ b/src/main/resources/modules/SpringBoot/test/datainit/DictInit.java @@ -8,6 +8,7 @@ import org.springframework.test.annotation.Rollback; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; import ${basePackage}.frame.auth.Token; +import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.module.system.mgr.DictItemManager; import ${basePackage}.module.system.mgr.DictManager; import ${basePackage}.module.system.req.DictCreateRequest; diff --git a/src/main/resources/modules/SpringBootService/java/module/mpr/MySQL_NSYS_mapper.xml b/src/main/resources/modules/SpringBootService/java/module/mpr/MySQL_NSYS_mapper.xml index 3a951f81..9d0c6988 100644 --- a/src/main/resources/modules/SpringBootService/java/module/mpr/MySQL_NSYS_mapper.xml +++ b/src/main/resources/modules/SpringBootService/java/module/mpr/MySQL_NSYS_mapper.xml @@ -4,24 +4,15 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - -<#if dataBase == 'Oracle'> - "${module.modulePrefix?default("")}${table.tableName}" -<#elseif dataBase='MySQL'> `${module.modulePrefix?default("")}${table.tableName}` - - <#if dataBase == 'Oracle'> - <#list table.fields as f>"${f.fieldName}"<#if f_has_next>, - <#elseif dataBase='MySQL'> - <#list table.fields as f>`${f.fieldName}`<#if f_has_next>, - + <#list table.fields as field>`${field.fieldName}`<#if field_has_next>, - <#list table.fields as f> - + <#list table.fields as field> + @@ -31,33 +22,19 @@ FROM WHERE - 1 = 1 -<#list table.fields as f> -<#if f.isQuery> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} + 1 = 1 +<#list table.fields as field> + <#if field.isQuery> + <#if field.fieldType.javaType() == "String"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - -<#if f.fieldType.javaType() == "Boolean"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} + <#elseif field.fieldType.javaType() == "Boolean"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - - - + + @@ -66,26 +43,21 @@ FROM +<#if table.hasSearchKey()> + <#list table.searchKeyList() as field> + <#if field_index = 0> WHERE -<#if table.hasSeachKey()> - 1 = 2 - -<#list table.fields as f> -<#if f.isQuery> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - OR "${f.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - OR `${f.fieldName}` LIKE CONCAT(CONCAT('%',${r"#{"}request.keyword}),'%') - - - - - + ( + `${field.fieldName}` LIKE CONCAT(CONCAT('%',${r"#{"}request.keyword}),'%') + <#else> + OR `${field.fieldName}` LIKE CONCAT(CONCAT('%',${r"#{"}request.keyword}),'%') + + <#if !field_has_next> + ) + + <#else> - 1 = 2 + WHERE 1 = 2 @@ -97,8 +69,8 @@ ) VALUES ( - <#list table.fields as f> - ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>, + <#list table.fields as field> + ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}<#if field_has_next>, ) @@ -106,38 +78,16 @@ DELETE FROM - WHERE <#if table.hasPrimaryKey()> - 1 = 1 -<#list table.fields as f> -<#if f.isPrimaryKey> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - - - - + <#list table.primaryKeyList() as field> + <#if field_index = 0> + WHERE `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} + <#else> + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} + + <#else> - 1 = 2 + WHERE 1 = 2 @@ -145,47 +95,21 @@ UPDATE SET - <#if dataBase == 'Oracle'> - <#list table.fields as f> - "${f.fieldName}" = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>, - - <#elseif dataBase='MySQL'> - <#list table.fields as f> - `${f.fieldName}` = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>, - - - WHERE -<#if table.hasPrimaryKey()> - 1 = 1 -<#list table.fields as f> -<#if f.isPrimaryKey> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - - - +<#list table.fields as field> + <#if !field.isPrimaryKey> + `${field.fieldName}` = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}, + +<#if table.hasPrimaryKey()> + <#list table.primaryKeyList() as field> + <#if field_index = 0> + WHERE `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} + <#else> + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} + + <#else> - 1 = 2 + WHERE 1 = 2 \ No newline at end of file diff --git a/src/main/resources/modules/SpringBootService/java/module/mpr/MySQL_mapper.xml b/src/main/resources/modules/SpringBootService/java/module/mpr/MySQL_mapper.xml index 264032b1..ab085fb2 100644 --- a/src/main/resources/modules/SpringBootService/java/module/mpr/MySQL_mapper.xml +++ b/src/main/resources/modules/SpringBootService/java/module/mpr/MySQL_mapper.xml @@ -7,12 +7,12 @@ `${module.modulePrefix?default("")}${table.tableName}` - <#list table.fields as f>`${f.fieldName}`<#if f_has_next>, + <#list table.fields as field>`${field.fieldName}`<#if field_has_next>, - <#list table.fields as f> - + <#list table.fields as field> + @@ -23,57 +23,56 @@ WHERE `IS_DELETED` = 0 - -<#list table.fields as f> -<#if f.isQuery> - <#if f.fieldType.javaType() == "Boolean"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} +<#list table.fields as field> +<#if field.isQuery> + <#if field.fieldType.javaType() == "Boolean"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Byte"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Byte"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Short"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Short"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Integer"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Integer"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Long"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Long"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Float"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Float"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Double"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Double"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Character"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Character"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "String"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "String"> + + AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Date"> - - AND DATE_FORMAT(`${f.fieldName}`,"%Y-%m-%d %T") = DATE_FORMAT(${r"#{"}request.${f.getFName()}},"%Y-%m-%d %T") + <#if field.fieldType.javaType() == "Date"> + + AND DATE_FORMAT(`${field.fieldName}`,"%Y-%m-%d %T") = DATE_FORMAT(${r"#{"}request.${field.getFName()}},"%Y-%m-%d %T") @@ -87,14 +86,19 @@ WHERE `IS_DELETED` = 0 +<#if table.hasSearchKey()> - 1 = 2 -<#list table.fields as f> -<#if f.isSearch> - OR `${f.fieldName}` LIKE CONCAT('%',${r"#{request.keyword}"},'%') - - + AND ( + <#list table.searchKeyList() as field> + <#if field_index == 0> + `${field.fieldName}` LIKE CONCAT('%',${r"#{request.keyword}"},'%') + <#else> + OR `${field.fieldName}` LIKE CONCAT('%',${r"#{request.keyword}"},'%') + + + ) + @@ -106,9 +110,9 @@ VALUES ( ${r"#{"}request.id}, - <#list table.fields as f> - <#if !f.isSystem> - ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, + <#list table.fields as field> + <#if !field.isSystem> + ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}, 0, @@ -127,22 +131,22 @@ ) VALUES - - ( - ${r"#{"}item.id}, - <#list table.fields as f> - <#if !f.isSystem> - ${r"#{"}item.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, - - - 0, - 0, - ${r"#{"}token.userId,jdbcType=NUMERIC}, - sysdate(), - NULL, - NULL - ) - + + ( + ${r"#{"}item.id}, + <#list table.fields as field> + <#if !field.isSystem> + ${r"#{"}item.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}, + + + 0, + 0, + ${r"#{"}token.userId,jdbcType=NUMERIC}, + sysdate(), + NULL, + NULL + ) + @@ -157,18 +161,17 @@ UPDATE SET - <#list table.fields as f> - <#if !f.isPrimaryKey> - <#if !f.isSystem || f.fieldName == 'ID'> - `${f.fieldName}` = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, + <#list table.fields as field> + <#if !field.isPrimaryKey> + <#if !field.isSystem || field.fieldName == 'ID'> + `${field.fieldName}` = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}, `ROW_VERSION` = `ROW_VERSION` + 1, `LAST_UPDATE_BY` = ${r"#{"}token.userId}, `LAST_UPDATE_TIME` = sysdate() - WHERE - `IS_DELETED` = 0 + WHERE `IS_DELETED` = 0 AND `ID` = ${r"#{"}request.id} AND `ROW_VERSION` = ${r"#{"}request.rowVersion} @@ -178,8 +181,7 @@ FROM - WHERE - `IS_DELETED` = 0 + WHERE `IS_DELETED` = 0 AND `ID` = ${r"#{request.id}"} \ No newline at end of file diff --git a/src/main/resources/modules/SpringBootService/java/module/mpr/Oracle_NSYS_mapper.xml b/src/main/resources/modules/SpringBootService/java/module/mpr/Oracle_NSYS_mapper.xml index 1c318324..fd10815f 100644 --- a/src/main/resources/modules/SpringBootService/java/module/mpr/Oracle_NSYS_mapper.xml +++ b/src/main/resources/modules/SpringBootService/java/module/mpr/Oracle_NSYS_mapper.xml @@ -4,24 +4,15 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - -<#if dataBase == 'Oracle'> "${module.modulePrefix?default("")}${table.tableName}" -<#elseif dataBase='MySQL'> - `${module.modulePrefix?default("")}${table.tableName}` - - <#if dataBase == 'Oracle'> - <#list table.fields as f>"${f.fieldName}"<#if f_has_next>, - <#elseif dataBase='MySQL'> - <#list table.fields as f>`${f.fieldName}`<#if f_has_next>, - + <#list table.fields as field>"${field.fieldName}"<#if field_has_next>, - <#list table.fields as f> - + <#list table.fields as field> + @@ -32,32 +23,18 @@ WHERE 1 = 1 -<#list table.fields as f> -<#if f.isQuery> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} +<#list table.fields as field> + <#if field.isQuery> + <#if field.fieldType.javaType() == "String"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - -<#if f.fieldType.javaType() == "Boolean"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} + <#elseif field.fieldType.javaType() == "Boolean"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - - - + + @@ -66,26 +43,21 @@ FROM +<#if table.hasSearchKey()> + <#list table.searchKeyList() as field> + <#if field_index = 0> WHERE - 1 = 1 -<#if table.hasSeachKey()> - - 1 = 1 -<#list table.fields as f> -<#if f.isQuery> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - OR "${f.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - OR `${f.fieldName}` LIKE CONCAT(CONCAT('%',${r"#{"}request.keyword}),'%') - - - - + ( + "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' + <#else> + OR "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' + + <#if !field_has_next> + ) + + <#else> - 1 = 2 + WHERE 1 = 2 @@ -97,8 +69,8 @@ ) VALUES ( - <#list table.fields as f> - ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>, + <#list table.fields as field> + ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}<#if field_has_next>, ) @@ -106,38 +78,16 @@ DELETE FROM - WHERE <#if table.hasPrimaryKey()> - 1 = 1 -<#list table.fields as f> -<#if f.isPrimaryKey> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - - - - + <#list table.primaryKeyList() as field> + <#if field_index = 0> + WHERE "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} + <#else> + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} + + <#else> - 1 = 2 + WHERE 1 = 2 @@ -145,47 +95,21 @@ UPDATE SET - <#if dataBase == 'Oracle'> - <#list table.fields as f> - "${f.fieldName}" = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>, - - <#elseif dataBase='MySQL'> - <#list table.fields as f> - `${f.fieldName}` = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>, - - - WHERE -<#if table.hasPrimaryKey()> - 1 = 1 -<#list table.fields as f> -<#if f.isPrimaryKey> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - - - +<#list table.fields as field> + <#if !field.isPrimaryKey> + "${field.fieldName}" = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}<#if field_has_next>, + +<#if table.hasPrimaryKey()> + <#list table.primaryKeyList() as field> + <#if field_index = 0> + WHERE "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} + <#else> + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} + + <#else> - 1 = 2 + WHERE 1 = 2 \ No newline at end of file diff --git a/src/main/resources/modules/SpringBootService/java/module/mpr/Oracle_mapper.xml b/src/main/resources/modules/SpringBootService/java/module/mpr/Oracle_mapper.xml index 3e9bda35..acaf4035 100644 --- a/src/main/resources/modules/SpringBootService/java/module/mpr/Oracle_mapper.xml +++ b/src/main/resources/modules/SpringBootService/java/module/mpr/Oracle_mapper.xml @@ -7,12 +7,12 @@ "${module.modulePrefix?default("")}${table.tableName}" - <#list table.fields as f>"${f.fieldName}"<#if f_has_next>, + <#list table.fields as field>"${field.fieldName}"<#if field_has_next>, - <#list table.fields as f> - + <#list table.fields as field> + @@ -23,56 +23,56 @@ WHERE "IS_DELETED" = 0 -<#list table.fields as f> -<#if f.isQuery> - <#if f.fieldType.javaType() == "Boolean"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} +<#list table.fields as field> +<#if field.isQuery> + <#if field.fieldType.javaType() == "Boolean"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Byte"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Byte"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Short"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Short"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Integer"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Integer"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Long"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Long"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Float"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Float"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Double"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Double"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Character"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Character"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "String"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "String"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Date"> - - AND to_char("${f.fieldName}",'yyyy-MM-dd HH24:mi:ss') = to_char(${r"#{"}request.${f.getFName()}},'yyyy-MM-dd HH24:mi:ss') + <#if field.fieldType.javaType() == "Date"> + + AND to_char("${field.fieldName}",'yyyy-MM-dd HH24:mi:ss') = to_char(${r"#{"}request.${field.getFName()}},'yyyy-MM-dd HH24:mi:ss') @@ -86,13 +86,19 @@ WHERE "IS_DELETED" = 0 +<#if table.hasSearchKey()> - 1 = 2 -<#list table.fields as f> -<#if f.isSearch> - OR "${f.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' - + AND ( + <#list table.searchKeyList() as field> + <#if field_index == 0> + "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' + <#else> + OR "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' + + + ) + @@ -104,9 +110,9 @@ VALUES ( ${r"#{"}request.id}, - <#list table.fields as f> - <#if !f.isSystem> - ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, + <#list table.fields as field> + <#if !field.isSystem> + ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}, 0, @@ -125,12 +131,12 @@ ) VALUES - + ( ${r"#{"}item.id}, - <#list table.fields as f> - <#if !f.isSystem> - ${r"#{"}item.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, + <#list table.fields as field> + <#if !field.isSystem> + ${r"#{"}item.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}, 0, @@ -155,18 +161,17 @@ UPDATE SET - <#list table.fields as f> - <#if !f.isPrimaryKey> - <#if !f.isSystem || f.fieldName == 'ID'> - "${f.fieldName}" = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, + <#list table.fields as field> + <#if !field.isPrimaryKey> + <#if !field.isSystem || field.fieldName == 'ID'> + "${field.fieldName}" = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}, "ROW_VERSION" = "ROW_VERSION" + 1, "LAST_UPDATE_BY" = ${r"#{"}token.userId}, "LAST_UPDATE_TIME" = sysdate - WHERE - "IS_DELETED" = 0 + WHERE "IS_DELETED" = 0 AND "ID" = ${r"#{"}request.id} AND "ROW_VERSION" = ${r"#{"}request.rowVersion} @@ -176,8 +181,7 @@ FROM - WHERE - "IS_DELETED" = 0 + WHERE "IS_DELETED" = 0 AND "ID" = ${r"#{request.id}"} \ No newline at end of file diff --git a/src/main/resources/modules/SpringBootService/java/module/mpr/SQLite_NSYS_mapper.xml b/src/main/resources/modules/SpringBootService/java/module/mpr/SQLite_NSYS_mapper.xml index 1c318324..fd10815f 100644 --- a/src/main/resources/modules/SpringBootService/java/module/mpr/SQLite_NSYS_mapper.xml +++ b/src/main/resources/modules/SpringBootService/java/module/mpr/SQLite_NSYS_mapper.xml @@ -4,24 +4,15 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - -<#if dataBase == 'Oracle'> "${module.modulePrefix?default("")}${table.tableName}" -<#elseif dataBase='MySQL'> - `${module.modulePrefix?default("")}${table.tableName}` - - <#if dataBase == 'Oracle'> - <#list table.fields as f>"${f.fieldName}"<#if f_has_next>, - <#elseif dataBase='MySQL'> - <#list table.fields as f>`${f.fieldName}`<#if f_has_next>, - + <#list table.fields as field>"${field.fieldName}"<#if field_has_next>, - <#list table.fields as f> - + <#list table.fields as field> + @@ -32,32 +23,18 @@ WHERE 1 = 1 -<#list table.fields as f> -<#if f.isQuery> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} +<#list table.fields as field> + <#if field.isQuery> + <#if field.fieldType.javaType() == "String"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - -<#if f.fieldType.javaType() == "Boolean"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} + <#elseif field.fieldType.javaType() == "Boolean"> + + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - - - + + @@ -66,26 +43,21 @@ FROM +<#if table.hasSearchKey()> + <#list table.searchKeyList() as field> + <#if field_index = 0> WHERE - 1 = 1 -<#if table.hasSeachKey()> - - 1 = 1 -<#list table.fields as f> -<#if f.isQuery> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - OR "${f.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - OR `${f.fieldName}` LIKE CONCAT(CONCAT('%',${r"#{"}request.keyword}),'%') - - - - + ( + "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' + <#else> + OR "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' + + <#if !field_has_next> + ) + + <#else> - 1 = 2 + WHERE 1 = 2 @@ -97,8 +69,8 @@ ) VALUES ( - <#list table.fields as f> - ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>, + <#list table.fields as field> + ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}<#if field_has_next>, ) @@ -106,38 +78,16 @@ DELETE FROM - WHERE <#if table.hasPrimaryKey()> - 1 = 1 -<#list table.fields as f> -<#if f.isPrimaryKey> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - - - - + <#list table.primaryKeyList() as field> + <#if field_index = 0> + WHERE "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} + <#else> + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} + + <#else> - 1 = 2 + WHERE 1 = 2 @@ -145,47 +95,21 @@ UPDATE SET - <#if dataBase == 'Oracle'> - <#list table.fields as f> - "${f.fieldName}" = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>, - - <#elseif dataBase='MySQL'> - <#list table.fields as f> - `${f.fieldName}` = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>, - - - WHERE -<#if table.hasPrimaryKey()> - 1 = 1 -<#list table.fields as f> -<#if f.isPrimaryKey> -<#if dataBase == 'Oracle'> -<#if f.fieldType.javaType() == "String"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} - - -<#elseif dataBase='MySQL'> -<#if f.fieldType.javaType() == "String"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - -<#if f.fieldType.javaType() == "Boolean"> - - AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} - - - - +<#list table.fields as field> + <#if !field.isPrimaryKey> + "${field.fieldName}" = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}<#if field_has_next>, + +<#if table.hasPrimaryKey()> + <#list table.primaryKeyList() as field> + <#if field_index = 0> + WHERE "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} + <#else> + AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}} + + <#else> - 1 = 2 + WHERE 1 = 2 \ No newline at end of file diff --git a/src/main/resources/modules/SpringBootService/java/module/mpr/SQLite_mapper.xml b/src/main/resources/modules/SpringBootService/java/module/mpr/SQLite_mapper.xml index 4a13ad74..6922cda1 100644 --- a/src/main/resources/modules/SpringBootService/java/module/mpr/SQLite_mapper.xml +++ b/src/main/resources/modules/SpringBootService/java/module/mpr/SQLite_mapper.xml @@ -7,12 +7,12 @@ "${module.modulePrefix?default("")}${table.tableName}" - <#list table.fields as f>"${f.fieldName}"<#if f_has_next>, + <#list table.fields as field>"${field.fieldName}"<#if field_has_next>, - <#list table.fields as f> - + <#list table.fields as field> + @@ -23,56 +23,56 @@ WHERE "IS_DELETED" = 0 -<#list table.fields as f> -<#if f.isQuery> - <#if f.fieldType.javaType() == "Boolean"> - - AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} +<#list table.fields as field> +<#if field.isQuery> + <#if field.fieldType.javaType() == "Boolean"> + + AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Byte"> - - AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Byte"> + + AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Short"> - - AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Short"> + + AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Integer"> - - AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Integer"> + + AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Long"> - - AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Long"> + + AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Float"> - - AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Float"> + + AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Double"> - - AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Double"> + + AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Character"> - - AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Character"> + + AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "String"> - - AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "String"> + + AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}} - <#if f.fieldType.javaType() == "Date"> - - AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} + <#if field.fieldType.javaType() == "Date"> + + AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}} @@ -86,14 +86,19 @@ WHERE "IS_DELETED" = 0 +<#if table.hasSearchKey()> - 1 = 2 -<#list table.fields as f> -<#if f.isSearch> - OR ${f.fieldName} LIKE CONCAT('%',${r"#{request.keyword}"},'%') - - + AND ( + <#list table.searchKeyList() as field> + <#if field_index == 0> + "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' + <#else> + OR "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' + + + ) + @@ -105,9 +110,9 @@ VALUES ( ${r"#{"}request.id}, - <#list table.fields as f> - <#if !f.isSystem> - ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, + <#list table.fields as field> + <#if !field.isSystem> + ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}, 0, @@ -126,12 +131,12 @@ ) VALUES - + ( ${r"#{"}item.id}, - <#list table.fields as f> - <#if !f.isSystem> - ${r"#{"}item.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, + <#list table.fields as field> + <#if !field.isSystem> + ${r"#{"}item.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}, 0, @@ -156,18 +161,17 @@ UPDATE SET - <#list table.fields as f> - <#if !f.isPrimaryKey> - <#if !f.isSystem || f.fieldName == 'ID'> - ${f.fieldName} = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, + <#list table.fields as field> + <#if !field.isPrimaryKey> + <#if !field.isSystem || field.fieldName == 'ID'> + ${field.fieldName} = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}, "ROW_VERSION" = "ROW_VERSION" + 1, "LAST_UPDATE_BY" = ${r"#{"}token.userId}, "LAST_UPDATE_TIME" = datetime('now','localtime') - WHERE - "IS_DELETED" = 0 + WHERE "IS_DELETED" = 0 AND "ID" = ${r"#{"}request.id} AND "ROW_VERSION" = ${r"#{"}request.rowVersion} @@ -177,8 +181,7 @@ FROM - WHERE - IS_DELETED = 0 + WHERE IS_DELETED = 0 AND ID = ${r"#{request.id}"} \ No newline at end of file