|
|
@@ -11,12 +11,16 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import com.goafanti.common.dao.OutsourceOrganizationMapper;
|
|
|
+import com.goafanti.common.dao.TOrderLogMapper;
|
|
|
import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.dao.TOrderOutsourceMapper;
|
|
|
+import com.goafanti.common.enums.OrderLogProcess;
|
|
|
import com.goafanti.common.model.OutsourceOrganization;
|
|
|
+import com.goafanti.common.model.TOrderLog;
|
|
|
import com.goafanti.common.model.TOrderNew;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
+import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.OrderOutsourceBo;
|
|
|
import com.goafanti.order.bo.OrderOutsourceDtails;
|
|
|
import com.goafanti.order.bo.OutsourceOrganizationBo;
|
|
|
@@ -32,6 +36,8 @@ public class OutsourceOrgServiceImpl extends BaseMybatisDao<TOrderOutsourceMapp
|
|
|
private TOrderNewMapper tOrderNewMapper;
|
|
|
@Autowired
|
|
|
private OrderService orderService;
|
|
|
+ @Autowired
|
|
|
+ private TOrderLogMapper tOrderLogMapper;
|
|
|
@Override
|
|
|
public int addOutsourceOrg(OutsourceOrganization o) {
|
|
|
return outsourceOrganizationMapper.insertSelective(o);
|
|
|
@@ -88,10 +94,22 @@ public class OutsourceOrgServiceImpl extends BaseMybatisDao<TOrderOutsourceMapp
|
|
|
t.setOrderNo(o.getOrderNo());
|
|
|
t.setOrderStatus(2);//订单审核标记通过
|
|
|
t.setProcessStatus(2);//订单流程标记到财务
|
|
|
+ addOrderLog(o.getOrderNo(),OrderLogProcess.WBSH.getCode());
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ }else {
|
|
|
+ addOrderLog(o.getOrderNo(),OrderLogProcess.WBBH.getCode());
|
|
|
}
|
|
|
return tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
|
|
|
}
|
|
|
+
|
|
|
+ public void addOrderLog(String orderNo, Integer code) {
|
|
|
+ TOrderLog tl=new TOrderLog();
|
|
|
+ tl.setOrderNo(orderNo);
|
|
|
+ tl.setProcess(code);
|
|
|
+ tl.setAid(TokenManager.getAdminId());
|
|
|
+ tOrderLogMapper.insertSelective(tl);
|
|
|
+
|
|
|
+ }
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<OrderOutsourceBo> salesmanOrderOutsourceList(String name, String contractNo, String starTime,
|