lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11-20-改善

Browse Source
This commit is contained in:
青云
2025-11-20 20:00:03 +08:00
parent e37d118d0c
commit 3d85b10475
6 changed files with 89 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierInfoController.java
View File

@ -18,11 +18,13 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.xzd.domain.bo.XzdProjectBo;
import org.dromara.xzd.domain.bo.XzdSupplierInfoBo;
import org.dromara.xzd.domain.vo.XzdCustomertypeVo;
import org.dromara.xzd.domain.vo.XzdProjectVo;
import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo;
import org.dromara.xzd.domain.bo.XzdYhxxBo;
import org.dromara.xzd.domain.vo.*;
import org.dromara.xzd.service.IXzdProjectService;
import org.dromara.xzd.service.IXzdSupplierInfoService;
import org.dromara.xzd.service.IXzdSupplierOpenBankService;
import org.dromara.xzd.service.IXzdYhxxService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -42,6 +44,8 @@ public class XzdSupplierInfoController extends BaseController {
private final IXzdSupplierInfoService xzdSupplierInfoService;
private final IXzdProjectService xzdProjectService;
private final IXzdSupplierOpenBankService xzdSupplierOpenBankService;
private final IXzdYhxxService xzdYhxxService;
/**
* 查询供应商信息列表
@ -140,4 +144,22 @@ public class XzdSupplierInfoController extends BaseController {
return R.ok(xzdProjectService.queryById(id));
}
/**
* 查询银行数据关联列表
*/
@SaCheckPermission(value = {"xzd:supplierInfo:add", "xzd:supplierInfo:edit", "xzd:supplierInfo:list"}, mode = SaMode.OR)
@GetMapping("/supplierBankList")
public TableDataInfo<XzdYhxxVo> list(XzdYhxxBo bo, PageQuery pageQuery) {
return xzdYhxxService.queryPageList(bo, pageQuery);
}
/**
* 查询银行列表
*/
@SaCheckPermission(value = {"xzd:supplierInfo:add", "xzd:supplierInfo:edit", "xzd:supplierInfo:list"}, mode = SaMode.OR)
@GetMapping("/bankList")
public TableDataInfo<XzdSupplierOpenBankVo> list(XzdSupplierOpenBankBo bo, PageQuery pageQuery) {
return xzdSupplierOpenBankService.queryPageList(bo, pageQuery);
}
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java
View File

@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import java.io.Serial;
import java.math.BigDecimal;
@ -152,7 +150,7 @@ public class XzdSettlementInfo extends BaseEntity {
* 开户银行信息
*/
@TableField(exist = false)
private List<XzdSupplierOpenBank> openBanks;
private List<XzdYhxx> openBanks;
}

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdSupplierInfoMapper.java
View File

@ -1,13 +1,11 @@
package org.dromara.xzd.mapper;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.xzd.domain.XzdSupplierInfo;
import org.dromara.xzd.domain.bo.XzdSupplierInfoBo;
import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.util.List;
@ -19,7 +17,7 @@ import java.util.List;
*/
public interface XzdSupplierInfoMapper extends BaseMapperPlus<XzdSupplierInfo, XzdSupplierInfoVo> {
List<XzdSupplierInfoVo> search(@Param("bo")XzdSupplierInfoBo bo);
List<XzdSupplierInfoVo> search(@Param("bo")XzdSupplierInfoBo bo, @Param("page") IPage<XzdSupplierInfo> page);
}

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java
View File

@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.event.ProcessDeleteEvent;
import org.dromara.common.core.domain.event.ProcessEvent;
import org.dromara.common.core.domain.event.ProcessTaskEvent;
@ -22,7 +21,6 @@ import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.domain.XzdBusinessChange;
import org.dromara.xzd.domain.XzdContractProgressSettlement;
import org.dromara.xzd.domain.bo.XzdContractProgressSettlementBo;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
import org.dromara.xzd.domain.vo.*;
import org.dromara.xzd.mapper.XzdContractProgressSettlementMapper;
import org.dromara.xzd.service.IXzdContractProgressSettlementService;
@ -483,14 +481,14 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl<XzdCon
// }
// }
//结算单位名称(客户)
if (vo.getSettlementUnit() != null) {
R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(vo.getSettlementUnit());
if (byid != null) {
if (byid.getData().getXzdCustomerinformation() != null) {
vo.setSettlementUnitName(byid.getData().getXzdCustomerinformation().getUnitName());
}
}
}
// if (vo.getSettlementUnit() != null) {
// R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(vo.getSettlementUnit());
// if (byid != null) {
// if (byid.getData().getXzdCustomerinformation() != null) {
// vo.setSettlementUnitName(byid.getData().getXzdCustomerinformation().getUnitName());
// }
// }
// }
//用印信息
LambdaQueryWrapper<XzdBusinessChange> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(XzdBusinessChange::getContractChangeId, vo.getId());

93
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
View File

@ -22,7 +22,6 @@ import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.system.service.impl.SysUserServiceImpl;
import org.dromara.xzd.domain.*;
import org.dromara.xzd.domain.bo.XzdSupplierInfoBo;
import org.dromara.xzd.domain.bo.XzdYhxxBo;
import org.dromara.xzd.domain.vo.XzdCustomertypeVo;
import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
import org.dromara.xzd.mapper.XzdSupplierInfoMapper;
@ -132,14 +131,11 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
bo.setPageSize(10);
}
int i = (bo.getPageNum() - 1) * bo.getPageSize();
Integer i = (bo.getPageNum() - 1) * bo.getPageSize();
bo.setOffset(i);
List<XzdSupplierInfoVo> xzdSupplierInfoVos = baseMapper.search(bo);
List<XzdSupplierInfoVo> xzdSupplierInfoVos = baseMapper.search(bo,pageQuery.build());
// LambdaQueryWrapper<XzdSupplierInfo> lqw = buildQueryWrapper(bo);
// Page<XzdSupplierInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
// setValue(result.getRecords());
return TableDataInfo.build(xzdSupplierInfoVos);
}
@ -286,16 +282,18 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
//开户银行
if(bo.getSettlement().getOpenBanks() != null && !bo.getSettlement().getOpenBanks().isEmpty()){
for (XzdSupplierOpenBank bank : bo.getSettlement().getOpenBanks()) {
XzdYhxxBo xzdYhxxBo = new XzdYhxxBo();
xzdYhxxBo.setOpenBank(bank.getOpenBank());
xzdYhxxBo.setBranchName(bank.getBranchName());
xzdYhxxBo.setMainId(add.getId());
xzdYhxxBo.setSfmr(bank.getIsDefault());
xzdYhxxBo.setAccount(bank.getAccount());
xzdYhxxBo.setKhhm(bank.getPersonName());
xzdYhxxBo.setType("1");
xzdYhxxService.insertByBo(xzdYhxxBo);
for (XzdYhxx bank : bo.getSettlement().getOpenBanks()) {
// XzdYhxxBo xzdYhxxBo = new XzdYhxxBo();
// xzdYhxxBo.setOpenBank(bank.getOpenBank());
// xzdYhxxBo.setBranchName(bank.getBranchName());
// xzdYhxxBo.setMainId(add.getId());
// xzdYhxxBo.setSfmr(bank.getIsDefault());
// xzdYhxxBo.setAccount(bank.getAccount());
// xzdYhxxBo.setKhhm(bank.getPersonName());
// xzdYhxxBo.setType("1");
bank.setType("1");
bank.setMainId(add.getId());
xzdYhxxService.save(bank);
}
}
@ -490,16 +488,13 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
}
//保存此次的
for (XzdSupplierOpenBank bank : bo.getSettlement().getOpenBanks()) {
XzdYhxxBo xzdYhxxBo = new XzdYhxxBo();
xzdYhxxBo.setOpenBank(bank.getOpenBank());
xzdYhxxBo.setBranchName(bank.getBranchName());
xzdYhxxBo.setMainId(update.getId());
xzdYhxxBo.setSfmr(bank.getIsDefault());
xzdYhxxBo.setAccount(bank.getAccount());
xzdYhxxBo.setKhhm(bank.getPersonName());
xzdYhxxBo.setType("1");
xzdYhxxService.insertByBo(xzdYhxxBo);
for (XzdYhxx bank : bo.getSettlement().getOpenBanks()) {
// XzdYhxxBo xzdYhxxBo = new XzdYhxxBo();
// xzdYhxxBo.setOpenBank(bank.getOpenBank());
// xzdYhxxBo.setBranchName(bank.getBranchName());
bank.setMainId(update.getId());
bank.setType("1");
xzdYhxxService.save(bank);
}
}else {
//先获取老数据银行关联表
@ -665,7 +660,7 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
for (Long id : ids) {
XzdSupplierInfoVo vo = baseMapper.selectVoById(id);
XzdSupplierInfoVo vo = queryById(id);
if(vo == null){
continue;
}
@ -934,32 +929,36 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
bankLambdaQueryWrapper.eq(XzdYhxx::getSfmr,"1");
XzdYhxx xzdYhxx = xzdYhxxService.getOne(bankLambdaQueryWrapper);
if (xzdYhxx!= null) {
XzdSupplierOpenBank openBank = xzdSupplierOpenBankService.getBaseMapper().selectOne(new LambdaQueryWrapper<XzdSupplierOpenBank>()
.eq(XzdSupplierOpenBank::getOpenBank, xzdYhxx.getOpenBank()).eq(XzdSupplierOpenBank::getBranchName,xzdYhxx.getBranchName()));
if (openBank != null) {
vo.setKhyh(openBank.getOpenBank());
// XzdSupplierOpenBank openBank = xzdSupplierOpenBankService.getBaseMapper().selectOne(new LambdaQueryWrapper<XzdSupplierOpenBank>()
// .eq(XzdSupplierOpenBank::getOpenBank, xzdYhxx.getOpenBank()).eq(XzdSupplierOpenBank::getBranchName,xzdYhxx.getBranchName()));
// if (openBank != null) {
// vo.setKhyh(openBank.getOpenBank());
// vo.setKhhzh(xzdYhxx.getAccount());
// vo.setKhhhm(openBank.getPersonName());
// }
vo.setKhyh(xzdYhxx.getOpenBank());
vo.setKhhzh(xzdYhxx.getAccount());
vo.setKhhhm(openBank.getOpenBank());
}
vo.setKhhhm(xzdYhxx.getKhhm());
}
bankLambdaQueryWrapper.clear();
bankLambdaQueryWrapper.eq(XzdYhxx::getMainId,vo.getId());
List<XzdYhxx> xzdYhxxList = xzdYhxxService.list(bankLambdaQueryWrapper);
if (xzdYhxxList!= null && !xzdYhxxList.isEmpty()) {
List<XzdSupplierOpenBank> openBanks = new ArrayList<>();
for (XzdYhxx yhxx : xzdYhxxList) {
XzdSupplierOpenBank byId = xzdSupplierOpenBankService.getBaseMapper().selectOne(new LambdaQueryWrapper<XzdSupplierOpenBank>()
.eq(XzdSupplierOpenBank::getOpenBank, xzdYhxx.getOpenBank()).eq(XzdSupplierOpenBank::getBranchName,xzdYhxx.getBranchName()));
if (byId != null){
byId.setAccount(yhxx.getAccount());
byId.setIsDefault(yhxx.getSfmr());
byId.setPersonName(yhxx.getKhhm());
openBanks.add(byId);
}
}
vo.getSettlement().setOpenBanks(openBanks);
}
vo.getSettlement().setOpenBanks(xzdYhxxList);
// if (xzdYhxxList!= null && !xzdYhxxList.isEmpty()) {
// List<XzdSupplierOpenBank> openBanks = new ArrayList<>();
// for (XzdYhxx yhxx : xzdYhxxList) {
// XzdSupplierOpenBank byId = xzdSupplierOpenBankService.getBaseMapper().selectOne(new LambdaQueryWrapper<XzdSupplierOpenBank>()
// .eq(XzdSupplierOpenBank::getOpenBank, xzdYhxx.getOpenBank()).eq(XzdSupplierOpenBank::getBranchName,xzdYhxx.getBranchName()));
// if (byId != null){
// byId.setAccount(yhxx.getAccount());
// byId.setIsDefault(yhxx.getSfmr());
// byId.setPersonName(yhxx.getKhhm());
// openBanks.add(byId);
// }
// }
// vo.getSettlement().setOpenBanks(openBanks);
// }
//处理业务信息
LambdaQueryWrapper<XzdBusinessInfo> businessInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
businessInfoLambdaQueryWrapper.eq(XzdBusinessInfo::getCustomerinformationId,vo.getId()).eq(XzdBusinessInfo::getType,"2");

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
View File

@ -12,8 +12,9 @@
# settlement.account_number as khhzh,
info.city_code as cityCode,
info.shzt as shzt,
bank.open_bank as khyh,
yhxx.open_bank as khyh,
yhxx.account as khhzh,
yhxx.khhm as khhhm,
supplement.creator as createByUser,
info.create_time as createTime,
info.update_time as updateTime,
@ -103,9 +104,9 @@
</where>
ORDER BY info.create_time DESC
<if test='bo.pageNum != null and bo.pageSize != null'>
LIMIT #{bo.pageSize} OFFSET #{bo.offset}
</if>
<!-- <if test='bo.pageNum != null and bo.pageSize != null'>-->
<!-- LIMIT #{bo.pageSize} OFFSET #{bo.offset}-->
<!-- </if>-->
</select>