Переглянути джерело

订单催款中间表值不对修改

anderx 4 роки тому
батько
коміт
c76dc2cbed

+ 7 - 7
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -24,14 +24,14 @@
     <result column="valid_date" jdbcType="VARCHAR" property="validDate" />
     <result column="new_user" jdbcType="INTEGER" property="newUser" />
     <result column="sign_sum" jdbcType="INTEGER" property="signSum" />
-    <result column="mian_status" jdbcType="INTEGER" property="mainStatus" />
+    <result column="main_status" jdbcType="INTEGER" property="mainStatus" />
     <result column="supplement" jdbcType="VARCHAR" property="supplement" />
     <result column="audit_info" jdbcType="VARCHAR" property="auditInfo" />
   </resultMap>
   <sql id="Base_Column_List">
     id, `uid`, aid, release_start, release_end, remarks, annex_url, user_name, longitude, 
     latitude, `status`, create_time, clock_in, clock_in_time, photo_url, pid, pname, 
-    ufid, duration, valid_date, new_user, sign_sum, mian_status, supplement, audit_info
+    ufid, duration, valid_date, new_user, sign_sum, main_status, supplement, audit_info
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -51,7 +51,7 @@
       clock_in_time, photo_url, pid, 
       pname, ufid, duration, 
       valid_date, new_user, sign_sum, 
-      mian_status, supplement, audit_info
+      main_status, supplement, audit_info
       )
     values (#{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, 
       #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, 
@@ -130,7 +130,7 @@
         sign_sum,
       </if>
       <if test="mainStatus != null">
-        mian_status,
+        main_status,
       </if>
       <if test="supplement != null">
         supplement,
@@ -281,7 +281,7 @@
         sign_sum = #{signSum,jdbcType=INTEGER},
       </if>
       <if test="mainStatus != null">
-        mian_status = #{mainStatus,jdbcType=INTEGER},
+        main_status = #{mainStatus,jdbcType=INTEGER},
       </if>
       <if test="supplement != null">
         supplement = #{supplement,jdbcType=VARCHAR},
@@ -315,7 +315,7 @@
       valid_date = #{validDate,jdbcType=VARCHAR},
       new_user = #{newUser,jdbcType=INTEGER},
       sign_sum = #{signSum,jdbcType=INTEGER},
-      mian_status = #{mainStatus,jdbcType=INTEGER},
+      main_status = #{mainStatus,jdbcType=INTEGER},
       supplement = #{supplement,jdbcType=VARCHAR},
       audit_info = #{auditInfo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
@@ -394,7 +394,7 @@
          sign_sum,
        </if>
        <if test="mainStatus != null">
-         mian_status,
+         main_status,
        </if>
        <if test="supplement != null">
          supplement,

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,11 +1,11 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20