|
@@ -8,12 +8,10 @@ import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
-import java.util.Iterator;
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
import java.util.UUID;
|
|
import java.util.UUID;
|
|
|
|
|
|
|
|
-import javax.print.attribute.standard.MediaSize.Other;
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
@@ -57,7 +55,6 @@ import com.goafanti.common.model.TOrderTask;
|
|
|
import com.goafanti.common.model.Admin;
|
|
import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.NewOrderChange;
|
|
import com.goafanti.common.model.NewOrderChange;
|
|
|
import com.goafanti.common.model.NewOrderDun;
|
|
import com.goafanti.common.model.NewOrderDun;
|
|
|
-import com.goafanti.common.model.NewOrderRefund;
|
|
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.ExportExcelUtil;
|
|
import com.goafanti.common.utils.ExportExcelUtil;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
import com.goafanti.common.utils.StringUtils;
|
|
@@ -82,11 +79,9 @@ import com.goafanti.order.enums.OrderChangeType;
|
|
|
import com.goafanti.order.enums.OrderNewState;
|
|
import com.goafanti.order.enums.OrderNewState;
|
|
|
import com.goafanti.order.enums.OrderType;
|
|
import com.goafanti.order.enums.OrderType;
|
|
|
import com.goafanti.order.enums.ProcessStatus;
|
|
import com.goafanti.order.enums.ProcessStatus;
|
|
|
-import com.goafanti.order.service.FundManageOrderService;
|
|
|
|
|
import com.goafanti.order.service.NewOrderDunService;
|
|
import com.goafanti.order.service.NewOrderDunService;
|
|
|
import com.goafanti.order.service.OrderChangeService;
|
|
import com.goafanti.order.service.OrderChangeService;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
-import com.goafanti.order.service.OrderProjectService;
|
|
|
|
|
import com.goafanti.order.service.OrderService;
|
|
import com.goafanti.order.service.OrderService;
|
|
|
import com.goafanti.techproject.enums.TaskState;
|
|
import com.goafanti.techproject.enums.TaskState;
|
|
|
|
|
|
|
@@ -125,8 +120,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private OrderNewService orderNewService;
|
|
private OrderNewService orderNewService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private OrderProjectService orderProjectService;
|
|
|
|
|
- @Autowired
|
|
|
|
|
private NewOrderDunService newOrderDunService;
|
|
private NewOrderDunService newOrderDunService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private TChangeTaskMapper TChangeTaskMapper;
|
|
private TChangeTaskMapper TChangeTaskMapper;
|
|
@@ -431,14 +424,16 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
Map<Integer, Integer> map=new HashMap<>();
|
|
Map<Integer, Integer> map=new HashMap<>();
|
|
|
for (TOrderTaskBo tOrderTaskBo : tt1) {
|
|
for (TOrderTaskBo tOrderTaskBo : tt1) {
|
|
|
//处理父子项目关系 将员父项目存储
|
|
//处理父子项目关系 将员父项目存储
|
|
|
|
|
+ int x=tOrderTaskBo.getId();
|
|
|
tOrderTaskBo.setId(null);
|
|
tOrderTaskBo.setId(null);
|
|
|
tOrderTaskBo.setOrderNo(newOrderNo);
|
|
tOrderTaskBo.setOrderNo(newOrderNo);
|
|
|
if(tOrderTaskBo.getSplitStatus()==2) {
|
|
if(tOrderTaskBo.getSplitStatus()==2) {
|
|
|
tOrderTaskBo.setSplitSuper(map.get(tOrderTaskBo.getSplitSuper()));
|
|
tOrderTaskBo.setSplitSuper(map.get(tOrderTaskBo.getSplitSuper()));
|
|
|
}
|
|
}
|
|
|
- int y=tOrderTaskMapper.insertSelective(tOrderTaskBo);
|
|
|
|
|
|
|
+ tOrderTaskMapper.insertSelective(tOrderTaskBo);
|
|
|
|
|
+ int y=tOrderTaskBo.getId();
|
|
|
if(tOrderTaskBo.getSplitStatus()==1) {
|
|
if(tOrderTaskBo.getSplitStatus()==1) {
|
|
|
- map.put(tOrderTaskBo.getId(), y);
|
|
|
|
|
|
|
+ map.put(x, y);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
for (OutNewOrderDunBo outNewOrderDunBo : td2) {
|
|
for (OutNewOrderDunBo outNewOrderDunBo : td2) {
|