Преглед изворни кода

Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

别傲 пре 5 година
родитељ
комит
e3ddee497e

+ 4 - 0
lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/model/response/CapitalRepairResponse.java

@@ -23,6 +23,10 @@ public class CapitalRepairResponse {
      * 项目地址
      */
     private String projectAddress;
+    /**
+     * 开始时间
+     */
+    private LocalDate startDate;
     /**
      * 竣工时间
      */

+ 1 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceRecordController.java

@@ -413,7 +413,7 @@ public class MaintenanceRecordController {
         return RestResponse.success(pages);
     }
 
-    @GetMapping("export")
+    @PostMapping("export")
     @Validation(fields = {"recordIds"})
     public void export(@Val @RequestBody MtRecordRequest mtRecordRequest, HttpServletResponse response) {
         maintenanceRecordService.export(mtRecordRequest, response);

+ 1 - 0
lift-business-service/src/main/resources/mapper/capital/CapitalRepairMapper.xml

@@ -43,6 +43,7 @@
         SELECT c.id              AS id,
                c.project_name    AS projectName,
                c.project_address AS projectAddress,
+               c.start_date      AS startDate,
                c.end_date        AS endDate,
                c.region_id       AS regionId,
                c.project_status  AS projectStatus,