合并分支 'dev_foton_CJM' 到 'fix_foton'

征求意见-（代码修改）

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!3

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java

@@ -83,7 +83,7 @@ public class SarPublicIdeaController extends BaseController<SarPublicIdea> {
 //
             Calendar c2 = Calendar.getInstance();
             c2.setTime(sarPublicIdea.getEndTime());
-            c2.add(Calendar.DAY_OF_MONTH, 0);// 今天+1天
+            c2.add(Calendar.DAY_OF_MONTH, +1);// 今天+1天
             sarPublicIdea.setEndTime(c2.getTime());
 
             sarPublicIdeaService.save(sarPublicIdea);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java

@@ -52,19 +52,6 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
                 String date1 = (new SimpleDateFormat("yyyy-MM-dd")).format(start);
                 String date2 = (new SimpleDateFormat("yyyy-MM-dd")).format(end);
 
-//                Date classDate = null;
-//                try {
-//                    classDate = new SimpleDateFormat("yyyy-MM-dd").parse(date3);
-//                    Calendar calendar = Calendar.getInstance(); //使用Calendar日历类对日期进行加减
-//                    calendar.setTime(classDate);
-//                    calendar.add(Calendar.DAY_OF_MONTH, - 1);
-//                    classDate = calendar.getTime();//获取加减以后的Date类型日期
-//
-//                } catch (ParseException e) {
-//                    e.printStackTrace();
-//                }
-//                ;//把字符串转化成指定格式的日期
-//                String date2 =(new SimpleDateFormat("yyyy-MM-dd")).format(classDate);
 
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)