Merge branch '1.0' of http://gogs.tcmbrain.com/zjh/pre_paramater into 1.0

.idea/encodings.xml

@@ -2,8 +2,6 @@
 <project version="4">
   <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$/cbkj_web_parameter/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

cbkj_web_parameter/src/main/resources/mappers/bs/BsAreaMapper.xml

@@ -144,5 +144,10 @@
         </if>
         order by SORT
     </select>
+    <select id="getAreaByCode" parameterType="string" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List" />
+        from sys_area
+        where AREA_CODE=#{areaCode}
+    </select>
 
 </mapper>

cbkj_web_parameter/src/main/resources/mappers/bs/BsCityMapper.xml

@@ -144,5 +144,10 @@
         </if>
         order by SORT
     </select>
+    <select id="getBsCityByCode" parameterType="string" resultMap="BaseResultMap">
+        select  <include refid="Base_Column_List" />
+        from sys_city
+        where CITY_CODE=#{cityCode}
+    </select>
 
 </mapper>

cbkj_web_parameter/src/main/resources/mappers/bs/BsProvinceMapper.xml

@@ -136,5 +136,9 @@
         from sys_province
         order by SORT
     </select>
+    <select id="getProvinceByCode" parameterType="string" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List" />
+        from sys_province where PROVINCE_CODE=#{provinceCode}
+    </select>
 
 </mapper>

cbkj_web_parameter/src/main/resources/mappers/bs/BsStreetMapper.xml

@@ -144,5 +144,10 @@
         </if>
         order by SORT
     </select>
+    <select id="getBsStreetByCode" parameterType="string" resultMap="BaseResultMap">
+        select  <include refid="Base_Column_List" />
+        from sys_street
+        where STREET_CODE=#{streetCode}
+    </select>
 
 </mapper>

cbkj_web_parameter/src/main/resources/mappers/sysApp/SysAppMapper.xml

@@ -10,7 +10,7 @@
         <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="create_user" jdbcType="VARCHAR" property="createUser"/>
         <result column="create_user_name" jdbcType="VARCHAR" property="createUserName"/>
-        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+        <result column="update_date" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="update_user" jdbcType="VARCHAR" property="updateUser"/>
         <result column="update_user_name" jdbcType="VARCHAR" property="updateUserName"/>
         <result column="status" jdbcType="VARCHAR" property="status"/>
@@ -42,7 +42,7 @@
     <insert id="insert" parameterType="SysApp">
         insert into sys_app (app_id, app_name, app_pwd, app_desc, create_date, create_user, create_user_name, status,update_date,update_user,update_user_name,
                             sort, platform_code)
