Merge branch 'feature/xgh/202507迭代' into 'developer'

Feature/xgh/202507迭代

See merge request !3092

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

@@ -9,6 +9,6 @@ public interface HaobanTaskNoticeApiService {
 
     ServiceResponse<Void> sendTimer(String params);
 
-
+    HaobanTaskNoticeDTO getById(Long id) ;
 
 }

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

@@ -15,4 +15,5 @@ public interface HaobanTaskNoticeMapper {
 
     List<TabHaobanTaskNotice> listForTimer() ;
 
+    TabHaobanTaskNotice getById(@Param("id")Long id);
 }

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

@@ -27,6 +27,8 @@ public interface QwMomentPlanService {
 
     void sendPlanNoticeTimer(String params);
 
+    void notice(String planId);
+
     ServiceResponse<Integer> getTaskNum(TaskNumQDTO qdto);
 
     ServiceResponse<Page<QwMomentPlanWxaDTO>> planListWxa(PlanListWxaQDTO qdto);

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

@@ -442,6 +442,21 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
     }
 
     @Override
+    public void notice(String planIdParams) {
+        Long planId = Long.parseLong(planIdParams) ;
+        TabQwMomentPlan plan = this.qwMomentPlanMapper.getById(planId) ;
+        List<QwMomentPlanAttendDTO> list = this.qwMomentPlanAttendMapper.listClerk(planId , 1);
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (QwMomentPlanAttendDTO dto : list) {
+                if(dto.getTaskStatus()==1) {
+                    this.sendTaskToClerk(dto.getClerkId(), plan);
+                }
+            }
+        }
+
+    }
+
+    @Override
     public void sendToQiwei(TabQwMomentPlan plan) {
         List<ContentMaterialDTO> imageList = new ArrayList<>() ;
         String json = plan.getMediaInfo() ;

haoban-manage3-service/src/main/resources/mapper/TaskNoticeMapper.xml

@@ -13,6 +13,7 @@
       <result column="status_flag" javaType="int" jdbcType="INTEGER" property="statusFlag"/>
   </resultMap>
   <sql id="Base_Column_List">
+      id,
 	  enterprise_id,
 	  plan_id,
 	  plan_type,
@@ -63,4 +64,10 @@
             FROM tab_haoban_task_notice WHERE status_flag = 1
     </select>
 
+    <select id="getById" resultMap="result-map-tabHaobanTaskNotice">
+        SELECT
+            <include refid="Base_Column_List" />
+            FROM tab_haoban_task_notice WHERE id = #{id}
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -103,7 +103,7 @@
 
 
     <select id="listClerk" resultType="com.gic.haoban.manage.api.dto.moment.QwMomentPlanAttendDTO">
-        select clerk_id clerkId , clerk_code clerkCode , clerk_name clerkName , staff_id staffId , store_id storeId , attend_id attendId
+        select clerk_id clerkId , clerk_code clerkCode , clerk_name clerkName , staff_id staffId , store_id storeId , attend_id attendId , task_status taskStatus
         from tab_haoban_qw_moment_plan_attend where plan_id = #{planId}
             <if test="null != statusFlag">
                 and status_flag = #{statusFlag}

haoban-manage3-service/src/test/java/Notice.java

+import com.gic.haoban.manage.api.service.HaobanTaskNoticeApiService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
+public class Notice {
+
+
+
+    @Autowired
+    private HaobanTaskNoticeApiService haobanTaskNoticeApiService ;
+
+
+
+
+    @Test
+    public void test1() {
+      this.haobanTaskNoticeApiService.sendTimer("") ;
+    }
+
+
+}