Ver código fonte

客户查询修改成全部查询

anderx 8 meses atrás
pai
commit
3ce6fd2c51

+ 24 - 13
src/main/java/com/goafanti/common/mapper/UserInterviewProjectMapper.xml

@@ -9,6 +9,7 @@
         <result property="pid" column="pid" jdbcType="VARCHAR"/>
         <result property="prdid" column="prdid" jdbcType="INTEGER"/>
         <result property="type" column="type" jdbcType="INTEGER"/>
+        <result property="status" column="status" 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"/>
@@ -16,7 +17,7 @@
     </resultMap>
 
     <sql id="UserInterviewProjectAllSql">
-        id, uid, aid, pid, prdid, type, examine_status, examine_status_other, buy_status, buy_status_other
+        id, uid, aid, pid, prdid, type, status, examine_status, examine_status_other, buy_status, buy_status_other
     </sql>
 
     <!--查询单个-->
@@ -29,29 +30,29 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into user_interview_project(uid, aid, pid, prdid, type, examine_status, examine_status_other, buy_status,
-                                           buy_status_other)
-        values (#{uid}, #{aid}, #{pid}, #{prdid}, #{type}, #{examineStatus}, #{examineStatusOther}, #{buyStatus},
-                #{buyStatusOther})
+        insert into user_interview_project(uid, aid, pid, prdid, type, status, examine_status, examine_status_other,
+                                           buy_status, buy_status_other)
+        values (#{uid}, #{aid}, #{pid}, #{prdid}, #{type}, #{status}, #{examineStatus}, #{examineStatusOther},
+                #{buyStatus}, #{buyStatusOther})
     </insert>
 
     <insert id="insertBatch">
-        insert into user_interview_project(uid, aid, pid, prdid, type, examine_status, examine_status_other, buy_status,
-        buy_status_other)
+        insert into user_interview_project(uid, aid, pid, prdid, type, status, examine_status, examine_status_other,
+        buy_status, buy_status_other)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.uid}, #{entity.aid}, #{entity.pid}, #{entity.prdid}, #{entity.type}, #{entity.examineStatus},
-            #{entity.examineStatusOther}, #{entity.buyStatus}, #{entity.buyStatusOther})
+            (#{entity.uid}, #{entity.aid}, #{entity.pid}, #{entity.prdid}, #{entity.type}, #{entity.status},
+            #{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, prdid, type, examine_status, examine_status_other, buy_status,
-        buy_status_other)
+        insert into user_interview_project(uid, aid, pid, prdid, type, status, examine_status, examine_status_other,
+        buy_status, buy_status_other)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.uid}, #{entity.aid}, #{entity.pid}, #{entity.prdid}, #{entity.type}, #{entity.examineStatus},
-            #{entity.examineStatusOther}, #{entity.buyStatus}, #{entity.buyStatusOther})
+            (#{entity.uid}, #{entity.aid}, #{entity.pid}, #{entity.prdid}, #{entity.type}, #{entity.status},
+            #{entity.examineStatus}, #{entity.examineStatusOther}, #{entity.buyStatus}, #{entity.buyStatusOther})
         </foreach>
         on duplicate key update
         uid = values(uid),
@@ -59,6 +60,7 @@
         pid = values(pid),
         prdid = values(prdid),
         type = values(type),
+        status = values(status),
         examine_status = values(examine_status),
         examine_status_other = values(examine_status_other),
         buy_status = values(buy_status),
@@ -84,6 +86,9 @@
             <if test="type != null">
                 type = #{type},
             </if>
+            <if test="status != null">
+                status = #{status},
+            </if>
             <if test="examineStatus != null">
                 examine_status = #{examineStatus},
             </if>
@@ -138,6 +143,9 @@
             <if test="type != null">
                 and type = #{type}
             </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
             <if test="examineStatus != null">
                 and examine_status = #{examineStatus}
             </if>
@@ -179,6 +187,9 @@
             <if test="type != null">
                 and type = #{type}
             </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
             <if test="examineStatus != null">
                 and examine_status = #{examineStatus}
             </if>

+ 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-22 16:52:45
+ * @since 2025-04-22 17:22:50
  */
 public class UserInterviewProject implements Serializable {
-    private static final long serialVersionUID = -39209773983788594L;
+    private static final long serialVersionUID = -90007626271441238L;
 
     private Integer id;
     /**
@@ -34,6 +34,10 @@ public class UserInterviewProject implements Serializable {
      */
     private Integer type;
     /**
+     * 状态 0=正常,1=废除
+     */
+    private Integer status;
+    /**
      * 审核状态 0=否,1=初次审核,2=复审
      */
     private Integer examineStatus;
@@ -99,6 +103,14 @@ public class UserInterviewProject implements Serializable {
         this.type = type;
     }
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     public Integer getExamineStatus() {
         return examineStatus;
     }

+ 0 - 3
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1125,9 +1125,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		if (p.getStatus()!=null||p.getPublicType()!=null||p.getTechStartProcess()!=null){
 			publicReleaseMapper.update(p);
-			if (p.getStatus() ==2&&use.getPublicType()==0&&use.getTechStartProcess()==0){
-				pushFirstPublic(use);
-			}
 		}
 		if (a.getOpenId()!=null) {
 			if (remarks.length()>19) {