导出字段顺序调整

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -213,7 +213,7 @@ public class CmcDeviceApprovalController extends BaseController
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcDeviceApproval cmcDeviceApproval = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(formDataJson.getString("deviceApplyId"));
-        if (formDataJson.getString("modifyDevices") != null && formDataJson.getString("managerComment") == null) {
+        if (formDataJson.getString("modifyDevices") != null && formDataJson.getString("managerComment") == null && formDataJson.getString("dispatcher") == null) {
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
             cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
             cmcDeviceApproval.setDispatchTime(new Date());

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -117,7 +117,6 @@ public class SysRoleController extends BaseController
         }
         role.setCreateBy(getUsername());
         return toAjax(roleService.insertRole(role));
-
     }
 
     /**

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBorrow.java

@@ -67,14 +67,14 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "部门意见")
     private String deptComment;
 
-    /** 部门审批人 */
-    @Excel(name = "部门审批人")
+    /** 部门审核人 */
+    @Excel(name = "部门审核人")
     private String deptUserName;
     private Long deptUserId;
 
-    /** 部门审批时间 */
+    /** 部门审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "部门审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date deptTime;
 
     /** 分管审批意见 */

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCarApproval.java

@@ -24,51 +24,18 @@ public class CmcCarApproval extends BaseEntity
     private String carApplyId;
 
     /** 申请人 */
-    private Long applier;
-
     @Excel(name = "申请人")
     private String applierUserName;
-    private SysUser applierUser;
-
-    @Excel(name = "部门审批人")
-    private String deptUserName;
-    private SysUser deptUser;
-
-    @Excel(name = "分管审批人")
-    private String managerUserName;
-    private SysUser managerUser;
-
-    @Excel(name = "党工团审批人")
-    private String unionUserName;
-    private SysUser unionUser;
-
-    @Excel(name = "总经理")
-    private String gmUserName;
-    private SysUser gmUser;
-
-    @Excel(name = "董事长")
-    private String dszUserName;
-    private SysUser dszUser;
-
-    @Excel(name = "车辆管理员")
-    private String dispatchUserName;
-    private SysUser dispatchUser;
+    private Long applier;
 
     /** 使用部门 */
-    private Long useDept;
     @Excel(name = "使用部门")
     private String deptName;
-    private SysDept dept;
-
-    /** 车辆id */
-    @Excel(name = "车牌号")
-    private String carNames;
-    private String cars;
+    private Long useDept;
 
-    /** 驾驶员id */
-    @Excel(name = "驾驶员")
-    private String driverNames;
-    private String drivers;
+    /** 申请用途 */
+    @Excel(name = "申请用途")
+    private String carUsage;
 
     /** 项目编号 */
     private String projectId;
@@ -100,90 +67,124 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "天数")
     private Long days;
 
-    /** 部门审批人 */
-    private Long deptUserId;
+    /** 申请日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyDate;
 
-    /** 部门审批意见 */
-    @Excel(name = "部门审批意见")
+    /** 部门审核意见 */
+    @Excel(name = "部门审核意见")
     private String deptComment;
 
-    /** 分管审批人 */
-    private Long managerUserId;
+    /** 部门审核人 */
+    @Excel(name = "部门审核人")
+    private String deptUserName;
+    private Long deptUserId;
+
+    /** 部门审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "部门审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deptTime;
 
     /** 分管审批意见 */
     @Excel(name = "分管审批意见")
     private String managerComment;
 
-    /** 申请用途 */
-    @Excel(name = "申请用途")
-    private String carUsage;
+    /** 分管审批人 */
+    @Excel(name = "分管审批人")
+    private String managerUserName;
+    private Long managerUserId;
 
-    /** 工会审批人 */
-    private Long unionUserId;
+    /** 分管审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
 
-    /** 工会审批意见 */
-    @Excel(name = "工会审批意见")
+    /** 党工团审批意见 */
+    @Excel(name = "党工团审批意见")
     private String unionComment;
 
-    /** 总经理审批人 */
-    private Long gmUserId;
+    /** 党工团审批人 */
+    @Excel(name = "党工团审批人")
+    private String unionUserName;
+    private Long unionUserId;
 
-    /** 董事长审批人 */
-    private Long dszUserId;
+    /** 党工团审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "党工团审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date unionTime;
 
     /** 总经理审批意见 */
     @Excel(name = "总经理审批意见")
     private String gmComment;
 
+    /** 总经理审批人 */
+    @Excel(name = "总经理")
+    private String gmUserName;
+    private Long gmUserId;
+
+    /** 总经理审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date gmTime;
+
     /** 董事长审批意见 */
     @Excel(name = "董事长审批意见")
     private String dszComment;
 
+    /** 董事长审批人 */
+    @Excel(name = "董事长")
+    private String dszUserName;
+    private Long dszUserId;
+
+    /** 董事长审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "董事长审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dszTime;
+
+    /** 安排用车意见 */
+    @Excel(name = "安排用车意见")
+    private String dispatchComment;
+
     /** 调度员 */
+    @Excel(name = "车辆管理员")
+    private String dispatchUserName;
     private Long dispatcher;
 
-    /** 调度审批意见 */
-    @Excel(name = "调度审批意见")
-    private String dispatchComment;
+    /** 车辆id */
+    @Excel(name = "车牌号")
+    private String carNames;
+    private String cars;
+
+    /** 驾驶员id */
+    @Excel(name = "驾驶员")
+    private String driverNames;
+    private String drivers;
 
     /** 预计用车成本 */
-    @Excel(name = "预计用车成本")
+//    @Excel(name = "预计用车成本")
     private BigDecimal estimateCost;
 
