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

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-04-18 14:24:22 +08:00
parent 96082b9124 ee2bb280b6
commit 254dada485
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-aps/src/main/java/com/klp/aps/mapper/ApsPlanSheetMapper.java
View File

@@ -18,5 +18,5 @@ import java.util.List;
*/ */
public interface ApsPlanSheetMapper extends BaseMapperPlus<ApsPlanSheetMapper, ApsPlanSheet, ApsPlanSheetVo> { public interface ApsPlanSheetMapper extends BaseMapperPlus<ApsPlanSheetMapper, ApsPlanSheet, ApsPlanSheetVo> {
List<ApsPlanSheetRowVo> selectList(ApsPlanSheetQueryReq req); List<ApsPlanSheetRowVo> selectListByReq(ApsPlanSheetQueryReq req);
} }

2
klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanSheetServiceImpl.java
View File

@@ -318,7 +318,7 @@ public class ApsPlanSheetServiceImpl implements IApsPlanSheetService {
} }
private List<ApsPlanSheetRowVo> queryListAll(ApsPlanSheetQueryReq req) { private List<ApsPlanSheetRowVo> queryListAll(ApsPlanSheetQueryReq req) {
return baseMapper.selectList(req); return baseMapper.selectListByReq(req);
} }
private String nvl(Object v, Object fallback) { private String nvl(Object v, Object fallback) {

2
klp-aps/src/main/resources/mapper/aps/ApsPlanSheetMapper.xml
View File

@@ -19,7 +19,7 @@
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<select id="selectList" parameterType="com.klp.aps.domain.dto.ApsPlanSheetQueryReq" resultType="com.klp.aps.domain.vo.ApsPlanSheetRowVo"> <select id="selectListByReq" parameterType="com.klp.aps.domain.dto.ApsPlanSheetQueryReq" resultType="com.klp.aps.domain.vo.ApsPlanSheetRowVo">
SELECT SELECT
d.plan_detail_id AS detailSheetId, d.plan_detail_id AS detailSheetId,
s.plan_date AS planDate, s.plan_date AS planDate,