Browse Source

更新企业档案与面谈接口修改

anderx 9 months ago
parent
commit
3e71cce3cd

+ 4 - 3
src/main/java/com/goafanti/common/dao/UserInterviewProjectMapper.java

@@ -1,8 +1,8 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.UserInterviewProject;
+import com.goafanti.common.model.UserInterviewProjectBo;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
@@ -27,10 +27,9 @@ public interface UserInterviewProjectMapper {
      * 查询指定行数据
      *
      * @param userInterviewProject 查询条件
-     * @param pageable             分页对象
      * @return 对象列表
      */
-    List<UserInterviewProject> findUserInterviewProjectList(UserInterviewProject userInterviewProject, @Param("pageable") Pageable pageable);
+    List<UserInterviewProject> findUserInterviewProjectList(UserInterviewProject userInterviewProject);
 
     /**
      * 统计总行数
@@ -81,5 +80,7 @@ public interface UserInterviewProjectMapper {
      */
     int deleteById(Integer id);
 
+    List<UserInterviewProjectBo> selectByAid(@Param("aid") String aid, @Param("uid") String uid);
+
 }
 

+ 9 - 0
src/main/java/com/goafanti/common/mapper/UserInterviewProjectMapper.xml

@@ -169,6 +169,7 @@
         </where>
     </select>
 
+
     <!--通过主键删除-->
     <delete id="deleteById">
         delete
@@ -176,5 +177,13 @@
         where id = #{id}
     </delete>
 
+    <select id="selectByAid" resultMap="ListMap">
+        select
+            a.id, a.uid, a.aid, a.pid, a.examine_status, a.examine_status_other, a.buy_status, a.buy_status_other,
+            b.bname name
+        from user_interview_project a left join business_project b on a.pid=b.id
+        where a.uid = #{uid} and a.aid = #{aid}
+    </select>
+
 </mapper>
 

+ 10 - 0
src/main/java/com/goafanti/customer/bo/UserArchivesDetails.java

@@ -3,6 +3,7 @@ package com.goafanti.customer.bo;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.UserArchives;
 import com.goafanti.common.model.UserArchivesInterview;
+import com.goafanti.common.model.UserInterviewProjectBo;
 
 import java.util.List;
 
@@ -23,6 +24,15 @@ public class UserArchivesDetails extends UserArchives {
     private String LocationProvinceName;
     private String LocationCityName;
     private String LocationAreaName;
+    private List<UserInterviewProjectBo> projectList;
+
+    public List<UserInterviewProjectBo> getProjectList() {
+        return projectList;
+    }
+
+    public void setProjectList(List<UserInterviewProjectBo> projectList) {
+        this.projectList = projectList;
+    }
 
     public String getLocationProvinceName() {
         return LocationProvinceName;

+ 3 - 1
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -50,7 +50,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
     @Resource
     private DistrictGlossoryMapper districtGlossoryMapper;
     @Resource
-    private IndustryCategoryMapper industryCategoryMapper;
+    private UserInterviewProjectMapper userInterviewProjectMapper;
 
 
 
@@ -109,6 +109,8 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
             UserFirstInterview userFirstInterview = firstList.get(0);
             user.setFirstInterviewDate(userFirstInterview.getFirstTime());
         }
+        List<UserInterviewProjectBo> userInterviewProjects = userInterviewProjectMapper.selectByAid(TokenManager.getAdminId(), id);
+        user.setProjectList(userInterviewProjects);
         return user;
     }