-    /** 申请日期 */
+    /** 派车审批时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date applyDate;
+    @Excel(name = "派车审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dispatchTime;
 
-    /** 部门审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date deptTime;
+    private SysUser applierUser;
 
-    /** 分管审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date managerTime;
+    private SysUser deptUser;
 
-    /** 工会审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "工会审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date unionTime;
+    private SysUser managerUser;
 
-    /** 总经理审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date gmTime;
+    private SysUser unionUser;
 
-    /** 董事长审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "董事长审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date dszTime;
+    private SysUser gmUser;
 
-    /** 派车审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "派车审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date dispatchTime;
+    private SysUser dszUser;
+
+    private SysUser dispatchUser;
+
+    private SysDept dept;
 
     public void setCarApplyId(String carApplyId)
     {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcContract.java

@@ -19,7 +19,7 @@ public class CmcContract extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 合同id（ht2024w002） */
+    /** 合同id */
     private String contractId;
 
     /** 合同名称 */
@@ -35,18 +35,14 @@ public class CmcContract extends BaseEntity
     private String contractNumber;
 
     /** 投标项目 */
-    private Integer tenderId;
-
     @Excel(name = "投标项目")
     private String tenderName;
-    private CmcTender tender;
+    private Integer tenderId;
 
     /** 甲方单位 */
-    private String partyAId;
-
     @Excel(name = "甲方单位")
     private String partyAName;
-    private CmcPartyA partyA;
+    private String partyAId;
 
     /** 合同金额 */
     @Excel(name = "合同金额")
@@ -57,34 +53,19 @@ public class CmcContract extends BaseEntity
     private BigDecimal deposit;
 
     /** 合同文件 */
-    @Excel(name = "合同文件")
+//    @Excel(name = "合同文件")
     private String contractDocument;
 
     /** 拟稿人 */
-    private Long drafter;
-
     @Excel(name = "拟稿人")
     private String draftUserName;
-    private SysUser draftUser;
+    private Long drafter;
 
     /** 拟稿日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "拟稿日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date draftTime;
 
-    /** 签订日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "签订日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date signDate;
-
-    /** 签订备注 */
-    @Excel(name = "签订备注")
-    private String signRemark;
-
-    /** 签订扫描件 */
-    @Excel(name = "签订扫描件")
-    private String signScan;
-
     /** 评审方式 */
     @Excel(name = "评审方式", readConverterExp = "0=无须评审,1=会议评审,2=线上会审")
     private String commentType;
@@ -94,31 +75,51 @@ public class CmcContract extends BaseEntity
     private String managerComment;
 
     /** 分管审批人 */
-    private Long managerUserId;
-
     @Excel(name = "分管审批人")
     private String managerUserName;
-    private SysUser managerUser;
+    private Long managerUserId;
 
     /** 分管审批日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "分管审批日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date managerTime;
 
+    /** 总经理审核意见 */
+    @Excel(name = "总经理审核意见")
+    private String gmComment;
+
     /** 总经理审核人 */
     private Long gmUserId;
     @Excel(name = "总经理")
     private String gmUserName;
