楚江ERP:客户资信变更记录列表

@@ -28,6 +28,12 @@ public class GetCustomerCreditHistoryBo extends BaseBo<CustomerCreditHistory> {
     private String id;
     private String id;
 
 
     /**
     /**
+     * 标题（非持久化字段）
+     */
+    @ApiModelProperty("title")
+    private String title;
+
+    /**
      * 客户资信ID
      * 客户资信ID
      */
      */
     @ApiModelProperty("客户资信ID")
     @ApiModelProperty("客户资信ID")

@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
 @Api(tags = "核心人员历史记录表")
 @Api(tags = "核心人员历史记录表")
 @Validated
 @Validated
 @RestController
 @RestController
-@RequestMapping("/personnelHistory/corepersonnelhistory")
+@RequestMapping("/personnelHistory")
 public class CorePersonnelHistoryController extends DefaultBaseController {
 public class CorePersonnelHistoryController extends DefaultBaseController {
 
 
     @Autowired
     @Autowired

@@ -23,6 +23,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.validation.Valid;
 import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -33,7 +35,7 @@ import java.util.stream.Collectors;
 @Api(tags = "客户资信历史记录表")
 @Api(tags = "客户资信历史记录表")
 @Validated
 @Validated
 @RestController
 @RestController
-@RequestMapping("/customerCreditHistory/customercredithistory")
+@RequestMapping("/customerCreditHistory")
 public class CustomerCreditHistoryController extends DefaultBaseController {
 public class CustomerCreditHistoryController extends DefaultBaseController {
 
 
     @Autowired
     @Autowired
@@ -60,6 +62,35 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
     }
     }
 
 
     /**
     /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"customerCreditHistory:customercredithistory:query"})
+    @GetMapping("/customerCreditHistoryList")
+    public InvokeResult<List<GetCustomerCreditHistoryBo>> customerCreditHistoryList(@Valid QueryCustomerCreditHistoryVo vo) {
+
+        List<CustomerCreditHistory> query = customerCreditHistoryService.query(vo);
+
+        List<GetCustomerCreditHistoryBo> results = null;
+
+        if (!CollectionUtil.isEmpty(query)) {
+            results = query.stream().map(GetCustomerCreditHistoryBo::new).collect(Collectors.toList());
+        }
+        if (!CollectionUtil.isEmpty(results)) {
+            for (GetCustomerCreditHistoryBo bo : results) {
+                String sort = bo.getSort();
+                LocalDateTime createTime = bo.getCreateTime();
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                String newDate = createTime.format(formatter);
+                String title = "第" + sort + "次变更,变更时间：" + newDate;
+                bo.setTitle(title);
+            }
+        }
+
+        return InvokeResultBuilder.success(results);
+    }
+
+    /**
      * 根据ID查询
      * 根据ID查询
      */
      */
     @ApiOperation("根据ID查询")
     @ApiOperation("根据ID查询")