|
|
@@ -96,8 +96,8 @@
|
|
|
<result property="paperSubmitOther" column="paper_submit_other" jdbcType="VARCHAR"/>
|
|
|
<result property="reviewProvince" column="review_province" jdbcType="INTEGER"/>
|
|
|
<result property="reviewCountry" column="review_country" jdbcType="INTEGER"/>
|
|
|
- <result property="reviewProvinceNumber" column="review_province_number" jdbcType="INTEGER"/>
|
|
|
- <result property="reviewCountryNumber" column="review_country_number" jdbcType="INTEGER"/>
|
|
|
+ <result property="reviewProvinceNumber" column="review_province_number" jdbcType="VARCHAR"/>
|
|
|
+ <result property="reviewCountryNumber" column="review_country_number" jdbcType="VARCHAR"/>
|
|
|
<result property="remarks" column="remarks" jdbcType="VARCHAR"/>
|
|
|
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
|
|
|
<result property="downloadTime" column="download_time" jdbcType="TIMESTAMP"/>
|
|
|
@@ -533,10 +533,10 @@ feature_other = values(feature_other)
|
|
|
<if test="reviewCountry != null">
|
|
|
review_country = #{reviewCountry},
|
|
|
</if>
|
|
|
- <if test="reviewProvinceNumber != null">
|
|
|
+ <if test="reviewProvinceNumber != null and reviewProvinceNumber != ''">
|
|
|
review_province_number = #{reviewProvinceNumber},
|
|
|
</if>
|
|
|
- <if test="reviewCountryNumber != null">
|
|
|
+ <if test="reviewCountryNumber != null and reviewCountryNumber != ''">
|
|
|
review_country_number = #{reviewCountryNumber},
|
|
|
</if>
|
|
|
<if test="remarks != null and remarks != ''">
|
|
|
@@ -865,10 +865,10 @@ feature_other = values(feature_other)
|
|
|
<if test="reviewCountry != null">
|
|
|
and review_country = #{reviewCountry}
|
|
|
</if>
|
|
|
- <if test="reviewProvinceNumber != null">
|
|
|
+ <if test="reviewProvinceNumber != null and reviewProvinceNumber != ''">
|
|
|
and review_province_number = #{reviewProvinceNumber}
|
|
|
</if>
|
|
|
- <if test="reviewCountryNumber != null">
|
|
|
+ <if test="reviewCountryNumber != null and reviewCountryNumber != ''">
|
|
|
and review_country_number = #{reviewCountryNumber}
|
|
|
</if>
|
|
|
<if test="remarks != null and remarks != ''">
|
|
|
@@ -1197,10 +1197,10 @@ feature_other = values(feature_other)
|
|
|
<if test="reviewCountry != null">
|
|
|
and review_country = #{reviewCountry}
|
|
|
</if>
|
|
|
- <if test="reviewProvinceNumber != null">
|
|
|
+ <if test="reviewProvinceNumber != null and reviewProvinceNumber != ''">
|
|
|
and review_province_number = #{reviewProvinceNumber}
|
|
|
</if>
|
|
|
- <if test="reviewCountryNumber != null">
|
|
|
+ <if test="reviewCountryNumber != null and reviewCountryNumber != ''">
|
|
|
and review_country_number = #{reviewCountryNumber}
|
|
|
</if>
|
|
|
<if test="remarks != null and remarks != ''">
|
|
|
@@ -1363,4 +1363,5 @@ feature_other = values(feature_other)
|
|
|
from task_details a
|
|
|
<include refid="selectTaskDetailsSql"/>
|
|
|
</select>
|
|
|
-</mapper>
|
|
|
+</mapper>
|
|
|
+
|