diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectObject.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectObject.java index 9698962d..fa6f688f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectObject.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectObject.java @@ -64,5 +64,5 @@ public class EnterpriseStandardInspectObject implements Serializable { /** 计划稽查对象 */ @ApiModelProperty(value = "计划稽查对象") - private String planInspectObjecy; + private String planInspectObject; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml index 2e64f84e..168f1de4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml @@ -31,7 +31,7 @@ SELECT p.id, - s.standard_no AS standardNo, + s.standard_number AS standardNo, s.standard_name AS standardName, s.release_date AS releaseDate, p.recheck_date AS recheckDate, @@ -34,7 +34,7 @@ d.depart_name AS mainDraftingUnit FROM laws_enterprise_standard_recheck_plan AS p - LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = p.standard_no + LEFT JOIN laws_enterprise_standard AS s ON s.standard_number = p.standard_no LEFT JOIN sys_user AS u ON u.id = s.main_drafting_user LEFT JOIN sys_depart AS d ON d.id = s.main_drafting_unit WHERE @@ -43,7 +43,7 @@ (p.recheck_result IS NOT NULL) - AND s.standard_no LIKE CONCAT('%',#{param.standardNo},'%') + AND s.standard_number LIKE CONCAT('%',#{param.standardNo},'%') diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRmrEvaluateDetailMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRmrEvaluateDetailMapper.xml index 442d9650..a9d36fc4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRmrEvaluateDetailMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRmrEvaluateDetailMapper.xml @@ -11,7 +11,6 @@ - @@ -20,7 +19,7 @@ id,create_by,create_time, update_by,update_time,org_code, - standard_no,evaluate_item,evaluate_score, + evaluate_item,evaluate_score, deduction_score_reason diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java index 626fc6a3..79d98305 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java @@ -71,7 +71,7 @@ public class LawsEnterpriseStandard implements Serializable { * 企标编号 */ @ApiModelProperty(value = "企标编号") - private String standardNo; + private String standardNumber; /** * 企标名称 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml index 026ea959..65035154 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml @@ -12,7 +12,7 @@ - + diff --git a/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java b/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java index 4cd9dd7a..a60119fd 100644 --- a/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java +++ b/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java @@ -59,7 +59,7 @@ public class LawsEnterpriseStandardTest { // ... continue with more fields as needed - lawsEnterpriseStandard.setStandardNo(faker.code().ean8()); + lawsEnterpriseStandard.setStandardNumber(faker.code().ean8()); lawsEnterpriseStandard.setStandardName(faker.commerce().productName()); lawsEnterpriseStandard.setEnglishName(faker.commerce().productName()); lawsEnterpriseStandard.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS));