优化

Former-commit-id: 87353b52f2f21bb120c431719470f6ccde1f1c96

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml

@@ -7,7 +7,7 @@
     <sql id="table">"SYS_RES"</sql>
 
     <sql id="entityColumnList">
-        "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"
     </sql>
 
     <resultMap id="res" type="${basePackage}.module.system.ent.Res">
@@ -18,6 +18,7 @@
         <result column="RES_VALUE"  jdbcType="VARCHAR" property="resValue"/>
         <result column="SUP_CODE"  jdbcType="VARCHAR" property="supCode"/>
         <result column="SUP_NAME"  jdbcType="VARCHAR" property="supName"/>
+        <result column="FREE"  jdbcType="BIT" property="free"/>
         <result column="VALID"  jdbcType="BIT" property="valid"/>
         <result column="ROW_VERSION"  jdbcType="BIGINT" property="rowVersion"/>
         <result column="IS_DELETED"  jdbcType="BIT" property="isDeleted"/>
@@ -52,6 +53,9 @@
         <if test="request.supName != null and request.supName != ''">
             AND SUP_NAME = ${r"#"}{request.supName}
         </if>
+        <if test="request.free != null">
+            AND FREE = ${r"#"}{request.free}
+        </if>
         <if test="request.valid != null">
             AND VALID = ${r"#"}{request.valid}
         </if>
@@ -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},

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);