Merge branch 'refs/heads/feature-lihb-20250731' into test-merge

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialCyAccessories.java

@@ -33,7 +33,7 @@ public class TrialCyAccessories {
      */
     @ApiModelProperty("成渝接口返回的")
     @TableField("acc_id")
-    private String AccID;
+    private String accId;
 
     /**
      * 类型名称
@@ -41,19 +41,19 @@ public class TrialCyAccessories {
 
     @ApiModelProperty("类型名称")
     @TableField("acc_type")
-    private String AccType;
+    private String accType;
 
     /**
      * 文件名称
      */
     @ApiModelProperty("文件名称")
     @TableField("file_name")
-    private String FileName;
+    private String fileName;
 
     /**
      * 文件路径
      */
     @ApiModelProperty("文件路径")
     @TableField("file_path")
-    private String FilePath;
+    private String filePath;
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialCyFinishTestReport.java

@@ -70,31 +70,31 @@ public class TrialCyFinishTestReport {
      */
     @ApiModelProperty("取样地点")
     @TableField("sampling_place")
-    private String SamplingPlace;
+    private String samplingPlace;
     /**
      * 样品信息 同试验检测查询界面
      */
     @ApiModelProperty("样品信息 同试验检测查询界面")
     @TableField("sample_info")
-    private String SampleInfo;
+    private String sampleInfo;
     /**
      * 类型规格 规格型号
      */
     @ApiModelProperty("类型规格 规格型号")
     @TableField("specification")
-    private String Specification;
+    private String specification;
     /**
      * 合格证上传情况 已上传、未上传
      */
     @ApiModelProperty("合格证上传情况 已上传、未上传")
     @TableField("hash_gz")
-    private String HasHGZ;
+    private String hasHGZ;
     /**
      * 所检参数信息 同试验检测查询界面
      */
     @ApiModelProperty("所检参数信息 同试验检测查询界面")
     @TableField("test_param_info")
-    private String TestParamInfo;
+    private String testParamInfo;
     /**
      * 报告时间
      */
@@ -121,17 +121,17 @@ public class TrialCyFinishTestReport {
      */
     @ApiModelProperty("报告文件路径")
     @TableField("report_file_path")
-    private String ReportFilePath;
+    private String reportFilePath;
     /**
      * 记录文件路径
      */
     @ApiModelProperty("记录文件路径")
     @TableField("record_file_path")
-    private String RecordFilePath;
+    private String recordFilePath;
     /**
      * 附件
      */
     @ApiModelProperty("附件")
     @TableField(exist = false)
-    private List<TrialCyAccessories> Accessories;
+    private List<TrialCyAccessories> accessories;
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialCyTestType.java

@@ -28,23 +28,23 @@ public class TrialCyTestType {
      */
     @TableField("id")
     @ApiModelProperty("成渝的id")
-    private String ID;
+    private String id;
     /**
      * 名称
      */
     @TableField("name")
     @ApiModelProperty("名称")
-    private String Name;
+    private String name;
     /**
      * 父级ID
      */
     @TableField("father_id")
     @ApiModelProperty("父级id")
-    private String FatherID;
+    private String fatherId;
     /**
      * 顺序号
      */
     @TableField("order_index")
     @ApiModelProperty("顺序号")
-    private String OrderIndex;
+    private String orderIndex;
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialCyThirdReport.java

@@ -30,7 +30,7 @@ public class TrialCyThirdReport {
      */
     @ApiModelProperty("成渝的id")
     @TableField("id")
-    public String ID;
+    public String id;
     /**
      * 报告类型（0:外委检测，1:第三方检测，2:扫描上传报告）
      */
@@ -41,199 +41,199 @@ public class TrialCyThirdReport {
      */
     @ApiModelProperty("委托编号")
     @TableField("consign_no")
-    public String ConsignNo;
+    public String consignNo;
     /**
      * 报告编号
      */
     @ApiModelProperty("报告编号")
     @TableField("report_no")
-    public String ReportNo;
+    public String reportNo;
     /**
      * 取样时间 格式如：“2022-06-21”
      */
     @ApiModelProperty("取样时间 格式如：“2022-06-21”")
     @TableField("take_sampling_date")
-    public String TakeSamplingDate;
+    public String takeSamplingDate;
     /**
      * 送样时间 格式如：“2022-06-21”
      */
     @ApiModelProperty("送样时间 格式如：“2022-06-21”")
     @TableField("send_sample_date")
-    public String SendSampleDate;
+    public String sendSampleDate;
     /**
      * 检测时间 格式如：“2022-06-21”
      */
     @ApiModelProperty("检测时间 格式如：“2022-06-21”")
     @TableField("test_date")
-    public String TestDate;
+    public String testDate;
     /**
      * 报告时间 格式如：“2022-06-21”
      */
     @ApiModelProperty("报告时间 格式如：“2022-06-21”")
     @TableField("report_date")
-    public String ReportDate;
+    public String reportDate;
     /**
      * 委托单位
      */
     @ApiModelProperty("委托单位")
     @TableField("consign_unit")
-    public String ConsignUnit;
+    public String consignUnit;
     /**
      * 检测机构
      */
     @ApiModelProperty("检测机构")
     @TableField("accept_test_unit")
-    public String AcceptTestUnit;
+    public String acceptTestUnit;
     /**
      * 送样人
      */
     @ApiModelProperty("送样人")
     @TableField("send_sample_person")
-    public String SendSamplePerson;
+    public String sendSamplePerson;
     /**
      * 接样人
      */
     @ApiModelProperty("接样人")
     @TableField("witness_person")
-    public String WitnessPerson;
+    public String witnessPerson;
     /**
      * 工程部位
      */
     @ApiModelProperty("工程部位")
     @TableField("project_part")
-    public String ProjectPart;
+    public String projectPart;
     /**
      * 取样地点
      */
     @ApiModelProperty("取样地点")
     @TableField("sampling_place")
-    public String SamplingPlace;
+    public String samplingPlace;
     /**
      * 样品名称
      */
     @ApiModelProperty("样品名称")
     @TableField("sample_name")
-    public String SampleName;
+    public String sampleName;
     /**
      * 委托单文件下载地址
      */
     @ApiModelProperty("委托单文件下载地址")
     @TableField("consign_doc_file_path")
-    public String ConsignDocFilePath;
+    public String consignDocFilePath;
     /**
      * 记录单文件下载地址
      */
     @ApiModelProperty("记录单文件下载地址")
     @TableField("record_doc_file_path")
-    public String RecordDocFilePath;
+    public String recordDocFilePath;
     /**
      * 报告单文件下载地址
      */
     @ApiModelProperty("报告单文件下载地址")
     @TableField("report_doc_file_path")
-    public String ReportDocFilePath;
+    public String reportDocFilePath;
     /**
      * 检测依据
      */
     @ApiModelProperty("检测依据")
     @TableField("test_standard")
-    public String TestStandard;
+    public String testStandard;
     /**
      * 评定标准
      */
     @ApiModelProperty("评定标准")
     @TableField("assess_standard")
-    public String AssessStandard;
+    public String assessStandard;
     /**
      * 检测结论
      */
     @ApiModelProperty("检测结论")
     @TableField("test_conclusion")
-    public String TestConclusion;
+    public String testConclusion;
     /**
      * 备注
      */
     @ApiModelProperty("备注")
     @TableField("memo")
-    public String Memo;
+    public String memo;
     /**
      * 期数
      */
     @ApiModelProperty("期数")
     @TableField("period_num")
-    public String PeriodNum;
+    public String periodNum;
     /**
      * 是否合格
      */
     @ApiModelProperty("是否合格：1 合格， 0 不合格")
     @TableField("is_qualified")
-    public String IsQualified;
+    public String isQualified;
     /**
      * 样品编号
      */
     @ApiModelProperty("样品编号")
     @TableField("sample_code")
-    public String SampleCode;
+    public String sampleCode;
     /**
      * 规格型号
      */
     @ApiModelProperty("规格型号")
     @TableField("gui_ge_xing_hao")
-    public String GuiGeXingHao;
+    public String guiGeXingHao;
     /**
      * 生产厂家
      */
     @ApiModelProperty("生产厂家")
     @TableField("sheng_chan_cj")
-    public String ShengChanCJ;
+    public String shengChanCJ;
     /**
      * 产地
      */
     @ApiModelProperty("产地")
     @TableField("chan_di")
-    public String ChanDi;
+    public String chanDi;
     /**
      * 样品数量
      */
     @ApiModelProperty("样品数量")
     @TableField("sample_num")
-    public String SampleNum;
+    public String sampleNum;
     /**
      * 检测机构资质证书编号
      */
     @ApiModelProperty("检测机构资质证书编号")
     @TableField("consign_unit_ability")
-    public String ConsignUnitAbility;
+    public String consignUnitAbility;
     /**
      * 批号
      */
     @ApiModelProperty("批号")
     @TableField("batch_num")
-    public String BatchNum;
+    public String batchNum;
     /**
      * 代表数量
      */
     @ApiModelProperty("代表数量")
     @TableField("quantity")
-    public String Quantity;
+    public String quantity;
     /**
      * 单位
      */
     @ApiModelProperty("单位")
     @TableField("unit")
-    public String Unit;
+    public String unit;
     /**
      * 类型ID
      */
     @ApiModelProperty("类型ID")
     @TableField("consign_test_cls_id")
-    public String ConsignTestClsID;
+    public String consignTestClsID;
     /**
      * 结论
      */
     @ApiModelProperty("结论")
     @TableField("result")
-    public String Result;
+    public String result;
     /**
      * 是否已删除
      * Null：未删除
@@ -242,13 +242,13 @@ public class TrialCyThirdReport {
      */
     @ApiModelProperty("是否已删除 0：未删除 1：已删除")
     @TableField("is_deleted")
-    public String IsDeleted;
+    public String isDeleted;
     /**
      * 删除时间
      */
     @ApiModelProperty("删除时间")
     @TableField("delete_time")
-    public String DeleteTime;
+    public String deleteTime;
     /**
      * 快报/正式报告
      * 1 快报
@@ -256,18 +256,18 @@ public class TrialCyThirdReport {
      */
     @ApiModelProperty("快报/ 正式报告 1 快报 2 正式报告")
     @TableField("report_type")
-    public Integer ReportType;
+    public Integer reportType;
     /**
      * 创建时间 格式如：“2022-06-21 13:44:33 235”
      */
     @ApiModelProperty("创建时间 格式如：“2022-06-21 13:44:33 235”")
     @TableField("create_time")
-    public String CreateTime;
+    public String createTime;
 
     /**
      * 附件
      */
     @ApiModelProperty("附件")
     @TableField(exist = false)
-    private List<TrialCyAccessories> Accessories;
+    private List<TrialCyAccessories> accessories;
 }

blade-service/blade-business/src/main/java/org/springblade/business/scheduled/ChenYuTestScheduled.java

@@ -480,7 +480,7 @@ public class ChenYuTestScheduled {
     }
 
     /**
-     * 获取检测项目树  TODO 第三方接口未开发完（待调试）
+     * 获取检测项目树
      */
     @Scheduled(cron = "0 0 * * * ?")
     public void getAllTestType() {
@@ -517,7 +517,7 @@ public class ChenYuTestScheduled {
             for (TrialCyTestType type : testTypes) {
                 type.setPKeyId(SnowFlakeUtil.getId());
                 type.setProjectId(PROJECT_ID);
-                type.setFatherID(type.getFatherID() == null || type.getFatherID().isEmpty() ? "0" : type.getFatherID());
+                type.setFatherId(type.getFatherId() == null || type.getFatherId().isEmpty() ? "0" : type.getFatherId());
             }
             //先删除旧数据
             trialCyTestTypeService.remove(Wrappers.<TrialCyTestType>lambdaQuery()

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialCyServiceImpl.java

@@ -53,7 +53,7 @@ public class TrialCyServiceImpl implements TrialCyService {
     public List<TrialCyTestType> getTree(Long projectId, String parentId) {
         List<TrialCyTestType> list = trialCyTestTypeService.list(Wrappers.<TrialCyTestType>lambdaQuery()
                 .eq(TrialCyTestType::getProjectId, projectId)
-                .eq(TrialCyTestType::getFatherID, parentId)
+                .eq(TrialCyTestType::getFatherId, parentId)
                 .orderByAsc(TrialCyTestType::getOrderIndex)
         );
         return list;