diff --git a/klp-pocket/src/main/java/com/klp/pocket/acid/controller/AcidTypingController.java b/klp-pocket/src/main/java/com/klp/pocket/acid/controller/AcidTypingController.java index d11fb8fc..e9ff7797 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/acid/controller/AcidTypingController.java +++ b/klp-pocket/src/main/java/com/klp/pocket/acid/controller/AcidTypingController.java @@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RequiredArgsConstructor @RestController @RequestMapping("/pocket/acidTyping") @@ -18,9 +20,9 @@ public class AcidTypingController extends BaseController { private final IAcidTypingService acidTypingService; @GetMapping("/prefill") - public R getTypingPrefill(@RequestParam String currentCoilNo) { - AcidTypingPrefillVo vo = acidTypingService.getTypingPrefillByCurrentCoilNo(currentCoilNo); - return R.ok(vo); + public R> getTypingPrefill(@RequestParam String currentCoilNo) { + List voList = acidTypingService.getTypingPrefillByCurrentCoilNo(currentCoilNo); + return R.ok(voList); } } diff --git a/klp-pocket/src/main/java/com/klp/pocket/acid/mapper/AcidTypingMapper.java b/klp-pocket/src/main/java/com/klp/pocket/acid/mapper/AcidTypingMapper.java index a51536f2..e83ea06d 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/acid/mapper/AcidTypingMapper.java +++ b/klp-pocket/src/main/java/com/klp/pocket/acid/mapper/AcidTypingMapper.java @@ -4,9 +4,11 @@ import com.klp.pocket.acid.domain.vo.AcidTypingPrefillVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface AcidTypingMapper { - AcidTypingPrefillVo selectTypingPrefillByEncoilId(@Param("encoilId") String encoilId); + List selectTypingPrefillByEncoilId(@Param("encoilId") String encoilId); } diff --git a/klp-pocket/src/main/java/com/klp/pocket/acid/service/IAcidTypingService.java b/klp-pocket/src/main/java/com/klp/pocket/acid/service/IAcidTypingService.java index c63ab7f3..224602c4 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/acid/service/IAcidTypingService.java +++ b/klp-pocket/src/main/java/com/klp/pocket/acid/service/IAcidTypingService.java @@ -1,9 +1,12 @@ package com.klp.pocket.acid.service; import com.klp.pocket.acid.domain.vo.AcidTypingPrefillVo; +import org.w3c.dom.stylesheets.LinkStyle; + +import java.util.List; public interface IAcidTypingService { - AcidTypingPrefillVo getTypingPrefillByCurrentCoilNo(String currentCoilNo); + List getTypingPrefillByCurrentCoilNo(String currentCoilNo); } diff --git a/klp-pocket/src/main/java/com/klp/pocket/acid/service/impl/AcidTypingServiceImpl.java b/klp-pocket/src/main/java/com/klp/pocket/acid/service/impl/AcidTypingServiceImpl.java index 28813cab..37a6a2ac 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/acid/service/impl/AcidTypingServiceImpl.java +++ b/klp-pocket/src/main/java/com/klp/pocket/acid/service/impl/AcidTypingServiceImpl.java @@ -7,6 +7,8 @@ import com.klp.pocket.acid.service.IAcidTypingService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @RequiredArgsConstructor @DS("acid") @Service @@ -15,7 +17,7 @@ public class AcidTypingServiceImpl implements IAcidTypingService { private final AcidTypingMapper acidTypingMapper; @Override - public AcidTypingPrefillVo getTypingPrefillByCurrentCoilNo(String currentCoilNo) { + public List getTypingPrefillByCurrentCoilNo(String currentCoilNo) { return acidTypingMapper.selectTypingPrefillByEncoilId(currentCoilNo); } } diff --git a/klp-pocket/src/main/resources/mapper/pocket/AcidTypingMapper.xml b/klp-pocket/src/main/resources/mapper/pocket/AcidTypingMapper.xml index d173ec13..b16edf68 100644 --- a/klp-pocket/src/main/resources/mapper/pocket/AcidTypingMapper.xml +++ b/klp-pocket/src/main/resources/mapper/pocket/AcidTypingMapper.xml @@ -12,7 +12,7 @@ FROM klptcm1_pdo_excoil e WHERE e.ENCOILID = #{encoilId} ORDER BY e.INSDATE DESC - LIMIT 1 + LIMIT 10