Commit 53a0258b authored by hongguangwu's avatar hongguangwu

MVP1.5.3-部分失败的单增

parent add8e452
...@@ -20,6 +20,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -20,6 +20,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
...@@ -706,4 +707,12 @@ public class TDispatchInfo extends BaseEntity { ...@@ -706,4 +707,12 @@ public class TDispatchInfo extends BaseEntity {
@ExcelProperty("订单ID" ) @ExcelProperty("订单ID" )
private String orderId; private String orderId;
/**
* 原派单ID
* 2023-4-11 14:37:17
* hgw增加
*/
@TableField(exist = false)
private String pid;
} }
...@@ -821,6 +821,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -821,6 +821,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
dispatch.setCreateTime(LocalDateTime.now()); dispatch.setCreateTime(LocalDateTime.now());
baseMapper.insert(dispatch); baseMapper.insert(dispatch);
if (Common.isNotNull(dispatch.getPid())) {
TDispatchInfo old = new TDispatchInfo();
old.setId(dispatch.getPid());
old.setAgainDispatchCode(dispatch.getApplyNo());
baseMapper.updateById(old);
}
} }
} }
...@@ -1280,6 +1286,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1280,6 +1286,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
// 生成申请编码 // 生成申请编码
dispatch.setApplyNo(getApplyCode()); dispatch.setApplyNo(getApplyCode());
dispatch.setPid(excel.getDispatchId());
dispatchMap.put(excel.getEmpIdcard(),dispatch); dispatchMap.put(excel.getEmpIdcard(),dispatch);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment