Browse Source

代码修改

anderx 6 years ago
parent
commit
db0fec3813

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

@@ -890,7 +890,7 @@
   	o.sign_time as signTime, u.nickname as buyerName,o.total_amount signTotalAmount, o.approval , a.name sellerName
   	,liquidation_status,o.finance_id as financeId,contract_no as contractNo,d.name as departmentName,e.name as outsourceName
   	from t_order_new o left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id
-  	left join department d on o.order_dep=d.id left join (select order_no,name from outsource_organization group by order_no) e
+  	left join department d on o.order_dep=d.id left join ( select order_no, name from outsource_organization group by order_no,name) e
   	on o.order_no=e.order_no where delete_sign = 0 and order_status = 2
   	and approval in (0,2) and outsource=#{o.outsource,jdbcType=INTEGER}
   	<if test="o.processStatus == 2">

+ 14 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -249,7 +249,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			throw new BusinessException(new Error( "该部门缩写不存在","该部门缩写不存在"));
 		}
 		//根据前缀查询最大编号
-		String max=organizationManagementMapper.getMaxAbbreviation(dep.getAbbreviation());
+		String max=organizationManagementMapper.getMaxAbbreviation(dep.getAbbreviation()+"-");
 		//获取日期年份
 		Calendar c=Calendar.getInstance();
 		int y=c.getWeekYear();
@@ -276,6 +276,19 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 	}
 
+	public static void main(String[] args) {
+		String max="GZKD1-20190001"; 
+		int ty=Integer.parseInt(max.substring(max.indexOf("-")+1, max.length()-4));
+		int no=Integer.parseInt(max.substring(max.length()-4, max.length()));
+		System.out.println("ty:"+ty+",no:"+no);
+		no++;
+		String s="GZKD"+"-"+ty+"000"+no;
+		System.out.println(s);
+		
+		int i=Integer.parseInt(s.substring(s.indexOf("-")+5, s.length()));
+		System.out.println(i);
+				
+	}
 
 
 	private String iterationNo(String sno ,Object mp, int ty, int no) {

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.08
-avatar.host=//sb.jishutao.com
+#static.host=//sb.jishutao.com/1.1.08
+#avatar.host=//sb.jishutao.com
 
 #连生产
-#avatar.host=//static.kedexinxi.com
-#static.host=//s.kedexinxi.com/1.1.06
+avatar.host=//static.jishutao.com
+static.host=//static.jishutao.com/1.1.08
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload