Merge branch 'feature/xgh/2502朋友圈' into 'master'

朋友圈

See merge request !2664

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/moment/QwMomentPlanAttendMapper.java

@@ -46,7 +46,7 @@ public interface QwMomentPlanAttendMapper {
 
     List<TaskListWxaDTO> taskListWxa(TaskListWxaQDTO qdto);
 
-    void finishTask(@Param("attendId")Long attendId, @Param("sendTime")Date sendTime );
+    void finishTask(@Param("attendId")Long attendId, @Param("sendTime")Date sendTime , @Param("staffId")  String staffId);
 
     void updateMomentId(@Param("id") Long id, @Param("momentId") String jobId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/QwMomentPlanAttendService.java

@@ -35,5 +35,5 @@ public interface QwMomentPlanAttendService {
 
     void updateStatusFlag(TabQwMomentPlan plan) ;
 
-    void finishTaskUpdateData(Long attendId , Long planId , Date sendDate) ;
+    void finishTaskUpdateData(Long attendId , Long planId , Date sendDate , String staffId) ;
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanAttendServiceImpl.java

@@ -214,7 +214,7 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
         if(null == dto) {
             return ServiceResponse.failure("9999","任务不存在");
         }
-        this.finishTaskUpdateData(dto.getAttendId(),planId,qdto.getSendTime()) ;
+        this.finishTaskUpdateData(dto.getAttendId(),planId,qdto.getSendTime(),qdto.getStaffId()) ;
         String momentId = this.getMomentId(qdto.getStaffId() , qdto.getSendTime() , 0) ;
         if(StringUtils.isNotBlank(momentId)) {
             this.qwMomentPlanAttendMapper.updateMomentId(dto.getAttendId(),momentId);
@@ -253,12 +253,12 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
     }
 
     @Override
-    public void finishTaskUpdateData(Long attendId , Long planId , Date sendDate) {
+    public void finishTaskUpdateData(Long attendId , Long planId , Date sendDate , String staffId) {
         TabQwMomentPlanAttend attend = this.qwMomentPlanAttendMapper.getById(attendId) ;
         if(attend.getTaskStatus()==2) {
             return;
         }
-        this.qwMomentPlanAttendMapper.finishTask(attendId,sendDate) ;
+        this.qwMomentPlanAttendMapper.finishTask(attendId,sendDate,staffId) ;
         this.qwMomentPlanMapper.updateClerkNum(planId,-1,-1,1);
         // 完成代办
         this.pendingTaskService.updateFinish(attendId+"") ;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanDataServiceImpl.java

@@ -129,7 +129,7 @@ public class QwMomentPlanDataServiceImpl implements QwMomentPlanDataService {
         }
         this.qwMomentPlanAttendMapper.updateQwData(task.getPlanId(),task.getClerkId(),likeCount,commentCount) ;
         if((likeCount > 0 || commentCount > 0) && task.getTaskStatus()==1) {
-            this.qwMomentPlanAttendService.finishTaskUpdateData(task.getAttendId(), task.getPlanId() , new Date());
+            this.qwMomentPlanAttendService.finishTaskUpdateData(task.getAttendId(), task.getPlanId() , new Date(),null);
         }
         return ServiceResponse.success();
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanServiceImpl.java

@@ -597,7 +597,7 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
                     String staffId = staff.getStaffId();
                     TabQwMomentPlanAttend attend = this.qwMomentPlanAttendMapper.getByStaff(planId, staffId);
                     if(attend.getTaskStatus()==1) {
-                       this.qwMomentPlanAttendService.finishTaskUpdateData(attend.getAttendId(),attend.getPlanId(),new Date()) ;
+                       this.qwMomentPlanAttendService.finishTaskUpdateData(attend.getAttendId(),attend.getPlanId(),new Date(),null) ;
                     }
                 }
             }

haoban-manage3-service/src/main/resources/mapper/moment/qwMomentPlanAttendMapper.xml

@@ -203,7 +203,11 @@
 
 
     <update id="finishTask">
-        update  tab_haoban_qw_moment_plan_attend set task_status = 2 , send_time= #{sendTime} where attend_id = #{attendId}
+        update  tab_haoban_qw_moment_plan_attend set task_status = 2 , send_time= #{sendTime}
+                                                 <if test="null != staffId">
+                                                     , staff_id = #{staffId}
+                                                 </if>
+                                                 where attend_id = #{attendId}
     </update>
 
     <update id="updateMomentId">