Ver código fonte

Merge branch 'test' of jishutao/kede-server into prod

anderx 3 anos atrás
pai
commit
49cb53df67

+ 21 - 45
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -14,7 +14,6 @@
     <result column="pname" jdbcType="VARCHAR" property="pname" />
     <result column="duration" jdbcType="DOUBLE" property="duration" />
     <result column="valid_date" jdbcType="VARCHAR" property="validDate" />
-    <result column="main_status" jdbcType="INTEGER" property="mainStatus" />
     <result column="supplement" jdbcType="VARCHAR" property="supplement" />
     <result column="audit_info" jdbcType="VARCHAR" property="auditInfo" />
     <result column="plan" jdbcType="VARCHAR" property="plan" />
@@ -34,7 +33,6 @@
     <result column="assistant_name" jdbcType="VARCHAR" property="assistantName" />
     <result column="public_again" jdbcType="INTEGER" property="publicAgain" />
     <result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
-    <result column="ufid" jdbcType="VARCHAR" property="ufid" />
     <result column="new_user" jdbcType="VARCHAR" property="newUser" />
     <result column="sign_sum" jdbcType="VARCHAR" property="signSum" />
     <result column="user_names" jdbcType="VARCHAR" property="userNames" />
@@ -42,10 +40,10 @@
   </resultMap>
   <sql id="Base_Column_List">
     id, aid, release_start, release_end, remarks, annex_url, `status`, create_time, pid,
-    pname, duration, valid_date, main_status, supplement, audit_info, `plan`, expected_effect,
-    next_plan, `type`, order_no, update_time, update_status, assist, assist_aid, assist_aid_name,
+    pname, duration, valid_date, supplement, audit_info, `plan`, expected_effect, next_plan,
+    `type`, order_no, update_time, update_status, assist, assist_aid, assist_aid_name,
     main_id, main_name, reject_name, assistant_aid, assistant_name, public_again, audit_time,
-    ufid, new_user, sign_sum, user_names, object_type
+    new_user, sign_sum, user_names, object_type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -61,29 +59,27 @@
     insert into public_release (aid, release_start, release_end,
       remarks, annex_url, `status`,
       create_time, pid, pname,
-      duration, valid_date, main_status,
-      supplement, audit_info, `plan`,
-      expected_effect, next_plan, `type`,
-      order_no, update_time, update_status,
-      assist, assist_aid, assist_aid_name,
-      main_id, main_name, reject_name,
-      assistant_aid, assistant_name, public_again,
-      audit_time, ufid, new_user,
-      sign_sum, user_names, object_type
-      )
+      duration, valid_date, supplement,
+      audit_info, `plan`, expected_effect,
+      next_plan, `type`, order_no,
+      update_time, update_status, assist,
+      assist_aid, assist_aid_name, main_id,
+      main_name, reject_name, assistant_aid,
+      assistant_name, public_again, audit_time,
+      new_user, sign_sum, user_names,
+      object_type)
     values (#{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP},
       #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{pid,jdbcType=VARCHAR}, #{pname,jdbcType=VARCHAR},
-      #{duration,jdbcType=DOUBLE}, #{validDate,jdbcType=VARCHAR}, #{mainStatus,jdbcType=INTEGER},
-      #{supplement,jdbcType=VARCHAR}, #{auditInfo,jdbcType=VARCHAR}, #{plan,jdbcType=VARCHAR},
-      #{expectedEffect,jdbcType=VARCHAR}, #{nextPlan,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER},
-      #{orderNo,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{updateStatus,jdbcType=INTEGER},
-      #{assist,jdbcType=INTEGER}, #{assistAid,jdbcType=VARCHAR}, #{assistAidName,jdbcType=VARCHAR},
-      #{mainId,jdbcType=INTEGER}, #{mainName,jdbcType=VARCHAR}, #{rejectName,jdbcType=VARCHAR},
-      #{assistantAid,jdbcType=VARCHAR}, #{assistantName,jdbcType=VARCHAR}, #{publicAgain,jdbcType=INTEGER},
-      #{auditTime,jdbcType=TIMESTAMP}, #{ufid,jdbcType=VARCHAR}, #{newUser,jdbcType=VARCHAR},
-      #{signSum,jdbcType=VARCHAR}, #{userNames,jdbcType=VARCHAR}, #{objectType,jdbcType=INTEGER}
-      )
+      #{duration,jdbcType=DOUBLE}, #{validDate,jdbcType=VARCHAR}, #{supplement,jdbcType=VARCHAR},
+      #{auditInfo,jdbcType=VARCHAR}, #{plan,jdbcType=VARCHAR}, #{expectedEffect,jdbcType=VARCHAR},
+      #{nextPlan,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR},
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateStatus,jdbcType=INTEGER}, #{assist,jdbcType=INTEGER},
+      #{assistAid,jdbcType=VARCHAR}, #{assistAidName,jdbcType=VARCHAR}, #{mainId,jdbcType=INTEGER},
+      #{mainName,jdbcType=VARCHAR}, #{rejectName,jdbcType=VARCHAR}, #{assistantAid,jdbcType=VARCHAR},
+      #{assistantName,jdbcType=VARCHAR}, #{publicAgain,jdbcType=INTEGER}, #{auditTime,jdbcType=TIMESTAMP},
+      #{newUser,jdbcType=VARCHAR}, #{signSum,jdbcType=VARCHAR}, #{userNames,jdbcType=VARCHAR},
+      #{objectType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
     insert into public_release
