diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml index 26a342af..2ba15f3f 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml @@ -7,7 +7,7 @@ "SYS_RES" - "ID","RES_CODE","RES_NAME","RES_TYPE","RES_VALUE","SUP_CODE","SUP_NAME","VALID","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" + "ID","RES_CODE","RES_NAME","RES_TYPE","RES_VALUE","SUP_CODE","SUP_NAME","FREE","VALID","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" @@ -18,6 +18,7 @@ + @@ -52,6 +53,9 @@ AND SUP_NAME = ${r"#"}{request.supName} + + AND FREE = ${r"#"}{request.free} + AND VALID = ${r"#"}{request.valid} @@ -102,6 +106,7 @@ ${r"#"}{request.resValue,jdbcType=VARCHAR}, ${r"#"}{request.supCode,jdbcType=VARCHAR}, ${r"#"}{request.supName,jdbcType=VARCHAR}, + ${r"#"}{request.free,jdbcType=BIT}, ${r"#"}{request.valid,jdbcType=BIT}, 0, 0, @@ -128,6 +133,7 @@ ${r"#"}{item.resValue,jdbcType=VARCHAR}, ${r"#"}{item.supCode,jdbcType=VARCHAR}, ${r"#"}{item.supName,jdbcType=VARCHAR}, + ${r"#"}{item.free,jdbcType=BIT}, ${r"#"}{item.valid,jdbcType=BIT}, 0, 0, @@ -157,6 +163,7 @@ RES_VALUE = ${r"#"}{request.resValue,jdbcType=VARCHAR}, SUP_CODE = ${r"#"}{request.supCode,jdbcType=VARCHAR}, SUP_NAME = ${r"#"}{request.supName,jdbcType=VARCHAR}, + FREE = ${r"#"}{request.free,jdbcType=BIT}, VALID = ${r"#"}{request.valid,jdbcType=BIT}, "ROW_VERSION" = "ROW_VERSION" + 1, "LAST_UPDATE_BY" = ${r"#"}{token.userId}, diff --git a/src/main/resources/modules/SpringBoot/test/DataInit.java b/src/main/resources/modules/SpringBoot/test/DataInit.java index 2a8a940b..76e1eb1d 100644 --- a/src/main/resources/modules/SpringBoot/test/DataInit.java +++ b/src/main/resources/modules/SpringBoot/test/DataInit.java @@ -275,11 +275,16 @@ public class DataInit { } private Res createRes(String code, String name, String resType, String value) { + return createRes(code,name,resType,value,false); + } + + private Res createRes(String code, String name, String resType, String value, boolean free) { ResCreateRequest resCreateRequest = new ResCreateRequest(); resCreateRequest.setResName(name); resCreateRequest.setResCode(code); resCreateRequest.setResType(resType); resCreateRequest.setResValue(value); + resCreateRequest.setFree(free); resCreateRequest.setValid(true); ResCreateResponse resCreateResponse = resManager.create(resCreateRequest, token); printError(resCreateResponse);