|
|
@@ -4,7 +4,6 @@ package com.goafanti.order.service.impl;
|
|
|
import java.io.IOException;
|
|
|
import java.io.OutputStream;
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
-import java.lang.reflect.InvocationTargetException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
@@ -15,13 +14,11 @@ 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;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
-import org.apache.commons.beanutils.ConvertUtils;
|
|
|
-import org.apache.commons.beanutils.converters.DateConverter;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
@@ -31,12 +28,10 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
-import org.springframework.core.task.TaskExecutor;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.scheduling.annotation.EnableAsync;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import com.alibaba.druid.sql.parser.Token;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.goafanti.admin.bo.AdminListBo;
|
|
|
import com.goafanti.common.bo.EmailBo;
|
|
|
@@ -93,7 +88,6 @@ import com.goafanti.order.bo.TOrderLogBo;
|
|
|
import com.goafanti.order.bo.TOrderNewBo;
|
|
|
import com.goafanti.order.bo.TOrderRefundBo;
|
|
|
import com.goafanti.order.bo.TOrderTaskBo;
|
|
|
-import com.goafanti.order.bo.TOrderTaskListBo;
|
|
|
import com.goafanti.order.bo.outOrderDunListBo;
|
|
|
import com.goafanti.order.enums.ActiveState;
|
|
|
import com.goafanti.order.enums.ApprovalNewState;
|
|
|
@@ -107,7 +101,6 @@ import com.goafanti.order.enums.TaskState;
|
|
|
import com.goafanti.order.enums.refundState;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
import com.goafanti.order.service.OrderService;
|
|
|
-import com.goafanti.organization.bo.OrganizationListOut;
|
|
|
|
|
|
@Service
|
|
|
@EnableAsync
|
|
|
@@ -372,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";
|
|
|
@@ -397,7 +389,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
private String iterationNo(String sno ,Object mp, int ty, int no) {
|
|
|
@@ -860,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)) {
|