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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
青云
2025-10-27 15:25:19 +08:00
parent 82d55d7188 aec5eacd0b
commit 6174743858
6 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java
View File

@ -668,11 +668,13 @@ public class MatMaterialsServiceImpl extends ServiceImpl<MatMaterialsMapper, Mat
BeanUtils.copyProperties(material, vo);
Long id = material.getId();
MatMaterialsInventory put = putMap.get(id);
vo.setSupplier(put.getRecipient());
vo.setInventoryId(put.getId());
vo.setNumber(put.getNumber());
vo.setOperator(put.getOperator());
vo.setEnterTime(put.getCreateTime());
if (put != null) {
vo.setSupplier(put.getRecipient());
vo.setInventoryId(put.getId());
vo.setNumber(put.getNumber());
vo.setOperator(put.getOperator());
vo.setEnterTime(put.getCreateTime());
}
if (CollUtil.isNotEmpty(outList)) {
List<MatMaterialsInventory> outs = outList.stream()
.filter(inventory -> inventory.getMaterialsId().equals(id))

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
View File

@ -333,10 +333,11 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
}
//打卡范围
if (!checkInRange(req)) {
throw new ServiceException("打卡位置不在范围内", HttpStatus.ERROR);
if (!"1".equals(req.getSource())){
if (!checkInRange(req)) {
throw new ServiceException("打卡位置不在范围内", HttpStatus.ERROR);
}
}
//用户信息校验
SubConstructionUser constructionUser = constructionUserService.getBySysUserId(userId);
if ("1".equals(constructionUser.getStatus())) {

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java
View File

@ -74,6 +74,12 @@ public class XzdBiddingDocumentVo implements Serializable {
@ExcelProperty(value = "项目类型ID")
private Long projectType;
/**
* 项目类型ID
*/
@ExcelProperty(value = "项目类型ID")
private String projectTypeName;
/**
* 投标单位
*/

20
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java
View File

@ -25,6 +25,8 @@ import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdBidding
import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdTbwjBusinessBidService;
import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdTbwjTechnicalBidService;
import org.dromara.xzd.biddingManagement.biddingDocumentList.service.IXzdTbwjZsyqService;
import org.dromara.xzd.domain.vo.XzdProjectTypeVo;
import org.dromara.xzd.service.IXzdProjectTypeService;
import org.dromara.xzd.utilS.AreaUtil;
import org.locationtech.jts.edgegraph.HalfEdge;
import org.springframework.beans.BeanUtils;
@ -59,6 +61,8 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
private final IXzdTbwjZsyqService iXzdTbwjZsyqService;
private final IXzdProjectTypeService xzdProjectTypeService;
/**
* 查询投标文件
*
@ -94,9 +98,25 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
public TableDataInfo<XzdBiddingDocumentVo> queryPageList(XzdBiddingDocumentBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdBiddingDocument> lqw = buildQueryWrapper(bo);
Page<XzdBiddingDocumentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
result.getRecords().forEach(this::getName);
return TableDataInfo.build(result);
}
private void getName(XzdBiddingDocumentVo xzdBiddingDocumentVo) {
if (xzdBiddingDocumentVo != null){
Long projectType = xzdBiddingDocumentVo.getProjectType();
if (projectType != null){
XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(projectType);
if (xzdProjectTypeVo != null){
xzdBiddingDocumentVo.setProjectTypeName(xzdProjectTypeVo.getTypeName());
}
}
}
}
/**
* 查询符合条件的投标文件列表
*

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/controller/XzdPurchaseContractSuspendController.java
View File

@ -61,7 +61,7 @@ public class XzdPurchaseContractSuspendController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("contractTermination:purchaseContractSuspend:query")
// @SaCheckPermission("contractTermination:purchaseContractSuspend:query")
@GetMapping("/{id}")
public R<XzdPurchaseContractSuspendVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/controller/XzdSubcontractTerminationController.java
View File

@ -61,7 +61,7 @@ public class XzdSubcontractTerminationController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("fenbaohetongzhongzhi:subcontractTermination:query")
// @SaCheckPermission("fenbaohetongzhongzhi:subcontractTermination:query")
@GetMapping("/{id}")
public R<XzdSubcontractTerminationVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {