Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/generate/GenerateReportByAutoService.java

@@ -67,6 +67,7 @@ public class GenerateReportByAutoService {
         report.setInspectionId(inspection.getId());
         report.setInspectionCode(inspection.getCode());
         report.setInspectionName(inspection.getName());
+        //自动生成报告标识改为2
         report.setAutoGenerate(2);
         report.setCreateUser("");
         report.setCreateTime(DateUtils.now());

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/generate/GenerateReportByManualService.java

@@ -101,6 +101,8 @@ public class GenerateReportByManualService {
         report.setReportCode(code);
         report.setTenantId(tenantId);
         report.setInspectionId(inspection.getId());
+        //手动生成报告,设置成1
+        report.setAutoGenerate(1);
         report.setInspectionCode(inspection.getCode());
         report.setInspectionName(inspection.getName());
         report.setCreateUser(userId);

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/ReportPageListVo.java

@@ -65,4 +65,10 @@ public class ReportPageListVo {
      */
     private Integer problemHandleCount;
 
+    /**
+     * 自动生成报告标识 自动生成：1：未自动生成，2自动生成
+     */
+    private Integer autoGenerate;
+
+
 }