anderx 4 years ago
parent
commit
e404d74537

+ 10 - 10
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1080,14 +1080,14 @@
 		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-
+
 		and  a.name = #{name,jdbcType=VARCHAR}
 
 	</if>
 	<if test="keyword != null">
-
+
 		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
-
+
 	</if>
 	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
@@ -1138,14 +1138,14 @@
 		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-
+
 		and  a.name = #{name,jdbcType=VARCHAR}
-
+
 	</if>
 	<if test="keyword != null">
-
+
 		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
-
+
 	</if>
 	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
@@ -1224,9 +1224,9 @@
 		    a.cooperation_mode as cooperationMode, a.transfer_mode as transferMode, a.bargaining_mode as bargainingMode, 
 		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough, 
 		    a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
-		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
+		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
 		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId,  a.international_flag as internationalFlag,
-		    a.create_time as createTime, a.release_status as releaseStatus,
+		    a.create_time as createTime, a.release_status as releaseStatus,
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
 		    oi.unit_name as iOwnerName, oi.postal_address as iOwnerPostalAddress, u.email as iOwnerEmail,
 		    oi.org_code as iOwnerIdNumber, u.mobile as iOwnerMobile,a.boutique,a.remark,a.contacts,a.contact_mobile as contactMobile
@@ -1694,7 +1694,7 @@
   		a.transfer_price as transferPrice,
   		a.technical_picture_url as technicalpictureurl
   		from achievement a 
-  		LEFT JOIN aft.achievement_interest b on a.id = b.achievement_id
+  		LEFT JOIN achievement_interest b on a.id = b.achievement_id
   		where 
   	    a.deleted_sign = 0 
 		and category = 0

+ 2 - 2
src/main/java/com/goafanti/common/mapper/DailySalesReportMapper.xml

@@ -48,8 +48,8 @@
   <select id="selectDailySalesReports" resultMap="BaseResultMap">
     SELECT o.salesman_id as admin_id, a.department_id as dep_id,
 	count(o.order_no) as order_count, sum(o.sign_total_amount) as order_amount
-	FROM aft.t_order o
-	left join aft.admin a on o.salesman_id=a.id
+	FROM t_order o
+	left join admin a on o.salesman_id=a.id
 	where o.order_status=3 and o.sign_time &gt;= #{startTime,jdbcType=TIMESTAMP} and o.sign_time &lt; #{endTime,jdbcType=TIMESTAMP}
 	group by o.salesman_id, a.department_id;
   </select>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/DistrictGlossoryMapper.xml

@@ -88,7 +88,7 @@
   </select>
   
   <select id="selectNameById" parameterType="java.lang.Integer" resultType="String">
-    select name from aft.district_glossory where id=#{id,jdbcType=INTEGER}
+    select name from district_glossory where id=#{id,jdbcType=INTEGER}
   </select>
   
   <select id="getProvince" resultType="com.goafanti.common.bo.ProvinceBo">

+ 2 - 2
src/main/java/com/goafanti/common/mapper/IndustryCategoryMapper.xml

@@ -88,13 +88,13 @@
   </select>
   <select id="selectindustryList" resultType="com.goafanti.common.bo.fieldGlossoryBo">
   	SELECT id, name, pid, `level`
-	FROM aft.field_glossory
+	FROM field_glossory
 	WHERE level=1
   </select>
   
   <select id="selectDomainList" resultType="com.goafanti.common.bo.fieldGlossoryBo">
   	SELECT id,name,pid
-	FROM aft.industry_category
+	FROM industry_category
 	WHERE pid=0
   </select>
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -530,7 +530,7 @@
   )
   </select>
   <insert id="insertChannelList">
-      INSERT INTO aft.user_lock_release
+      INSERT INTO user_lock_release
 (id, `type`, uid, aid, status, lock_time)
 VALUES
   <foreach item="item" collection="list" separator="," index="">