diff --git a/admin-hanhai-vue/dist.zip b/admin-hanhai-vue/dist.zip index df8d006..27611f5 100644 Binary files a/admin-hanhai-vue/dist.zip and b/admin-hanhai-vue/dist.zip differ diff --git a/admin-hanhai-vue/src/views/applet/insurance/CommonInsuranceOrderList.vue b/admin-hanhai-vue/src/views/applet/insurance/CommonInsuranceOrderList.vue index e38acad..663ee29 100644 --- a/admin-hanhai-vue/src/views/applet/insurance/CommonInsuranceOrderList.vue +++ b/admin-hanhai-vue/src/views/applet/insurance/CommonInsuranceOrderList.vue @@ -159,6 +159,12 @@ dataIndex: 'idCardBack', scopedSlots: {customRender: 'imgSlot'} }, + { + title:'创建时间', + align:"center", + dataIndex: 'createTime', + width: 150 + }, { title: '操作', dataIndex: 'action', @@ -197,6 +203,7 @@ fieldList.push({type:'BigDecimal',value:'price',text:'金额',dictCode:''}) fieldList.push({type:'sel_search',value:'orderId',text:'订单',dictTable:"", dictText:'', dictCode:''}) fieldList.push({type:'string',value:'warranty',text:'保单',dictCode:''}) + fieldList.push({type:'datetime',value:'createTime',text:'创建时间',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java index 42c4214..3426c95 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java @@ -870,19 +870,19 @@ public class OrderServiceImpl implements OrderService { */ private HanHaiMember getJobSeekerFromOrder(EmployOrder order) { try { - if (order.getType() == 0) { +// if (order.getType() == 0) { // 企业招聘订单:求职者是接单的人,通过简历信息获取 EmployResume resume = employResumeService.getById(order.getResumeId()); if (resume != null) { return hanHaiMemberService.getById(resume.getUserId()); } - } else if (order.getType() == 1) { - // 求职订单:求职者是发布求职的人,通过求职信息获取 - EmploySeek seek = employSeekService.getById(order.getSeekId()); - if (seek != null) { - return hanHaiMemberService.getById(seek.getUserId()); - } - } +// } else if (order.getType() == 1) { +// // 求职订单:求职者是发布求职的人,通过求职信息获取 +// EmploySeek seek = employSeekService.getById(order.getSeekId()); +// if (seek != null) { +// return hanHaiMemberService.getById(seek.getUserId()); +// } +// } } catch (Exception e) { log.error("获取求职者信息失败,订单号:{}", order.getId(), e); }