ソースを参照

修改发起公出

anderx 3 年 前
コミット
4fe294063e

+ 93 - 82
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.goafanti.common.dao.PublicReleaseMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.PublicRelease">
     <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="uid" jdbcType="VARCHAR" property="uid" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="release_start" jdbcType="TIMESTAMP" property="releaseStart" />
     <result column="release_end" jdbcType="TIMESTAMP" property="releaseEnd" />
@@ -19,11 +18,8 @@
     <result column="photo_url" jdbcType="VARCHAR" property="photoUrl" />
     <result column="pid" jdbcType="VARCHAR" property="pid" />
     <result column="pname" jdbcType="VARCHAR" property="pname" />
-    <result column="ufid" jdbcType="VARCHAR" property="ufid" />
     <result column="duration" jdbcType="DOUBLE" property="duration" />
     <result column="valid_date" jdbcType="VARCHAR" property="validDate" />
-    <result column="new_user" jdbcType="INTEGER" property="newUser" />
-    <result column="sign_sum" jdbcType="INTEGER" property="signSum" />
     <result column="main_status" jdbcType="INTEGER" property="mainStatus" />
     <result column="supplement" jdbcType="VARCHAR" property="supplement" />
     <result column="audit_info" jdbcType="VARCHAR" property="auditInfo" />
@@ -45,14 +41,19 @@
     <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="uid" jdbcType="INTEGER" property="uid" />
