diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 59331a737..22b43150c 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -3,3 +3,8 @@ ALTER TABLE `sys_role_permission` MODIFY COLUMN `operate_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作ip' AFTER `operate_date`; -- 6月23日部署上线 + +ALTER TABLE `dummy_inventory_info` +ADD COLUMN `verify_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '验证备注' AFTER `applicable_supplement`, +ADD COLUMN `prehomo_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'pre备注' AFTER `verify_remark`, +ADD COLUMN `design_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设计备注' AFTER `prehomo_remark`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index 99073f97a..b9aaa15ad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -201,6 +201,10 @@ public class DummyInventoryInfoEO implements Serializable { @Dict(dicCode ="ze2_ren4_ren2") private java.lang.String designDuty; + //交付物说明 + @Excel(name = "设计符合性确认-交付物说明", width = 20) + private String designRemark; + /**prehomo确认-交付物类型*/ @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template") @ApiModelProperty(value = "prehomo确认-交付物类型") @@ -209,6 +213,7 @@ public class DummyInventoryInfoEO implements Serializable { @TableField(exist = false) private java.lang.String prehomoDeliverableTypeName; + /**prehomo确认-交付物模板*/ @ApiModelProperty(value = "prehomo确认-交付物模板") @@ -230,6 +235,10 @@ public class DummyInventoryInfoEO implements Serializable { @Dict(dicCode ="ze2_ren4_ren2") private java.lang.String prehomoDuty; + //prehomo确认-交付物说明 + @Excel(name = "prehomo确认-交付物说明", width = 20) + private String prehomoRemark; + /**验证符合性确认-交付物类型*/ @Excel(name = "验证-交付物类型", width = 15,dicCode ="deliverable_template") @ApiModelProperty(value = "验证符合性确认-交付物类型") @@ -259,6 +268,10 @@ public class DummyInventoryInfoEO implements Serializable { @Dict(dicCode ="ze2_ren4_ren2") private java.lang.String verifyDuty; + //验证备注 + @Excel(name = "验证符合性确认-交付物说明", width = 20) + private String verifyRemark; + @TableField(exist = false) private String cut; @@ -273,4 +286,9 @@ public class DummyInventoryInfoEO implements Serializable { + + + + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java index e873f2709..d723a4612 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java @@ -82,11 +82,11 @@ public class DummyInventoryInfoEOEn implements Serializable { /**适用地区*/ @ApiModelProperty(value = "适用地区") @Dict(dicCode ="region") - @Excel(name = "Area", width = 15, dicCode = "region") + @Excel(name = "Area", width = 15) private String region; /**适用范围*/ - @Excel(name = "Scope of application", width = 15, dicCode = "apply_scope") + @Excel(name = "Scope of application", width = 30, dicCode = "apply_scope") @ApiModelProperty(value = "适用范围") @Dict(dicCode ="apply_scope") private String shi4Yong4Fan4Wei2; @@ -111,7 +111,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String implementType; /**新车型实施日期*/ - @Excel(name = "New Type Execute Date", width = 15,format = "yyyy-MM-dd") + @Excel(name = "New Type Execute Date", width = 30,format = "yyyy-MM-dd") @ApiModelProperty(value = "新车型实施日期") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @@ -120,7 +120,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String xin1Che1Xing2Shi2Shi1Ri4Qi1String; /**在产车实施日期*/ - @Excel(name = "New Vehicle Execute Date", width = 15,format = "yyyy-MM-dd") + @Excel(name = "New Vehicle Execute Date", width = 30,format = "yyyy-MM-dd") @ApiModelProperty(value = "在产车实施日期") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @@ -134,25 +134,25 @@ public class DummyInventoryInfoEOEn implements Serializable { private String wvtaId; /**认证类型*/ - @Excel(name = "Certification Type", width = 15,dicCode ="attestation_type") + @Excel(name = "Certification Type", width = 30,dicCode ="attestation_type") @ApiModelProperty(value = "认证类型") @Dict(dicCode ="attestation_type") private String attestationType; /**认证级别*/ - @Excel(name = "Certification Level", width = 15,dicCode ="attestation_rank") + @Excel(name = "Certification Level", width = 30,dicCode ="attestation_rank") @ApiModelProperty(value = "认证级别") @Dict(dicCode ="attestation_rank") private String attestationRank; /**适用增补件*/ @ApiModelProperty(value = "适用增补件") - @Excel(name = "Applicable Supplement", width = 15) + @Excel(name = "Applicable Supplement", width = 30) private String applicableSupplement; /**技术领域*/ - @Excel(name = "Technical Field", width = 15) + @Excel(name = "Technical Field", width = 30) @ApiModelProperty(value = "技术领域") private String technologyTerritory; @@ -160,7 +160,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String technologyTerritoryName; /**责任领域*/ - @Excel(name = "Responsible Field", width = 15,dicCode ="duty_territory") + @Excel(name = "Responsible Field", width = 30,dicCode ="duty_territory") @ApiModelProperty(value = "责任领域") @Dict(dicCode ="duty_territory") private String dutyTerritory; @@ -171,7 +171,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String remark; /**设计符合性确认-交付物类型*/ - @Excel(name = "Design-Deliverables", width = 15,dicCode ="deliverable_template") + @Excel(name = "Design Deliverables", width = 30,dicCode ="deliverable_template") @ApiModelProperty(value = "设计符合性确认-交付物类型") @Dict(dicCode ="deliverable_template") private String designDeliverableType; @@ -182,23 +182,28 @@ public class DummyInventoryInfoEOEn implements Serializable { private String designDeliverableTemplate; @TableField(exist = false) - @Excel(name = "Design-Deliverable Template", width = 15) + @Excel(name = "Design Deliverable Template", width = 30) private String designDeliverableTemplateName; + /**设计符合性确认-发起人*/ - @Excel(name = "Design-Initiator", width = 15) + @Excel(name = "Design Initiator", width = 30) @ApiModelProperty(value = "设计符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String designInitiator; /**设计符合性确认-责任人*/ - @Excel(name = "Design-Assignee", width = 15) + @Excel(name = "Design Assignee", width = 30) @ApiModelProperty(value = "设计符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String designDuty; + //交付物说明 + @Excel(name = "Design Compliance Check Deliverable Description", width = 50) + private String designRemark; + /**prehomo确认-交付物类型*/ - @Excel(name = "Prehomo-Deliverables", width = 15,dicCode ="deliverable_template") + @Excel(name = "Prehomo Deliverables", width = 30,dicCode ="deliverable_template") @ApiModelProperty(value = "prehomo确认-交付物类型") @Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; @@ -209,23 +214,27 @@ public class DummyInventoryInfoEOEn implements Serializable { private String prehomoDeliverableTemplate; @TableField(exist = false) - @Excel(name = "Prehomo-Deliverable Template", width = 15) + @Excel(name = "Prehomo Deliverable Template", width = 30) private String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo-Initiator", width = 15) + @Excel(name = "Prehomo Initiator", width = 30) @ApiModelProperty(value = "prehomo确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String prehomoInitiator; /**prehomo确认-责任人*/ - @Excel(name = "Prehomo-Assignee", width = 15) + @Excel(name = "Prehomo Assignee", width = 30) @ApiModelProperty(value = "prehomo确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String prehomoDuty; + //prehomo确认-交付物说明 + @Excel(name = "Prehomo Check Deliverable Description", width = 50) + private String prehomoRemark; + /**验证符合性确认-交付物类型*/ - @Excel(name = "Verify-Deliverables", width = 15,dicCode ="deliverable_template") + @Excel(name = "Verify Deliverables", width = 30,dicCode ="deliverable_template") @ApiModelProperty(value = "验证符合性确认-交付物类型") @Dict(dicCode ="deliverable_template") private String verifyDeliverableType; @@ -235,21 +244,25 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyDeliverableTemplate; @TableField(exist = false) - @Excel(name = "Verify-Deliverable Template", width = 15) + @Excel(name = "Verify Deliverable Template", width = 30) private String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "Verify-Initiator", width = 15) + @Excel(name = "Verify Initiator", width = 30) @ApiModelProperty(value = "验证符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String verifyInitiator; /**验证符合性确认-责任人*/ - @Excel(name = "Verify-Assignee", width = 15) + @Excel(name = "Verify Assignee", width = 30) @ApiModelProperty(value = "验证符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String verifyDuty; + ///验证-交付物说明 + @Excel(name = "Validation Compliance Check Deliverable Description", width = 60) + private String verifyRemark; + @TableField(exist = false) private String cut; @@ -264,4 +277,9 @@ public class DummyInventoryInfoEOEn implements Serializable { + + + + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml index 61fcb9840..b6f9d9eb0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml @@ -30,7 +30,6 @@ - @@ -38,5 +37,8 @@ + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 975193c4c..0b3940a8d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -653,16 +653,18 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 8){ String flag = ""; - if(8 < j && j < 13){ + if(8 < j && j < 14){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ flag ="设计"; }else{ - flag ="design "; + flag ="Design "; } key = flag + headerCell.getStringCellValue(); } - if(12 < j && j < 17){ + if(13 < j && j < 19){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ - flag ="pre"; + flag ="Pre"; }else{ - flag ="pre "; + flag ="Pre "; } key = flag + headerCell.getStringCellValue(); } - if(16 < j && j < 21){ + if(18 < j && j < 24){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ flag ="验证"; }else{ - flag ="verify "; + flag ="Verify "; } key = flag + headerCell.getStringCellValue(); @@ -1720,18 +1724,21 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl