代码提交

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -149,6 +150,10 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
     // 不存在值班数据则不查找 修改sql 方法去除 by kongfm 2021-09-14
     public IPage<Map<String, Object>> pageListNew(int current, int size, String groupCode, String beginDate, String endDate) {
         Map<String, String> params = this.getRequestParamMap();
+        if (!ObjectUtils.isEmpty(beginDate) && params.get("beginDate") == null) {
+            params.put("stratTime", beginDate);
+            params.put("endTime", endDate);
+        }
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
         Page page = new Page(current, size);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -448,7 +448,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     nowValue,
                     nowValue.compareTo(minValue) < 0 ? "低于最低报警阈值" + minValue : "超过最高报警阈值" + maxValue
                     );
-            model.setTitle(equipmentSpecificIndex.getEquipmentSpecificName());
+            model.setTitle("模拟量提醒");
             model.setBody(bodyMain);
             model.setMsgType("FoamTankOrPipeNetwork");
             model.setSendTime(new Date());