Procházet zdrojové kódy

增加城市字段,增加是都是lNG标识字段。

zangguocen před 3 roky
rodič
revize
673ba167cd

+ 9 - 0
yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java

@@ -89,6 +89,15 @@ public class SysDept extends BaseEntity
      */
     private String printDeviceType;
     private String isLngFlag;
+    private String city;
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
 
     public String getIsLngFlag() {
         return isLngFlag;

+ 9 - 2
yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -54,14 +54,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="printDeviceType"    column="print_device_type" />
 		<result property="balance"    column="balance" />
 		<result property="isLngFlag"    column="is_lng_flag" />
+		<result property="city"    column="city" />
 	</resultMap>
 
 	<sql id="selectDeptVo">
         select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
         d.del_flag, d.create_by, d.create_time ,d.ji_bie, d.dept_address, d.oil_gun_num, d.station_pic, d.station_longitude,
-        d.station_latitude, d.mno, discount_setting,card_enabled_flag,d.app_id, d.app_secret,gzh_app_id,gzh_app_secret,ali_app_id,gzh_app_secret
+        d.station_latitude, d.mno, discount_setting,card_enabled_flag,d.app_id, d.app_secret,gzh_app_id,gzh_app_secret,ali_app_id,gzh_app_secret,
         ali_app_id,ali_public_key,ali_private_key,ali_encrypt_key,image1,image2,image3,image4,image5,ws_print_flag,print_setting,notice,integral_print_flag,
-        d.integral_flag,d.integral_rule_flag,d.card_rule_flag,d.coupon_flag,d.label_flag,d.print_device_type,d.balance,d.is_lng_flag
+        d.integral_flag,d.integral_rule_flag,d.card_rule_flag,d.coupon_flag,d.label_flag,d.print_device_type,d.balance,d.is_lng_flag,d.city
         from sys_dept d
     </sql>
 
@@ -327,6 +328,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="labelFlag != null">label_flag,</if>
 			<if test="printDeviceType != null">print_device_type,</if>
 			<if test="balance != null">balance,</if>
+			<if test="city != null">city,</if>
+			<if test="isLngFlag != null">is_lng_flag,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -372,6 +375,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="labelFlag != null">#{labelFlag},</if>
 			<if test="printDeviceType != null">#{printDeviceType},</if>
 			<if test="balance != null">#{balance},</if>
+			<if test="city != null">#{city},</if>
+			<if test="isLngFlag != null">#{isLngFlag},</if>
  			sysdate()
  		)
 	</insert>
@@ -421,6 +426,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="labelFlag != null">label_flag= #{labelFlag},</if>
 			<if test="printDeviceType != null">print_device_type= #{printDeviceType},</if>
 			<if test="balance != null">balance= #{balance},</if>
+			<if test="city != null">city= #{city},</if>
+			<if test="isLngFlag != null">is_lng_flag= #{isLngFlag},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}