更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/AppVersionController.java

@@ -46,7 +46,7 @@ public class AppVersionController {
      */
     @GetMapping("/test")
     public void test() {
-        geTuiUtils.pushByCid("工作事项提醒","您有新的易粮易运流程，请及时审核","84f62127b7384dcdbaeaddfe460329fc");
+        geTuiUtils.pushByCid("工作事项提醒","您有新的易粮易运流程，请及时审批","10272f536dd9405da38c28c4e6c34457");
 //       List<CommonUser> list =   commonUserService.selectList(new EntityWrapper<>());
 //       for(CommonUser commonUser:list){
 //           commonUser.setPassword(Md5Crypt.md5Crypt("123456".getBytes(), "$1$" + commonUser.getPhone().substring(0, 7)));

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/NewWorkflowServiceImpl.java

@@ -291,7 +291,7 @@ public class NewWorkflowServiceImpl implements INewWorkflowService {
         List<CommonStaff> list =  getTaskCandidates(workflowId,businessKey);
         for (CommonStaff c :
                 list) {
-            geTuiUtils.pushByCid("审核任务","您有新的审核任务需要处理，请及时处理。",c.getStaffId());
+            geTuiUtils.pushByCid("审核任务","您有新的易粮易运流程，请及时审批。",c.getStaffId());
         }
     }
 
@@ -349,7 +349,7 @@ public class NewWorkflowServiceImpl implements INewWorkflowService {
         List<CommonStaff> list =  getTaskCandidates(workflowId,businessKey);
         for (CommonStaff c :
                 list) {
-//            geTuiUtils.pushByCid("审核任务","您有新的审核任务需要处理，请及时处理。",c.getStaffId());
+//            geTuiUtils.pushByCid("审核任务","您有新的易粮易运流程，请及时审批。",c.getStaffId());
             geTuiUtils.pushByCid("工作事项提醒","您有新的易粮易运流程，请及时审批",c.getStaffId());
 
         }
@@ -899,6 +899,11 @@ public class NewWorkflowServiceImpl implements INewWorkflowService {
 
         String statusEn = languageChangeService.findLanguageBySourceType(compId, LanguageChange.LanguageStataus.CHINESE,
                 processIsEnd ? status : status.substring(1), LanguageChange.LanguageStataus.ENGLISH);
+        List<CommonStaff> list =  getTaskCandidates(workflowId,businessKey);
+        for (CommonStaff c :
+                list) {
+            geTuiUtils.pushByCid("审核任务","您有新的易粮易运流程，请及时审批。",c.getStaffId());
+        }
         notify(workflowId, taskListener -> taskListener.handleStatusChanged(businessKey, status,
                 !StringUtils.isEmpty(statusEn) ? "Waiting for the " + statusEn : null, processIsEnd));
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/GeTuiUtils.java

@@ -124,8 +124,10 @@ public class GeTuiUtils {
             ups.addOption("HW", "/message/android/notification/badge/class", "io.dcloud.PandoraEntry ");
             ups.addOption("HW", "/message/android/notification/badge/add_num", 1);
             ups.addOption("HW", "/message/android/notification/sound", "/raw/ring");
-            ups.addOption("HW", "/message/android/notification/channel_id", "task1");
-            ups.addOption("HW", "/message/android/notification/importance", "HIGH");
+            ups.addOption("HW", "/message/android/notification/channel_id", "task2");
+            ups.addOption("HW", "/message/android/notification/importance", "NORMAL");
+            ups.addOption("HW", "/message/android/notification/category", "WORK");
+            ups.addOption("HW", "/message/android/notification/default_sound", false);
             ups.addOption("XM", "/extra.sound_uri", "android.resource://uni.UNI7297DA2/raw/task1");
             ups.addOption("XM", "/extra.channel_id", "high_custom_5");
             //ups.addOption("VV","classification",1);
@@ -218,9 +220,9 @@ public class GeTuiUtils {
         message.setTemplateArgs(params);
 
         try {
-            VoiceResponseResult result = VoiceSender.httpsSendVoiceNotify(message, accountId, token);
+//            VoiceResponseResult result = VoiceSender.httpsSendVoiceNotify(message, accountId, token);
 
-            System.out.println("result = " + result);
+//            System.out.println("result = " + result);
 
         }catch (Exception e) {
             //Log.e(this.getClass(), " e = " + e);

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -84,8 +84,13 @@
         w.issuing_time as issuingTime
         FROM warehousing_order w
         LEFT JOIN warehouse_base_info wbi on wbi.id=w.base_id and wbi.delete_flag = '0'
-        WHERE
-        w.comp_id = #{compId}
+        WHERE 1=1
+        <if test="compId != null and compId != ''">
+            and w.comp_id = #{compId}
+        </if>
+        <if test="compId == null or compId == ''">
+            and w.comp_id = '2710b21efc1e4393930c5dc800010dc4'
+        </if>
         and
         w.delete_flag = '0'
         <if test="startDate != null">