Browse Source

订单评分修改

anderx 1 year ago
parent
commit
5e51766d23

+ 1 - 1
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -382,7 +382,7 @@ public class OrderDunTask {
 	private void updateOrderDun(OutNewOrderDunBo t,Calendar now,Calendar now2) {
 		if (now.getTimeInMillis() >= now2.getTimeInMillis()) {
 			InputNewOrderDunBo o=new InputNewOrderDunBo();
-			TOrderNew orderNew=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+			TOrderNew orderNew=tOrderNewMapper.queryById(t.getOrderNo());
 			Date date = new Date();
 			o.setId(t.getId());
 			o.setStatus(1);

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -114,7 +114,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	}
 
 	private TOrderNew checkDeleteSign(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t=tOrderNewMapper.queryById(orderNo);
 		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
 		return t;
 	}
@@ -423,7 +423,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//修改订单数据结算状态和结算金额
 		TOrderNew orderNew = new TOrderNew();
 		orderNew.setOrderNo(billNew.getOrderNo());
-		TOrderNew o = tOrderNewMapper.selectByPrimaryKey(billNew.getOrderNo());
+		TOrderNew o = tOrderNewMapper.queryById(billNew.getOrderNo());
 		//这里修改退款金额数据之前退的金额加上本次退的金额
 		orderNew.setRefundAmount(billNew.getTransactionAmount().add(o.getRefundAmount()));
 		orderNew.setRefundAmount(o.getSettlementAmount().subtract(billNew.getTransactionAmount().abs()));
@@ -465,7 +465,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 
 	private void updateCount(String orderNo){
 		//获得订单数据
-		TOrderNew new1 = tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew new1 = tOrderNewMapper.queryById(orderNo);
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(new1.getSignTime());
 		int sy = cal.get(Calendar.YEAR);

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -59,7 +59,7 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 	@Override
 	public int deleteMyBill(String billNo) {
 		TOrderBillNew tbn=billNewMapper.selectByPrimaryKey(billNo);
-		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(tbn.getOrderNo());
+		TOrderNew o=tOrderNewMapper.queryById(tbn.getOrderNo());
 		TOrderNew o2=new TOrderNew();
 		o2.setOrderNo(o.getOrderNo());
 		o2.setSettlementAmount(o.getSettlementAmount().subtract(tbn.getTransactionAmount()));

+ 6 - 13
src/main/java/com/goafanti/order/service/impl/OrderBonusServiceImpl.java

@@ -1,18 +1,6 @@
 package com.goafanti.order.service.impl;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import com.goafanti.admin.service.DepartmentService;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.TOrderBonusMapper;
@@ -29,6 +17,11 @@ import com.goafanti.order.bo.OrderListBo;
 import com.goafanti.order.bo.OrderReportBo;
 import com.goafanti.order.bo.TOrderBonusBo;
 import com.goafanti.order.service.OrderBonusService;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
 
 @Service
 public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> implements OrderBonusService {
@@ -54,7 +47,7 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 	@Override
 	public Integer updateBounsPaymnetStatus(String id,String orderNo) {
 		//先确定订单有没有校对信息
-		TOrderNew o = orderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew o = orderNewMapper.queryById(orderNo);
 		if(null == o || StringUtils.isBlank(o.getProofAid())){//不存在或者没有校对
 			return -1;
 		}

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

@@ -237,7 +237,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (!list.isEmpty()){
 			for (NewOrderChangeBo c : list) {
 				if (c.getContacts()==null){
-					TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+					TOrderNew t=tOrderNewMapper.queryById(orderNo);
 					c.setContacts(t.getContacts());
 					c.setContactMobile(t.getContactMobile());
 				}
@@ -445,7 +445,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	private boolean pushApproval(NewOrderChangeBo nb, Department dep,String remarks) {
-		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+		TOrderNew tOrderNew = tOrderNewMapper.queryById(nb.getOrderNo());
 		Date date = new Date();
 		date.setTime(date.getTime()+500);
 		if (tOrderNew.getSalesmanId().equals(AFTConstants.CAOJIN_AID)) {
@@ -630,7 +630,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	 * 变更完成复制出原订单镜像
 	 */
 	private void changeAdopt(NewOrderChangeBo nb) {
-		TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+		TOrderNew t1=tOrderNewMapper.queryById(nb.getOrderNo());
 		List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(),  null);
 		List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTaskAll(nb.getOrderNo(),null);
 		List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());
@@ -993,7 +993,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		date.setTime(date.getTime()+500);
 		addOrderChangeLog("变更完成。", 4, nb.getOrderNo(), nb.getId(),date);
 		pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), order, TokenManager.getAdminId(),0);
-		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+		TOrderNew tOrderNew = tOrderNewMapper.queryById(nb.getOrderNo());
 		orderNewService.pushOrderPublicReleaseCount(tOrderNew);
 		//修改投标标识
 		tOrderMidMapper.updateBidTypeByOrderNo(nb.getOrderNo());
@@ -1054,7 +1054,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	 * @param nb
 	 */
 	private TOrderNew pushChange(NewOrderChangeBo nb) {
-		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+		TOrderNew o=tOrderNewMapper.queryById(nb.getOrderNo());
 		NewOrderChangeBo nob=newOrderChangeMapper.selectById(nb.getId());
 //		变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送
 		if(nob.getType()==OrderChangeType.TDTK.getCode()) {
@@ -1544,7 +1544,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if (noc.getRefundStatus()!=1) {
 					List<OutNewOrderRefund> list=listRefund(id);
 					BigDecimal bd=new BigDecimal(0);
-					TOrderNew order=tOrderNewMapper.selectByPrimaryKey(noc.getOrderNo());
+					TOrderNew order=tOrderNewMapper.queryById(noc.getOrderNo());
 					for (OutNewOrderRefund o : list) {
 						TOrderBillNew tbn =new TOrderBillNew();
 						tbn.setOrderNo(o.getOrderNo());
@@ -1577,7 +1577,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			@Override
 			public boolean checkrefund(InputNewOrderRefund or) {
 				if (or.getOrderNo()!=null) {
-					TOrderNew o=tOrderNewMapper.selectByPrimaryKey(or.getOrderNo());
+					TOrderNew o=tOrderNewMapper.queryById(or.getOrderNo());
 					BigDecimal refund=new BigDecimal(0);
 					List<OutNewOrderRefund> list=listRefund(or.getCid());
 					refund=refund.add(or.getRefundAmount());

+ 4 - 4
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -136,7 +136,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	private void sendNoticeAndEmail(TOrderInvoice o) {
 		List<String> aids = new ArrayList<>();
 		if (o.getStatus()==1) {//发起
-			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
+			TOrderNew t=tOrderNewMapper.queryById(o.getOrderNo());
 			if (o.getType()==0) {//省内
 				if(o.getApproval()==0) {
 					aids.add(departmentMapper.selectByPrimaryKey(t.getOrderDep()).getFinanceId());
@@ -163,7 +163,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	@SuppressWarnings("deprecation")
 	@Override
 	public boolean checkAmount(TOrderInvoice t) {
-		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		TOrderNew tn=tOrderNewMapper.queryById(t.getOrderNo());
 
 			String i=tOrderInvoiceMapper.checkApplyAmount(t.getOrderNo(),t.getId());//新建时直接查所有数据,修改时除掉修改订单
 			//处理精度问题
@@ -270,7 +270,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		//examine 2通过 3拒绝
 		List<String> aids = new ArrayList<>();
 		TOrderInvoice t2=tOrderInvoiceMapper.selectByPrimaryKey(id);
-		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(t2.getOrderNo());
+		TOrderNew o=tOrderNewMapper.queryById(t2.getOrderNo());
 		Integer type=null;
 		if(examine==3){
 			type=NoticeStatus.ORDER_INVPICE_NO.getCode();
@@ -376,7 +376,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		t.setType(o.getType());
 		t.setStatus(o.getStatus());
 		t.setOrderNo(o.getOrderNo());
-		TOrderNew ts=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
+		TOrderNew ts=tOrderNewMapper.queryById(o.getOrderNo());
 		//examine 2通过 3拒绝
 		Integer type =null;
 		if(examine==3) {

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

@@ -231,7 +231,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public InputAddTask addOrderTask(InputAddTask t) {
-		TOrderNew order=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		TOrderNew order=tOrderNewMapper.queryById(t.getOrderNo());
 		checkOrder(order,t);
 		t.setTaskStatus(TaskState.WFP.getCode());
 		t.setProjectStatus(NewProjectStatus.WQD.getCode());
@@ -505,7 +505,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Transactional
 	public int updateServiceOrder(TOrderNewWithBLOBs t, Integer isSubmit) {
 		Date date=new Date();
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		TOrderNew t2=tOrderNewMapper.queryById(t.getOrderNo());
 		//判断手机号码是否存在
 		if (StringUtils.isNotBlank(t.getContacts())&&StringUtils.isNotBlank(t.getContactMobile())&&
 				organizationContactBookMapper.checkContacts(t2.getBuyerId(), t2.getContactMobile(),TokenManager.getAdminId()==null?"1":TokenManager.getAdminId() )>0) {
@@ -1583,7 +1583,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	private void addBackOrder(String orderNo, String reason) {
 		TOrderBack ob=new TOrderBack();
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
 		ob.setCreateTime(new Date());
 		ob.setOrderNo(orderNo);
 		ob.setReason(reason);
@@ -1802,7 +1802,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public boolean chekeOrderStatus(String orderNo) {
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
 		if (tOrder.getOrderStatus().equals(OrderNewState.QDDS.getCode()) || tOrder.getOrderStatus().equals(OrderNewState.QDSHTG.getCode())) {
 			return false;
 		}
@@ -1811,7 +1811,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public boolean chekeProcessStatus(String orderNo) {
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
 		if (tOrder.getProcessStatus().equals(ProcessStatus.YPYXY.getCode())) {
 			return false;
 		}
@@ -1821,7 +1821,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public boolean chekeApprovalOrderStatus(String orderNo) {
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
 		if (tOrder.getApproval().equals(ApprovalNewState.FTP.getCode()) ||
 				tOrder.getOrderStatus().equals(OrderNewState.QDSHJJ.getCode()) ||
 				tOrder.getOrderStatus().equals(OrderNewState.YBH.getCode())) {
@@ -1832,7 +1832,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int deleteOrderNew(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t=tOrderNewMapper.queryById(orderNo);
 		if (t.getOrderStatus().equals(OrderNewState.YBH.getCode()) || t.getOrderStatus().equals(OrderNewState.YTD.getCode()) ||
 				t.getOrderStatus().equals(OrderNewState.DQD.getCode()) || t.getOrderStatus().equals(OrderNewState.QDSHJJ.getCode())) {
 			t.setOrderNo(orderNo);
@@ -1874,7 +1874,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public boolean checkOderSettlementAmount(String orderNo) {
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrder= tOrderNewMapper.queryById(orderNo);
 		if (tOrder.getSettlementAmount()==null||
 				tOrder.getSettlementAmount().doubleValue()==0||
 				tOrder.getOrderStatus().equals(OrderNewState.TDZ.getCode())){
@@ -1969,7 +1969,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateOrderOver(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t=tOrderNewMapper.queryById(orderNo);
 		if (!t.getLiquidationStatus().equals(LiquidationNewState.ALREADY_PAY.getCode()) ||
 				!t.getProcessStatus().equals(ProcessStatus.YQBFPZXSGLY.getCode())) {
 			return -1;
@@ -2098,7 +2098,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	}
 	private TOrderNew checkDeleteSign(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t=tOrderNewMapper.queryById(orderNo);
 		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
 		return t;
 	}
@@ -2515,7 +2515,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		for (TOrderNew e : tOrderNews) {
 			pushOrderDunContent(e);
 		}
-//		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey("412255829035991040");
+//		TOrderNew tOrderNew = tOrderNewMapper.queryById("412255829035991040");
 //		pushOrderDunContent(tOrderNew);
 	}
 

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -387,7 +387,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 	public TOrderNew checkDeleteSign(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew t=tOrderNewMapper.queryById(orderNo);
 		if(t.getDeleteSign()==2||t.getDeleteSign()==3) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
 		return t;
 	}
@@ -825,7 +825,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				}
 					if(flag) {
 					//如果启动催款,则新增欠款与应收款
-						TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(task2.getOrderNo());
+						TOrderNew tn=tOrderNewMapper.queryById(task2.getOrderNo());
 						ob.setStatus(1);
 						ob.setStartTime(new Date());
 						newOrderDunMapper.updateByPrimaryKeySelective(ob);
@@ -951,7 +951,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (task.getProjectStatus()==NewProjectStatus.YTJ.getCode()||task.getProjectStatus()==NewProjectStatus.YLX.getCode()||
 				task.getProjectStatus()==NewProjectStatus.YNGS.getCode()) {
 			TOrderBonus tb=new TOrderBonus();
-			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(task.getOrderNo());
+			TOrderNew t=tOrderNewMapper.queryById(task.getOrderNo());
 			tb.setId(UUID.randomUUID().toString());
 			tb.setOrderNo(task.getOrderNo());
 			if (task.getProjectStatus()==NewProjectStatus.YTJ.getCode()) {

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -1110,7 +1110,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	@Override
 	@Transactional
 	public  int pushOrderImg(String orderNo, String imageUrl,String sign) {
-		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrderNew = tOrderNewMapper.queryById(orderNo);
 		TOrderNew newOrder=new TOrderNew();
 		newOrder.setOrderNo(orderNo);
 		StringBuffer str=new StringBuffer();
@@ -1145,7 +1145,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 	@Override
 	public int deleteOrderImg(String fileName,String orderNo, String sign) {
-		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(orderNo);
+		TOrderNew tOrderNew = tOrderNewMapper.queryById(orderNo);
 		TOrderNew newOrder=new TOrderNew();
 		newOrder.setOrderNo(orderNo);
 		StringBuffer str=new StringBuffer();

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -112,7 +112,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 		o.setAuditTime(new Date());
 		List<String> aids = new ArrayList<>();
 		Integer type=null;
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
+		TOrderNew t2=tOrderNewMapper.queryById(o.getOrderNo());
 		//外包订单已删除
 		if (o.getType()==null||o.getType()==0) {
 			o.setType(0);

+ 9 - 9
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -365,7 +365,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
 			for (String s : strings) {
 				addOrderLog(s,OrderLogProcess.YYBZSHTG.getCode(),"运营保障审核人未设置,系统自动通过");
-				TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+				TOrderNew tOrderNew = torderNewMapper.queryById(s);
 				TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
 				StringBuilder str = new StringBuilder();
 				TOrderNew newOrder = new TOrderNew();
@@ -392,7 +392,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 					}
 				}
 				newOrder.setExamineName(str.substring(0,str.length()-1));
-				tOrderNewMapper.update(newOrder);
+				torderNewMapper.update(newOrder);
 			}
 		} else if (Objects.equals(useDep.getOperationGuaranteeId(),in.getOperationGuaranteeId())) {
 			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
@@ -401,14 +401,14 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 				TOrderNew newOrder = new TOrderNew();
 				newOrder.setOrderNo(s);
 				newOrder.setExamineName(admin.getName());
-				tOrderNewMapper.update(newOrder);
+				torderNewMapper.update(newOrder);
 			}
 		}
 		//关掉特批审核
 		if (in.getApproval()==0&&useDep.getApproval()==1){
 			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YPTPSH.getCode());
 			for (String s : strings) {
-				TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+				TOrderNew tOrderNew = torderNewMapper.queryById(s);
 				if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.TPDSH.getCode())){
 					TOrderNew newOrder=new TOrderNew();
 					List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
@@ -420,20 +420,20 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 					newOrder.setOrderNo(s);
 					newOrder.setApproval(ApprovalNewState.TPTG.getCode());
 					newOrder.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
-					tOrderNewMapper.update(newOrder);
+					torderNewMapper.update(newOrder);
 					addOrderLog(s,OrderLogProcess.TP.getCode(),"特批审核关闭,系统自动通过");
 				}
 			}
 		} else if (in.getApprovalAid().equals(useDep.getApprovalAid())) {
 			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YPTPSH.getCode());
 			for (String s : strings) {
-				TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+				TOrderNew tOrderNew = torderNewMapper.queryById(s);
 				if (Objects.equals(tOrderNew.getApproval(), ApprovalNewState.TPDSH.getCode())){
 					TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
 					TOrderNew newOrder=new TOrderNew();
 					newOrder.setOrderNo(s);
 					newOrder.setExamineName(order.getApprovalName());
-					tOrderNewMapper.update(newOrder);
+					torderNewMapper.update(newOrder);
 				}
 			}
 
@@ -500,7 +500,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			//推送订单流程
 			addOrderLog(s,OrderLogProcess.XMZJSH.getCode(),type==0?"部门修改技术总监为空,系统自动通过":"部门修改财务复审为空,系统自动通过");
 			StringBuilder str = new StringBuilder();
-			TOrderNew tOrderNew = torderNewMapper.selectByPrimaryKey(s);
+			TOrderNew tOrderNew = torderNewMapper.queryById(s);
 			TOrderNewBo order = torderNewMapper.getSaleIdByOno(s);
 			TOrderNew newOrder = new TOrderNew();
 			newOrder.setOrderNo(s);
@@ -539,7 +539,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 				pushJSZJidAndName(aids, str);
 			}
 			newOrder.setExamineName(str.substring(0,str.length()-1));
-			tOrderNewMapper.update(newOrder);
+			torderNewMapper.update(newOrder);
 		}
 
 	}

+ 4 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -128,7 +128,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		publicReleaseMapper.insertSelective(in);
 		if (in.getType()==1&&in.getOrderNo()!=null){
-			TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
+			TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
 			orderNewService.pushOrderPublicReleaseCount(tOrderNew);
 		}
 		addPRD(in, users, str, prdList);
@@ -321,7 +321,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 			publicReleaseMapper.update(in);
 		}else {
-			TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
+			TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
 			String salesmanId = tOrderNew.getSalesmanId();
 			Admin a = adminMapper.selectByPrimaryKey(salesmanId);
 			addPublicExamine(in.getId(),a);
@@ -516,7 +516,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		publicReleaseLogMapper.insertSelective(log);
 		publicReleaseMapper.update(in);
 		if (in.getOrderNo()!=null){
-			TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
+			TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
 			orderNewService.pushOrderPublicReleaseCount(tOrderNew);
 		}
 		return 1;
@@ -2600,7 +2600,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 		}
 		data.setDurationMax(useOyd.getMaxDuration());
-		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
+		TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
 		List<TTaskMember> tTaskMembers = tTaskMemberMapper.selectByOrderNo(tOrderNew.getOrderNo());
 		String amountName=null;
 		String amountType=null;