|
|
@@ -1,46 +1,47 @@
|
|
|
package com.goafanti.order.service.impl;
|
|
|
|
|
|
-import java.io.IOException;
|
|
|
-import java.io.OutputStream;
|
|
|
-import java.math.BigDecimal;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
-import java.util.*;
|
|
|
-
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
-
|
|
|
-import com.goafanti.admin.service.DepartmentService;
|
|
|
-import com.goafanti.common.dao.*;
|
|
|
-import com.goafanti.common.model.*;
|
|
|
-import com.goafanti.common.utils.OrderUtils;
|
|
|
-import com.goafanti.order.bo.*;
|
|
|
-import com.goafanti.order.enums.*;
|
|
|
-import com.goafanti.order.service.*;
|
|
|
-import com.goafanti.organization.bo.OrganizationListOut;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
-import org.slf4j.Logger;
|
|
|
-import org.slf4j.LoggerFactory;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-
|
|
|
import com.goafanti.admin.bo.AdminListBo;
|
|
|
+import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.bo.OrderExamineBo;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
+import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
+import com.goafanti.common.model.*;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.ExportExcelUtil;
|
|
|
+import com.goafanti.common.utils.OrderUtils;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.JDBCIdGenerator;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
-import com.goafanti.techproject.enums.TaskState;
|
|
|
+import com.goafanti.order.bo.*;
|
|
|
+import com.goafanti.order.enums.OrderChangeProcess;
|
|
|
+import com.goafanti.order.enums.OrderChangeType;
|
|
|
+import com.goafanti.order.enums.OrderNewState;
|
|
|
+import com.goafanti.order.enums.OrderType;
|
|
|
+import com.goafanti.order.service.NewOrderDunService;
|
|
|
+import com.goafanti.order.service.OrderChangeService;
|
|
|
+import com.goafanti.order.service.OrderNewService;
|
|
|
+import com.goafanti.order.service.OrderProjectService;
|
|
|
+import com.goafanti.organization.bo.OrganizationListOut;
|
|
|
+import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
+import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
+import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
|
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.io.IOException;
|
|
|
+import java.io.OutputStream;
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.*;
|
|
|
+
|
|
|
@Service
|
|
|
public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper> implements OrderChangeService {
|
|
|
@Autowired
|
|
|
@@ -1077,10 +1078,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (cd.getSplitStatus()==1){
|
|
|
map.put(cd.getId(),ot.getId());
|
|
|
}
|
|
|
- if (cd.getServiceLife()!=null){
|
|
|
- addTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum(),cd.getContractTerm());
|
|
|
- }
|
|
|
-
|
|
|
+ orderNewService.addTTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum(),cd.getContractTerm());
|
|
|
cd.setTid(ot.getId());
|
|
|
tChangeTaskMapper.updateByPrimaryKeySelective(cd);
|
|
|
tChangeDunMapper.updateByCTid(cd.getId(), ot.getId());
|
|
|
@@ -1133,15 +1131,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tTaskMemberMapper.updateByTid(ttm);
|
|
|
}
|
|
|
|
|
|
- private void addTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum,String contractTerm) {
|
|
|
- TTaskMember ttm=new TTaskMember();
|
|
|
- ttm.setTid(id);
|
|
|
- ttm.setServiceLife(serviceLife);
|
|
|
- ttm.setServiceYear(serviceYear);
|
|
|
- ttm.setYearSum(yearSum);
|
|
|
- ttm.setContractTerm(contractTerm);
|
|
|
- tTaskMemberMapper.insertSelective(ttm);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
@Override
|