diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java index b86b1ee3a..d8625c4a6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java @@ -18,7 +18,7 @@ import java.util.List; @Slf4j @RestController @RequestMapping("invest") -@Api(tags = "招商管理接口") +@Api(tags = "招商模块-其它接口") public class InvestController extends InvestBaseController { @Autowired diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java index f68be2d05..77b1449c8 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** - * 客户管理 + * 招商模块-客户管理 * * @author * @email @@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; @Slf4j @RestController @RequestMapping("invest/customer") -@Api(tags = "客户管理") +@Api(tags = "招商模块-客户管理") public class InvestCustomerController extends InvestBaseController{ @Autowired private InvestCustomerService investCustomerService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java index 6ad2b4e7e..5adcb70de 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java @@ -19,7 +19,7 @@ import java.util.Arrays; /** - * 需求管理 + * 招商模块-客户需求 * * @author * @email @@ -28,7 +28,7 @@ import java.util.Arrays; @Slf4j @RestController @RequestMapping("invest/demand") -@Api(tags = "需求管理") +@Api(tags = "招商模块-客户需求") public class InvestDemandController extends InvestBaseController { @Autowired diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java index 3952d8458..23616a211 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java @@ -17,7 +17,7 @@ import java.util.Arrays; /** - * 跟踪管理 + * 招商模块-跟踪记录 * * @author * @email @@ -26,7 +26,7 @@ import java.util.Arrays; @Slf4j @RestController @RequestMapping("invest/followrecord") -@Api(tags = "跟踪管理") +@Api(tags = "招商模块-跟踪记录") public class InvestFollowRecordController extends InvestBaseController { @Autowired private InvestFollowRecordService investFollowRecordService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java index c2f1673f0..573b8ac99 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java @@ -16,7 +16,7 @@ import java.util.Arrays; /** - * 操作记录 + * 招商模块-操作记录 * * @author * @email @@ -25,7 +25,7 @@ import java.util.Arrays; @Slf4j @RestController @RequestMapping("invest/operaterecord") -@Api(tags = "操作记录") +@Api(tags = "招商模块-操作记录") public class InvestOperateRecordController extends InvestBaseController { @Autowired private InvestOperateRecordService investOperateRecordService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java index b379b31d5..ddaf3eced 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java @@ -18,7 +18,7 @@ import java.util.Arrays; /** - * 招商提醒 + * 招商模块-预约提醒 * * @author * @email @@ -27,7 +27,7 @@ import java.util.Arrays; @Slf4j @RestController @RequestMapping("invest/remind") -@Api(tags = "招商提醒") +@Api(tags = "招商模块-预约提醒") public class InvestRemindController extends InvestBaseController { @Autowired private InvestRemindService investRemindService; @@ -55,7 +55,7 @@ public class InvestRemindController extends InvestBaseController { */ @RequiresPermissions("investFollowRecordEdit") @PostMapping("/save") - public InvestResultData save(@RequestBody InvestRemindEntity investRemind) { + public InvestResultData save(@RequestBody InvestRemindEntity investRemind) { return execute(investRemind, p -> investRemindService.save(p)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java index 291403a43..8eeb765a4 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java @@ -19,7 +19,7 @@ import java.util.Arrays; /** - * 招商任务 + * 招商模块-招商任务 * * @author * @email @@ -28,7 +28,7 @@ import java.util.Arrays; @Slf4j @RestController @RequestMapping("invest/task") -@Api(tags = "招商任务") +@Api(tags = "招商模块-招商任务") public class InvestTaskController extends InvestBaseController { @Autowired private InvestTaskService investTaskService; diff --git a/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java index 1b75a265e..a822318de 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java @@ -144,7 +144,8 @@ public class SystemLogAspect { } } //TODO 调试使用 - return String.format("%s%s",description, Arrays.asList(arguments)); + //return String.format("%s%s",description, Arrays.asList(arguments)); + return description; } /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java index 31dd7f8d8..916be03c8 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java @@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode; public class InvestRemindEntity extends InvestBaseEntity { /** - * 提醒用户 + * 提醒用户InvestRemindEntity */ @io.swagger.annotations.ApiModelProperty(value = "提醒用户", name = "owner") private Long owner; @@ -31,8 +31,8 @@ public class InvestRemindEntity extends InvestBaseEntity { @io.swagger.annotations.ApiModelProperty(value = "提醒内容", name = "content",example = "\"" + "{" + "\"text\": \"今天约了王老板,要求签订框架协议\"," + - " \"customer_id\": 222222," + - " \"negotiation_type\": 2" + + " \"customerId\": 222222," + + " \"negotiationType\": 2" + "}\"") private String content; /**