Browse Source

update

Signed-off-by: Administrator <Administrator@PC-20170312YABW>
Administrator 5 years ago
parent
commit
b847cdf6e6

+ 7 - 2
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -221,9 +221,13 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			if(!list.isEmpty()) op=tOrderOutsourceMapper.selectByTid(tid);
 			//外包type
 				for (OutThirdPartyCompany oc : list) {
+					// start_type	0外包 1供应商	
 					if (oc.getStartType()==1) {
 						if(op.getProjectType()==null)op.setProjectType(0);
-						if((op.getProjectType()==1&&oc.getType()==1)||(op.getProjectType()==2)||oc.getPatentType()==0) {
+						//patent_type 专利类型 0申请/变更/转让 1买卖
+						//project_tyoe 0 正常 1专利 2软著 3审计
+						if((op.getProjectType()==1&&oc.getPatentType()==0)
+								|| op.getProjectType()==2 ) {
 							oc.setUnitPrice("***");
 							oc.setTotalAmount("***");
 						}
@@ -323,7 +327,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			!TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
 		outProjectBo ob=tOrderOutsourceMapper.selectByTid(tp.getTid());
 		if (ob!=null &&ob.getStartType()!=null&& ob.getStartType()==1) {
-			if((ob.getProjectType()==1&&ob.getPatentType()==0)||(ob.getProjectType()==2)) {
+			if((ob.getProjectType()==1&&ob.getPatentType()==0)
+					||(ob.getProjectType()==2)) {
 				op.setInitialUnitPrice("***");
 				op.setInitialTotalAmount("***");
 			}

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

@@ -5,7 +5,7 @@ jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.username=dev
 #jdbc.password=123456
 #测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20201022?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+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
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
@@ -64,7 +64,7 @@ user_remind_days=15
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com:3000/1.1.52
+#static.host=//sb.jishutao.com:3000/1.1.54
 #avatar.host=//sb.jishutao.com
 
 #连测试