Antiloveg лет назад: 8
Родитель
Сommit
dceea8e6a0

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

@@ -408,7 +408,7 @@
 			select uid, net_asset as netAsset2, gross_profit as grossProfit2, sales_revenue as salesRevenue2 from org_finance where uid = #{1} and year = 
 			#{0}-2 and deleted_sign = 0
 			) b on b.uid = u. id
-			LEFT  JOIN
+	  LEFT  JOIN
 			(
 			select uid, net_asset as netAsset3, gross_profit as grossProfit3, sales_revenue as salesRevenue3 from org_finance where uid = #{1} and year = 
 			#{0}-3 and deleted_sign = 0
@@ -418,7 +418,7 @@
   <select id="selectCognizanceCatagoryBoByUidAndYear"  resultType="com.goafanti.cognizance.bo.CognizanceCatagoryBo">
 		 select u.id as uid, a.firstCatagory, b.secondCatagory, c.firmTotal, c.techTotal, d.totalRevenue FROM
 				(select id from user where id = #{1}) u 
-			LEFT JOIN
+	  LEFT JOIN
 				(select uid, count(1) as firstCatagory from org_intellectual_property 
 				where uid = #{1} and evaluation_category= 0 and deleted_sign = 0 GROUP BY uid
 				) a on a.uid = u.id

+ 3 - 3
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -749,12 +749,12 @@
 		patentState,
 		c.annual_fee_state as annualFeeState, p.authorized_date as authorizedDate
 		from patent_info p
-		LEFT JOIN patent_cost c on p.id = c.pid
+		LEFT JOIN patent_cost c on p.id = c.pid and c.annual_fee_state = 0
 		LEFT JOIN organization_identity o on p.uid = o.uid
 		<if test="principal != null">
 			left join patent_log l on p.id=l.pid
 		</if>
-		where p.deleted_sign = 0 
+		where p.deleted_sign = 0 and c.annual_fee_state = 0
 		<if test="principal != null">
 			and l.principal = #{principal,jdbcType=VARCHAR}
 		</if>
@@ -781,7 +781,7 @@
 		<if test="principal != null">
 			left join patent_log l on p.id=l.pid
 		</if>
-		where p.deleted_sign = 0 
+		where p.deleted_sign = 0 and c.annual_fee_state = 0
 		<if test="principal != null">
 			and l.principal = #{principal,jdbcType=VARCHAR}
 		</if>

+ 3 - 1
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.task;
 
+
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -13,6 +14,7 @@ public class PatentTask {
 	@Scheduled(cron = "0 0 10 * * ?")
 	public void run() {
 		LoggerUtils.debug(getClass(), "开始检查专利到期");
-		
 	}
+
+	
 }

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.23
+static.host=//afts.hnzhiming.com/1.0.24
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

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

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.23
+static.host=//afts.hnzhiming.com/1.0.24
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.23
+static.host=//afts.hnzhiming.com/1.0.24

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.23
+static.host=//aftts.hnzhiming.com/1.0.24
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload