车辆、设备信息

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

 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.ICmcCarService;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
     @Autowired
     private ICmcCarService cmcCarService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 查询cmc用车审批列表
      */
     {
         startPage();
         List<CmcCarApproval> list = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval);
+        for(CmcCarApproval carApproval : list) {
+            String carIds = carApproval.getCars();
+            StringBuilder carNames = new StringBuilder();
+            if (carIds != null && !carIds.equals("") && carIds.split(",").length > 0) {
+                for (String carId : carIds.split(","))
+                    carNames.append(cmcCarService.selectCmcCarByCarId(Integer.parseInt(carId)).getLicensePlate()).append("、");
+                carApproval.setCarNames(carNames.substring(0, carNames.length() - 1));
+            }
+            String driverIds = carApproval.getDrivers();
+            StringBuilder driverNames = new StringBuilder();
+            if (driverIds != null && !driverIds.equals("") && driverIds.split(",").length > 0) {
+                for (String driverId : driverIds.split(","))
+                    driverNames.append(userService.selectUserById(Long.parseLong(driverId)).getNickName()).append("、");
+                carApproval.setDriverNames(driverNames.substring(0, driverNames.length() - 1));
+            }
+        }
         return getDataTable(list);
     }
 
     public void export(HttpServletResponse response, CmcCarApproval cmcCarApproval)
     {
         List<CmcCarApproval> list = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval);
+        for(CmcCarApproval carApproval : list) {
+            String carIds = carApproval.getCars();
+            StringBuilder carNames = new StringBuilder();
+            if (carIds != null && !carIds.equals("") && carIds.split(",").length > 0) {
+                for (String carId : carIds.split(","))
+                    carNames.append(cmcCarService.selectCmcCarByCarId(Integer.parseInt(carId)).getLicensePlate()).append("、");
+                carApproval.setCarNames(carNames.substring(0, carNames.length() - 1));
+            }
+            String driverIds = carApproval.getDrivers();
+            StringBuilder driverNames = new StringBuilder();
+            if (driverIds != null && !driverIds.equals("") && driverIds.split(",").length > 0) {
+                for (String driverId : driverIds.split(","))
+                    driverNames.append(userService.selectUserById(Long.parseLong(driverId)).getNickName()).append("、");
+                carApproval.setDriverNames(driverNames.substring(0, driverNames.length() - 1));
+            }
+        }
         ExcelUtil<CmcCarApproval> util = new ExcelUtil<CmcCarApproval>(CmcCarApproval.class);
         util.exportExcel(response, list, "cmc用车审批数据");
     }

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

     {
         startPage();
         List<CmcDeviceApproval> list = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval);
+        for(CmcDeviceApproval deviceApproval : list) {
+            String deviceIds = deviceApproval.getDevices();
+            StringBuilder deviceNames = new StringBuilder();
+            if (deviceIds != null && !deviceIds.equals("") && deviceIds.split(",").length > 0) {
+                for (String deviceId : deviceIds.split(",")) {
+                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
+                    deviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
+                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                }
+                deviceApproval.setDeviceNames(deviceNames.substring(0, deviceNames.length() - 1));
+            }
+            String modifyDeviceIds = deviceApproval.getModifyDevices();
+            StringBuilder modifyDeviceNames = new StringBuilder();
+            StringBuilder modifyDeviceNumbers = new StringBuilder();
+            if (modifyDeviceIds != null && !modifyDeviceIds.equals("") && modifyDeviceIds.split(",").length > 0) {
+                for (String deviceId : modifyDeviceIds.split(",")) {
+                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
+                    modifyDeviceNumbers.append(device.getDeviceNumber());
+                    modifyDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
+                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                }
+                deviceApproval.setModifyDeviceNumbers(modifyDeviceNumbers.substring(0, modifyDeviceNumbers.length() - 1));
+                deviceApproval.setModifyDeviceNames(modifyDeviceNames.substring(0, modifyDeviceNames.length() - 1));
+            }
+            String repairDeviceIds = deviceApproval.getRepairDevices();
+            StringBuilder repairDeviceNames = new StringBuilder();;
+            StringBuilder repairDeviceNumbers = new StringBuilder();
+            if (repairDeviceIds != null && !repairDeviceIds.equals("") && repairDeviceIds.split(",").length > 0) {
+                for (String deviceId : repairDeviceIds.split(",")) {
+                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
+                    repairDeviceNumbers.append(device.getDeviceNumber());
+                    repairDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
+                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                }
+                deviceApproval.setRepairDeviceNumbers(repairDeviceNumbers.substring(0, repairDeviceNumbers.length() - 1));
+                deviceApproval.setRepairDeviceNames(repairDeviceNames.substring(0, repairDeviceNames.length() - 1));
+            }
+        }
         return getDataTable(list);
     }
 
     public void export(HttpServletResponse response, CmcDeviceApproval cmcDeviceApproval)
     {
         List<CmcDeviceApproval> list = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval);
+        for(CmcDeviceApproval deviceApproval : list) {
+            String deviceIds = deviceApproval.getDevices();
+            StringBuilder deviceNames = new StringBuilder();
+            if (deviceIds != null && !deviceIds.equals("") && deviceIds.split(",").length > 0) {
+                for (String deviceId : deviceIds.split(",")) {
+                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
+                    deviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
+                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                }
+                deviceApproval.setDeviceNames(deviceNames.substring(0, deviceNames.length() - 1));
+            }
+            String modifyDeviceIds = deviceApproval.getModifyDevices();
+            StringBuilder modifyDeviceNames = new StringBuilder();
+            StringBuilder modifyDeviceNumbers = new StringBuilder();
+            if (modifyDeviceIds != null && !modifyDeviceIds.equals("") && modifyDeviceIds.split(",").length > 0) {
+                for (String deviceId : modifyDeviceIds.split(",")) {
+                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
+                    modifyDeviceNumbers.append(device.getDeviceNumber());
+                    modifyDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
+                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                }
+                deviceApproval.setModifyDeviceNumbers(modifyDeviceNumbers.substring(0, modifyDeviceNumbers.length() - 1));
+                deviceApproval.setModifyDeviceNames(modifyDeviceNames.substring(0, modifyDeviceNames.length() - 1));
+            }
+            String repairDeviceIds = deviceApproval.getRepairDevices();
+            StringBuilder repairDeviceNames = new StringBuilder();;
+            StringBuilder repairDeviceNumbers = new StringBuilder();
+            if (repairDeviceIds != null && !repairDeviceIds.equals("") && repairDeviceIds.split(",").length > 0) {
+                for (String deviceId : repairDeviceIds.split(",")) {
+                    CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
+                    repairDeviceNumbers.append(device.getDeviceNumber());
+                    repairDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
+                            .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                }
+                deviceApproval.setRepairDeviceNumbers(repairDeviceNumbers.substring(0, repairDeviceNumbers.length() - 1));
+                deviceApproval.setRepairDeviceNames(repairDeviceNames.substring(0, repairDeviceNames.length() - 1));
+            }
+        }
         ExcelUtil<CmcDeviceApproval> util = new ExcelUtil<CmcDeviceApproval>(CmcDeviceApproval.class);
         util.exportExcel(response, list, "cmc设备审批数据");
     }

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

     private String carApplyId;
 
     /** 申请人 */
