今日数据

src/main/java/com/sqx/modules/app/controller/app/AppUserController.java

@@ -59,8 +59,8 @@ public class AppUserController {
     @Login
     @GetMapping("userYesterdayData")
     @ApiOperation("用户昨日数据")
-    public Result userYesterdayData(@RequestAttribute("userId")Long userId,Integer dateType){
-        return Result.success().put("data",userService.userYesterdayData(userId,dateType));
+    public Result userYesterdayData(@RequestAttribute("userId")Long userId,Integer dateType,Integer postPushId){
+        return Result.success().put("data",userService.userYesterdayData(userId,dateType,postPushId));
     }
 
 }

src/main/java/com/sqx/modules/app/service/UserService.java

@@ -224,5 +224,5 @@ public interface UserService extends IService<UserEntity> {
 
     Result updateUserType(UpdateUserTypeForm updateUserTypeForm);
 
-    HashMap<String,Object> userYesterdayData(Long userId,Integer dateType);
+    HashMap<String,Object> userYesterdayData(Long userId,Integer dateType,Integer postPushId);
 }

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -1498,7 +1498,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
          * @param userId 用户ID（企业用户，对应user_type=2）
          * @return 包含各指标今日数据及较昨日变化的Map
          */
-        public HashMap<String, Object> userYesterdayData(Long userId,Integer dateType) {
+        public HashMap<String, Object> userYesterdayData(Long userId,Integer dateType,Integer postPushId) {
             HashMap<String, Object> resultMap = new HashMap<>();
             LocalDateTime todayStart;
             LocalDateTime todayEnd;
@@ -1549,37 +1549,37 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         List<Long> myPostIds = postIdObjs.stream()
                 .map(obj -> Long.valueOf(obj.toString()))
                 .collect(Collectors.toList());
-            int todaySawMe = userBrowseService.count(new QueryWrapper<UserBrowse>().in("post_push_id",myPostIds).between("update_time",todayStart,todayEnd));
-            int yesterdaySawMe = userBrowseService.count(new QueryWrapper<UserBrowse>().in("post_push_id",myPostIds).between("update_time",yesterdayStart,yesterdayEnd));
+            int todaySawMe = userBrowseService.count(new QueryWrapper<UserBrowse>().in("post_push_id",myPostIds).between("update_time",todayStart,todayEnd).eq("post_push_id",postPushId));
+            int yesterdaySawMe = userBrowseService.count(new QueryWrapper<UserBrowse>().in("post_push_id",myPostIds).between("update_time",yesterdayStart,yesterdayEnd).eq("post_push_id",postPushId));
             resultMap.put("sawMe",todaySawMe);
             resultMap.put("tySawMe",todaySawMe-yesterdaySawMe);
 
             // 4.3 我沟通（企业主动发起的沟通数量）
-            int todayICommunicated =chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("type",2).between("create_time",todayStart,todayEnd));
-            int yesterdayICommunicated = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("type",2).between("create_time",yesterdayStart,yesterdayEnd));
+            int todayICommunicated =chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("type",2).between("create_time",todayStart,todayEnd).eq("post_push_id",postPushId));
+            int yesterdayICommunicated = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("type",2).between("create_time",yesterdayStart,yesterdayEnd).eq("post_push_id",postPushId));
             resultMap.put("iCommunicated",todayICommunicated);
             resultMap.put("tyICommunicated",todayICommunicated-yesterdayICommunicated);
             // 4.4 求职者沟通（求职者主动发起的沟通数量）
-            int todayCandidateCommunicated =chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("type",1).between("create_time",todayStart,todayEnd));
-            int yesterdayCandidateCommunicated = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("type",1).between("create_time",yesterdayStart,yesterdayEnd));
+            int todayCandidateCommunicated =chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("type",1).between("create_time",todayStart,todayEnd).eq("post_push_id",postPushId));
+            int yesterdayCandidateCommunicated = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("type",1).between("create_time",yesterdayStart,yesterdayEnd).eq("post_push_id",postPushId));
             resultMap.put("candidateCommunicated", todayCandidateCommunicated);
             resultMap.put("tyCandidateCommunicated",todayCandidateCommunicated-yesterdayCandidateCommunicated);
 
             // 4.5 收获简历（企业收到的简历数量，对应is_send_resumes=1）
