This commit is contained in:
JyuHsin
2025-05-14 11:31:09 +08:00
parent a116a0c61c
commit 15bf8ad766
3 changed files with 10 additions and 4 deletions
@@ -28,6 +28,9 @@ public class WelfareExportEntityTc {
@Excel(name = "所属单位", width = 60d) @Excel(name = "所属单位", width = 60d)
private String unitName; private String unitName;
@Excel(name = "是否会员", width = 20d)
private String memberStatus;
@Excel(name = "备注", width = 60d) @Excel(name = "备注", width = 60d)
private String remark; private String remark;
@@ -46,8 +49,8 @@ public class WelfareExportEntityTc {
// @Excel(name = "收货信息", width = 100d) // @Excel(name = "收货信息", width = 100d)
private String receiveAddress; private String receiveAddress;
@Excel(name = "快递单号", width = 40d) //@Excel(name = "快递单号", width = 40d)
private String courierNumber; //private String courierNumber;
@Excel(name = "实名签字", width = 20d, type = 2 , imageType = 2, height = 12d) @Excel(name = "实名签字", width = 20d, type = 2 , imageType = 2, height = 12d)
private byte[] qzBytes; private byte[] qzBytes;
@@ -472,7 +472,8 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
IF(LOCATE('undefined',wpus.receiveAddress)>0,NULL,wpus.receiveAddress) as receiveAddress, IF(LOCATE('undefined',wpus.receiveAddress)>0,NULL,wpus.receiveAddress) as receiveAddress,
wpus.userSign, wpus.userSign,
GROUP_CONCAT(DISTINCT wpso.optionName ,'',wpus.selectNum,'份)') optionName, GROUP_CONCAT(DISTINCT wpso.optionName ,'',wpus.selectNum,'份)') optionName,
wpus.courierNumber wpus.courierNumber,
if(u.member = 1, '是', '否') as memberStatus
FROM FROM
welfare_project_user_selection wpus welfare_project_user_selection wpus
LEFT JOIN `user` u ON u.id = wpus.selectUserId LEFT JOIN `user` u ON u.id = wpus.selectUserId
@@ -548,7 +549,8 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
unionname unionName, unionname unionName,
idcard idCard, idcard idCard,
mobile, mobile,
remark remark,
if(member = 1, '是', '否') as memberStatus
FROM FROM
view_welfare_list view_welfare_list
WHERE WHERE
@@ -262,6 +262,7 @@ layout("/layouts/platform.html"){
}, },
async created() { async created() {
this.pageData() this.pageData()
this.dzOptions = this.dzOptions.filter(d => ['江苏省', '浙江省', '上海市'].includes(d.label))
} }
}) })
</script> </script>