-    @Excel(name = "申请人")
     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 dispatchUserName;
     private SysUser dispatchUser;
 
     /** 使用部门 */
-    @Excel(name = "使用部门")
     private Long useDept;
-
+    @Excel(name = "使用部门")
+    private String deptName;
     private SysDept dept;
 
     /** 车辆id */
-    @Excel(name = "车辆id")
+    @Excel(name = "车牌号")
+    private String carNames;
     private String cars;
 
     /** 驾驶员id */
-    @Excel(name = "驾驶员id")
+    @Excel(name = "驾驶员")
+    private String driverNames;
     private String drivers;
 
     /** 项目编号 */
-    @Excel(name = "项目编号")
     private String projectId;
-
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
     private CmcProject project;
 
     /** 用车事由 */
     private Long days;
 
     /** 部门审批人 */
-    @Excel(name = "部门审批人")
     private Long deptUserId;
 
     /** 部门审批意见 */
     private String deptComment;
 
     /** 分管审批人 */
-    @Excel(name = "分管审批人")
     private Long managerUserId;
 
     /** 分管审批意见 */
     private String carUsage;
 
     /** 工会审批人 */
-    @Excel(name = "工会审批人")
     private Long unionUserId;
 
     /** 工会审批意见 */
     private String unionComment;
 
     /** 总经理审批人 */
-    @Excel(name = "总经理审批人")
     private Long gmUserId;
 
     /** 总经理审批意见 */
     private String gmComment;
 
     /** 调度员 */
-    @Excel(name = "调度员")
     private Long dispatcher;
 
     /** 调度审批意见 */
     public void setApplierUser(SysUser applierUser)
     {
         this.applierUser = applierUser;
+        this.applierUserName = applierUser == null ? "" : applierUser.getNickName();
     }
 
     public SysUser getApplierUser()
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
     }
 
     public SysUser getManagerUser()
     public void setUnionUser(SysUser unionUser)
     {
         this.unionUser = unionUser;
+        this.unionUserName = unionUser == null ? "" : unionUser.getNickName();
     }
 
     public SysUser getUnionUser()
     public void setGmUser(SysUser gmUser)
     {
         this.gmUser = gmUser;
+        this.gmUserName = gmUser == null ? "" : gmUser.getNickName();
     }
 
     public SysUser getGmUser()
     public void setDispatchUser(SysUser dispatchUser)
     {
         this.dispatchUser = dispatchUser;
+        this.dispatchUserName = dispatchUser == null ? "" : dispatchUser.getNickName();
     }
 
     public SysUser getDispatchUser()
     public void setDept(SysDept dept)
     {
         this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
     }
 
     public SysDept getDept()
     {
         return cars;
     }
+    public void setCarNames(String carNames)
+    {
+        this.carNames = carNames;
+    }
+
+    public String getCarNames()
+    {
+        return carNames;
+    }
     public void setDrivers(String drivers)
     {
         this.drivers = drivers;
     {
         return drivers;
     }
+    public void setDriverNames(String driverNames)
+    {
+        this.driverNames = driverNames;
+    }
+
+    public String getDriverNames()
+    {
+        return driverNames;
+    }
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
     public void setProject(CmcProject project)
     {
         this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
     }
 
     public CmcProject getProject()

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

-package com.ruoyi.oa.domain;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * cmc车辆费用对象 cmc_car_expense
- * 
- * @author cmc
- * @date 2024-03-12
- */
-public class CmcCarExpense extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 车辆费用id */
-    private Integer carExpenseId;
-
-    /** 车辆id */
-    @Excel(name = "车牌号")
-    private String licensePlate;
-    private Integer carId;
-    private CmcCar car;
-
-    /** 费用类型（0保险费,1维修保养费,2轮胎费） */
-    @Excel(name = "费用类型", readConverterExp = "0=保险费,1=维修/保养费,2=轮胎费")
-    private String expenseType;
-
-    /** 费用金额 */
-    @Excel(name = "费用金额")
-    private BigDecimal expense;
-
-    /** 发生日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "发生日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date occurDate;
-
-    /** 附件 */
-    @Excel(name = "附件")
-    private String document;
-
-    public void setCarExpenseId(Integer carExpenseId)
-    {
-        this.carExpenseId = carExpenseId;
-    }
-
-    public Integer getCarExpenseId()
-    {
-        return carExpenseId;
-    }
-    public void setCarId(Integer carId) 
-    {
-        this.carId = carId;
-    }
-
-    public Integer getCarId() 
-    {
-        return carId;
-    }
-    public void setCar(CmcCar car)
-    {
-        this.car = car;
-        this.licensePlate = car != null ? car.getLicensePlate() : "";
-    }
-
-    public CmcCar getCar()
-    {
-        return car;
-    }
-    public void setExpenseType(String expenseType) 
-    {
-        this.expenseType = expenseType;
-    }
-
-    public String getExpenseType() 
-    {
-        return expenseType;
-    }
-    public void setExpense(BigDecimal expense) 
-    {
-        this.expense = expense;
-    }
-
-    public BigDecimal getExpense() 
-    {
-        return expense;
-    }
-    public void setOccurDate(Date occurDate)
-    {
-        this.occurDate = occurDate;
-    }
-
-    public Date getOccurDate()
-    {
-        return occurDate;
-    }
-    public void setDocument(String document)
-    {
-        this.document = document;
-    }
-
-    public String getDocument()
-    {
-        return document;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("carExpenseId", getCarExpenseId())
-            .append("carId", getCarId())
-            .append("expenseType", getExpenseType())
-            .append("expense", getExpense())
-            .append("occurDate", getOccurDate())
-            .toString();
-    }
-}

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

     @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;
 
     /** 使用部门 */
