guzijian / bsth-alcohol-sign · Commits

Commit 999e7d6503bd56ca322a726a582159c39ff69a98

Authored by 2c
2 parents 4c8ecd2f fffdd8a3
build: skipped

Merge remote-tracking branch 'origin/mast_qingpu' into mast_qingpu

Inline Side-by-side
Showing 7 changed files with 34 additions and 2 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
  View file @999e7d6
... ... @@ -221,4 +221,13 @@ public class DriverController extends BaseController {
221 221 return driverService.allUpdateDriverInfo(request);
222 222 }
223 223  
  224 + /**
  225 + * 创建测试司机
  226 + */
  227 + @GetMapping("/createTestDriver")
  228 + public AjaxResult createTestDriver() {
  229 + driverService.createTestDriver();
  230 + return AjaxResult.success("创建测试司机成功！");
  231 + }
  232 +
224 233 }
... ...
Bsth-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
  View file @999e7d6
... ... @@ -140,4 +140,6 @@ public interface DriverMapper
140 140 List<Driver> selectDriverListAll();
141 141  
142 142 int insertFaceUpdateLog(@Param("jobCode") String jobCode,@Param("image") String image,@Param("createTime") String createTime,@Param("createBy") String createBy);
  143 +
  144 + int createTestDriver();
143 145 }
... ...
Bsth-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
  View file @999e7d6
... ... @@ -126,4 +126,10 @@ public interface IDriverService
126 126 AjaxResult allUpdateDriverInfo(HttpServletRequest request);
127 127  
128 128 List<Driver> selectDriverListAll();
  129 +
  130 + /**
  131 + * 创建测试司机
  132 + * @return 结果
  133 + */
  134 + int createTestDriver();
129 135 }
... ...
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
  View file @999e7d6
... ... @@ -743,4 +743,12 @@ public class DriverServiceImpl implements IDriverService {
743 743  
744 744 return new File(RuoYiConfig.getProfile() + File.separator + image.replace("/profile", ""));
745 745 }
  746 +
  747 + /**
  748 + * 创建测试司机
  749 + * @return 结果
  750 + */
  751 + public int createTestDriver(){
  752 + return driverMapper.createTestDriver();
  753 + }
746 754 }
... ...
Bsth-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
  View file @999e7d6
... ... @@ -445,7 +445,7 @@ public class AttendanceServiceImpl implements AttendanceService {
445 445 else {
446 446 main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
447 447 main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime())));
448   - if (TOMORROW_YES.equals(dto.getFirstSignInDayTomorrow())) {
  448 + if (TOMORROW_YES.equals(dto.getSecondSignDayTomorrow())) {
449 449 main.setSecondQuittingSignInTime(handleTimeTomorrowByRule(date, main.getSecondQuittingSignInTime()));
450 450 } else {
451 451 main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime())));
... ...
Bsth-admin/src/main/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
  View file @999e7d6
... ... @@ -174,7 +174,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
174 174 else {
175 175 main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
176 176 main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime())));
177   - if (TOMORROW_YES.equals(dto.getFirstSignInDayTomorrow())) {
  177 + if (TOMORROW_YES.equals(dto.getSecondSignDayTomorrow())) {
178 178 main.setSecondQuittingSignInTime(handleTimeTomorrowByRule(date, main.getSecondQuittingSignInTime()));
179 179 } else {
180 180 main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime())));
... ...
Bsth-admin/src/main/resources/mapper/driver/DriverMapper.xml
  View file @999e7d6
... ... @@ -489,4 +489,11 @@
489 489 value(#{jobCode},#{image},#{createTime},#{createBy})
490 490 </insert>
491 491  
  492 +
  493 + <insert id="createTestDriver">
  494 + INSERT INTO driver (job_code, personnel_name, posts, face_sign_in, update_time, fleet_name)
  495 + VALUES ('700001', '测试司机', '驾驶员', 2, now(), '三车队')
  496 + ON DUPLICATE KEY UPDATE job_code = VALUES(job_code);
  497 + </insert>
  498 +
492 499 </mapper>
493 500 \ No newline at end of file
... ...