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 a9643b2ca..1b8f939f0 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 @@ -171,7 +171,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String remark; /**设计符合性确认-交付物类型*/ - @Excel(name = "Design Deliverables", width = 30,dicCode ="deliverable_template") + @Excel(name = "Deliverables", width = 30,dicCode ="deliverable_template",groupName = "Design compliance check") @ApiModelProperty(value = "设计符合性确认-交付物类型") @Dict(dicCode ="deliverable_template") private String designDeliverableType; @@ -182,7 +182,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String designDeliverableTemplate; @TableField(exist = false) - @Excel(name = "Design Deliverable Template", width = 30) + @Excel(name = "Deliverable Template", width = 30,groupName = "Design compliance check") private String designDeliverableTemplateName; @@ -193,17 +193,17 @@ public class DummyInventoryInfoEOEn implements Serializable { private String designInitiator; /**设计符合性确认-责任人*/ - @Excel(name = "Design Assignee", width = 30) + @Excel(name = "Assignee", width = 30,groupName = "Design compliance check") @ApiModelProperty(value = "设计符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String designDuty; //交付物说明 - @Excel(name = "Design Compliance Check Deliverable Description", width = 50) + @Excel(name = "Deliverables description", width = 50,groupName = "Design compliance check") private String designRemark; /**prehomo确认-交付物类型*/ - @Excel(name = "Prehomo Deliverables", width = 30,dicCode ="deliverable_template") +// @Excel(name = "Prehomo Deliverables", width = 30,dicCode ="deliverable_template") @ApiModelProperty(value = "prehomo确认-交付物类型") @Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; @@ -214,7 +214,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String prehomoDeliverableTemplate; @TableField(exist = false) - @Excel(name = "Prehomo Deliverable Template", width = 30) +// @Excel(name = "Prehomo Deliverable Template", width = 30) private String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ @@ -224,17 +224,17 @@ public class DummyInventoryInfoEOEn implements Serializable { private String prehomoInitiator; /**prehomo确认-责任人*/ - @Excel(name = "Prehomo Assignee", width = 30) +// @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) +// @Excel(name = "Prehomo Check Deliverable Description", width = 50) private String prehomoRemark; /**验证符合性确认-交付物类型*/ - @Excel(name = "Verify Deliverables", width = 30,dicCode ="deliverable_template") + @Excel(name = "Deliverables", width = 30,dicCode ="deliverable_template",groupName = "Validation compliance check") @ApiModelProperty(value = "验证符合性确认-交付物类型") @Dict(dicCode ="deliverable_template") private String verifyDeliverableType; @@ -244,7 +244,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyDeliverableTemplate; @TableField(exist = false) - @Excel(name = "Verify Deliverable Template", width = 30) + @Excel(name = "Deliverable Template", width = 30,groupName = "Validation compliance check") private String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ @@ -254,13 +254,13 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyInitiator; /**验证符合性确认-责任人*/ - @Excel(name = "Verify Assignee", width = 30) + @Excel(name = "Assignee", width = 30,groupName = "Validation compliance check") @ApiModelProperty(value = "验证符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String verifyDuty; ///验证-交付物说明 - @Excel(name = "Validation Compliance Check Deliverable Description", width = 60) + @Excel(name = "Deliverables description", width = 60,groupName = "Validation compliance check") private String verifyRemark; @TableField(exist = false) 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 ecd46c645..00fd8b1d1 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 @@ -1207,7 +1207,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl