客户管理接口改动

zengh

2021-02-03 4d6a0cdf54a36b88634629700e5ce7d4bf8d90e9

客户管理接口改动

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java

@@ -157,14 +157,17 @@
                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();
                //计算天数
                int day = (int) ((st - en) / 86400000);
                if (day <= 30) {
                    page.getRecords().get(j).setType(1);
                } else {
                    page.getRecords().get(j).setType(0);

                if (expireTime != null){
                    long st = sim.parse(expireTime).getTime();
                    long en = sim.parse(end).getTime();
                    //计算天数
                    int day = (int) ((st - en) / 86400000);
                    if (day <= 30) {
                        page.getRecords().get(j).setType(1);
                    } else {
                        page.getRecords().get(j).setType(0);
                    }
                }
            }
        }

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml

@@ -70,8 +70,12 @@
            and (deviceName like concat('%',#{equipment.deviceName},'%') or deviceNumber like
            concat('%',#{equipment.deviceName},'%'))
        </if>
        <if test="equipment.addvcd!=null">
            and addvcd=#{equipment.addvcd}

        <if test="equipment.beginTime!=null and equipment.beginTime!=''">
            and expireTime&gt;=#{equipment.beginTime}
        </if>
        <if test="equipment.endTime!=null and equipment.endTime!=''">
            and expireTime&lt;=#{equipment.endTime}
        </if>

        <if test="equipment.district!=null">

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java

@@ -35,5 +35,7 @@
    int type;
    String pay;
    String expireTime;
    private  String beginTime;
    private  String endTime;

}