-    private SysUser gmUser;
 
     /** 总经理审核日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "总经理审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date gmTime;
 
-    /** 总经理审核意见 */
-    @Excel(name = "总经理审核意见")
-    private String gmComment;
+    /** 签订日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "签订日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date signDate;
+
+    /** 签订备注 */
+    @Excel(name = "签订备注")
+    private String signRemark;
+
+    /** 签订扫描件 */
+//    @Excel(name = "签订扫描件")
+    private String signScan;
+
+    private SysUser draftUser;
+
+    private SysUser managerUser;
+
+    private SysUser gmUser;
+
+    private CmcTender tender;
+
+    private CmcPartyA partyA;
 
     public void setContractId(String contractId)
     {
@@ -187,7 +188,7 @@ public class CmcContract extends BaseEntity
     public void setPartyA(CmcPartyA partyA)
     {
         this.partyA = partyA;
-        this.partyAName = partyA.getPartyAName();
+        this.partyAName = partyA != null ? partyA.getPartyAName() : "";
     }
 
     public CmcPartyA getPartyA()

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeposit.java

@@ -29,13 +29,11 @@ public class CmcDeposit extends BaseEntity
     private Integer tenderId;
     @Excel(name = "投标项目名称")
     private String projectName;
-    private CmcTender tender;
 
     /** 合同id */
     private String contractId;
     @Excel(name = "合同名称")
     private String contractName;
-    private CmcContract contract;
 
     /** 预计退还日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -59,19 +57,9 @@ public class CmcDeposit extends BaseEntity
     private String depositWay;
 
     /** 申请人 */
-    private Long applier;
-
     @Excel(name = "申请人")
     private String applierUserName;
-    private SysUser applierUser;
-
-    @Excel(name = "分管审批人")
-    private String managerUserName;
-    private SysUser managerUser;
-
-    @Excel(name = "财务部经办人")
-    private String cwUserName;
-    private SysUser cwUser;
+    private Long applier;
 
     /** 申请日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -83,46 +71,60 @@ public class CmcDeposit extends BaseEntity
     private String applyReason;
 
     /** 相关附件 */
-    @Excel(name = "相关附件")
+//    @Excel(name = "相关附件")
     private String applyDocument;
 
     /** 分管审批意见 */
     @Excel(name = "分管审批意见")
     private String managerComment;
 
+    /** 分管审批人 */
+    @Excel(name = "分管审批人")
+    private String managerUserName;
+    private Long managerUserId;
+
     /** 分管审批时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date managerTime;
 
-    /** 分管审批人 */
-    private Long managerUserId;
+    /** 财务打款备注 */
+    @Excel(name = "财务打款备注")
+    private String cwComment;
+
+    /** 汇款凭证 */
+//    @Excel(name = "汇款凭证")
+    private String remitDocument;
 
     /** 汇款日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "汇款日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date remitTime;
 
-    /** 财务处理时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "财务处理时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date cwTime;
-
     /** 退还时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "退还时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date backTime;
 
-    /** 财务打款备注 */
-    @Excel(name = "财务打款备注")
-    private String cwComment;
-
     /** 财务处理人 */
+    @Excel(name = "财务部经办人")
+    private String cwUserName;
     private Long cwUserId;
 
-    /** 汇款凭证 */
-    @Excel(name = "汇款凭证")
-    private String remitDocument;
+    /** 财务处理时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "财务处理时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date cwTime;
+
+    private SysUser applierUser;
+
+    private SysUser managerUser;
+
+    private SysUser cwUser;
+
+    private CmcTender tender;
+
+    private CmcContract contract;
 
     public void setDepositId(String depositId) 
     {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDevice.java

@@ -22,21 +22,33 @@ public class CmcDevice extends BaseEntity
     /** 设备id */
     private Integer deviceId;
 
+    /** 状态 */
+    @Excel(name = "状态", readConverterExp = "0=被领用,1=可领用,2=维修中,3=已停用,4=已报废")
+    private String status;
+
     /** 设备编码 */
     @Excel(name = "设备编码")
     private String deviceNumber;
 
-    /** 出厂编号 */
-    @Excel(name = "出厂编号")
-    private String code;
+    /** 设备类别 */
+    @Excel(name = "设备类别")
+    private String type;
 
     /** 设备名称 */
     @Excel(name = "设备名称")
     private String name;
 
-    /** 设备类别 */
-    @Excel(name = "设备类别")
-    private String type;
+    /** 设备品牌 */
+    @Excel(name = "设备品牌")
+    private String brand;
+
+    /** 规格型号 */
+    @Excel(name = "规格型号")
+    private String series;
+
+    /** 出厂编号 */
+    @Excel(name = "出厂编号")
+    private String code;
 
     /** 购置时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -51,14 +63,6 @@ public class CmcDevice extends BaseEntity
     @Excel(name = "预计使用年限")
     private Integer expectLife;
 
-    /** 规格型号 */
-    @Excel(name = "规格型号")
-    private String series;
-
-    /** 设备品牌 */
-    @Excel(name = "设备品牌")
-    private String brand;
-
     /** 单日成本 */
     @Excel(name = "单日成本")
     private BigDecimal dayCost;
@@ -68,17 +72,12 @@ public class CmcDevice extends BaseEntity
     private String place;
 
     /** 管理部门id */
-    @Excel(name = "管理部门id")
+    @Excel(name = "管理部门")
+    private String deptName;
     private Long manageDept;
 
-    /** 管理部门 */
-    @Excel(name = "管理部门")
     private SysDept dept;
 
-    /** 状态 */
-    @Excel(name = "状态", readConverterExp = "0=被领用,1=可领用,2=维修中,3=已停用,4=已报废")
-    private String status;
-
     public void setDeviceId(Integer deviceId)
     {
         this.deviceId = deviceId;
@@ -199,6 +198,7 @@ public class CmcDevice extends BaseEntity
     public void setDept(SysDept dept)
     {
         this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
     }
 
     public SysDept getDept()

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceApproval.java

@@ -25,38 +25,14 @@ public class CmcDeviceApproval extends BaseEntity
     private String deviceApplyId;
 
     /** 申请人 */
-    @Excel(name = "申请人")
-    private Long applier;
-
     @Excel(name = "申请人")
     private String applierUserName;
-    private SysUser applierUser;
-
-    @Excel(name = "分管审批人")
-    private String managerUserName;
-    private SysUser managerUser;
-
-    @Excel(name = "设备管理员")
-    private String dispatchUserName;
-    private SysUser dispatchUser;
+    private Long applier;
 
     /** 使用部门 */
-    private Long useDept;
     @Excel(name = "使用部门")
     private String deptName;
-    private SysDept dept;
-
-    /** 设备id */
-    @Excel(name = "申领设备")
-    private String deviceNames;
-    private String devices;
-
-    /** 修改后设备id */
-    @Excel(name = "发放设备")
-    private String modifyDeviceNames;
-    @Excel(name = "发放设备序号")
-    private String modifyDeviceNumbers;
-    private String modifyDevices;
+    private Long useDept;
 
     /** 项目id */
     @Excel(name = "项目id")
@@ -65,7 +41,6 @@ public class CmcDeviceApproval extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
-    private CmcProject project;
 
     /** 申领事由 */
     @Excel(name = "申领事由")
@@ -85,28 +60,54 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "天数")
     private Long days;
 
-    /** 分管审批人 */
-    private Long managerUserId;
-
-    /** 分管审批意见 */
-    @Excel(name = "分管审批意见")
-    private String managerComment;
+    /** 设备id */
+    @Excel(name = "申领设备")
+    private String deviceNames;
+    private String devices;
 
-    /** 调度员 */
-    private Long dispatcher;
+    /** 申请日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyDate;
 
-    /** 调度审批意见 */
-    @Excel(name = "调度审批意见")
+    /** 安排设备意见 */
+    @Excel(name = "安排设备意见")
     private String dispatchComment;
 
+    /** 修改后设备id */
+    @Excel(name = "发放设备")
+    private String modifyDeviceNames;
+    @Excel(name = "发放设备序号")
+    private String modifyDeviceNumbers;
+    private String modifyDevices;
+
+    /** 设备管理员 */
+    @Excel(name = "设备管理员")
+    private String dispatchUserName;
+    private Long dispatcher;
+
     /** 预计设备成本 */
-    @Excel(name = "预计设备成本")
+//    @Excel(name = "预计设备成本")
     private BigDecimal estimateCost;
 
-    /** 申请日期 */
+    /** 设备发放时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date applyDate;
+    @Excel(name = "设备发放时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dispatchTime;
+
+    /** 分管审批意见 */
+    @Excel(name = "分管审批意见")
+    private String managerComment;
+
+    /** 分管审批人 */
+    @Excel(name = "分管审批人")
+    private String managerUserName;
+    private Long managerUserId;
+
+    /** 分管审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
 
     /** 确认日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -118,16 +119,6 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "归还日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date returnDate;
 
-    /** 分管审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date managerTime;
-
-    /** 调度审批时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "调度审批时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date dispatchTime;
-
     /** 需维修设备id */
     @Excel(name = "需维修设备")
     private String repairDeviceNames;
@@ -135,6 +126,16 @@ public class CmcDeviceApproval extends BaseEntity
     private String repairDeviceNumbers;
     private String repairDevices;
 
+    private SysUser applierUser;
+
+    private SysUser managerUser;
+
+    private SysUser dispatchUser;
+
+    private SysDept dept;
+
+    private CmcProject project;
+
     public void setDeviceApplyId(String deviceApplyId)
     {
         this.deviceApplyId = deviceApplyId;
@@ -157,6 +158,7 @@ public class CmcDeviceApproval extends BaseEntity
     public void setApplierUser(SysUser applierUser)
     {
         this.applierUser = applierUser;
+        this.applierUserName = applierUser == null ? "" : applierUser.getNickName();
     }
 
     public SysUser getApplierUser()
@@ -166,6 +168,7 @@ public class CmcDeviceApproval extends BaseEntity
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
     }
 
     public SysUser getManagerUser()
@@ -175,6 +178,7 @@ public class CmcDeviceApproval extends BaseEntity
     public void setDispatchUser(SysUser dispatchUser)
     {
         this.dispatchUser = dispatchUser;
+        this.dispatchUserName = dispatchUser == null ? "" : dispatchUser.getNickName();
     }
 
     public SysUser getDispatchUser()

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceExpense.java

@@ -22,56 +22,52 @@ public class CmcDeviceExpense extends BaseEntity
     /** 设备费用id */
     private Integer deviceExpenseId;
 
-    /** 设备id */
-    private Integer deviceId;
-    private CmcDevice device;
-
     /** 车辆id */
-    private Integer carId;
-    private CmcCar car;
-
     @Excel(name = "车牌号")
     private String licensePlate;
+    private Integer carId;
 
+    /** 设备id */
     @Excel(name = "设备编码")
     private String deviceNumber;
-
     @Excel(name = "设备名称")
     private String name;
-
     @Excel(name = "出厂编号")
     private String code;
-
     @Excel(name = "品牌")
     private String brand;
-
     @Excel(name = "系列")
     private String series;
+    private Integer deviceId;
 
-    /** 负责人id */
-    private Long userId;
-
-    @Excel(name = "负责人")
-    private String nickName;
-    private SysUser user;
-
-    /** 费用类型（0保险费,1维修保养费,2检定费） */
-    @Excel(name = "费用类型", readConverterExp = "0=保险费,1=维修/保养费,2=检定费")
+    /** 费用类型（0保险费,1维修保养费,2轮胎费,3检定费） */
+    @Excel(name = "费用类型", readConverterExp = "0=保险费,1=维修/保养费,2=轮胎费,3=检定费")
     private String expenseType;
 
     /** 费用金额 */
     @Excel(name = "费用金额")
     private BigDecimal expense;
 
+    /** 负责人id */
+    @Excel(name = "负责人")
+    private String nickName;
+    private Long userId;
+
     /** 发生日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "发生日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date occurDate;
 
     /** 附件 */
-    @Excel(name = "附件")
+//    @Excel(name = "附件")
     private String document;
 
+    private SysUser user;
+
+    private CmcCar car;
+
+    private CmcDevice device;
+
     public void setDeviceExpenseId(Integer deviceExpenseId)
     {
         this.deviceExpenseId = deviceExpenseId;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceHandover.java

@@ -23,24 +23,17 @@ public class CmcDeviceHandover extends BaseEntity
     private Integer deviceHandoverId;
 
     /** 设备id */
-    private Integer deviceId;
-    private CmcDevice device;
-
     @Excel(name = "设备编码")
     private String deviceNumber;
-
     @Excel(name = "设备名称")
     private String name;
-
     @Excel(name = "出厂编号")
     private String code;
-
     @Excel(name = "品牌")
     private String brand;
-
     @Excel(name = "系列")
     private String series;
-
+    private Integer deviceId;
 
     /** 移交部门id */
     @Excel(name = "移交部门")
@@ -67,6 +60,14 @@ public class CmcDeviceHandover extends BaseEntity
     private String receiveNickName;
     private Long receiveUserId;
 
+    /** 设备软件说明 */
+    @Excel(name = "设备软件说明")
+    private String description;
+
+    /** 交接原因 */
+    @Excel(name = "交接原因")
+    private String reason;
+
     private SysUser handoverUser;
 
     private SysUser receiveUser;
@@ -75,13 +76,7 @@ public class CmcDeviceHandover extends BaseEntity
 
     private SysDept receiveDept;
 
-    /** 设备软件说明 */
-    @Excel(name = "设备软件说明")
-    private String description;
-
-    /** 交接原因 */
-    @Excel(name = "交接原因")
-    private String reason;
+    private CmcDevice device;
 
     public void setDeviceHandoverId(Integer deviceHandoverId)
     {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceScrap.java

@@ -21,31 +21,23 @@ public class CmcDeviceScrap extends BaseEntity
     /** 设备报废id */
     private Integer deviceScrapId;
 
-    /** 设备id */
-    private Integer deviceId;
-    private CmcDevice device;
-
     /** 车辆id */
-    private Integer carId;
-    private CmcCar car;
-
     @Excel(name = "车牌号")
     private String licensePlate;
+    private Integer carId;
 
+    /** 设备id */
     @Excel(name = "设备编码")
     private String deviceNumber;
-
     @Excel(name = "设备名称")
     private String name;
-
     @Excel(name = "出厂编号")
     private String code;
-
     @Excel(name = "品牌")
     private String brand;
-
     @Excel(name = "系列")
     private String series;
+    private Integer deviceId;
 
     /** 原价值 */
     @Excel(name = "原价值")
@@ -65,9 +57,13 @@ public class CmcDeviceScrap extends BaseEntity
     private String deal;
 
     /** 附件 */
-    @Excel(name = "附件")
+//    @Excel(name = "附件")
     private String document;
 
+    private CmcCar car;
+
+    private CmcDevice device;
+
     public void setDeviceScrapId(Integer deviceScrapId)
     {
         this.deviceScrapId = deviceScrapId;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcManageDept.java

@@ -17,20 +17,21 @@ public class CmcManageDept extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 分管领导id */
-    private Long userId;
     @Excel(name = "分管领导")
     private String userName;
-    private SysUser user;
+    private Long userId;
 
     /** 分管部门id */
-    private String deptId;
     @Excel(name = "分管部门")
     private String deptName;
+    private String deptId;
 
     /** 院内对接单位 */
-    private String partyAId;
     @Excel(name = "院内对接单位")
     private String partyAName;
+    private String partyAId;
+
+    private SysUser user;
 
     public void setUserId(Long userId) 
     {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -33,14 +33,8 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目负责人")
     private Long projectLeader;
 
-    private SysUser projectLeaderUser;
-
-    private SysUser technicalDirectorUser;
-
     private String qualityInspector;
 
-    private String qualityInspectorName;
-
     /** 项目状态（0进行中、1已结束） */
     @Excel(name = "项目状态", readConverterExp = "0=进行中,1=已结束")
     private String isFinished;
@@ -75,8 +69,6 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目登记人")
     private Long projectRegistrant;
 
-    private SysUser projectRegistrantUser;
-
     /** 承担部门 */
     private String undertakingDept;
 
@@ -92,8 +84,12 @@ public class CmcProject extends BaseEntity
     @Excel(name = "现场负责人")
     private Long siteLeader;
 
+    /** 项目负责人 */
+    @Excel(name = "质量检查员")
+    private String qualityInspectorName;
+
     /** 组织交底文档 */
-    @Excel(name = "组织交底文档")
+//    @Excel(name = "组织交底文档")
     private String organizeDocument;
 
     /** 项目登记日期 */
@@ -108,7 +104,7 @@ public class CmcProject extends BaseEntity
 
     /** 组织交底日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "组织交底日期", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "组织交底日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date organizeTime;
 
     /** 进场时间 */
@@ -161,6 +157,12 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目提交要求")
     private String projectRequest;
 
+    private SysUser projectLeaderUser;
+
+    private SysUser technicalDirectorUser;
+
+    private SysUser projectRegistrantUser;
+
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProjectChange.java

@@ -30,27 +30,29 @@ public class CmcProjectChange extends BaseEntity
     @Excel(name = "承担部门")
     private String undertakingDeptName;
     private String undertakingDept;
-    private CmcProject project;
+    @Excel(name = "项目负责人")
+    private String leaderUserName;
 
     /** 变更内容 */
     @Excel(name = "变更内容")
     private String content;
 
-    @Excel(name = "项目负责人")
-    private String leaderUserName;
-    private SysUser leaderUser;
-
     /** 登记人 */
-    private Long registrant;
     @Excel(name = "登记人")
     private String registrantUserName;
-    private SysUser registrantUser;
+    private Long registrant;
 
     /** 登记时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "登记时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date registerTime;
 
+    private CmcProject project;
+
+    private SysUser leaderUser;
+
+    private SysUser registrantUser;
+
     public void setChangeId(String changeId)
     {
         this.changeId = changeId;
@@ -120,7 +122,6 @@ public class CmcProjectChange extends BaseEntity
     {
         this.leaderUser = leaderUser;
         this.leaderUserName = leaderUser == null ? "" : leaderUser.getNickName();
-
     }
 
     public SysUser getLeaderUser()
@@ -131,7 +132,6 @@ public class CmcProjectChange extends BaseEntity
     {
         this.registrantUser = registrantUser;
         this.registrantUserName = registrantUser == null ? "" : registrantUser.getNickName();
-
     }
 
     public SysUser getRegistrantUser()

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSafe.java

@@ -27,21 +27,6 @@ public class CmcSafe extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
-    private CmcProject project;
-
-    /** 接受交底人 */
-    private Long disclosureAccepter;
-    @Excel(name = "接受交底人")
-    private String acceptUserName;
-
-    private SysUser accepterUser;
-
-    /** 安全交底人 */
-    private Long disclosurer;
-    @Excel(name = "安全交底人")
-    private String disclosurerUserName;
-
-    private SysUser disclosurerUser;
 
     /** 环境要求 */
     @Excel(name = "环境要求")
@@ -59,20 +44,36 @@ public class CmcSafe extends BaseEntity
     @Excel(name = "安全交底意见")
     private String disclosureComment;
 
-    /** 接受交底意见 */
-    @Excel(name = "接受交底意见")
-    private String acceptComment;
+    /** 安全交底人 */
+    @Excel(name = "安全交底人")
+    private String disclosurerUserName;
+    private Long disclosurer;
 
     /** 安全交底时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "安全交底时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date disclosureTime;
 
+    /** 接受交底意见 */
+    @Excel(name = "接受交底意见")
+    private String acceptComment;
+
+    /** 接受交底人 */
+    @Excel(name = "接受交底人")
+    private String acceptUserName;
+    private Long disclosureAccepter;
+
     /** 接受交底时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "接受交底时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date acceptTime;
 
+    private SysUser accepterUser;
+
+    private SysUser disclosurerUser;
+
+    private CmcProject project;
+
     public void setSafeId(String safeId) 
     {
         this.safeId = safeId;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSafeReport.java

@@ -27,7 +27,6 @@ public class CmcSafeReport extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
-    private CmcProject project;
 
     /** 公司人员 */
     private String member;
@@ -46,13 +45,16 @@ public class CmcSafeReport extends BaseEntity
     private Long reporter;
     @Excel(name = "填报人")
     private String reporterName;
-    private SysUser reportUser;
 
     /** 报告日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "报告日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date reportDate;
 
+    private SysUser reportUser;
+
+    private CmcProject project;
+
     public void setSafeReportId(Integer safeReportId)
     {
         this.safeReportId = safeReportId;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSettle.java

@@ -27,53 +27,32 @@ public class CmcSettle extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
-    private CmcProject project;
 
     /** 工作量上报说明 */
     @Excel(name = "工作量上报说明")
     private String workloadReport;
 
-    /** 上报人 */
-    private Long reporter;
+    /** 结算说明 */
+    @Excel(name = "结算说明")
+    private String settleComment;
 
+    /** 上报人 */
     @Excel(name = "项目负责人")
     private String reporterUserName;
-    private SysUser reporterUser;
-
-    @Excel(name = "综合事务部审核人")
-    private String zhUserName;
-    private SysUser zhUser;
-
-    @Excel(name = "技术质量与安全部审核人")
-    private String jsUserName;
-    private SysUser jsUser;
-
-    @Excel(name = "经营发展部审核人")
-    private String jyUserName;
-    private SysUser jyUser;
-
-    @Excel(name = "分管审核人")
-    private String managerUserName;
-    private SysUser managerUser;
-
-    @Excel(name = "总经理")
-    private String gmUserName;
-    private SysUser gmUser;
-
-    @Excel(name = "董事长")
-    private String dszUserName;
-    private SysUser dszUser;
+    private Long reporter;
 
     /** 上报日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date reportTime;
 
-    /** 结算说明 */
-    @Excel(name = "结算说明")
-    private String settleComment;
+    /** 综合事务部审核意见 */
+    @Excel(name = "综合事务部审核意见")
+    private String zhComment;
 
     /** 综合事务部审核人 */
+    @Excel(name = "综合事务部审核人")
+    private String zhUserName;
     private Long zhUserId;
 
     /** 综合事务部审核日期 */
@@ -81,11 +60,13 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "综合事务部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date zhTime;
 
-    /** 综合事务部审核意见 */
-    @Excel(name = "综合事务部审核意见")
-    private String zhComment;
+    /** 技术质量与安全部审核意见 */
+    @Excel(name = "技术质量与安全部审核意见")
+    private String jsComment;
 
     /** 技术质量与安全部审核人 */
+    @Excel(name = "技术质量与安全部审核人")
+    private String jsUserName;
     private Long jsUserId;
 
     /** 技术质量与安全部审核日期 */
@@ -93,11 +74,13 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "技术质量与安全部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date jsTime;
 
-    /** 技术质量与安全部审核意见 */
-    @Excel(name = "技术质量与安全部审核意见")
-    private String jsComment;
+    /** 经营发展部审核意见 */
+    @Excel(name = "经营发展部审核意见")
+    private String jyComment;
 
     /** 经营发展部审核人 */
+    @Excel(name = "经营发展部审核人")
+    private String jyUserName;
     private Long jyUserId;
 
     /** 经营发展部审核日期 */
@@ -105,11 +88,13 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "经营发展部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date jyTime;
 
-    /** 经营发展部审核意见 */
-    @Excel(name = "经营发展部审核意见")
-    private String jyComment;
+    /** 分管审核意见 */
+    @Excel(name = "分管审核意见")
+    private String managerComment;
 
     /** 分管审核人 */
+    @Excel(name = "分管审核人")
+    private String managerUserName;
     private Long managerUserId;
 
     /** 分管审核日期 */
@@ -117,11 +102,13 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "分管审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date managerTime;
 
-    /** 分管审核意见 */
-    @Excel(name = "分管审核意见")
-    private String managerComment;
+    /** 总经理审核意见 */
+    @Excel(name = "总经理审核意见")
+    private String gmComment;
 
     /** 总经理审核人 */
+    @Excel(name = "总经理")
+    private String gmUserName;
     private Long gmUserId;
 
     /** 总经理审核日期 */
@@ -129,11 +116,13 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "总经理审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date gmTime;
 
-    /** 总经理审核意见 */
-    @Excel(name = "总经理审核意见")
-    private String gmComment;
+    /** 董事长审核意见 */
+    @Excel(name = "董事长审核意见")
+    private String dszComment;
 
     /** 董事长审核人 */
+    @Excel(name = "董事长")
+    private String dszUserName;
     private Long dszUserId;
 
     /** 董事长审核日期 */
@@ -141,22 +130,34 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "董事长审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date dszTime;
 
-    /** 董事长审核意见 */
-    @Excel(name = "董事长审核意见")
-    private String dszComment;
-
     /** 原始结算表 */
-    @Excel(name = "原始结算表")
+//    @Excel(name = "原始结算表")
     private String settleDocument;
 
     /** 修改结算表 */
-    @Excel(name = "修改结算表")
+//    @Excel(name = "修改结算表")
     private String modifyDocument;
 
     /** 最终算表 */
-    @Excel(name = "最终结算表")
+//    @Excel(name = "最终结算表")
     private String finalDocument;
 
+    private SysUser reporterUser;
+
+    private SysUser zhUser;
+
+    private SysUser jsUser;
+
+    private SysUser jyUser;
+
+    private SysUser managerUser;
+
+    private SysUser gmUser;
+
+    private SysUser dszUser;
+
+    private CmcProject project;
+
     public void setSettleId(String settleId) 
     {
         this.settleId = settleId;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSubContract.java

@@ -31,11 +31,9 @@ public class CmcSubContract extends BaseEntity
     private BigDecimal subAmount;
 
     /** 承接单位id */
-    private String partnerId;
-
     @Excel(name = "承接单位")
     private String partnerName;
-    private CmcPartner partner;
+    private String partnerId;
 
     /** 承接单位联系人 */
     @Excel(name = "承接单位联系人")
@@ -45,41 +43,24 @@ public class CmcSubContract extends BaseEntity
     @Excel(name = "承接单位联系电话")
     private String telephone;
 
+    /** 评审方式 */
+    @Excel(name = "评审方式")
+    private String commentType;
+
     /** 合同文件 */
-    @Excel(name = "合同文件")
+//    @Excel(name = "合同文件")
     private String contractDocument;
 
     /** 拟稿人 */
-    private Long drafter;
-
     @Excel(name = "拟稿人")
     private String draftUserName;
-    private SysUser draftUser;
-
-    private SysUser managerUser;
+    private Long drafter;
 
     /** 拟稿日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "拟稿日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date draftTime;
 
-    /** 签订日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "签订日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date signDate;
-
-    /** 签订备注 */
-    @Excel(name = "签订备注")
-    private String signRemark;
-
-    /** 签订扫描件 */
-    @Excel(name = "签订扫描件")
-    private String signScan;
-
-    /** 评审方式 */
-    @Excel(name = "评审方式")
-    private String commentType;
-
     /** 分管审批意见 */
     @Excel(name = "分管审批意见")
     private String managerComment;
@@ -94,20 +75,40 @@ public class CmcSubContract extends BaseEntity
     @Excel(name = "分管审批日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date managerTime;
 
+    /** 总经理审核意见 */
+    @Excel(name = "总经理审核意见")
+    private String gmComment;
+
     /** 总经理审核人 */
-    private Long gmUserId;
     @Excel(name = "总经理")
     private String gmUserName;
-    private SysUser gmUser;
+    private Long gmUserId;
 
     /** 总经理审核日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "总经理审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date gmTime;
 
-    /** 总经理审核意见 */
-    @Excel(name = "总经理审核意见")
-    private String gmComment;
+    /** 签订备注 */
+    @Excel(name = "签订备注")
+    private String signRemark;
+
+    /** 签订扫描件 */
+//    @Excel(name = "签订扫描件")
+    private String signScan;
+
+    /** 签订日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "签订日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date signDate;
+
+    private SysUser draftUser;
+
+    private SysUser managerUser;
+
+    private SysUser gmUser;
+
+    private CmcPartner partner;
 
     public void setSubContractId(String subContractId)
     {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcTechnical.java

@@ -27,48 +27,49 @@ public class CmcTechnical extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
-    private CmcProject project;
-
-    /** 接受交底人 */
-    private Long disclosureAccepter;
-    @Excel(name = "接受交底人")
-    private String acceptUserName;
-
-    private SysUser accepterUser;
-
-    /** 安全交底人 */
-    private Long disclosurer;
-    @Excel(name = "安全交底人")
-    private String disclosurerUserName;
-
-    private SysUser disclosurerUser;
 
     /** 技术交底内容 */
     @Excel(name = "技术交底内容")
     private String content;
 
     /** 附件 */
-    @Excel(name = "附件")
+//    @Excel(name = "附件")
     private String document;
 
     /** 技术交底意见 */
     @Excel(name = "技术交底意见")
     private String disclosureComment;
 
-    /** 接受交底意见 */
-    @Excel(name = "接受交底意见")
-    private String acceptComment;
+    /** 安全交底人 */
+    @Excel(name = "安全交底人")
+    private String disclosurerUserName;
+    private Long disclosurer;
 
     /** 技术交底时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "技术交底时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date disclosureTime;
 
+    /** 接受交底意见 */
+    @Excel(name = "接受交底意见")
+    private String acceptComment;
+
+    /** 接受交底人 */
+    @Excel(name = "接受交底人")
+    private String acceptUserName;
+    private Long disclosureAccepter;
+
     /** 接受交底时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "接受交底时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date acceptTime;
 
+    private SysUser disclosurerUser;
+
+    private SysUser accepterUser;
+
+    private CmcProject project;
+
     public void setTechnicalId(String technicalId) 
     {
         this.technicalId = technicalId;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcTechnicalPlan.java

@@ -27,91 +27,91 @@ public class CmcTechnicalPlan extends BaseEntity
     private String projectNumber;
     @Excel(name = "项目名称")
     private String projectName;
-    private CmcProject project;
+
+    /** 技术安排意见 */
+    @Excel(name = "技术安排意见")
+    private String planComment;
+
+    /** 技术安排人 */
+    @Excel(name = "技术安排人")
+    private String planUserName;
+    private Long technicalPlanner;
+
+    /** 技术安排时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "技术安排时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date technicalTime;
 
     /** 技术负责人 */
+    @Excel(name = "技术负责人")
+    private String directUserName;
     private Long technicalDirector;
 
-    /** 技术设计人 */
-    private Long technicalDesigner;
+    /** 方案说明 */
+    @Excel(name = "方案说明")
+    private String designDescription;
 
     /** 技术设计人 */
-    private Long technicalAuditor;
+    @Excel(name = "技术设计人")
+    private String designUserName;
+    private Long technicalDesigner;
 
-    /** 技术安排人 */
-    private Long technicalPlanner;
+    /** 方案上传时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "方案上传时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date technicalUploadTime;
 
     /** 质量检查员 */
+    @Excel(name = "质量检查员")
+    private String qualityInspectorName;
     private String qualityInspector;
 
-    /** 总工审批人 */
-    private Long managerUserId;
-
-    @Excel(name = "技术负责人")
-    private String directUserName;
-    private SysUser directUser;
-
-    @Excel(name = "技术安排人")
-    private String planUserName;
-    private SysUser planUser;
+    /** 技术审核意见 */
+    @Excel(name = "技术审核意见")
+    private String technicalComment;
 
+    /** 技术审核人 */
     @Excel(name = "技术审核人")
     private String auditUserName;
-    private SysUser auditUser;
+    private Long technicalAuditor;
 
-    @Excel(name = "技术设计人")
-    private String designUserName;
-    private SysUser designUser;
+    /** 技术审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "技术审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date techApprovalTime;
 
+    /** 总工审核意见 */
+    @Excel(name = "总工审核意见")
+    private String manageComment;
+
+    /** 总工审批人 */
     @Excel(name = "总工程师")
     private String managerUserName;
-    private SysUser managerUser;
-
-    @Excel(name = "质量检查员")
-    private String qualityInspectorName;
-
+    private Long managerUserId;
+    
     /** 技术方案 */
-    @Excel(name = "技术方案")
+//    @Excel(name = "技术方案")
     private String technicalDocument;
 
     /** 修改技术方案 */
-    @Excel(name = "修改技术方案")
+//    @Excel(name = "修改技术方案")
     private String modifyDocument;
 
     /** 最终技术方案 */
-    @Excel(name = "最终技术方案")
+//    @Excel(name = "最终技术方案")
     private String finalDocument;
 
-    /** 方案说明 */
-    @Excel(name = "方案说明")
-    private String designDescription;
-
-    /** 技术安排意见 */
-    @Excel(name = "技术安排意见")
-    private String planComment;
+    private SysUser directUser;
 
-    /** 技术审核意见 */
-    @Excel(name = "技术审核意见")
-    private String technicalComment;
+    private SysUser planUser;
 
-    /** 总工审核意见 */
-    @Excel(name = "总工审核意见")
-    private String manageComment;
+    private SysUser auditUser;
 
-    /** 技术安排时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "技术安排时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date technicalTime;
+    private SysUser designUser;
 
-    /** 方案上传时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "方案上传时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date technicalUploadTime;
+    private SysUser managerUser;
 
-    /** 技术审核时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "技术审核时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date techApprovalTime;
+    private CmcProject project;
 
     /** 总工审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -187,7 +187,6 @@ public class CmcTechnicalPlan extends BaseEntity
     {
         this.directUser = directUser;
         this.directUserName = directUser == null ? "" : directUser.getNickName();
-
     }
 
     public SysUser getDirectUser()
@@ -198,7 +197,6 @@ public class CmcTechnicalPlan extends BaseEntity
     {
         this.planUser = planUser;
         this.planUserName = planUser == null ? "" : planUser.getNickName();
-
     }
 
     public SysUser getPlanUser()

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcTender.java

@@ -20,7 +20,7 @@ public class CmcTender extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 投标id（2024-001） */
+    /** 投标id */
     private Integer tenderId;
 
     /** 投标项目名称 */
@@ -56,9 +56,13 @@ public class CmcTender extends BaseEntity
     private String place;
 
     /** 投标部门 */
+    @Excel(name = "投标部门")
+    private String tenderDeptName;
     private Long dept;
 
     /** 投标委托人 */
+    @Excel(name = "投标委托人")
+    private String trusteeUserName;
     private Long trustee;
 
     /** 业主预算 */
@@ -96,6 +100,8 @@ public class CmcTender extends BaseEntity
     private String projectBriefly;
 
     /** 商务标书编写人 */
+    @Excel(name = "商务标书编写人")
+    private String businessUserName;
     private Long businessWriter;
 
     /** 商务标书要求提交时间 */
@@ -104,6 +110,8 @@ public class CmcTender extends BaseEntity
     private Date businessDeadline;
 
     /** 技术标书编写人 */
+    @Excel(name = "技术标书编写人")
+    private String techUserName;
     private Long techWriter;
 
     /** 技术标书要求提交时间 */
@@ -112,44 +120,36 @@ public class CmcTender extends BaseEntity
     private Date techDeadline;
 
     /** 标书合稿人 */
+    @Excel(name = "标书合稿人")
+    private String combinerUserName;
     private Long tenderCombiner;
 
     /** 标书检查人 */
+    @Excel(name = "标书检查人")
+    private String checkerUserName;
     private Long tenderChecker;
 
     /** 标书打印装订人 */
+    @Excel(name = "标书打印装订人")
+    private String printerUserName;
     private Long tenderPrinter;
 
     /** 标书文件 */
-    @Excel(name = "标书文件")
+//    @Excel(name = "标书文件")
     private String tenderDocument;
 
-    @Excel(name = "投标委托人")
-    private String trusteeUserName;
     private SysUser trusteeUser;
 
-    @Excel(name = "商务标书编写人")
-    private String businessUserName;
     private SysUser businessUser;
 
-    @Excel(name = "技术标书编写人")
-    private String techUserName;
     private SysUser techUser;
 
-    @Excel(name = "标书合稿人")
-    private String combinerUserName;
     private SysUser combinerUser;
 
-    @Excel(name = "标书检查人")
-    private String checkerUserName;
     private SysUser checkerUser;
 
-    @Excel(name = "标书打印装订人")
-    private String printerUserName;
     private SysUser printerUser;
 
-    @Excel(name = "投标部门")
-    private String tenderDeptName;
     private SysDept tenderDept;
 
     public void setTenderId(Integer tenderId)