Merge remote-tracking branch 'origin/master'

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyDrillProgrammeServiceImpl.java

@@ -474,7 +474,7 @@ public class AspSafetyDrillProgrammeServiceImpl extends ServiceImpl<AspSafetyDri
                 builder.insertCell();
                 builder.getCellFormat().setVerticalMerge(CellMerge.FIRST);
                 for (AspSafetyOnsiteDisposalPlan item2 : onsiteDisposalPlanList) {
-                    String word = item2.getTreatment() + " " + item2.getNo();
+                    String word = item2.getNo() + "、" + item2.getTreatment();
                     builder.writeln(word);
                 }
             }else {

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SafeCheckSendNotifyServiceImpl.java

@@ -367,14 +367,16 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
         // 对业务数据按照厂区进行分组
         Map<String, List<HiddenDangerTrackDo>> collect = hiddenDangerTrackDos.stream().collect(Collectors.groupingBy(HiddenDangerTrackDo::getTenantid));
         collect.forEach((k, v) -> {
-            // 周五需要生成 维修提醒
+            // 周三和周五生成 生产提醒维修提醒
             if (DayOfWeek.WEDNESDAY == dayOfWeek) {
-                // 维修
+                // 生产提醒
+                sendNotify(HIDDEN_DANGER_TASK_PRODUCTION, k, v);
+            }else{
+                // 生产提醒
+                sendNotify(HIDDEN_DANGER_TASK_PRODUCTION, k, v);
+                // 维修提醒
                 sendNotify(HIDDEN_DANGER_TASK_MAINTAIN, k, v);
-
             }
-            //周三和周五生成 生产提醒
-            sendNotify(HIDDEN_DANGER_TASK_PRODUCTION, k, v);
         });
         return R.ok();
     }
@@ -398,7 +400,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
                 recipientIds.addAll(saveCheckCommonDao.getUserIdByRoleCodeAndOrgIdAndTenantId(Arrays.asList(WMS, LCZG), orgId, tenantId));
             }
             // 整改状态为“待整改”记录中的 指派跟踪人
-            recipientIds.addAll(dangerTrackDos.stream().filter(info -> "20".equals(info.getStatus()))
+            recipientIds.addAll(dangerTrackDos.stream().filter(info -> "待整改".equals(info.getStatus()))
                     .map(HiddenDangerTrackDo::getTrackuserid)
                     .filter(StringUtils::isNotBlank)
                     .distinct()

cx-safe-check/cx-save-check-server/src/main/java/com/rongwei/savecheck/controller/AppPushMessageController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.rongwe.scentity.vo.PushMessageToAppRequestVo;
+import com.rongwei.rwcommon.base.R;
 import com.rongwei.safecommon.utils.CXCommonUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -23,15 +24,17 @@ public class AppPushMessageController {
      * @param message
      */
     @PostMapping("/old/pushToApp")
-    public void pushToWeb(@RequestParam String message){
+    public R pushToWeb(@RequestParam String message){
         try {
             JSONObject jsonObject = JSONObject.parseObject(message);
             String title = jsonObject.getString("title");
             String content = jsonObject.getString("content");
             List<String> userIdList = JSON.parseArray(jsonObject.getJSONArray("userIds").toJSONString(), String.class);
             Lists.partition(userIdList, 10).forEach(userIds -> CXCommonUtils.pushApp(title, content, userIds));
+            return R.ok("发送app通知成功");
         } catch (Exception e) {
             e.printStackTrace();
+            return R.error("发送app通知失败");
         }
 
     }
@@ -40,14 +43,16 @@ public class AppPushMessageController {
      * 新版可用此方式，post实体类传参
      */
     @PostMapping("/new/pushToApp")
-    public void pushToWeb(@RequestBody PushMessageToAppRequestVo model){
+    public R pushToWeb(@RequestBody PushMessageToAppRequestVo model){
         try {
             String title = model.getTitle();
             String content = model.getContent();
             List<String> userIdList = model.getUserIds();
             Lists.partition(userIdList, 10).forEach(userIds -> CXCommonUtils.pushApp(title, content, userIds));
+            return R.ok("发送app通知成功");
         } catch (Exception e) {
             e.printStackTrace();
+            return R.error("发送app通知失败");
         }
     }