修改客户跟进

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmFileRest.java

@@ -0,0 +1,35 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.oms.biz.func.crmfile.CommonAppendixSelectQuery;
+import com.yxt.oms.biz.func.crmfile.CommonAppendixVo;
+import com.yxt.oms.biz.func.crmfile.CrmFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/29 10:08
+ */
+@Api(tags = "客户跟进记录")
+@RestController
+@RequestMapping("v1/crmfile")
+public class CrmFileRest {
+
+    @Autowired
+    private CrmFileService crmFileService;
+
+    @ApiOperation("Pc端查询附件")
+    @PostMapping("/getPcAppendix")
+    public ResultBean<List<CommonAppendixVo>> getPcAppendix(@RequestBody CommonAppendixSelectQuery query) {
+        return crmFileService.getPcAppendix(query);
+    }
+}

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmVisitRest.java

@@ -61,6 +61,7 @@ public class CrmVisitRest {
 
     @ApiOperation("Pc查看详情及修改回显")
     @GetMapping("/fetchSid/{sid}")
+    @ResponseBody
     public ResultBean<CrmVisitVo> fetchSid(@PathVariable("sid") String sid){
         return crmVisitService.fetchSid(sid);
     }
@@ -125,9 +126,9 @@ public class CrmVisitRest {
     public ResultBean update(@RequestBody CrmVisitDto dto, @PathVariable("sid") String sid){
 
         ResultBean rb = ResultBean.fireFail();
-        int i = crmVisitService.updateBySid(dto, sid);
-        if (i == 0) {
-            return rb.fail().setMsg("修改失败");
+        boolean b = crmVisitService.updateBySid(dto, sid);
+        if (!b) {
+            return rb.setMsg("修改失败");
         }
         ResultBean delFiles = crmFileFeign.deleteFiles(sid);
         if (delFiles != null) {

oms/src/main/java/com/yxt/oms/biz/func/crmfile/CommonAppendixSelectQuery.java

@@ -0,0 +1,31 @@
+package com.yxt.oms.biz.func.crmfile;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(安瑞基础信息模块) <br/>
+ * File: CommonAppendixQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.commonappendix.CommonAppendixQuery <br/>
+ * Description: 公共附件表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-10-28 08:59:25 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "公共附件表 查询条件", description = "公共附件表 查询条件")
+@Data
+public class CommonAppendixSelectQuery implements Query {
+
+	@ApiModelProperty("关联业务对象sid")
+    private String linkSid;
+
+	@ApiModelProperty("附件类型")
+    private String attachType;
+}

oms/src/main/java/com/yxt/oms/biz/func/crmfile/CommonAppendixVo.java

@@ -0,0 +1,62 @@
+package com.yxt.oms.biz.func.crmfile;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(安瑞基础信息模块) <br/>
+ * File: CommonAppendixVo.java <br/>
+ * Class: com.yxt.anrui.base.api.commonappendix.CommonAppendixVo <br/>
+ * Description: 公共附件表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-10-28 08:59:25 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "公共附件表 视图数据对象", description = "公共附件表 视图数据对象")
+@Data
+public class CommonAppendixVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("上传人姓名")
+    private String name;
+
+    @ApiModelProperty("文件名")
+    private String fileName;
+
+    @ApiModelProperty("文件类型")
+    private String fileType;
+
+    @ApiModelProperty("关联业务对象sid")
+    private String linkSid;
+
+    @ApiModelProperty("附件类型")
+    private String attachType;
+
+    @ApiModelProperty("文件大小")
+    private String fileSize;
+
+    @ApiModelProperty("文件的路径")
+    private String filePath;
+
+    @ApiModelProperty("文件的路径")
+    private String fileUrl;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("上传人sid")
+    private String createBySid;
+
+    @ApiModelProperty("上传时间")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private String createTime;
+}

oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.crmfile;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.feign.customer.crmfile.CrmFileFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户信息) <br/>
+ * File: CrmFileService.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmfile.CrmFileService <br/>
+ * Description: 客户资料表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-01-24 09:15:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class CrmFileService  {
+
+
+    @Autowired
+    private CrmFileFeign crmFileFeign;
+
+
+    public ResultBean<List<CommonAppendixVo>> getPcAppendix(CommonAppendixSelectQuery query) {
+        return crmFileFeign.getPcAppendix(query);
+    }
+}

oms/src/main/java/com/yxt/oms/biz/func/crmvisit/CrmVisitService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -92,19 +93,27 @@ public class CrmVisitService {
         String staffSid = pagerQuery.getParams().getStaffSid();
         ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.selectByStaffsid(staffSid);
         String name = sysUserVoResultBean.getData().getName();
-        IPage<CrmVisitVo> page = crmVisitFeign.pageList(pagerQuery);
-        PagerVo<CrmVisitVo> pv = new PagerVo<>();
-        PagerVo<CrmVisitVo> pv1 = PagerUtil.pageToVo(page, pv);
-        List<CrmVisitVo> list = pv1.getRecords();
-        for (CrmVisitVo crmVisitVo : list) {
-            crmVisitVo.setStaffName(name);
+        ResultBean <PagerVo<CrmVisitVo>> resultBean = crmVisitFeign.pageList(pagerQuery);
+        if (resultBean.getSuccess()) {
+            PagerVo<CrmVisitVo> data = resultBean.getData();
+            List<CrmVisitVo> records = data.getRecords();
+            if (!records.isEmpty()) {
+                for (CrmVisitVo record : records) {
+                    if (StringUtils.isNotBlank(name)) {
+                        record.setStaffName(name);
+                    }
+                }
+                data.setRecords(records);
+            }
+            return rb.success().setData(data);
         }
-        return rb.success().setData(pv1);
+        return rb.success();
 
     }
 
     public ResultBean<CrmVisitVo> fetchSid(String sid) {
-        return crmVisitFeign.fetchSid(sid);
+        ResultBean<CrmVisitVo> crmVisitVoResultBean = crmVisitFeign.fetchSid(sid);
+        return crmVisitVoResultBean;
     }
 
     public boolean save(CrmVisit entity) {
@@ -112,7 +121,7 @@ public class CrmVisitService {
     }
 
 
-    public int updateBySid(CrmVisitDto dto, String sid) {
+    public boolean updateBySid(CrmVisitDto dto, String sid) {
         return crmVisitFeign.update(dto,sid);
     }
 

oms/src/main/java/com/yxt/oms/biz/func/crmvisit/CrmVisitVo.java

@@ -4,7 +4,9 @@ package com.yxt.oms.biz.func.crmvisit;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * Project: anrui-crm(客户管理) <br/>

oms/src/main/java/com/yxt/oms/feign/customer/crmfile/CrmFileFeign.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.oms.biz.func.crmfile.CommonAppendixSelectQuery;
+import com.yxt.oms.biz.func.crmfile.CommonAppendixVo;
 import com.yxt.oms.biz.func.crmfile.CommonAttachTypeEnum;
 import com.yxt.oms.biz.func.crmfile.PcCommonAppendixDto;
 import com.yxt.oms.biz.func.crmvisit.CrmVisit;
@@ -49,6 +51,8 @@ public interface CrmFileFeign {
     @PostMapping("/deleteFiles")
     ResultBean deleteFiles(@RequestParam(value = "linkSid") String linkSid);
 
-
+    @ApiOperation("Pc端查询附件")
+    @PostMapping("/getPcAppendix")
+    public ResultBean<List<CommonAppendixVo>> getPcAppendix(@RequestBody CommonAppendixSelectQuery query);
 
 }

oms/src/main/java/com/yxt/oms/feign/customer/crmvisit/CrmVisitFeign.java

@@ -48,17 +48,18 @@ public interface CrmVisitFeign {
      */
     @ApiOperation("客户跟进记录分页列表")
     @PostMapping("/pageList")
-    public IPage<CrmVisitVo> pageList(PagerQuery<CrmVisitQuery> pagerQuery);
+    public ResultBean<PagerVo<CrmVisitVo>> pageList(@RequestBody PagerQuery<CrmVisitQuery> pagerQuery);
 
 
     @ApiOperation("Pc查看详情及修改回显")
     @GetMapping("/fetchSid/{sid}")
+    @ResponseBody
     public ResultBean<CrmVisitVo> fetchSid(@PathVariable("sid") String sid);
 
 
     @ApiOperation("修改")
-    @PostMapping("/update")
-    public int update(@RequestBody CrmVisitDto dto, @PathVariable("sid") String sid);
+    @PostMapping("/update/{sid}")
+    public boolean update(@RequestBody CrmVisitDto dto, @PathVariable("sid") String sid);
 
     @ApiOperation("删除记录")
     @DeleteMapping("/del")