From 556e7ad9f0e1be4294a5e375b5e8f5888e19371d Mon Sep 17 00:00:00 2001 From: xyc <3422692813@qq.com> Date: Fri, 25 Apr 2025 12:57:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9ECOS=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java | 2 +- .../java/com/ruoyi/framework/config/SecurityConfig.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index c0d895e..34636d8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java @@ -198,7 +198,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl Date: Fri, 25 Apr 2025 13:19:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=80=9A=E5=91=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusiEvaluateController.java | 10 ++++----- .../busi/controller/BusiNoticeController.java | 3 +-- .../com/ruoyi/busi/domain/BusiEvaluate.java | 10 ++++++++- .../com/ruoyi/busi/domain/BusiNoticeSign.java | 2 ++ .../busi/service/IBusiEvaluateService.java | 1 + .../busi/service/IBusiNoticeService.java | 2 +- .../service/impl/BusiEvaluateServiceImpl.java | 16 +++++++++++++- .../service/impl/BusiNoticeServiceImpl.java | 21 ++++++++++--------- .../ruoyi/member/domain/MemberBusiCard.java | 6 +++++- .../mapper/busi/BusiNoticeSignMapper.xml | 2 +- 10 files changed, 50 insertions(+), 23 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiEvaluateController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiEvaluateController.java index 644bd12..4a2755f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiEvaluateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiEvaluateController.java @@ -28,7 +28,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 评价Controller - * + * * @author 朱春云 * @date 2025-03-17 */ @@ -76,15 +76,13 @@ public class BusiEvaluateController extends BaseController return success(busiEvaluateService.getById(id)); } - /** - * 新增评价 - */ - @PreAuthorize("@ss.hasPermi('busi:evaluate:add')") + @Log(title = "评价", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BusiEvaluate busiEvaluate) { - return toAjax(busiEvaluateService.save(busiEvaluate)); + busiEvaluateService.saveVo(busiEvaluate); + return success(); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java index dc7b38e..98fac60 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java @@ -115,8 +115,7 @@ public class BusiNoticeController extends BaseController @Log(title = "通告", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody BusiNotice busiNotice) - { + public AjaxResult add(@RequestBody BusiNotice busiNotice) throws Exception { busiNoticeService.saveVo(busiNotice); return success(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiEvaluate.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiEvaluate.java index f96efba..00d0aae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiEvaluate.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiEvaluate.java @@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.DlBaseEntity; /** * 评价对象 dl_busi_evaluate - * + * * @author 朱春云 * @date 2025-03-17 */ @@ -54,5 +54,13 @@ public class BusiEvaluate extends DlBaseEntity /** 评价内容 */ @Excel(name = "评价内容") private String evaluate; + /** + * 打分 + */ + private String score; + /** + * 是否匿名评价0否1是 + */ + private String isAnonymous; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java index c2b9c0a..9ef1251 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java @@ -97,6 +97,8 @@ public class BusiNoticeSign extends DlBaseEntity private String accountName; @TableField(exist = false) private Long fansNum; + @TableField(exist = false) + private String indexUrl; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiEvaluateService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiEvaluateService.java index f1e0175..b82d260 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiEvaluateService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiEvaluateService.java @@ -26,4 +26,5 @@ public interface IBusiEvaluateService extends IService { * @date 14:16 2025/3/21 **/ List listByToUserId(Long userId); + void saveVo(BusiEvaluate busiEvaluate); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java index dd72b0a..b8965d3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java @@ -41,7 +41,7 @@ public interface IBusiNoticeService extends IService * 保存 * @param data 保存参数 */ - void saveVo(BusiNotice data); + void saveVo(BusiNotice data) throws Exception; /** * 更新 * @param data 保存参数 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiEvaluateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiEvaluateServiceImpl.java index 883c4e1..3e2ba2b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiEvaluateServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiEvaluateServiceImpl.java @@ -8,6 +8,9 @@ import com.ruoyi.busi.domain.BusiEvaluate; import com.ruoyi.busi.mapper.BusiEvaluateMapper; import com.ruoyi.busi.service.IBusiEvaluateService; import com.ruoyi.busi.vo.BusiEvaluateVO; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +18,7 @@ import java.util.List; /** * 评价Service业务层处理 - * + * * @author 朱春云 * @date 2025-03-17 */ @@ -24,6 +27,8 @@ public class BusiEvaluateServiceImpl extends ServiceImpl queryListPage(BusiEvaluate pageReqVO, Page page) { @@ -42,4 +47,13 @@ public class BusiEvaluateServiceImpl extends ServiceImpl listByToUserId(Long userId) { return busiEvaluateMapper.listByToUserId(userId); } + + @Override + public void saveVo(BusiEvaluate busiEvaluate) { + Long userId = SecurityUtils.getUserId(); + SysUser sysUser = sysUserService.selectUserById(userId); + busiEvaluate.setToUserId(sysUser.getUserId()); + busiEvaluate.setNickname(sysUser.getNickName()); + this.save(busiEvaluate); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index ac29261..6685417 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java @@ -101,7 +101,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl select sign.*,card.platform_name as platformName, card.account_name as accountName,card.fans_num as fansNum - ,card.platform_code as platformCode + ,card.platform_code as platformCode,card.index_url from dl_busi_notice_sign sign inner join dl_member_busi_card card on sign.card_id = card.id From e99ee0197f85f5587c03d76cccdbe532f0fd9ca2 Mon Sep 17 00:00:00 2001 From: xyc <3422692813@qq.com> Date: Fri, 25 Apr 2025 14:19:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/busi/query/BusiNoticeQuery.java | 3 +++ .../com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/query/BusiNoticeQuery.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/query/BusiNoticeQuery.java index 36ba455..7528e97 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/query/BusiNoticeQuery.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/query/BusiNoticeQuery.java @@ -37,6 +37,9 @@ public class BusiNoticeQuery { //审核备注 private String approvalRemark; private String bloggerTypes; + /** 是否急招（0 否 | 1是） */ + private String isUrgent; + private String isPlatformFree; /** 查询条件 */ private JSONObject params =new JSONObject(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index 6685417..2a03722 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java @@ -100,7 +100,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl Date: Fri, 25 Apr 2025 14:29:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=80=9A=E5=91=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/busi/BusiNoticeMapper.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml index 01fb83d..e4152df 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml @@ -299,9 +299,9 @@ order by dbns.create_time desc count(sign.id) as reportNum, mySign.create_time as signTime, CASE - WHEN mySign.status = '0' AND dbn.end_date >= CURDATE() THEN '审核中' - WHEN mySign.status = '1' THEN '已通过' - WHEN mySign.status = '0' AND dbn.end_date < CURDATE() THEN '未合作' + WHEN mySign.status = '01' AND dbn.end_date >= CURDATE() THEN '审核中' + WHEN mySign.status = '02' THEN '已通过' + WHEN mySign.status = '01' AND dbn.end_date < CURDATE() THEN '未合作' ELSE '已过期' END AS signStatus FROM @@ -309,20 +309,20 @@ order by dbns.create_time desc LEFT JOIN dl_busi_notice_view dbnv ON dbn.id = dbnv.id LEFT JOIN sys_user su ON dbn.user_id = su.user_id LEFT join dl_busi_notice_sign sign on sign.notice_id = dbn.id and sign.del_flag = 0 - inner join dl_busi_notice_sign mySign on sign.notice_id = dbn.id and sign.del_flag = 0 and sign.user_id = #{entity.userId} + inner join dl_busi_notice_sign mySign on dbn.id = mySign.notice_id and dbn.del_flag = 0 and mySign.user_id = #{entity.userId} WHERE dbn.del_flag = 0 AND (dbn.approval_status = '1') - and mySign.status ='0' and dbn.end_date >= CURDATE() + and mySign.status ='01' and dbn.end_date >= CURDATE() - and mySign.status ='1' + and mySign.status ='02' - and mySign.status ='0' and dbn.end_date < CURDATE() + and mySign.status ='01' and dbn.end_date < CURDATE() From a62e628a184087b212199579a764afd8698268a5 Mon Sep 17 00:00:00 2001 From: xyc <3422692813@qq.com> Date: Fri, 25 Apr 2025 15:34:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/busi/controller/BusiNoticeSignController.java | 2 +- .../java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeSignController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeSignController.java index d03b44c..662af9b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeSignController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeSignController.java @@ -76,7 +76,7 @@ public class BusiNoticeSignController extends BaseController Page page = new Page<>(1, 5000); List records = noticeService.reportList(query, page).getRecords(); ExcelUtil util = new ExcelUtil(BusiNoticeSign.class); - util.exportExcel(response, records, "通告:"+notice.getTitle()+"报名名称"); + util.exportExcel(response, records, "通告-"+notice.getTitle()+"报名名称"); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index 2a03722..8912893 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java @@ -474,7 +474,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl().eq(BusiNoticeSign::getNoticeId, noticeId).eq(BusiNoticeSign::getUserId, userId).eq(BusiNoticeSign::getStatus,"1").last("limit 1"))!=null){ + if(busiNoticeSignMapper.selectOne(new LambdaQueryWrapper().eq(BusiNoticeSign::getNoticeId, noticeId).eq(BusiNoticeSign::getUserId, userId).eq(BusiNoticeSign::getStatus,"02").last("limit 1"))!=null){ res.put("passSign",true); } }