Merge remote-tracking branch 'origin/develop_tzs_1227' into develop_tzs_1227

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/EquipRegularlyRemindServicelmpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.dto.UseInfoModel;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
@@ -81,8 +82,8 @@ public void sendReminderMessage(){
         queryWrapper.like(TzsUserInfo::getPost,"6552");
         queryWrapper.isNotNull(TzsUserInfo::getPhone);
         List<TzsUserInfo> tzsUserInfos = tzsUserInfoMapper.selectList(queryWrapper);
-        List<String> phones = tzsUserInfos.stream().map(TzsUserInfo::getPhone).collect(Collectors.toList());
-        List<String> userIds = tzsUserInfos.stream().map(TzsUserInfo::getAmosUserId).collect(Collectors.toList());
+        List<String> phones = tzsUserInfos.stream().filter(e-> StringUtil.isNotEmpty(e.getPhone())).map(TzsUserInfo::getPhone).collect(Collectors.toList());
+        List<String> userIds = tzsUserInfos.stream().filter(e-> StringUtil.isNotEmpty(e.getAmosUserId())).map(TzsUserInfo::getAmosUserId).collect(Collectors.toList());
         // 组装短信内容  发送短信
         HashMap<String,String> smsParams = new HashMap<>();
         smsParams.put("smsCode","EQU_TZS_001");
@@ -106,10 +107,10 @@ public void sendReminderMessage(){
                 int day1 = DateUtils.dateBetween(nextInspectDate, date);
                 if (day > 0) {
                     messageModel.setTitle("设备超期提醒");
-                    messageModel.setBody(useInfo.getProductName()+"("+useInfo.getSupervisiryCode()==null?"":useInfo.getSupervisiryCode()+") 已超期"+ Math.abs(day)+"天" );
+                    messageModel.setBody(useInfo.getProductName()+"("+(useInfo.getSupervisoryCode()==null?"":useInfo.getSupervisoryCode()+") 已超期"+ Math.abs(day)+"天"));
                 }else if (day1 > 0){
                     messageModel.setTitle("设备临期提醒");
-                    messageModel.setBody(useInfo.getProductName()+"("+useInfo.getSupervisiryCode()==null?"":useInfo.getSupervisiryCode()+") 还有"+ Math.abs(day1)+"天将到期");
+                    messageModel.setBody(useInfo.getProductName()+"("+(useInfo.getSupervisoryCode()==null?"":useInfo.getSupervisoryCode()+") 还有"+ Math.abs(day1)+"天将到期"));
                 }
                 messageModel.setRecivers(userIds);
                 messageModel.setIsSendWeb(true);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/UseInfoModel.java

@@ -75,7 +75,7 @@ public class UseInfoModel extends BaseDto {
     private String cityName;
     @ApiModelProperty(value = "")
     private String countyName;
-    private String supervisiryCode;
+    private String supervisoryCode;
     private String productName;
     private Date nextInspectDate;
     private String lastInspectReportNo;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/UseInfoMapper.xml

@@ -17,8 +17,8 @@
         SELECT
         use.RECORD,
         use.USE_UNIT_CREDIT_CODE,
-        other.SUPERVISORY_CODE,
-        register.PRODUCT_NAME,
+        other.SUPERVISORY_CODE as supervisoryCode,
+        register.PRODUCT_NAME as productName,
         use.NEXT_INSPECT_DATE as nextInspectDate,
         base.contact_phone as phone
         FROM