蓝斯二期

liujun001
1 parent 767fdec0
Showing 2 changed files with 4 additions and 3 deletions
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/resources/mapper/in/SignInMapper.xml
@@ -151,7 +151,7 @@ public class SchedulingService {
             changeScheduling(driverScheduling,signIn,remark,index,isNew);
         }else{
             SignIn sourceSign = signInService.selectSignInById(driverScheduling.getSignInId());
-            if(Objects.isNull(sourceSign)){
+            if(Objects.isNull(sourceSign)|| Objects.isNull(sourceSign.getExType1())){
                 changeScheduling(driverScheduling,signIn,remark,index,isNew);
             }else if(bigViewServiceV1.isEarly(sourceSign) && bigViewServiceV1.isNormal(signIn)){
                 //第一次是早签，第二次正常签到，覆盖原来的数据。
@@ -61,9 +61,10 @@
     <select id="selectSignInList" parameterType="com.ruoyi.pojo.response.SignInResponseVo" resultMap="SignInResultVO">
         select sign_in.*,driver.posts,driver.personnel_name,equipment.name
-        from sign_in,driver,equipment
+        from sign_in inner join  driver on  driver.job_code = sign_in.jobCode
+        left join equipment on equipment.device_id = sign_in.device_id
         WHERE
-        driver.job_code = sign_in.jobCode and equipment.device_id = sign_in.device_id
+       1=1
         <if test="jobCode != null  and jobCode != ''">and jobCode = #{jobCode}</if>
         <if test="ip != null  and ip != ''">and ip = #{ip}</if>
         <if test="image != null  and image != ''">and image = #{image}</if>