Explorar el Código

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
wanjing hace 1 año
padre
commit
6c6137b0dd
Se han modificado 2 ficheros con 2 adiciones y 1 borrados
  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 Ver fichero

@@ -87,7 +87,7 @@ public class UpdateExecuteTaskStatusService {
inspection.setUpdateUser(userId);
inspection.setUpdateTime(DateUtils.now());
inspection.setExecutionStartTime(DateUtils.now());
inspectionMapper.update(inspection);
inspectionMapper.updateStatus(inspection);
}

/**

+ 1
- 0
tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionMapper.xml Ver fichero

@@ -194,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null"> status = #{status}, </if>
<if test="updateUser != null and updateUser != ''"> update_user = #{updateUser},</if>
<if test="updateTime != null"> update_time = #{updateTime},</if>
<if test="executionStartTime != null"> execution_start_time = #{executionStartTime},</if>
</trim>
where id = #{id}
</update>

Cargando…
Cancelar
Guardar