shiyang / regional-platform

Download as
Browse Code »

Commit 018f12d85a461def2a0a0a576c2a833acad3c8d9

Authored by jiangjiazhi
1 parent 3fb37d520e
Exists in master and in 1 other branch nobuildprocess

修改产检删除

Showing 2 changed files with 17 additions and 8 deletions

platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml View file @ 018f12d
... ... @@ -21,19 +21,21 @@
21 21 <result column="created" property="created" jdbcType="TIMESTAMP"/>
22 22 <result column="shortCode" property="shortCode" jdbcType="VARCHAR"/>
23 23 <result column="foreign_id" property="foreignId" jdbcType="VARCHAR"/>
  24 + <result column="bStatus" property="bStatus" jdbcType="INTEGER"/>
  25 +
24 26 </resultMap>
25 27  
26 28  
27 29 <insert id="addOrganization" parameterType="com.lyms.platform.permission.model.Organization">
28 30 <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer">SELECT LAST_INSERT_ID()</selectKey>
29 31 insert into organization
30   - (foreign_id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id
  32 + (foreign_id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id,bStatus
31 33 <if test="id != null and id >= 0">
32 34 ,id
33 35 </if>
34 36 )
35 37 values
36   - (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId}
  38 + (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId},#{bStatus}
37 39 <if test="id != null and id >= 0">
38 40 ,#{id}
39 41 </if>
... ... @@ -62,6 +64,9 @@
62 64 <if test="provinceId != null">
63 65 province_id = #{provinceId,jdbcType=INTEGER},
64 66 </if>
  67 + <if test="bStatus !=null">
  68 + bStatus=#{bStatus,jdbcType=INTEGER},
  69 + </if>
65 70 <if test="cityId != null">
66 71 city_id = #{cityId,jdbcType=INTEGER},
67 72 </if>
... ... @@ -109,7 +114,7 @@
109 114  
110 115  
111 116 <select id="getOrganization" resultMap="OrganizationResultMap" parameterType="java.lang.Integer">
112   -select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status
  117 +select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status,bStatus
113 118 from organization where id = #{id,jdbcType=INTEGER}
114 119 </select>
115 120  
... ... @@ -213,7 +218,7 @@
213 218 <select id="queryOrganization" resultMap="OrganizationResultMap"
214 219 parameterType="com.lyms.platform.permission.model.OrganizationQuery">
215 220 select
216   - id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status
  221 + id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status,bStatus
217 222 from organization
218 223 <include refid="OrganizationCondition"/>
219 224 <include refid="orderAndLimit"/>
platform-biz-service/src/main/resources/mainOrm/slave/Organization.xml View file @ 018f12d
... ... @@ -21,19 +21,20 @@
21 21 <result column="created" property="created" jdbcType="TIMESTAMP"/>
22 22 <result column="shortCode" property="shortCode" jdbcType="VARCHAR"/>
23 23 <result column="foreign_id" property="foreignId" jdbcType="VARCHAR"/>
  24 + <result column="bStatus" property="bStatus" jdbcType="INTEGER"/>
24 25 </resultMap>
25 26  
26 27  
27 28 <insert id="addOrganization" parameterType="com.lyms.platform.permission.model.Organization">
28 29 <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer">SELECT LAST_INSERT_ID()</selectKey>
29 30 insert into organization
30   - (foreign_id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id
  31 + (foreign_id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id,bStatus
31 32 <if test="id != null and id >= 0">
32 33 ,id
33 34 </if>
34 35 )
35 36 values
36   - (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId}
  37 + (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId},#{bStatus}
37 38 <if test="id != null and id >= 0">
38 39 ,#{id}
39 40 </if>
... ... @@ -47,6 +48,9 @@
47 48 <if test="foreignId != null and foreignId != ''">
48 49 foreign_id = #{foreignId,jdbcType=VARCHAR},
49 50 </if>
  51 + <if test="bStatus !=null">
  52 + bStatus=#{bStatus,jdbcType=INTEGER},
  53 + </if>
50 54 <if test="name != null and name != ''">
51 55 name = #{name,jdbcType=VARCHAR},
52 56 </if>
... ... @@ -109,7 +113,7 @@
109 113  
110 114  
111 115 <select id="getOrganization" resultMap="OrganizationResultMap" parameterType="java.lang.Integer">
112   -select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status
  116 +select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status,bStatus
113 117 from organization where id = #{id,jdbcType=INTEGER}
114 118 </select>
115 119  
... ... @@ -213,7 +217,7 @@
213 217 <select id="queryOrganization" resultMap="OrganizationResultMap"
214 218 parameterType="com.lyms.platform.permission.model.OrganizationQuery">
215 219 select
216   - id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status
  220 + id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status,bStatus
217 221 from organization
218 222 <include refid="OrganizationCondition"/>
219 223 <include refid="orderAndLimit"/>