Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java

@@ -96,7 +96,7 @@ public class BusinessFileController extends BaseController {
 
             // 上传并返回文件全路径
             String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+//            String url = serverConfig.getUrl() + fileName;
             AjaxResult ajax = AjaxResult.success();
             ajax.put("url", fileName);
             return ajax;

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/BusinessOpportunityRadarController.java

@@ -133,10 +133,6 @@ public class BusinessOpportunityRadarController {
      */
     @RequestMapping("/bidSourceList")
     public AjaxResult bidSourceList(@RequestBody JSONObject object) {
-        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
-        if (PageQueryLimit.pageLimit(compose.getPage())){
-            return AjaxResult.error("翻页已达到上限");
-        }
         return opportunityRadarService.bidSourceList(object);
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java

 package com.dsk.web.controller.search.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
@@ -46,14 +47,11 @@ public class CompanySearchController {
      * 完全匹配企业名称
      */
     @PostMapping("/page")
-    public AjaxResult page(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult page(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        compose.getPage().setPage(compose.getPageNum());
-        compose.getPage().setLimit(compose.getPageSize());
-        compose.getPage().setField(compose.getField());
-        compose.getPage().setOrder(compose.getOrder());
-        return opportunityRadarService.enterprisePage(compose);
+        return opportunityRadarService.enterprisePage(object);
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -26,7 +26,7 @@ public interface BusinessOpportunityRadarService {
 
     AjaxResult enterpriseByName(String keyword);
 
-    AjaxResult enterprisePage(ComposeQueryDto compose);
+    AjaxResult enterprisePage(JSONObject object);
 
     AjaxResult bondProjectPage( JSONObject object);
 

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -63,8 +63,8 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
     }
 
     @Override
-    public AjaxResult enterprisePage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult enterprisePage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

dsk-system/src/main/java/com/dsk/system/domain/customer/vo/CustomerFollowRecordListVo.java

@@ -2,6 +2,7 @@ package com.dsk.system.domain.customer.vo;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -57,6 +58,7 @@ public class CustomerFollowRecordListVo implements Serializable {
     private String content;
 
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessContactsServiceImpl.java

@@ -65,7 +65,7 @@ public class BusinessContactsServiceImpl implements IBusinessContactsService
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (ObjectUtil.isEmpty(loginUser)) throw new BaseException("请登录");
         //维护人员为当前登录用户
-        businessContacts.setAccendant(loginUser.getUsername());
+        businessContacts.setAccendant(loginUser.getUser().getNickName());
         return businessContactsMapper.insertBusinessContacts(businessContacts);
     }
 

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -148,7 +148,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
             row++;
             if (count > 0) {
                 //如果存在，跳过该项目，不保存
-                result.add("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
+//                result.add("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
+                log.info("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
                 errorCount++;
             } else {
                 //保存到数据库