Browse Source

高新新增年份选择BUG修复

anderx 2 years ago
parent
commit
56a764ae93

+ 6 - 8
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -1,17 +1,13 @@
 package com.goafanti.order.service;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.*;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.*;
-import com.goafanti.order.bo.InputMemberList;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 public interface OrderNewService {
 
@@ -221,4 +217,6 @@ public interface OrderNewService {
     int updateOrderUrl(String orderNo, String contractPictureUrl, String agreementUrl, String serviceContent);
 
     OrderProcessName getProcessName(String orderNo);
+
+	 void addTTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum, String contractTerm);
 }

+ 29 - 39
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -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

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

@@ -238,13 +238,18 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		String str=tOrderTaskMapper.selectByidGetCname(t.getCommodityId());
 		t.setCname(str);
 		tOrderTaskMapper.insertSelective(t);
-		if (t.getServiceLife()!=null|| t.getServiceYear()!=null|| t.getYearSum()!=null|| t.getContractTerm()!=null){
+		addTTaskMember(t.getId(),t.getServiceLife(),t.getServiceYear(),t.getYearSum(),t.getContractTerm());
+	}
+
+	@Override
+	public void addTTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum, String contractTerm) {
+		if (serviceLife!=null|| serviceYear!=null||yearSum!=null|| contractTerm!=null){
 			TTaskMember ttm=new TTaskMember();
-			ttm.setTid(t.getId());
-			if(t.getServiceLife()!=null)ttm.setServiceLife(t.getServiceLife());
-			if(t.getServiceYear()!=null)ttm.setServiceYear(t.getServiceYear());
-			if(t.getYearSum()!=null)ttm.setYearSum(t.getYearSum());
-			if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
+			ttm.setTid(id);
+			if(serviceLife!=null)ttm.setServiceLife(serviceLife);
+			if(serviceYear!=null)ttm.setServiceYear(serviceYear);
+			if(yearSum!=null)ttm.setYearSum(yearSum);
+			if(contractTerm!=null)ttm.setContractTerm(contractTerm);
 			tTaskMemberMapper.insertSelective(ttm);
 		}
 	}