Browse Source

公出审核日志双协单显示BUG修复,
公出列表双协单显示BUG修复

anderx 2 days ago
parent
commit
72e6bb46a4

+ 2 - 2
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1117,7 +1117,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 								}
 							}
 							if (str.length()>1)e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
-						}else if ((e.getType()==0||e.getType()>4)&&e.getAssistProcess()==2){
+						}else if ((e.getType()==0||e.getType()>4)&&(e.getAssistProcess()==2||e.getAssistProcess()==3)){
 							//获取技术协单
 							List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(e.getId(), null, null);
 							StringBuffer str =new StringBuffer();
@@ -2289,7 +2289,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 							outPublicReleaseLog.setAname(str.substring(0,str.length()-1));
 							list.add(outPublicReleaseLog);
 						}
-					}else if ((e.getType()==0||e.getType()==5)&&e.getAssistProcess()==2){
+					}else if ((e.getType()==0||e.getType()==5)&&(e.getAssistProcess()==2||e.getAssistProcess()==3)){
 						//获取技术协单
 						List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(e.getId(), null, null);
 						StringBuffer str =new StringBuffer();

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

@@ -8,12 +8,12 @@ static.host=//static.jishutao.com/${kede.version}
 #avatar.host=//172.16.1.199:3000
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20250613?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+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
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20