|
@@ -97,8 +97,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private TTaskMidMapper tTaskMidMapper;
|
|
private TTaskMidMapper tTaskMidMapper;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private UserLockReleaseMapper userLockReleaseMapper;
|
|
|
|
|
- @Autowired
|
|
|
|
|
private PushOrderService pushOrderService;
|
|
private PushOrderService pushOrderService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private TOrderMidMapper tOrderMidMapper;
|
|
private TOrderMidMapper tOrderMidMapper;
|
|
@@ -109,7 +107,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private OrderProjectService orderProjectService;
|
|
private OrderProjectService orderProjectService;
|
|
|
|
|
|
|
|
- Logger logger = LoggerFactory.getLogger(OrderChangeServiceImpl.class);
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
|
|
public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
|
|
@@ -128,67 +125,66 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
t.setZxsRemarks(startRemarks);
|
|
t.setZxsRemarks(startRemarks);
|
|
|
newOrderChangeMapper.insertSelective(t);
|
|
newOrderChangeMapper.insertSelective(t);
|
|
|
NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNoAndStatus(t.getOrderNo());
|
|
NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNoAndStatus(t.getOrderNo());
|
|
|
-
|
|
|
|
|
- List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null);
|
|
|
|
|
- List<TChangeDun> listcd=new ArrayList<>();
|
|
|
|
|
- if (listDun!=null&&!listDun.isEmpty()) {
|
|
|
|
|
- for (OutNewOrderDunBo d : listDun) {
|
|
|
|
|
- TChangeDun cd=new TChangeDun();
|
|
|
|
|
- cd.setOrderNo(d.getOrderNo());
|
|
|
|
|
- cd.setAid(d.getAid());
|
|
|
|
|
- cd.setAppropriationRatio(d.getAppropriationRatio());
|
|
|
|
|
- cd.setCid(ncb.getId());
|
|
|
|
|
- cd.setDid(d.getId());
|
|
|
|
|
- cd.setTid(d.getTid());
|
|
|
|
|
- cd.setProjectType(d.getProjectType());
|
|
|
|
|
- cd.setDunType(d.getDunType());
|
|
|
|
|
- cd.setMoney(d.getMoney());
|
|
|
|
|
- cd.setWaitDay(d.getWaitDay());
|
|
|
|
|
- cd.setStartTime(d.getStartTime());
|
|
|
|
|
- cd.setEffectiveCount(d.getEffectiveCount());
|
|
|
|
|
- cd.setCustomizeTime(d.getCustomizeTime());
|
|
|
|
|
- cd.setCustomizeName(d.getCustomizeName());
|
|
|
|
|
- listcd.add(cd);
|
|
|
|
|
- }
|
|
|
|
|
- tChangeDunMapper.insertSelectiveList(listcd);
|
|
|
|
|
- }
|
|
|
|
|
- List<TChangeTask> listck=new ArrayList<>();
|
|
|
|
|
- List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo(),null);
|
|
|
|
|
- if (listTask!=null&&!listTask.isEmpty()) {
|
|
|
|
|
- for (TOrderTaskBo tt : listTask) {
|
|
|
|
|
- TChangeTask ck=new TChangeTask();
|
|
|
|
|
- ck.setOrderNo(tt.getOrderNo());
|
|
|
|
|
- ck.setCid(ncb.getId());
|
|
|
|
|
- ck.setCommodityId(tt.getCommodityId());
|
|
|
|
|
- ck.setOrderNo(tt.getOrderNo());
|
|
|
|
|
- ck.setCommodityName(tt.getCommodityName());
|
|
|
|
|
- ck.setCommodityPrice(tt.getCommodityPrice());
|
|
|
|
|
- ck.setCommodityQuantity(tt.getCommodityQuantity());
|
|
|
|
|
- ck.setTaskComment(tt.getTaskComment());
|
|
|
|
|
- ck.setSplitStatus(tt.getSplitStatus());
|
|
|
|
|
- ck.setSplitSuper(tt.getSplitSuper());
|
|
|
|
|
- ck.setReceiverName(tt.getReceiverName());
|
|
|
|
|
- ck.setMain(tt.getMain());
|
|
|
|
|
- ck.setTid(tt.getId());
|
|
|
|
|
- if(tt.getServiceLife()!=null) ck.setServiceLife(tt.getServiceLife());
|
|
|
|
|
- if(tt.getServiceYear()!=null) ck.setServiceYear(tt.getServiceYear());
|
|
|
|
|
- if(tt.getYearSum()!=null) ck.setYearSum(tt.getYearSum());
|
|
|
|
|
- if(tt.getContractTerm()!=null) ck.setContractTerm(tt.getContractTerm());
|
|
|
|
|
- listck.add(ck);
|
|
|
|
|
- }
|
|
|
|
|
- tChangeTaskMapper.insertSelectiveList(listck);
|
|
|
|
|
|
|
+ List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null);
|
|
|
|
|
+ List<TChangeDun> listcd=new ArrayList<>();
|
|
|
|
|
+ if (listDun!=null&&!listDun.isEmpty()) {
|
|
|
|
|
+ for (OutNewOrderDunBo d : listDun) {
|
|
|
|
|
+ TChangeDun cd=new TChangeDun();
|
|
|
|
|
+ cd.setOrderNo(d.getOrderNo());
|
|
|
|
|
+ cd.setAid(d.getAid());
|
|
|
|
|
+ cd.setAppropriationRatio(d.getAppropriationRatio());
|
|
|
|
|
+ cd.setCid(ncb.getId());
|
|
|
|
|
+ cd.setDid(d.getId());
|
|
|
|
|
+ cd.setTid(d.getTid());
|
|
|
|
|
+ cd.setProjectType(d.getProjectType());
|
|
|
|
|
+ cd.setDunType(d.getDunType());
|
|
|
|
|
+ cd.setMoney(d.getMoney());
|
|
|
|
|
+ cd.setWaitDay(d.getWaitDay());
|
|
|
|
|
+ cd.setStartTime(d.getStartTime());
|
|
|
|
|
+ cd.setEffectiveCount(d.getEffectiveCount());
|
|
|
|
|
+ cd.setCustomizeTime(d.getCustomizeTime());
|
|
|
|
|
+ cd.setCustomizeName(d.getCustomizeName());
|
|
|
|
|
+ listcd.add(cd);
|
|
|
}
|
|
}
|
|
|
- if (t.getType()==OrderChangeType.TDTK.getCode()) {
|
|
|
|
|
- OrderChangeLog ocl=new OrderChangeLog();
|
|
|
|
|
- ocl.setAuditor(TokenManager.getAdminId());
|
|
|
|
|
- ocl.setOrderNo(t.getOrderNo());
|
|
|
|
|
- ocl.setRemarks(startRemarks);
|
|
|
|
|
- ocl.setChangeId(ncb.getId());
|
|
|
|
|
- ocl.setStatus(0);
|
|
|
|
|
- sendNotice(0, t);//设置与通过一样发送信息
|
|
|
|
|
- orderChangeLogMapper.insertSelective(ocl);
|
|
|
|
|
|
|
+ tChangeDunMapper.insertSelectiveList(listcd);
|
|
|
|
|
+ }
|
|
|
|
|
+ List<TChangeTask> listck=new ArrayList<>();
|
|
|
|
|
+ List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo(),null);
|
|
|
|
|
+ if (listTask!=null&&!listTask.isEmpty()) {
|
|
|
|
|
+ for (TOrderTaskBo tt : listTask) {
|
|
|
|
|
+ TChangeTask ck=new TChangeTask();
|
|
|
|
|
+ ck.setOrderNo(tt.getOrderNo());
|
|
|
|
|
+ ck.setCid(ncb.getId());
|
|
|
|
|
+ ck.setCommodityId(tt.getCommodityId());
|
|
|
|
|
+ ck.setOrderNo(tt.getOrderNo());
|
|
|
|
|
+ ck.setCommodityName(tt.getCommodityName());
|
|
|
|
|
+ ck.setCommodityPrice(tt.getCommodityPrice());
|
|
|
|
|
+ ck.setCommodityQuantity(tt.getCommodityQuantity());
|
|
|
|
|
+ ck.setTaskComment(tt.getTaskComment());
|
|
|
|
|
+ ck.setSplitStatus(tt.getSplitStatus());
|
|
|
|
|
+ ck.setSplitSuper(tt.getSplitSuper());
|
|
|
|
|
+ ck.setReceiverName(tt.getReceiverName());
|
|
|
|
|
+ ck.setMain(tt.getMain());
|
|
|
|
|
+ ck.setTid(tt.getId());
|
|
|
|
|
+ if(tt.getServiceLife()!=null) ck.setServiceLife(tt.getServiceLife());
|
|
|
|
|
+ if(tt.getServiceYear()!=null) ck.setServiceYear(tt.getServiceYear());
|
|
|
|
|
+ if(tt.getYearSum()!=null) ck.setYearSum(tt.getYearSum());
|
|
|
|
|
+ if(tt.getContractTerm()!=null) ck.setContractTerm(tt.getContractTerm());
|
|
|
|
|
+ listck.add(ck);
|
|
|
}
|
|
}
|
|
|
- return 1;
|
|
|
|
|
|
|
+ tChangeTaskMapper.insertSelectiveList(listck);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (t.getType()==OrderChangeType.TDTK.getCode()) {
|
|
|
|
|
+ OrderChangeLog ocl=new OrderChangeLog();
|
|
|
|
|
+ ocl.setAuditor(TokenManager.getAdminId());
|
|
|
|
|
+ ocl.setOrderNo(t.getOrderNo());
|
|
|
|
|
+ ocl.setRemarks(startRemarks);
|
|
|
|
|
+ ocl.setChangeId(ncb.getId());
|
|
|
|
|
+ ocl.setStatus(0);
|
|
|
|
|
+ sendNotice(0, t);//设置与通过一样发送信息
|
|
|
|
|
+ orderChangeLogMapper.insertSelective(ocl);
|
|
|
|
|
+ }
|
|
|
|
|
+ return 1;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -216,8 +212,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
orderExamineMapper.insertSelective(o);
|
|
orderExamineMapper.insertSelective(o);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -264,33 +258,43 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
//2通过 3驳回
|
|
//2通过 3驳回
|
|
|
if (status==2) {
|
|
if (status==2) {
|
|
|
- //变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送
|
|
|
|
|
|
|
+ //变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送 6退单不退款 7仅变更合同
|
|
|
if(nb.getType() !=null){
|
|
if(nb.getType() !=null){
|
|
|
- if (nb.getChangeAmount().compareTo(new BigDecimal("0.2"))<0) {//小于则总裁通过,大于则董事长
|
|
|
|
|
- if(nb.getProcessState()==7) {//总裁项目变更通过
|
|
|
|
|
- nb.setStatus(2);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ //仅合同变更只需要 营销管理员与财务专员审核
|
|
|
|
|
+ if(nb.getType()==OrderChangeType.JBGGT.getCode()){
|
|
|
|
|
+ if(nb.getProcessState()==1){
|
|
|
|
|
+ nb.setProcessState(5);
|
|
|
|
|
+ }else if(nb.getProcessState()==5){
|
|
|
|
|
+ nb.setStatus(4);
|
|
|
|
|
+ pushCompleteOrderChange(nb);
|
|
|
|
|
+ return 1;
|
|
|
|
|
+ }
|
|
|
}else {
|
|
}else {
|
|
|
- if(nb.getProcessState()==7) {
|
|
|
|
|
- nb.setProcessState(nb.getProcessState()+1);
|
|
|
|
|
|
|
+ if (nb.getChangeAmount().compareTo(new BigDecimal("0.2"))<0) {//小于则总裁通过,大于则董事长
|
|
|
|
|
+ if(nb.getProcessState()==7) {//总裁项目变更通过
|
|
|
|
|
+ nb.setStatus(2);
|
|
|
|
|
+ }
|
|
|
|
|
+ }else {
|
|
|
|
|
+ if(nb.getProcessState()==7) {
|
|
|
|
|
+ nb.setProcessState(nb.getProcessState()+1);
|
|
|
}else if(nb.getProcessState()==8) {//董事长项目变更通过
|
|
}else if(nb.getProcessState()==8) {//董事长项目变更通过
|
|
|
- nb.setStatus(2);
|
|
|
|
|
|
|
+ nb.setStatus(2);
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- //营销管理通过则设置技术管理员通过表
|
|
|
|
|
- if(nb.getProcessState()==1){
|
|
|
|
|
- if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) {
|
|
|
|
|
- insertOrderExamine(orderNo);
|
|
|
|
|
- } else {
|
|
|
|
|
- orderExamineMapper.updateByOrderNo(orderNo,null);
|
|
|
|
|
- }
|
|
|
|
|
- nb.setProcessState(nb.getProcessState()+1);
|
|
|
|
|
}
|
|
}
|
|
|
- //必须放置在咨询师与咨询师经理前,否则会直接通过不走咨询师管理员
|
|
|
|
|
- if(nb.getProcessState()==4||nb.getProcessState()==5||nb.getProcessState()==6) {
|
|
|
|
|
- nb.setProcessState(nb.getProcessState()+1);
|
|
|
|
|
- }
|
|
|
|
|
- if(nb.getProcessState()==2){//咨询师
|
|
|
|
|
|
|
+ //营销管理通过则设置技术管理员通过表
|
|
|
|
|
+ if(nb.getProcessState()==1){
|
|
|
|
|
+ if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) {
|
|
|
|
|
+ insertOrderExamine(orderNo);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ orderExamineMapper.updateByOrderNo(orderNo,null);
|
|
|
|
|
+ }
|
|
|
|
|
+ nb.setProcessState(nb.getProcessState()+1);
|
|
|
|
|
+ }
|
|
|
|
|
+ //必须放置在咨询师与咨询师经理前,否则会直接通过不走咨询师管理员
|
|
|
|
|
+ if(nb.getProcessState()==4||nb.getProcessState()==5||nb.getProcessState()==6) {
|
|
|
|
|
+ nb.setProcessState(nb.getProcessState()+1);
|
|
|
|
|
+ }
|
|
|
|
|
+ if(nb.getProcessState()==2){//咨询师
|
|
|
//找出当时人的审核改为通过
|
|
//找出当时人的审核改为通过
|
|
|
orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
|
|
orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
|
|
|
//全部通过了则跳下个流程
|
|
//全部通过了则跳下个流程
|
|
@@ -298,7 +302,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nb.setProcessState(nb.getProcessState()+1);
|
|
nb.setProcessState(nb.getProcessState()+1);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if(nb.getProcessState()==3){//咨询师经理
|
|
|
|
|
|
|
+ if(nb.getProcessState()==3){//咨询师经理
|
|
|
//找出当时人的审核改为通过
|
|
//找出当时人的审核改为通过
|
|
|
orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
|
|
orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
|
|
|
//全部通过了则跳下个流程
|
|
//全部通过了则跳下个流程
|
|
@@ -306,7 +310,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
nb.setProcessState(nb.getProcessState()+1);
|
|
nb.setProcessState(nb.getProcessState()+1);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
if(nb.getStatus()==3) {
|
|
if(nb.getStatus()==3) {
|
|
|
nb.setStatus(1);//如果驳回数据则改为正常数据
|
|
nb.setStatus(1);//如果驳回数据则改为正常数据
|
|
@@ -336,7 +340,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}else if (nb.getProcessState()<3) {
|
|
}else if (nb.getProcessState()<3) {
|
|
|
orderExamineMapper.updateByOrderNo(orderNo,null);
|
|
orderExamineMapper.updateByOrderNo(orderNo,null);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
OrderChangeLog ocl=new OrderChangeLog();
|
|
OrderChangeLog ocl=new OrderChangeLog();
|
|
|
ocl.setAuditor(TokenManager.getAdminId());
|
|
ocl.setAuditor(TokenManager.getAdminId());
|
|
@@ -541,6 +544,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
Pagination<NewOderCahngeListBo> data = (Pagination<NewOderCahngeListBo>)findPage("selectOrderChangeList", "selectOrderChangeCount", parameter, pageNo, pageSize);
|
|
Pagination<NewOderCahngeListBo> data = (Pagination<NewOderCahngeListBo>)findPage("selectOrderChangeList", "selectOrderChangeCount", parameter, pageNo, pageSize);
|
|
|
return data;
|
|
return data;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public int updateOrderChange(NewOrderChangeBo t,Integer changeType,String startRemarks) {
|
|
public int updateOrderChange(NewOrderChangeBo t,Integer changeType,String startRemarks) {
|
|
|
NewOrderChange noc=new NewOrderChange();
|
|
NewOrderChange noc=new NewOrderChange();
|
|
@@ -549,6 +553,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (changeType==0) {
|
|
if (changeType==0) {
|
|
|
// chekeChangeTaskNumber(noc);
|
|
// chekeChangeTaskNumber(noc);
|
|
|
noc.setRemarks(t.getRemarks());
|
|
noc.setRemarks(t.getRemarks());
|
|
|
|
|
+ if(t.getContractPictureUrl()!=null)noc.setContractPictureUrl(t.getContractPictureUrl());
|
|
|
noc.setType(t.getType());
|
|
noc.setType(t.getType());
|
|
|
noc.setVoucherUrl(t.getVoucherUrl());
|
|
noc.setVoucherUrl(t.getVoucherUrl());
|
|
|
noc.setTotalAmount(t.getTotalAmount());
|
|
noc.setTotalAmount(t.getTotalAmount());
|
|
@@ -622,22 +627,26 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
throw new BusinessException("变更子项目与父项目数量不符");
|
|
throw new BusinessException("变更子项目与父项目数量不符");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public int addOrderRefundInvoice(OrderRefundInvoice o) {
|
|
public int addOrderRefundInvoice(OrderRefundInvoice o) {
|
|
|
o.setCreateTime(new Date());
|
|
o.setCreateTime(new Date());
|
|
|
newOrderChangeMapper.addRefundInvoice(o.getOrderNo(),o.getAmount());
|
|
newOrderChangeMapper.addRefundInvoice(o.getOrderNo(),o.getAmount());
|
|
|
return orderRefundInvoiceMapper.insertSelective(o);
|
|
return orderRefundInvoiceMapper.insertSelective(o);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public int deleteOrderRefundInvoice(Integer id) {
|
|
public int deleteOrderRefundInvoice(Integer id) {
|
|
|
OrderRefundInvoice or=orderRefundInvoiceMapper.selectByPrimaryKey(id);
|
|
OrderRefundInvoice or=orderRefundInvoiceMapper.selectByPrimaryKey(id);
|
|
|
newOrderChangeMapper.subtractRefundInvoice(or.getOrderNo(),or.getAmount());
|
|
newOrderChangeMapper.subtractRefundInvoice(or.getOrderNo(),or.getAmount());
|
|
|
return orderRefundInvoiceMapper.deleteByPrimaryKey(id);
|
|
return orderRefundInvoiceMapper.deleteByPrimaryKey(id);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public List<OrderRefundInvoice> listOrderRefundInvoice(String orderNo) {
|
|
public List<OrderRefundInvoice> listOrderRefundInvoice(String orderNo) {
|
|
|
return orderRefundInvoiceMapper.selectByorderNo(orderNo);
|
|
return orderRefundInvoiceMapper.selectByorderNo(orderNo);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public int pushCompleteOrderChange(NewOrderChangeBo nb) {
|
|
public int pushCompleteOrderChange(NewOrderChangeBo nb) {
|
|
|
//变更完成
|
|
//变更完成
|
|
@@ -658,7 +667,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 获取除发起者意外所有审核者
|
|
|
|
|
|
|
+ * 获取除当前审核者所有审核者
|
|
|
* @param id
|
|
* @param id
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
@@ -667,7 +676,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
List<String>newl=new ArrayList<>();
|
|
List<String>newl=new ArrayList<>();
|
|
|
List<OrderChangeLogBo> list=orderChangeLogMapper.selectOrderChangeLogList(id.toString());
|
|
List<OrderChangeLogBo> list=orderChangeLogMapper.selectOrderChangeLogList(id.toString());
|
|
|
for (OrderChangeLogBo log : list) {
|
|
for (OrderChangeLogBo log : list) {
|
|
|
- if (!log.getStatus().equals(0)){
|
|
|
|
|
|
|
+ if (!TokenManager.getAdminId().equals(log.getAuditor())){
|
|
|
if (!newl.contains(log.getAuditor())){
|
|
if (!newl.contains(log.getAuditor())){
|
|
|
newl.add(log.getAuditor());
|
|
newl.add(log.getAuditor());
|
|
|
}
|
|
}
|
|
@@ -742,6 +751,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
um.setTaskNames(taskNames);
|
|
um.setTaskNames(taskNames);
|
|
|
if (nb.getType()==0)um.setChargeback(1);
|
|
if (nb.getType()==0)um.setChargeback(1);
|
|
|
userMidMapper.updateByUid(um);
|
|
userMidMapper.updateByUid(um);
|
|
|
|
|
+ //如果合同不是空,则修改合同
|
|
|
|
|
+ if (nob.getContractPictureUrl()!=null)o.setContractPictureUrl(nob.getContractPictureUrl());
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(o);
|
|
tOrderNewMapper.updateByPrimaryKeySelective(o);
|
|
|
return o;
|
|
return o;
|
|
|
}
|
|
}
|