Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/impl/JingdanServiceImpl.java

@@ -42,8 +42,8 @@
   }

   @Override
   public IPage<JingdanVO> selectList(IPage<JingdanVO> page,String waringType, String beginTime, String endTime,String addvcd,String type) {
      return page.setRecords(baseMapper.selectList(page,waringType,beginTime,endTime,addvcd,type));
   public List<JingdanVO> selectList(String waringType, String beginTime, String endTime,String addvcd,String type) {
      return baseMapper.selectList(waringType,beginTime,endTime,addvcd,type);
   }

   @Override
@@ -57,11 +57,11 @@
   }

   @Override
   public void insert(String galarmPeople,String phoneNumber,String place,String content,
   public void inserts(String galarmPeople,String phoneNumber,String place,String content,
                  String galarmTime,String waringType,String deviceNumber,String type,String handleP,
                  String handleTime,String handName,String level,String coordinate,String jd,String wd,
                  String addvcd,String rName,String czTime,String bz) {
      baseMapper.insert(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
      baseMapper.inserts(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
   }

   @Override
@@ -74,4 +74,9 @@
      baseMapper.updateInfo(id, handleP, handName,handletype,type);
   }

   @Override
   public int submitReId(JingdanVO jingdanVO) {
      return baseMapper.submitReId(jingdanVO);
   }

}