Pārlūkot izejas kodu

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
wanjing pirms 1 gada
vecāks
revīzija
6c6137b0dd
2 mainītis faili ar 2 papildinājumiem un 1 dzēšanām
  1. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateExecuteTaskStatusService.java
  2. +1
    -0
      tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionMapper.xml

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateExecuteTaskStatusService.java Parādīt failu

inspection.setUpdateUser(userId); inspection.setUpdateUser(userId);
inspection.setUpdateTime(DateUtils.now()); inspection.setUpdateTime(DateUtils.now());
inspection.setExecutionStartTime(DateUtils.now()); inspection.setExecutionStartTime(DateUtils.now());
inspectionMapper.update(inspection);
inspectionMapper.updateStatus(inspection);
} }


/** /**

+ 1
- 0
tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionMapper.xml Parādīt failu

<if test="status != null"> status = #{status}, </if> <if test="status != null"> status = #{status}, </if>
<if test="updateUser != null and updateUser != ''"> update_user = #{updateUser},</if> <if test="updateUser != null and updateUser != ''"> update_user = #{updateUser},</if>
<if test="updateTime != null"> update_time = #{updateTime},</if> <if test="updateTime != null"> update_time = #{updateTime},</if>
<if test="executionStartTime != null"> execution_start_time = #{executionStartTime},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>

Notiek ielāde…
Atcelt
Saglabāt