-            int todayReceivedResumes = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("is_send_resumes",1).between("update_time",todayStart,todayEnd));
-            int yesterdayReceivedResumes =chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("is_send_resumes",1).between("update_time",yesterdayStart,yesterdayEnd));
+            int todayReceivedResumes = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("is_send_resumes",1).between("update_time",todayStart,todayEnd).eq("post_push_id",postPushId));
+            int yesterdayReceivedResumes =chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).eq("is_send_resumes",1).between("update_time",yesterdayStart,yesterdayEnd).eq("post_push_id",postPushId));
             resultMap.put("receivedResumes", todayReceivedResumes);
             resultMap.put("tyReceivedResumes",todayReceivedResumes-yesterdayReceivedResumes);
 
             // 4.6 交换电话微信（电话/微信交换成功数量，对应is_send_phone=1或is_send_wx=1）
-            int todayExchangedContact = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).and(qw -> qw.eq("is_send_phone", 1).or().eq("is_send_wx", 1)) .between("update_time",todayStart,todayEnd));
-            int yesterdayExchangedContact = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).and(qw -> qw.eq("is_send_phone", 1).or().eq("is_send_wx", 1)) .between("update_time",todayStart,todayEnd));
+            int todayExchangedContact = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).and(qw -> qw.eq("is_send_phone", 1).or().eq("is_send_wx", 1)) .between("update_time",todayStart,todayEnd).eq("post_push_id",postPushId));
+            int yesterdayExchangedContact = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("focused_user_id",userId).and(qw -> qw.eq("is_send_phone", 1).or().eq("is_send_wx", 1)) .between("update_time",todayStart,todayEnd).eq("post_push_id",postPushId));
             resultMap.put("exchangedContact", todayExchangedContact);
             resultMap.put("tyExchangeContact",todayExchangedContact-yesterdayExchangedContact);
 
             // 4.7 接受面试（求职者接受面试的数量，需结合status字段定义）
-            int todayAcceptedInterview = interviewRecordService.count(new QueryWrapper<InterviewRecord>().eq("user_id",userId).eq("status",2).between("create_time",todayStart,todayEnd));
-            int yesterdayAcceptedInterview = interviewRecordService.count(new QueryWrapper<InterviewRecord>().eq("user_id",userId).eq("status",2).between("create_time",yesterdayStart,yesterdayEnd));
+            int todayAcceptedInterview = interviewRecordService.count(new QueryWrapper<InterviewRecord>().eq("user_id",userId).eq("status",2).between("create_time",todayStart,todayEnd).eq("post_push_id",postPushId));
+            int yesterdayAcceptedInterview = interviewRecordService.count(new QueryWrapper<InterviewRecord>().eq("user_id",userId).eq("status",2).between("create_time",yesterdayStart,yesterdayEnd).eq("post_push_id",postPushId));
             resultMap.put("acceptedInterview", todayAcceptedInterview);
             resultMap.put("tyAcceptedInterview",todayAcceptedInterview-yesterdayAcceptedInterview);
 

src/main/java/com/sqx/modules/chat/controller/app/AppChatController.java

