Browse Source

订单年份问题修改

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
8cfed39da2

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

@@ -14,6 +14,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.UUID;
 
 import javax.mail.MessagingException;
@@ -364,8 +365,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			String max=organizationManagementMapper.getMaxAbbreviation(dep.getAbbreviation()+"-");
 			//获取日期年份
 			Calendar c=Calendar.getInstance();
-			int y=c.getWeekYear();
-			
+			int y=c.get(Calendar.YEAR);
 			String sno=null;
 			if (StringUtils.isBlank(max)||max.length()<13) {
 				String cn=""+dep.getAbbreviation()+"-"+y+"0001";
@@ -389,7 +389,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 	}
 		
-
+	
 	
 
 	private String iterationNo(String sno ,Object mp, int ty, int no) {
@@ -852,7 +852,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 */
 	private void contractNoReplace(String orderNo, String  contractNo,String orderDep) {
 		Calendar c=Calendar.getInstance();
-		int y=c.getWeekYear();
+		int y=c.get(Calendar.YEAR);
 		String ys="-"+y;
 		//判断编号是否类似‘-2019’,是则为有效编号
 		if (contractNo.contains(ys)) {