hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 02:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Boolean
2023-06-23 17:20:26 +08:00
parent 989f8ec113 c77f32b11e
commit 5db2cbaf3d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java
View File

@@ -197,7 +197,7 @@ public class CasesRecommendApi extends ApiBaseController {
}).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(rows)) {
// 通过工具类创建writer
try (ExcelWriter writer = ExcelUtil.getWriter(true);
try (ExcelWriter writer = ExcelUtil.getWriter();
// 输出流
ServletOutputStream servletOutputStream = response.getOutputStream()
) {
@@ -212,9 +212,9 @@ public class CasesRecommendApi extends ApiBaseController {
writer.setColumnWidth(5, 20);
writer.setColumnWidth(6, 20);
// 此处的response.setContentType 和教程里的不同
response.setContentType("application/octet-stream");
response.setContentType("application/vnd.ms-excel;charset=utf-8");
// filename就是表格的名字，这个无所谓，反正前端还会重命名
response.setHeader("Content-Disposition", "attachment;filename=推荐信息.xlsx");
response.setHeader("Content-Disposition", "attachment;filename=推荐信息.xls");
writer.flush(servletOutputStream, true);
} catch (Exception e) {

3
servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java
View File

@@ -46,9 +46,6 @@ public class CasesRecommend extends BaseEntity {
/**查看率*/
@Column(name = "view_rate", length = 255)
private String viewRate;
/**推荐组织ID*/
@Column(name = "recommend_org_id", length = 20)
private String recommendOrgId;
/**推荐组织名称*/
@Column(name = "recommend_org_name", length = 255)

5
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendServiceImpl.java
View File

@@ -61,7 +61,10 @@ public class CasesRecommendServiceImpl implements ICasesRecommendService {
public void rePushOrWithdraw(CasesRecommendPushVo casesRecommendPushVo) {
// 查询
CasesRecommend db = casesRecommendDao.get(casesRecommendPushVo.getCasesRecommendId());
if (CasesPushStatusEnum.PUSH_SUCCESS.getStatus().equals(db.getPushProgress())){
if (CasesPushStatusEnum.PUSH_SUCCESS.getStatus().equals(db.getPushProgress())
|| CasesPushStatusEnum.WAIT_PUSH.getStatus().equals(db.getPushProgress())
|| CasesPushStatusEnum.PUSH_ING.getStatus().equals(db.getPushProgress())
){
// 当为推送成功时为
iCasesRecommendPushRecordService.rePushOrWithdraw(true, casesRecommendPushVo.getCasesRecommendId());
db.setPushProgress(CasesPushStatusEnum.PUSH_REVOKE.getStatus());