Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -655,22 +655,22 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         list.add(titleList);
         QueryWrapper<MouldOperationDynamics> qw = new QueryWrapper<MouldOperationDynamics>();
         qw.eq("content", Constant.DOWNLOAD);
-        String start = userVO.getStartTime().replace("Z", " UTC");//是空格+UTC
-        String end = userVO.getEndTime().replace("Z", " UTC");//是空格+UTC
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        Date date1 = df.parse(start);
-        System.out.println(date1);
-        Date date2 = df.parse(end);
-        System.out.println(date2);
+//        String start = userVO.getStartTime().replace("Z", " UTC");//是空格+UTC
+//        String end = userVO.getEndTime().replace("Z", " UTC");//是空格+UTC
+//        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+//        Date date1 = df.parse(start);
+//        System.out.println(date1);
+//        Date date2 = df.parse(end);
+//        System.out.println(date2);
 //        SimpleDateFormat df1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.CHINA);
-        Calendar calendar = new GregorianCalendar();
-        calendar.setTime(date1);
-        calendar.add(calendar.DATE, -1);//把日期往后增加一天.整数往后推,负数往前移动        date=calendar.getTime();
-        Date startDate1 = calendar.getTime();
-        calendar.setTime(date2);
-        calendar.add(calendar.DATE, -1);
+//        Calendar calendar = new GregorianCalendar();
+//        calendar.setTime(date1);
+//        calendar.add(calendar.DATE, -1);//把日期往后增加一天.整数往后推,负数往前移动        date=calendar.getTime();
+//        Date startDate1 = calendar.getTime();
+//        calendar.setTime(date2);
+//        calendar.add(calendar.DATE, -1);
 //        Date startDate = df1.parse(date1.toString());
-        Date endDate2 = calendar.getTime();
+//        Date endDate2 = calendar.getTime();
 //        Date endDate = df1.parse(date2.toString());
 //        SimpleDateFormat dateSdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 //        SimpleDateFormat dateSdf = new SimpleDateFormat("yyyy-MM-dd");