|
|
@@ -12,7 +12,9 @@ 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.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;
|
|
|
@@ -49,10 +51,6 @@ import com.goafanti.order.bo.TChangeTaskOut;
|
|
|
import com.goafanti.order.bo.TOrderLogBo;
|
|
|
import com.goafanti.order.bo.TOrderNewBo;
|
|
|
import com.goafanti.order.bo.TOrderTaskBo;
|
|
|
-import com.goafanti.order.enums.OrderChangeType;
|
|
|
-import com.goafanti.order.enums.OrderNewState;
|
|
|
-import com.goafanti.order.enums.OrderType;
|
|
|
-import com.goafanti.order.enums.ProcessStatus;
|
|
|
import com.goafanti.techproject.enums.TaskState;
|
|
|
|
|
|
@Service
|
|
|
@@ -107,6 +105,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
private DepartmentService departmentService;
|
|
|
@Autowired
|
|
|
private OrderProjectService orderProjectService;
|
|
|
+ @Autowired
|
|
|
+ private DepartmentMapper departmentMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -223,11 +223,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
public List<NewOrderChangeBo> orderChangeDetails(String orderNo) {
|
|
|
List<NewOrderChangeBo> list=newOrderChangeMapper.selectByorderNo(orderNo);
|
|
|
for (NewOrderChangeBo noc : list) {
|
|
|
- List<OrderExamineBo> consultantExamine =orderExamineMapper.selectByOrderNo(noc.getOrderNo(),0);
|
|
|
- List<OrderExamineBo> managerExamine=orderExamineMapper.selectByOrderNo(noc.getOrderNo(),1);
|
|
|
+// List<OrderExamineBo> consultantExamine =orderExamineMapper.selectByOrderNo(noc.getOrderNo(),0);
|
|
|
+// List<OrderExamineBo> managerExamine=orderExamineMapper.selectByOrderNo(noc.getOrderNo(),1);
|
|
|
int isExamine=orderExamineMapper.selectByOrderNoAndAid(noc.getOrderNo(),TokenManager.getAdminId());
|
|
|
- noc.setConsultantExamine(consultantExamine);
|
|
|
- noc.setManagerExamine(managerExamine);
|
|
|
+// noc.setConsultantExamine(consultantExamine);
|
|
|
+// noc.setManagerExamine(managerExamine);
|
|
|
if (noc.getVoucherUrl()!=null) {
|
|
|
TOrderNew t=tOrderNewMapper.selectByPrimaryKey(noc.getOrderNo());
|
|
|
noc.setVoucherUrl(pushOrderService.changeProcessStatusConstant(noc.getVoucherUrl(),t.getSalesmanId(),noc.getProcessState(),noc.getStatus()));
|
|
|
@@ -239,11 +239,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Override
|
|
|
public NewOrderChangeBo orderChangeDetailsById(Integer id) {
|
|
|
NewOrderChangeBo nb=newOrderChangeMapper.selectById(id);
|
|
|
- List<OrderExamineBo> consultantExamine =orderExamineMapper.selectByOrderNo(nb.getOrderNo(),0);
|
|
|
- List<OrderExamineBo> managerExamine=orderExamineMapper.selectByOrderNo(nb.getOrderNo(),1);
|
|
|
+// List<OrderExamineBo> consultantExamine =orderExamineMapper.selectByOrderNo(nb.getOrderNo(),0);
|
|
|
+// List<OrderExamineBo> managerExamine=orderExamineMapper.selectByOrderNo(nb.getOrderNo(),1);
|
|
|
int isExamine=orderExamineMapper.selectByOrderNoAndAid(nb.getOrderNo(),TokenManager.getAdminId());
|
|
|
- nb.setConsultantExamine(consultantExamine);
|
|
|
- nb.setManagerExamine(managerExamine);
|
|
|
+// nb.setConsultantExamine(consultantExamine);
|
|
|
+// nb.setManagerExamine(managerExamine);
|
|
|
nb.setIsExamine(isExamine);
|
|
|
if(nb.getProcessState()!=null){
|
|
|
TOrderNew t=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
|
|
|
@@ -362,6 +362,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
ocl.setStatus(status);
|
|
|
orderChangeLogMapper.insertSelective(ocl);
|
|
|
sendNotice(status,nb);
|
|
|
+ pushOrderCangeProcess(nb);
|
|
|
newOrderChangeMapper.updateByPrimaryKeySelective(nb);
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -562,6 +563,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
public int updateOrderChange(NewOrderChangeBo t,Integer changeType,String startRemarks) {
|
|
|
NewOrderChange noc=new NewOrderChange();
|
|
|
t.setProcessState(1);
|
|
|
+ noc.setOrderNo(t.getOrderNo());
|
|
|
noc.setId(t.getId());
|
|
|
if (changeType==0) {
|
|
|
// chekeChangeTaskNumber(noc);
|
|
|
@@ -593,10 +595,89 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
noc.setCwCost(t.getCwCost());
|
|
|
noc.setRefundableAmount(t.getRefundableAmount());
|
|
|
}
|
|
|
+ if(changeType!=2)pushOrderCangeProcess(noc);
|
|
|
if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ public void pushOrderCangeProcess(NewOrderChange noc) {
|
|
|
+ if (noc.getProcessState()== OrderChangeProcess.YXY.getCode()){
|
|
|
+ TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
|
+ noc.setExamineName(ton.getSalesmanName());
|
|
|
+ }else if (noc.getProcessState()== OrderChangeProcess.YXGLY.getCode()){
|
|
|
+ TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
|
+ OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
|
|
|
+ noc.setExamineName(dep.getManagerName());
|
|
|
+ }else if (noc.getProcessState()== OrderChangeProcess.JSY.getCode()){
|
|
|
+ List<OrderExamineBo> os = orderExamineMapper.selectByOrderNo(noc.getOrderNo(), 0);
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
+ for (OrderExamineBo o : os) {
|
|
|
+ if (o.getStatus()==0){
|
|
|
+ if (!str.toString().contains(o.getName()))str.append(o.getName()).append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
+
|
|
|
+
|
|
|
+ }else if (noc.getProcessState()== OrderChangeProcess.JSJL.getCode()){
|
|
|
+ List<OrderExamineBo> os = orderExamineMapper.selectByOrderNo(noc.getOrderNo(), 1);
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
+ for (OrderExamineBo o : os) {
|
|
|
+ if (o.getStatus()==0){
|
|
|
+ if (!str.toString().contains(o.getName()))str.append(o.getName()).append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
+ }else if (noc.getProcessState()== OrderChangeProcess.JSZJ.getCode()){
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
+ List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN);
|
|
|
+ for (Admin a : admins) {
|
|
|
+ str=str.append(a.getName()).append(",");
|
|
|
+ }
|
|
|
+ if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
+
|
|
|
+ }else if (noc.getProcessState()== OrderChangeProcess.CWZY.getCode()){
|
|
|
+ TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
|
+ OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
|
|
|
+ noc.setExamineName(dep.getFinanceName());
|
|
|
+ }else if (noc.getProcessState()== OrderChangeProcess.CWZJ.getCode()){
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
+ List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.FINANCE_ADMIN);
|
|
|
+ for (Admin a : admins) {
|
|
|
+ str=str.append(a.getName()).append(",");
|
|
|
+ }
|
|
|
+ if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
+
|
|
|
+ }else if (noc.getProcessState()== OrderChangeProcess.ZC.getCode()){
|
|
|
+ if (noc.getStatus()==2){
|
|
|
+ TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
|
+ OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
|
|
|
+ noc.setExamineName(dep.getFinanceName());
|
|
|
+ }else {
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
+ List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.CED);
|
|
|
+ for (Admin a : admins) {
|
|
|
+ str=str.append(a.getName()).append(",");
|
|
|
+ }
|
|
|
+ if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
+ }
|
|
|
+ }else if (noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
|
|
|
+ if (noc.getStatus()==2){
|
|
|
+ TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
|
+ OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
|
|
|
+ noc.setExamineName(dep.getFinanceName());
|
|
|
+ }else {
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
+ List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.APPROVAL_DECISION);
|
|
|
+ for (Admin a : admins) {
|
|
|
+ str=str.append(a.getName()).append(",");
|
|
|
+ }
|
|
|
+ if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void chekeAmout(NewOrderChangeBo t) {
|
|
|
BigDecimal amout=t.getTotalAmount();
|
|
|
List<TChangeTaskOut> list = selectChangeTask(t.getId());
|
|
|
@@ -707,7 +788,15 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
TOrderNewBo o=tOrderNewMapper.getSaleIdByOno(nob.getOrderNo());
|
|
|
List<String> alist = new ArrayList<>();
|
|
|
alist.add(o.getSalesmanId());
|
|
|
+ nb.setExamineName("");
|
|
|
newOrderChangeMapper.updateByPrimaryKeySelective(nb);
|
|
|
+ OrderChangeLog ocl=new OrderChangeLog();
|
|
|
+ ocl.setAuditor(TokenManager.getAdminId());
|
|
|
+ ocl.setOrderNo(nob.getOrderNo());
|
|
|
+ ocl.setRemarks("变更财务退票。");
|
|
|
+ ocl.setChangeId(nb.getId());
|
|
|
+ ocl.setStatus(2);
|
|
|
+ orderChangeLogMapper.insertSelective(ocl);
|
|
|
orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_YES.getCode(), o, TokenManager.getAdminId(),0);
|
|
|
return 1;
|
|
|
}
|