|
|
@@ -664,19 +664,23 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
Calendar c=Calendar.getInstance();
|
|
|
int y=c.getWeekYear();
|
|
|
String ys="-"+y;
|
|
|
+ //判断编号是否类似‘-2019’,是则为有效编号
|
|
|
if (contractNo.contains(ys)) {
|
|
|
IdleContractNo i=new IdleContractNo();
|
|
|
i.setAid(TokenManager.getAdminId());
|
|
|
i.setContractNo(contractNo);
|
|
|
i.setUsedOrderNo(orderNo);
|
|
|
- OrganizationManagement o=organizationManagementMapper.selectByPrimaryKey(orderDep);
|
|
|
- i.setAbbreviation(o.getAbbreviation());
|
|
|
+ //如果找不到订单部门,则取订单编号-前面的缩写
|
|
|
+ if(StringUtils.isNotBlank(orderDep)) {
|
|
|
+ OrganizationManagement o=organizationManagementMapper.selectByPrimaryKey(orderDep);
|
|
|
+ i.setAbbreviation(o.getAbbreviation());
|
|
|
+ }else {
|
|
|
+ i.setAbbreviation(contractNo.substring(0, contractNo.indexOf("-")));
|
|
|
+ }
|
|
|
idleContractNoMapper.insertSelective(i);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
@Override
|
|
|
public boolean checkOderSettlementAmount(String orderNo) {
|
|
|
TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
|