-    @Excel(name = "使用部门")
     private Long useDept;
-
+    @Excel(name = "使用部门")
+    private String deptName;
     private SysDept dept;
 
     /** 设备id */
-    @Excel(name = "设备id")
+    @Excel(name = "申领设备")
+    private String deviceNames;
     private String devices;
 
     /** 修改后设备id */
-    @Excel(name = "修改后设备id")
+    @Excel(name = "发放设备")
+    private String modifyDeviceNames;
+    @Excel(name = "发放设备序号")
+    private String modifyDeviceNumbers;
     private String modifyDevices;
 
     /** 项目id */
     @Excel(name = "项目id")
     private String projectId;
-
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
     private CmcProject project;
 
     /** 申领事由 */
     private Long days;
 
     /** 分管审批人 */
-    @Excel(name = "分管审批人")
     private Long managerUserId;
 
     /** 分管审批意见 */
     private String managerComment;
 
     /** 调度员 */
-    @Excel(name = "调度员")
     private Long dispatcher;
 
     /** 调度审批意见 */
     private Date dispatchTime;
 
     /** 需维修设备id */
-    @Excel(name = "需维修设备id")
+    @Excel(name = "需维修设备")
+    private String repairDeviceNames;
+    @Excel(name = "需维修设备序号")
+    private String repairDeviceNumbers;
     private String repairDevices;
 
     public void setDeviceApplyId(String deviceApplyId)
     public void setDept(SysDept dept)
     {
         this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
     }
 
     public SysDept getDept()
     {
         return devices;
     }
