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

2c
2 parents 4c8ecd2f fffdd8a3
Showing 7 changed files with 34 additions and 2 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
Bsth-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
Bsth-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -221,4 +221,13 @@ public class DriverController extends BaseController {
         return driverService.allUpdateDriverInfo(request);
     }
+    /**
+     * 创建测试司机
+     */
+    @GetMapping("/createTestDriver")
+    public AjaxResult createTestDriver() {
+        driverService.createTestDriver();
+        return AjaxResult.success("创建测试司机成功！");
+    }
+
 }
@@ -140,4 +140,6 @@ public interface DriverMapper
     List<Driver> selectDriverListAll();
     int insertFaceUpdateLog(@Param("jobCode") String jobCode,@Param("image") String image,@Param("createTime") String createTime,@Param("createBy") String createBy);
+
+    int createTestDriver();
 }
@@ -126,4 +126,10 @@ public interface IDriverService
     AjaxResult allUpdateDriverInfo(HttpServletRequest request);
     List<Driver> selectDriverListAll();
+
+    /**
+     * 创建测试司机
+     * @return 结果
+     */
+    int createTestDriver();
 }
@@ -743,4 +743,12 @@ public class DriverServiceImpl implements IDriverService {
         return new File(RuoYiConfig.getProfile() + File.separator + image.replace("/profile", ""));
     }
+
+    /**
+     * 创建测试司机
+     * @return 结果
+     */
+    public int createTestDriver(){
+        return driverMapper.createTestDriver();
+    }
 }
@@ -445,7 +445,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         else {
             main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
             main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime())));
-            if (TOMORROW_YES.equals(dto.getFirstSignInDayTomorrow())) {
+            if (TOMORROW_YES.equals(dto.getSecondSignDayTomorrow())) {
                 main.setSecondQuittingSignInTime(handleTimeTomorrowByRule(date, main.getSecondQuittingSignInTime()));
             } else {
                 main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime())));
@@ -174,7 +174,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
         else {
             main.setFirstQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getFirstQuittingSignInTime())));
             main.setSecondWorkSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondWorkSignInTime())));
-            if (TOMORROW_YES.equals(dto.getFirstSignInDayTomorrow())) {
+            if (TOMORROW_YES.equals(dto.getSecondSignDayTomorrow())) {
                 main.setSecondQuittingSignInTime(handleTimeTomorrowByRule(date, main.getSecondQuittingSignInTime()));
             } else {
                 main.setSecondQuittingSignInTime(ConstDateUtil.dateAddition(date.toString(), ConstDateUtil.formatDate("HH:mm:ss", main.getSecondQuittingSignInTime())));
@@ -489,4 +489,11 @@
         value(#{jobCode},#{image},#{createTime},#{createBy})
     </insert>
+
+    <insert id="createTestDriver">
+        INSERT INTO driver (job_code, personnel_name, posts, face_sign_in, update_time, fleet_name)
+        VALUES ('700001', '测试司机', '驾驶员', 2, now(), '三车队')
+            ON DUPLICATE KEY UPDATE job_code = VALUES(job_code);
+    </insert>
+
 </mapper>
 \ No newline at end of file