guzijian / bsth-alcohol-sign · Commits

Commit b73e485de29cf3b12ce3189037e1f9bfdb62d229

Authored by liujun001
1 parent 767fdec0

蓝斯二期

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