@@ -48,6 +48,9 @@ public class AppChatController {
     @PostMapping("/insertChatConversation")
     @ApiOperation("发起聊天")
     public Result insertChatConversation(@RequestBody ChatConversation chatConversation){
+        if (chatConversation.getUserId().equals(chatConversation.getFocusedUserId())){
+            return Result.error("发起会话失败");
+        }
         return chatConversationService.insertChatConversations(chatConversation);
     }
 

src/main/java/com/sqx/modules/firstLogin/control/UserFirstRegistController.java

@@ -96,8 +96,15 @@ public class UserFirstRegistController {
         resumesDto.setResumeList( resumes);
         resumesDto.setEduList(eduService.selectEdu(Integer.valueOf(userId1)));
         resumesDto.setIntentions(intentionService.getIntention(Long.valueOf(userId1)));
-        resumesDto.setWorkExps(workExpService.selectWorkExpOnly(Long.valueOf(userId1)));
-        resumesDto.setWorkExpList(workExpService.selectWorkExp(Integer.valueOf(userId1)));
+//        resumesDto.setWorkExps(workExpService.selectWorkExpOnly(Long.valueOf(userId1)));
+//        resumesDto.setWorkExpList(workExpService.selectWorkExp(Integer.valueOf(userId1)));
+//        List<WorkExp> workExps =workExpService.getBaseMapper().selectList(new QueryWrapper<WorkExp>().eq("user_id",userId1).eq("is_use",1));
+//        for (WorkExp workExp:workExps) {
+//            List<WorkExpDetail> workExpDetails =workExpDetailService.getBaseMapper().selectList(new QueryWrapper<WorkExpDetail>().eq("work_exp_id",workExp.getWorkExpId()));
+//            workExp.setWorkExpDetailList(workExpDetails);
+//        }
+//        resumesDto.setWorkExps(workExps);
+        resumesDto.setWorkExpList(workExpService.selectWorkExp(Math.toIntExact(userId)));
         resumesDto.setSkills(skillService.selectSkill(Integer.valueOf(userId1)));
         resumesDto.setWorkExpTimes(workExpService.getWorkTime(Long.valueOf(userId1)));
         UserBrowse userBrowseOld = userBrowseService.getOne(new QueryWrapper<UserBrowse>().eq("user_id",userId).eq("resumes_id",resumesId));

src/main/java/com/sqx/modules/firstLogin/dto/WorkExpDetailDto.java

@@ -16,4 +16,5 @@ public class WorkExpDetailDto {
     private String endTime;
     private String department;     // 部门索引
     private String workPerformance;
+    private String companyName;
 }

src/main/java/com/sqx/modules/intention/controller/AppIntentionController.java

@@ -69,7 +69,11 @@ public class AppIntentionController {
     @Login
     @ApiOperation("删除求职意向")
     @PostMapping(value = "deleteIntention")
-    public Result deleteIntention(@RequestBody Intention intention) {
+    public Result deleteIntention(@RequestAttribute("userId")Long userId,@RequestBody Intention intention) {
+        int a = intentionService.count(new QueryWrapper<Intention>().eq("user_id",userId).eq("is_default",1));
+        if(a==1){
+            return Result.error("请至少保留一条意向");
+        }
         return intentionService.removeById(intention.getIntentionId()) ? Result.success() : Result.error();
     }
 }

src/main/java/com/sqx/modules/resumes/controller/CompanyController.java

@@ -30,12 +30,17 @@ public class CompanyController {
     @PostMapping("/insertCompany")
     @ApiOperation("添加企业")
     public Result insertCompany(@RequestBody Company company,@RequestAttribute("userId")Long userId){
-
+        if(company.getCompanyName() ==null || company.getCompanyName().isEmpty() ){
+            company.setCompanyName(company.getCompanyAllName());
+        }
        return companyService.insertCompany(company,userId);
    }
     @PostMapping("/updateCompany")
     @ApiOperation("修改企业")
     public Result updateCompany(@RequestBody Company company){
+        if(company.getCompanyName() ==null || company.getCompanyName().isEmpty() ){
+            company.setCompanyName(company.getCompanyAllName());
+        }
         company.setStatus(2);
         return companyService.updateCompany(company);
     }

src/main/resources/mapper/resumes/ResumesDao.xml

@@ -128,12 +128,13 @@
         GROUP BY user_id
         ) intent ON u.user_id = intent.user_id
     <where>
-        <if test="resumesListDto.expectedCity!=null or resumesListDto.city==''">
-            AND FIND_IN_SET(#{resumesListDto.expectedCity}, expectedCity)
+        <if test="resumesListDto.expectedCity!=null or resumesListDto.expectedCity==''">
+            AND FIND_IN_SET(#{resumesListDto.expectedCity},intent.all_expected_cities)
         </if>
         <if test="resumesListDto.resumesId !=null or resumesListDto.resumesId==''">
-             resumes.resumes_id = #{resumesListDto.resumesId}
+             AND resumes.resumes_id = #{resumesListDto.resumesId}
         </if>
+<!--        <if test="resumesListDto."-->
 
     </where>
     </select>