1

.gitignore

@@ -0,0 +1,15 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+.idea
+package-lock.json
+node_modules/
+unpackage/
+.hbuilderx
+.vite
+target

.idea/jarRepositories.xml

@@ -26,5 +26,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

admin-hanhai-vue/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8081/employ-api/
+VUE_APP_API_BASE_URL=http://localhost:8001/employ-api/
 //VUE_APP_API_BASE_URL=http://localhost:8000/employ-api/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/OrderController.java

@@ -41,7 +41,7 @@ public class OrderController {
     }
 
     //订单信息-简历信息-立即聘用
-    @ApiOperation(value="订单信息-简历信息-立即聘用", notes="订单信息-简历信息-立即聘用")
+    @ApiOperation(value="订单信息-简历信息-立即应聘", notes="订单信息-简历信息-立即应聘")
     @RequestMapping(value = "/addOrderWork", method = {RequestMethod.POST})
     public Result<?> addOrderWork(@RequestHeader("X-Access-Token")String token, String id){
         return orderService.addOrderWork(token, id);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java

@@ -87,29 +87,21 @@ public class OrderServiceImpl implements OrderService {
         Page<EmployOrder> page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<EmployOrder> pageList = employOrderService.lambdaQuery()
                 .eq(EmployOrder::getUserId, hanHaiMember.getId())
-                .eq(EmployOrder::getType, role)
+                .eq(StringUtils.isNotBlank(role), EmployOrder::getType, role)
+                .eq(StringUtils.isNotBlank(status), EmployOrder::getStatus, status)
+                .orderByDesc(EmployOrder::getCreateTime)
                 .page(page);
-        //如果状态不为空
-        if (StringUtils.isNotBlank(status)){
-            pageList = employOrderService.lambdaQuery()
-                    .eq(EmployOrder::getUserId, hanHaiMember.getId())
-                    .eq(EmployOrder::getStatus, status)
-                    .eq(EmployOrder::getType, role)
-                    .page(page);
-        }
 
 
-        //得到list数据循环替换数据
-        List records = pageList.getRecords();
-        //创建一个新的集合
-        List<EmployOrder> list = new ArrayList<>();
-        for (Object record : records) {
-            EmployOrder order = (EmployOrder) record;
+        for (EmployOrder order : pageList.getRecords()) {
             order.setCategoryOne(employCategoryService.getById(order.getCategoryOne()).getName());
             order.setCategoryTwo(employCategoryService.getById(order.getCategoryTwo()).getName());
-            list.add(order);
+            if (order.getType() == 0){
+                order.setEmployJob(employJobService.getById(order.getJobId()));
+            }else {
+                order.setEmploySeek(employSeekService.getById(order.getSeekId()));
+            }
         }
-        pageList.setRecords(list);
         return Result.OK("查询成功",pageList);
     }
 
@@ -158,7 +150,7 @@ public class OrderServiceImpl implements OrderService {
     }
 
 
-    //订单信息-简历信息-立即聘用
+    //订单信息-简历信息-立即接单
     @Override
     public Result<?> addOrderWork(String token,  String workId) {
         //校验信息
@@ -187,6 +179,13 @@ public class OrderServiceImpl implements OrderService {
         EmployAuthenticationPerson person = employAuthenticationPersonService
                 .lambdaQuery().eq(EmployAuthenticationPerson::getUserId, toUser).one();
 
+        //检查招聘方认证信息是否存在
+        if(company == null){
+            return Result.error("招聘方公司认证信息不存在，无法接单");
+        }
+        if(person == null){
+            return Result.error("招聘方个人认证信息不存在，无法接单");
+        }
 
         //查询该用户是否已经存在订单
         EmployOrder order = employOrderService.lambdaQuery()
@@ -195,7 +194,7 @@ public class OrderServiceImpl implements OrderService {
                 .one();
 
         if(order!=null){
-            return Result.OK("您已经存在该订单,请不要重复下单",order);
+            return Result.error("您已经应聘过了",order);
         }
 
 
@@ -210,6 +209,7 @@ public class OrderServiceImpl implements OrderService {
         employOrder.setJobName(resume.getName());
         employOrder.setJobPhone(resume.getPhone());
         employOrder.setJobAddress(resume.getAddress());
+        employOrder.setPayType(employJob.getPayType());
 
         //招聘方信息
         employOrder.setWorkHeadImg(company.getHeadImg());
@@ -282,7 +282,7 @@ public class OrderServiceImpl implements OrderService {
 
 
 
-    //订单信息-求职信息-立即接单
+    //订单信息-求职信息-立即聘用
     @Override
     public Result<?> addOrderJob(String token, String jobId){
         //校验信息
@@ -330,7 +330,7 @@ public class OrderServiceImpl implements OrderService {
                 .one();
 
         if(order!=null){
-            return Result.OK("您已经存在该订单,请不要重复下单",order);
+            return Result.error("您已经聘用过了",order);
         }
 
 
@@ -346,6 +346,7 @@ public class OrderServiceImpl implements OrderService {
         employOrder.setJobPhone(resume.getPhone());
         employOrder.setJobAddress(resume.getAddress());
         employOrder.setJobHeadImg(person.getImage());
+        employOrder.setPayType(employSeek.getPayType());
 
         //招聘方信息
         employOrder.setWorkHeadImg(company.getHeadImg());