+    public void setDeviceNames(String deviceNames)
+    {
+        this.deviceNames = deviceNames;
+    }
+
+    public String getDeviceNames()
+    {
+        return deviceNames;
+    }
+    public void setModifyDeviceNumbers(String modifyDeviceNumbers)
+    {
+        this.modifyDeviceNumbers = modifyDeviceNumbers;
+    }
+
+    public String getModifyDeviceNumbers()
+    {
+        return modifyDeviceNumbers;
+    }
     public void setModifyDevices(String modifyDevices)
     {
         this.modifyDevices = modifyDevices;
     {
         return modifyDevices;
     }
+    public void setModifyDeviceNames(String modifyDeviceNames)
+    {
+        this.modifyDeviceNames = modifyDeviceNames;
+    }
+
+    public String getModifyDeviceNames()
+    {
+        return modifyDeviceNames;
+    }
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
     public void setProject(CmcProject project)
     {
         this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
     }
 
     public CmcProject getProject()
     {
         return repairDevices;
     }
+    public void setRepairDeviceNames(String repairDeviceNames)
+    {
+        this.repairDeviceNames = repairDeviceNames;
+    }
+
+    public String getRepairDeviceNames()
+    {
+        return repairDeviceNames;
+    }
+    public void setRepairDeviceNumbers(String repairDeviceNumbers)
+    {
+        this.repairDeviceNumbers = repairDeviceNumbers;
+    }
+
+    public String getRepairDeviceNumbers()
+    {
+        return repairDeviceNumbers;
+    }
 
     @Override
     public String toString() {

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

     private Integer deviceScrapId;
 
     /** 设备id */
-    @Excel(name = "设备id")
     private Integer deviceId;
+    private CmcDevice device;
 
     /** 车辆id */
-    @Excel(name = "车辆id")
     private Integer carId;
+    private CmcCar car;
+
+    @Excel(name = "车牌号")
+    private String licensePlate;
+
+    @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;
 
     /** 原价值 */
     @Excel(name = "原价值")
     {
         return deviceId;
     }
+    public void setDevice(CmcDevice device)
+    {
+        this.device = device;
+        if (device != null) {
+            this.deviceNumber = device.getDeviceNumber();
+            this.brand = device.getBrand();
+            this.series = device.getSeries();
+            this.name = device.getName();
+            this.code = device.getCode();
+        }
+    }
+
+    public CmcDevice getDevice()
+    {
+        return device;
+    }
     public void setCarId(Integer carId)
     {
         this.carId = carId;
     {
         return carId;
     }
+    public void setCar(CmcCar car)
+    {
+        this.car = car;
+        this.licensePlate = car == null ? "" :car.getLicensePlate();
+    }
+
+    public CmcCar getCar()
+    {
+        return car;
+    }
     public void setCost(BigDecimal cost) 
     {
         this.cost = cost;

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

     @Excel(name = "安全交底意见")
     private String disclosureComment;
 
+    /** 接受交底意见 */
+    @Excel(name = "接受交底意见")
+    private String acceptComment;
+
     /** 安全交底时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "安全交底时间", width = 30, dateFormat = "yyyy-MM-dd")
     {
         return disclosureComment;
     }
+    public void setAcceptComment(String acceptComment)
+    {
+        this.acceptComment = acceptComment;
+    }
+
+    public String getAcceptComment()
+    {
+        return acceptComment;
+    }
     public void setDisclosureTime(Date disclosureTime) 
     {
         this.disclosureTime = disclosureTime;
             .append("outsideComment", getOutsideComment())
             .append("insideComment", getInsideComment())
             .append("disclosureComment", getDisclosureComment())
+            .append("acceptComment", getAcceptComment())
             .append("disclosureTime", getDisclosureTime())
             .append("acceptTime", getAcceptTime())
             .toString();

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

 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
     private String settleId;
 
     /** 项目id */
-    @Excel(name = "项目id")
     private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+    private CmcProject project;
 
     /** 工作量上报说明 */
     @Excel(name = "工作量上报说明")
     private String workloadReport;
 
     /** 上报人 */
-    @Excel(name = "上报人")
     private Long reporter;
 
+    @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 xmUserName;
+    private SysUser xmUser;
+
+    @Excel(name = "承担部门审核人")
+    private String deptUserName;
+    private SysUser deptUser;
+
+    @Excel(name = "经营发展部审核人")
+    private String jyUserName;
+    private SysUser jyUser;
+
+    @Excel(name = "分管审核人")
+    private String managerUserName;
+    private SysUser managerUser;
+
+    @Excel(name = "总经理")
+    private String gmUserName;
+    private SysUser gmUser;
+
     /** 上报日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
     private String settleComment;
 
     /** 综合事务部审核人 */
-    @Excel(name = "综合事务部审核人")
     private Long zhUserId;
 
     /** 综合事务部审核日期 */
     private String zhComment;
 
     /** 技术质量部审核人 */
-    @Excel(name = "技术质量部审核人")
     private Long jsUserId;
 
     /** 技术质量部审核日期 */
     private String jsComment;
 
     /** 项目管理部审核人 */
-    @Excel(name = "项目管理部审核人")
     private Long xmUserId;
 
     /** 项目管理部审核日期 */
     private String xmComment;
 
     /** 承担部门审核人 */
-    @Excel(name = "承担部门审核人")
     private Long deptUserId;
 
     /** 承担部门审核日期 */
     private String jyComment;
 
     /** 分管审核人 */
-    @Excel(name = "分管审核人")
     private Long managerUserId;
 
     /** 分管审核日期 */
     private String modifyDocument;
 
     /** 最终算表 */
-    @Excel(name = "最终算表")
+    @Excel(name = "最终结算表")
     private String finalDocument;
 
     public void setSettleId(String settleId) 
     {
         return projectId;
     }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
     public void setWorkloadReport(String workloadReport) 
     {
         this.workloadReport = workloadReport;
     {
         return finalDocument;
     }
+    public void setReporterUser(SysUser reporterUser)
+    {
+        this.reporterUser = reporterUser;
+        this.reporterUserName = reporterUser == null ? "" : reporterUser.getNickName();
+    }
+
+    public SysUser getReporterUser()
+    {
+        return reporterUser;
+    }
+    public void setDeptUser(SysUser deptUser)
+    {
+        this.deptUser = deptUser;
+        this.deptUserName = deptUser == null ? "" : deptUser.getNickName();
+    }
+
+    public SysUser getDeptUser()
+    {
+        return deptUser;
+    }
+    public void setZhUser(SysUser zhUser)
+    {
+        this.zhUser = zhUser;
+        this.zhUserName = zhUser == null ? "" : zhUser.getNickName();
+    }
+
+    public SysUser getZhUser()
+    {
+        return zhUser;
+    }
+    public void setJyUser(SysUser jyUser)
+    {
+        this.jyUser = jyUser;
+        this.jyUserName = jyUser == null ? "" : jyUser.getNickName();
+    }
+
+    public SysUser getJyUser()
+    {
+        return jyUser;
+    }
+    public void setJsUser(SysUser jsUser)
+    {
+        this.jsUser = jsUser;
+        this.jsUserName = jsUser == null ? "" : jsUser.getNickName();
+    }
+
+    public SysUser getJsUser()
+    {
+        return jsUser;
+    }
+    public void setXmUser(SysUser xmUser)
+    {
+        this.xmUser = xmUser;
+        this.xmUserName = xmUser == null ? "" : xmUser.getNickName();
+    }
+
+    public SysUser getXmUser()
+    {
+        return xmUser;
+    }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
+    public void setGmUser(SysUser gmUser)
+    {
+        this.gmUser = gmUser;
+        this.gmUserName = gmUser == null ? "" : gmUser.getNickName();
+    }
+
+    public SysUser getGmUser()
+    {
+        return reporterUser;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarExpenseMapper.xml

-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.oa.mapper.CmcCarExpenseMapper">
-    
-    <resultMap type="CmcCarExpense" id="CmcCarExpenseResult">
-        <result property="carExpenseId"    column="car_expense_id"    />
-        <result property="carId"    column="car_id"    />
-        <result property="expenseType"    column="expense_type"    />
-        <result property="expense"    column="expense"    />
-        <result property="occurDate"    column="occur_date"    />
-        <result property="remark"    column="remark"    />
-        <result property="document"    column="document"    />
-        <association property="car"    javaType="CmcCar"         resultMap="CmcCarResult" />
-    </resultMap>
-
-    <resultMap type="CmcCar" id="CmcCarResult">
-        <result property="carId"    column="car_id"    />
-        <result property="licensePlate"    column="license_plate"    />
-    </resultMap>
-
-    <sql id="selectCmcCarExpenseVo">
-        select ce.car_expense_id, ce.car_id, c.license_plate, ce.expense_type, ce.expense, ce.occur_date, ce.remark, ce.document from cmc_car_expense as ce
-        left join cmc_car as c on c.car_id = ce.car_id
-    </sql>
-
-    <select id="selectCmcCarExpenseList" parameterType="CmcCarExpense" resultMap="CmcCarExpenseResult">
-        <include refid="selectCmcCarExpenseVo"/>
-        <where>  
-            <if test="carId != null "> and ce.car_id = #{carId}</if>
-            <if test="expenseType != null  and expenseType != ''"> and ce.expense_type = #{expenseType}</if>
-            <if test="expense != null "> and ce.expense = #{expense}</if>
-            <if test="occurDate != null "> and ce.occur_date = #{occurDate}</if>
-        </where>
-    </select>
-    
-    <select id="selectCmcCarExpenseByCarExpenseId" parameterType="String" resultMap="CmcCarExpenseResult">
-        <include refid="selectCmcCarExpenseVo"/>
-        where ce.car_expense_id = #{carExpenseId}
-    </select>
-        
-    <insert id="insertCmcCarExpense" parameterType="CmcCarExpense">
-        insert into cmc_car_expense
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="carExpenseId != null">car_expense_id,</if>
-            <if test="carId != null">car_id,</if>
-            <if test="expenseType != null">expense_type,</if>
-            <if test="expense != null">expense,</if>
-            <if test="occurDate != null">occur_date,</if>
-            <if test="remark != null">remark,</if>
-            <if test="document != null">document,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="carExpenseId != null">#{carExpenseId},</if>
-            <if test="carId != null">#{carId},</if>
-            <if test="expenseType != null">#{expenseType},</if>
-            <if test="expense != null">#{expense},</if>
-            <if test="occurDate != null">#{occurDate},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="document != null">#{document},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCmcCarExpense" parameterType="CmcCarExpense">
-        update cmc_car_expense
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="carId != null">car_id = #{carId},</if>
-            <if test="expenseType != null">expense_type = #{expenseType},</if>
-            <if test="expense != null">expense = #{expense},</if>
-            <if test="occurDate != null">occur_date = #{occurDate},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="document != null">document = #{document},</if>
-        </trim>
-        where car_expense_id = #{carExpenseId}
-    </update>
-
-    <delete id="deleteCmcCarExpenseByCarExpenseId" parameterType="String">
-        delete from cmc_car_expense where car_expense_id = #{carExpenseId}
-    </delete>
-
-    <delete id="deleteCmcCarExpenseByCarExpenseIds" parameterType="String">
-        delete from cmc_car_expense where car_expense_id in 
-        <foreach item="carExpenseId" collection="array" open="(" separator="," close=")">
-            #{carExpenseId}
-        </foreach>
-    </delete>
-</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceScrapMapper.xml

         <result property="deal"    column="deal"    />
         <result property="remark"    column="remark"    />
         <result property="document"    column="document"    />
+        <association property="device"    javaType="CmcDevice"         resultMap="CmcDeviceResult" />
+        <association property="car"    javaType="CmcCar"         resultMap="CmcCarResult" />
+    </resultMap>
+
+    <resultMap type="CmcCar" id="CmcCarResult">
+        <result property="carId"    column="car_id"    />
+        <result property="licensePlate"    column="license_plate"    />
+    </resultMap>
+
+    <resultMap type="CmcDevice" id="CmcDeviceResult">
+        <result property="deviceId"    column="device_id"    />
+        <result property="deviceNumber"    column="device_number"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="series"    column="series"    />
+        <result property="brand"    column="brand"    />
     </resultMap>
 
     <sql id="selectCmcDeviceScrapVo">
-        select device_scrap_id, device_id, car_id, cost, scrap_date, reason, deal, remark, document from cmc_device_scrap
+        select ds.device_scrap_id, ds.device_id, ds.car_id, c.license_plate, d.device_number, d.code, d.name, d.brand, d.series, ds.cost, ds.scrap_date, ds.reason, ds.deal, ds.remark, ds.document from cmc_device_scrap as ds
+        left join cmc_device as d on d.device_id = ds.device_id
+        left join cmc_car as c on c.car_id = ds.car_id
     </sql>
 
     <select id="selectCmcDeviceScrapList" parameterType="CmcDeviceScrap" resultMap="CmcDeviceScrapResult">
         <include refid="selectCmcDeviceScrapVo"/>
         <where>  
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
-            <if test="carId != null "> and car_id = #{carId}</if>
-            <if test="cost != null "> and cost = #{cost}</if>
-            <if test="scrapDate != null "> and scrap_date = #{scrapDate}</if>
-            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
-            <if test="deal != null  and deal != ''"> and deal = #{deal}</if>
-            <if test="document != null  and document != ''"> and document = #{document}</if>
+            <if test="deviceId != null "> and ds.device_id = #{deviceId}</if>
+            <if test="carId != null "> and ds.car_id = #{carId}</if>
+            <if test="cost != null "> and ds.cost = #{cost}</if>
+            <if test="scrapDate != null "> and ds.scrap_date = #{scrapDate}</if>
+            <if test="reason != null  and reason != ''"> and ds.reason = #{reason}</if>
+            <if test="deal != null  and deal != ''"> and ds.deal = #{deal}</if>
+            <if test="document != null  and document != ''"> and ds.document = #{document}</if>
         </where>
     </select>
     

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

             <if test="entryTime != null "> and p.entry_time = #{entryTime}</if>
             <if test="exitTime != null "> and p.exit_time = #{exitTime}</if>
         </where>
-        order by project_number desc
+        order by p.register_time desc
     </select>
 
     <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSafeMapper.xml

         <result property="outsideComment"    column="outside_comment"    />
         <result property="insideComment"    column="inside_comment"    />
         <result property="disclosureComment"    column="disclosure_comment"    />
+        <result property="acceptComment"    column="accept_comment"    />
         <result property="disclosureTime"    column="disclosure_time"    />
         <result property="acceptTime"    column="accept_time"    />
         <association property="accepterUser"    javaType="SysUser"         resultMap="AccepterUserResult" />
     </resultMap>
 
     <sql id="selectCmcSafeVo">
-        select s.safe_id, s.project_id, p.project_number, p.project_name, s.disclosure_accepter, u.nick_name as accepter_nick_name, s.disclosurer, u1.nick_name as disclosurer_nick_name, s.environment_comment, s.outside_comment, s.inside_comment, s.disclosure_comment, s.disclosure_time, s.accept_time from cmc_safe as s
+        select s.safe_id, s.project_id, p.project_number, p.project_name, s.disclosure_accepter, u.nick_name as accepter_nick_name, s.disclosurer, u1.nick_name as disclosurer_nick_name,
+               s.environment_comment, s.outside_comment, s.inside_comment, s.disclosure_comment, s.accept_comment, s.disclosure_time, s.accept_time from cmc_safe as s
         left join sys_user as u on u.user_id = s.disclosure_accepter
         left join sys_user as u1 on u1.user_id = s.disclosurer
         left join cmc_project as p on p.project_id = s.project_id
             <if test="outsideComment != null">outside_comment,</if>
             <if test="insideComment != null">inside_comment,</if>
             <if test="disclosureComment != null">disclosure_comment,</if>
+            <if test="acceptComment != null">accept_comment,</if>
             <if test="disclosureTime != null">disclosure_time,</if>
             <if test="acceptTime != null">accept_time,</if>
          </trim>
             <if test="outsideComment != null">#{outsideComment},</if>
             <if test="insideComment != null">#{insideComment},</if>
             <if test="disclosureComment != null">#{disclosureComment},</if>
+            <if test="acceptComment != null">#{acceptComment},</if>
             <if test="disclosureTime != null">#{disclosureTime},</if>
             <if test="acceptTime != null">#{acceptTime},</if>
          </trim>
             <if test="outsideComment != null">outside_comment = #{outsideComment},</if>
             <if test="insideComment != null">inside_comment = #{insideComment},</if>
             <if test="disclosureComment != null">disclosure_comment = #{disclosureComment},</if>
+            <if test="acceptComment != null">accept_comment = #{acceptComment},</if>
             <if test="disclosureTime != null">disclosure_time = #{disclosureTime},</if>
             <if test="acceptTime != null">accept_time = #{acceptTime},</if>
         </trim>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleMapper.xml

         <result property="settleDocument"    column="settle_document"    />
         <result property="modifyDocument"    column="modify_document"    />
         <result property="finalDocument"    column="final_document"    />
+        <association property="reporterUser"    javaType="SysUser"         resultMap="ReporterUserResult" />
+        <association property="zhUser"    javaType="SysUser"         resultMap="ZhUserResult" />
+        <association property="jsUser"    javaType="SysUser"         resultMap="JsUserResult" />
+        <association property="xmUser"    javaType="SysUser"         resultMap="XmUserResult" />
+        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
+        <association property="jyUser"    javaType="SysUser"         resultMap="JyUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ReporterUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="reporter_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ZhUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="zh_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="JsUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="js_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="XmUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="xm_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DeptUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="dept_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="JyUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="jy_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="GmUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="gm_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcSettleVo">
-        select settle_id, project_id, workload_report, reporter, report_time, settle_comment, zh_user_id, zh_time, zh_comment, js_user_id, js_time, js_comment, xm_user_id, xm_time, xm_comment, dept_user_id, dept_time, dept_comment, jy_user_id, jy_time, jy_comment, manager_user_id, manager_time, manager_comment, gm_user_id, gm_time, gm_comment, settle_document, modify_document, final_document from cmc_settle
+        select s.settle_id, s.project_id, s.workload_report, s.reporter, u.nick_name as reporter_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name, 
+               s.zh_time, s.zh_comment, s.js_user_id, u2.nick_name as js_nick_name, s.js_time, s.js_comment, s.xm_user_id, u3.nick_name as xm_nick_name, s.xm_time, s.xm_comment, s.dept_user_id,
+               u4.nick_name as dept_nick_name, s.dept_time, s.dept_comment, s.jy_user_id, u5.nick_name as jy_nick_name, s.jy_time, s.jy_comment, s.manager_user_id, u6.nick_name as manager_nick_name, 
+               s.manager_time, s.manager_comment, s.gm_user_id, u7.nick_name as gm_nick_name, s.gm_time, s.gm_comment, s.settle_document, s.modify_document, s.final_document from cmc_settle as s
+        left join sys_user as u on u.user_id = s.reporter
+        left join sys_user as u1 on u1.user_id = s.zh_user_id
+        left join sys_user as u2 on u2.user_id = s.js_user_id
+        left join sys_user as u3 on u3.user_id = s.xm_user_id
+        left join sys_user as u4 on u4.user_id = s.dept_user_id
+        left join sys_user as u5 on u5.user_id = s.jy_user_id
+        left join sys_user as u6 on u6.user_id = s.manager_user_id
+        left join sys_user as u7 on u7.user_id = s.gm_user_id
     </sql>
 
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
         <where>
-            <if test="settleId != null  and settleId != ''"> and settle_id = #{settleId}</if>
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="workloadReport != null  and workloadReport != ''"> and workload_report = #{workloadReport}</if>
-            <if test="reporter != null "> and reporter = #{reporter}</if>
-            <if test="reportTime != null "> and report_time = #{reportTime}</if>
-            <if test="settleComment != null  and settleComment != ''"> and settle_comment = #{settleComment}</if>
-            <if test="zhUserId != null "> and zh_user_id = #{zhUserId}</if>
-            <if test="zhTime != null "> and zh_time = #{zhTime}</if>
-            <if test="zhComment != null  and zhComment != ''"> and zh_comment = #{zhComment}</if>
-            <if test="jsUserId != null "> and js_user_id = #{jsUserId}</if>
-            <if test="jsTime != null "> and js_time = #{jsTime}</if>
-            <if test="jsComment != null  and jsComment != ''"> and js_comment = #{jsComment}</if>
-            <if test="xmUserId != null "> and xm_user_id = #{xmUserId}</if>
-            <if test="xmTime != null "> and xm_time = #{xmTime}</if>
-            <if test="xmComment != null  and xmComment != ''"> and xm_comment = #{xmComment}</if>
-            <if test="deptUserId != null "> and dept_user_id = #{deptUserId}</if>
-            <if test="deptTime != null "> and dept_time = #{deptTime}</if>
-            <if test="deptComment != null  and deptComment != ''"> and dept_comment = #{deptComment}</if>
-            <if test="jyUserId != null "> and jy_user_id = #{jyUserId}</if>
-            <if test="jyTime != null "> and jy_time = #{jyTime}</if>
-            <if test="jyComment != null  and jyComment != ''"> and jy_comment = #{jyComment}</if>
-            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
-            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
-            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
-            <if test="gmUserId != null "> and gm_user_id = #{gmUserId}</if>
-            <if test="gmTime != null "> and gm_time = #{gmTime}</if>
-            <if test="gmComment != null  and gmComment != ''"> and gm_comment = #{gmComment}</if>
+            <if test="settleId != null  and settleId != ''"> and s.settle_id = #{settleId}</if>
+            <if test="projectId != null  and projectId != ''"> and s.project_id = #{projectId}</if>
+            <if test="workloadReport != null  and workloadReport != ''"> and s.workload_report = #{workloadReport}</if>
+            <if test="reporter != null "> and s.reporter = #{reporter}</if>
+            <if test="reportTime != null "> and s.report_time = #{reportTime}</if>
+            <if test="settleComment != null  and settleComment != ''"> and s.settle_comment = #{settleComment}</if>
+            <if test="zhUserId != null "> and s.zh_user_id = #{zhUserId}</if>
+            <if test="zhTime != null "> and s.zh_time = #{zhTime}</if>
+            <if test="zhComment != null  and zhComment != ''"> and s.zh_comment = #{zhComment}</if>
+            <if test="jsUserId != null "> and s.js_user_id = #{jsUserId}</if>
+            <if test="jsTime != null "> and s.js_time = #{jsTime}</if>
+            <if test="jsComment != null  and jsComment != ''"> and s.js_comment = #{jsComment}</if>
+            <if test="xmUserId != null "> and s.xm_user_id = #{xmUserId}</if>
+            <if test="xmTime != null "> and s.xm_time = #{xmTime}</if>
+            <if test="xmComment != null  and xmComment != ''"> and s.xm_comment = #{xmComment}</if>
+            <if test="deptUserId != null "> and s.dept_user_id = #{deptUserId}</if>
+            <if test="deptTime != null "> and s.dept_time = #{deptTime}</if>
+            <if test="deptComment != null  and deptComment != ''"> and s.dept_comment = #{deptComment}</if>
+            <if test="jyUserId != null "> and s.jy_user_id = #{jyUserId}</if>
+            <if test="jyTime != null "> and s.jy_time = #{jyTime}</if>
+            <if test="jyComment != null  and jyComment != ''"> and s.jy_comment = #{jyComment}</if>
+            <if test="managerUserId != null "> and s.manager_user_id = #{managerUserId}</if>
+            <if test="managerTime != null "> and s.manager_time = #{managerTime}</if>
+            <if test="managerComment != null  and managerComment != ''"> and s.manager_comment = #{managerComment}</if>
+            <if test="gmUserId != null "> and s.gm_user_id = #{gmUserId}</if>
+            <if test="gmTime != null "> and s.gm_time = #{gmTime}</if>
+            <if test="gmComment != null  and gmComment != ''"> and s.gm_comment = #{gmComment}</if>
         </where>
     </select>
     
     <select id="selectCmcSettleBySettleId" parameterType="String" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
-        where settle_id = #{settleId}
+        where s.settle_id = #{settleId}
     </select>
         
     <insert id="insertCmcSettle" parameterType="CmcSettle">

oa-back/sql/sql.sql

 INSERT INTO `cmc_project` VALUES ('1648881410631270448', '2024C26', '力丘河口及塔公以上河段1:500地形测绘及现时水边线测量', 65, '0', '0', '0230', '龙宇杰、梁媛', '15198088143、18602868995', '地形图测绘', '0', 13, '108,111', NULL, NULL, NULL, '2024-06-04', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410631270449', '2024C27', '亚龙水电站可研阶段地形图测绘', 95, '0', '0', '0230', '龙宇杰、刘永波', '15198088143、13438137962', '地形图测绘', '0', 13, '112,108', NULL, NULL, NULL, '2024-06-04', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410631270450', '2024C28', 'ML及JW界桩测设工作', 84, '0', '0', '0226', '干尚伟', '13980874941', '界桩测设', '0', 21, '112', NULL, NULL, NULL, '2024-06-06', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_project` VALUES ('1648881410631270465', '2024C29', '南江兴马抽水蓄能电站可研阶段地形图测绘项目', 75, '0', '0', '0230', '龙宇杰、闫勇', '15198088143、13880937699', '地形图测绘', '0', 13, '108,111', 33, 75, NULL, '2024-06-18', NULL, '2024-06-19', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_project` VALUES ('1648881410631270466', '2024C30', '理塘呷洼抽水蓄能电站预可阶段地形图测绘工作', 146, '0', '0', '0230', '龙宇杰、赵程', '15198088143、18428311670', '地形图测绘', '0', 13, '108,117', 33, 146, NULL, '2024-06-19', NULL, '2024-06-20', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410631270451', '2024W01', '重庆区县建成区实景三维制作', 38, '0', '1', '0274', '马红', '17723881291', '三维实景模型', '0', 13, '109,108', NULL, NULL, NULL, '2024-01-04', NULL, NULL, '2024-01-05', '2024-03-23', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410631270452', '2024W02', '凤山平乐风电场地形图测绘', 76, '0', '1', '0238', '姚鹏', '15361284599', '地形图测绘', '0', 13, '108,118,111', NULL, NULL, NULL, '2024-01-12', NULL, NULL, '2024-01-15', '2024-02-04', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410631270453', '2024W03', '雅砻江二滩水电站大坝外部变形观测及谷坡稳定性监测（2024年）', 103, '0', '1', '0199', '高翠峰', '', '工程监测', '0', 13, '113', NULL, NULL, NULL, '2024-01-26', NULL, NULL, '2024-01-01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881508333387778', '201702047', '雅砻江二滩水电站大坝外部变形观测', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881508366942210', '201702048', '涪江双江航电工程', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881508400496642', '201702049', '西藏多雄河玉松、林芝厂区勘探放样复核报告.pdf', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('1648881508423598826', '2024C29', '南江兴马抽水蓄能电站可研阶段地形图测绘项目', NULL, '0', NULL, '0230', '龙宇杰、闫勇', '15198088143、13880937699', '地形图测绘', '0', 13, NULL, NULL, NULL, NULL, '2024-06-18', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881508438245378', '201702050', '重庆市洪崖洞旅游客运码头工程项目', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881508471799809', '201703051', '云南省金沙江溪洛渡天星坝水库左干渠地形图及地类图测绘测绘', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881508505354241', '201703052', '西藏自治区雅鲁藏布江米林水库工程拉丁、康扎及大渡卡料场', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_technical` VALUES ('1648881410631270462', '1648881410631270462', 117, 119, NULL, NULL, NULL, '120', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_technical` VALUES ('1648881410631270463', '1648881410631270463', 52, 76, NULL, NULL, NULL, '61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_technical` VALUES ('1648881410631270464', '1648881410631270464', 52, 65, NULL, NULL, NULL, '63', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410631270465', '1648881410631270465', 55, 75, NULL, NULL, NULL, '60,61', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_technical` VALUES ('1648881410631270466', '1648881410631270466', 55, 146, NULL, NULL, NULL, '59,61,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_technical` VALUES ('1648881410643853314', '1648881410643853314', 61, 75, NULL, NULL, NULL, '60', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_technical` VALUES ('1648881410660630529', '1648881410660630529', 61, 145, NULL, NULL, NULL, '59,62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_technical` VALUES ('1648881410677407746', '1648881410677407746', 55, 38, NULL, NULL, NULL, '62', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
   `outside_comment` 	text		  	default null comment '外业要求',
   `inside_comment` 		text		  	default null comment '内业要求',
   `disclosure_comment` 	varchar(255)  	default null comment '安全交底意见',
+  `accept_comment` 		varchar(255)  	default null comment '接受交底意见',
   `disclosure_time` 	date  			default null comment '安全交底时间',
   `accept_time` 		date  			default null comment '接受交底时间',
   primary key (`safe_id`)

oa-ui/src/views/flowable/form/projectProcess/safeTab.vue

           <el-input v-model="form.insideComment" placeholder="请输入信息安全管理要求" type="textarea" :autosize="{ minRows: 8 }" />
         </el-form-item>
         <el-form-item label="安全交底意见" prop="disclosureComment">
-          <el-input v-model="form.disclosureComment" placeholder="请输入安全交底意见" type="textarea"
-            :autosize="{ minRows: 4 }" />
+          <el-input v-model="form.disclosureComment" placeholder="请输入安全交底意见" type="textarea" :autosize="{ minRows: 4 }" />
         </el-form-item>
-        <el-form-item label="安全交底人" prop="disclosurer">
-          <span class="auditor"> {{ form.disclosurerUser ? form.disclosurerUser.nickName : form.user.nickName }}</span>
-        </el-form-item>
-        <el-form-item label="安全交底时间" prop="disclosureTime">
-          <el-date-picker clearable v-model="form.disclosureTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="接受交底意见" prop="disclosureComment">
-          <el-input :disabled="true" placeholder="按要求进行作业" />
-        </el-form-item>
-        <el-form-item label="接受交底时间" prop="acceptTime">
-          <el-date-picker clearable v-model="form.acceptTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
-          </el-date-picker>
+        <el-row>
+          <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="disclosurer">
+              <span class="auditor"> {{ form.disclosurerUser ? form.disclosurerUser.nickName : '' }}
+              </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+              <span> {{ parseTime(form.disclosureTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="接受交底意见" prop="acceptComment">
+          <el-input v-model="form.acceptComment" placeholder="请输入接受交底意见" type="textarea" :autosize="{ minRows: 4 }" />
         </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名">
+              <span class="auditor"> {{ form.accepterUser ? form.accepterUser.nickName : '' }} </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+              <span> {{ parseTime(form.acceptTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </div>

oa-ui/src/views/flowable/form/safeForm.vue

   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
-        <el-form ref="form" :model="form" :rules="rules" label-width="150px" :disabled="taskName != '安全交底'">
+        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
           <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '安全交底'">
             <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目编号" disabled style="width: 300px" />
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="环境管理要求" prop="environmentComment" :disabled="taskName != '安全交底'">
+          <el-form-item label="环境管理要求" prop="environmentComment">
             <el-input v-model="form.environmentComment" placeholder="请输入环境管理要求" type="textarea"
-              :autosize="{ minRows: 8 }" />
+              :disabled="taskName != '安全交底'" :autosize="{ minRows: 8 }" />
           </el-form-item>
-          <el-form-item label="安全生产与职业健康要求" prop="outsideComment" :disabled="taskName != '安全交底'">
+          <el-form-item label="安全生产与职业健康要求" prop="outsideComment">
             <el-input v-model="form.outsideComment" placeholder="请输入安全生产与职业健康要求" type="textarea"
-              :autosize="{ minRows: 8 }" />
+              :disabled="taskName != '安全交底'" :autosize="{ minRows: 8 }" />
           </el-form-item>
-          <el-form-item label="信息安全管理要求" prop="insideComment" :disabled="taskName != '安全交底'">
-            <el-input v-model="form.insideComment" placeholder="请输入信息安全管理要求" type="textarea" :autosize="{ minRows: 8 }" />
+          <el-form-item label="信息安全管理要求" prop="insideComment">
+            <el-input v-model="form.insideComment" placeholder="请输入信息安全管理要求" type="textarea" :autosize="{ minRows: 8 }"
+              :disabled="taskName != '安全交底'" />
           </el-form-item>
-          <el-form-item label="安全交底意见" prop="disclosureComment" :disabled="taskName != '安全交底'">
+          <el-form-item label="安全交底意见" prop="disclosureComment">
             <el-input v-model="form.disclosureComment" placeholder="请输入安全交底意见" type="textarea"
-              :autosize="{ minRows: 4 }" />
+              :disabled="taskName != '安全交底'" :autosize="{ minRows: 4 }" />
           </el-form-item>
-          <el-form-item label="安全交底人" prop="disclosurer">
-            <span class="auditor"> {{ form.disclosurerUser ? form.disclosurerUser.nickName : form.user.nickName }}</span>
-          </el-form-item>
-          <el-form-item label="安全交底时间" prop="disclosureTime">
-            <el-date-picker clearable v-model="form.disclosureTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="选择日期" :disabled="taskName != '安全交底'">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="接受交底意见" prop="disclosureComment" v-if="taskName == '接受交底' || taskName == ''">
-            <el-input :disabled="true" placeholder="按要求进行作业" />
-          </el-form-item>
-          <el-form-item label="接受交底时间" prop="acceptTime" v-if="taskName == '接受交底' || taskName == ''">
-            <el-date-picker clearable v-model="form.acceptTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
-              :disabled="taskName != '接受交底'">
-            </el-date-picker>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名" prop="disclosurer">
+                <span class="auditor"> {{ form.disclosurerUser ? form.disclosurerUser.nickName : disclosurerUser }}
+                </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px">
+                <span> {{ parseTime(form.disclosureTime, '{y}-{m}-{d}') }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="接受交底意见" prop="acceptComment" v-if="taskName != '安全交底'">
+            <el-input v-model="form.acceptComment" placeholder="请输入接受交底意见" type="textarea" :autosize="{ minRows: 4 }"
+              :disabled="taskName == ''" />
           </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名" v-if="taskName != '安全交底'">
+                <span class="auditor"> {{ form.accepterUser ? form.accepterUser.nickName : accepterUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName != '安全交底'">
+                <span> {{ parseTime(form.acceptTime, '{y}-{m}-{d}') }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div style="text-align: center;" v-if="taskName">
           <el-button type="primary" @click="submitForm">提 交</el-button>
   },
   data() {
     return {
+      disclosurerUser: '',
+      accepterUser: '',
       // 遮罩层
       loading: true,
       // 选中数组
         disclosureTime: null,
         acceptTime: null
       },
-      disclosureTime: undefined,
-      acceptTime: undefined,
       userList: [],
       chooseProject: {},
       isSelect: false,
         }
       },
       // 表单校验
-      rules: {
-        disclosureComment: [
-            { required: true, message: '请选择安全交底意见', trigger: 'blur' },
-          ],
-      },
+      rules: {},
       formTotal: 0,
       flowData: {}
     };
   },
   created() {
-    this.form.acceptTime = new Date();
-    this.form.user.nickName = this.$store.getters.name;
     this.getProjectById();
     this.getUserList();
     this.getList();
     })
   },
   mounted() {
+    this.initRules();
     this.initForm();
   },
   methods: {
+    initRules() {
+      if (this.taskName == '安全交底') {
+        this.rules = {
+          disclosureComment: [
+            { required: true, message: '请输入安全交底意见', trigger: 'blur' },
+          ],
+        }
+      }
+      else if (this.taskName == '接受交底') {
+        this.rules = {
+          acceptComment: [
+            { required: true, message: '请输入接受交底意见', trigger: 'blur' },
+          ],
+        }
+      }
+    },
     initForm() {
       getSafe(this.taskForm.formId).then(res => {
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.disclosurer = this.$store.getters.userId;
+          this.disclosurerUser = this.$store.getters.name;
           this.form.disclosureTime = new Date();
         }
         else {
           this.formTotal = 1;
           this.form = res.data;
+          this.accepterUser = this.$store.getters.name;
+          this.form.acceptTime = new Date();
         }
       })
     },
 };
 </script>
 
-<style lang="scss" scoped>@import "@/assets/styles/element-reset.scss";</style>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>