2 Commits c186647ea2 ... 0aed36a329

Autor SHA1 Mensaje Fecha
  yzx 0aed36a329 Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java hace 3 semanas
  yzx eb98c18f29 删除随访DOC相关没用代码 hace 3 semanas
Se han modificado 48 ficheros con 0 adiciones y 4220 borrados
  1. 0 103
      fs-admin/src/main/java/com/fs/doc/controller/DocController.java
  2. 0 103
      fs-admin/src/main/java/com/fs/doc/controller/DocOrderController.java
  3. 0 103
      fs-admin/src/main/java/com/fs/doc/controller/DocOrderReplyController.java
  4. 0 106
      fs-admin/src/main/java/com/fs/doc/controller/DocRecordController.java
  5. 0 103
      fs-admin/src/main/java/com/fs/doc/controller/DocRecordReplyController.java
  6. 0 126
      fs-company-app/src/main/java/com/fs/app/controller/DocController.java
  7. 0 106
      fs-company/src/main/java/com/fs/doc/controller/DocController.java
  8. 0 97
      fs-company/src/main/java/com/fs/doc/controller/DocOrderController.java
  9. 0 97
      fs-company/src/main/java/com/fs/doc/controller/DocOrderReplyController.java
  10. 0 103
      fs-company/src/main/java/com/fs/doc/controller/DocRecordController.java
  11. 0 97
      fs-company/src/main/java/com/fs/doc/controller/DocRecordReplyController.java
  12. 0 207
      fs-service-system/src/main/java/com/fs/doc/domain/Doc.java
  13. 0 215
      fs-service-system/src/main/java/com/fs/doc/domain/DocOrder.java
  14. 0 126
      fs-service-system/src/main/java/com/fs/doc/domain/DocOrderReply.java
  15. 0 161
      fs-service-system/src/main/java/com/fs/doc/domain/DocRecord.java
  16. 0 135
      fs-service-system/src/main/java/com/fs/doc/domain/DocRecordReply.java
  17. 0 86
      fs-service-system/src/main/java/com/fs/doc/mapper/DocMapper.java
  18. 0 77
      fs-service-system/src/main/java/com/fs/doc/mapper/DocOrderMapper.java
  19. 0 73
      fs-service-system/src/main/java/com/fs/doc/mapper/DocOrderReplyMapper.java
  20. 0 103
      fs-service-system/src/main/java/com/fs/doc/mapper/DocRecordMapper.java
  21. 0 78
      fs-service-system/src/main/java/com/fs/doc/mapper/DocRecordReplyMapper.java
  22. 0 17
      fs-service-system/src/main/java/com/fs/doc/param/DocOrderQueryParam.java
  23. 0 15
      fs-service-system/src/main/java/com/fs/doc/param/DocOrderReplyQueryParam.java
  24. 0 17
      fs-service-system/src/main/java/com/fs/doc/param/DocQueryParam.java
  25. 0 20
      fs-service-system/src/main/java/com/fs/doc/param/DocRecordParam.java
  26. 0 19
      fs-service-system/src/main/java/com/fs/doc/param/DocRecordQueryParam.java
  27. 0 15
      fs-service-system/src/main/java/com/fs/doc/param/DocRecordReplyQueryParam.java
  28. 0 65
      fs-service-system/src/main/java/com/fs/doc/service/IDocOrderReplyService.java
  29. 0 65
      fs-service-system/src/main/java/com/fs/doc/service/IDocOrderService.java
  30. 0 65
      fs-service-system/src/main/java/com/fs/doc/service/IDocRecordReplyService.java
  31. 0 69
      fs-service-system/src/main/java/com/fs/doc/service/IDocRecordService.java
  32. 0 65
      fs-service-system/src/main/java/com/fs/doc/service/IDocService.java
  33. 0 102
      fs-service-system/src/main/java/com/fs/doc/service/impl/DocOrderReplyServiceImpl.java
  34. 0 102
      fs-service-system/src/main/java/com/fs/doc/service/impl/DocOrderServiceImpl.java
  35. 0 115
      fs-service-system/src/main/java/com/fs/doc/service/impl/DocRecordReplyServiceImpl.java
  36. 0 135
      fs-service-system/src/main/java/com/fs/doc/service/impl/DocRecordServiceImpl.java
  37. 0 103
      fs-service-system/src/main/java/com/fs/doc/service/impl/DocServiceImpl.java
  38. 0 52
      fs-service-system/src/main/java/com/fs/doc/vo/DocListQueryVO.java
  39. 0 52
      fs-service-system/src/main/java/com/fs/doc/vo/DocOrderListQueryVO.java
  40. 0 44
      fs-service-system/src/main/java/com/fs/doc/vo/DocOrderReplyListQueryVO.java
  41. 0 58
      fs-service-system/src/main/java/com/fs/doc/vo/DocRecordListQueryVO.java
  42. 0 48
      fs-service-system/src/main/java/com/fs/doc/vo/DocRecordReplyListQueryVO.java
  43. 0 58
      fs-service-system/src/main/java/com/fs/doc/vo/DocRecordVO.java
  44. 0 115
      fs-service-system/src/main/resources/mapper/doc/DocMapper.xml
  45. 0 116
      fs-service-system/src/main/resources/mapper/doc/DocOrderMapper.xml
  46. 0 86
      fs-service-system/src/main/resources/mapper/doc/DocOrderReplyMapper.xml
  47. 0 107
      fs-service-system/src/main/resources/mapper/doc/DocRecordMapper.xml
  48. 0 90
      fs-service-system/src/main/resources/mapper/doc/DocRecordReplyMapper.xml

+ 0 - 103
fs-admin/src/main/java/com/fs/doc/controller/DocController.java

