代码修改

notes-pas/src/main/java/com/zjty/tynotes/pas/entity/Config.java

@@ -41,14 +41,27 @@ public class Config {
     @ApiModelProperty(value = "迟到次数",example = "3")
     private String lateNum;
 
+    @NotEmpty(message = "迟到次数时间规定")
+    @ApiModelProperty(value = "迟到次数时间规定",example = "15分钟")
+    private String lateNumOfFixedTime;
+
     @NotEmpty(message = "迟到15分钟以上扣分")
     @ApiModelProperty(value = "迟到15分钟以上扣分",example = "2")
     private String latePointsFifteen;
 
+    @NotEmpty(message = "弹性迟到1时间")
+    @ApiModelProperty(value = "弹性迟到1时间",example = "2")
+    private String lateWorkTimeOne;
+
+
     @NotEmpty(message = "迟到半天扣分")
     @ApiModelProperty(value = "迟到半天扣分",example = "4")
     private String latePointsHalfOfDay;
 
+    @NotEmpty(message = "弹性迟到2时间")
+    @ApiModelProperty(value = "弹性迟到2时间",example = "2")
+    private String lateWorkTimeTwo;
+
     @NotEmpty(message = "事假半天扣分")
     @ApiModelProperty(value = "事假半天",example = "2")
     private String thingHalfOfDay;

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/ConfigServiceImpl.java

@@ -69,6 +69,7 @@ public class ConfigServiceImpl implements ConfigService {
     public List<Day> findHolidaysByMonth(String date) {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
         try {
             Date date1 = sdf.parse(date);
             int year = date1.getYear()+1900;
@@ -85,17 +86,18 @@ public class ConfigServiceImpl implements ConfigService {
             if(days==null || days.size()==0){
 
                 calendar.set(Calendar.DAY_OF_MONTH,2);
+                System.out.println(calendar.getTime());
                 List<String> fullDayList = new ArrayList<>(32);
                 int count = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
                 for (int j = 1; j <= count ; j++) {
-                    fullDayList.add(sdf.format(calendar.getTime()));
+                    fullDayList.add(sdf1.format(calendar.getTime()));
                     calendar.add(Calendar.DAY_OF_MONTH,1);
                 }
                 List<Day> days1 = new ArrayList<>();
                 for (String string : fullDayList) {
                     Day day = new Day();
                     day.setStatus("0");
-                    day.setDate(sdf.parse(string));
+                    day.setDate(sdf1.parse(string));
                     days1.add(day);
                 }
                 return dayDao.saveAll(days1);