valhalla / fw-valhalla

Commit de4444b90dc92e638423e4aea4dad617cb5da3b8

Authored by 张志伟
2 parents 31899b57 65697ca0

Merge remote-tracking branch 'origin/dev' into test

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/StammkundePoolQueryVO.java
  View file @de4444b
@@ -78,7 +78,7 @@ public class StammkundePoolQueryVO extends PoolQuery { @@ -78,7 +78,7 @@ public class StammkundePoolQueryVO extends PoolQuery {
78 return defeated ? 1 : 0; 78 return defeated ? 1 : 0;
79 } 79 }
80 80
81 - public Date getActivationTime1() { 81 + public Date getActivationTime() {
82 if (StringUtils.isNotBlank(activationTime) && NumberUtils.isDigits(activationTime)) { 82 if (StringUtils.isNotBlank(activationTime) && NumberUtils.isDigits(activationTime)) {
83 LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(activationTime)).atZone(ZoneId.systemDefault()).toLocalDateTime(); 83 LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(activationTime)).atZone(ZoneId.systemDefault()).toLocalDateTime();
84 return DateUtil.getEndInTime(DateUtil.localDateTime2Date(localDateTime)); 84 return DateUtil.getEndInTime(DateUtil.localDateTime2Date(localDateTime));
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/app/PoolController.java
  View file @de4444b
@@ -107,7 +107,7 @@ public class PoolController { @@ -107,7 +107,7 @@ public class PoolController {
107 107
108 @GetMapping("/stammkunde/own/list") 108 @GetMapping("/stammkunde/own/list")
109 public Message<AppPage<StammkundePoolVO>> ownStammkundeList(@CurrentUser LoginAuthBean currentUser, final StammkundePoolQueryVO queryVO) { 109 public Message<AppPage<StammkundePoolVO>> ownStammkundeList(@CurrentUser LoginAuthBean currentUser, final StammkundePoolQueryVO queryVO) {
110 - final String msg = "查询自己的保有客池列表[pool/public/list]"; 110 + final String msg = "查询自己的保有客池列表[pool/stammkunde/own/list]";
111 try { 111 try {
112 log.info("{}: param[{}]", msg, queryVO); 112 log.info("{}: param[{}]", msg, queryVO);
113 AppPage<StammkundePoolVO> page = poolBizService.stammkundeList(currentUser, queryVO); 113 AppPage<StammkundePoolVO> page = poolBizService.stammkundeList(currentUser, queryVO);
@@ -121,7 +121,7 @@ public class PoolController { @@ -121,7 +121,7 @@ public class PoolController {
121 @GetMapping("/stammkunde/list") 121 @GetMapping("/stammkunde/list")
122 @IgnoreAuth 122 @IgnoreAuth
123 public Message<AppPage<StammkundePoolVO>> stammkundeList(@CurrentUser LoginAuthBean currentUser, final StammkundePoolQueryVO queryVO) { 123 public Message<AppPage<StammkundePoolVO>> stammkundeList(@CurrentUser LoginAuthBean currentUser, final StammkundePoolQueryVO queryVO) {
124 - final String msg = "查询保有客池列表[pool/public/list]"; 124 + final String msg = "查询保有客池列表[pool/stammkunde/list]";
125 try { 125 try {
126 log.info("{}: param[{}]", msg, queryVO); 126 log.info("{}: param[{}]", msg, queryVO);
127 queryVO.setGroupId(currentUser.getGroupId()); 127 queryVO.setGroupId(currentUser.getGroupId());
@@ -136,7 +136,7 @@ public class PoolController { @@ -136,7 +136,7 @@ public class PoolController {
136 @GetMapping("/clue/list") 136 @GetMapping("/clue/list")
137 @IgnoreAuth 137 @IgnoreAuth
138 public Message<AppPage<CustomerCluePoolVO>> clueList(@CurrentUser LoginAuthBean currentUser, final CustomerCluePoolQueryVO queryVO) { 138 public Message<AppPage<CustomerCluePoolVO>> clueList(@CurrentUser LoginAuthBean currentUser, final CustomerCluePoolQueryVO queryVO) {
139 - final String msg = "查询客户线索池列表[pool/public/list]"; 139 + final String msg = "查询客户线索池列表[pool/clue/list]";
140 try { 140 try {
141 log.info("{}: param[{}]", msg, queryVO); 141 log.info("{}: param[{}]", msg, queryVO);
142 queryVO.setGroupId(currentUser.getGroupId()); 142 queryVO.setGroupId(currentUser.getGroupId());