+    <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" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, `uid`, aid, release_start, release_end, remarks, annex_url, user_name, longitude,
-    latitude, `status`, create_time, clock_in, clock_in_time, photo_url, pid, pname,
-    ufid, duration, valid_date, new_user, sign_sum, 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, clock_in_remarks, reject_name,
-    assistant_aid, assistant_name, public_again, audit_time
+    id, aid, release_start, release_end, remarks, annex_url, user_name, longitude, latitude,
+    `status`, create_time, clock_in, clock_in_time, photo_url, 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, clock_in_remarks, reject_name, assistant_aid, assistant_name,
+    public_again, audit_time, `uid`, ufid, new_user, sign_sum, user_names
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -65,43 +66,40 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
-    insert into public_release (`uid`, aid, release_start,
-      release_end, remarks, annex_url,
-      user_name, longitude, latitude,
-      `status`, create_time, clock_in,
-      clock_in_time, photo_url, pid,
-      pname, ufid, duration,
-      valid_date, new_user, sign_sum,
-      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,
-      clock_in_remarks, reject_name, assistant_aid,
-      assistant_name, public_again, audit_time
-      )
-    values (#{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP},
-      #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR},
-      #{userName,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR},
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{clockIn,jdbcType=INTEGER},
-      #{clockInTime,jdbcType=TIMESTAMP}, #{photoUrl,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR},
-      #{pname,jdbcType=VARCHAR}, #{ufid,jdbcType=VARCHAR}, #{duration,jdbcType=DOUBLE},
-      #{validDate,jdbcType=VARCHAR}, #{newUser,jdbcType=INTEGER}, #{signSum,jdbcType=INTEGER},
-      #{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},
-      #{clockInRemarks,jdbcType=VARCHAR}, #{rejectName,jdbcType=VARCHAR}, #{assistantAid,jdbcType=VARCHAR},
-      #{assistantName,jdbcType=VARCHAR}, #{publicAgain,jdbcType=INTEGER}, #{auditTime,jdbcType=TIMESTAMP}
-      )
+    insert into public_release (aid, release_start, release_end,
+      remarks, annex_url, user_name,
+      longitude, latitude, `status`,
+      create_time, clock_in, clock_in_time,
+      photo_url, 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, clock_in_remarks,
+      reject_name, assistant_aid, assistant_name,
+      public_again, audit_time, `uid`,
+      ufid, new_user, sign_sum,
+      user_names)
+    values (#{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP},
+      #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
+      #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
+      #{createTime,jdbcType=TIMESTAMP}, #{clockIn,jdbcType=INTEGER}, #{clockInTime,jdbcType=TIMESTAMP},
+      #{photoUrl,jdbcType=VARCHAR}, #{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}, #{clockInRemarks,jdbcType=VARCHAR},
+      #{rejectName,jdbcType=VARCHAR}, #{assistantAid,jdbcType=VARCHAR}, #{assistantName,jdbcType=VARCHAR},
+      #{publicAgain,jdbcType=INTEGER}, #{auditTime,jdbcType=TIMESTAMP}, #{uid,jdbcType=INTEGER},
+      #{ufid,jdbcType=VARCHAR}, #{newUser,jdbcType=VARCHAR}, #{signSum,jdbcType=VARCHAR},
+      #{userNames,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
     insert into public_release
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="uid != null">
-        `uid`,
-      </if>
       <if test="aid != null">
         aid,
       </if>
@@ -147,21 +145,12 @@
       <if test="pname != null">
         pname,
       </if>
-      <if test="ufid != null">
-        ufid,
-      </if>
       <if test="duration != null">
         duration,
       </if>
       <if test="validDate != null">
         valid_date,
       </if>
-      <if test="newUser != null">
-        new_user,
-      </if>
-      <if test="signSum != null">
-        sign_sum,
-      </if>
       <if test="mainStatus != null">
         main_status,
       </if>
@@ -225,11 +214,23 @@
       <if test="auditTime != null">
         audit_time,
       </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="uid != null">
-        #{uid,jdbcType=VARCHAR},
+        `uid`,
       </if>
+      <if test="ufid != null">
+        ufid,
+      </if>
+      <if test="newUser != null">
+        new_user,
+      </if>
+      <if test="signSum != null">
+        sign_sum,
+      </if>
+      <if test="userNames != null">
+        user_names,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
       </if>
@@ -275,21 +276,12 @@
       <if test="pname != null">
         #{pname,jdbcType=VARCHAR},
       </if>
-      <if test="ufid != null">
-        #{ufid,jdbcType=VARCHAR},
-      </if>
       <if test="duration != null">
         #{duration,jdbcType=DOUBLE},
       </if>
       <if test="validDate != null">
         #{validDate,jdbcType=VARCHAR},
       </if>
-      <if test="newUser != null">
-        #{newUser,jdbcType=INTEGER},
-      </if>
-      <if test="signSum != null">
-        #{signSum,jdbcType=INTEGER},
-      </if>
       <if test="mainStatus != null">
         #{mainStatus,jdbcType=INTEGER},
       </if>
@@ -353,14 +345,26 @@
       <if test="auditTime != null">
         #{auditTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="uid != null">
+        #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="ufid != null">
+        #{ufid,jdbcType=VARCHAR},
+      </if>
+      <if test="newUser != null">
+        #{newUser,jdbcType=VARCHAR},
+      </if>
+      <if test="signSum != null">
+        #{signSum,jdbcType=VARCHAR},
+      </if>
+      <if test="userNames != null">
+        #{userNames,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
     update public_release
     <set>
-      <if test="uid != null">
-        `uid` = #{uid,jdbcType=VARCHAR},
-      </if>
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
@@ -406,21 +410,12 @@
       <if test="pname != null">
         pname = #{pname,jdbcType=VARCHAR},
       </if>
-      <if test="ufid != null">
-        ufid = #{ufid,jdbcType=VARCHAR},
-      </if>
       <if test="duration != null">
         duration = #{duration,jdbcType=DOUBLE},
       </if>
       <if test="validDate != null">
         valid_date = #{validDate,jdbcType=VARCHAR},
       </if>
-      <if test="newUser != null">
-        new_user = #{newUser,jdbcType=INTEGER},
-      </if>
-      <if test="signSum != null">
-        sign_sum = #{signSum,jdbcType=INTEGER},
-      </if>
       <if test="mainStatus != null">
         main_status = #{mainStatus,jdbcType=INTEGER},
       </if>
@@ -484,13 +479,27 @@
       <if test="auditTime != null">
         audit_time = #{auditTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="uid != null">
+        `uid` = #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="ufid != null">
+        ufid = #{ufid,jdbcType=VARCHAR},
+      </if>
+      <if test="newUser != null">
+        new_user = #{newUser,jdbcType=VARCHAR},
+      </if>
+      <if test="signSum != null">
+        sign_sum = #{signSum,jdbcType=VARCHAR},
+      </if>
+      <if test="userNames != null">
+        user_names = #{userNames,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PublicRelease">
     update public_release
-    set `uid` = #{uid,jdbcType=VARCHAR},
-      aid = #{aid,jdbcType=VARCHAR},
+    set aid = #{aid,jdbcType=VARCHAR},
       release_start = #{releaseStart,jdbcType=TIMESTAMP},
       release_end = #{releaseEnd,jdbcType=TIMESTAMP},
       remarks = #{remarks,jdbcType=VARCHAR},
@@ -505,11 +514,8 @@
       photo_url = #{photoUrl,jdbcType=VARCHAR},
       pid = #{pid,jdbcType=VARCHAR},
       pname = #{pname,jdbcType=VARCHAR},
-      ufid = #{ufid,jdbcType=VARCHAR},
       duration = #{duration,jdbcType=DOUBLE},
       valid_date = #{validDate,jdbcType=VARCHAR},
-      new_user = #{newUser,jdbcType=INTEGER},
-      sign_sum = #{signSum,jdbcType=INTEGER},
       main_status = #{mainStatus,jdbcType=INTEGER},
       supplement = #{supplement,jdbcType=VARCHAR},
       audit_info = #{auditInfo,jdbcType=VARCHAR},
@@ -530,7 +536,12 @@
       assistant_aid = #{assistantAid,jdbcType=VARCHAR},
       assistant_name = #{assistantName,jdbcType=VARCHAR},
       public_again = #{publicAgain,jdbcType=INTEGER},
-      audit_time = #{auditTime,jdbcType=TIMESTAMP}
+      audit_time = #{auditTime,jdbcType=TIMESTAMP},
+      `uid` = #{uid,jdbcType=INTEGER},
+      ufid = #{ufid,jdbcType=VARCHAR},
+      new_user = #{newUser,jdbcType=VARCHAR},
+      sign_sum = #{signSum,jdbcType=VARCHAR},
+      user_names = #{userNames,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

+ 66 - 53
src/main/java/com/goafanti/common/model/PublicRelease.java

@@ -11,11 +11,6 @@ public class PublicRelease implements Serializable {
     private Integer id;
 
     /**
-     * 客户id
-     */
-    private String uid;
-
-    /**
      * 公出人
      */
     private String aid;
@@ -41,7 +36,7 @@ public class PublicRelease implements Serializable {
     private String annexUrl;
 
     /**
-     * 公出企业名称
+     * 公出企业地址
      */
     private String userName;
 
@@ -91,11 +86,6 @@ public class PublicRelease implements Serializable {
     private String pname;
 
     /**
-     * 跟进id
-     */
-    private String ufid;
-
-    /**
      * 时长
      */
     private Double duration;
@@ -106,16 +96,6 @@ public class PublicRelease implements Serializable {
     private String validDate;
 
     /**
-     * 客户类型 0新客户 1老客户
-     */
-    private Integer newUser;
-
-    /**
-     * 签单数
-     */
-    private Integer signSum;
-
-    /**
      * 0辅助根据 1主要跟进
      */
     private Integer mainStatus;
@@ -220,6 +200,31 @@ public class PublicRelease implements Serializable {
      */
     private Date auditTime;
 
+    /**
+     * 客户id
+     */
+    private Integer uid;
+
+    /**
+     * 跟进id
+     */
+    private String ufid;
+
+    /**
+     * 客户类型 0新客户 1老客户
+     */
+    private String newUser;
+
+    /**
+     * 签单数
+     */
+    private String signSum;
+
+    /**
+     * 公司名称
+     */
+    private String userNames;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -230,14 +235,6 @@ public class PublicRelease implements Serializable {
         this.id = id;
     }
 
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
     public String getAid() {
         return aid;
     }
@@ -358,14 +355,6 @@ public class PublicRelease implements Serializable {
         this.pname = pname;
     }
 
-    public String getUfid() {
-        return ufid;
-    }
-
-    public void setUfid(String ufid) {
-        this.ufid = ufid;
-    }
-
     public Double getDuration() {
         return duration;
     }
@@ -382,22 +371,6 @@ public class PublicRelease implements Serializable {
         this.validDate = validDate;
     }
 
-    public Integer getNewUser() {
-        return newUser;
-    }
-
-    public void setNewUser(Integer newUser) {
-        this.newUser = newUser;
-    }
-
-    public Integer getSignSum() {
-        return signSum;
-    }
-
-    public void setSignSum(Integer signSum) {
-        this.signSum = signSum;
-    }
-
     public Integer getMainStatus() {
         return mainStatus;
     }
@@ -565,4 +538,44 @@ public class PublicRelease implements Serializable {
     public void setAuditTime(Date auditTime) {
         this.auditTime = auditTime;
     }
+
+    public Integer getUid() {
+        return uid;
+    }
+
+    public void setUid(Integer uid) {
+        this.uid = uid;
+    }
+
+    public String getUfid() {
+        return ufid;
+    }
+
+    public void setUfid(String ufid) {
+        this.ufid = ufid;
+    }
+
+    public String getNewUser() {
+        return newUser;
+    }
+
+    public void setNewUser(String newUser) {
+        this.newUser = newUser;
+    }
+
+    public String getSignSum() {
+        return signSum;
+    }
+
+    public void setSignSum(String signSum) {
+        this.signSum = signSum;
+    }
+
+    public String getUserNames() {
+        return userNames;
+    }
+
+    public void setUserNames(String userNames) {
+        this.userNames = userNames;
+    }
 }

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

@@ -309,25 +309,24 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		str=str.append("(").append(ad.getName()).append(")");
 		Integer type=0;
 		String content="";
-		User u=userMapper.selectByPrimaryKey(use.getUid());
 		Admin a=adminMapper.selectByPrimaryKey(use.getAid());
 		if (status==0){
 			str=str.append("驳回,");
 			if (use.getAssist()==2){
-				content="["+u.getNickname()+"]公司的外出申请,技术协单被["+ad.getName()+"]拒绝!";
+				content="["+use.getUserNames()+"]公司的外出申请,技术协单被["+ad.getName()+"]拒绝!";
 			}else {
-				content="["+u.getNickname()+"]公司的外出申请,未通过公出审核!";
+				content="["+use.getUserNames()+"]公司的外出申请,未通过公出审核!";
 			}
 		}else if(status==2){
 			str=str.append("同意,");
 			//如果是协单公出主公出,在审核通过
 			if (use.getAssist()==1){
-				pushPublicReleaseAssist(use,status,date,u,a);
+				pushPublicReleaseAssist(use,status,date,a);
 			}else if (use.getAssist()==0){
 				publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
 			}
 
-			content="["+u.getNickname()+"]公司的外出申请,已通过审核!";
+			content="["+use.getUserNames()+"]公司的外出申请,已通过审核!";
 		}
 		str=str.append(remarks);
 		p.setAuditInfo(str.toString());
@@ -412,14 +411,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @param use 原始公出信息
 	 * @param status 状态
 	 * @param date 时间
-	 * @param u 客户
 	 * @param a
 	 */
-	private void pushPublicReleaseAssist(PublicRelease use,Integer status,Date date,User u,Admin a) {
+	private void pushPublicReleaseAssist(PublicRelease use,Integer status,Date date,Admin a) {
 		if (use.getAssistAid()!=null){
-			updatePushassist(use, status, date,u,a);
+			updatePushassist(use, status, date,a);
 			if(use.getAssistantAid()!=null){
-				updatepushAssistant(use,u,a);
+				updatepushAssistant(use,a);
 			}
 
 		}
@@ -431,7 +429,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @param status
 	 * @param date
 	 */
-	private void updatePushassist(PublicRelease use, Integer status, Date date, User u,Admin a) {
+	private void updatePushassist(PublicRelease use, Integer status, Date date, Admin a) {
 		//协单
 		List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId(),3,null);
 		String []ss= use.getAssistAid().split(",");
@@ -449,7 +447,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				in.setId(out.getId());
 				in.setStatus(3);
 				publicReleaseMapper.updateByPrimaryKeySelective(in);
-				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]取消公出").append("[").append(u.getUsername()).append("]。");
+				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]取消公出").append("[").append(use.getUserNames()).append("]。");
 				PublicReleaseLog log = new PublicReleaseLog(in.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.cx.getCode(), str.toString(), date);
 				publicReleaseLogMapper.insertSelective(log);
 				sendNoticeAndSoucket(out.getAid(),in.getStatus(),str.toString());
@@ -465,7 +463,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				np.setStatus(status);
 				np.setAid(null);
 				publicReleaseMapper.updateByPrimaryKeySelective(np);
-				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(u.getUsername()).append("]。");
+				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(use.getUserNames()).append("]。");
 				PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(),str.toString(), date);
 				publicReleaseLogMapper.insertSelective(log);
 				sendNoticeAndSoucket(out.getAid(),np.getStatus(),str.toString());
@@ -488,7 +486,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				np.setMainId(use.getId());
 				np.setId(null);
 				publicReleaseMapper.insertSelective(np);
-				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]邀请你技术协单").append("[").append(u.getUsername()).append("]。");
+				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]邀请你技术协单").append("[").append(use.getUserNames()).append("]。");
 				PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.fq.getCode(), str.toString(), date);
 				sendNoticeAndSoucket(np.getAid(),np.getStatus(),str.toString());
 				publicReleaseLogMapper.insertSelective(log);
@@ -500,7 +498,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * 处理技术助手
 	 * @param use
 	 */
-	private void updatepushAssistant(PublicRelease use,User u,Admin a) {
+	private void updatepushAssistant(PublicRelease use,Admin a) {
 		List<String> list=new ArrayList();
 		list =new ArrayList<>(Arrays.asList(use.getAssistantAid().split(",")));
 		List<PublicRelease> deletelist = publicReleaseMapper.selectByMainId(use.getId(),4,null);
@@ -523,7 +521,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					if (!use.getReleaseEnd().equals(p.getReleaseEnd()))p.setReleaseEnd(use.getReleaseEnd());
 					p.setStatus(2);
 					publicReleaseMapper.updateByPrimaryKeySelective(p);
-					StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了").append("[").append(u.getUsername()).append("]。");
+					StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了").append("[").append(use.getUserNames()).append("]。");
 					PublicReleaseLog log = new PublicReleaseLog(p.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), str.toString(), new Date());
 					sendNoticeAndSoucket(p.getAid(),p.getStatus(),str.toString());
 					publicReleaseLogMapper.insertSelective(log);
@@ -840,10 +838,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 			}
 		}
-
-		User u=userMapper.selectByPrimaryKey(p.getUid());
 		StringBuffer str=new StringBuffer();
-		str=str.append("公出").append("[").append(u.getUsername()).append("]").append("邀请你协助!");
+		str=str.append("公出").append("[").append(p.getUserNames()).append("]").append("邀请你协助!");
 		addWeChatNotice( aid,1,str.toString(),newP.getId());
 	}
 
@@ -949,9 +945,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	private void deleteAssistantPulicRelease(PublicRelease p, String aid) {
 		publicReleaseMapper.updateStatusByMainId(3,4,p.getMainId(),aid);
 		List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, aid);
-		User u=userMapper.selectByPrimaryKey(p.getUid());
 		StringBuffer str=new StringBuffer();
-		str=str.append("公出").append("[").append(u.getUsername()).append("]").append("撤销了你的协助!");
+		str=str.append("公出").append("[").append(p.getUserNames()).append("]").append("撤销了你的协助!");
 		for (PublicRelease pr : list) {
 			addWeChatNotice( pr.getAid(),3,str.toString(),pr.getId());
 		}