Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-09-05 ba9c4bca1bdf36f827ab258222d92c885ff890db

 screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java

@@ -74,11 +74,12 @@
        List<Map<String, Object>> data = (List<Map<String, Object>>) params.get("data");

        for (Map<String, Object> datum : data) {
            ManageCoordinateDetail manageCoordinateDetail = new ManageCoordinateDetail();

            String code = datum.get("code").toString();
            String state = datum.get("state").toString();

            if (state.equals("2")){
                ManageCoordinateDetail manageCoordinateDetail = new ManageCoordinateDetail();
                String[] rs = code.split("_");
                manageCoordinateDetail.setCoordinateId(coordinateId);
                manageCoordinateDetail.setLongitude(Double.parseDouble(rs[0]));
@@ -101,7 +102,7 @@
                    return 2;
                }
                manageCoordinateDetailMapper.deleteById(Integer.parseInt(id1.toString()));
//                    manageCoordinateDetailMapper.delete(wrapper);

            }
        }
        return 200;
@@ -203,7 +204,7 @@
        queryWrapper.eq("coordinate_id",coordinateId);
        String time1 = params.remove("time1").toString();
        String time2 = params.remove("time2").toString();
        long l = DateUtils.compareDateStr(time1, time2);
        long l = DateUtils.compareDateStrDay(time1, time2);
        if (l>0){
            params.put("time1",time1);
            params.put("time2",time2);