deptid添加

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/ViolationRecordTest.java

@@ -1,9 +1,17 @@
 package org.dromara.test;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
+import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.safety.domain.dto.violationrecord.HseViolationRecordCreateDto;
 import org.dromara.safety.service.IHseViolationRecordService;
+import org.dromara.system.domain.SysMenu;
+import org.dromara.system.domain.vo.SysMenuVo;
+import org.dromara.system.mapper.SysMenuMapper;
+import org.dromara.system.service.ISysMenuService;
+import org.hamcrest.core.Is;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.ArrayList;
@@ -20,6 +28,9 @@ public class ViolationRecordTest {
     @Resource
     private IHseViolationRecordService violationRecordService;
 
+    @Autowired
+    private SysMenuMapper sysMenuMapper;
+
     @Test
     void test() {
         List<HseViolationRecordCreateDto> list = new ArrayList<>();
@@ -55,4 +66,26 @@ public class ViolationRecordTest {
         list.add(dto5);
         violationRecordService.insertByMonitor(list);
     }
+
+    @Test
+    void contextLoads() {
+        SysMenuVo sysMenuVo = sysMenusByList(1972500768346673154L);
+        System.out.println(sysMenuVo.toString());
+
+    }
+
+    SysMenuVo sysMenusByList(Long id) {
+        SysMenuVo sysMenus = new SysMenuVo();
+        List<SysMenu> res = sysMenuMapper.selectList(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId, id));
+        if (res != null && res.size() > 0 ) {
+            sysMenus.setChildren(MapstructUtils.convert(res, SysMenuVo.class));
+            res.forEach(sysMenu -> {
+                sysMenusByList(sysMenu.getMenuId());
+            });
+        }
+        return sysMenus;
+
+    }
+
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/XzdBiddingFileEstimate.java

@@ -127,4 +127,7 @@ public class XzdBiddingFileEstimate extends BaseEntity {
     private String auditStatus;
 
 
+    private Long deptId;
+
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/bo/XzdBiddingFileEstimateBo.java

@@ -123,5 +123,7 @@ public class XzdBiddingFileEstimateBo extends BaseEntity {
      */
     private String auditStatus;
 
+    private Long deptId;
+
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java

@@ -176,6 +176,9 @@ public class XzdBiddingFileEstimateVo implements Serializable {
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
+    private Long deptId;
+
+
 
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/service/impl/XzdBiddingFileEstimateServiceImpl.java

@@ -108,6 +108,7 @@ public class XzdBiddingFileEstimateServiceImpl extends ServiceImpl<XzdBiddingFil
         lqw.orderByDesc(XzdBiddingFileEstimate::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getDocumentCode()), XzdBiddingFileEstimate::getDocumentCode, bo.getDocumentCode());
         lqw.eq(bo.getDocumentDate() != null, XzdBiddingFileEstimate::getDocumentDate, bo.getDocumentDate());
+        lqw.eq(bo.getDeptId() != null, XzdBiddingFileEstimate::getDeptId, bo.getDeptId());
         lqw.like(bo.getProjectName() !=null, XzdBiddingFileEstimate::getProjectName, bo.getProjectName());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdBiddingFileEstimate::getTitle, bo.getTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectLocation()), XzdBiddingFileEstimate::getProjectLocation, bo.getProjectLocation());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/XzdBidDepositRecovery.java

@@ -98,6 +98,9 @@ public class XzdBidDepositRecovery extends BaseEntity {
      */
     private String depositStatus;
 
+
+    private Long deptId;
+
     /**
      * 保证金金额
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/bo/XzdBidDepositRecoveryBo.java

@@ -184,6 +184,8 @@ public class XzdBidDepositRecoveryBo extends BaseEntity {
      */
     private Integer gatheringNumber;
 
+    private Long deptId;
+
     /**
      * 收款单位（供应商信息）
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/domain/vo/XzdBidDepositRecoveryVo.java

@@ -270,5 +270,7 @@ public class XzdBidDepositRecoveryVo implements Serializable {
      */
     private String xmbm;
 
+    private Long deptId;
+
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/earnestMoneyWithdraw/service/impl/XzdBidDepositRecoveryServiceImpl.java

@@ -131,6 +131,7 @@ public class XzdBidDepositRecoveryServiceImpl extends ServiceImpl<XzdBidDepositR
         lqw.eq(bo.getProjectType() != null, XzdBidDepositRecovery::getProjectType, bo.getProjectType());
         lqw.eq(StringUtils.isNotBlank(bo.getBusinessMode()), XzdBidDepositRecovery::getBusinessMode, bo.getBusinessMode());
         lqw.eq(bo.getProjectCost() != null, XzdBidDepositRecovery::getProjectCost, bo.getProjectCost());
+        lqw.eq(bo.getDeptId() != null, XzdBidDepositRecovery::getDeptId, bo.getDeptId());
         lqw.eq(bo.getRecoveryAmount() != null, XzdBidDepositRecovery::getRecoveryAmount, bo.getRecoveryAmount());
         lqw.eq(StringUtils.isNotBlank(bo.getRecoveryAmountCapital()), XzdBidDepositRecovery::getRecoveryAmountCapital, bo.getRecoveryAmountCapital());
         lqw.eq(bo.getDataFee() != null, XzdBidDepositRecovery::getDataFee, bo.getDataFee());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/XzdPurchaseContractSuspend.java

@@ -60,6 +60,8 @@ public class XzdPurchaseContractSuspend extends BaseEntity {
      */
     private LocalDate terminationDate;
 
+    private Long deptId;
+
     /**
      * 项目名称
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java

@@ -73,6 +73,7 @@ public class XzdPurchaseContractSuspendBo extends BaseEntity {
      */
     private Long partyAUnit;
 
+    private Long deptId;
     /**
      * 终止原因
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/vo/XzdPurchaseContractSuspendVo.java

@@ -76,6 +76,8 @@ public class XzdPurchaseContractSuspendVo implements Serializable {
     @ExcelProperty(value = "合同名称")
     private String contractName;
 
+    private Long deptId;
+
     /**
      * 终止日期
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java

@@ -150,6 +150,7 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl<XzdPurcha
         lqw.eq(StringUtils.isNotBlank(bo.getReceiptsCode()), XzdPurchaseContractSuspend::getReceiptsCode, bo.getReceiptsCode());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdPurchaseContractSuspend::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getDocumentDate());
+        lqw.eq(bo.getDeptId() != null, XzdPurchaseContractSuspend::getDeptId, bo.getDeptId());
         lqw.ge(bo.getStartDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getStartDate());
         lqw.le(bo.getEndDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getEndDate());
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/XzdPurchaseContractAlteration.java

@@ -106,6 +106,8 @@ public class XzdPurchaseContractAlteration extends BaseEntity {
      */
     private String warning;
 
+    private Long deptId;
+
     /**
      * 累计变更金额
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/bo/XzdPurchaseContractAlterationBo.java

@@ -66,6 +66,8 @@ public class XzdPurchaseContractAlterationBo extends BaseEntity {
      */
     private String contractType;
 
+    private Long deptId;
+
     /**
      * 变更类型
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java

@@ -96,6 +96,8 @@ public class XzdPurchaseContractAlterationVo implements Serializable {
     @ExcelProperty(value = "变更类型")
     private String alterationType;
 
+    private Long deptId;
+
     /**
      * 项目名称
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java

@@ -194,6 +194,7 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
         lqw.eq(StringUtils.isNotBlank(bo.getReceiptsCode()), XzdPurchaseContractAlteration::getReceiptsCode, bo.getReceiptsCode());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdPurchaseContractAlteration::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, XzdPurchaseContractAlteration::getDocumentDate, bo.getDocumentDate());
+        lqw.eq(bo.getDeptId() != null, XzdPurchaseContractAlteration::getDeptId, bo.getDeptId());
         lqw.ge(bo.getStartDate() != null, XzdPurchaseContractAlteration::getDocumentDate, bo.getStartDate());
         lqw.le(bo.getEndDate() != null, XzdPurchaseContractAlteration::getDocumentDate, bo.getEndDate());
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/XzdSubcontractChange.java

@@ -84,6 +84,8 @@ public class XzdSubcontractChange extends BaseEntity {
      */
     private String organizationName;
 
+
+    private Long deptId;
     /**
      * 甲方单位
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/bo/XzdSubcontractChangeBo.java

@@ -82,6 +82,8 @@ public class XzdSubcontractChangeBo extends BaseEntity {
      */
     private String businessModel;
 
+    private Long deptId;
+
     /**
      * 组织
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/vo/XzdSubcontractChangeVo.java

@@ -125,6 +125,9 @@ public class XzdSubcontractChangeVo implements Serializable {
     @ExcelProperty(value = "甲方单位")
     private String partyAUnitName;
 
+
+    private Long deptId;
+
     /**
      * 乙方单位
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java

@@ -170,6 +170,7 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
         lqw.eq(StringUtils.isNotBlank(bo.getDocumentCode()), XzdSubcontractChange::getDocumentCode, bo.getDocumentCode());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdSubcontractChange::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, XzdSubcontractChange::getDocumentDate, bo.getDocumentDate());
+        lqw.eq(bo.getDeptId() != null, XzdSubcontractChange::getDeptId, bo.getDeptId());
         lqw.ge(bo.getStartTime() != null, XzdSubcontractChange::getDocumentDate, bo.getStartTime());
         lqw.le(bo.getEndTime() != null, XzdSubcontractChange::getDocumentDate, bo.getEndTime());
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java

@@ -53,6 +53,8 @@ public class XzdSubcontract extends BaseEntity {
      */
     private Long project;
 
+    private Long deptId;
+
     /**
      * 经营模式
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java

@@ -68,6 +68,8 @@ public class XzdSubcontractBo extends BaseEntity {
      */
     private String businessModel;
 
+    private Long deptId;
+
     /**
      * 原合同造价
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java

@@ -80,6 +80,8 @@ public class XzdSubcontractVo implements Serializable {
     @ExcelProperty(value = "项目")
     private Long project;
 
+    private Long deptId;
+
     /**
      * 项目名称
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java

@@ -215,6 +215,7 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
         lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), XzdSubcontract::getContractCode, bo.getContractCode());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdSubcontract::getContractName, bo.getContractName());
         lqw.eq(bo.getDocumentDate() != null, XzdSubcontract::getDocumentDate, bo.getDocumentDate());
+        lqw.eq(bo.getDeptId() != null, XzdSubcontract::getDeptId, bo.getDeptId());
         lqw.ge(bo.getStartDate() != null, XzdSubcontract::getDocumentDate, bo.getStartDate());
         lqw.le(bo.getEndDate() != null, XzdSubcontract::getDocumentDate, bo.getEndDate());
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/domain/XzdSubcontractTermination.java

@@ -54,6 +54,7 @@ public class XzdSubcontractTermination extends BaseEntity {
      */
     private String contractName;
 
+    private Long deptId;
     /**
      * 终止日期
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/domain/bo/XzdSubcontractTerminationBo.java

@@ -57,6 +57,8 @@ public class XzdSubcontractTerminationBo extends BaseEntity {
      */
     private LocalDate terminationDate;
 
+    private Long deptId;
+
     /**
      * 工程项目
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/domain/vo/XzdSubcontractTerminationVo.java

@@ -71,6 +71,8 @@ public class XzdSubcontractTerminationVo implements Serializable {
     @ExcelProperty(value = "合同编码")
     private String contractNumberName;
 
+    private Long deptId;
+
     /**
      * 合同名称
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/service/impl/XzdSubcontractTerminationServiceImpl.java

@@ -108,6 +108,7 @@ public class XzdSubcontractTerminationServiceImpl extends ServiceImpl<XzdSubcont
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdSubcontractTermination::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, XzdSubcontractTermination::getDocumentDate, bo.getDocumentDate());
         lqw.eq(bo.getContractNumber() != null, XzdSubcontractTermination::getContractNumber, bo.getContractNumber());
+        lqw.eq(bo.getDeptId() != null, XzdSubcontractTermination::getDeptId, bo.getDeptId());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdSubcontractTermination::getContractName, bo.getContractName());
         lqw.eq(bo.getTerminationDate() != null, XzdSubcontractTermination::getTerminationDate, bo.getTerminationDate());
         lqw.eq(StringUtils.isNotBlank(bo.getEngineeringProject()), XzdSubcontractTermination::getEngineeringProject, bo.getEngineeringProject());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java

@@ -91,6 +91,8 @@ public class XzdPurchaseContractInformation extends BaseEntity {
      */
     private Long cumulativeChangeAmount;
 
+
+    private Long deptId;
     /**
      * 归档日期
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java

@@ -80,6 +80,8 @@ public class XzdPurchaseContractInformationBo extends BaseEntity {
      */
     private Long partyAUnit;
 
+    private Long deptId;
+
     /**
      * 含税合同金额
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java

@@ -63,6 +63,8 @@ public class XzdPurchaseContractInformationVo implements Serializable {
      */
     private String contractText;
 
+    private Long deptId;
+
     /**
      * 单据日期
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java

@@ -152,6 +152,7 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
         lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), XzdPurchaseContractInformation::getContractCode, bo.getContractCode());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdPurchaseContractInformation::getContractName, bo.getContractName());
         lqw.eq(bo.getDocumentDate() != null, XzdPurchaseContractInformation::getDocumentDate, bo.getDocumentDate());
+        lqw.eq(bo.getDeptId() != null, XzdPurchaseContractInformation::getDeptId, bo.getDeptId());
         lqw.ge(bo.getStartDate() != null, XzdPurchaseContractInformation::getDocumentDate, bo.getStartDate());
         lqw.le(bo.getEndDate() != null, XzdPurchaseContractInformation::getDocumentDate, bo.getEndDate());
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/XzdGuaranteeChangeInfo.java

@@ -228,4 +228,6 @@ public class XzdGuaranteeChangeInfo extends BaseEntity {
     private String fileId;
 
 
+    private Long deptId;
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/bo/XzdGuaranteeChangeInfoBo.java

@@ -245,5 +245,7 @@ public class XzdGuaranteeChangeInfoBo extends BaseEntity {
 
     private LocalDate endTime;
 
+    private Long deptId;
+
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/domain/vo/XzdGuaranteeChangeInfoVo.java

@@ -305,5 +305,7 @@ public class XzdGuaranteeChangeInfoVo implements Serializable {
     @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
     private String createByName;
 
+    private Long deptId;
+
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/backletter/service/impl/XzdGuaranteeChangeInfoServiceImpl.java

@@ -95,6 +95,7 @@ public class XzdGuaranteeChangeInfoServiceImpl extends ServiceImpl<XzdGuaranteeC
         LambdaQueryWrapper<XzdGuaranteeChangeInfo> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdGuaranteeChangeInfo::getId);
         lqw.eq(bo.getDanjuId() != null, XzdGuaranteeChangeInfo::getDanjuId, bo.getDanjuId());
+        lqw.eq(bo.getDeptId() != null, XzdGuaranteeChangeInfo::getDeptId, bo.getDeptId());
         lqw.eq(StringUtils.isNotBlank(bo.getDocumentNumber()), XzdGuaranteeChangeInfo::getDocumentNumber, bo.getDocumentNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdGuaranteeChangeInfo::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, XzdGuaranteeChangeInfo::getDocumentDate, bo.getDocumentDate());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/domain/XzdGuaranteeInfo.java

@@ -93,6 +93,7 @@ public class  XzdGuaranteeInfo extends BaseEntity {
      */
     private Long partyAUnit;
 
+    private Long deptId;
     /**
      * 乙方单位
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/domain/bo/XzdGuaranteeInfoBo.java

@@ -62,6 +62,8 @@ public class XzdGuaranteeInfoBo extends BaseEntity {
      */
     private String contractNumber;
 
+    private Long deptId;
+
     /**
      * 合同名称
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/domain/vo/XzdGuaranteeInfoVo.java

@@ -70,6 +70,7 @@ public class XzdGuaranteeInfoVo implements Serializable {
     @ExcelProperty(value = "单据日期")
     private LocalDate documentDate;
 
+    private Long deptId;
     /**
      * 合同编号
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/service/impl/XzdGuaranteeInfoServiceImpl.java

@@ -137,6 +137,7 @@ public class XzdGuaranteeInfoServiceImpl extends ServiceImpl<XzdGuaranteeInfoMap
         lqw.eq(StringUtils.isNotBlank(bo.getContractType()), XzdGuaranteeInfo::getContractType, bo.getContractType());
         lqw.eq(StringUtils.isNotBlank(bo.getDocumentNumber()), XzdGuaranteeInfo::getDocumentNumber, bo.getDocumentNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdGuaranteeInfo::getTitle, bo.getTitle());
+        lqw.eq(bo.getDeptId() != null, XzdGuaranteeInfo::getDeptId, bo.getDeptId());
         lqw.eq(bo.getDocumentDate() != null, XzdGuaranteeInfo::getDocumentDate, bo.getDocumentDate());
         lqw.ge(bo.getStartDate() != null, XzdGuaranteeInfo::getDocumentDate,bo.getStartDate());
         lqw.le(bo.getEndDate() != null, XzdGuaranteeInfo::getDocumentDate,bo.getEndDate());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/domain/XzdDepositApplication.java

@@ -73,6 +73,8 @@ public class XzdDepositApplication extends BaseEntity {
      */
     private Long paymentMethod;
 
+    private Long deptId;
+
     /**
      * 保证金类型（字典）
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/domain/bo/XzdDepositApplicationBo.java

@@ -41,6 +41,8 @@ public class XzdDepositApplicationBo extends BaseEntity {
      */
     private String documentSerialNumber;
 
+    private Long deptId;
+
     /**
      * 申请人所属组织
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/domain/vo/XzdDepositApplicationVo.java

@@ -61,6 +61,8 @@ public class XzdDepositApplicationVo implements Serializable {
     @ExcelProperty(value = "申请人所属组织")
     private Long applicantOrganization;
 
+    private Long deptId;
+
     /**
      * 申请人所属组织名称
      */
@@ -130,6 +132,13 @@ public class XzdDepositApplicationVo implements Serializable {
     @ExcelProperty(value = "收取保证金单位")
     private String depositReceivingUnit;
 
+    /**
+     * 收取保证金单位
+     */
+    @ExcelProperty(value = "收取保证金单位")
+    @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "depositReceivingUnit")
+    private String depositReceivingUnitName;
+
     /**
      * 账号
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/earnestMoney/service/impl/XzdDepositApplicationServiceImpl.java

@@ -86,6 +86,7 @@ public class XzdDepositApplicationServiceImpl extends ServiceImpl<XzdDepositAppl
         LambdaQueryWrapper<XzdDepositApplication> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdDepositApplication::getId);
         lqw.eq(bo.getApplicationTime() != null, XzdDepositApplication::getApplicationTime, bo.getApplicationTime());
+        lqw.eq(bo.getDeptId() != null, XzdDepositApplication::getDeptId, bo.getDeptId());
         lqw.eq(StringUtils.isNotBlank(bo.getDocumentSerialNumber()), XzdDepositApplication::getDocumentSerialNumber, bo.getDocumentSerialNumber());
         lqw.eq(bo.getApplicantOrganization() != null, XzdDepositApplication::getApplicantOrganization, bo.getApplicantOrganization());
         lqw.eq(bo.getApplicantDepartment() != null, XzdDepositApplication::getApplicantDepartment, bo.getApplicantDepartment());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/domain/XzdFbhtzbjth.java

@@ -63,6 +63,8 @@ public class XzdFbhtzbjth extends BaseEntity {
      */
     private String contractName;
 
+    private Long deptId;
+
     /**
      * 合同金额
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/domain/bo/XzdFbhtzbjthBo.java

@@ -58,6 +58,8 @@ public class XzdFbhtzbjthBo extends BaseEntity {
      */
     private String contractCode;
 
+    private Long deptId;
+
     /**
      * 合同名称
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/domain/vo/XzdFbhtzbjthVo.java

@@ -80,6 +80,8 @@ public class XzdFbhtzbjthVo implements Serializable {
     @ExcelProperty(value = "合同名称")
     private String contractName;
 
+    private Long deptId;
+
     /**
      * 合同金额
      */
@@ -116,6 +118,13 @@ public class XzdFbhtzbjthVo implements Serializable {
     @ExcelProperty(value = "项目")
     private String project;
 
+    /**
+     * 项目
+     */
+    @ExcelProperty(value = "项目")
+    @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "project")
+    private String projectName;
+
     /**
      * 质保金比例(%)
      */
@@ -128,6 +137,13 @@ public class XzdFbhtzbjthVo implements Serializable {
     @ExcelProperty(value = "申请单位")
     private String applicationUnit;
 
+    /**
+     * 申请单位
+     */
+    @ExcelProperty(value = "申请单位")
+    @Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "applicationUnit")
+    private String applicationUnitName;
+
     /**
      * 供应商负责人
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/service/impl/XzdFbhtzbjthServiceImpl.java

@@ -98,6 +98,7 @@ public class XzdFbhtzbjthServiceImpl extends ServiceImpl<XzdFbhtzbjthMapper, Xzd
         LambdaQueryWrapper<XzdFbhtzbjth> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdFbhtzbjth::getId);
         lqw.eq(bo.getDanjuId() != null, XzdFbhtzbjth::getDanjuId, bo.getDanjuId());
+        lqw.eq(bo.getDeptId() != null, XzdFbhtzbjth::getDeptId, bo.getDeptId());
         lqw.eq(StringUtils.isNotBlank(bo.getDocumentCode()), XzdFbhtzbjth::getDocumentCode, bo.getDocumentCode());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdFbhtzbjth::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, XzdFbhtzbjth::getDocumentDate, bo.getDocumentDate());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/domain/AppreciationInvoice.java

@@ -76,6 +76,8 @@ public class AppreciationInvoice extends BaseEntity {
      */
     private Long organization;
 
+    private Long deptId;
+
     /**
      * 经办人
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/domain/bo/AppreciationInvoiceBo.java

@@ -52,6 +52,8 @@ public class AppreciationInvoiceBo extends BaseEntity {
      */
     private LocalDate entryDate;
 
+    private Long deptId;
+
     /**
      * 年度
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/domain/vo/AppreciationInvoiceVo.java

@@ -54,6 +54,8 @@ public class AppreciationInvoiceVo implements Serializable {
     @ExcelProperty(value = "项目")
     private Long project;
 
+    private Long deptId;
+
     /**
      * 项目名称
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java

@@ -155,6 +155,7 @@ public class AppreciationInvoiceServiceImpl extends ServiceImpl<AppreciationInvo
         lqw.eq(bo.getContractNo() != null, AppreciationInvoice::getContractNo, bo.getContractNo());
         lqw.eq(bo.getEntryDate() != null, AppreciationInvoice::getEntryDate, bo.getEntryDate());
         lqw.eq(bo.getYear() != null, AppreciationInvoice::getYear, bo.getYear());
+        lqw.eq(bo.getDeptId() != null, AppreciationInvoice::getDeptId, bo.getDeptId());
         lqw.eq(bo.getAccountingPeriod() != null, AppreciationInvoice::getAccountingPeriod, bo.getAccountingPeriod());
         lqw.eq(StringUtils.isNotBlank(bo.getTaxType()), AppreciationInvoice::getTaxType, bo.getTaxType());
         lqw.eq(bo.getTaxItem() != null, AppreciationInvoice::getTaxItem, bo.getTaxItem());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/domain/SettlementOfSubcontractingContract.java

@@ -54,6 +54,8 @@ public class SettlementOfSubcontractingContract extends BaseEntity {
      */
     private String contractName;
 
+    private Long deptId;
+
     /**
      * 统计周期
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/domain/bo/SettlementOfSubcontractingContractBo.java

@@ -66,6 +66,8 @@ public class SettlementOfSubcontractingContractBo extends BaseEntity {
      */
     private LocalDate measurementStart;
 
+    private Long deptId;
+
     /**
      * 项目
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/domain/vo/SettlementOfSubcontractingContractVo.java

@@ -61,6 +61,8 @@ public class SettlementOfSubcontractingContractVo implements Serializable {
     @ExcelProperty(value = "单据日期")
     private LocalDate documentDate;
 
+    private Long deptId;
+
     /**
      * 合同编码
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java

@@ -185,6 +185,7 @@ public class SettlementOfSubcontractingContractServiceImpl extends ServiceImpl<S
         lqw.eq(StringUtils.isNotBlank(bo.getDocumentCode()), SettlementOfSubcontractingContract::getDocumentCode, bo.getDocumentCode());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), SettlementOfSubcontractingContract::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, SettlementOfSubcontractingContract::getDocumentDate, bo.getDocumentDate());
+        lqw.eq(bo.getDeptId() != null, SettlementOfSubcontractingContract::getDeptId, bo.getDeptId());
         lqw.ge(bo.getStartDate() != null, SettlementOfSubcontractingContract::getDocumentDate, bo.getStartDate());
         lqw.le(bo.getEndDate() != null, SettlementOfSubcontractingContract::getDocumentDate, bo.getEndDate());
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/domain/SettlementOfSubcontractingCompletion.java

@@ -59,6 +59,8 @@ public class SettlementOfSubcontractingCompletion extends BaseEntity {
      */
     private Long approvedTotalPrice;
 
+    private Long deptId;
+
     /**
      * 审定日期
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/domain/bo/SettlementOfSubcontractingCompletionBo.java

@@ -59,6 +59,8 @@ public class SettlementOfSubcontractingCompletionBo extends BaseEntity {
      */
     private String contractName;
 
+    private Long deptId;
+
     /**
      * 审定总价
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/domain/vo/SettlementOfSubcontractingCompletionVo.java

@@ -75,6 +75,8 @@ public class SettlementOfSubcontractingCompletionVo implements Serializable {
     @ExcelProperty(value = "合同名称")
     private String contractName;
 
+    private Long deptId;
+
     /**
      * 审定总价
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java

@@ -221,6 +221,7 @@ public class SettlementOfSubcontractingCompletionServiceImpl extends ServiceImpl
         lqw.eq(StringUtils.isNotBlank(bo.getDocumentCode()), SettlementOfSubcontractingCompletion::getDocumentCode, bo.getDocumentCode());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), SettlementOfSubcontractingCompletion::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, SettlementOfSubcontractingCompletion::getDocumentDate, bo.getDocumentDate());
+        lqw.eq(bo.getDeptId() != null, SettlementOfSubcontractingCompletion::getDeptId, bo.getDeptId());
         lqw.ge(bo.getStartTime() != null, SettlementOfSubcontractingCompletion::getDocumentDate, bo.getStartTime());
         lqw.le(bo.getEndTime() != null, SettlementOfSubcontractingCompletion::getDocumentDate, bo.getEndTime());
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/domain/SettlementOfSubcontractingAdjustment.java

@@ -84,6 +84,8 @@ public class SettlementOfSubcontractingAdjustment extends BaseEntity {
      */
     private String fileId;
 
+    private Long deptId;
+
     /**
      * 备注
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/domain/bo/SettlementOfSubcontractingAdjustmentBo.java

@@ -45,6 +45,8 @@ public class SettlementOfSubcontractingAdjustmentBo extends BaseEntity {
      */
     private LocalDate documentDate;
 
+    private Long deptId;
+
     /**
      * 决算单编号
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/domain/vo/SettlementOfSubcontractingAdjustmentVo.java

@@ -64,6 +64,7 @@ public class SettlementOfSubcontractingAdjustmentVo implements Serializable {
     @ExcelProperty(value = "决算单编号")
     private Long finalAccountNo;
 
+    private Long deptId;
 
     /**
      * 决算单编号名称

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/service/impl/SettlementOfSubcontractingAdjustmentServiceImpl.java

@@ -129,6 +129,8 @@ public class SettlementOfSubcontractingAdjustmentServiceImpl extends ServiceImpl
         lqw.eq(StringUtils.isNotBlank(bo.getDocumentNo()), SettlementOfSubcontractingAdjustment::getDocumentNo, bo.getDocumentNo());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), SettlementOfSubcontractingAdjustment::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, SettlementOfSubcontractingAdjustment::getDocumentDate, bo.getDocumentDate());
+        lqw.eq(bo.getDeptId() != null, SettlementOfSubcontractingAdjustment::getDeptId, bo.getDeptId());
+
         lqw.eq(bo.getFinalAccountNo() != null, SettlementOfSubcontractingAdjustment::getFinalAccountNo, bo.getFinalAccountNo());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), SettlementOfSubcontractingAdjustment::getContractName, bo.getContractName());
         lqw.eq(StringUtils.isNotBlank(bo.getContractNo()), SettlementOfSubcontractingAdjustment::getContractNo, bo.getContractNo());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/domain/FinancialRevenuePlanAlteration.java

@@ -44,6 +44,8 @@ public class FinancialRevenuePlanAlteration extends BaseEntity {
      */
     private Long project;
 
+    private Long deptId;
+
     /**
      * 计划类型
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/domain/bo/FinancialRevenuePlanAlterationBo.java

@@ -74,6 +74,8 @@ public class FinancialRevenuePlanAlterationBo extends BaseEntity {
      */
     private BigDecimal expenseTotal;
 
+    private Long deptId;
+
     /**
      * 收入总额
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/domain/vo/FinancialRevenuePlanAlterationVo.java

@@ -67,6 +67,8 @@ public class FinancialRevenuePlanAlterationVo implements Serializable {
     @ExcelProperty(value = "项目")
     private String projectName;
 
+    private Long deptId;
+
     /**
      * 计划类型
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java

@@ -201,6 +201,7 @@ public class FinancialRevenuePlanAlterationServiceImpl extends ServiceImpl<Finan
         lqw.eq(StringUtils.isNotBlank(bo.getWorkCycle()), FinancialRevenuePlanAlteration::getWorkCycle, bo.getWorkCycle());
         lqw.eq(bo.getStartDate() != null, FinancialRevenuePlanAlteration::getStartDate, bo.getStartDate());
         lqw.eq(bo.getEndDate() != null, FinancialRevenuePlanAlteration::getEndDate, bo.getEndDate());
+        lqw.eq(bo.getDeptId() != null, FinancialRevenuePlanAlteration::getDeptId, bo.getDeptId());
         lqw.eq(bo.getExpenseTotal() != null, FinancialRevenuePlanAlteration::getExpenseTotal, bo.getExpenseTotal());
         lqw.eq(bo.getIncomeTotal() != null, FinancialRevenuePlanAlteration::getIncomeTotal, bo.getIncomeTotal());
         lqw.eq(StringUtils.isNotBlank(bo.getIsTemporaryPlan()), FinancialRevenuePlanAlteration::getIsTemporaryPlan, bo.getIsTemporaryPlan());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/FinancialRevenueExpenditurePlan.java

@@ -94,6 +94,8 @@ public class FinancialRevenueExpenditurePlan extends BaseEntity {
      */
     private BigDecimal projectAvailableBalance;
 
+    private Long deptId;
+
     /**
      * 累计收款金额
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/bo/FinancialRevenueExpenditurePlanBo.java

@@ -72,6 +72,8 @@ public class FinancialRevenueExpenditurePlanBo extends BaseEntity {
      */
     private BigDecimal expenseTotal;
 
+    private Long deptId;
+
     /**
      * 收入总额
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/domain/vo/FinancialRevenueExpenditurePlanVo.java

@@ -74,6 +74,8 @@ public class FinancialRevenueExpenditurePlanVo implements Serializable {
     @ExcelProperty(value = "计划类型")
     private String planType;
 
+
+    private Long deptId;
     /**
      * 工作周期
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java

@@ -202,6 +202,7 @@ public class FinancialRevenueExpenditurePlanServiceImpl extends ServiceImpl<Fina
         lqw.eq(bo.getProject() != null, FinancialRevenueExpenditurePlan::getProject, bo.getProject());
         lqw.eq(StringUtils.isNotBlank(bo.getPlanType()), FinancialRevenueExpenditurePlan::getPlanType, bo.getPlanType());
         lqw.eq(bo.getWorkCycle() != null, FinancialRevenueExpenditurePlan::getWorkCycle, bo.getWorkCycle());
+        lqw.eq(bo.getDeptId() != null, FinancialRevenueExpenditurePlan::getDeptId, bo.getDeptId());
         lqw.eq(bo.getStartDate() != null, FinancialRevenueExpenditurePlan::getStartDate, bo.getStartDate());
         lqw.eq(bo.getEndDate() != null, FinancialRevenueExpenditurePlan::getEndDate, bo.getEndDate());
         lqw.eq(bo.getExpenseTotal() != null, FinancialRevenueExpenditurePlan::getExpenseTotal, bo.getExpenseTotal());