费用/商标

src/main/java/com/izouma/uwip/domain/Fee.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
+import javax.persistence.Transient;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
@@ -84,4 +85,13 @@ public class Fee extends BaseEntity {
     private String invoiceRemark;
 
     private Long userId;
+
+    @Transient
+    private String patentPartner;
+
+    @Transient
+    private String payPartner;
+
+    @Transient
+    private String currency;
 }

src/main/java/com/izouma/uwip/domain/LogoPatent.java

@@ -104,4 +104,7 @@ public class LogoPatent extends BaseEntity {
     @Transient
     private String supplierPartner;
 
+    @Transient
+    @ApiModelProperty(value = "操作")
+    private String operate;
 }

src/main/java/com/izouma/uwip/web/FeeController.java

@@ -1,5 +1,10 @@
 package com.izouma.uwip.web;
+
 import com.izouma.uwip.domain.Fee;
+import com.izouma.uwip.domain.Maintenance;
+import com.izouma.uwip.domain.Partner;
+import com.izouma.uwip.repo.MaintenanceRepo;
+import com.izouma.uwip.repo.PartnerRepo;
 import com.izouma.uwip.service.FeeService;
 import com.izouma.uwip.dto.PageQuery;
 import com.izouma.uwip.exception.BusinessException;
@@ -14,13 +19,17 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/fee")
 @AllArgsConstructor
 public class FeeController extends BaseController {
-    private FeeService feeService;
-    private FeeRepo feeRepo;
+    private final FeeService      feeService;
+    private final FeeRepo         feeRepo;
+    private final PartnerRepo     partnerRepo;
+    private final MaintenanceRepo maintenanceRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -37,7 +46,20 @@ public class FeeController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
     public Page<Fee> all(@RequestBody PageQuery pageQuery) {
-        return feeService.all(pageQuery);
+        pageQuery.setSort("createdAt,desc");
+        List<Partner> partners = partnerRepo.findAll();
+        Map<Long, String> partnerMap = partners
+                .stream()
+                .collect(Collectors.toMap(Partner::getId, Partner::getName));
+        Map<Long, String> currency = maintenanceRepo.findAllByFlag("currency")
+                .stream()
+                .collect(Collectors.toMap(Maintenance::getId, Maintenance::getName));
+        return feeService.all(pageQuery).map(fee -> {
+            fee.setPatentPartner(partnerMap.get(fee.getPatentPartnerId()));
+            fee.setPayPartner(partnerMap.get(fee.getPayPartnerId()));
+            fee.setCurrency(currency.get(fee.getCurrencyMaintenanceId()));
+            return fee;
+        });
     }
 
     @GetMapping("/get/{id}")

src/main/java/com/izouma/uwip/web/LogoPatentController.java

@@ -1,8 +1,12 @@
 package com.izouma.uwip.web;
 
+import cn.hutool.core.collection.CollUtil;
+import com.izouma.uwip.domain.Handle;
 import com.izouma.uwip.domain.LogoPatent;
 import com.izouma.uwip.domain.Partner;
+import com.izouma.uwip.domain.User;
 import com.izouma.uwip.repo.PartnerRepo;
+import com.izouma.uwip.repo.UserRepo;
 import com.izouma.uwip.service.LogoPatentService;
 import com.izouma.uwip.dto.PageQuery;
 import com.izouma.uwip.exception.BusinessException;
@@ -27,6 +31,7 @@ public class LogoPatentController extends BaseController {
     private LogoPatentService logoPatentService;
     private LogoPatentRepo    logoPatentRepo;
     private PartnerRepo       partnerRepo;
+    private UserRepo          userRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -44,9 +49,22 @@ public class LogoPatentController extends BaseController {
         Map<Long, String> partnerMap = partners
                 .stream()
                 .collect(Collectors.toMap(Partner::getId, Partner::getName));
+        Map<Long, String> userMap = userRepo.findAll()
+                .stream()
+                .collect(Collectors.toMap(User::getId, User::getNickname));
         return logoPatentService.all(pageQuery).map(logoPatent -> {
             logoPatent.setClientPartner(partnerMap.get(logoPatent.getClientPartnerId()));
             logoPatent.setSupplierPartner(partnerMap.get(logoPatent.getSupplierPartnerId()));
+            logoPatent.setOperate(userMap.get(logoPatent.getUserId()));
+
+            List<Handle> handles = logoPatent.getHandle()
+                    .stream()
+                    .filter(handle -> handle.getLogoWorkflow().equals(logoPatent.getLogoWorkflow()))
+                    .limit(1)
+                    .collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(handles)) {
+                logoPatent.setOperate(userMap.get(handles.get(0).getUserId()));
+            }
             return logoPatent;
         });
     }

src/test/java/com/izouma/uwip/web/LogoPatentControllerTest.java

@@ -13,6 +13,6 @@ public class LogoPatentControllerTest extends ApplicationTests {
 
     @Test
     public void all() {
-        logoPatentController.all(new PageQuery());
+        logoPatentController.all(new PageQuery()).getContent().forEach(System.out::println);
     }
 }