Commit ae9fb36e authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent 5a850260
...@@ -901,4 +901,7 @@ public class TDispatchInfo extends BaseEntity { ...@@ -901,4 +901,7 @@ public class TDispatchInfo extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private String preId; private String preId;
@Schema(description ="社保待购买前端客服")
@TableField(exist = false)
private String preName;
} }
...@@ -815,7 +815,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -815,7 +815,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfo.setAuditRemark("派单申请提交"); auditInfo.setAuditRemark("派单申请提交");
auditInfo.setTitle("派单申请"); auditInfo.setTitle("派单申请");
auditInfo.setOrganName(dispatch.getOrganName()); auditInfo.setOrganName(dispatch.getOrganName());
auditInfo.setAuditUser(dispatch.getCreateName()); auditInfo.setAuditUser(null != dispatch.getPreName() ? dispatch.getPreName() : dispatch.getCreateName());
auditInfo.setAuditTime(new Date()); auditInfo.setAuditTime(new Date());
auditInfo.setIsCommision(CommonConstants.ONE_STRING); auditInfo.setIsCommision(CommonConstants.ONE_STRING);
auditInfoMapper.insert(auditInfo); auditInfoMapper.insert(auditInfo);
...@@ -1359,6 +1359,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1359,6 +1359,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(excel.getPreId())) { if (Common.isNotNull(excel.getPreId())) {
dispatch.setPreId(excel.getPreId()); dispatch.setPreId(excel.getPreId());
} }
if (Common.isNotNull(excel.getPreName())) {
dispatch.setPreName(excel.getPreName());
}
dispatch.setCreateBy(null == user ? "7" : user.getId()); dispatch.setCreateBy(null == user ? "7" : user.getId());
dispatch.setCreateName(Common.isNotNull(excel.getPreName()) ? excel.getPreName() : user.getNickname()); dispatch.setCreateName(Common.isNotNull(excel.getPreName()) ? excel.getPreName() : user.getNickname());
dispatch.setCreateTime(LocalDateTime.now()); dispatch.setCreateTime(LocalDateTime.now());
......
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