小程序查询接口

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatPlanApiService.java

@@ -30,6 +30,8 @@ public interface GroupChatPlanApiService {
     
     // 更新备注
     public ServiceResponse<GroupChatPlanDTO> updateRemark(GroupChatPlanDTO dto);
+    
+    public ServiceResponse<GroupChatPlanOwnerLogDTO> getOwnerInfo(Long planId ,String staffId , String clerkId , String wxEnterpriseId);
 
     /**
      * 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatPlanOwnerLogMapper.java

@@ -42,4 +42,6 @@ public interface GroupChatPlanOwnerLogMapper {
     public List<ChatOwnerTotalDTO> listOwnerLogPageForWxaTotal(GroupChatPlanSearchQDTO qdto);
 
     public List<GroupChatPlanOwnerLogDTO> listOwnerLogPageForWxa(GroupChatPlanSearchQDTO qdto);
+
+    public GroupChatPlanOwnerLogDTO getOwnerInfo(@Param("planId")Long planId, @Param("staffId")String staffId, @Param("clerkId")String clerkId, @Param("wxEnterpriseId")String wxEnterpriseId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/GroupChatPlanOwnerLogService.java

@@ -33,4 +33,6 @@ public interface GroupChatPlanOwnerLogService {
     public Page<GroupChatPlanOwnerLogDTO> listOwnerLogPageForWxa(GroupChatPlanSearchQDTO qdto,
             BasePageInfo basePageInfo);
 
+    public GroupChatPlanOwnerLogDTO getOwnerInfo(Long planId, String staffId, String clerkId, String wxEnterpriseId);
+
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanOwnerLogServiceImpl.java

@@ -235,5 +235,15 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
                 GroupChatPlanOwnerLogDTO.class);
         return retPage;
     }
+    
+    @Override
+    public GroupChatPlanOwnerLogDTO getOwnerInfo(Long planId, String staffId, String clerkId, String wxEnterpriseId) {
+        GroupChatPlanOwnerLogDTO dto = this.groupChatPlanOwnerLogMapper.getOwnerInfo(planId,staffId,clerkId,wxEnterpriseId) ; 
+        if(null != dto && StringUtils.isNotBlank(dto.getClerkId())) {
+           ClerkDTO clerk =  this.clerkService.getclerkById(dto.getClerkId());
+           dto.setClerkName(clerk.getClerkName());
+        }
+        return dto;
+    }
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatPlanApiServiceImpl.java

@@ -56,7 +56,14 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
         this.groupChatPlanService.updateRemark(dto);
         return ServiceResponse.success(dto);
     }
-
+    
+    @Override
+    public ServiceResponse<GroupChatPlanOwnerLogDTO> getOwnerInfo(Long planId, String staffId, String clerkId,
+            String wxEnterpriseId) {
+        GroupChatPlanOwnerLogDTO dto = this.groupChatPlanOwnerLogService.getOwnerInfo(planId,staffId,clerkId , wxEnterpriseId) ;
+        return ServiceResponse.success(dto);
+    }
+    
     /**
      * 
     * @Title: doPlan

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatMapper.xml

@@ -124,7 +124,7 @@
 	
 	<update id="updateChatErrorRemark">
 	  update tab_haoban_group_chat set 
-		  chat_remark = #{chatRemark} , init_flag = 2 , update_time = now() 
+		  chat_remark = #{chatRemark} , init_flag = 2 , update_time = now() , staff_id = null
 	    where group_chat_id = #{groupChatId} 
 	</update>
 	

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -204,4 +204,29 @@
   	  	 order by a.create_time desc , a.owner_log_id
   </select>
   
+  <select id="getOwnerInfo"  resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
+  		select 
+  		a.owner_log_id ownerLogId ,
+  		b.plan_id   planId , 
+  	 	b.name      planName ,
+  	 	a.staff_id  staffId , 
+  	 	a.clerk_id  clerkId ,
+  	 	a.store_id  storeId ,
+  	 	a.send_status sendStatus ,
+  	 	a.send_count  sendCount , 
+  	 	a.fail_count  failCount ,
+  	 	a.send_time   sendTime ,
+  	 	a.create_time createTime ,
+  	 	b.end_time  expireDate ,
+  	 	b.end_time  endTime ,
+  	 	b.start_time startTime ,
+  	 	a.done_flag   doneFlag ,
+  	 	a.msgid       msgid 
+  	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
+  	  where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  and b.delete_flag = 0 and a.staff_id = #{staffId}
+  	  and a.clerk_id = #{clerkId}
+  </select>
+  
+  
+  
 </mapper> 
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/haoban/GroupChatPlanController.java

@@ -91,7 +91,7 @@ public class GroupChatPlanController {
     }
 
     @RequestMapping("detail")
-    public RestResponse<Object> detail(Long planId) {
+    public RestResponse<Object> detail(Long planId,String clerkId, String staffId , String wxEnterpriseId) {
         if (null == planId) {
             return RestResponse.failure("1", "planid为空");
         }
@@ -112,13 +112,25 @@ public class GroupChatPlanController {
         Map<String, Object> retMap = new HashMap<>();
         retMap.put("plan", plan);
         retMap.put("materialList", materials);
+        if(StringUtils.isNotEmpty(clerkId)) {
+            ServiceResponse<GroupChatPlanOwnerLogDTO> resp = this.groupChatPlanApiService.getOwnerInfo(planId, staffId, clerkId, wxEnterpriseId) ;
+            GroupChatPlanOwnerLogDTO owner = resp.getResult() ;
+            if(!resp.isSuccess()|| null == owner) {
+                return RestResponse.failure("1", "记录不存在");
+            }
+            Map<String,Object> ownerInfo = new HashMap<>() ;
+            ownerInfo.put("clerkName", owner.getClerkName()) ;
+            ownerInfo.put("ownerLogId", owner.getOwnerLogId()) ;
+            ownerInfo.put("sendStatus", owner.getSendStatus()) ;
+            retMap.put("ownerInfo", ownerInfo) ;
+        }
         return RestResponse.successResult(retMap);
     }
 
     @RequestMapping("owner-do-list")
-    public RestResponse<Object> ownerDoList(Long planId, String clerkId, String wxEnterpriseId, String enterpriseId,
-            Long ownLogId, BasePageInfo basePageInfo) {
-        if (null == ownLogId || null == planId || StringUtils.isEmpty(clerkId)) {
+    public RestResponse<Object> ownerDoList(Long planId, String clerkId, String wxEnterpriseId, String enterpriseId,String staffId ,Long ownLogId,
+            BasePageInfo basePageInfo) {
+        if (null == planId || StringUtils.isEmpty(clerkId)) {
             return RestResponse.failure("1", "参数未传");
         }
         GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();