养护计划 修改代码

src/main/java/org/rcisoft/business/device/maintenance/controller/MaintenanceController.java

@@ -111,6 +111,5 @@ public class MaintenanceController {
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 maintenanceService.listDevDate(year));
-
     }
 }

src/main/java/org/rcisoft/business/device/maintenance/dao/MaintenanceRepository.java

@@ -47,7 +47,7 @@ public interface MaintenanceRepository extends BaseMapper<BusDevService> {
      * @param date the date
      * @return the list
      */
-    @Select("SELECT * FROM `bus_dev_service` WHERE DATE_FORMAT(SER_TM,'%Y-%m-%d') = #{date}")
+    @Select("SELECT ds.*,d.DEV_NM,tp.DEV_TP_NM FROM bus_dev_service ds INNER JOIN bus_device d on d.DEV_NUM = ds.DEV_NUM INNER JOIN bus_device_tp tp ON tp.DEV_TP_ID=d.DEV_TP_ID WHERE DATE_FORMAT(SER_TM,'%Y-%m-%d') = #{date}")
     List<Map<String,Object>> listBusDevServiceByDate(@Param("date") String date);
 
     /**

src/main/java/org/rcisoft/business/device/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -33,7 +32,6 @@ public class    MaintenanceServiceImpl implements MaintenanceService {
      */
     @Override
     public int saveBusDevService(BusDevService busDevService) {
-        busDevService.setSerTm(new Date());
         busDevService.setSerId(UUID.randomUUID().toString().replaceAll("-","").toUpperCase());
         int i= 0;
         try {