客户列表接口修改

zengh

2021-01-12 4f595fb79090a31764e9114ae5862fbcc1b00bd5

 src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java

@@ -120,18 +120,17 @@

               String expireTime = pages.get(j).getExpireTime();
               //1.获取当前时间
               Date dd=new Date();
               SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
               String end=sim.format(dd);
               Date dd = new Date();
               SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
               String end = sim.format(dd);
               //把string类型转换为long类型的
               long st=sim.parse(expireTime).getTime();
               long en=sim.parse(end).getTime();
               long st = sim.parse(expireTime).getTime();
               long en = sim.parse(end).getTime();
               //计算天数
               int day=(int) ((st-en)/86400000);
               if (day<=30){
               int day = (int) ((st - en) / 86400000);
               if (day <= 30) {
                  pages.get(j).setType(1);
               }


               if (childList.get(i).get("eqid") != null) {
                  if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {