Просмотр исходного кода

[招商]adjust

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
5b3e8486bb
9 измененных файлов: 19 добавлений и 18 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java
  2. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java
  3. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java
  4. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java
  5. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java
  6. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java
  7. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java
  8. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java
  9. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java

+ 1
- 1
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


+ 2
- 2
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;


+ 2
- 2
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


+ 2
- 2
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;


+ 2
- 2
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;


+ 3
- 3
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));
}



+ 2
- 2
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;


+ 2
- 1
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;
}

/**


+ 3
- 3
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;
/**


Загрузка…
Отмена
Сохранить