geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
张秉卓
2026-01-07 17:44:42 +08:00
parent 0329f40727
commit c8d4f26279
6 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesController.java
View File

@ -80,7 +80,7 @@ public class ContractSalesController {
return content.getObj();
}
});
return R.ok(res.getId());
return R.ok(res);
}
private void execAfter(String table, Long id, String sign) {

13
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java
View File

@ -7,9 +7,13 @@ import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.contract.dto.LngContractPageDto;
import com.xjrsoft.module.contract.entity.LngContract;
import com.xjrsoft.module.contract.vo.LngContractPageVo;
import com.xjrsoft.module.contract.vo.LngContractSalesPngPointVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* @title: mapper
* @Author 管理员
@ -36,5 +40,12 @@ public interface LngContractMapper extends MPJBaseMapper<LngContract>, BaseMappe
" ${ew.customSqlSegment}" +
" GROUP BY k.id, k.k_no, k.k_name, cu.cu_sname, k.date_from, k.date_to,com.name, dd_a.name" +
" ORDER BY k.date_from DESC, k.k_no DESC")
IPage<LngContractPageVo> queryPage(IPage<LngContractPageDto> page, QueryWrapper<LngContract> queryWrapper);
IPage<LngContractPageVo> queryPage(IPage<LngContractPageDto> page, @Param("ew") QueryWrapper<LngContract> queryWrapper);
@Select("SELECT t1.*, t2.full_name AS pointDelyName, t3.full_name AS pointTransName" +
" FROM lng_contract_sales_png_point t1" +
" LEFT JOIN lng_b_station_png t2 on t1.point_dely_code = t2.code" +
" LEFT JOIN lng_b_station_png t3 on t1.point_trans_code = t3.code" +
" WHERE t1.k_id = #{kid}")
List<LngContractSalesPngPointVo> queryLngContractSalesPngPointList(@Param("kid") Long kid);
}

10
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesServiceImpl.java
View File

@ -73,12 +73,10 @@ public class ContractSalesServiceImpl extends MPJBaseServiceImpl<LngContractMapp
vo.setLngContractSalesPngList(BeanUtil.copyToList(lngContractSalesPngList,
LngContractSalesPngVo.class));
}
List<LngContractSalesPngPoint> lngContractSalesPngPointList = lngContractSalesPngPointMapper.selectList(
new LambdaQueryWrapper<LngContractSalesPngPoint>()
.eq(LngContractSalesPngPoint::getKId, lngContract.getId()));
if (CollectionUtils.isNotEmpty(lngContractSalesPngPointList)) {
vo.setLngContractSalesPngPointList(BeanUtil.copyToList(lngContractSalesPngPointList,
LngContractSalesPngPointVo.class));
List<LngContractSalesPngPointVo> lngContractSalesPngPointVoList = this.baseMapper.
queryLngContractSalesPngPointList(lngContract.getId());
if (CollectionUtils.isNotEmpty(lngContractSalesPngPointVoList)) {
vo.setLngContractSalesPngPointList(lngContractSalesPngPointVoList);
}
List<LngContractSalesPngQty> lngContractSalesPngQtyList = lngContractSalesPngQtyMapper.selectList(
new LambdaQueryWrapper<LngContractSalesPngQty>()