Explorar el Código

Merge branch 'master' of https://git.coding.net/aft/AFT

wubb hace 8 años
padre
commit
9120e448ef

+ 0 - 1
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -187,7 +187,6 @@ public class PortalController extends BaseController {
 						String uprovince = bo.getUprovince();
 						String ucity = bo.getUcity();
 						ulocation += (StringUtils.isBlank(uprovince) ? "" : uprovince) + (StringUtils.isBlank(ucity) ? "" : ucity);
-						
 						String olocation = "";
 						String oprovince = bo.getOprovince();
 						String ocity = bo.getOcity();

+ 3 - 1
src/main/java/com/goafanti/common/dao/OrgRatepayMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.common.model.OrgRatepay;
 
 public interface OrgRatepayMapper {
@@ -21,5 +23,5 @@ public interface OrgRatepayMapper {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
-	OrgRatepay selectRatepayByUidAndYear(String uid, Integer year);
+	OrgRatepay selectRatepayByUidAndYear(@Param("uid")String uid, @Param("year")Integer year);
 }

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

@@ -1279,8 +1279,8 @@
 	LEFT JOIN organization_identity oi on oi.uid = a.owner_id
 	LEFT JOIN district_glossory dg on dg.id = ui.province
 	LEFT JOIN district_glossory dgg on dgg.id = ui.city
-	LEFT JOIN district_glossory dggg on dg.id = oi.licence_province
-	LEFT JOIN district_glossory dgggg on dgg.id = oi.licence_city
+	LEFT JOIN district_glossory dggg on dggg.id = oi.licence_province
+	LEFT JOIN district_glossory dgggg on dgggg.id = oi.licence_city
 	WHERE
 		a.audit_status = 3
 	AND a.deleted_sign = 0
@@ -1308,8 +1308,8 @@
 	LEFT JOIN user_identity ui ON ui.uid = a.owner_id
 	LEFT JOIN district_glossory dg on dg.id = oi.licence_province
 	LEFT JOIN district_glossory dgg on dgg.id = oi.licence_city 
-	LEFT JOIN district_glossory dggg on dg.id = ui.province
-	LEFT JOIN district_glossory dgggg on dgg.id = ui.city
+	LEFT JOIN district_glossory dggg on dggg.id = ui.province
+	LEFT JOIN district_glossory dgggg on dgggg.id = ui.city
 	WHERE
 		a.audit_status = 3
 	AND a.deleted_sign = 0

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

@@ -239,8 +239,8 @@
     <include refid="Base_Column_List" />
     from org_ratepay
     where 
-    	uid = #{0} 
-    and year = #{1} 
+    	uid = #{uid,jdbcType=VARCHAR} 
+    and year = #{year,jdbcType=INTEGER} 
     and deleted_sign = 0
   </select>
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -387,7 +387,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		} else if (null != o && StringUtils.isNotBlank(oi.getId())) {
 			organizationIdentityMapper.updateByPrimaryKeySelective(oi);
 		}
-
 	}
+	
 
 }

+ 2 - 2
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.35
+static.host=//afts.hnzhiming.com/1.0.36
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload
@@ -67,7 +67,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//afts.hnzhiming.com/portal/1.0.3
+portal.host=//afts.hnzhiming.com/portal/1.0.4
 
 patentTemplate=SMS_72005286
 

+ 2 - 2
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.35
+static.host=//afts.hnzhiming.com/1.0.36
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc
@@ -69,7 +69,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//afts.hnzhiming.com/portal/1.0.3
+portal.host=//afts.hnzhiming.com/portal/1.0.4
 
 patentTemplate=SMS_72005286
 

+ 2 - 2
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.35
+static.host=//aftts.hnzhiming.com/1.0.36
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload
@@ -69,7 +69,7 @@ template.cacheable=true
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//aftts.hnzhiming.com/portal/1.0.3
+portal.host=//aftts.hnzhiming.com/portal/1.0.4
 
 patentTemplate=SMS_72005286