@@ -1,103 +0,0 @@
-package com.fs.doc.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.doc.domain.Doc;
-import com.fs.doc.service.IDocService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 档案Controller
- * 
- * @author fs
- * @date 2023-01-09
- */
-@RestController
-@RequestMapping("/doc/doc")
-public class DocController extends BaseController
-{
-    @Autowired
-    private IDocService docService;
-
-    /**
-     * 查询档案列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(Doc doc)
-    {
-        startPage();
-        List<Doc> list = docService.selectDocList(doc);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出档案列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:export')")
-    @Log(title = "档案", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(Doc doc)
-    {
-        List<Doc> list = docService.selectDocList(doc);
-        ExcelUtil<Doc> util = new ExcelUtil<Doc>(Doc.class);
-        return util.exportExcel(list, "doc");
-    }
-
-    /**
-     * 获取档案详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:query')")
-    @GetMapping(value = "/{docId}")
-    public AjaxResult getInfo(@PathVariable("docId") Long docId)
-    {
-        return AjaxResult.success(docService.selectDocById(docId));
-    }
-
-    /**
-     * 新增档案
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:add')")
-    @Log(title = "档案", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody Doc doc)
-    {
-        return toAjax(docService.insertDoc(doc));
-    }
-
-    /**
-     * 修改档案
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:edit')")
-    @Log(title = "档案", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody Doc doc)
-    {
-        return toAjax(docService.updateDoc(doc));
-    }
-
-    /**
-     * 删除档案
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:remove')")
-    @Log(title = "档案", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{docIds}")
-    public AjaxResult remove(@PathVariable Long[] docIds)
-    {
-        return toAjax(docService.deleteDocByIds(docIds));
-    }
-}

+ 0 - 103
fs-admin/src/main/java/com/fs/doc/controller/DocOrderController.java

@@ -1,103 +0,0 @@
-package com.fs.doc.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.doc.domain.DocOrder;
-import com.fs.doc.service.IDocOrderService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 问医生Controller
- * 
- * @author fs
- * @date 2023-01-09
- */
-@RestController
-@RequestMapping("/doc/docOrder")
-public class DocOrderController extends BaseController
-{
-    @Autowired
-    private IDocOrderService docOrderService;
-
-    /**
-     * 查询问医生列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocOrder docOrder)
-    {
-        startPage();
-        List<DocOrder> list = docOrderService.selectDocOrderList(docOrder);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出问医生列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:export')")
-    @Log(title = "问医生", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(DocOrder docOrder)
-    {
-        List<DocOrder> list = docOrderService.selectDocOrderList(docOrder);
-        ExcelUtil<DocOrder> util = new ExcelUtil<DocOrder>(DocOrder.class);
-        return util.exportExcel(list, "docOrder");
-    }
-
-    /**
-     * 获取问医生详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:query')")
-    @GetMapping(value = "/{orderId}")
-    public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
-    {
-        return AjaxResult.success(docOrderService.selectDocOrderById(orderId));
-    }
-
-    /**
-     * 新增问医生
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:add')")
-    @Log(title = "问医生", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocOrder docOrder)
-    {
-        return toAjax(docOrderService.insertDocOrder(docOrder));
-    }
-
-    /**
-     * 修改问医生
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:edit')")
-    @Log(title = "问医生", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocOrder docOrder)
-    {
-        return toAjax(docOrderService.updateDocOrder(docOrder));
-    }
-
-    /**
-     * 删除问医生
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:remove')")
-    @Log(title = "问医生", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{orderIds}")
-    public AjaxResult remove(@PathVariable Long[] orderIds)
-    {
-        return toAjax(docOrderService.deleteDocOrderByIds(orderIds));
-    }
-}

+ 0 - 103
fs-admin/src/main/java/com/fs/doc/controller/DocOrderReplyController.java

@@ -1,103 +0,0 @@
-package com.fs.doc.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.doc.domain.DocOrderReply;
-import com.fs.doc.service.IDocOrderReplyService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 订单回复Controller
- * 
- * @author fs
- * @date 2023-01-09
- */
-@RestController
-@RequestMapping("/doc/docOrderReply")
-public class DocOrderReplyController extends BaseController
-{
-    @Autowired
-    private IDocOrderReplyService docOrderReplyService;
-
-    /**
-     * 查询订单回复列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocOrderReply docOrderReply)
-    {
-        startPage();
-        List<DocOrderReply> list = docOrderReplyService.selectDocOrderReplyList(docOrderReply);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出订单回复列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:export')")
-    @Log(title = "订单回复", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(DocOrderReply docOrderReply)
-    {
-        List<DocOrderReply> list = docOrderReplyService.selectDocOrderReplyList(docOrderReply);
-        ExcelUtil<DocOrderReply> util = new ExcelUtil<DocOrderReply>(DocOrderReply.class);
-        return util.exportExcel(list, "docOrderReply");
-    }
-
-    /**
-     * 获取订单回复详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:query')")
-    @GetMapping(value = "/{replyId}")
-    public AjaxResult getInfo(@PathVariable("replyId") Long replyId)
-    {
-        return AjaxResult.success(docOrderReplyService.selectDocOrderReplyById(replyId));
-    }
-
-    /**
-     * 新增订单回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:add')")
-    @Log(title = "订单回复", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocOrderReply docOrderReply)
-    {
-        return toAjax(docOrderReplyService.insertDocOrderReply(docOrderReply));
-    }
-
-    /**
-     * 修改订单回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:edit')")
-    @Log(title = "订单回复", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocOrderReply docOrderReply)
-    {
-        return toAjax(docOrderReplyService.updateDocOrderReply(docOrderReply));
-    }
-
-    /**
-     * 删除订单回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:remove')")
-    @Log(title = "订单回复", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{replyIds}")
-    public AjaxResult remove(@PathVariable Long[] replyIds)
-    {
-        return toAjax(docOrderReplyService.deleteDocOrderReplyByIds(replyIds));
-    }
-}

+ 0 - 106
fs-admin/src/main/java/com/fs/doc/controller/DocRecordController.java

@@ -1,106 +0,0 @@
-package com.fs.doc.controller;
-
-import java.util.List;
-
-import com.fs.doc.param.DocRecordParam;
-import com.fs.doc.vo.DocRecordVO;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.doc.domain.DocRecord;
-import com.fs.doc.service.IDocRecordService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 记录Controller
- * 
- * @author fs
- * @date 2023-01-09
- */
-@RestController
-@RequestMapping("/doc/docRecord")
-public class DocRecordController extends BaseController
-{
-    @Autowired
-    private IDocRecordService docRecordService;
-
-    /**
-     * 查询记录列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocRecordParam docRecord)
-    {
-        startPage();
-        List<DocRecordVO> list = docRecordService.selectDocRecordListVO(docRecord);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出记录列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:export')")
-    @Log(title = "记录", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(DocRecordParam docRecord)
-    {
-        List<DocRecordVO> list = docRecordService.selectDocRecordListVO(docRecord);
-        ExcelUtil<DocRecordVO> util = new ExcelUtil<DocRecordVO>(DocRecordVO.class);
-        return util.exportExcel(list, "docRecord");
-    }
-
-    /**
-     * 获取记录详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:query')")
-    @GetMapping(value = "/{recordId}")
-    public AjaxResult getInfo(@PathVariable("recordId") Long recordId)
-    {
-        return AjaxResult.success(docRecordService.selectDocRecordById(recordId));
-    }
-
-    /**
-     * 新增记录
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:add')")
-    @Log(title = "记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocRecord docRecord)
-    {
-        return toAjax(docRecordService.insertDocRecord(docRecord));
-    }
-
-    /**
-     * 修改记录
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:edit')")
-    @Log(title = "记录", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocRecord docRecord)
-    {
-        return toAjax(docRecordService.updateDocRecord(docRecord));
-    }
-
-    /**
-     * 删除记录
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:remove')")
-    @Log(title = "记录", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{recordIds}")
-    public AjaxResult remove(@PathVariable Long[] recordIds)
-    {
-        return toAjax(docRecordService.deleteDocRecordByIds(recordIds));
-    }
-}

+ 0 - 103
fs-admin/src/main/java/com/fs/doc/controller/DocRecordReplyController.java

@@ -1,103 +0,0 @@
-package com.fs.doc.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.doc.domain.DocRecordReply;
-import com.fs.doc.service.IDocRecordReplyService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 回复Controller
- * 
- * @author fs
- * @date 2023-01-09
- */
-@RestController
-@RequestMapping("/doc/docRecordReply")
-public class DocRecordReplyController extends BaseController
-{
-    @Autowired
-    private IDocRecordReplyService docRecordReplyService;
-
-    /**
-     * 查询回复列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocRecordReply docRecordReply)
-    {
-        startPage();
-        List<DocRecordReply> list = docRecordReplyService.selectDocRecordReplyList(docRecordReply);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出回复列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:export')")
-    @Log(title = "回复", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(DocRecordReply docRecordReply)
-    {
-        List<DocRecordReply> list = docRecordReplyService.selectDocRecordReplyList(docRecordReply);
-        ExcelUtil<DocRecordReply> util = new ExcelUtil<DocRecordReply>(DocRecordReply.class);
-        return util.exportExcel(list, "docRecordReply");
-    }
-
-    /**
-     * 获取回复详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:query')")
-    @GetMapping(value = "/{replyId}")
-    public AjaxResult getInfo(@PathVariable("replyId") Long replyId)
-    {
-        return AjaxResult.success(docRecordReplyService.selectDocRecordReplyById(replyId));
-    }
-
-    /**
-     * 新增回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:add')")
-    @Log(title = "回复", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocRecordReply docRecordReply)
-    {
-        return toAjax(docRecordReplyService.insertDocRecordReply(docRecordReply));
-    }
-
-    /**
-     * 修改回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:edit')")
-    @Log(title = "回复", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocRecordReply docRecordReply)
-    {
-        return toAjax(docRecordReplyService.updateDocRecordReply(docRecordReply));
-    }
-
-    /**
-     * 删除回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:remove')")
-    @Log(title = "回复", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{replyIds}")
-    public AjaxResult remove(@PathVariable Long[] replyIds)
-    {
-        return toAjax(docRecordReplyService.deleteDocRecordReplyByIds(replyIds));
-    }
-}

+ 0 - 126
fs-company-app/src/main/java/com/fs/app/controller/DocController.java

@@ -1,126 +0,0 @@
-package com.fs.app.controller;
-
-
-import com.fs.app.annotation.Login;
-import com.fs.app.utils.JwtUtils;
-import com.fs.common.core.domain.R;
-import com.fs.company.service.ICompanyService;
-import com.fs.company.service.ICompanyUserService;
-import com.fs.company.vo.DocCompanyUserVO;
-import com.fs.doc.domain.*;
-import com.fs.doc.param.*;
-import com.fs.doc.service.*;
-import com.fs.doc.vo.*;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import java.util.Date;
-import java.util.List;
-
-
-@Api("随访接口")
-@RestController
-@RequestMapping(value="/app/doc")
-public class DocController extends  AppBaseController {
-	@Autowired
-	JwtUtils jwtUtils;
-	@Autowired
-	IDocService docService;
-	@Autowired
-	IDocOrderService docOrderService;
-	@Autowired
-	IDocRecordService docRecordService;
-	@Autowired
-	IDocRecordReplyService docRecordReplyService;
-	@Autowired
-	IDocOrderReplyService docOrderReplyService;
-	@Autowired
-	ICompanyUserService companyUserService;
-	@Login
-	@ApiOperation("获取健康档案")
-	@GetMapping("/getDocList")
-	public R getDocList(DocQueryParam param, HttpServletRequest request){
-		List<DocListQueryVO> list=docService.selectDocListVOQuery(param);
-		return R.ok().put("data",list);
-	}
-
-	@Login
-	@ApiOperation("获取健康档案")
-	@GetMapping("/getDocDetails")
-	public R getDocDetails(@RequestParam("docId") Long docId, HttpServletRequest request){
-		//获取服务销售列表
-		Doc doc=docService.selectDocById(docId);
-		List<DocCompanyUserVO> users=companyUserService.selectDocCompanyUserListByIds(doc.getCompanyUserIds());
-		return R.ok().put("data",docService.selectDocById(docId)).put("users",users);
-	}
-
-	@Login
-	@ApiOperation("获取健康记录列表")
-	@GetMapping("/getDocRecordList")
-	public R getDocRecordList(DocRecordQueryParam param, HttpServletRequest request){
-		PageHelper.startPage(param.getPage(), param.getPageSize());
-		List<DocRecordListQueryVO> list=docRecordService.selectDocRecordListVOQuery(param);
-		PageInfo<DocRecordListQueryVO> listPageInfo=new PageInfo<>(list);
-		return R.ok().put("data",listPageInfo);
-	}
-
-	@Login
-	@ApiOperation("获取健康记录回复列表")
-	@GetMapping("/getDocRecordReplyList")
-	public R getDocRecordReplyList(DocRecordReplyQueryParam param, HttpServletRequest request){
-		PageHelper.startPage(param.getPage(), param.getPageSize());
-		List<DocRecordReplyListQueryVO> list=docRecordReplyService.selectDocRecordReplyListVOQuery(param);
-		PageInfo<DocRecordReplyListQueryVO> listPageInfo=new PageInfo<>(list);
-		return R.ok().put("data",listPageInfo);
-	}
-
-
-	@Login
-	@ApiOperation("回复记录")
-	@PostMapping("/replyRecord")
-	public R replyRecord(@Valid @RequestBody DocRecordReply param, HttpServletRequest request){
-		param.setCompanyId(getCompanyId());
-		param.setCompanyUserId(Long.parseLong(getUserId()));
-		param.setCreateTime(new Date());
-		docRecordReplyService.insertDocRecordReply(param);
-		return R.ok("操作成功");
-	}
-
-//	@Login
-//	@ApiOperation("获取问医生列表")
-//	@GetMapping("/getDocOrderList")
-//	public R getDocOrderList(DocOrderQueryParam param, HttpServletRequest request){
-//		PageHelper.startPage(param.getPage(), param.getPageSize());
-//		List<DocOrderListQueryVO> list=docOrderService.selectDocOrderListVOQuery(param);
-//		PageInfo<DocOrderListQueryVO> listPageInfo=new PageInfo<>(list);
-//		return R.ok().put("data",listPageInfo);
-//	}
-//
-//	@Login
-//	@ApiOperation("获取问医生回复列表")
-//	@GetMapping("/getDocOrderReplyList")
-//	public R getDocOrderReplyList(DocOrderReplyQueryParam param, HttpServletRequest request){
-//		PageHelper.startPage(param.getPage(), param.getPageSize());
-//		List<DocOrderReplyListQueryVO> list=docOrderReplyService.selectDocOrderReplyListVOQuery(param);
-//		PageInfo<DocOrderReplyListQueryVO> listPageInfo=new PageInfo<>(list);
-//		return R.ok().put("data",listPageInfo);
-//	}
-//
-//
-//	@Login
-//	@ApiOperation("回复问医生")
-//	@PostMapping("/replyDocOrder")
-//	public R replyDocOrder(@Valid @RequestBody DocOrderReply param, HttpServletRequest request){
-//		param.setCompanyId(getCompanyId());
-//		param.setCompanyUserId(Long.parseLong(getUserId()));
-//		param.setCreateTime(new Date());
-//		docOrderReplyService.insertDocOrderReply(param);
-//		return R.ok("操作成功");
-//	}
-}

+ 0 - 106
fs-company/src/main/java/com/fs/doc/controller/DocController.java

@@ -1,106 +0,0 @@
-package com.fs.doc.controller;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.crm.vo.CrmFullCustomerListQueryVO;
-import com.fs.doc.domain.Doc;
-import com.fs.doc.param.DocQueryParam;
-import com.fs.doc.service.IDocService;
-import com.fs.doc.vo.DocListQueryVO;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-import static com.fs.common.constant.Constants.PAGE_SIZE;
-
-/**
- * 档案Controller
- * 
- * @author fs
- * @date 2023-01-09
- */
-@RestController
-@RequestMapping("/doc/doc")
-public class DocController extends BaseController
-{
-    @Autowired
-    private IDocService docService;
-
-    /**
-     * 查询档案列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:list')")
-    @GetMapping("/list")
-    public R list(DocQueryParam param)
-    {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        List<DocListQueryVO> list=docService.selectDocListVOQuery(param);
-        PageInfo<DocListQueryVO> listPageInfo=new PageInfo<>(list);
-        return R.ok().put("data",listPageInfo);
-    }
-
-    /**
-     * 导出档案列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:export')")
-    @Log(title = "档案", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(DocQueryParam param)
-    {
-        List<DocListQueryVO> list=docService.selectDocListVOQuery(param);
-        ExcelUtil<DocListQueryVO> util = new ExcelUtil<DocListQueryVO>(DocListQueryVO.class);
-        return util.exportExcel(list, "doc");
-    }
-
-    /**
-     * 获取档案详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:query')")
-    @GetMapping(value = "/{docId}")
-    public AjaxResult getInfo(@PathVariable("docId") Long docId)
-    {
-        return AjaxResult.success(docService.selectDocById(docId));
-    }
-
-    /**
-     * 新增档案
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:add')")
-    @Log(title = "档案", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody Doc doc)
-    {
-        return toAjax(docService.insertDoc(doc));
-    }
-
-    /**
-     * 修改档案
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:edit')")
-    @Log(title = "档案", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody Doc doc)
-    {
-        return toAjax(docService.updateDoc(doc));
-    }
-
-    /**
-     * 删除档案
-     */
-    @PreAuthorize("@ss.hasPermi('doc:doc:remove')")
-    @Log(title = "档案", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{docIds}")
-    public AjaxResult remove(@PathVariable Long[] docIds)
-    {
-        return toAjax(docService.deleteDocByIds(docIds));
-    }
-}

+ 0 - 97
fs-company/src/main/java/com/fs/doc/controller/DocOrderController.java

@@ -1,97 +0,0 @@
-package com.fs.doc.controller;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.doc.domain.DocOrder;
-import com.fs.doc.service.IDocOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 问医生Controller
- * 
- * @author fs
- * @date 2023-01-09
- */
-@RestController
-@RequestMapping("/doc/docOrder")
-public class DocOrderController extends BaseController
-{
-    @Autowired
-    private IDocOrderService docOrderService;
-
-    /**
-     * 查询问医生列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocOrder docOrder)
-    {
-        startPage();
-        List<DocOrder> list = docOrderService.selectDocOrderList(docOrder);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出问医生列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:export')")
-    @Log(title = "问医生", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(DocOrder docOrder)
-    {
-        List<DocOrder> list = docOrderService.selectDocOrderList(docOrder);
-        ExcelUtil<DocOrder> util = new ExcelUtil<DocOrder>(DocOrder.class);
-        return util.exportExcel(list, "docOrder");
-    }
-
-    /**
-     * 获取问医生详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:query')")
-    @GetMapping(value = "/{orderId}")
-    public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
-    {
-        return AjaxResult.success(docOrderService.selectDocOrderById(orderId));
-    }
-
-    /**
-     * 新增问医生
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:add')")
-    @Log(title = "问医生", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocOrder docOrder)
-    {
-        return toAjax(docOrderService.insertDocOrder(docOrder));
-    }
-
-    /**
-     * 修改问医生
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:edit')")
-    @Log(title = "问医生", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocOrder docOrder)
-    {
-        return toAjax(docOrderService.updateDocOrder(docOrder));
-    }
-
-    /**
-     * 删除问医生
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrder:remove')")
-    @Log(title = "问医生", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{orderIds}")
-    public AjaxResult remove(@PathVariable Long[] orderIds)
-    {
-        return toAjax(docOrderService.deleteDocOrderByIds(orderIds));
-    }
-}

+ 0 - 97
fs-company/src/main/java/com/fs/doc/controller/DocOrderReplyController.java

@@ -1,97 +0,0 @@
-package com.fs.doc.controller;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.doc.domain.DocOrderReply;
-import com.fs.doc.service.IDocOrderReplyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 订单回复Controller
- * 
- * @author fs
- * @date 2023-01-09
- */
-@RestController
-@RequestMapping("/doc/docOrderReply")
-public class DocOrderReplyController extends BaseController
-{
-    @Autowired
-    private IDocOrderReplyService docOrderReplyService;
-
-    /**
-     * 查询订单回复列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocOrderReply docOrderReply)
-    {
-        startPage();
-        List<DocOrderReply> list = docOrderReplyService.selectDocOrderReplyList(docOrderReply);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出订单回复列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:export')")
-    @Log(title = "订单回复", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(DocOrderReply docOrderReply)
-    {
-        List<DocOrderReply> list = docOrderReplyService.selectDocOrderReplyList(docOrderReply);
-        ExcelUtil<DocOrderReply> util = new ExcelUtil<DocOrderReply>(DocOrderReply.class);
-        return util.exportExcel(list, "docOrderReply");
-    }
-
-    /**
-     * 获取订单回复详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:query')")
-    @GetMapping(value = "/{replyId}")
-    public AjaxResult getInfo(@PathVariable("replyId") Long replyId)
-    {
-        return AjaxResult.success(docOrderReplyService.selectDocOrderReplyById(replyId));
-    }
-
-    /**
-     * 新增订单回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:add')")
-    @Log(title = "订单回复", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocOrderReply docOrderReply)
-    {
-        return toAjax(docOrderReplyService.insertDocOrderReply(docOrderReply));
-    }
-
-    /**
-     * 修改订单回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:edit')")
-    @Log(title = "订单回复", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocOrderReply docOrderReply)
-    {
-        return toAjax(docOrderReplyService.updateDocOrderReply(docOrderReply));
-    }
-
-    /**
-     * 删除订单回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docOrderReply:remove')")
-    @Log(title = "订单回复", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{replyIds}")
-    public AjaxResult remove(@PathVariable Long[] replyIds)
-    {
-        return toAjax(docOrderReplyService.deleteDocOrderReplyByIds(replyIds));
-    }
-}

+ 0 - 103
fs-company/src/main/java/com/fs/doc/controller/DocRecordController.java

@@ -1,103 +0,0 @@
-package com.fs.doc.controller;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.doc.domain.DocRecord;
-import com.fs.doc.param.DocRecordQueryParam;
-import com.fs.doc.service.IDocRecordService;
-import com.fs.doc.vo.DocRecordListQueryVO;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 记录Controller
- * 
- * @author fs
- * @date 2023-01-09
- */
-@RestController
-@RequestMapping("/doc/docRecord")
-public class DocRecordController extends BaseController
-{
-    @Autowired
-    private IDocRecordService docRecordService;
-
-    /**
-     * 查询记录列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:list')")
-    @GetMapping("/list")
-    public R list(DocRecordQueryParam param)
-    {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        List<DocRecordListQueryVO> list=docRecordService.selectDocRecordListVOQuery(param);
-        PageInfo<DocRecordListQueryVO> listPageInfo=new PageInfo<>(list);
-        return R.ok().put("data",listPageInfo);
-    }
-
-    /**
-     * 导出记录列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:export')")
-    @Log(title = "记录", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(DocRecordQueryParam param)
-    {
-        List<DocRecordListQueryVO> list=docRecordService.selectDocRecordListVOQuery(param);
-        ExcelUtil<DocRecordListQueryVO> util = new ExcelUtil<DocRecordListQueryVO>(DocRecordListQueryVO.class);
-        return util.exportExcel(list, "docRecord");
-    }
-
-    /**
-     * 获取记录详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:query')")
-    @GetMapping(value = "/{recordId}")
-    public AjaxResult getInfo(@PathVariable("recordId") Long recordId)
-    {
-        return AjaxResult.success(docRecordService.selectDocRecordById(recordId));
-    }
-
-    /**
-     * 新增记录
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:add')")
-    @Log(title = "记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocRecord docRecord)
-    {
-        return toAjax(docRecordService.insertDocRecord(docRecord));
-    }
-
-    /**
-     * 修改记录
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:edit')")
-    @Log(title = "记录", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocRecord docRecord)
-    {
-        return toAjax(docRecordService.updateDocRecord(docRecord));
-    }
-
-    /**
-     * 删除记录
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecord:remove')")
-    @Log(title = "记录", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{recordIds}")
-    public AjaxResult remove(@PathVariable Long[] recordIds)
-    {
-        return toAjax(docRecordService.deleteDocRecordByIds(recordIds));
-    }
-}

+ 0 - 97
fs-company/src/main/java/com/fs/doc/controller/DocRecordReplyController.java

@@ -1,97 +0,0 @@
-package com.fs.doc.controller;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.doc.domain.DocRecordReply;
-import com.fs.doc.service.IDocRecordReplyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 回复Controller
- * 
- * @author fs
- * @date 2023-01-09
- */
-@RestController
-@RequestMapping("/doc/docRecordReply")
-public class DocRecordReplyController extends BaseController
-{
-    @Autowired
-    private IDocRecordReplyService docRecordReplyService;
-
-    /**
-     * 查询回复列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocRecordReply docRecordReply)
-    {
-        startPage();
-        List<DocRecordReply> list = docRecordReplyService.selectDocRecordReplyList(docRecordReply);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出回复列表
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:export')")
-    @Log(title = "回复", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(DocRecordReply docRecordReply)
-    {
-        List<DocRecordReply> list = docRecordReplyService.selectDocRecordReplyList(docRecordReply);
-        ExcelUtil<DocRecordReply> util = new ExcelUtil<DocRecordReply>(DocRecordReply.class);
-        return util.exportExcel(list, "docRecordReply");
-    }
-
-    /**
-     * 获取回复详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:query')")
-    @GetMapping(value = "/{replyId}")
-    public AjaxResult getInfo(@PathVariable("replyId") Long replyId)
-    {
-        return AjaxResult.success(docRecordReplyService.selectDocRecordReplyById(replyId));
-    }
-
-    /**
-     * 新增回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:add')")
-    @Log(title = "回复", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocRecordReply docRecordReply)
-    {
-        return toAjax(docRecordReplyService.insertDocRecordReply(docRecordReply));
-    }
-
-    /**
-     * 修改回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:edit')")
-    @Log(title = "回复", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocRecordReply docRecordReply)
-    {
-        return toAjax(docRecordReplyService.updateDocRecordReply(docRecordReply));
-    }
-
-    /**
-     * 删除回复
-     */
-    @PreAuthorize("@ss.hasPermi('doc:docRecordReply:remove')")
-    @Log(title = "回复", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{replyIds}")
-    public AjaxResult remove(@PathVariable Long[] replyIds)
-    {
-        return toAjax(docRecordReplyService.deleteDocRecordReplyByIds(replyIds));
-    }
-}

+ 0 - 207
fs-service-system/src/main/java/com/fs/doc/domain/Doc.java

@@ -1,207 +0,0 @@
-package com.fs.doc.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 档案对象 doc
- * 
- * @author fs
- * @date 2023-01-09
- */
-public class Doc extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    private Long docId;
-
-    /** 会员ID */
-    @Excel(name = "会员ID")
-    private Long userId;
-
-    /** 姓名 */
-    @NotNull(message = "姓名不能为空")
-    @Excel(name = "姓名")
-    private String userName;
-
-    /** 描述 */
-    @Excel(name = "描述")
-    private String descs;
-
-    /** 身份证号 */
-    @NotNull(message = "身份证号不能为空")
-    @Excel(name = "身份证号")
-    private String idCard;
-
-    /** 身份证正面 */
-    @Excel(name = "身份证正面")
-    private String idCardFront;
-
-    /** 身份证反面 */
-    @Excel(name = "身份证反面")
-    private String idCardBack;
-
-    /** 性别 */
-    @Excel(name = "性别")
-    @NotNull(message = "性别不能为空")
-    private Integer sex;
-
-    /** 出生年月 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @NotNull(message = "出生年月不能为空")
-    @Excel(name = "出生年月", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date birthday;
-
-    /** 头像 */
-    @Excel(name = "头像")
-    private String headImg;
-
-    private String remark;
-
-    private String tags;
-
-    private String companyUserIds;
-
-    public String getCompanyUserIds() {
-        return companyUserIds;
-    }
-
-    public void setCompanyUserIds(String companyUserIds) {
-        this.companyUserIds = companyUserIds;
-    }
-
-    public String getTags() {
-        return tags;
-    }
-
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
-    @Override
-    public String getRemark() {
-        return remark;
-    }
-
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public void setDocId(Long docId)
-    {
-        this.docId = docId;
-    }
-
-    public Long getDocId() 
-    {
-        return docId;
-    }
-    public void setUserId(Long userId) 
-    {
-        this.userId = userId;
-    }
-
-    public Long getUserId() 
-    {
-        return userId;
-    }
-    public void setUserName(String userName) 
-    {
-        this.userName = userName;
-    }
-
-    public String getUserName() 
-    {
-        return userName;
-    }
-    public void setDescs(String descs) 
-    {
-        this.descs = descs;
-    }
-
-    public String getDescs() 
-    {
-        return descs;
-    }
-    public void setIdCard(String idCard) 
-    {
-        this.idCard = idCard;
-    }
-
-    public String getIdCard() 
-    {
-        return idCard;
-    }
-    public void setIdCardFront(String idCardFront) 
-    {
-        this.idCardFront = idCardFront;
-    }
-
-    public String getIdCardFront() 
-    {
-        return idCardFront;
-    }
-    public void setIdCardBack(String idCardBack) 
-    {
-        this.idCardBack = idCardBack;
-    }
-
-    public String getIdCardBack() 
-    {
-        return idCardBack;
-    }
-    public void setSex(Integer sex) 
-    {
-        this.sex = sex;
-    }
-
-    public Integer getSex() 
-    {
-        return sex;
-    }
-    public void setBirthday(Date birthday) 
-    {
-        this.birthday = birthday;
-    }
-
-    public Date getBirthday() 
-    {
-        return birthday;
-    }
-    public void setHeadImg(String headImg) 
-    {
-        this.headImg = headImg;
-    }
-
-    public String getHeadImg() 
-    {
-        return headImg;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("docId", getDocId())
-            .append("userId", getUserId())
-            .append("userName", getUserName())
-            .append("descs", getDescs())
-            .append("idCard", getIdCard())
-            .append("idCardFront", getIdCardFront())
-            .append("idCardBack", getIdCardBack())
-            .append("sex", getSex())
-            .append("birthday", getBirthday())
-            .append("headImg", getHeadImg())
-            .append("remark", getRemark())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

+ 0 - 215
fs-service-system/src/main/java/com/fs/doc/domain/DocOrder.java

@@ -1,215 +0,0 @@
-package com.fs.doc.domain;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 问医生对象 doc_order
- * 
- * @author fs
- * @date 2023-01-09
- */
-public class DocOrder extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    private Long orderId;
-
-    /** 订单CODE */
-    @Excel(name = "订单CODE")
-    private String orderCode;
-
-    /** 标题 */
-    @Excel(name = "标题")
-    @NotNull(message = "标题不能为空")
-    private String title;
-
-    /** 组图 */
-    @Excel(name = "组图")
-    @NotNull(message = "组图不能为空")
-    private String images;
-
-    /** 会员ID */
-    @Excel(name = "会员ID")
-
-    private Long userId;
-
-    /** 档案ID */
-    @Excel(name = "档案ID")
-    private Long docId;
-
-    /** 订单类型 */
-    @Excel(name = "订单类型")
-    private Integer orderType;
-
-    /** 状态 */
-    @Excel(name = "状态")
-    private Integer status;
-
-    /** $column.columnComment */
-    @Excel(name = "状态")
-    private BigDecimal money;
-
-    /** $column.columnComment */
-    @Excel(name = "状态")
-    private BigDecimal payMoney;
-
-    /** 完成时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date finishTime;
-
-    /** 公司ID */
-    @Excel(name = "公司ID")
-    private Long companyId;
-
-    /** 员工ID */
-    @Excel(name = "员工ID")
-    private Long companyUserId;
-
-    public void setOrderId(Long orderId) 
-    {
-        this.orderId = orderId;
-    }
-
-    public Long getOrderId() 
-    {
-        return orderId;
-    }
-    public void setOrderCode(String orderCode) 
-    {
-        this.orderCode = orderCode;
-    }
-
-    public String getOrderCode() 
-    {
-        return orderCode;
-    }
-    public void setTitle(String title) 
-    {
-        this.title = title;
-    }
-
-    public String getTitle() 
-    {
-        return title;
-    }
-    public void setImages(String images) 
-    {
-        this.images = images;
-    }
-
-    public String getImages() 
-    {
-        return images;
-    }
-    public void setUserId(Long userId) 
-    {
-        this.userId = userId;
-    }
-
-    public Long getUserId() 
-    {
-        return userId;
-    }
-    public void setDocId(Long docId) 
-    {
-        this.docId = docId;
-    }
-
-    public Long getDocId() 
-    {
-        return docId;
-    }
-    public void setOrderType(Integer orderType) 
-    {
-        this.orderType = orderType;
-    }
-
-    public Integer getOrderType() 
-    {
-        return orderType;
-    }
-    public void setStatus(Integer status) 
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus() 
-    {
-        return status;
-    }
-    public void setMoney(BigDecimal money) 
-    {
-        this.money = money;
-    }
-
-    public BigDecimal getMoney() 
-    {
-        return money;
-    }
-    public void setPayMoney(BigDecimal payMoney) 
-    {
-        this.payMoney = payMoney;
-    }
-
-    public BigDecimal getPayMoney() 
-    {
-        return payMoney;
-    }
-    public void setFinishTime(Date finishTime) 
-    {
-        this.finishTime = finishTime;
-    }
-
-    public Date getFinishTime() 
-    {
-        return finishTime;
-    }
-    public void setCompanyId(Long companyId) 
-    {
-        this.companyId = companyId;
-    }
-
-    public Long getCompanyId() 
-    {
-        return companyId;
-    }
-    public void setCompanyUserId(Long companyUserId) 
-    {
-        this.companyUserId = companyUserId;
-    }
-
-    public Long getCompanyUserId() 
-    {
-        return companyUserId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("orderId", getOrderId())
-            .append("orderCode", getOrderCode())
-            .append("title", getTitle())
-            .append("images", getImages())
-            .append("userId", getUserId())
-            .append("docId", getDocId())
-            .append("orderType", getOrderType())
-            .append("status", getStatus())
-            .append("money", getMoney())
-            .append("payMoney", getPayMoney())
-            .append("createTime", getCreateTime())
-            .append("finishTime", getFinishTime())
-            .append("companyId", getCompanyId())
-            .append("companyUserId", getCompanyUserId())
-            .toString();
-    }
-}

+ 0 - 126
fs-service-system/src/main/java/com/fs/doc/domain/DocOrderReply.java

@@ -1,126 +0,0 @@
-package com.fs.doc.domain;
-
-import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 订单回复对象 doc_order_reply
- * 
- * @author fs
- * @date 2023-01-09
- */
-public class DocOrderReply extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    private Long replyId;
-
-    /** 订单ID */
-    @Excel(name = "订单ID")
-    @NotNull(message = "订单号不能为空")
-    private Long orderId;
-
-    /** 回复内容 */
-    @Excel(name = "回复内容")
-    @NotNull(message = "回复内容不能为空")
-    private String content;
-
-    /** 图片 */
-    @Excel(name = "图片")
-    private String images;
-
-    /** 视频 */
-    @Excel(name = "视频")
-    private String video;
-
-    /** 公司ID */
-    @Excel(name = "公司ID")
-    private Long companyId;
-
-    /** 员工ID */
-    @Excel(name = "员工ID")
-    private Long companyUserId;
-
-    public void setReplyId(Long replyId) 
-    {
-        this.replyId = replyId;
-    }
-
-    public Long getReplyId() 
-    {
-        return replyId;
-    }
-    public void setOrderId(Long orderId) 
-    {
-        this.orderId = orderId;
-    }
-
-    public Long getOrderId() 
-    {
-        return orderId;
-    }
-    public void setContent(String content) 
-    {
-        this.content = content;
-    }
-
-    public String getContent() 
-    {
-        return content;
-    }
-    public void setImages(String images) 
-    {
-        this.images = images;
-    }
-
-    public String getImages() 
-    {
-        return images;
-    }
-    public void setVideo(String video) 
-    {
-        this.video = video;
-    }
-
-    public String getVideo() 
-    {
-        return video;
-    }
-    public void setCompanyId(Long companyId) 
-    {
-        this.companyId = companyId;
-    }
-
-    public Long getCompanyId() 
-    {
-        return companyId;
-    }
-    public void setCompanyUserId(Long companyUserId) 
-    {
-        this.companyUserId = companyUserId;
-    }
-
-    public Long getCompanyUserId() 
-    {
-        return companyUserId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("replyId", getReplyId())
-            .append("orderId", getOrderId())
-            .append("content", getContent())
-            .append("images", getImages())
-            .append("video", getVideo())
-            .append("companyId", getCompanyId())
-            .append("companyUserId", getCompanyUserId())
-            .append("createTime", getCreateTime())
-            .toString();
-    }
-}

+ 0 - 161
fs-service-system/src/main/java/com/fs/doc/domain/DocRecord.java

@@ -1,161 +0,0 @@
-package com.fs.doc.domain;
-
-import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 记录对象 doc_record
- * 
- * @author fs
- * @date 2023-01-09
- */
-public class DocRecord extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    private Long recordId;
-
-    /** 档案ID */
-    @Excel(name = "档案ID")
-    private Long docId;
-
-    private Long userId;
-
-    /** 记录类型 */
-    @Excel(name = "记录类型")
-    private Integer recordType;
-
-    /** 标题 */
-    @NotNull(message = "身体情况不能为空")
-    @Excel(name = "标题")
-    private String title;
-
-    /** 内容 */
-    @Excel(name = "内容")
-    private String content;
-
-    /** JSON数据 */
-    @Excel(name = "JSON数据")
-    private String jsonInfo;
-
-    private String images;
-
-    /** 公司ID */
-    @Excel(name = "公司ID")
-    private Long companyId;
-
-    /** 员工ID */
-    @Excel(name = "员工ID")
-    private Long companyUserId;
-
-    public String getImages() {
-        return images;
-    }
-
-    public void setImages(String images) {
-        this.images = images;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public void setRecordId(Long recordId)
-    {
-        this.recordId = recordId;
-    }
-
-    public Long getRecordId() 
-    {
-        return recordId;
-    }
-    public void setDocId(Long docId) 
-    {
-        this.docId = docId;
-    }
-
-    public Long getDocId() 
-    {
-        return docId;
-    }
-    public void setRecordType(Integer recordType) 
-    {
-        this.recordType = recordType;
-    }
-
-    public Integer getRecordType() 
-    {
-        return recordType;
-    }
-    public void setTitle(String title) 
-    {
-        this.title = title;
-    }
-
-    public String getTitle() 
-    {
-        return title;
-    }
-    public void setContent(String content) 
-    {
-        this.content = content;
-    }
-
-    public String getContent() 
-    {
-        return content;
-    }
-    public void setJsonInfo(String jsonInfo) 
-    {
-        this.jsonInfo = jsonInfo;
-    }
-
-    public String getJsonInfo() 
-    {
-        return jsonInfo;
-    }
-    public void setCompanyId(Long companyId) 
-    {
-        this.companyId = companyId;
-    }
-
-    public Long getCompanyId() 
-    {
-        return companyId;
-    }
-    public void setCompanyUserId(Long companyUserId) 
-    {
-        this.companyUserId = companyUserId;
-    }
-
-    public Long getCompanyUserId() 
-    {
-        return companyUserId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("recordId", getRecordId())
-            .append("docId", getDocId())
-            .append("recordType", getRecordType())
-            .append("title", getTitle())
-            .append("content", getContent())
-            .append("jsonInfo", getJsonInfo())
-            .append("remark", getRemark())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("companyId", getCompanyId())
-            .append("companyUserId", getCompanyUserId())
-            .toString();
-    }
-}

+ 0 - 135
fs-service-system/src/main/java/com/fs/doc/domain/DocRecordReply.java

@@ -1,135 +0,0 @@
-package com.fs.doc.domain;
-
-import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 回复对象 doc_record_reply
- * 
- * @author fs
- * @date 2023-01-09
- */
-public class DocRecordReply extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    private Long replyId;
-
-    /** 记录ID */
-    @Excel(name = "记录ID")
-    private Long recordId;
-
-    /** 所属公司 */
-    @Excel(name = "所属公司")
-    private Long companyId;
-
-    /** 所属员工 */
-    @Excel(name = "所属员工")
-    private Long companyUserId;
-
-    /** 内容 */
-    @Excel(name = "内容")
-    @NotNull(message = "回复内容不能为空")
-    private String content;
-
-    /** 图片 */
-    @Excel(name = "图片")
-    private String images;
-
-    /** 视频 */
-    @Excel(name = "视频")
-    private String videos;
-
-    private String productIds;
-
-    public String getProductIds() {
-        return productIds;
-    }
-
-    public void setProductIds(String productIds) {
-        this.productIds = productIds;
-    }
-
-    public void setReplyId(Long replyId)
-    {
-        this.replyId = replyId;
-    }
-
-    public Long getReplyId() 
-    {
-        return replyId;
-    }
-    public void setRecordId(Long recordId) 
-    {
-        this.recordId = recordId;
-    }
-
-    public Long getRecordId() 
-    {
-        return recordId;
-    }
-    public void setCompanyId(Long companyId) 
-    {
-        this.companyId = companyId;
-    }
-
-    public Long getCompanyId() 
-    {
-        return companyId;
-    }
-    public void setCompanyUserId(Long companyUserId) 
-    {
-        this.companyUserId = companyUserId;
-    }
-
-    public Long getCompanyUserId() 
-    {
-        return companyUserId;
-    }
-    public void setContent(String content) 
-    {
-        this.content = content;
-    }
-
-    public String getContent() 
-    {
-        return content;
-    }
-    public void setImages(String images) 
-    {
-        this.images = images;
-    }
-
-    public String getImages() 
-    {
-        return images;
-    }
-    public void setVideos(String videos) 
-    {
-        this.videos = videos;
-    }
-
-    public String getVideos() 
-    {
-        return videos;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("replyId", getReplyId())
-            .append("recordId", getRecordId())
-            .append("companyId", getCompanyId())
-            .append("companyUserId", getCompanyUserId())
-            .append("content", getContent())
-            .append("images", getImages())
-            .append("videos", getVideos())
-            .append("createTime", getCreateTime())
-            .toString();
-    }
-}

+ 0 - 86
fs-service-system/src/main/java/com/fs/doc/mapper/DocMapper.java

@@ -1,86 +0,0 @@
-package com.fs.doc.mapper;
-
-import java.util.List;
-import com.fs.doc.domain.Doc;
-import com.fs.doc.param.DocQueryParam;
-import com.fs.doc.vo.DocListQueryVO;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * 档案Mapper接口
- * 
- * @author fs
- * @date 2023-01-09
- */
-public interface DocMapper 
-{
-    /**
-     * 查询档案
-     * 
-     * @param docId 档案ID
-     * @return 档案
-     */
-    public Doc selectDocById(Long docId);
-
-    /**
-     * 查询档案列表
-     * 
-     * @param doc 档案
-     * @return 档案集合
-     */
-    public List<Doc> selectDocList(Doc doc);
-
-    /**
-     * 新增档案
-     * 
-     * @param doc 档案
-     * @return 结果
-     */
-    public int insertDoc(Doc doc);
-
-    /**
-     * 修改档案
-     * 
-     * @param doc 档案
-     * @return 结果
-     */
-    public int updateDoc(Doc doc);
-
-    /**
-     * 删除档案
-     * 
-     * @param docId 档案ID
-     * @return 结果
-     */
-    public int deleteDocById(Long docId);
-
-    /**
-     * 批量删除档案
-     * 
-     * @param docIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteDocByIds(Long[] docIds);
-    @Select({"<script> " +
-            "select d.* from doc d  " +
-            "where 1=1 " +
-            "<if test = 'maps.userId != null     '> " +
-            "and d.user_id =#{maps.userId} " +
-            "</if>" +
-            "<if test = 'maps.userName != null and  maps.userName !=\"\"    '> " +
-            "and d.user_name like CONCAT('%',#{maps.userName},'%') " +
-            "</if>" +
-            "<if test = 'maps.keyword != null and  maps.keyword !=\"\"    '> " +
-            "and d.user_name like CONCAT('%',#{maps.keyword},'%') " +
-            "</if>" +
-            "<if test = 'maps.sex != null     '> " +
-            "and d.sex =#{maps.sex} " +
-            "</if>" +
-            "<if test = 'maps.idCard != null and  maps.idCard !=\"\"   '> " +
-            "and d.id_card =#{maps.idCard} " +
-            "</if>" +
-            " order by d.doc_id desc "+
-            "</script>"})
-    List<DocListQueryVO> selectDocListVOQuery(@Param("maps")DocQueryParam param);
-}

+ 0 - 77
fs-service-system/src/main/java/com/fs/doc/mapper/DocOrderMapper.java

@@ -1,77 +0,0 @@
-package com.fs.doc.mapper;
-
-import java.util.List;
-import com.fs.doc.domain.DocOrder;
-import com.fs.doc.param.DocOrderQueryParam;
-import com.fs.doc.vo.DocOrderListQueryVO;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * 问医生Mapper接口
- * 
- * @author fs
- * @date 2023-01-09
- */
-public interface DocOrderMapper 
-{
-    /**
-     * 查询问医生
-     * 
-     * @param orderId 问医生ID
-     * @return 问医生
-     */
-    public DocOrder selectDocOrderById(Long orderId);
-
-    /**
-     * 查询问医生列表
-     * 
-     * @param docOrder 问医生
-     * @return 问医生集合
-     */
-    public List<DocOrder> selectDocOrderList(DocOrder docOrder);
-
-    /**
-     * 新增问医生
-     * 
-     * @param docOrder 问医生
-     * @return 结果
-     */
-    public int insertDocOrder(DocOrder docOrder);
-
-    /**
-     * 修改问医生
-     * 
-     * @param docOrder 问医生
-     * @return 结果
-     */
-    public int updateDocOrder(DocOrder docOrder);
-
-    /**
-     * 删除问医生
-     * 
-     * @param orderId 问医生ID
-     * @return 结果
-     */
-    public int deleteDocOrderById(Long orderId);
-
-    /**
-     * 批量删除问医生
-     * 
-     * @param orderIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteDocOrderByIds(Long[] orderIds);
-    @Select({"<script> " +
-            "select o.*,d.user_name from doc_order o left join doc d on d.doc_id=o.doc_id  " +
-            "where 1=1 " +
-            "<if test = 'maps.userId != null '> " +
-            "and o.user_id =#{maps.userId} " +
-            "</if>" +
-            "<if test = 'maps.docId != null     '> " +
-            "and o.doc_id =#{maps.docId} " +
-            "</if>" +
-            " order by o.order_id desc "+
-            "</script>"})
-    List<DocOrderListQueryVO> selectDocOrderListVOQuery(@Param("maps")DocOrderQueryParam param);
-}

+ 0 - 73
fs-service-system/src/main/java/com/fs/doc/mapper/DocOrderReplyMapper.java

@@ -1,73 +0,0 @@
-package com.fs.doc.mapper;
-
-import java.util.List;
-import com.fs.doc.domain.DocOrderReply;
-import com.fs.doc.param.DocOrderReplyQueryParam;
-import com.fs.doc.vo.DocOrderReplyListQueryVO;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * 订单回复Mapper接口
- * 
- * @author fs
- * @date 2023-01-09
- */
-public interface DocOrderReplyMapper 
-{
-    /**
-     * 查询订单回复
-     * 
-     * @param replyId 订单回复ID
-     * @return 订单回复
-     */
-    public DocOrderReply selectDocOrderReplyById(Long replyId);
-
-    /**
-     * 查询订单回复列表
-     * 
-     * @param docOrderReply 订单回复
-     * @return 订单回复集合
-     */
-    public List<DocOrderReply> selectDocOrderReplyList(DocOrderReply docOrderReply);
-
-    /**
-     * 新增订单回复
-     * 
-     * @param docOrderReply 订单回复
-     * @return 结果
-     */
-    public int insertDocOrderReply(DocOrderReply docOrderReply);
-
-    /**
-     * 修改订单回复
-     * 
-     * @param docOrderReply 订单回复
-     * @return 结果
-     */
-    public int updateDocOrderReply(DocOrderReply docOrderReply);
-
-    /**
-     * 删除订单回复
-     * 
-     * @param replyId 订单回复ID
-     * @return 结果
-     */
-    public int deleteDocOrderReplyById(Long replyId);
-
-    /**
-     * 批量删除订单回复
-     * 
-     * @param replyIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteDocOrderReplyByIds(Long[] replyIds);
-    @Select({"<script> " +
-            "select r.*,c.user_name from doc_record_reply r left join doc_order o on o.doc_id=r.doc_id  " +
-            "where 1=1 " +
-            "<if test = 'maps.orderId != null     '> " +
-            "and r.order_id =#{maps.orderId} " +
-            "</if>" +
-            " order by r.reply_id desc "+
-            "</script>"})
-    List<DocOrderReplyListQueryVO> selectDocOrderReplyListVOQuery(DocOrderReplyQueryParam param);
-}

+ 0 - 103
fs-service-system/src/main/java/com/fs/doc/mapper/DocRecordMapper.java

@@ -1,103 +0,0 @@
-package com.fs.doc.mapper;
-
-import java.util.List;
-import com.fs.doc.domain.DocRecord;
-import com.fs.doc.param.DocRecordParam;
-import com.fs.doc.param.DocRecordQueryParam;
-import com.fs.doc.vo.DocRecordListQueryVO;
-import com.fs.doc.vo.DocRecordVO;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * 记录Mapper接口
- * 
- * @author fs
- * @date 2023-01-09
- */
-public interface DocRecordMapper 
-{
-    /**
-     * 查询记录
-     * 
-     * @param recordId 记录ID
-     * @return 记录
-     */
-    public DocRecord selectDocRecordById(Long recordId);
-
-    /**
-     * 查询记录列表
-     * 
-     * @param docRecord 记录
-     * @return 记录集合
-     */
-    public List<DocRecord> selectDocRecordList(DocRecord docRecord);
-
-    /**
-     * 新增记录
-     * 
-     * @param docRecord 记录
-     * @return 结果
-     */
-    public int insertDocRecord(DocRecord docRecord);
-
-    /**
-     * 修改记录
-     * 
-     * @param docRecord 记录
-     * @return 结果
-     */
-    public int updateDocRecord(DocRecord docRecord);
-
-    /**
-     * 删除记录
-     * 
-     * @param recordId 记录ID
-     * @return 结果
-     */
-    public int deleteDocRecordById(Long recordId);
-
-    /**
-     * 批量删除记录
-     * 
-     * @param recordIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteDocRecordByIds(Long[] recordIds);
-    @Select({"<script> " +
-            "select r.*,c.user_name,c.id_card,c.sex,c.birthday from doc_record r left join doc c on c.doc_id=r.doc_id  " +
-            "where 1=1 " +
-            "<if test = 'maps.docId != null  '> " +
-            "and r.doc_id =#{maps.docId} " +
-            "</if>" +
-            "<if test = 'maps.userId != null  '> " +
-            "and r.user_id =#{maps.userId} " +
-            "</if>" +
-            "<if test = 'maps.userName != null and  maps.userName !=\"\"    '> " +
-            "and c.user_name like CONCAT('%',#{maps.userName},'%') " +
-            "</if>" +
-            "<if test = 'maps.idCard != null and  maps.idCard !=\"\"   '> " +
-            "and c.id_card =#{maps.idCard} " +
-            "</if>" +
-            " order by r.record_id desc "+
-            "</script>"})
-    List<DocRecordListQueryVO> selectDocRecordListVOQuery(@Param("maps")DocRecordQueryParam param);
-    @Select({"<script> " +
-            "select r.*,c.user_name,c.id_card,c.sex,c.birthday from doc_record r left join doc c on c.doc_id=r.doc_id  " +
-            "where 1=1 " +
-            "<if test = 'maps.docId != null  '> " +
-            "and r.doc_id =#{maps.docId} " +
-            "</if>" +
-            "<if test = 'maps.userId != null  '> " +
-            "and r.user_id =#{maps.userId} " +
-            "</if>" +
-            "<if test = 'maps.userName != null and  maps.userName !=\"\"    '> " +
-            "and c.user_name like CONCAT('%',#{maps.userName},'%') " +
-            "</if>" +
-            "<if test = 'maps.idCard != null and  maps.idCard !=\"\"   '> " +
-            "and c.id_card =#{maps.idCard} " +
-            "</if>" +
-            " order by r.record_id desc "+
-            "</script>"})
-    List<DocRecordVO> selectDocRecordListVO(@Param("maps")DocRecordParam docRecord);
-}

+ 0 - 78
fs-service-system/src/main/java/com/fs/doc/mapper/DocRecordReplyMapper.java

@@ -1,78 +0,0 @@
-package com.fs.doc.mapper;
-
-import java.util.List;
-import com.fs.doc.domain.DocRecordReply;
-import com.fs.doc.param.DocRecordReplyQueryParam;
-import com.fs.doc.vo.DocRecordReplyListQueryVO;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * 回复Mapper接口
- * 
- * @author fs
- * @date 2023-01-09
- */
-public interface DocRecordReplyMapper 
-{
-    /**
-     * 查询回复
-     * 
-     * @param replyId 回复ID
-     * @return 回复
-     */
-    public DocRecordReply selectDocRecordReplyById(Long replyId);
-
-    /**
-     * 查询回复列表
-     * 
-     * @param docRecordReply 回复
-     * @return 回复集合
-     */
-    public List<DocRecordReply> selectDocRecordReplyList(DocRecordReply docRecordReply);
-
-    /**
-     * 新增回复
-     * 
-     * @param docRecordReply 回复
-     * @return 结果
-     */
-    public int insertDocRecordReply(DocRecordReply docRecordReply);
-
-    /**
-     * 修改回复
-     * 
-     * @param docRecordReply 回复
-     * @return 结果
-     */
-    public int updateDocRecordReply(DocRecordReply docRecordReply);
-
-    /**
-     * 删除回复
-     * 
-     * @param replyId 回复ID
-     * @return 结果
-     */
-    public int deleteDocRecordReplyById(Long replyId);
-
-    /**
-     * 批量删除回复
-     * 
-     * @param replyIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteDocRecordReplyByIds(Long[] replyIds);
-
-    @Select({"<script> " +
-            "select r.*,cu.nick_name as company_nick_name from doc_record_reply r left join company_user cu on cu.user_id=r.company_user_id  " +
-            "where 1=1 " +
-            "<if test = 'maps.recordId != null     '> " +
-            "and r.record_id =#{maps.recordId} " +
-            "</if>" +
-            "order by r.reply_id desc "+
-            "<if test = 'maps.limit != null     '> " +
-            "limit #{maps.limit} " +
-            "</if>" +
-            "</script>"})
-    List<DocRecordReplyListQueryVO> selectDocRecordReplyListVOQuery(@Param("maps") DocRecordReplyQueryParam map);
-}

+ 0 - 17
fs-service-system/src/main/java/com/fs/doc/param/DocOrderQueryParam.java

@@ -1,17 +0,0 @@
-package com.fs.doc.param;
-
-import com.fs.common.param.BaseQueryParam;
-import lombok.Data;
-
-@Data
-public class DocOrderQueryParam extends BaseQueryParam
-{
-
-    private Long docId;
-    private Long userId;
-
-
-
-
-
-}

+ 0 - 15
fs-service-system/src/main/java/com/fs/doc/param/DocOrderReplyQueryParam.java

@@ -1,15 +0,0 @@
-package com.fs.doc.param;
-
-import com.fs.common.param.BaseQueryParam;
-import lombok.Data;
-
-@Data
-public class DocOrderReplyQueryParam extends BaseQueryParam
-{
-    private Long orderId;
-
-
-
-
-
-}

+ 0 - 17
fs-service-system/src/main/java/com/fs/doc/param/DocQueryParam.java

@@ -1,17 +0,0 @@
-package com.fs.doc.param;
-
-import com.fs.common.param.BaseQueryParam;
-import lombok.Data;
-
-@Data
-public class DocQueryParam extends BaseQueryParam
-{
-
-
-    private Long userId;
-    private String userName;
-    private Integer sex;
-    private String idCard;
-
-
-}

+ 0 - 20
fs-service-system/src/main/java/com/fs/doc/param/DocRecordParam.java

@@ -1,20 +0,0 @@
-package com.fs.doc.param;
-
-import com.fs.common.core.domain.BaseEntity;
-import com.fs.common.param.BaseQueryParam;
-import lombok.Data;
-
-@Data
-public class DocRecordParam extends BaseEntity
-{
-
-
-    private Long docId;
-
-    private Long userId;
-
-    private Long userName;
-
-    private Long idCard;
-
-}

+ 0 - 19
fs-service-system/src/main/java/com/fs/doc/param/DocRecordQueryParam.java

@@ -1,19 +0,0 @@
-package com.fs.doc.param;
-
-import com.fs.common.param.BaseQueryParam;
-import lombok.Data;
-
-@Data
-public class DocRecordQueryParam extends BaseQueryParam
-{
-
-
-    private Long docId;
-
-    private Long userId;
-
-    private Long userName;
-
-    private Long idCard;
-
-}

+ 0 - 15
fs-service-system/src/main/java/com/fs/doc/param/DocRecordReplyQueryParam.java

@@ -1,15 +0,0 @@
-package com.fs.doc.param;
-
-import com.fs.common.param.BaseQueryParam;
-import lombok.Data;
-
-@Data
-public class DocRecordReplyQueryParam extends BaseQueryParam
-{
-
-
-    private Long recordId;
-
-
-
-}

+ 0 - 65
fs-service-system/src/main/java/com/fs/doc/service/IDocOrderReplyService.java

@@ -1,65 +0,0 @@
-package com.fs.doc.service;
-
-import java.util.List;
-import com.fs.doc.domain.DocOrderReply;
-import com.fs.doc.param.DocOrderReplyQueryParam;
-import com.fs.doc.vo.DocOrderReplyListQueryVO;
-
-/**
- * 订单回复Service接口
- * 
- * @author fs
- * @date 2023-01-09
- */
-public interface IDocOrderReplyService 
-{
-    /**
-     * 查询订单回复
-     * 
-     * @param replyId 订单回复ID
-     * @return 订单回复
-     */
-    public DocOrderReply selectDocOrderReplyById(Long replyId);
-
-    /**
-     * 查询订单回复列表
-     * 
-     * @param docOrderReply 订单回复
-     * @return 订单回复集合
-     */
-    public List<DocOrderReply> selectDocOrderReplyList(DocOrderReply docOrderReply);
-
-    /**
-     * 新增订单回复
-     * 
-     * @param docOrderReply 订单回复
-     * @return 结果
-     */
-    public int insertDocOrderReply(DocOrderReply docOrderReply);
-
-    /**
-     * 修改订单回复
-     * 
-     * @param docOrderReply 订单回复
-     * @return 结果
-     */
-    public int updateDocOrderReply(DocOrderReply docOrderReply);
-
-    /**
-     * 批量删除订单回复
-     * 
-     * @param replyIds 需要删除的订单回复ID
-     * @return 结果
-     */
-    public int deleteDocOrderReplyByIds(Long[] replyIds);
-
-    /**
-     * 删除订单回复信息
-     * 
-     * @param replyId 订单回复ID
-     * @return 结果
-     */
-    public int deleteDocOrderReplyById(Long replyId);
-
-    List<DocOrderReplyListQueryVO> selectDocOrderReplyListVOQuery(DocOrderReplyQueryParam param);
-}

+ 0 - 65
fs-service-system/src/main/java/com/fs/doc/service/IDocOrderService.java

@@ -1,65 +0,0 @@
-package com.fs.doc.service;
-
-import java.util.List;
-import com.fs.doc.domain.DocOrder;
-import com.fs.doc.param.DocOrderQueryParam;
-import com.fs.doc.vo.DocOrderListQueryVO;
-
-/**
- * 问医生Service接口
- * 
- * @author fs
- * @date 2023-01-09
- */
-public interface IDocOrderService 
-{
-    /**
-     * 查询问医生
-     * 
-     * @param orderId 问医生ID
-     * @return 问医生
-     */
-    public DocOrder selectDocOrderById(Long orderId);
-
-    /**
-     * 查询问医生列表
-     * 
-     * @param docOrder 问医生
-     * @return 问医生集合
-     */
-    public List<DocOrder> selectDocOrderList(DocOrder docOrder);
-
-    /**
-     * 新增问医生
-     * 
-     * @param docOrder 问医生
-     * @return 结果
-     */
-    public int insertDocOrder(DocOrder docOrder);
-
-    /**
-     * 修改问医生
-     * 
-     * @param docOrder 问医生
-     * @return 结果
-     */
-    public int updateDocOrder(DocOrder docOrder);
-
-    /**
-     * 批量删除问医生
-     * 
-     * @param orderIds 需要删除的问医生ID
-     * @return 结果
-     */
-    public int deleteDocOrderByIds(Long[] orderIds);
-
-    /**
-     * 删除问医生信息
-     * 
-     * @param orderId 问医生ID
-     * @return 结果
-     */
-    public int deleteDocOrderById(Long orderId);
-
-    List<DocOrderListQueryVO> selectDocOrderListVOQuery(DocOrderQueryParam param);
-}

+ 0 - 65
fs-service-system/src/main/java/com/fs/doc/service/IDocRecordReplyService.java

@@ -1,65 +0,0 @@
-package com.fs.doc.service;
-
-import java.util.List;
-import com.fs.doc.domain.DocRecordReply;
-import com.fs.doc.param.DocRecordReplyQueryParam;
-import com.fs.doc.vo.DocRecordReplyListQueryVO;
-
-/**
- * 回复Service接口
- * 
- * @author fs
- * @date 2023-01-09
- */
-public interface IDocRecordReplyService 
-{
-    /**
-     * 查询回复
-     * 
-     * @param replyId 回复ID
-     * @return 回复
-     */
-    public DocRecordReply selectDocRecordReplyById(Long replyId);
-
-    /**
-     * 查询回复列表
-     * 
-     * @param docRecordReply 回复
-     * @return 回复集合
-     */
-    public List<DocRecordReply> selectDocRecordReplyList(DocRecordReply docRecordReply);
-
-    /**
-     * 新增回复
-     * 
-     * @param docRecordReply 回复
-     * @return 结果
-     */
-    public int insertDocRecordReply(DocRecordReply docRecordReply);
-
-    /**
-     * 修改回复
-     * 
-     * @param docRecordReply 回复
-     * @return 结果
-     */
-    public int updateDocRecordReply(DocRecordReply docRecordReply);
-
-    /**
-     * 批量删除回复
-     * 
-     * @param replyIds 需要删除的回复ID
-     * @return 结果
-     */
-    public int deleteDocRecordReplyByIds(Long[] replyIds);
-
-    /**
-     * 删除回复信息
-     * 
-     * @param replyId 回复ID
-     * @return 结果
-     */
-    public int deleteDocRecordReplyById(Long replyId);
-
-    List<DocRecordReplyListQueryVO> selectDocRecordReplyListVOQuery(DocRecordReplyQueryParam param);
-}

+ 0 - 69
fs-service-system/src/main/java/com/fs/doc/service/IDocRecordService.java

@@ -1,69 +0,0 @@
-package com.fs.doc.service;
-
-import java.util.List;
-import com.fs.doc.domain.DocRecord;
-import com.fs.doc.param.DocRecordParam;
-import com.fs.doc.param.DocRecordQueryParam;
-import com.fs.doc.vo.DocRecordListQueryVO;
-import com.fs.doc.vo.DocRecordVO;
-
-/**
- * 记录Service接口
- * 
- * @author fs
- * @date 2023-01-09
- */
-public interface IDocRecordService 
-{
-    /**
-     * 查询记录
-     * 
-     * @param recordId 记录ID
-     * @return 记录
-     */
-    public DocRecord selectDocRecordById(Long recordId);
-
-    /**
-     * 查询记录列表
-     * 
-     * @param docRecord 记录
-     * @return 记录集合
-     */
-    public List<DocRecord> selectDocRecordList(DocRecord docRecord);
-
-    /**
-     * 新增记录
-     * 
-     * @param docRecord 记录
-     * @return 结果
-     */
-    public int insertDocRecord(DocRecord docRecord);
-
-    /**
-     * 修改记录
-     * 
-     * @param docRecord 记录
-     * @return 结果
-     */
-    public int updateDocRecord(DocRecord docRecord);
-
-    /**
-     * 批量删除记录
-     * 
-     * @param recordIds 需要删除的记录ID
-     * @return 结果
-     */
-    public int deleteDocRecordByIds(Long[] recordIds);
-
-    /**
-     * 删除记录信息
-     * 
-     * @param recordId 记录ID
-     * @return 结果
-     */
-    public int deleteDocRecordById(Long recordId);
-
-    List<DocRecordListQueryVO> selectDocRecordListVOQuery(DocRecordQueryParam param);
-
-    List<DocRecordVO> selectDocRecordListVO(DocRecordParam docRecord);
-}

+ 0 - 65
fs-service-system/src/main/java/com/fs/doc/service/IDocService.java

@@ -1,65 +0,0 @@
-package com.fs.doc.service;
-
-import java.util.List;
-import com.fs.doc.domain.Doc;
-import com.fs.doc.param.DocQueryParam;
-import com.fs.doc.vo.DocListQueryVO;
-
-/**
- * 档案Service接口
- * 
- * @author fs
- * @date 2023-01-09
- */
-public interface IDocService 
-{
-    /**
-     * 查询档案
-     * 
-     * @param docId 档案ID
-     * @return 档案
-     */
-    public Doc selectDocById(Long docId);
-
-    /**
-     * 查询档案列表
-     * 
-     * @param doc 档案
-     * @return 档案集合
-     */
-    public List<Doc> selectDocList(Doc doc);
-
-    /**
-     * 新增档案
-     * 
-     * @param doc 档案
-     * @return 结果
-     */
-    public int insertDoc(Doc doc);
-
-    /**
-     * 修改档案
-     * 
-     * @param doc 档案
-     * @return 结果
-     */
-    public int updateDoc(Doc doc);
-
-    /**
-     * 批量删除档案
-     * 
-     * @param docIds 需要删除的档案ID
-     * @return 结果
-     */
-    public int deleteDocByIds(Long[] docIds);
-
-    /**
-     * 删除档案信息
-     * 
-     * @param docId 档案ID
-     * @return 结果
-     */
-    public int deleteDocById(Long docId);
-
-    List<DocListQueryVO> selectDocListVOQuery(DocQueryParam param);
-}

+ 0 - 102
fs-service-system/src/main/java/com/fs/doc/service/impl/DocOrderReplyServiceImpl.java

@@ -1,102 +0,0 @@
-package com.fs.doc.service.impl;
-
-import java.util.List;
-import com.fs.common.utils.DateUtils;
-import com.fs.doc.param.DocOrderReplyQueryParam;
-import com.fs.doc.vo.DocOrderReplyListQueryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.fs.doc.mapper.DocOrderReplyMapper;
-import com.fs.doc.domain.DocOrderReply;
-import com.fs.doc.service.IDocOrderReplyService;
-
-/**
- * 订单回复Service业务层处理
- * 
- * @author fs
- * @date 2023-01-09
- */
-@Service
-public class DocOrderReplyServiceImpl implements IDocOrderReplyService 
-{
-    @Autowired
-    private DocOrderReplyMapper docOrderReplyMapper;
-
-    /**
-     * 查询订单回复
-     * 
-     * @param replyId 订单回复ID
-     * @return 订单回复
-     */
-    @Override
-    public DocOrderReply selectDocOrderReplyById(Long replyId)
-    {
-        return docOrderReplyMapper.selectDocOrderReplyById(replyId);
-    }
-
-    /**
-     * 查询订单回复列表
-     * 
-     * @param docOrderReply 订单回复
-     * @return 订单回复
-     */
-    @Override
-    public List<DocOrderReply> selectDocOrderReplyList(DocOrderReply docOrderReply)
-    {
-        return docOrderReplyMapper.selectDocOrderReplyList(docOrderReply);
-    }
-
-    /**
-     * 新增订单回复
-     * 
-     * @param docOrderReply 订单回复
-     * @return 结果
-     */
-    @Override
-    public int insertDocOrderReply(DocOrderReply docOrderReply)
-    {
-        docOrderReply.setCreateTime(DateUtils.getNowDate());
-        return docOrderReplyMapper.insertDocOrderReply(docOrderReply);
-    }
-
-    /**
-     * 修改订单回复
-     * 
-     * @param docOrderReply 订单回复
-     * @return 结果
-     */
-    @Override
-    public int updateDocOrderReply(DocOrderReply docOrderReply)
-    {
-        return docOrderReplyMapper.updateDocOrderReply(docOrderReply);
-    }
-
-    /**
-     * 批量删除订单回复
-     * 
-     * @param replyIds 需要删除的订单回复ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDocOrderReplyByIds(Long[] replyIds)
-    {
-        return docOrderReplyMapper.deleteDocOrderReplyByIds(replyIds);
-    }
-
-    /**
-     * 删除订单回复信息
-     * 
-     * @param replyId 订单回复ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDocOrderReplyById(Long replyId)
-    {
-        return docOrderReplyMapper.deleteDocOrderReplyById(replyId);
-    }
-
-    @Override
-    public List<DocOrderReplyListQueryVO> selectDocOrderReplyListVOQuery(DocOrderReplyQueryParam param) {
-        return docOrderReplyMapper.selectDocOrderReplyListVOQuery(param);
-    }
-}

+ 0 - 102
fs-service-system/src/main/java/com/fs/doc/service/impl/DocOrderServiceImpl.java

@@ -1,102 +0,0 @@
-package com.fs.doc.service.impl;
-
-import java.util.List;
-import com.fs.common.utils.DateUtils;
-import com.fs.doc.param.DocOrderQueryParam;
-import com.fs.doc.vo.DocOrderListQueryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.fs.doc.mapper.DocOrderMapper;
-import com.fs.doc.domain.DocOrder;
-import com.fs.doc.service.IDocOrderService;
-
-/**
- * 问医生Service业务层处理
- * 
- * @author fs
- * @date 2023-01-09
- */
-@Service
-public class DocOrderServiceImpl implements IDocOrderService 
-{
-    @Autowired
-    private DocOrderMapper docOrderMapper;
-
-    /**
-     * 查询问医生
-     * 
-     * @param orderId 问医生ID
-     * @return 问医生
-     */
-    @Override
-    public DocOrder selectDocOrderById(Long orderId)
-    {
-        return docOrderMapper.selectDocOrderById(orderId);
-    }
-
-    /**
-     * 查询问医生列表
-     * 
-     * @param docOrder 问医生
-     * @return 问医生
-     */
-    @Override
-    public List<DocOrder> selectDocOrderList(DocOrder docOrder)
-    {
-        return docOrderMapper.selectDocOrderList(docOrder);
-    }
-
-    /**
-     * 新增问医生
-     * 
-     * @param docOrder 问医生
-     * @return 结果
-     */
-    @Override
-    public int insertDocOrder(DocOrder docOrder)
-    {
-        docOrder.setCreateTime(DateUtils.getNowDate());
-        return docOrderMapper.insertDocOrder(docOrder);
-    }
-
-    /**
-     * 修改问医生
-     * 
-     * @param docOrder 问医生
-     * @return 结果
-     */
-    @Override
-    public int updateDocOrder(DocOrder docOrder)
-    {
-        return docOrderMapper.updateDocOrder(docOrder);
-    }
-
-    /**
-     * 批量删除问医生
-     * 
-     * @param orderIds 需要删除的问医生ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDocOrderByIds(Long[] orderIds)
-    {
-        return docOrderMapper.deleteDocOrderByIds(orderIds);
-    }
-
-    /**
-     * 删除问医生信息
-     * 
-     * @param orderId 问医生ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDocOrderById(Long orderId)
-    {
-        return docOrderMapper.deleteDocOrderById(orderId);
-    }
-
-    @Override
-    public List<DocOrderListQueryVO> selectDocOrderListVOQuery(DocOrderQueryParam param) {
-        return docOrderMapper.selectDocOrderListVOQuery(param);
-    }
-}

+ 0 - 115
fs-service-system/src/main/java/com/fs/doc/service/impl/DocRecordReplyServiceImpl.java

@@ -1,115 +0,0 @@
-package com.fs.doc.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import com.fs.common.utils.DateUtils;
-import com.fs.common.utils.StringUtils;
-import com.fs.doc.param.DocRecordReplyQueryParam;
-import com.fs.doc.vo.DocRecordReplyListQueryVO;
-import com.fs.store.mapper.FsStoreProductMapper;
-import com.fs.store.vo.FsStoreProductListQueryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.fs.doc.mapper.DocRecordReplyMapper;
-import com.fs.doc.domain.DocRecordReply;
-import com.fs.doc.service.IDocRecordReplyService;
-
-/**
- * 回复Service业务层处理
- * 
- * @author fs
- * @date 2023-01-09
- */
-@Service
-public class DocRecordReplyServiceImpl implements IDocRecordReplyService 
-{
-    @Autowired
-    private DocRecordReplyMapper docRecordReplyMapper;
-    @Autowired
-    private FsStoreProductMapper storeProductMapper;
-    /**
-     * 查询回复
-     * 
-     * @param replyId 回复ID
-     * @return 回复
-     */
-    @Override
-    public DocRecordReply selectDocRecordReplyById(Long replyId)
-    {
-        return docRecordReplyMapper.selectDocRecordReplyById(replyId);
-    }
-
-    /**
-     * 查询回复列表
-     * 
-     * @param docRecordReply 回复
-     * @return 回复
-     */
-    @Override
-    public List<DocRecordReply> selectDocRecordReplyList(DocRecordReply docRecordReply)
-    {
-        return docRecordReplyMapper.selectDocRecordReplyList(docRecordReply);
-    }
-
-    /**
-     * 新增回复
-     * 
-     * @param docRecordReply 回复
-     * @return 结果
-     */
-    @Override
-    public int insertDocRecordReply(DocRecordReply docRecordReply)
-    {
-        docRecordReply.setCreateTime(DateUtils.getNowDate());
-        return docRecordReplyMapper.insertDocRecordReply(docRecordReply);
-    }
-
-    /**
-     * 修改回复
-     * 
-     * @param docRecordReply 回复
-     * @return 结果
-     */
-    @Override
-    public int updateDocRecordReply(DocRecordReply docRecordReply)
-    {
-        return docRecordReplyMapper.updateDocRecordReply(docRecordReply);
-    }
-
-    /**
-     * 批量删除回复
-     * 
-     * @param replyIds 需要删除的回复ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDocRecordReplyByIds(Long[] replyIds)
-    {
-        return docRecordReplyMapper.deleteDocRecordReplyByIds(replyIds);
-    }
-
-    /**
-     * 删除回复信息
-     * 
-     * @param replyId 回复ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDocRecordReplyById(Long replyId)
-    {
-        return docRecordReplyMapper.deleteDocRecordReplyById(replyId);
-    }
-
-    @Override
-    public List<DocRecordReplyListQueryVO> selectDocRecordReplyListVOQuery(DocRecordReplyQueryParam param) {
-        List<DocRecordReplyListQueryVO> list= docRecordReplyMapper.selectDocRecordReplyListVOQuery(param);
-        for(DocRecordReplyListQueryVO vo:list){
-            List<FsStoreProductListQueryVO> productList=new ArrayList<>();
-            if(StringUtils.isEmpty(vo.getProductIds())){
-                productList=storeProductMapper.selectFsStoreProductListByIds(vo.getProductIds());
-            }
-            vo.setProducts(productList);
-        }
-        return list;
-    }
-}

+ 0 - 135
fs-service-system/src/main/java/com/fs/doc/service/impl/DocRecordServiceImpl.java

@@ -1,135 +0,0 @@
-package com.fs.doc.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import com.fs.common.utils.DateUtils;
-import com.fs.common.utils.StringUtils;
-import com.fs.doc.mapper.DocRecordReplyMapper;
-import com.fs.doc.param.DocRecordParam;
-import com.fs.doc.param.DocRecordQueryParam;
-import com.fs.doc.param.DocRecordReplyQueryParam;
-import com.fs.doc.vo.DocRecordListQueryVO;
-import com.fs.doc.vo.DocRecordReplyListQueryVO;
-import com.fs.doc.vo.DocRecordVO;
-import com.fs.store.mapper.FsStoreProductMapper;
-import com.fs.store.vo.FsStoreProductListQueryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.fs.doc.mapper.DocRecordMapper;
-import com.fs.doc.domain.DocRecord;
-import com.fs.doc.service.IDocRecordService;
-
-/**
- * 记录Service业务层处理
- * 
- * @author fs
- * @date 2023-01-09
- */
-@Service
-public class DocRecordServiceImpl implements IDocRecordService 
-{
-    @Autowired
-    private DocRecordMapper docRecordMapper;
-    @Autowired
-    private DocRecordReplyMapper docRecordReplyMapper;
-    @Autowired
-    private FsStoreProductMapper storeProductMapper;
-    /**
-     * 查询记录
-     * 
-     * @param recordId 记录ID
-     * @return 记录
-     */
-    @Override
-    public DocRecord selectDocRecordById(Long recordId)
-    {
-        return docRecordMapper.selectDocRecordById(recordId);
-    }
-
-    /**
-     * 查询记录列表
-     * 
-     * @param docRecord 记录
-     * @return 记录
-     */
-    @Override
-    public List<DocRecord> selectDocRecordList(DocRecord docRecord)
-    {
-        return docRecordMapper.selectDocRecordList(docRecord);
-    }
-
-    /**
-     * 新增记录
-     * 
-     * @param docRecord 记录
-     * @return 结果
-     */
-    @Override
-    public int insertDocRecord(DocRecord docRecord)
-    {
-        docRecord.setCreateTime(DateUtils.getNowDate());
-        return docRecordMapper.insertDocRecord(docRecord);
-    }
-
-    /**
-     * 修改记录
-     * 
-     * @param docRecord 记录
-     * @return 结果
-     */
-    @Override
-    public int updateDocRecord(DocRecord docRecord)
-    {
-        docRecord.setUpdateTime(DateUtils.getNowDate());
-        return docRecordMapper.updateDocRecord(docRecord);
-    }
-
-    /**
-     * 批量删除记录
-     * 
-     * @param recordIds 需要删除的记录ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDocRecordByIds(Long[] recordIds)
-    {
-        return docRecordMapper.deleteDocRecordByIds(recordIds);
-    }
-
-    /**
-     * 删除记录信息
-     * 
-     * @param recordId 记录ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDocRecordById(Long recordId)
-    {
-        return docRecordMapper.deleteDocRecordById(recordId);
-    }
-
-    @Override
-    public List<DocRecordListQueryVO> selectDocRecordListVOQuery(DocRecordQueryParam param) {
-        List<DocRecordListQueryVO> list=docRecordMapper.selectDocRecordListVOQuery(param);
-        for(DocRecordListQueryVO vo:list){
-            DocRecordReplyQueryParam map=new DocRecordReplyQueryParam();
-            map.setLimit(10);
-            map.setRecordId(vo.getRecordId());
-            List<DocRecordReplyListQueryVO> replys=docRecordReplyMapper.selectDocRecordReplyListVOQuery(map);
-            for(DocRecordReplyListQueryVO replyVO:replys){
-                List<FsStoreProductListQueryVO> productList=new ArrayList<>();
-                if(StringUtils.isEmpty(replyVO.getProductIds())){
-                    productList=storeProductMapper.selectFsStoreProductListByIds(replyVO.getProductIds());
-                }
-                replyVO.setProducts(productList);
-            }
-            vo.setReplys(replys);
-        }
-        return list;
-    }
-
-    @Override
-    public List<DocRecordVO> selectDocRecordListVO(DocRecordParam docRecord) {
-        return docRecordMapper.selectDocRecordListVO(docRecord);
-    }
-}

+ 0 - 103
fs-service-system/src/main/java/com/fs/doc/service/impl/DocServiceImpl.java

@@ -1,103 +0,0 @@
-package com.fs.doc.service.impl;
-
-import java.util.List;
-import com.fs.common.utils.DateUtils;
-import com.fs.doc.param.DocQueryParam;
-import com.fs.doc.vo.DocListQueryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.fs.doc.mapper.DocMapper;
-import com.fs.doc.domain.Doc;
-import com.fs.doc.service.IDocService;
-
-/**
- * 档案Service业务层处理
- * 
- * @author fs
- * @date 2023-01-09
- */
-@Service
-public class DocServiceImpl implements IDocService 
-{
-    @Autowired
-    private DocMapper docMapper;
-
-    /**
-     * 查询档案
-     * 
-     * @param docId 档案ID
-     * @return 档案
-     */
-    @Override
-    public Doc selectDocById(Long docId)
-    {
-        return docMapper.selectDocById(docId);
-    }
-
-    /**
-     * 查询档案列表
-     * 
-     * @param doc 档案
-     * @return 档案
-     */
-    @Override
-    public List<Doc> selectDocList(Doc doc)
-    {
-        return docMapper.selectDocList(doc);
-    }
-
-    /**
-     * 新增档案
-     * 
-     * @param doc 档案
-     * @return 结果
-     */
-    @Override
-    public int insertDoc(Doc doc)
-    {
-        doc.setCreateTime(DateUtils.getNowDate());
-        return docMapper.insertDoc(doc);
-    }
-
-    /**
-     * 修改档案
-     * 
-     * @param doc 档案
-     * @return 结果
-     */
-    @Override
-    public int updateDoc(Doc doc)
-    {
-        doc.setUpdateTime(DateUtils.getNowDate());
-        return docMapper.updateDoc(doc);
-    }
-
-    /**
-     * 批量删除档案
-     * 
-     * @param docIds 需要删除的档案ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDocByIds(Long[] docIds)
-    {
-        return docMapper.deleteDocByIds(docIds);
-    }
-
-    /**
-     * 删除档案信息
-     * 
-     * @param docId 档案ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDocById(Long docId)
-    {
-        return docMapper.deleteDocById(docId);
-    }
-
-    @Override
-    public List<DocListQueryVO> selectDocListVOQuery(DocQueryParam param) {
-        return docMapper.selectDocListVOQuery(param);
-    }
-}

+ 0 - 52
fs-service-system/src/main/java/com/fs/doc/vo/DocListQueryVO.java

@@ -1,52 +0,0 @@
-package com.fs.doc.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fs.common.annotation.Excel;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class DocListQueryVO implements Serializable
-{
-
-    /** ID */
-    private Long docId;
-
-    /** 会员ID */
-    private Long userId;
-
-    /** 姓名 */
-    private String userName;
-
-    /** 描述 */
-    private String descs;
-
-    /** 身份证号 */
-    private String idCard;
-
-    /** 身份证正面 */
-    private String idCardFront;
-
-    /** 身份证反面 */
-    private String idCardBack;
-
-    /** 性别 */
-    private Integer sex;
-
-    /** 出生年月 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date birthday;
-
-    /** 头像 */
-    private String headImg;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    private String remark;
-
-    private String tags;
-
-}

+ 0 - 52
fs-service-system/src/main/java/com/fs/doc/vo/DocOrderListQueryVO.java

@@ -1,52 +0,0 @@
-package com.fs.doc.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fs.common.annotation.Excel;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class DocOrderListQueryVO implements Serializable
-{
-    /** ID */
-    private Long orderId;
-
-    /** 订单CODE */
-    private String orderCode;
-
-    /** 标题 */
-    private String title;
-
-    /** 组图 */
-    private String images;
-
-    /** 会员ID */
-    private Long userId;
-
-    /** 档案ID */
-    private Long docId;
-
-    /** 订单类型 */
-    private Integer orderType;
-
-    /** 状态 */
-    private Integer status;
-
-    private BigDecimal money;
-
-    private BigDecimal payMoney;
-
-    /** 完成时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    private String userName;
-
-
-}

+ 0 - 44
fs-service-system/src/main/java/com/fs/doc/vo/DocOrderReplyListQueryVO.java

@@ -1,44 +0,0 @@
-package com.fs.doc.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fs.common.annotation.Excel;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class DocOrderReplyListQueryVO implements Serializable
-{
-    /** ID */
-    private Long replyId;
-
-    /** 记录ID */
-    private Long recordId;
-
-    /** 所属公司 */
-    private Long companyId;
-
-    /** 所属员工 */
-    private Long companyUserId;
-
-    /** 内容 */
-    @NotNull(message = "回复内容不能为空")
-    private String content;
-
-    /** 图片 */
-    private String images;
-
-    /** 视频 */
-    private String videos;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    private String companyUserNickName;
-
-
-
-}

+ 0 - 58
fs-service-system/src/main/java/com/fs/doc/vo/DocRecordListQueryVO.java

@@ -1,58 +0,0 @@
-package com.fs.doc.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class DocRecordListQueryVO implements Serializable
-{
-
-    /** ID */
-    private Long recordId;
-
-    /** 档案ID */
-    private Long docId;
-
-    private Long userId;
-
-    /** 记录类型 */
-    private Integer recordType;
-
-    /** 标题 */
-    private String title;
-
-    /** 内容 */
-    private String content;
-
-    /** JSON数据 */
-    private String jsonInfo;
-
-    private String images;
-
-    /** 公司ID */
-    private Long companyId;
-
-    /** 员工ID */
-    private Long companyUserId;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    private String userName;
-
-    private String idCard;
-
-    private String sex;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date birthday;
-
-    List<DocRecordReplyListQueryVO> replys;
-
-
-
-}

+ 0 - 48
fs-service-system/src/main/java/com/fs/doc/vo/DocRecordReplyListQueryVO.java

@@ -1,48 +0,0 @@
-package com.fs.doc.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fs.common.annotation.Excel;
-import com.fs.store.vo.FsStoreProductListQueryVO;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class DocRecordReplyListQueryVO implements Serializable
-{
-
-    /** ID */
-    private Long replyId;
-
-    /** 记录ID */
-    private Long recordId;
-
-    /** 所属公司 */
-    private Long companyId;
-
-    /** 所属员工 */
-    private Long companyUserId;
-
-    /** 内容 */
-    private String content;
-
-    /** 图片 */
-    private String images;
-
-    /** 视频 */
-    private String videos;
-
-    private String companyNickName;
-
-    private String avatar;
-
-    private String productIds;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    List<FsStoreProductListQueryVO> products;
-
-}

+ 0 - 58
fs-service-system/src/main/java/com/fs/doc/vo/DocRecordVO.java

@@ -1,58 +0,0 @@
-package com.fs.doc.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class DocRecordVO implements Serializable
-{
-
-    /** ID */
-    private Long recordId;
-
-    /** 档案ID */
-    private Long docId;
-
-    private Long userId;
-
-    /** 记录类型 */
-    private Integer recordType;
-
-    /** 标题 */
-    private String title;
-
-    /** 内容 */
-    private String content;
-
-    /** JSON数据 */
-    private String jsonInfo;
-
-    private String images;
-
-    /** 公司ID */
-    private Long companyId;
-
-    /** 员工ID */
-    private Long companyUserId;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    private String userName;
-
-    private String idCard;
-
-    private String sex;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date birthday;
-
-
-
-
-
-}

+ 0 - 115
fs-service-system/src/main/resources/mapper/doc/DocMapper.xml

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fs.doc.mapper.DocMapper">
-    <resultMap type="Doc" id="DocResult">
-        <result property="docId"    column="doc_id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="descs"    column="descs"    />
-        <result property="idCard"    column="id_card"    />
-        <result property="idCardFront"    column="id_card_front"    />
-        <result property="idCardBack"    column="id_card_back"    />
-        <result property="sex"    column="sex"    />
-        <result property="birthday"    column="birthday"    />
-        <result property="headImg"    column="head_img"    />
-        <result property="remark"    column="remark"    />
-        <result property="tags"    column="tags"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="companyUserIds"    column="company_user_ids"    />
-    </resultMap>
-    <sql id="selectDocVo">
-        select doc_id, user_id, user_name, descs, id_card, id_card_front, id_card_back, sex, birthday, head_img, remark,tags, create_time, update_time,company_user_ids from doc
-    </sql>
-
-    <select id="selectDocList" parameterType="Doc" resultMap="DocResult">
-        <include refid="selectDocVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="descs != null  and descs != ''"> and descs = #{descs}</if>
-            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
-            <if test="idCardFront != null  and idCardFront != ''"> and id_card_front = #{idCardFront}</if>
-            <if test="idCardBack != null  and idCardBack != ''"> and id_card_back = #{idCardBack}</if>
-            <if test="sex != null "> and sex = #{sex}</if>
-            <if test="birthday != null "> and birthday = #{birthday}</if>
-            <if test="headImg != null  and headImg != ''"> and head_img = #{headImg}</if>
-        </where>
-    </select>
-    
-    <select id="selectDocById" parameterType="Long" resultMap="DocResult">
-        <include refid="selectDocVo"/>
-        where doc_id = #{docId}
-    </select>
-        
-    <insert id="insertDoc" parameterType="Doc" useGeneratedKeys="true" keyProperty="docId">
-        insert into doc
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="descs != null">descs,</if>
-            <if test="idCard != null">id_card,</if>
-            <if test="idCardFront != null">id_card_front,</if>
-            <if test="idCardBack != null">id_card_back,</if>
-            <if test="sex != null">sex,</if>
-            <if test="birthday != null">birthday,</if>
-            <if test="headImg != null">head_img,</if>
-            <if test="remark != null">remark,</if>
-            <if test="tags != null">tags,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="companyUserIds != null">company_user_ids,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="descs != null">#{descs},</if>
-            <if test="idCard != null">#{idCard},</if>
-            <if test="idCardFront != null">#{idCardFront},</if>
-            <if test="idCardBack != null">#{idCardBack},</if>
-            <if test="sex != null">#{sex},</if>
-            <if test="birthday != null">#{birthday},</if>
-            <if test="headImg != null">#{headImg},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="tags != null">#{tags},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="companyUserIds != null">#{companyUserIds},</if>
-         </trim>
-    </insert>
-
-    <update id="updateDoc" parameterType="Doc">
-        update doc
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="descs != null">descs = #{descs},</if>
-            <if test="idCard != null">id_card = #{idCard},</if>
-            <if test="idCardFront != null">id_card_front = #{idCardFront},</if>
-            <if test="idCardBack != null">id_card_back = #{idCardBack},</if>
-            <if test="sex != null">sex = #{sex},</if>
-            <if test="birthday != null">birthday = #{birthday},</if>
-            <if test="headImg != null">head_img = #{headImg},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="tags != null">tags = #{tags},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="companyUserIds != null">company_user_ids = #{companyUserIds},</if>
-        </trim>
-        where doc_id = #{docId}
-    </update>
-
-    <delete id="deleteDocById" parameterType="Long">
-        delete from doc where doc_id = #{docId}
-    </delete>
-
-    <delete id="deleteDocByIds" parameterType="String">
-        delete from doc where doc_id in 
-        <foreach item="docId" collection="array" open="(" separator="," close=")">
-            #{docId}
-        </foreach>
-    </delete>
-    
-</mapper>

+ 0 - 116
fs-service-system/src/main/resources/mapper/doc/DocOrderMapper.xml

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fs.doc.mapper.DocOrderMapper">
-    
-    <resultMap type="DocOrder" id="DocOrderResult">
-        <result property="orderId"    column="order_id"    />
-        <result property="orderCode"    column="order_code"    />
-        <result property="title"    column="title"    />
-        <result property="images"    column="images"    />
-        <result property="userId"    column="user_id"    />
-        <result property="docId"    column="doc_id"    />
-        <result property="orderType"    column="order_type"    />
-        <result property="status"    column="status"    />
-        <result property="money"    column="money"    />
-        <result property="payMoney"    column="pay_money"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="finishTime"    column="finish_time"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="companyUserId"    column="company_user_id"    />
-    </resultMap>
-
-    <sql id="selectDocOrderVo">
-        select order_id, order_code, title, images, user_id, doc_id, order_type, status, money, pay_money, create_time, finish_time, company_id, company_user_id from doc_order
-    </sql>
-
-    <select id="selectDocOrderList" parameterType="DocOrder" resultMap="DocOrderResult">
-        <include refid="selectDocOrderVo"/>
-        <where>  
-            <if test="orderCode != null  and orderCode != ''"> and order_code = #{orderCode}</if>
-            <if test="title != null  and title != ''"> and title = #{title}</if>
-            <if test="images != null  and images != ''"> and images = #{images}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="docId != null "> and doc_id = #{docId}</if>
-            <if test="orderType != null "> and order_type = #{orderType}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="money != null "> and money = #{money}</if>
-            <if test="payMoney != null "> and pay_money = #{payMoney}</if>
-            <if test="finishTime != null "> and finish_time = #{finishTime}</if>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
-        </where>
-    </select>
-    
-    <select id="selectDocOrderById" parameterType="Long" resultMap="DocOrderResult">
-        <include refid="selectDocOrderVo"/>
-        where order_id = #{orderId}
-    </select>
-        
-    <insert id="insertDocOrder" parameterType="DocOrder" useGeneratedKeys="true" keyProperty="orderId">
-        insert into doc_order
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="orderCode != null">order_code,</if>
-            <if test="title != null">title,</if>
-            <if test="images != null">images,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="docId != null">doc_id,</if>
-            <if test="orderType != null">order_type,</if>
-            <if test="status != null">status,</if>
-            <if test="money != null">money,</if>
-            <if test="payMoney != null">pay_money,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="companyId != null">company_id,</if>
-            <if test="companyUserId != null">company_user_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="orderCode != null">#{orderCode},</if>
-            <if test="title != null">#{title},</if>
-            <if test="images != null">#{images},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="docId != null">#{docId},</if>
-            <if test="orderType != null">#{orderType},</if>
-            <if test="status != null">#{status},</if>
-            <if test="money != null">#{money},</if>
-            <if test="payMoney != null">#{payMoney},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="companyId != null">#{companyId},</if>
-            <if test="companyUserId != null">#{companyUserId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateDocOrder" parameterType="DocOrder">
-        update doc_order
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderCode != null">order_code = #{orderCode},</if>
-            <if test="title != null">title = #{title},</if>
-            <if test="images != null">images = #{images},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="docId != null">doc_id = #{docId},</if>
-            <if test="orderType != null">order_type = #{orderType},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="money != null">money = #{money},</if>
-            <if test="payMoney != null">pay_money = #{payMoney},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="companyId != null">company_id = #{companyId},</if>
-            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
-        </trim>
-        where order_id = #{orderId}
-    </update>
-
-    <delete id="deleteDocOrderById" parameterType="Long">
-        delete from doc_order where order_id = #{orderId}
-    </delete>
-
-    <delete id="deleteDocOrderByIds" parameterType="String">
-        delete from doc_order where order_id in 
-        <foreach item="orderId" collection="array" open="(" separator="," close=")">
-            #{orderId}
-        </foreach>
-    </delete>
-    
-</mapper>

+ 0 - 86
fs-service-system/src/main/resources/mapper/doc/DocOrderReplyMapper.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fs.doc.mapper.DocOrderReplyMapper">
-    
-    <resultMap type="DocOrderReply" id="DocOrderReplyResult">
-        <result property="replyId"    column="reply_id"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="content"    column="content"    />
-        <result property="images"    column="images"    />
-        <result property="video"    column="video"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="companyUserId"    column="company_user_id"    />
-        <result property="createTime"    column="create_time"    />
-    </resultMap>
-
-    <sql id="selectDocOrderReplyVo">
-        select reply_id, order_id, content, images, video, company_id, company_user_id, create_time from doc_order_reply
-    </sql>
-
-    <select id="selectDocOrderReplyList" parameterType="DocOrderReply" resultMap="DocOrderReplyResult">
-        <include refid="selectDocOrderReplyVo"/>
-        <where>  
-            <if test="orderId != null "> and order_id = #{orderId}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="images != null  and images != ''"> and images = #{images}</if>
-            <if test="video != null  and video != ''"> and video = #{video}</if>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
-        </where>
-    </select>
-    
-    <select id="selectDocOrderReplyById" parameterType="Long" resultMap="DocOrderReplyResult">
-        <include refid="selectDocOrderReplyVo"/>
-        where reply_id = #{replyId}
-    </select>
-        
-    <insert id="insertDocOrderReply" parameterType="DocOrderReply" useGeneratedKeys="true" keyProperty="replyId">
-        insert into doc_order_reply
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="orderId != null">order_id,</if>
-            <if test="content != null">content,</if>
-            <if test="images != null">images,</if>
-            <if test="video != null">video,</if>
-            <if test="companyId != null">company_id,</if>
-            <if test="companyUserId != null">company_user_id,</if>
-            <if test="createTime != null">create_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="orderId != null">#{orderId},</if>
-            <if test="content != null">#{content},</if>
-            <if test="images != null">#{images},</if>
-            <if test="video != null">#{video},</if>
-            <if test="companyId != null">#{companyId},</if>
-            <if test="companyUserId != null">#{companyUserId},</if>
-            <if test="createTime != null">#{createTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateDocOrderReply" parameterType="DocOrderReply">
-        update doc_order_reply
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="content != null">content = #{content},</if>
-            <if test="images != null">images = #{images},</if>
-            <if test="video != null">video = #{video},</if>
-            <if test="companyId != null">company_id = #{companyId},</if>
-            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-        </trim>
-        where reply_id = #{replyId}
-    </update>
-
-    <delete id="deleteDocOrderReplyById" parameterType="Long">
-        delete from doc_order_reply where reply_id = #{replyId}
-    </delete>
-
-    <delete id="deleteDocOrderReplyByIds" parameterType="String">
-        delete from doc_order_reply where reply_id in 
-        <foreach item="replyId" collection="array" open="(" separator="," close=")">
-            #{replyId}
-        </foreach>
-    </delete>
-    
-</mapper>

+ 0 - 107
fs-service-system/src/main/resources/mapper/doc/DocRecordMapper.xml

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fs.doc.mapper.DocRecordMapper">
-    
-    <resultMap type="DocRecord" id="DocRecordResult">
-        <result property="recordId"    column="record_id"    />
-        <result property="docId"    column="doc_id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="recordType"    column="record_type"    />
-        <result property="title"    column="title"    />
-        <result property="content"    column="content"    />
-        <result property="images"    column="images"    />
-        <result property="jsonInfo"    column="json_info"    />
-        <result property="remark"    column="remark"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="companyUserId"    column="company_user_id"    />
-    </resultMap>
-
-    <sql id="selectDocRecordVo">
-        select record_id, doc_id,user_id, record_type, title, content,images, json_info, remark, create_time, update_time, company_id, company_user_id from doc_record
-    </sql>
-
-    <select id="selectDocRecordList" parameterType="DocRecord" resultMap="DocRecordResult">
-        <include refid="selectDocRecordVo"/>
-        <where>  
-            <if test="docId != null "> and doc_id = #{docId}</if>
-            <if test="recordType != null "> and record_type = #{recordType}</if>
-            <if test="title != null  and title != ''"> and title = #{title}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="jsonInfo != null  and jsonInfo != ''"> and json_info = #{jsonInfo}</if>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
-        </where>
-    </select>
-    
-    <select id="selectDocRecordById" parameterType="Long" resultMap="DocRecordResult">
-        <include refid="selectDocRecordVo"/>
-        where record_id = #{recordId}
-    </select>
-        
-    <insert id="insertDocRecord" parameterType="DocRecord" useGeneratedKeys="true" keyProperty="recordId">
-        insert into doc_record
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="docId != null">doc_id,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="recordType != null">record_type,</if>
-            <if test="title != null">title,</if>
-            <if test="content != null">content,</if>
-            <if test="images != null">images,</if>
-            <if test="jsonInfo != null">json_info,</if>
-            <if test="remark != null">remark,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="companyId != null">company_id,</if>
-            <if test="companyUserId != null">company_user_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="docId != null">#{docId},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="recordType != null">#{recordType},</if>
-            <if test="title != null">#{title},</if>
-            <if test="content != null">#{content},</if>
-            <if test="images != null">#{images},</if>
-            <if test="jsonInfo != null">#{jsonInfo},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="companyId != null">#{companyId},</if>
-            <if test="companyUserId != null">#{companyUserId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateDocRecord" parameterType="DocRecord">
-        update doc_record
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="docId != null">doc_id = #{docId},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="recordType != null">record_type = #{recordType},</if>
-            <if test="title != null">title = #{title},</if>
-            <if test="content != null">content = #{content},</if>
-            <if test="images != null">images = #{images},</if>
-            <if test="jsonInfo != null">json_info = #{jsonInfo},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="companyId != null">company_id = #{companyId},</if>
-            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
-        </trim>
-        where record_id = #{recordId}
-    </update>
-
-    <delete id="deleteDocRecordById" parameterType="Long">
-        delete from doc_record where record_id = #{recordId}
-    </delete>
-
-    <delete id="deleteDocRecordByIds" parameterType="String">
-        delete from doc_record where record_id in 
-        <foreach item="recordId" collection="array" open="(" separator="," close=")">
-            #{recordId}
-        </foreach>
-    </delete>
-    
-</mapper>

+ 0 - 90
fs-service-system/src/main/resources/mapper/doc/DocRecordReplyMapper.xml

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fs.doc.mapper.DocRecordReplyMapper">
-    
-    <resultMap type="DocRecordReply" id="DocRecordReplyResult">
-        <result property="replyId"    column="reply_id"    />
-        <result property="recordId"    column="record_id"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="companyUserId"    column="company_user_id"    />
-        <result property="content"    column="content"    />
-        <result property="images"    column="images"    />
-        <result property="videos"    column="videos"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="productIds"    column="product_ids"    />
-    </resultMap>
-
-    <sql id="selectDocRecordReplyVo">
-        select reply_id, record_id, company_id, company_user_id, content, images, videos, create_time,product_ids from doc_record_reply
-    </sql>
-
-    <select id="selectDocRecordReplyList" parameterType="DocRecordReply" resultMap="DocRecordReplyResult">
-        <include refid="selectDocRecordReplyVo"/>
-        <where>  
-            <if test="recordId != null "> and record_id = #{recordId}</if>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="images != null  and images != ''"> and images = #{images}</if>
-            <if test="videos != null  and videos != ''"> and videos = #{videos}</if>
-        </where>
-    </select>
-    
-    <select id="selectDocRecordReplyById" parameterType="Long" resultMap="DocRecordReplyResult">
-        <include refid="selectDocRecordReplyVo"/>
-        where reply_id = #{replyId}
-    </select>
-        
-    <insert id="insertDocRecordReply" parameterType="DocRecordReply" useGeneratedKeys="true" keyProperty="replyId">
-        insert into doc_record_reply
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="recordId != null">record_id,</if>
-            <if test="companyId != null">company_id,</if>
-            <if test="companyUserId != null">company_user_id,</if>
-            <if test="content != null">content,</if>
-            <if test="images != null">images,</if>
-            <if test="videos != null">videos,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="productIds != null">product_ids,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="recordId != null">#{recordId},</if>
-            <if test="companyId != null">#{companyId},</if>
-            <if test="companyUserId != null">#{companyUserId},</if>
-            <if test="content != null">#{content},</if>
-            <if test="images != null">#{images},</if>
-            <if test="videos != null">#{videos},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="productIds != null">#{productIds},</if>
-         </trim>
-    </insert>
-
-    <update id="updateDocRecordReply" parameterType="DocRecordReply">
-        update doc_record_reply
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="recordId != null">record_id = #{recordId},</if>
-            <if test="companyId != null">company_id = #{companyId},</if>
-            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
-            <if test="content != null">content = #{content},</if>
-            <if test="images != null">images = #{images},</if>
-            <if test="videos != null">videos = #{videos},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="productIds != null">product_ids = #{productIds},</if>
-        </trim>
-        where reply_id = #{replyId}
-    </update>
-
-    <delete id="deleteDocRecordReplyById" parameterType="Long">
-        delete from doc_record_reply where reply_id = #{replyId}
-    </delete>
-
-    <delete id="deleteDocRecordReplyByIds" parameterType="String">
-        delete from doc_record_reply where reply_id in 
-        <foreach item="replyId" collection="array" open="(" separator="," close=")">
-            #{replyId}
-        </foreach>
-    </delete>
-    
-</mapper>