From 5e39a8b4f1b9359258928f968ee04fbccf3ec73e Mon Sep 17 00:00:00 2001 From: chenwei Date: Mon, 19 Aug 2024 18:22:58 +0800 Subject: [PATCH] lpg 功能模块划分 --- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WAjxqDao.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WBxbDao.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/AjDto.java | 8 ++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/BxRequest.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WAjManager.java | 10 ++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WAjxqManager.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WBxbManager.java | 40 ++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WHyxxManager.java | 8 ++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WAjManagerImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WAjxqManagerImpl.java | 18 ++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WBxbManagerImpl.java | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WHyxxManagerImpl.java | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/AjDetailResponse.java | 16 ++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/AjxxVo.java | 12 ++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/BxbResponse.java | 21 +++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/WHydzVo.java | 15 +++++++++++++++ backend/lpg/src/main/java/com/hotent/lpg/controller/hy/AjController.java | 72 ------------------------------------------------------------------------ backend/lpg/src/main/java/com/hotent/lpg/controller/hy/BxbController.java | 119 ----------------------------------------------------------------------------------------------------------------------- backend/lpg/src/main/java/com/hotent/lpg/model/dto/AjDto.java | 8 -------- backend/lpg/src/main/java/com/hotent/lpg/model/request/BxRequest.java | 106 ---------------------------------------------------------------------------------------------------------- backend/lpg/src/main/java/com/hotent/lpg/model/response/AjDetailResponse.java | 16 ---------------- backend/lpg/src/main/java/com/hotent/lpg/model/response/BxbResponse.java | 21 --------------------- backend/lpg/src/main/java/com/hotent/lpg/model/vo/AjxxVo.java | 12 ------------ backend/lpg/src/main/java/com/hotent/lpg/model/vo/WHydzVo.java | 17 ----------------- 26 files changed, 769 insertions(+), 371 deletions(-) create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WAjxqDao.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WBxbDao.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/AjDto.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/BxRequest.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WAjxqManager.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WBxbManager.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WAjxqManagerImpl.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WBxbManagerImpl.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/AjDetailResponse.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/AjxxVo.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/BxbResponse.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/WHydzVo.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/controller/hy/AjController.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/controller/hy/BxbController.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/dto/AjDto.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/request/BxRequest.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/response/AjDetailResponse.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/response/BxbResponse.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/vo/AjxxVo.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/vo/WHydzVo.java diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java new file mode 100644 index 0000000..45042f8 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java @@ -0,0 +1,66 @@ +package com.hotent.lpg.user.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.model.CommonResult; +import com.hotent.lpg.common.model.WAj; +import com.hotent.lpg.common.model.WAjxq; +import com.hotent.lpg.user.dto.AjDto; +import com.hotent.lpg.user.manager.WAjManager; +import com.hotent.lpg.user.manager.WAjxqManager; +import com.hotent.lpg.user.vo.AjDetailResponse; +import com.hotent.lpg.user.vo.AjxxVo; +import com.hotent.uc.util.ContextUtil; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/customer/aj/") +public class AjController { + + @Autowired + private WAjManager wAjManager; + @Autowired + private WAjxqManager wAjxqManager; + + @GetMapping("/pageList") + @ApiOperation("会员安检列表") + public CommonResult> pageList(Page page, String ajlx, String ajjl, String ajsj) { + AjDto ajDto = new AjDto(); + ajDto.setFHyyhid(ContextUtil.getCurrentUserId()); + ajDto.setFAjlx(ajlx); + ajDto.setFAjjl(ajjl); + ajDto.setSj(ajsj); + IPage responseIPage = wAjManager.pageList(page,ajDto,null); + return CommonResult.>ok().value(responseIPage); + } + + /** + * 根据id获取详情 + * + * @param id + * @return + * @throws Exception ModelAndView + */ + @GetMapping(value = "/getDetail") + public CommonResult getDetail(@RequestParam(required = true) String id) throws Exception { + AjDetailResponse response = new AjDetailResponse(); + WAj aj = wAjManager.getDetail(id); + if (ObjectUtil.isNull(aj)) { + return CommonResult.ok().value(response); + } + List list = wAjxqManager.list(new LambdaQueryWrapper().eq(WAjxq::getfAjid, id)); + response.setAj(aj); + response.setAjxq(list); + return CommonResult.ok().value(response); + } + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java new file mode 100644 index 0000000..1aaacfe --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java @@ -0,0 +1,119 @@ +package com.hotent.lpg.user.controller; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.controller.BaseController; +import com.hotent.base.model.CommonResult; +import com.hotent.lpg.common.model.WBxb; +import com.hotent.lpg.common.model.WHyxx; +import com.hotent.lpg.user.dto.BxRequest; +import com.hotent.lpg.user.vo.BxbResponse; +import com.hotent.lpg.user.manager.WBxbManager; +import com.hotent.lpg.user.manager.WHyxxManager; +import com.hotent.runtime.script.ScriptImpl; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 会员端：报修管理 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-04-07 + */ +@Slf4j +@RestController +@RequestMapping("/customer/bx") +public class BxbController extends BaseController { + + @Resource + private ScriptImpl scriptImpl; + @Resource + private WHyxxManager wHyxxManager; + + /** + * 根据id获取报修表数据详情 + * + * @param id + * @return + * @throws Exception ModelAndView + */ + @GetMapping(value = "/getDetail") + @ApiOperation(value = "根据id获取报修表数据详情", httpMethod = "GET", notes = "根据id获取报修表数据详情") + public CommonResult getDetail(@ApiParam(name = "id", value = "业务对象主键", required = true) @RequestParam(required = true) String id) throws Exception { + return CommonResult.ok().value(baseService.getDetail(id)); + } + + /** + * 创建工单 + * + * @param bxRequest + * @return + * @throws Exception + * @throws + */ + @PostMapping(value = "/save") + @ApiOperation(value = "创建工单", httpMethod = "POST", notes = "创建工单") + public CommonResult save(@ApiParam(name = "bxRequest", value = "报修表对象", required = true) @RequestBody BxRequest bxRequest) throws Exception { + log.info("新增保修参数，bxRequest={}", bxRequest); + try { + String currentUserId = scriptImpl.getCurrentUserId(); + WHyxx one = wHyxxManager.getOne(Wrappers.lambdaQuery().eq(WHyxx::getFUserid, currentUserId)); + if (one == null) { + throw new RuntimeException("会员信息不存在"); + } + bxRequest.setHyyhid(one.getFUserid()); + baseService.saveBx(bxRequest,"1"); + } catch (Exception e) { + return CommonResult.error().message(e.getMessage()); + } + return CommonResult.ok().message("操作成功"); + } + + /** + * 会员端报修分页 + * + * @param page + * @param wBxb + * @return + */ + @GetMapping(value = "/bxbPage", produces = {"application/json; charset=utf-8"}) + @ApiOperation(value = "会员报修列表", httpMethod = "GET", notes = "会员报修列表") + public CommonResult bxbPage(Page page, WBxb wBxb) { + log.info("保修列表参数，page={},wBxb={}", page, wBxb); + String currentUserId = scriptImpl.getCurrentUserId(); + WHyxx wHyxx = wHyxxManager.getOne(Wrappers.lambdaQuery().eq(WHyxx::getFUserid, currentUserId)); + if (wHyxx == null) { + return CommonResult.error("会员信息不存在"); + } + wBxb.setFHyyhid(wHyxx.getFUserid()); + IPage resultPage = baseService.bxbPage(page, wBxb); + return new CommonResult(true, "", resultPage); + } + + /** + * 取消工单 + * + * @param id 工单id + * @return + * @throws Exception + * @throws + */ + @PostMapping(value = "/cancal") + @ApiOperation(value = "取消工单", httpMethod = "POST", notes = "取消工单") + public CommonResult cancal(String id) throws Exception { + log.info("新增保修参数，id={}", id); + try { + baseService.cancal(id); + } catch (Exception e) { + return CommonResult.error().message(e.getMessage()); + } + return CommonResult.ok().message("操作成功"); + } +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WAjxqDao.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WAjxqDao.java new file mode 100644 index 0000000..acd1d4d --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WAjxqDao.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hotent.lpg.common.model.WAjxq; + +/** + * 安检详情 Mapper 接口 + * + * @company 广州宏天软件股份有限公司 + * @author admin + * @since 2024-03-20 + */ +public interface WAjxqDao extends BaseMapper { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WBxbDao.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WBxbDao.java new file mode 100644 index 0000000..8406d12 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WBxbDao.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hotent.lpg.common.model.WBxb; + +/** + * 报修表 Mapper 接口 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-04-07 + */ +public interface WBxbDao extends BaseMapper { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/AjDto.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/AjDto.java new file mode 100644 index 0000000..661a7e4 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/AjDto.java @@ -0,0 +1,8 @@ +package com.hotent.lpg.user.dto; + +import com.hotent.lpg.common.model.WAj; +import lombok.Data; + +@Data +public class AjDto extends WAj { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/BxRequest.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/BxRequest.java new file mode 100644 index 0000000..3030ca6 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/BxRequest.java @@ -0,0 +1,106 @@ +package com.hotent.lpg.user.dto; + +import lombok.Data; + +/** + * 报修表请求参数 + */ +@Data +public class BxRequest { + // 会员端：新增工单参数 + /** + * 报修类型 + */ + private String bxlx; + /** + * 问题描述 + */ + private String wtms; + /** + * 问题图片 + */ + private String wttp; + /** + * 工单类型 + */ + private String gdlx; + /** + * 下单姓名 + */ + private String xdxm; + /** + * 会员用户ID + */ + private String hyyhid; + /** + * 联系方式 + */ + private String lxfs; + /** + * 联系地址省 + */ + private String lxdzsf; + /** + * 联系地址市 + */ + private String lxdzs; + /** + * 联系地址区 + */ + private String lxdzq; + /** + * 联系地址街道 + */ + private String lxdzjd; + /** + * 联系地址详细地址 + */ + private String lxdzxxdz; + /** + * 报修类型明细 + */ + private String bxlxmx; + /** + * 经度 + */ + private String jd; + /** + * 维度 + */ + private String wd; + + + //员工端：提交工单参数 + /** + * 维修结果 + */ + private String wxjg; + + /** + * 维修图片 + */ + private String wxtp; + + /** + * 维修备注 + */ + private String wxbz; + + /** + * 维修id + */ + private String id; + /** + * 身份证号 + */ + private String sfzh; + /** + * 会员类型 + */ + private String hylx; + /** + * 会员姓名 + */ + private String hyxm; + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WAjManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WAjManager.java index fdcef04..98da0c6 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WAjManager.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WAjManager.java @@ -1,7 +1,17 @@ package com.hotent.lpg.user.manager; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hotent.base.manager.BaseManager; import com.hotent.lpg.common.model.WAj; +import com.hotent.lpg.user.dto.AjDto; +import com.hotent.lpg.user.vo.AjxxVo; public interface WAjManager extends BaseManager { + IPage pageList(Page page, AjDto ajDto, String filterFieldSql); + + WAj getDetail(String id); + + + } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WAjxqManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WAjxqManager.java new file mode 100644 index 0000000..246a97d --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WAjxqManager.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.manager; + +import com.hotent.base.manager.BaseManager; +import com.hotent.lpg.common.model.WAjxq; + +/** + * 安检详情 服务类 + * + * @company 广州宏天软件股份有限公司 + * @author admin + * @since 2024-03-20 + */ +public interface WAjxqManager extends BaseManager { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WBxbManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WBxbManager.java new file mode 100644 index 0000000..5246dc4 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WBxbManager.java @@ -0,0 +1,40 @@ +package com.hotent.lpg.user.manager; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.manager.BaseManager; +import com.hotent.lpg.common.model.WBxb; +import com.hotent.lpg.user.dto.BxRequest; +import com.hotent.lpg.user.vo.BxbResponse; + +/** + * 报修表 服务类 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-04-07 + */ +public interface WBxbManager extends BaseManager { + WBxb getDetail(String id); + /** + * 会员端：创建工单 + * @param bxRequest + */ + WBxb saveBx(BxRequest bxRequest,String type); + /** + * 报修单分页 + * @param page + * @param wBxb + * @return + */ + IPage bxbPage(Page page, WBxb wBxb); + + + /** + * 会员端：取消工单 + * @param id + */ + void cancal(String id); + + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WHyxxManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WHyxxManager.java index d04f89d..5e673aa 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WHyxxManager.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WHyxxManager.java @@ -3,6 +3,7 @@ package com.hotent.lpg.user.manager; import com.hotent.base.manager.BaseManager; import com.hotent.lpg.common.model.Hytjxx; import com.hotent.lpg.common.model.WHyxx; +import com.hotent.lpg.user.vo.WHydzVo; public interface WHyxxManager extends BaseManager { @@ -17,4 +18,11 @@ public interface WHyxxManager extends BaseManager { void realNameAuth(WHyxx wHyxx); + WHyxx getHyxxByHydz(WHydzVo wHydzVo); + + + /** + * 根据会员信息创建会员和账号信息 + */ + WHyxx createByHyxx(WHyxx wHyxx) throws Exception; } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WAjManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WAjManagerImpl.java index 9dd59dd..a27c2b8 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WAjManagerImpl.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WAjManagerImpl.java @@ -1,15 +1,63 @@ package com.hotent.lpg.user.manager.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.base.util.StringUtil; import com.hotent.lpg.common.model.WAj; import com.hotent.lpg.user.dao.WAjDao; +import com.hotent.lpg.user.dto.AjDto; import com.hotent.lpg.user.manager.WAjManager; +import com.hotent.lpg.user.vo.AjxxVo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; + @Transactional(rollbackFor = Exception.class) @Slf4j @Service public class WAjManagerImpl extends BaseManagerImpl implements WAjManager { + @Override + public IPage pageList(Page page, AjDto ajDto,String filterFieldSql) { + ArrayList ajzt = new ArrayList<>(); + if ("完成安检".equals(ajDto.getFAjjl())) { + ajzt.add("已整改"); + ajzt.add("完成安检"); + } + if ("待整改".equals(ajDto.getFAjjl())) { + ajzt.add("待整改"); + } + if ("随瓶".equals(ajDto.getFAjlx())) { + ajDto.setFAjlx("随瓶安检"); + } + if ("定期".equals(ajDto.getFAjlx())) { + ajDto.setFAjlx("定期安检"); + } + if ("全部".equals(ajDto.getFAjjl())) { + ajDto.setFAjjl(null); + } + if ("全部".equals(ajDto.getFAjlx())) { + ajDto.setFAjlx(null); + } + LambdaQueryWrapper eq = Wrappers.lambdaQuery() + .eq(StringUtil.isNotEmpty(ajDto.getFHyyhid()),WAj::getFHyyhid, ajDto.getFHyyhid()) + //.eq(StringUtil.isNotEmpty(ajDto.getFAjjl()),WAj::getFAjjl, ajDto.getFAjjl()) + .eq(StringUtil.isNotEmpty(ajDto.getFAjlx()),WAj::getFAjlx, ajDto.getFAjlx()) + .like(StringUtil.isNotEmpty(ajDto.getSj()) ,WAj::getFAjsj, ajDto.getSj()) + .in(StringUtil.isNotEmpty(ajDto.getFAjjl()),WAj::getFAjzt, ajzt) + .orderByDesc(WAj::getFCjsj) + .apply(StringUtil.isNotEmpty(filterFieldSql), filterFieldSql); + Page respIPage = this.page(page, eq); + return respIPage; + } + + @Override + public WAj getDetail(String id) { + WAj wAj = this.get(id); + return wAj; + } } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WAjxqManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WAjxqManagerImpl.java new file mode 100644 index 0000000..91ff9ea --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WAjxqManagerImpl.java @@ -0,0 +1,18 @@ +package com.hotent.lpg.user.manager.impl; + +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.lpg.common.model.WAjxq; +import com.hotent.lpg.user.dao.WAjxqDao; +import com.hotent.lpg.user.manager.WAjxqManager; +import org.springframework.stereotype.Service; + +/** + * 安检详情 服务实现类 + * + * @author admin + * @company 广州宏天软件股份有限公司 + * @since 2024-03-20 + */ +@Service +public class WAjxqManagerImpl extends BaseManagerImpl implements WAjxqManager { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WBxbManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WBxbManagerImpl.java new file mode 100644 index 0000000..4fcba0f --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WBxbManagerImpl.java @@ -0,0 +1,142 @@ +package com.hotent.lpg.user.manager.impl; + + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.id.IdGenerator; +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.base.util.StringUtil; +import com.hotent.lpg.common.enums.BxztEnum; +import com.hotent.lpg.common.model.WBxb; +import com.hotent.lpg.common.model.WHyxx; +import com.hotent.lpg.user.dao.WBxbDao; +import com.hotent.lpg.user.dao.WHyxxDao; +import com.hotent.lpg.user.dto.BxRequest; +import com.hotent.lpg.user.manager.WBxbManager; +import com.hotent.lpg.user.manager.WHyxxManager; +import com.hotent.lpg.user.vo.BxbResponse; +import com.hotent.lpg.user.vo.WHydzVo; +import com.hotent.runtime.script.ScriptImpl; +import com.hotent.uc.api.model.IUser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.time.LocalDateTime; + +/** + * 报修表 服务实现类 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-04-07 + */ +@Slf4j +@Transactional(rollbackFor = Exception.class) +@Service +public class WBxbManagerImpl extends BaseManagerImpl implements WBxbManager { + @Resource + private ScriptImpl script; + @Resource + private WHyxxDao wHyxxDao; + @Resource + private IdGenerator idGenerator; + @Resource + private WHyxxManager wHyxxManager; + + @Override + public void cancal(String id) { + WBxb wBxb = this.getDetail(id); + if (wBxb == null) { + throw new RuntimeException("报修工单不存在"); + } + if (BxztEnum.ycl.getInfo().equals(wBxb.getFZt())) { + throw new RuntimeException("报修工单已处理"); + } + if (BxztEnum.yqx.getInfo().equals(wBxb.getFZt())) { + throw new RuntimeException("报修工单已取消"); + } + wBxb.setFQxsj(LocalDateTime.now()); + wBxb.setFZt(BxztEnum.yqx.getInfo()); + this.updateById(wBxb); + } + + + @Override + public WBxb getDetail(String id) { + WBxb wBxb = this.get(id); + BxbResponse bxbResponse = new BxbResponse(); + BeanUtil.copyProperties(wBxb,bxbResponse); + return bxbResponse; + } + + @Override + public WBxb saveBx(BxRequest bxRequest, String type) { + IUser currentUser = script.getCurrentUser(); + WHyxx wHyxx = new WHyxx(); + if ("1".equals(type)) { + wHyxx = wHyxxDao.selectOne(Wrappers.lambdaQuery().eq(WHyxx::getFUserid,currentUser.getUserId())); + } else if ("2".equals(type)) { + wHyxx = wHyxxDao.selectOne(Wrappers.lambdaQuery().eq(WHyxx::getFUserid,bxRequest.getHyyhid())); + } + WBxb wBxb = new WBxb(); + wBxb.setFBxlx(bxRequest.getBxlx()); + wBxb.setFBxlxmx(bxRequest.getBxlxmx()); + wBxb.setFWtms(bxRequest.getWtms()); + wBxb.setFWttp(bxRequest.getWttp()); + wBxb.setFHyyhid(bxRequest.getHyyhid()); + wBxb.setFLxdzsf(bxRequest.getLxdzsf()); + wBxb.setFLxdzs(bxRequest.getLxdzs()); + wBxb.setFLxdzq(bxRequest.getLxdzq()); + wBxb.setFLxdzjd(bxRequest.getLxdzjd()); + wBxb.setFLxdzxxdz(bxRequest.getLxdzxxdz()); + wBxb.setFZt(BxztEnum.dcl.getInfo()); + wBxb.setFGdh(idGenerator.getSuid()); + wBxb.setFXdsj(LocalDateTime.now()); + wBxb.setFGdlx("报修"); + wBxb.setFJd(bxRequest.getJd()); + wBxb.setFWd(bxRequest.getWd()); + wBxb.setFXdrmc(currentUser.getFullname()); + wBxb.setFXdrid(currentUser.getUserId()); + if ("1".equals(type)) { + wBxb.setFLxr(bxRequest.getXdxm()); + wBxb.setFLxrdh(bxRequest.getLxfs()); + wBxb.setFHyxm(wHyxx.getFXm()); + wBxb.setFHyyhid(wHyxx.getFUserid()); + } else { + wBxb.setFLxr(wHyxx.getFXm()); + wBxb.setFLxrdh(bxRequest.getLxfs()); + wBxb.setFHyxm(wHyxx.getFXm()); + wBxb.setFHyyhid(wHyxx.getFUserid()); + + if (StringUtil.isEmpty(bxRequest.getHyyhid())) { + WHydzVo wHydzVo = new WHydzVo(); + wHydzVo.setFLxr(bxRequest.getHyxm()); + wHydzVo.setFLxrdh(bxRequest.getLxfs()); + wHydzVo.setFLxrsf(bxRequest.getLxdzsf()); + wHydzVo.setFLxrs(bxRequest.getLxdzs()); + wHydzVo.setFLxrq(bxRequest.getLxdzq()); + wHydzVo.setFLxrjd(bxRequest.getLxdzjd()); + wHydzVo.setFLxrxxdz(bxRequest.getLxdzxxdz()); + wHydzVo.setFJd(bxRequest.getJd()); + wHydzVo.setFWd(bxRequest.getWd()); + wHydzVo.setFHylx(bxRequest.getHylx()); + wHydzVo.setFSfzh(bxRequest.getSfzh()); + WHyxx hyxxByHydz = wHyxxManager.getHyxxByHydz(wHydzVo); + wBxb.setFHyyhid(hyxxByHydz.getFUserid()); + } + } + this.save(wBxb); + return wBxb; + } + + @Override + public IPage bxbPage(Page page, WBxb wBxb) { + return null; + } + + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WHyxxManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WHyxxManagerImpl.java index d73be3e..b6d35ca 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WHyxxManagerImpl.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WHyxxManagerImpl.java @@ -1,21 +1,30 @@ package com.hotent.lpg.user.manager.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hotent.base.exception.BaseException; import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.base.util.StringUtil; import com.hotent.base.util.time.DateFormatUtil; import com.hotent.lpg.common.enums.QpztEnum; import com.hotent.lpg.common.enums.RzztEnum; +import com.hotent.lpg.common.enums.SfztEnum; +import com.hotent.lpg.common.enums.UserlxEnum; import com.hotent.lpg.common.model.*; import com.hotent.lpg.user.dao.WCzxxDao; import com.hotent.lpg.user.dao.WHyxxDao; import com.hotent.lpg.user.manager.WDdManager; +import com.hotent.lpg.user.manager.WHydzManager; import com.hotent.lpg.user.manager.WHyxxManager; import com.hotent.lpg.user.manager.WHyyqjlManager; +import com.hotent.lpg.user.vo.WHydzVo; import com.hotent.uc.manager.UserManager; +import com.hotent.uc.model.User; import com.hotent.uc.params.user.UserVo; +import com.hotent.uc.util.ContextUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,6 +34,7 @@ import java.time.Duration; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.UUID; @Transactional @Service @@ -40,6 +50,17 @@ public class WHyxxManagerImpl extends BaseManagerImpl implement private UserManager userManager; @Resource private WCzxxDao wCzxxDao; + @Resource + private WHydzManager wHydzManager; + + /** + * 会员角色编码 + */ + public static final String USER_ROLE_CODE = "hyyh"; + /** + * 会员组织编码 + */ + public static final String USER_ORG_CODE = "gsmc"; @Override @@ -162,4 +183,81 @@ public class WHyxxManagerImpl extends BaseManagerImpl implement wHyxx_select.setFTjsmrzsj(LocalDateTime.now()); baseMapper.updateById(wHyxx_select); } + + @Override + public WHyxx getHyxxByHydz(WHydzVo wHydzVo) { + WHyxx hyxx = this.getOne(Wrappers.lambdaQuery().eq(WHyxx::getFSjh, wHydzVo.getFLxrdh())); + try { + if (BeanUtil.isEmpty(hyxx)) { + WHyxx hyxx1 = new WHyxx(); + hyxx1.setFSjh(wHydzVo.getFLxrdh()); + hyxx1.setFHync(wHydzVo.getFLxr()); + hyxx1.setFXm(wHydzVo.getFLxr()); + hyxx1.setFSfzc(SfztEnum.n.getInfo()); + + hyxx1.setFHylx(wHydzVo.getFHylx()); + hyxx1.setFSfzh(wHydzVo.getFSfzh()); + hyxx1.setFShtysbm(wHydzVo.getFShtysbm()); + hyxx = createByHyxx(hyxx1); + } + List dz = wHydzManager.list(Wrappers.lambdaQuery() + .eq(WHydz::getFHyyhid, wHydzVo.getFHyyhid()) + .eq(WHydz::getFLxrsf, wHydzVo.getFLxrsf()) + .eq(WHydz::getFLxrjd, wHydzVo.getFLxrjd()) + .eq(WHydz::getFLxrq, wHydzVo.getFLxrq()) + .eq(WHydz::getFLxrs, wHydzVo.getFLxrs()) + ); + if (dz == null || dz.size() == 0) { + wHydzVo.setFHyyhid(hyxx.getFUserid()); + wHydzManager.save(wHydzVo); + } + } catch (Exception e) { + log.error(e.getMessage()); + } + return hyxx; + } + + @Override + public WHyxx createByHyxx(WHyxx wHyxx) throws Exception { + if (StringUtil.isEmpty(wHyxx.getFSjh())) { + throw new BaseException("手机号不能为空"); + } + com.hotent.uc.model.User selectUser = userManager.getOne(Wrappers.query().lambda().eq(com.hotent.uc.model.User::getMobile, wHyxx.getFSjh())); + List wHyxxes = baseMapper.selectList(Wrappers.lambdaQuery().eq(WHyxx::getFSjh, wHyxx.getFSjh())); + if (ObjectUtil.isNotEmpty(wHyxxes)) { + throw new BaseException("该手机号已注册"); + } + wHyxx.setFHync(StringUtil.isEmpty(wHyxx.getFHync()) ? wHyxx.getFSjh() : wHyxx.getFHync()); + wHyxx.setFXm(StringUtil.isEmpty(wHyxx.getFXm()) ? wHyxx.getFSjh() : wHyxx.getFXm()); + wHyxx.setFCjsj(LocalDateTime.now()); + wHyxx.setFCjr(ContextUtil.getCurrentUser() != null ? ContextUtil.getCurrentUser().getFullname() : wHyxx.getFXm()); + wHyxx.setFHybh("HY-" + UUID.randomUUID().toString().replace("-", "")); + wHyxx.setFMm("lpg@A1b2c3"); + this.save(wHyxx); + //添加宏天用户 + if (ObjectUtil.isNull(selectUser)) { + UserVo userVo = new UserVo(); + userVo.setAccount(wHyxx.getFSjh()); + userVo.setMobile(wHyxx.getFSjh()); + userVo.setFullname(wHyxx.getFXm()); + userVo.setPassword("lpg@A1b2c3"); + userVo.setStatus(1); + userVo.setRoleCode(USER_ROLE_CODE); + userVo.setUserType(UserlxEnum.hy.getInfo()); + User addUser = userManager.addUser(userVo); +// orgManager.addUsersForOrg(USER_ORG_CODE, addUser.getAccount()); +// this.update(null, Wrappers.lambdaUpdate(WHyxx.class).set(WHyxx::getFUserid, addUser.getId()).set(WHyxx::getFHtzzcode, USER_ORG_CODE).eq(WHyxx::getId, wHyxx.getId())); + this.update(null, Wrappers.lambdaUpdate(WHyxx.class).set(WHyxx::getFUserid, addUser.getId()).eq(WHyxx::getId, wHyxx.getId())); + wHyxx.setFUserid(addUser.getId()); + } else { +// orgManager.addUsersForOrg(USER_ORG_CODE, selectUser.getAccount()); +// this.update(null, Wrappers.lambdaUpdate(WHyxx.class).set(WHyxx::getFUserid, selectUser.getId()).set(WHyxx::getFHtzzcode, USER_ORG_CODE).eq(WHyxx::getId, wHyxx.getId())); + this.update(null, Wrappers.lambdaUpdate(WHyxx.class).set(WHyxx::getFUserid, selectUser.getId()).eq(WHyxx::getId, wHyxx.getId())); + wHyxx.setFUserid(selectUser.getId()); + } + + wHyxx.setFHtzzcode(USER_ORG_CODE); + return wHyxx; + } + } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/AjDetailResponse.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/AjDetailResponse.java new file mode 100644 index 0000000..892f4a5 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/AjDetailResponse.java @@ -0,0 +1,16 @@ +package com.hotent.lpg.user.vo; + +import com.hotent.lpg.common.model.WAj; +import com.hotent.lpg.common.model.WAjxq; +import lombok.Data; + +import java.util.List; + +@Data +public class AjDetailResponse { + + private WAj aj; + + private List ajxq; + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/AjxxVo.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/AjxxVo.java new file mode 100644 index 0000000..e54f080 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/AjxxVo.java @@ -0,0 +1,12 @@ +package com.hotent.lpg.user.vo; + +import com.hotent.lpg.common.model.WAj; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class AjxxVo extends WAj { + + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/BxbResponse.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/BxbResponse.java new file mode 100644 index 0000000..ef6b9d7 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/BxbResponse.java @@ -0,0 +1,21 @@ +package com.hotent.lpg.user.vo; + +import com.hotent.lpg.common.model.WBxb; +import lombok.Data; + +@Data +public class BxbResponse extends WBxb { + /** + * 地址全称 + */ + private String ddqc; + + public String getDdqc() { + return this.getFLxdzsf() + this.getFLxdzs() + this.getFLxdzq() + this.getFLxdzjd() + this.getFLxdzxxdz(); + } + + public void setDdqc(String ddqc) { + this.ddqc = ddqc; + } + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/WHydzVo.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/WHydzVo.java new file mode 100644 index 0000000..280332d --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/WHydzVo.java @@ -0,0 +1,15 @@ +package com.hotent.lpg.user.vo; + +import com.hotent.lpg.common.model.WHydz; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WHydzVo extends WHydz { + @ApiModelProperty(value = "会员类型") + private String fHylx; + @ApiModelProperty(value = "身份证号") + private String fSfzh; + @ApiModelProperty(value = "社会统一识别码") + private String fShtysbm; +} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/AjController.java b/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/AjController.java deleted file mode 100644 index 7510582..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/AjController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hotent.lpg.controller.hy; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hotent.base.model.CommonResult; -import com.hotent.base.util.StringUtil; -import com.hotent.lpg.manager.WAjManager; -import com.hotent.lpg.manager.WAjxqManager; -import com.hotent.lpg.model.WAj; -import com.hotent.lpg.model.WAjxq; -import com.hotent.lpg.model.dto.AjDto; -import com.hotent.lpg.model.response.AjDetailResponse; -import com.hotent.lpg.model.vo.AjxxVo; -import com.hotent.uc.util.ContextUtil; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.List; - -@RestController -@RequestMapping("/customer/aj/") -public class AjController { - - @Autowired - private WAjManager wAjManager; - @Autowired - private WAjxqManager wAjxqManager; - - @GetMapping("/pageList") - @ApiOperation("会员安检列表") - public CommonResult> pageList(Page page, String ajlx, String ajjl, String ajsj) { - - AjDto ajDto = new AjDto(); - ajDto.setFHyyhid(ContextUtil.getCurrentUserId()); - ajDto.setFAjlx(ajlx); - ajDto.setFAjjl(ajjl); - ajDto.setSj(ajsj); - IPage responseIPage = wAjManager.pageList(page,ajDto,null); - return CommonResult.>ok().value(responseIPage); - } - - /** - * 根据id获取详情 - * - * @param id - * @return - * @throws Exception ModelAndView - */ - @GetMapping(value = "/getDetail") - public CommonResult getDetail(@RequestParam(required = true) String id) throws Exception { - AjDetailResponse response = new AjDetailResponse(); - WAj aj = wAjManager.getDetail(id); - if (ObjectUtil.isNull(aj)) { - return CommonResult.ok().value(response); - } - List list = wAjxqManager.list(new LambdaQueryWrapper().eq(WAjxq::getfAjid, id)); - response.setAj(aj); - response.setAjxq(list); - return CommonResult.ok().value(response); - } - -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/BxbController.java b/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/BxbController.java deleted file mode 100644 index 0c9b805..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/BxbController.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.hotent.lpg.controller.hy; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hotent.base.controller.BaseController; -import com.hotent.base.model.CommonResult; -import com.hotent.lpg.manager.WBxbManager; -import com.hotent.lpg.manager.WHyxxManager; -import com.hotent.lpg.model.WBxb; -import com.hotent.lpg.model.WHyxx; -import com.hotent.lpg.model.request.BxRequest; -import com.hotent.lpg.model.response.BxbResponse; -import com.hotent.runtime.script.ScriptImpl; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * 会员端：报修管理 - * - * @author 超级管理员 - * @company 广州宏天软件股份有限公司 - * @since 2024-04-07 - */ -@Slf4j -@RestController -@RequestMapping("/customer/bx") -public class BxbController extends BaseController { - - @Resource - private ScriptImpl scriptImpl; - @Resource - private WHyxxManager wHyxxManager; - - /** - * 根据id获取报修表数据详情 - * - * @param id - * @return - * @throws Exception ModelAndView - */ - @GetMapping(value = "/getDetail") - @ApiOperation(value = "根据id获取报修表数据详情", httpMethod = "GET", notes = "根据id获取报修表数据详情") - public CommonResult getDetail(@ApiParam(name = "id", value = "业务对象主键", required = true) @RequestParam(required = true) String id) throws Exception { - return CommonResult.ok().value(baseService.getDetail(id)); - } - - /** - * 创建工单 - * - * @param bxRequest - * @return - * @throws Exception - * @throws - */ - @PostMapping(value = "/save") - @ApiOperation(value = "创建工单", httpMethod = "POST", notes = "创建工单") - public CommonResult save(@ApiParam(name = "bxRequest", value = "报修表对象", required = true) @RequestBody BxRequest bxRequest) throws Exception { - log.info("新增保修参数，bxRequest={}", bxRequest); - try { - String currentUserId = scriptImpl.getCurrentUserId(); - WHyxx one = wHyxxManager.getOne(Wrappers.lambdaQuery().eq(WHyxx::getFUserid, currentUserId)); - if (one == null) { - throw new RuntimeException("会员信息不存在"); - } - bxRequest.setHyyhid(one.getFUserid()); - baseService.saveBx(bxRequest,"1"); - } catch (Exception e) { - return CommonResult.error().message(e.getMessage()); - } - return CommonResult.ok().message("操作成功"); - } - - /** - * 会员端报修分页 - * - * @param page - * @param wBxb - * @return - */ - @GetMapping(value = "/bxbPage", produces = {"application/json; charset=utf-8"}) - @ApiOperation(value = "会员报修列表", httpMethod = "GET", notes = "会员报修列表") - public CommonResult bxbPage(Page page, WBxb wBxb) { - log.info("保修列表参数，page={},wBxb={}", page, wBxb); - String currentUserId = scriptImpl.getCurrentUserId(); - WHyxx wHyxx = wHyxxManager.getOne(Wrappers.lambdaQuery().eq(WHyxx::getFUserid, currentUserId)); - if (wHyxx == null) { - return CommonResult.error("会员信息不存在"); - } - wBxb.setFHyyhid(wHyxx.getFUserid()); - IPage resultPage = baseService.bxbPage(page, wBxb); - return new CommonResult(true, "", resultPage); - } - - /** - * 取消工单 - * - * @param id 工单id - * @return - * @throws Exception - * @throws - */ - @PostMapping(value = "/cancal") - @ApiOperation(value = "取消工单", httpMethod = "POST", notes = "取消工单") - public CommonResult cancal(String id) throws Exception { - log.info("新增保修参数，id={}", id); - try { - baseService.cancal(id); - } catch (Exception e) { - return CommonResult.error().message(e.getMessage()); - } - return CommonResult.ok().message("操作成功"); - } -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/dto/AjDto.java b/backend/lpg/src/main/java/com/hotent/lpg/model/dto/AjDto.java deleted file mode 100644 index 6ab0842..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/dto/AjDto.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.hotent.lpg.model.dto; - -import com.hotent.lpg.model.WAj; -import lombok.Data; - -@Data -public class AjDto extends WAj { -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/request/BxRequest.java b/backend/lpg/src/main/java/com/hotent/lpg/model/request/BxRequest.java deleted file mode 100644 index 2a9f39f..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/request/BxRequest.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.hotent.lpg.model.request; - -import lombok.Data; - -/** - * 报修表请求参数 - */ -@Data -public class BxRequest { - // 会员端：新增工单参数 - /** - * 报修类型 - */ - private String bxlx; - /** - * 问题描述 - */ - private String wtms; - /** - * 问题图片 - */ - private String wttp; - /** - * 工单类型 - */ - private String gdlx; - /** - * 下单姓名 - */ - private String xdxm; - /** - * 会员用户ID - */ - private String hyyhid; - /** - * 联系方式 - */ - private String lxfs; - /** - * 联系地址省 - */ - private String lxdzsf; - /** - * 联系地址市 - */ - private String lxdzs; - /** - * 联系地址区 - */ - private String lxdzq; - /** - * 联系地址街道 - */ - private String lxdzjd; - /** - * 联系地址详细地址 - */ - private String lxdzxxdz; - /** - * 报修类型明细 - */ - private String bxlxmx; - /** - * 经度 - */ - private String jd; - /** - * 维度 - */ - private String wd; - - - //员工端：提交工单参数 - /** - * 维修结果 - */ - private String wxjg; - - /** - * 维修图片 - */ - private String wxtp; - - /** - * 维修备注 - */ - private String wxbz; - - /** - * 维修id - */ - private String id; - /** - * 身份证号 - */ - private String sfzh; - /** - * 会员类型 - */ - private String hylx; - /** - * 会员姓名 - */ - private String hyxm; - -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/response/AjDetailResponse.java b/backend/lpg/src/main/java/com/hotent/lpg/model/response/AjDetailResponse.java deleted file mode 100644 index 0f05439..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/response/AjDetailResponse.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hotent.lpg.model.response; - -import com.hotent.lpg.model.WAj; -import com.hotent.lpg.model.WAjxq; -import lombok.Data; - -import java.util.List; - -@Data -public class AjDetailResponse { - - private WAj aj; - - private List ajxq; - -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/response/BxbResponse.java b/backend/lpg/src/main/java/com/hotent/lpg/model/response/BxbResponse.java deleted file mode 100644 index b597261..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/response/BxbResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hotent.lpg.model.response; - -import com.hotent.lpg.model.WBxb; -import lombok.Data; - -@Data -public class BxbResponse extends WBxb { - /** - * 地址全称 - */ - private String ddqc; - - public String getDdqc() { - return this.getFLxdzsf() + this.getFLxdzs() + this.getFLxdzq() + this.getFLxdzjd() + this.getFLxdzxxdz(); - } - - public void setDdqc(String ddqc) { - this.ddqc = ddqc; - } - -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/vo/AjxxVo.java b/backend/lpg/src/main/java/com/hotent/lpg/model/vo/AjxxVo.java deleted file mode 100644 index b418830..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/vo/AjxxVo.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hotent.lpg.model.vo; - -import com.hotent.lpg.model.WAj; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@EqualsAndHashCode(callSuper = true) -@Data -public class AjxxVo extends WAj { - - -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/vo/WHydzVo.java b/backend/lpg/src/main/java/com/hotent/lpg/model/vo/WHydzVo.java deleted file mode 100644 index 2a2e232..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/vo/WHydzVo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hotent.lpg.model.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.hotent.lpg.model.WHydz; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class WHydzVo extends WHydz { - @ApiModelProperty(value = "会员类型") - private String fHylx; - @ApiModelProperty(value = "身份证号") - private String fSfzh; - @ApiModelProperty(value = "社会统一识别码") - private String fShtysbm; -} -- libgit2 0.21.2