refactor(dms): 优化维护工单详细信息查询

-将 selectDetailList 方法的返回类型从 DmsBillsMaintDetailVo 改为 DmsBillsMaintDetail
- 将 selectPrjectIds 方法的返回类型从 DmsBaseMaintProjectVo 改为 DmsBaseMaintProject
- 更新相应的 XML 文件以匹配新的返回类型- 在 DmsBillsMaintInstanceServiceImpl 中进行相应的类型转换
master
zch 2 months ago
parent 042f1d4e40
commit c776ff3fce

@ -1,6 +1,7 @@
package org.dromara.dms.mapper; package org.dromara.dms.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.dms.domain.DmsBaseMaintProject;
import org.dromara.dms.domain.DmsBillsMaintDetail; import org.dromara.dms.domain.DmsBillsMaintDetail;
import org.dromara.dms.domain.DmsBillsMaintInstance; import org.dromara.dms.domain.DmsBillsMaintInstance;
import org.dromara.dms.domain.vo.DmsBaseMaintProjectVo; import org.dromara.dms.domain.vo.DmsBaseMaintProjectVo;
@ -25,11 +26,11 @@ public interface DmsBillsMaintDetailMapper extends BaseMapperPlus<DmsBillsMaintD
*/ */
public List<DmsBillsMaintDetail> selectDmsBillsMaintDetailJoinList(DmsBillsMaintDetail dmsBillsMaintDetail); public List<DmsBillsMaintDetail> selectDmsBillsMaintDetailJoinList(DmsBillsMaintDetail dmsBillsMaintDetail);
List<DmsBillsMaintDetailVo> selectDetailList(Long maintInstanceId); List<DmsBillsMaintDetail> selectDetailList(Long maintInstanceId);
DmsBaseMaintStationVo selectMainStation(Long stationId); DmsBaseMaintStationVo selectMainStation(Long stationId);
List<DmsBaseMaintProjectVo> selectPrjectIds(Long stationId); List<DmsBaseMaintProject> selectPrjectIds(Long stationId);
/** /**
* Join * Join

@ -231,10 +231,10 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
dmsBillsMaintDetailMapper.insertBatch(billsMaintDetails); dmsBillsMaintDetailMapper.insertBatch(billsMaintDetails);
ArrayList<DmsBillsMaintDetailProject> detailprojectList = new ArrayList<>(); ArrayList<DmsBillsMaintDetailProject> detailprojectList = new ArrayList<>();
List<DmsBillsMaintDetailVo> list = dmsBillsMaintDetailMapper.selectDetailList(maintInstanceId); List<DmsBillsMaintDetail> list = dmsBillsMaintDetailMapper.selectDetailList(maintInstanceId);
for (DmsBillsMaintDetailVo detail : list) { for (DmsBillsMaintDetail detail : list) {
List<DmsBaseMaintProjectVo> projects = dmsBillsMaintDetailMapper.selectPrjectIds(detail.getMaintStationId()); List<DmsBaseMaintProject> projects = dmsBillsMaintDetailMapper.selectPrjectIds(detail.getMaintStationId());
for (DmsBaseMaintProjectVo project : projects) { for (DmsBaseMaintProject project : projects) {
DmsBillsMaintDetailProject detailproject = new DmsBillsMaintDetailProject(); DmsBillsMaintDetailProject detailproject = new DmsBillsMaintDetailProject();
detailproject.setBillsMaintDetailId(detail.getBillsMaintDetailId()); detailproject.setBillsMaintDetailId(detail.getBillsMaintDetailId());
// DmsBaseMaintStation station = dmsBillsMaintDetailMapper.selectMainStation(detail.getStationId()); // DmsBaseMaintStation station = dmsBillsMaintDetailMapper.selectMainStation(detail.getStationId());

@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectDetailList" resultType="DmsBillsMaintDetailVo" <select id="selectDetailList" resultType="org.dromara.dms.domain.DmsBillsMaintDetail"
parameterType="java.lang.Long"> parameterType="java.lang.Long">
select * from dms_bills_maint_detail where maint_instance_id = #{maintInstanceId} select * from dms_bills_maint_detail where maint_instance_id = #{maintInstanceId}
</select> </select>
@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select * from dms_base_maint_station where maint_station_id = #{stationId} select * from dms_base_maint_station where maint_station_id = #{stationId}
</select> </select>
<select id="selectPrjectIds" resultType="org.dromara.dms.domain.vo.DmsBaseMaintProjectVo"> <select id="selectPrjectIds" resultType="org.dromara.dms.domain.DmsBaseMaintProject">
SELECT x.maint_project_id,a.maint_project_name,a.maint_project_desc SELECT x.maint_project_id,a.maint_project_name,a.maint_project_desc
FROM dms_base_station_project x FROM dms_base_station_project x
left join dms_base_maint_project a on x.maint_project_id = a.maint_project_id left join dms_base_maint_project a on x.maint_project_id = a.maint_project_id

Loading…
Cancel
Save