diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFeedbackController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFeedbackController.java new file mode 100644 index 00000000..cd3754fd --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFeedbackController.java @@ -0,0 +1,97 @@ +package cn.iocoder.yudao.module.jx.controller.admin; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.jx.core.controller.BaseController; +import cn.iocoder.yudao.module.jx.domain.DriveSchoolFeedback; +import cn.iocoder.yudao.module.jx.service.IDriveSchoolFeedbackService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; + +/** + * 反馈Controller + * + * @author ruoyi + * @date 2024-04-27 + */ +@RestController +@RequestMapping("/system/feedback") +public class DriveSchoolFeedbackController extends BaseController +{ + @Resource + private IDriveSchoolFeedbackService driveSchoolFeedbackService; + + @GetMapping("/insertData/{content}") + public void insertData(@PathVariable("content") String content) { + driveSchoolFeedbackService.insertData(content); + } + + /** + * 查询反馈列表 + */ + @GetMapping("/list") + public CommonResult> list(DriveSchoolFeedback driveSchoolFeedback) + { + Page page = new Page<>(driveSchoolFeedback.getPageNum(), driveSchoolFeedback.getPageSize()); + IPage driveSchoolFeedbackIPage = driveSchoolFeedbackService.selectDriveSchoolFeedbackList(driveSchoolFeedback, page); + return CommonResult.success(driveSchoolFeedbackIPage); + } + + /** + * 查询反馈列表 + */ + @GetMapping("/like") + public CommonResult like(DriveSchoolFeedback driveSchoolFeedback) + { + return CommonResult.success(driveSchoolFeedbackService.selectDriveSchoolFeedbackListAll(driveSchoolFeedback)); + } + + + /** + * 导出反馈列表 + */ +// @Log(title = "反馈", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(HttpServletResponse response, DriveSchoolFeedback driveSchoolFeedback) +// { +// List list = driveSchoolFeedbackService.selectDriveSchoolFeedbackList(driveSchoolFeedback); +// ExcelUtil util = new ExcelUtil(DriveSchoolFeedback.class); +// util.exportExcel(response, list, "反馈数据"); +// } + + /** + * 获取反馈详细信息 + */ + @GetMapping(value = "/{id}") + public CommonResult getInfo(@PathVariable("id") Long id) + { + return success(driveSchoolFeedbackService.selectDriveSchoolFeedbackById(id)); + } + + /** + * 新增反馈 + */ + @PostMapping + public CommonResult add(@RequestBody DriveSchoolFeedback driveSchoolFeedback) throws Exception { + return toAjax(driveSchoolFeedbackService.insertDriveSchoolFeedback(driveSchoolFeedback)); + } + + /** + * 修改反馈 + */ + @PutMapping + public CommonResult edit(@RequestBody DriveSchoolFeedback driveSchoolFeedback) + { + return toAjax(driveSchoolFeedbackService.updateDriveSchoolFeedback(driveSchoolFeedback)); + } + + /** + * 删除反馈 + */ + @DeleteMapping("/{ids}") + public CommonResult remove(@PathVariable Long[] ids) + { + return toAjax(driveSchoolFeedbackService.deleteDriveSchoolFeedbackByIds(ids)); + } +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFeedback.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFeedback.java new file mode 100644 index 00000000..64ab6eff --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolFeedback.java @@ -0,0 +1,39 @@ +package cn.iocoder.yudao.module.jx.domain; + +import cn.iocoder.yudao.annotation.Excel; +import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; +import lombok.Data; + +/** + * 反馈对象 drive_school_feedback + * + * @author ruoyi + * @date 2024-04-27 + */ +@Data +public class DriveSchoolFeedback extends TenantBaDO +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 用户id */ + @Excel(name = "用户id") + private Long userId; + + /** 公报内容 */ + @Excel(name = "公报内容") + private String content; + private String jlContent; + private String likes; + private Long jlId; + private String jlName; + private Long jxId; + private String jxName; + //评价类型 0：训练评价 1：拿证后评价 + private String evaluateType; + + //用户姓名 + private String userName; +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFeedbackMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFeedbackMapper.java new file mode 100644 index 00000000..8495bd93 --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolFeedbackMapper.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.jx.mapper; + +import cn.iocoder.yudao.module.jx.domain.DriveSchoolFeedback; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 反馈Mapper接口 + * + * @author ruoyi + * @date 2024-04-27 + */ +@Mapper +public interface DriveSchoolFeedbackMapper +{ + /** + * 查询反馈 + * + * @param id 反馈主键 + * @return 反馈 + */ + public DriveSchoolFeedback selectDriveSchoolFeedbackById(Long id); + + /** + * 查询反馈列表 + * + * @param driveSchoolFeedback 反馈 + * @return 反馈集合 + */ + public IPage selectDriveSchoolFeedbackList(@Param("entity") DriveSchoolFeedback driveSchoolFeedback, Page page); + public List selectDriveSchoolFeedbackListAll(@Param("entity") DriveSchoolFeedback driveSchoolFeedback); + public Integer likeOne(DriveSchoolFeedback driveSchoolFeedback); + public Integer likeTwo(DriveSchoolFeedback driveSchoolFeedback); + public Integer likeThree(DriveSchoolFeedback driveSchoolFeedback); + + /** + * 新增反馈 + * + * @param driveSchoolFeedback 反馈 + * @return 结果 + */ + public int insertDriveSchoolFeedback(DriveSchoolFeedback driveSchoolFeedback); + + /** + * 修改反馈 + * + * @param driveSchoolFeedback 反馈 + * @return 结果 + */ + public int updateDriveSchoolFeedback(DriveSchoolFeedback driveSchoolFeedback); + + /** + * 删除反馈 + * + * @param id 反馈主键 + * @return 结果 + */ + public int deleteDriveSchoolFeedbackById(Long id); + + /** + * 批量删除反馈 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDriveSchoolFeedbackByIds(Long[] ids); + + void insertData(@Param("userId") Long userId, @Param("content") String content); +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFeedbackService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFeedbackService.java new file mode 100644 index 00000000..df1c5827 --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolFeedbackService.java @@ -0,0 +1,70 @@ +package cn.iocoder.yudao.module.jx.service; + + +import cn.iocoder.yudao.module.jx.domain.DriveSchoolFeedback; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import java.util.List; +import java.util.Map; + +/** + * 反馈Service接口 + * + * @author ruoyi + * @date 2024-04-27 + */ +public interface IDriveSchoolFeedbackService +{ + /** + * 查询反馈 + * + * @param id 反馈主键 + * @return 反馈 + */ + public DriveSchoolFeedback selectDriveSchoolFeedbackById(Long id); + + /** + * 查询反馈列表 + * + * @param driveSchoolFeedback 反馈 + * @return 反馈集合 + */ + public IPage selectDriveSchoolFeedbackList(DriveSchoolFeedback driveSchoolFeedback, Page page); + public List selectDriveSchoolFeedbackListAll(DriveSchoolFeedback driveSchoolFeedback); + public Map like(DriveSchoolFeedback driveSchoolFeedback); + + /** + * 新增反馈 + * + * @param driveSchoolFeedback 反馈 + * @return 结果 + */ + public int insertDriveSchoolFeedback(DriveSchoolFeedback driveSchoolFeedback) throws Exception; + + /** + * 修改反馈 + * + * @param driveSchoolFeedback 反馈 + * @return 结果 + */ + public int updateDriveSchoolFeedback(DriveSchoolFeedback driveSchoolFeedback); + + /** + * 批量删除反馈 + * + * @param ids 需要删除的反馈主键集合 + * @return 结果 + */ + public int deleteDriveSchoolFeedbackByIds(Long[] ids); + + /** + * 删除反馈信息 + * + * @param id 反馈主键 + * @return 结果 + */ + public int deleteDriveSchoolFeedbackById(Long id); + + void insertData(String content); +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolExamPassServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolExamPassServiceImpl.java index 0ec59596..8602f05f 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolExamPassServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolExamPassServiceImpl.java @@ -45,8 +45,7 @@ import java.util.List; * @date 2024-05-07 */ @Service -public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassService -{ +public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassService { @Autowired @Lazy private DriveSchoolExamPassMapper driveSchoolExamPassMapper; @@ -73,13 +72,13 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi * @return 考试通过 */ @Override - public DriveSchoolExamPass selectDriveSchoolExamPassById(Long id) - { + public DriveSchoolExamPass selectDriveSchoolExamPassById(Long id) { return driveSchoolExamPassMapper.selectDriveSchoolExamPassById(id); } @Resource private DriveSchoolInfoMapper driveSchoolInfoMapper; + /** * 查询考试通过列表 * @@ -87,14 +86,14 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi * @return 考试通过 */ @Override - public IPage selectDriveSchoolExamPassList(DriveSchoolExamPass driveSchoolExamPass, Page page) - { + public IPage selectDriveSchoolExamPassList(DriveSchoolExamPass driveSchoolExamPass, Page page) { Long userId = SecurityFrameworkUtils.getLoginUserId(); AdminUserRespDTO user = userApi.getUser(userId); Long deptId = user.getDeptId(); + deptId = 227L; DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId); driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId()); - return driveSchoolExamPassMapper.selectDriveSchoolExamPassList(driveSchoolExamPass,page); + return driveSchoolExamPassMapper.selectDriveSchoolExamPassList(driveSchoolExamPass, page); } @Autowired @@ -107,8 +106,7 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi * @return 结果 */ @Override - public int insertDriveSchoolExamPass(DriveSchoolExamPass driveSchoolExamPass) - { + public int insertDriveSchoolExamPass(DriveSchoolExamPass driveSchoolExamPass) { DriveSchoolPay driveSchoolPay1 = new DriveSchoolPay(); Long userId = SecurityFrameworkUtils.getLoginUserId(); DriveSchoolPay driveSchoolPay2 = driveSchoolPayService.selectByUserId(userId); @@ -130,7 +128,7 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi driveSchoolPay1.setUserId(userId); DriveSchoolPay deductByUserInfo = driveSchoolPayMapper.getDeductByUserInfo(driveSchoolPay1); - if (ObjectUtils.isNotEmpty(deductByUserInfo)){ + if (ObjectUtils.isNotEmpty(deductByUserInfo)) { driveSchoolExamPass.setOrderNumber(deductByUserInfo.getOrderNumber()); DriveSchoolCourse driveSchoolCourse = driveSchoolCourseMapper.selectDriveSchoolCourseById(deductByUserInfo.getCourseId()); driveSchoolExamPass.setCoursePrice(driveSchoolCourse.getPrice()); @@ -142,7 +140,7 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi //发送短信 if (PhoneValidator.isValid(driveSchoolPay2.getPhone())) { - SendSmsUtil.sendMsgCommon(new String[]{driveSchoolPay2.getName()+ "同学，恭喜通过科目"+driveSchoolExamPass.getCourseSubject()+"的考试，继续加油！",}, driveSchoolPay2.getPhone(),"1400852709","蓝安汽车小程序","2143603"); + SendSmsUtil.sendMsgCommon(new String[]{driveSchoolPay2.getName() + "同学，恭喜通过科目" + driveSchoolExamPass.getCourseSubject() + "的考试，继续加油！",}, driveSchoolPay2.getPhone(), "1400852709", "蓝安汽车小程序", "2143603"); } return driveSchoolExamPassMapper.insertDriveSchoolExamPass(driveSchoolExamPass); } @@ -154,8 +152,7 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi * @return 结果 */ @Override - public int updateDriveSchoolExamPass(DriveSchoolExamPass driveSchoolExamPass) - { + public int updateDriveSchoolExamPass(DriveSchoolExamPass driveSchoolExamPass) { //driveSchoolExamPass.setUpdateTime(DateUtils.getNowDate()); return driveSchoolExamPassMapper.updateDriveSchoolExamPass(driveSchoolExamPass); } @@ -167,8 +164,7 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi * @return 结果 */ @Override - public int deleteDriveSchoolExamPassByIds(Long[] ids) - { + public int deleteDriveSchoolExamPassByIds(Long[] ids) { return driveSchoolExamPassMapper.deleteDriveSchoolExamPassByIds(ids); } @@ -179,20 +175,19 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi * @return 结果 */ @Override - public int deleteDriveSchoolExamPassById(Long id) - { + public int deleteDriveSchoolExamPassById(Long id) { return driveSchoolExamPassMapper.deleteDriveSchoolExamPassById(id); } @Override - public IPage checkList(DriveSchoolExamPass driveSchoolExamPass,Page page) { + public IPage checkList(DriveSchoolExamPass driveSchoolExamPass, Page page) { IPage driveSchoolExamPassIPage = driveSchoolExamPassMapper.checkList(driveSchoolExamPass.getJlId(), page); List driveSchoolExamPasses = driveSchoolExamPassIPage.getRecords(); for (DriveSchoolExamPass schoolExamPass : driveSchoolExamPasses) { DriveSchoolCourse driveSchoolCourse = driveSchoolCourseMapper.selectDriveSchoolCourseById(schoolExamPass.getCourseId()); - if (ObjectUtils.isNotEmpty(driveSchoolCourse)){ + if (ObjectUtils.isNotEmpty(driveSchoolCourse)) { schoolExamPass.setCourseName(driveSchoolCourse.getName()); } } @@ -201,34 +196,36 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi /** * 查询教练工资 + * * @param driveSchoolExamPass * @return */ @Override - public IPage getBalanceList(DriveSchoolExamPass driveSchoolExamPass,Page page) { + public IPage getBalanceList(DriveSchoolExamPass driveSchoolExamPass, Page page) { - if (ObjectUtils.isNotEmpty(driveSchoolExamPass.getJxId())){ + if (ObjectUtils.isNotEmpty(driveSchoolExamPass.getJxId())) { driveSchoolExamPass.setJxId(driveSchoolExamPass.getId()); - }else { + } else { Long userId = SecurityFrameworkUtils.getLoginUserId(); - AdminUserRespDTO user = userApi.getUser(userId); - Long deptId = user.getDeptId(); + AdminUserRespDTO user = userApi.getUser(userId); + Long deptId = user.getDeptId(); + deptId = 227L; DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId); driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId()); } SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - if (ObjectUtils.isNotEmpty(driveSchoolExamPass.getPayStartTime()) && ObjectUtils.isNotEmpty(driveSchoolExamPass.getPayEndTime())){ + if (ObjectUtils.isNotEmpty(driveSchoolExamPass.getPayStartTime()) && ObjectUtils.isNotEmpty(driveSchoolExamPass.getPayEndTime())) { driveSchoolExamPass.setPayStartTimes(simpleDateFormat.format(driveSchoolExamPass.getPayStartTime())); driveSchoolExamPass.setPayEndTimes(simpleDateFormat.format(driveSchoolExamPass.getPayEndTime())); } IPage records = driveSchoolExamPassMapper.getBalanceList(driveSchoolExamPass, page); List balanceList = records.getRecords(); - balanceList.forEach(s->{ + balanceList.forEach(s -> { DriveSchoolExamPass driveSchoolExamPass1 = new DriveSchoolExamPass(); DriveSchoolExamPass balance = driveSchoolExamPassMapper.getBalance(driveSchoolExamPass1); - if (ObjectUtils.isNotEmpty(balance)){ + if (ObjectUtils.isNotEmpty(balance)) { s.setDeducts(balance.getDeduct()); - }else { + } else { s.setDeducts(new BigDecimal(0)); } }); @@ -244,7 +241,7 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - if (ObjectUtils.isNotEmpty(driveSchoolExamPass.getPayStartTime()) && ObjectUtils.isNotEmpty(driveSchoolExamPass.getPayEndTime())){ + if (ObjectUtils.isNotEmpty(driveSchoolExamPass.getPayStartTime()) && ObjectUtils.isNotEmpty(driveSchoolExamPass.getPayEndTime())) { driveSchoolExamPass.setPayStartTimes(simpleDateFormat.format(driveSchoolExamPass.getPayStartTime())); driveSchoolExamPass.setPayEndTimes(simpleDateFormat.format(driveSchoolExamPass.getPayEndTime())); } @@ -274,24 +271,24 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi @Override public DriveSchoolExamPass getBalanceApp(DriveSchoolExamPass driveSchoolExamPass) { - if (ObjectUtils.isNotEmpty(driveSchoolExamPass.getJxId())){ + if (ObjectUtils.isNotEmpty(driveSchoolExamPass.getJxId())) { driveSchoolExamPass.setJxId(driveSchoolExamPass.getId()); - }else { + } else { Long userId = SecurityFrameworkUtils.getLoginUserId(); - AdminUserRespDTO user = userApi.getUser(userId); - Long deptId = user.getDeptId(); + AdminUserRespDTO user = userApi.getUser(userId); + Long deptId = user.getDeptId(); DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId); driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId()); } DriveSchoolExamPass driveSchoolExamPass1 = driveSchoolExamPassMapper.getBalanceApp(driveSchoolExamPass); - DriveSchoolExamPass balance = driveSchoolExamPassMapper.getBalance(driveSchoolExamPass); - if (ObjectUtils.isNotEmpty(balance)){ - driveSchoolExamPass1.setDeducts(balance.getDeduct()); - }else { - driveSchoolExamPass1.setDeducts(new BigDecimal(0)); - } + DriveSchoolExamPass balance = driveSchoolExamPassMapper.getBalance(driveSchoolExamPass); + if (ObjectUtils.isNotEmpty(balance)) { + driveSchoolExamPass1.setDeducts(balance.getDeduct()); + } else { + driveSchoolExamPass1.setDeducts(new BigDecimal(0)); + } return driveSchoolExamPass1; } @@ -301,6 +298,7 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi /** * 查询教练工资 + * * @param driveSchoolExamPass * @return */ @@ -327,9 +325,9 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi DriveSchoolExamPass driveSchoolExamPass1 = new DriveSchoolExamPass(); DriveSchoolExamPass balance = driveSchoolExamPassMapper.getBalanceByCaochId(driveSchoolExamPass1); - if (ObjectUtils.isNotEmpty(balanceByCoachId) && ObjectUtils.isNotEmpty(balance) && ObjectUtils.isNotEmpty(balance.getDeduct())){ + if (ObjectUtils.isNotEmpty(balanceByCoachId) && ObjectUtils.isNotEmpty(balance) && ObjectUtils.isNotEmpty(balance.getDeduct())) { balanceByCoachId.setDeducts(balance.getDeduct()); - }else { + } else { DriveSchoolExamPass driveSchoolExamPass2 = new DriveSchoolExamPass(); driveSchoolExamPass2.setDeducts(new BigDecimal(0)); return driveSchoolExamPass2; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFeedbackServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFeedbackServiceImpl.java new file mode 100644 index 00000000..339832ca --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFeedbackServiceImpl.java @@ -0,0 +1,176 @@ +package cn.iocoder.yudao.module.jx.service.impl; + +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.module.jx.domain.DriveSchoolFeedback; +import cn.iocoder.yudao.module.jx.domain.DriveSchoolInfo; +import cn.iocoder.yudao.module.jx.mapper.DriveSchoolFeedbackMapper; +import cn.iocoder.yudao.module.jx.mapper.DriveSchoolInfoMapper; +import cn.iocoder.yudao.module.jx.payment.entity.DriveSchoolPay; +import cn.iocoder.yudao.module.jx.payment.service.DriveSchoolPayService; +import cn.iocoder.yudao.module.jx.service.IDriveSchoolFeedbackService; +import cn.iocoder.yudao.module.jx.vo.DriveSchoolInfoVO; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 反馈Service业务层处理 + * + * @author ruoyi + * @date 2024-04-27 + */ +@Service +public class DriveSchoolFeedbackServiceImpl implements IDriveSchoolFeedbackService +{ + @Resource + private DriveSchoolFeedbackMapper driveSchoolFeedbackMapper; + +// @Resource +// private SysUserMapper sysUserMapper; + + @Resource + private AdminUserApi userApi; + /** + * 查询反馈 + * + * @param id 反馈主键 + * @return 反馈 + */ + @Override + public DriveSchoolFeedback selectDriveSchoolFeedbackById(Long id) + { + return driveSchoolFeedbackMapper.selectDriveSchoolFeedbackById(id); + } + + @Resource + private DriveSchoolInfoMapper driveSchoolInfoMapper; + /** + * 查询反馈列表 + * + * @param driveSchoolFeedback 反馈 + * @return 反馈 + */ + @Override + public IPage selectDriveSchoolFeedbackList(DriveSchoolFeedback driveSchoolFeedback, Page page) + { + Long deptId = SecurityFrameworkUtils.getLoginUserDeptId(); + //Long deptId = SecurityUtils.getDeptId(); + if(deptId !=100L){ + driveSchoolFeedback.setJxId(deptId); + } + return driveSchoolFeedbackMapper.selectDriveSchoolFeedbackList(driveSchoolFeedback,page); + } + + @Override + public List selectDriveSchoolFeedbackListAll(DriveSchoolFeedback driveSchoolFeedback) + { + Long deptId = SecurityFrameworkUtils.getLoginUserDeptId(); + //Long deptId = SecurityUtils.getDeptId(); + if(deptId !=100L){ + driveSchoolFeedback.setJxId(deptId); + } + return driveSchoolFeedbackMapper.selectDriveSchoolFeedbackListAll(driveSchoolFeedback); + } + + @Override + public Map like(DriveSchoolFeedback driveSchoolFeedback) + { + HashMap objectObjectHashMap = new HashMap<>(); + Long deptId = SecurityFrameworkUtils.getLoginUserDeptId(); + //Long deptId = SecurityUtils.getDeptId(); + if(deptId !=100L){ + driveSchoolFeedback.setJxId(deptId); + } + objectObjectHashMap.put("likeOne",driveSchoolFeedbackMapper.likeOne(driveSchoolFeedback)); + objectObjectHashMap.put("likeTwo",driveSchoolFeedbackMapper.likeTwo(driveSchoolFeedback)); + objectObjectHashMap.put("likeThree",driveSchoolFeedbackMapper.likeThree(driveSchoolFeedback)); + return objectObjectHashMap; + } + + @Autowired + private DriveSchoolPayService driveSchoolPayService; + + /** + * 新增反馈 + * + * @param driveSchoolFeedback 反馈 + * @return 结果 + */ + @Override + public int insertDriveSchoolFeedback(DriveSchoolFeedback driveSchoolFeedback) throws Exception { + Long userId = SecurityFrameworkUtils.getLoginUserId(); +// Long userId = SecurityUtils.getUserId(); +// SysUser sysUser = sysUserMapper.selectUserById(userId); + AdminUserRespDTO sysUser = userApi.getUser(userId); + if(ObjectUtils.isNotEmpty(sysUser)){ + driveSchoolFeedback.setUserName(sysUser.getNickname()); + } + DriveSchoolPay driveSchoolPay = driveSchoolPayService.selectByUserId(userId); + if (ObjectUtils.isEmpty(driveSchoolPay)){ + throw new Exception("请先报名！"); + } + driveSchoolFeedback.setUserId(userId); + driveSchoolFeedback.setJlId(driveSchoolPay.getJlId()); + driveSchoolFeedback.setJlName(driveSchoolPay.getJlName()); + DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.findInfoByJxId(driveSchoolPay.getJxId()); + driveSchoolFeedback.setJxId(schoolInfoByDeptId.getDeptId()); + + DriveSchoolInfo driveSchoolInfo = driveSchoolInfoMapper.selectDriveSchoolInfoById(driveSchoolPay.getJxId()); + driveSchoolFeedback.setJxName(driveSchoolInfo.getSchoolName()); + + return driveSchoolFeedbackMapper.insertDriveSchoolFeedback(driveSchoolFeedback); + } + + /** + * 修改反馈 + * + * @param driveSchoolFeedback 反馈 + * @return 结果 + */ + @Override + public int updateDriveSchoolFeedback(DriveSchoolFeedback driveSchoolFeedback) + { + //driveSchoolFeedback.setUpdateTime(DateUtils.getNowDate()); + return driveSchoolFeedbackMapper.updateDriveSchoolFeedback(driveSchoolFeedback); + } + + /** + * 批量删除反馈 + * + * @param ids 需要删除的反馈主键 + * @return 结果 + */ + @Override + public int deleteDriveSchoolFeedbackByIds(Long[] ids) + { + return driveSchoolFeedbackMapper.deleteDriveSchoolFeedbackByIds(ids); + } + + /** + * 删除反馈信息 + * + * @param id 反馈主键 + * @return 结果 + */ + @Override + public int deleteDriveSchoolFeedbackById(Long id) + { + return driveSchoolFeedbackMapper.deleteDriveSchoolFeedbackById(id); + } + + @Override + public void insertData(String content) { + Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); + driveSchoolFeedbackMapper.insertData(loginUserId, content); + + } +} diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFeedbackMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFeedbackMapper.xml new file mode 100644 index 00000000..8f8d2f56 --- /dev/null +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolFeedbackMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + select * from drive_school_feedback + + + + + + + + + + + + + + + + insert into drive_school_feedback + + id, + userId, + content, + jlContent, + jlId, + jlName, + jxId, + jxName, + create_time, + create_by, + update_time, + update_by, + evaluateType, + userName, + likes, + + + #{id}, + #{userId}, + #{content}, + #{jlContent}, + #{jlId}, + #{jlName}, + #{jxId}, + #{jxName}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{evaluateType}, + #{userName}, + #{likes}, + + + + insert into drive_school_feedback (userId, content, create_time) values (#{userId}, #{content}, now()) + + + + update drive_school_feedback + + userId = #{userId}, + content = #{content}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + evaluateType = #{evaluateType}, + + where id = #{id} + + + + delete from drive_school_feedback where id = #{id} + + + + delete from drive_school_feedback where id in + + #{id} + + +