【feat】【第二版开发】

1.修改punch_in表注释
2.修复BaseQuery积累日期时间获取异常

doc/技术文档.md

@@ -203,25 +203,25 @@ ui设计工具：即时设计
 
 表名：punch_in
 
-| 字段                 | 类型         | 描述                                             |
-| -------------------- | ------------ | ------------------------------------------------ |
-| id                   | bigint       | 主键                                             |
-| task_name            | varchar(128) | 任务名称                                         |
-| reward_num           | int          | 奖励倍数                                         |
-| category             | int          | 打卡类型(0-单次打卡，1-计数、2计时)              |
-| rule                 | int          | 比较规则(0-大于，1-大于等于，2-小于，3-小于等于) |
-| count_track          | int          | 次数记录                                         |
-| time_track           | time         | 时间记录                                         |
-| description          | varchar(300) | 任务描述                                         |
-| weekend_double_flag  | tinyint      | 是否启用周末双倍标志(0-不是，1-是)               |
-| full_attendance_flag | tinyint      | 是否启用全勤奖励标志(0-不是，1-是)               |
-| archive_flag         | tinyint      | 是否归档标志(0-不是，1-是)                       |
-| created_by           | bigint       | 创建人                                           |
-| creation_time        | timestamp    | 创建时间                                         |
-| last_updated_by      | bigint       | 最后更信人                                       |
-| last_update_time     | timestamp    | 最后更新时间                                     |
-| version              | bigint       | 版本号                                           |
-| delete_flag          | tinyint      | 逻辑删除标志（0-未删除，1-已删除）               |
+| 字段                 | 类型         | 描述                                |
+| -------------------- | ------------ | ----------------------------------- |
+| id                   | bigint       | 主键                                |
+| task_name            | varchar(128) | 任务名称                            |
+| reward_num           | int          | 奖励倍数                            |
+| category             | int          | 打卡类型(0-单次打卡，1-计数、2计时) |
+| rule                 | int          | 比较规则(0-大于等于，1-小于等于)    |
+| count_track          | int          | 次数记录                            |
+| time_track           | time         | 时间记录                            |
+| description          | varchar(300) | 任务描述                            |
+| weekend_double_flag  | tinyint      | 是否启用周末双倍标志(0-不是，1-是)  |
+| full_attendance_flag | tinyint      | 是否启用全勤奖励标志(0-不是，1-是)  |
+| archive_flag         | tinyint      | 是否归档标志(0-不是，1-是)          |
+| created_by           | bigint       | 创建人                              |
+| creation_time        | timestamp    | 创建时间                            |
+| last_updated_by      | bigint       | 最后更信人                          |
+| last_update_time     | timestamp    | 最后更新时间                        |
+| version              | bigint       | 版本号                              |
+| delete_flag          | tinyint      | 逻辑删除标志（0-未删除，1-已删除）  |
 
 
 

src/main/java/com/punchsettle/server/atomic/service/impl/LotteryScratchRecordServiceImpl.java

@@ -55,8 +55,8 @@ public class LotteryScratchRecordServiceImpl implements ILotteryScratchRecordSer
 
         Weekend<LotteryScratchRecord> weekend = Weekend.of(LotteryScratchRecord.class);
         WeekendCriteria<LotteryScratchRecord, Object> criteria = weekend.weekendCriteria();
-        if (StringUtils.hasText(query.getStartDate()) && StringUtils.hasText(query.getEndDate())) {
-            criteria.andBetween(LotteryScratchRecord::getCreationTime, query.getStartDate(), query.getEndDate());
+        if (StringUtils.hasText(query.getStartDateTime()) && StringUtils.hasText(query.getEndDateTime())) {
+            criteria.andBetween(LotteryScratchRecord::getCreationTime, query.getStartDateTime(), query.getEndDateTime());
         }
         if (!Objects.isNull(query.getUserId())) {
             criteria.andEqualTo(LotteryScratchRecord::getCreatedBy, query.getUserId());

src/main/java/com/punchsettle/server/atomic/service/impl/PunchInSettlementServiceImpl.java

@@ -40,8 +40,8 @@ public class PunchInSettlementServiceImpl implements IPunchInSettlementService {
 
         Weekend<PunchInSettlement> weekend = Weekend.of(PunchInSettlement.class);
         WeekendCriteria<PunchInSettlement, Object> criteria = weekend.weekendCriteria();
-        if (StringUtils.hasText(query.getStartDate()) && StringUtils.hasText(query.getEndDate())) {
-            criteria.andBetween(PunchInSettlement::getSettlementTime, query.getStartDate(), query.getEndDate());
+        if (StringUtils.hasText(query.getStartDateTime()) && StringUtils.hasText(query.getEndDateTime())) {
+            criteria.andBetween(PunchInSettlement::getSettlementTime, query.getStartDateTime(), query.getEndDateTime());
         }
         if (!Objects.isNull(query.getUserId())) {
             criteria.andEqualTo(PunchInSettlement::getUserId, query.getUserId());

src/main/java/com/punchsettle/server/atomic/service/impl/UserClaimRewardRecordServiceImpl.java

@@ -42,8 +42,8 @@ public class UserClaimRewardRecordServiceImpl implements IUserClaimRewardRecordS
 
         Weekend<UserClaimRewardRecord> weekend = Weekend.of(UserClaimRewardRecord.class);
         WeekendCriteria<UserClaimRewardRecord, Object> criteria = weekend.weekendCriteria();
-        if (StringUtils.hasText(query.getStartDate()) && StringUtils.hasText(query.getEndDate())) {
-            criteria.andBetween(UserClaimRewardRecord::getClaimRewardTime, query.getStartDate(), query.getEndDate());
+        if (StringUtils.hasText(query.getStartDateTime()) && StringUtils.hasText(query.getEndDateTime())) {
+            criteria.andBetween(UserClaimRewardRecord::getClaimRewardTime, query.getStartDateTime(), query.getEndDateTime());
         }
         weekend.orderBy(UserClaimRewardRecord::getClaimRewardTime).desc();
         return userClaimRewardRecordMapper.selectByExample(weekend);

src/main/java/com/punchsettle/server/common/pojo/BaseQuery.java

@@ -22,16 +22,18 @@ public class BaseQuery {
     @NotBlank(message = "结束时间不能为空")
     private String endDate;
 
-    public String getStartDate() {
-        if (StringUtils.hasText(startDate) && startDate.length() > 10) {
+    public String getStartDateTime() {
+        // 即符合yyyy-MM-dd格式
+        if (StringUtils.hasText(startDate) && startDate.length() == 10) {
             return String.format("%s 00:00:00.000", startDate);
         }
         return startDate;
     }
 
-    public String getEndDate() {
-        if (StringUtils.hasText(endDate) && endDate.length() > 10) {
-            return String.format("%s 00:00:00.000", startDate);
+    public String getEndDateTime() {
+        // 即符合yyyy-MM-dd格式
+        if (StringUtils.hasText(endDate) && endDate.length() == 10) {
+            return String.format("%s 23:59:59.999", endDate);
         }
         return endDate;
     }