@@ -121,9 +117,6 @@
       <if test="validDate != null">
         valid_date,
       </if>
-      <if test="mainStatus != null">
-        main_status,
-      </if>
       <if test="supplement != null">
         supplement,
       </if>
@@ -181,9 +174,6 @@
       <if test="auditTime != null">
         audit_time,
       </if>
-      <if test="ufid != null">
-        ufid,
-      </if>
       <if test="newUser != null">
         new_user,
       </if>
@@ -231,9 +221,6 @@
       <if test="validDate != null">
         #{validDate,jdbcType=VARCHAR},
       </if>
-      <if test="mainStatus != null">
-        #{mainStatus,jdbcType=INTEGER},
-      </if>
       <if test="supplement != null">
         #{supplement,jdbcType=VARCHAR},
       </if>
@@ -291,9 +278,6 @@
       <if test="auditTime != null">
         #{auditTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="ufid != null">
-        #{ufid,jdbcType=VARCHAR},
-      </if>
       <if test="newUser != null">
         #{newUser,jdbcType=VARCHAR},
       </if>
@@ -344,9 +328,6 @@
       <if test="validDate != null">
         valid_date = #{validDate,jdbcType=VARCHAR},
       </if>
-      <if test="mainStatus != null">
-        main_status = #{mainStatus,jdbcType=INTEGER},
-      </if>
       <if test="supplement != null">
         supplement = #{supplement,jdbcType=VARCHAR},
       </if>
@@ -404,9 +385,6 @@
       <if test="auditTime != null">
         audit_time = #{auditTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="ufid != null">
-        ufid = #{ufid,jdbcType=VARCHAR},
-      </if>
       <if test="newUser != null">
         new_user = #{newUser,jdbcType=VARCHAR},
       </if>
@@ -435,7 +413,6 @@
       pname = #{pname,jdbcType=VARCHAR},
       duration = #{duration,jdbcType=DOUBLE},
       valid_date = #{validDate,jdbcType=VARCHAR},
-      main_status = #{mainStatus,jdbcType=INTEGER},
       supplement = #{supplement,jdbcType=VARCHAR},
       audit_info = #{auditInfo,jdbcType=VARCHAR},
       `plan` = #{plan,jdbcType=VARCHAR},
@@ -455,7 +432,6 @@
       assistant_name = #{assistantName,jdbcType=VARCHAR},
       public_again = #{publicAgain,jdbcType=INTEGER},
       audit_time = #{auditTime,jdbcType=TIMESTAMP},
-      ufid = #{ufid,jdbcType=VARCHAR},
       new_user = #{newUser,jdbcType=VARCHAR},
       sign_sum = #{signSum,jdbcType=VARCHAR},
       user_names = #{userNames,jdbcType=VARCHAR},

+ 0 - 26
src/main/java/com/goafanti/common/model/PublicRelease.java

@@ -66,11 +66,6 @@ public class PublicRelease implements Serializable {
     private String validDate;
 
     /**
-     * 0辅助根据 1主要跟进
-     */
-    private Integer mainStatus;
-
-    /**
      * 本次总结
      */
     private String supplement;
@@ -166,11 +161,6 @@ public class PublicRelease implements Serializable {
     private Date auditTime;
 
     /**
-     * 跟进id
-     */
-    private String ufid;
-
-    /**
      * 客户类型 0新客户 1老客户
      */
     private String newUser;
@@ -288,14 +278,6 @@ public class PublicRelease implements Serializable {
         this.validDate = validDate;
     }
 
-    public Integer getMainStatus() {
-        return mainStatus;
-    }
-
-    public void setMainStatus(Integer mainStatus) {
-        this.mainStatus = mainStatus;
-    }
-
     public String getSupplement() {
         return supplement;
     }
@@ -448,14 +430,6 @@ public class PublicRelease implements Serializable {
         this.auditTime = auditTime;
     }
 
-    public String getUfid() {
-        return ufid;
-    }
-
-    public void setUfid(String ufid) {
-        this.ufid = ufid;
-    }
-
     public String getNewUser() {
         return newUser;
     }

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

@@ -657,7 +657,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					fbb.setFollowTime(DateUtils.formatDate(prd.getClockInTime(), AFTConstants.YYYYMMDDHHMMSS));
 					String ufid = UUID.randomUUID().toString();
 					prd.setUfid(ufid);
-					customerService.addFollow(fbb, ufid, use.getMainStatus());
+					customerService.addFollow(fbb, ufid, prd.getMainStatus());
 					str = "公出人员打卡";
 				}else if (clockIn == 2){
 					str = "公出人员异常打卡";