diff --git a/src/main/java/io/v/nutz/zhgh/welfare/model/template/WelfareExportEntityTc.java b/src/main/java/io/v/nutz/zhgh/welfare/model/template/WelfareExportEntityTc.java index 4ee9365..6725471 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/model/template/WelfareExportEntityTc.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/model/template/WelfareExportEntityTc.java @@ -28,6 +28,9 @@ public class WelfareExportEntityTc { @Excel(name = "所属单位", width = 60d) private String unitName; + @Excel(name = "是否会员", width = 20d) + private String memberStatus; + @Excel(name = "备注", width = 60d) private String remark; @@ -46,8 +49,8 @@ public class WelfareExportEntityTc { // @Excel(name = "收货信息", width = 100d) private String receiveAddress; - @Excel(name = "快递单号", width = 40d) - private String courierNumber; + //@Excel(name = "快递单号", width = 40d) + //private String courierNumber; @Excel(name = "实名签字", width = 20d, type = 2 , imageType = 2, height = 12d) private byte[] qzBytes; diff --git a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java index bb9d0d8..9b3a99a 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java @@ -472,7 +472,8 @@ public class WelfareSingleServiceImpl extends ViServiceImpl impl IF(LOCATE('undefined',wpus.receiveAddress)>0,NULL,wpus.receiveAddress) as receiveAddress, wpus.userSign, GROUP_CONCAT(DISTINCT wpso.optionName ,'(',wpus.selectNum,'份)') optionName, - wpus.courierNumber + wpus.courierNumber, + if(u.member = 1, '是', '否') as memberStatus FROM welfare_project_user_selection wpus LEFT JOIN `user` u ON u.id = wpus.selectUserId @@ -548,7 +549,8 @@ public class WelfareSingleServiceImpl extends ViServiceImpl impl unionname unionName, idcard idCard, mobile, - remark + remark, + if(member = 1, '是', '否') as memberStatus FROM view_welfare_list WHERE diff --git a/src/main/resources/views/platform/welfare/addressManage.html b/src/main/resources/views/platform/welfare/addressManage.html index 039e549..cefc9cf 100644 --- a/src/main/resources/views/platform/welfare/addressManage.html +++ b/src/main/resources/views/platform/welfare/addressManage.html @@ -262,6 +262,7 @@ layout("/layouts/platform.html"){ }, async created() { this.pageData() + this.dzOptions = this.dzOptions.filter(d => ['江苏省', '浙江省', '上海市'].includes(d.label)) } })