DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-02-07 17:00:43 +08:00
parent a156164a07 afd5b0479d
commit 3551f31537
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
klp-pocket/src/main/java/com/klp/pocket/acid/controller/AcidTypingController.java
View File

@@ -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<AcidTypingPrefillVo> getTypingPrefill(@RequestParam String currentCoilNo) {
AcidTypingPrefillVo vo = acidTypingService.getTypingPrefillByCurrentCoilNo(currentCoilNo);
return R.ok(vo);
public R<List<AcidTypingPrefillVo>> getTypingPrefill(@RequestParam String currentCoilNo) {
List<AcidTypingPrefillVo> voList = acidTypingService.getTypingPrefillByCurrentCoilNo(currentCoilNo);
return R.ok(voList);
}
}

4
klp-pocket/src/main/java/com/klp/pocket/acid/mapper/AcidTypingMapper.java
View File

@@ -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<AcidTypingPrefillVo> selectTypingPrefillByEncoilId(@Param("encoilId") String encoilId);
}

5
klp-pocket/src/main/java/com/klp/pocket/acid/service/IAcidTypingService.java
View File

@@ -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<AcidTypingPrefillVo> getTypingPrefillByCurrentCoilNo(String currentCoilNo);
}

4
klp-pocket/src/main/java/com/klp/pocket/acid/service/impl/AcidTypingServiceImpl.java
View File

@@ -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<AcidTypingPrefillVo> getTypingPrefillByCurrentCoilNo(String currentCoilNo) {
return acidTypingMapper.selectTypingPrefillByEncoilId(currentCoilNo);
}
}

2
klp-pocket/src/main/resources/mapper/pocket/AcidTypingMapper.xml
View File

@@ -12,7 +12,7 @@
FROM klptcm1_pdo_excoil e
WHERE e.ENCOILID = #{encoilId}
ORDER BY e.INSDATE DESC
LIMIT 1
LIMIT 10
</select>
</mapper>