-        values (#{appId}, #{appName}, #{appPwd}, #{appDesc}, #{createDate}, #{createUser}, #{createUserName}, #{status},#{updateDate},#{updateUser},#{updateUserName},
+        values (#{appId}, #{appName}, #{appPwd}, #{appDesc}, #{createDate}, #{createUser}, #{createUserName}, #{status},#{updateTime},#{updateUser},#{updateUserName},
                 #{sort},  #{platformCode})
     </insert>
 
@@ -51,7 +51,7 @@
         insert into sys_app
         (app_id,app_name,app_pwd,app_desc,create_date,create_user,create_user_name,update_date,update_user,update_user_name,status,sort,platform_code) values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.appId},#{item.appName},#{item.appPwd},#{item.appDesc},#{item.createDate},#{item.createUser},#{item.createUserName},#{item.updateDate},#{item.updateUser},#{item.updateUserName},
+            (#{item.appId},#{item.appName},#{item.appPwd},#{item.appDesc},#{item.createDate},#{item.createUser},#{item.createUserName},#{item.updateTime},#{item.updateUser},#{item.updateUserName},
             #{item.status},#{sort},#{item.platformCode})
         </foreach>
     </insert>
@@ -68,8 +68,8 @@
             <if test="appDesc != null and appDesc!=''">
                 app_desc = #{ appDesc },
             </if>
-            <if test="updateDate != null and updateDate!=''">
-                update_date = #{updateDate},
+            <if test="updateTime != null and updateTime!=''">
+                update_date = #{updateTime},
             </if>
             <if test="updateUser != null and updateUser!=''">
                 update_user = #{updateUser},

cbkj_web_parameter/src/main/resources/mappers/sysApp/SysDepartmentMapper.xml

@@ -14,7 +14,7 @@
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USER" jdbcType="VARCHAR" property="createUser"/>
         <result column="create_user_name" jdbcType="VARCHAR" property="createUserName"/>
-        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+        <result column="update_date" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="update_user" jdbcType="VARCHAR" property="updateUser"/>
         <result column="update_user_name" jdbcType="VARCHAR" property="updateUserName"/>
         <result column="status" jdbcType="VARCHAR" property="status"/>
@@ -36,7 +36,7 @@
 
     <sql id="Base_Column_List">
         dept_id
-        ,dept_name,APP_ID,INS_CODE,dept_origin_id,dept_parent_id,dept_parent_name,CREATE_DATE,CREATE_USER,create_user_name,updateDate,updateUser,updateUserName,status,dept_type
+        ,dept_name,APP_ID,INS_CODE,dept_origin_id,dept_parent_id,dept_parent_name,CREATE_DATE,CREATE_USER,create_user_name,updateTime,updateUser,updateUserName,status,dept_type
     </sql>
 
     <delete id="deleteByPrimaryKey" parameterType="SysDepartment">
@@ -59,7 +59,7 @@
                                     CREATE_DATE, CREATE_USER, create_user_name, update_date, update_user,
                                     update_user_name, status,dept_type)
         values (#{deptId}, #{deptName}, #{appId}, #{insCode}, #{depOriginId}, #{depParentId}, #{depParentName},
-                #{createDate}, #{createUser}, #{createUserName}, #{updateDate}, #{updateUser}, #{updateUserName},
+                #{createDate}, #{createUser}, #{createUserName}, #{updateTime}, #{updateUser}, #{updateUserName},
                 #{status},#{deptType})
     </insert>
 
@@ -69,7 +69,7 @@
         (dept_id,dept_name,APP_ID,INS_CODE,dept_origin_id,dept_parent_id,dept_parent_name,CREATE_DATE,CREATE_USER,create_user_name,update_date, update_user,update_user_name,status,dept_type)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.deptId},#{item.deptName},#{item.appId},#{item.insCode},#{item.depOriginId},#{item.depParentId},#{item.depParentName},#{item.createDate},#{item.createUser},#{item.createUserName},#{updateDate},#{updateUser},#{updateUserName},#{item.status},#{item.dept_type})
+            (#{item.deptId},#{item.deptName},#{item.appId},#{item.insCode},#{item.depOriginId},#{item.depParentId},#{item.depParentName},#{item.createDate},#{item.createUser},#{item.createUserName},#{updateTime},#{updateUser},#{updateUserName},#{item.status},#{item.dept_type})
         </foreach>
     </insert>
 
@@ -94,8 +94,8 @@
             <if test="depParentName != null depParentName!=''">
                 dept_parent_name = #{ depParentName },
             </if>
-            <if test="updateDate != null updateDate!=''">
-                update_date = #{updateDate},
+            <if test="updateTime != null updateTime!=''">
+                update_date = #{updateTime},
             </if>
             <if test="updateUser != null updateUser!=''">
                 update_user = #{updateUser},

cbkj_web_parameter/src/main/resources/mappers/sysApp/SysInstitutionMapper.xml

@@ -25,7 +25,7 @@
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USER" jdbcType="VARCHAR" property="createUser"/>
         <result column="create_user_name" jdbcType="VARCHAR" property="createUsername"/>
-        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+        <result column="update_date" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="update_user" jdbcType="VARCHAR" property="updateUser"/>
         <result column="update_user_name" jdbcType="VARCHAR" property="updateUserName"/>
         <result column="sort" jdbcType="VARCHAR" property="sort"/>
@@ -94,7 +94,7 @@
         values (#{insId}, #{appId}, #{insCode}, #{insName}, #{insParentCode}, #{insCategory}, #{insIslast},
                 #{insPinyin}, #{insWubi}, #{provinceCode}, #{provinceName}, #{cityCode}, #{cityName}, #{areaCode},
                 #{areaName}, #{streetCode}, #{streetName}, #{insAddress}, #{insIsonline}, #{sort}, #{createDate},
-                #{createUser}, #{createUsername}, #{updateDate}, #{updateUser}, #{updateUserName}, #{status},
+                #{createUser}, #{createUsername}, #{updateTime}, #{updateUser}, #{updateUserName}, #{status},
                 #{platformCode}, #{insLevel})
     </insert>
 
@@ -109,7 +109,7 @@
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.insId},#{item.appId},#{item.insCode},#{item.insName},#{item.insParentCode},#{item.insCategory},#{item.insIslast},#{item.insPinyin},#{item.insWubi},#{item.provinceCode},#{item.provinceName},#{item.cityCode},#{item.cityName},#{item.areaCode},#{item.areaName},#{item.streetCode},#{item.streetName},#{item.insAddress},#{item.insIsonline},#{item.sort},#{item.createDate},#{item.createUser},#{item.createUsername},
-            #{item.updateDate}, #{item.updateUser}, #{item.updateUserName},
+            #{item.updateTime}, #{item.updateUser}, #{item.updateUserName},
              #{item.status},#{item.platformCode},#{item.insLevel})
         </foreach>
     </insert>
@@ -175,8 +175,8 @@
                 SORT = #{ sort },
             </if>
 
-            <if test="updateDate != null">
-                update_date = #{updateDate},
+            <if test="updateTime != null">
+                update_date = #{updateTime},
             </if>
             <if test="updateUser != null">
                 update_user = #{updateUser},
@@ -520,8 +520,8 @@
                 create_user_name = #{ createUsername },
             </if>
 
-            <if test="updateDate != null">
-                update_date = #{updateDate},
+            <if test="updateTime != null">
+                update_date = #{updateTime},
             </if>
             <if test="updateUser != null">
                 update_user = #{updateUser},