|
@@ -1679,6 +1679,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
|
|
|
public HttpRespMsg getContractDetail(HttpServletRequest request, Integer id) {
|
|
|
HttpRespMsg respMsg = new HttpRespMsg();
|
|
|
Contract contract = contractMapper.selectById(id);
|
|
|
+ if (contract.getTypeId()!=null){
|
|
|
+ ContractType contractType = contractTypeMapper.selectById(contract.getTypeId());
|
|
|
+ if (contractType!=null){
|
|
|
+ contract.setTypeName(contractType.getTypeName());
|
|
|
+ }
|
|
|
+ }
|
|
|
List<ContractCustom> selectedList = contractCustomMapper.selectList(new QueryWrapper<ContractCustom>().eq("contract_id", contract.getId()));
|
|
|
if (selectedList != null && !selectedList.isEmpty()) {
|
|
|
contract.setCustomData(selectedList.get(0));
|