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 4b0c27a13..1ed1f31ef 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 @@ -215,7 +215,7 @@ public class DummyInventoryInfoEO implements Serializable { private java.lang.String designDeliverableTemplateName; /**设计符合性确认-发起人*/ - @Excel(name = "设计-发起人", width = 15,dicCode ="fa1_qi3_ren2") +// @Excel(name = "设计-发起人", width = 15,dicCode ="fa1_qi3_ren2") @ApiModelProperty(value = "设计符合性确认-发起人") //@Dict(dicCode ="fa1_qi3_ren2") private java.lang.String designInitiator; @@ -235,7 +235,7 @@ public class DummyInventoryInfoEO implements Serializable { private String designRemark; /**prehomo确认-交付物类型*/ - @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template") +// @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template") @ApiModelProperty(value = "prehomo确认-交付物类型") // @Dict(dicCode ="deliverable_template") private java.lang.String prehomoDeliverableType; @@ -253,7 +253,7 @@ public class DummyInventoryInfoEO implements Serializable { private java.lang.String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo-发起人", width = 15,dicCode ="fa1_qi3_ren2") +// @Excel(name = "Prehomo-发起人", width = 15,dicCode ="fa1_qi3_ren2") @ApiModelProperty(value = "prehomo确认-发起人") //@Dict(dicCode ="fa1_qi3_ren2") private java.lang.String prehomoInitiator; @@ -261,7 +261,7 @@ public class DummyInventoryInfoEO implements Serializable { private String prehomoInitiator_dictText; /**prehomo确认-责任人*/ - @Excel(name = "Prehomo-责任人", width = 15,dicCode ="ze2_ren4_ren2") +// @Excel(name = "Prehomo-责任人", width = 15,dicCode ="ze2_ren4_ren2") @ApiModelProperty(value = "prehomo确认-责任人") //@Dict(dicCode ="ze2_ren4_ren2") private java.lang.String prehomoDuty; @@ -269,7 +269,7 @@ public class DummyInventoryInfoEO implements Serializable { private String prehomoDuty_dictText; //prehomo确认-交付物说明 - @Excel(name = "prehomo确认-交付物说明", width = 20) +// @Excel(name = "prehomo确认-交付物说明", width = 20) private String prehomoRemark; /**验证符合性确认-交付物类型*/ @@ -290,7 +290,7 @@ public class DummyInventoryInfoEO implements Serializable { private java.lang.String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "验证-发起人", width = 15,dicCode ="fa1_qi3_ren2") +// @Excel(name = "验证-发起人", width = 15,dicCode ="fa1_qi3_ren2") @ApiModelProperty(value = "验证符合性确认-发起人") //@Dict(dicCode ="fa1_qi3_ren2") private java.lang.String verifyInitiator; 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 d723a4612..a9643b2ca 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 @@ -187,7 +187,7 @@ public class DummyInventoryInfoEOEn implements Serializable { /**设计符合性确认-发起人*/ - @Excel(name = "Design Initiator", width = 30) +// @Excel(name = "Design Initiator", width = 30) @ApiModelProperty(value = "设计符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String designInitiator; @@ -218,7 +218,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo Initiator", width = 30) +// @Excel(name = "Prehomo Initiator", width = 30) @ApiModelProperty(value = "prehomo确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String prehomoInitiator; @@ -248,7 +248,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "Verify Initiator", width = 30) +// @Excel(name = "Verify Initiator", width = 30) @ApiModelProperty(value = "验证符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String verifyInitiator; 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 ec4d8f52d..929870332 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 @@ -1182,6 +1182,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 8){ String flag = ""; - if(8 < j && j < 14){ + if(8 < j && j < 13){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ flag ="设计"; }else{ @@ -1626,15 +1630,15 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl