Parcourir la source

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

anderx il y a 9 mois
Parent
commit
81eab3238f

+ 2 - 0
src/main/java/com/goafanti/Interview/service/impl/UserArchivesInterviewServiceImpl.java

@@ -110,6 +110,8 @@ public class UserArchivesInterviewServiceImpl extends BaseMybatisDao<UserArchive
         if (in.getId()!=null){
             userArchivesMapper.update(in);
         }else {
+            in.setEarlyCommunication(null);
+            in.setInterviewIdeas(null);
             in.setCreateTime(new Date());
             userArchivesMapper.insert(in);
         }

+ 1 - 0
src/main/java/com/goafanti/Interview/service/impl/UserInterviewProjectServiceImpl.java

@@ -57,6 +57,7 @@ public class UserInterviewProjectServiceImpl extends BaseMybatisDao<UserIntervie
      */
     @Override
     public UserInterviewProject insert(UserInterviewProject userInterviewProject) {
+        userInterviewProject.setType(0);
         this.userInterviewProjectMapper.insert(userInterviewProject);
         return userInterviewProject;
     }

+ 21 - 10
src/main/java/com/goafanti/common/mapper/UserInterviewProjectMapper.xml

@@ -7,6 +7,7 @@
         <result property="uid" column="uid" jdbcType="VARCHAR"/>
         <result property="aid" column="aid" jdbcType="VARCHAR"/>
         <result property="pid" column="pid" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="INTEGER"/>
         <result property="examineStatus" column="examine_status" jdbcType="INTEGER"/>
         <result property="examineStatusOther" column="examine_status_other" jdbcType="VARCHAR"/>
         <result property="buyStatus" column="buy_status" jdbcType="INTEGER"/>
@@ -14,7 +15,7 @@
     </resultMap>
 
     <sql id="UserInterviewProjectAllSql">
-        id, uid, aid, pid, examine_status, examine_status_other, buy_status, buy_status_other
+        id, uid, aid, pid, type, examine_status, examine_status_other, buy_status, buy_status_other
     </sql>
 
     <!--查询单个-->
@@ -27,33 +28,35 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into user_interview_project(uid, aid, pid, examine_status, examine_status_other, buy_status,
+        insert into user_interview_project(uid, aid, pid, type, examine_status, examine_status_other, buy_status,
                                            buy_status_other)
-        values (#{uid}, #{aid}, #{pid}, #{examineStatus}, #{examineStatusOther}, #{buyStatus}, #{buyStatusOther})
+        values (#{uid}, #{aid}, #{pid}, #{type}, #{examineStatus}, #{examineStatusOther}, #{buyStatus},
+                #{buyStatusOther})
     </insert>
 
     <insert id="insertBatch">
-        insert into user_interview_project(uid, aid, pid, examine_status, examine_status_other, buy_status,
+        insert into user_interview_project(uid, aid, pid, type, examine_status, examine_status_other, buy_status,
         buy_status_other)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.uid}, #{entity.aid}, #{entity.pid}, #{entity.examineStatus}, #{entity.examineStatusOther},
-            #{entity.buyStatus}, #{entity.buyStatusOther})
+            (#{entity.uid}, #{entity.aid}, #{entity.pid}, #{entity.type}, #{entity.examineStatus},
+            #{entity.examineStatusOther}, #{entity.buyStatus}, #{entity.buyStatusOther})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into user_interview_project(uid, aid, pid, examine_status, examine_status_other, buy_status,
+        insert into user_interview_project(uid, aid, pid, type, examine_status, examine_status_other, buy_status,
         buy_status_other)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.uid}, #{entity.aid}, #{entity.pid}, #{entity.examineStatus}, #{entity.examineStatusOther},
-            #{entity.buyStatus}, #{entity.buyStatusOther})
+            (#{entity.uid}, #{entity.aid}, #{entity.pid}, #{entity.type}, #{entity.examineStatus},
+            #{entity.examineStatusOther}, #{entity.buyStatus}, #{entity.buyStatusOther})
         </foreach>
         on duplicate key update
         uid = values(uid),
         aid = values(aid),
         pid = values(pid),
+        type = values(type),
         examine_status = values(examine_status),
         examine_status_other = values(examine_status_other),
         buy_status = values(buy_status),
@@ -73,6 +76,9 @@
             <if test="pid != null and pid != ''">
                 pid = #{pid},
             </if>
+            <if test="type != null">
+                type = #{type},
+            </if>
             <if test="examineStatus != null">
                 examine_status = #{examineStatus},
             </if>
@@ -119,6 +125,9 @@
             <if test="pid != null and pid != ''">
                 and pid = #{pid}
             </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
             <if test="examineStatus != null">
                 and examine_status = #{examineStatus}
             </if>
@@ -154,6 +163,9 @@
             <if test="pid != null and pid != ''">
                 and pid = #{pid}
             </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
             <if test="examineStatus != null">
                 and examine_status = #{examineStatus}
             </if>
@@ -169,7 +181,6 @@
         </where>
     </select>
 
-
     <!--通过主键删除-->
     <delete id="deleteById">
         delete

+ 14 - 2
src/main/java/com/goafanti/common/model/UserInterviewProject.java

@@ -7,10 +7,10 @@ import java.io.Serializable;
  * 客户面谈项目表(UserInterviewProject)实体类
  *
  * @author makejava
- * @since 2025-04-16 10:26:21
+ * @since 2025-04-16 16:28:59
  */
 public class UserInterviewProject implements Serializable {
-    private static final long serialVersionUID = 446779262856045999L;
+    private static final long serialVersionUID = 877764991133560176L;
 
     private Integer id;
     /**
@@ -26,6 +26,10 @@ public class UserInterviewProject implements Serializable {
      */
     private String pid;
     /**
+     * 0=本次,1=上次
+     */
+    private Integer type;
+    /**
      * 审核状态 0=否,1=初次审核,2=复审
      */
     private Integer examineStatus;
@@ -75,6 +79,14 @@ public class UserInterviewProject implements Serializable {
         this.pid = pid;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     public Integer getExamineStatus() {
         return examineStatus;
     }