修改细节

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

@@ -4,14 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -80,6 +73,19 @@ public class CmcBudgetController extends BaseController
         return toAjax(cmcBudgetService.insertCmcBudget(cmcBudget));
     }
 
+    /**
+     * 新增cmc预算管理
+     */
+    @PreAuthorize("@ss.hasPermi('oa:budget:add')")
+    @Log(title = "cmc预算管理", businessType = BusinessType.INSERT)
+    @PostMapping( "/submit")
+    public AjaxResult submit(@RequestParam("form")String formData)
+    {
+        CmcBudget cmcBudget = new CmcBudget();
+        cmcBudget.setCompiler(getLoginUser().getUserId());
+        return toAjax(cmcBudgetService.insertCmcBudget(cmcBudget));
+    }
+
     /**
      * 修改cmc预算管理
      */

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

@@ -8,8 +8,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.ICmcCarService;
-import com.ruoyi.system.service.ISysDeptService;
-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;
@@ -33,12 +31,6 @@ public class CmcCarApprovalController extends BaseController
     @Autowired
     private ICmcCarApprovalService cmcCarApprovalService;
 
-    @Autowired
-    private ISysUserService userService;
-
-    @Autowired
-    private ISysDeptService deptService;
-
     @Autowired
     private ICmcCarService cmcCarService;
 
@@ -142,7 +134,7 @@ public class CmcCarApprovalController extends BaseController
             cmcCarApproval.setDispatcher(getLoginUser().getUserId());
             cmcCarApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
         }
-        if (formDataJson.getString("cars") != null && formDataJson.getString("drivers") != null) {
+        if (formDataJson.getJSONArray("cars").size() > 0 && formDataJson.getJSONArray("drivers").size() > 0) {
             cmcCarApproval.setDispatcher(getLoginUser().getUserId());
             String carString = formDataJson.getString("cars").substring(1, formDataJson.getString("cars").length() - 1);
             cmcCarApproval.setCars(carString);

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

@@ -9,6 +9,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -55,6 +56,7 @@ public class CmcCarController extends BaseController
     /**
      * 导出cmc车辆信息列表
      */
+    @PreAuthorize("@ss.hasPermi('oa:car:export')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcCar cmcCar)
@@ -67,28 +69,17 @@ public class CmcCarController extends BaseController
     /**
      * 获取cmc车辆信息详细信息
      */
+    @PreAuthorize("@ss.hasPermi('oa:car:query')")
     @GetMapping(value = "/{carId}")
     public AjaxResult getInfo(@PathVariable("carId") Integer carId)
     {
-        JSONObject jsonObject = new JSONObject();
-        CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(carId);
-        jsonObject.put("carId", cmcCar.getCarId());
-        jsonObject.put("licensePlate", cmcCar.getLicensePlate());
-        jsonObject.put("driver", cmcCar.getDriver() != null ? userService.selectUserById(cmcCar.getDriver()).getNickName() : "");
-        jsonObject.put("brand", cmcCar.getBrand());
-        jsonObject.put("series", cmcCar.getSeries());
-        jsonObject.put("cost", cmcCar.getCost());
-        jsonObject.put("acquisitionTime", cmcCar.getAcquisitionTime());
-        jsonObject.put("expectLife", cmcCar.getExpectLife());
-        jsonObject.put("expectKm", cmcCar.getExpectKm());
-        jsonObject.put("isRent", cmcCar.getIsRent());
-        jsonObject.put("dayCost", cmcCar.getDayCost());
-        return success(jsonObject);
+        return success(cmcCarService.selectCmcCarByCarId(carId));
     }
 
     /**
      * 新增cmc车辆信息
      */
+    @PreAuthorize("@ss.hasPermi('oa:car:add')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcCar cmcCar)
@@ -113,6 +104,7 @@ public class CmcCarController extends BaseController
     /**
      * 修改cmc车辆信息
      */
+    @PreAuthorize("@ss.hasPermi('oa:car:edit')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcCar cmcCar)
@@ -123,6 +115,7 @@ public class CmcCarController extends BaseController
     /**
      * 删除cmc车辆信息
      */
+    @PreAuthorize("@ss.hasPermi('oa:car:remove')")
     @Log(title = "cmc车辆信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{carIds}")
     public AjaxResult remove(@PathVariable Long[] carIds)

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

@@ -133,7 +133,7 @@ public class CmcDeviceApprovalController extends BaseController
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
             cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
         }
-        if (formDataJson.getString("devices") != null) {
+        if (formDataJson.getJSONArray("devices").size() > 0) {
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
             String deviceString = formDataJson.getString("devices").substring(1, formDataJson.getString("devices").length() - 1);
             cmcDeviceApproval.setDevices(deviceString);

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

@@ -1,16 +1,14 @@
 package com.ruoyi.web.controller.oa;
 
-import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SnowFlake;
 import com.ruoyi.oa.domain.CmcProjectWork;
 import com.ruoyi.oa.service.ICmcProjectWorkService;
-import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -39,7 +37,7 @@ public class CmcProjectController extends BaseController
     private ICmcProjectWorkService cmcProjectWorkService;
 
     @Autowired
-    private ISysUserService userService;
+    private ISysDeptService deptService;
 
     /**
      * 查询cmc项目列表
@@ -48,21 +46,7 @@ public class CmcProjectController extends BaseController
     public TableDataInfo list(CmcProject cmcProject)
     {
         startPage();
-        List<CmcProject> list = new ArrayList<>();
-        if (cmcProject.getProjectLeaderName() != null && !cmcProject.getProjectLeaderName().equals("")) {
-            SysUser user = new SysUser();
-            user.setNickName(cmcProject.getProjectLeaderName());
-            List<SysUser> userList = userService.selectUserList(user);
-            if (userList.size() > 0)
-                for (SysUser sysUser : userList) {
-                    cmcProject.setProjectLeader(sysUser.getUserId().toString());
-                    list.addAll(cmcProjectService.selectCmcProjectList(cmcProject));
-                }
-            else
-                list = cmcProjectService.selectCmcProjectList(cmcProject);
-        }
-        else
-            list = cmcProjectService.selectCmcProjectList(cmcProject);
+        List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
         return getDataTable(list);
     }
 
@@ -84,7 +68,24 @@ public class CmcProjectController extends BaseController
     @GetMapping(value = "/{projectId}")
     public AjaxResult getInfo(@PathVariable("projectId") String projectId)
     {
-        return success(cmcProjectService.selectCmcProjectByProjectId(projectId));
+        CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(projectId);
+        String underTakingDept = cmcProject.getUndertakingDept();
+        StringBuilder underTakingDeptName = new StringBuilder();
+        if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
+            for (String dept : underTakingDept.split(","))
+                underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
+            cmcProject.setUndertakingDept(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
+        }
+        return success(cmcProject);
+    }
+
+    /**
+     * 获取项目负责人负责的项目详细信息
+     */
+    @GetMapping("/projectLeader")
+    public AjaxResult getListByProjectLeader(String projectLeader)
+    {
+        return success(cmcProjectService.selectCmcProjectListByProjectLeader(projectLeader));
     }
 
     /**
@@ -108,7 +109,7 @@ public class CmcProjectController extends BaseController
         CmcProject cmcProject = new CmcProject();
         cmcProject.setProjectName(formDataJson.getString("projectName"));
         cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
-        cmcProject.setProjectLeader(formDataJson.getString("projectLeader"));
+        cmcProject.setProjectLeader(formDataJson.getLong("projectLeader"));
         cmcProject.setIsFinished(formDataJson.getString("isFinished"));
         cmcProject.setProjectSource(formDataJson.getString("projectSource"));
         cmcProject.setPartyA(formDataJson.getString("partyA"));
@@ -116,7 +117,7 @@ public class CmcProjectController extends BaseController
         cmcProject.setTelephone(formDataJson.getString("telephone"));
         cmcProject.setProjectType(formDataJson.getString("projectType"));
         cmcProject.setProjectLevel(formDataJson.getString("projectLevel"));
-        cmcProject.setProjectRegistrant(formDataJson.getString("projectRegistrant"));
+        cmcProject.setProjectRegistrant(formDataJson.getLong("projectRegistrant"));
         cmcProject.setCreateTime(DateUtils.getNowDate());
         cmcProject.setIsFinished("0");
         cmcProject.setRemark(formDataJson.getString("remark"));
@@ -178,7 +179,7 @@ public class CmcProjectController extends BaseController
         CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(formDataJson.getString("projectId"));
         cmcProject.setProjectName(formDataJson.getString("projectName"));
         cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
-        cmcProject.setProjectLeader(formDataJson.getString("projectLeader"));
+        cmcProject.setProjectLeader(formDataJson.getLong("projectLeader"));
         cmcProject.setIsFinished(formDataJson.getString("isFinished"));
         cmcProject.setProjectSource(formDataJson.getString("projectSource"));
         cmcProject.setPartyA(formDataJson.getString("partyA"));
@@ -186,7 +187,7 @@ public class CmcProjectController extends BaseController
         cmcProject.setTelephone(formDataJson.getString("telephone"));
         cmcProject.setProjectType(formDataJson.getString("projectType"));
         cmcProject.setProjectLevel(formDataJson.getString("projectLevel"));
-        cmcProject.setProjectRegistrant(formDataJson.getString("projectRegistrant"));
+        cmcProject.setProjectRegistrant(formDataJson.getLong("projectRegistrant"));
         cmcProject.setCreateTime(DateUtils.getNowDate());
         cmcProject.setIsFinished("0");
         cmcProject.setRemark(formDataJson.getString("remark"));

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

@@ -69,16 +69,6 @@ public class CmcProjectWorkerController extends BaseController
         return success(cmcProjectWorkerService.selectCmcProjectWorkerById(id));
     }
 
-    /**
-     * 获取项目负责人负责的项目详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:query')")
-    @GetMapping("/projectLeader")
-    public AjaxResult getListByProjectLeader(String projectLeader)
-    {
-        return success(cmcProjectWorkerService.selectCmcProjectWorkerListByProjectLeader(projectLeader));
-    }
-
     /**
      * 新增cmc项目人员
      */

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

@@ -1,6 +1,8 @@
 package com.ruoyi.oa.domain;
 
 import java.math.BigDecimal;
+
+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;
@@ -73,6 +75,10 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "编制人")
     private Long compiler;
 
+    private SysUser compilerUser;
+
+    private SysUser auditorUser;
+
     /** 审核人 */
     @Excel(name = "审核人")
     private Long auditor;
@@ -212,6 +218,24 @@ public class CmcBudget extends BaseEntity
     {
         return compiler;
     }
+    public void setCompilerUser(SysUser compilerUser)
+    {
+        this.compilerUser = compilerUser;
+    }
+
+    public SysUser getCompilerUser()
+    {
+        return compilerUser;
+    }
+    public void setAuditorUser(SysUser auditorUser)
+    {
+        this.auditorUser = auditorUser;
+    }
+
+    public SysUser getAuditorUser()
+    {
+        return auditorUser;
+    }
     public void setAuditor(Long auditor)
     {
         this.auditor = auditor;

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

@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 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;
@@ -29,6 +30,8 @@ public class CmcCar extends BaseEntity
     @Excel(name = "驾驶员")
     private Long driver;
 
+    private SysUser driverUser;
+
     /** 购置时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "购置时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -89,6 +92,15 @@ public class CmcCar extends BaseEntity
     {
         return driver;
     }
+    public void setDriverUser(SysUser driverUser)
+    {
+        this.driverUser = driverUser;
+    }
+
+    public SysUser getDriverUser()
+    {
+        return driverUser;
+    }
     public void setAcquisitionTime(Date acquisitionTime)
     {
         this.acquisitionTime = acquisitionTime;

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

@@ -27,7 +27,7 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "申请人")
     private Long applier;
 
-    private SysUser user;
+    private SysUser applierUser;
 
     /** 使用部门 */
     @Excel(name = "使用部门")
@@ -138,14 +138,14 @@ public class CmcCarApproval extends BaseEntity
     {
         return applier;
     }
-    public void setUser(SysUser user)
+    public void setApplierUser(SysUser applierUser)
     {
-        this.user = user;
+        this.applierUser = applierUser;
     }
 
-    public SysUser getUser()
+    public SysUser getApplierUser()
     {
-        return user;
+        return applierUser;
     }
     public void setUseDept(Long useDept)
     {

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

@@ -28,7 +28,7 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "申请人")
     private Long applier;
 
-    private SysUser user;
+    private SysUser applierUser;
 
     /** 使用部门 */
     @Excel(name = "使用部门")
@@ -129,14 +129,14 @@ public class CmcDeviceApproval extends BaseEntity
         return applier;
     }
 
-    public void setUser(SysUser user)
+    public void setApplierUser(SysUser applierUser)
     {
-        this.user = user;
+        this.applierUser = applierUser;
     }
 
-    public SysUser getUser()
+    public SysUser getApplierUser()
     {
-        return user;
+        return applierUser;
     }
     public void setUseDept(Long useDept)
     {

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

@@ -1,5 +1,6 @@
 package com.ruoyi.oa.domain;
 
+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;
@@ -28,11 +29,9 @@ public class CmcProject extends BaseEntity
 
     /** 项目负责人 */
     @Excel(name = "项目负责人")
-    private String projectLeader;
+    private Long projectLeader;
 
-    /** 项目负责人名字 */
-    @Excel(name = "项目负责人名字")
-    private String projectLeaderName;
+    private SysUser projectLeaderUser;
 
     /** 项目状态（0进行中、1已结束） */
     @Excel(name = "项目状态", readConverterExp = "0=进行中、1=已结束")
@@ -68,7 +67,9 @@ public class CmcProject extends BaseEntity
 
     /** 项目登记人 */
     @Excel(name = "项目登记人")
-    private String projectRegistrant;
+    private Long projectRegistrant;
+
+    private SysUser projectRegistrantUser;
 
     /** 承担部门 */
     @Excel(name = "承担部门")
@@ -101,23 +102,23 @@ public class CmcProject extends BaseEntity
     {
         return projectName;
     }
-    public void setProjectLeader(String projectLeader)
+    public void setProjectLeader(Long projectLeader)
     {
         this.projectLeader = projectLeader;
     }
 
-    public String getProjectLeader()
+    public Long getProjectLeader()
     {
         return projectLeader;
     }
-    public void setProjectLeaderName(String projectLeaderName)
+    public SysUser getProjectLeaderUser()
     {
-        this.projectLeaderName = projectLeaderName;
+        return projectLeaderUser;
     }
 
-    public String getProjectLeaderName()
+    public void setProjectLeader(SysUser projectLeaderUser)
     {
-        return projectLeaderName;
+        this.projectLeaderUser = projectLeaderUser;
     }
     public void setIsFinished(String isFinished)
     {
@@ -192,15 +193,24 @@ public class CmcProject extends BaseEntity
     {
         return projectLevel;
     }
-    public void setProjectRegistrant(String projectRegistrant)
+    public void setProjectRegistrant(Long projectRegistrant)
     {
         this.projectRegistrant = projectRegistrant;
     }
 
-    public String getProjectRegistrant()
+    public Long getProjectRegistrant()
     {
         return projectRegistrant;
     }
+    public SysUser getProjectRegistrantUser()
+    {
+        return projectRegistrantUser;
+    }
+
+    public void setProjectRegistrantUser(SysUser projectRegistrantUser)
+    {
+        this.projectRegistrantUser = projectRegistrantUser;
+    }
     public void setUndertakingDept(String undertakingDept)
     {
         this.undertakingDept = undertakingDept;

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

@@ -25,12 +25,6 @@ public class CmcProjectWorker extends BaseEntity
 
     private CmcProject project;
 
-    /** 项目负责人 */
-    @Excel(name = "项目负责人")
-    private String projectLeader;
-
-    private SysUser user;
-
     /** 内业负责人 */
     @Excel(name = "内业负责人")
     private String inWorker;
@@ -68,24 +62,6 @@ public class CmcProjectWorker extends BaseEntity
         return project;
     }
 
-    public void setProjectLeader(String projectLeader) 
-    {
-        this.projectLeader = projectLeader;
-    }
-
-    public String getProjectLeader() 
-    {
-        return projectLeader;
-    }
-    public void setUser(SysUser user)
-    {
-        this.user = user;
-    }
-
-    public SysUser getUser()
-    {
-        return user;
-    }
     public void setInWorker(String inWorker) 
     {
         this.inWorker = inWorker;
@@ -110,7 +86,6 @@ public class CmcProjectWorker extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("projectId", getProjectId())
-            .append("projectLeader", getProjectLeader())
             .append("inWorker", getInWorker())
             .append("outWorker", getOutWorker())
             .toString();

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectMapper.java

@@ -19,6 +19,14 @@ public interface CmcProjectMapper
      */
     public CmcProject selectCmcProjectByProjectId(String projectId);
 
+    /**
+     * 获取项目负责人负责的项目详细信息
+     *
+     * @param projectLeader cmc项目负责人
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcProjectListByProjectLeader(String projectLeader);
+
     /**
      * 查询cmc项目列表
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectWorkerMapper.java

@@ -21,14 +21,6 @@ public interface CmcProjectWorkerMapper
      */
     public CmcProjectWorker selectCmcProjectWorkerById(String id);
 
-    /**
-     * 获取项目负责人负责的项目详细信息
-     *
-     * @param projectLeader cmc项目主键
-     * @return cmc项目集合
-     */
-    public List<CmcProjectWorker> selectCmcProjectWorkerListByProjectLeader(String projectLeader);
-
     /**
      * 查询cmc项目人员列表
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectService.java

@@ -2,6 +2,7 @@ package com.ruoyi.oa.service;
 
 import java.util.List;
 import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.domain.CmcProject;
 
 /**
  * cmc项目Service接口
@@ -19,6 +20,14 @@ public interface ICmcProjectService
      */
     public CmcProject selectCmcProjectByProjectId(String projectId);
 
+    /**
+     * 获取项目负责人负责的项目详细信息
+     *
+     * @param projectLeader cmc项目负责人
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcProjectListByProjectLeader(String projectLeader);
+
     /**
      * 查询cmc项目列表
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectWorkerService.java

@@ -21,14 +21,6 @@ public interface ICmcProjectWorkerService
      */
     public CmcProjectWorker selectCmcProjectWorkerById(String id);
 
-    /**
-     * 获取项目负责人负责的项目详细信息
-     *
-     * @param projectLeader cmc项目主键
-     * @return cmc项目集合
-     */
-    public List<CmcProjectWorker> selectCmcProjectWorkerListByProjectLeader(String projectLeader);
-
     /**
      * 查询cmc项目人员列表
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ruoyi.oa.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.domain.CmcProject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.oa.mapper.CmcProjectMapper;
@@ -31,6 +34,17 @@ public class CmcProjectServiceImpl implements ICmcProjectService
         return cmcProjectMapper.selectCmcProjectByProjectId(projectId);
     }
 
+    /**
+     * 获取项目负责人负责的项目详细信息
+     *
+     * @param projectLeader cmc项目负责人
+     * @return cmc项目集合
+     */
+    @Override
+    public List<CmcProject> selectCmcProjectListByProjectLeader(String projectLeader) {
+        return cmcProjectMapper.selectCmcProjectListByProjectLeader(projectLeader);
+    }
+
     /**
      * 查询cmc项目列表
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectWorkerServiceImpl.java

@@ -33,17 +33,6 @@ public class CmcProjectWorkerServiceImpl implements ICmcProjectWorkerService
         return cmcProjectWorkerMapper.selectCmcProjectWorkerById(id);
     }
 
-    /**
-     * 获取项目负责人负责的项目详细信息
-     *
-     * @param projectLeader cmc项目主键
-     * @return cmc项目集合
-     */
-    @Override
-    public List<CmcProjectWorker> selectCmcProjectWorkerListByProjectLeader(String projectLeader) {
-        return cmcProjectWorkerMapper.selectCmcProjectWorkerListByProjectLeader(projectLeader);
-    }
-
     /**
      * 查询cmc项目人员列表
      * 

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

@@ -21,9 +21,21 @@
         <result property="compiler"    column="compiler"    />
         <result property="auditor"    column="auditor"    />
         <result property="createTime"    column="create_time"    />
+        <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
+        <association property="auditorUser"    javaType="SysUser"         resultMap="AuditorResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
+    <resultMap type="SysUser" id="CompilerResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="compiler_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="AuditorResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="auditor_nick_name"    />
+    </resultMap>
+
     <resultMap type="CmcProject" id="CmcProjectResult">
         <result property="projectId"    column="project_id"    />
         <result property="projectNumber"    column="project_number"    />
@@ -31,7 +43,9 @@
     </resultMap>
 
     <sql id="selectCmcBudgetVo">
-        select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.rent_expense, b.other_expense, b.direct_expense, b.total_budget, b.compiler, b.auditor, b.create_time from cmc_budget as b
+        select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.rent_expense, b.other_expense, b.direct_expense, b.total_budget, b.compiler, u.nick_name as compiler_nick_name, b.auditor, u1.nick_name as auditor_nick_name, b.create_time from cmc_budget as b
+            left join sys_user as u on u.user_id = b.compiler
+            left join sys_user as u1 on u1.user_id = b.auditor
             left join cmc_project as p on b.project_id = p.project_id
     </sql>
 
@@ -78,7 +92,7 @@
             <if test="totalBudget != null">total_budget,</if>
             <if test="compiler != null">compiler,</if>
             <if test="auditor != null">auditor,</if>
-            <if test="createTime != null">create_time,</if>
+            create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="budgetId != null">#{budgetId},</if>
@@ -96,7 +110,7 @@
             <if test="totalBudget != null">#{totalBudget},</if>
             <if test="compiler != null">#{compiler},</if>
             <if test="auditor != null">#{auditor},</if>
-            <if test="createTime != null">#{createTime},</if>
+            sysdate()
         </trim>
     </insert>
 

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

@@ -28,7 +28,7 @@
         <result property="dispatcher"    column="dispatcher"    />
         <result property="dispatchComment"    column="dispatch_comment"    />
         <result property="estimateCost"    column="estimate_cost"    />
-        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="applierUser"    javaType="SysUser"         resultMap="SysUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>

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

@@ -17,26 +17,33 @@
         <result property="isRent"    column="is_rent"    />
         <result property="dayCost"    column="day_cost"    />
         <result property="remark"    column="remark"    />
+        <association property="driverUser"    javaType="SysUser"         resultMap="SysUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
     </resultMap>
 
     <sql id="selectCmcCarVo">
-        select car_id, license_plate, driver, acquisition_time, cost, expect_life, expect_km, series, brand, is_rent, day_cost, remark from cmc_car
+        select c.car_id, c.license_plate, c.driver, u.nick_name, c.acquisition_time, c.cost, c.expect_life, c.expect_km, c.series, c.brand, c.is_rent, c.day_cost, c.remark from cmc_car as c
+        left join sys_user as u on u.user_id = c.driver
     </sql>
 
     <select id="selectCmcCarList" parameterType="CmcCar" resultMap="CmcCarResult">
         <include refid="selectCmcCarVo"/>
         <where>
-            <if test="licensePlate != null  and licensePlate != ''"> and license_plate like concat('%', #{licensePlate}, '%')</if>
-            <if test="driver != null "> and driver = #{driver}</if>
-            <if test="acquisitionTime != null "> and acquisition_time = #{acquisitionTime}</if>
-            <if test="cost != null "> and cost = #{cost}</if>
-            <if test="expectLife != null "> and expect_life = #{expectLife}</if>
-            <if test="expectKm != null "> and expect_km = #{expectKm}</if>
-            <if test="series != null  and series != ''"> and series like concat('%', #{series}, '%')</if>
-            <if test="brand != null  and brand != ''"> and brand like concat('%', #{brand}, '%')</if>
-            <if test="isRent != null  and isRent != ''"> and isRent = #{isRent}</if>
-            <if test="dayCost != null  and dayCost != ''"> and day_cost = #{dayCost}</if>
-            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
+            <if test="licensePlate != null  and licensePlate != ''"> and c.license_plate like concat('%', #{licensePlate}, '%')</if>
+            <if test="driver != null "> and c.driver = #{driver}</if>
+            <if test="acquisitionTime != null "> and c.acquisition_time = #{acquisitionTime}</if>
+            <if test="cost != null "> and c.cost = #{cost}</if>
+            <if test="expectLife != null "> and c.expect_life = #{expectLife}</if>
+            <if test="expectKm != null "> and c.expect_km = #{expectKm}</if>
+            <if test="series != null  and series != ''"> and c.series like concat('%', #{series}, '%')</if>
+            <if test="brand != null  and brand != ''"> and c.brand like concat('%', #{brand}, '%')</if>
+            <if test="isRent != null  and isRent != ''"> and c.isRent = #{isRent}</if>
+            <if test="dayCost != null  and dayCost != ''"> and c.day_cost = #{dayCost}</if>
+            <if test="remark != null  and remark != ''"> and c.remark = #{remark}</if>
         </where>
     </select>
 

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

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dispatcher"    column="dispatcher"    />
         <result property="dispatchComment"    column="dispatch_comment"    />
         <result property="estimateCost"    column="estimate_cost"    />
-        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="applierUser"    javaType="SysUser"         resultMap="SysUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>

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

@@ -21,31 +21,50 @@
         <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="createTime"    column="create_time"    />
         <result property="remark"    column="remark"    />
+        <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
+        <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ProjectLeaderResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="leader_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ProjectRegistrantResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="registrant_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select project_id, project_number, project_name, project_leader, is_finished, project_source, party_a, contact_person, telephone, contract_id, project_type, project_level, project_registrant, undertaking_dept, create_time, remark from cmc_project
+        select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone, p.contract_id, p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.create_time, p.remark from cmc_project as p
+        left join sys_user as u on u.user_id = p.project_leader
+        left join sys_user as u1 on u1.user_id = p.project_registrant
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         <where>
-            <if test="projectNumber != null  and projectNumber != ''"> and project_number like concat('%', #{projectNumber}, '%')</if>
-            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
-            <if test="isFinished != null  and isFinished != ''"> and is_finished = #{isFinished}</if>
-            <if test="projectSource != null  and projectSource != ''"> and project_source = #{projectSource}</if>
-            <if test="partyA != null  and partyA != ''"> and party_a like concat('%', #{partyA}, '%')</if>
-            <if test="contactPerson != null  and contactPerson != ''"> and contact_person like concat('%', #{contactPerson}, '%')</if>
-            <if test="telephone != null  and telephone != ''"> and telephone like concat('%', #{telephone}, '%')</if>
-            <if test="contractId != null  and contractId != ''"> and contract_id like concat('%', #{contractId}, '%')</if>
-            <if test="projectType != null  and projectType != ''"> and project_type like concat('%', #{projectType}, '%')</if>
-            <if test="projectLevel != null  and projectLevel != ''"> and project_level = #{projectLevel}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="isFinished != null  and isFinished != ''"> and p.is_finished = #{isFinished}</if>
+            <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+            <if test="partyA != null  and partyA != ''"> and p.party_a like concat('%', #{partyA}, '%')</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and p.contact_person like concat('%', #{contactPerson}, '%')</if>
+            <if test="telephone != null  and telephone != ''"> and p.telephone like concat('%', #{telephone}, '%')</if>
+            <if test="contractId != null  and contractId != ''"> and p.contract_id like concat('%', #{contractId}, '%')</if>
+            <if test="projectType != null  and projectType != ''"> and p.project_type like concat('%', #{projectType}, '%')</if>
+            <if test="projectLevel != null  and projectLevel != ''"> and p.project_level = #{projectLevel}</if>
         </where>
     </select>
 
     <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
-        where project_id = #{projectId}
+        where p.project_id = #{projectId}
+    </select>
+
+    <select id="selectCmcProjectListByProjectLeader" parameterType="String" resultMap="CmcProjectResult">
+        <include refid="selectCmcProjectVo"/>
+        where p.project_leader = #{projectLeader}
     </select>
 
     <insert id="insertCmcProject" parameterType="CmcProject">

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

@@ -7,18 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcProjectWorker" id="CmcProjectWorkerResult">
         <result property="id"    column="id"    />
         <result property="projectId"    column="project_id"    />
-        <result property="projectLeader"    column="project_leader"    />
         <result property="inWorker"    column="in_worker"    />
         <result property="outWorker"    column="out_worker"    />
-        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
-    <resultMap type="SysUser" id="SysUserResult">
-        <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="nick_name"    />
-    </resultMap>
-
     <resultMap type="CmcProject" id="CmcProjectResult">
         <result property="projectId"    column="project_id"    />
         <result property="projectNumber"    column="project_number"    />
@@ -26,8 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcProjectWorkerVo">
-        select pw.id, pw.project_id, p.project_number, p.project_name, pw.project_leader, u.nick_name, pw.in_worker, pw.out_worker from cmc_project_worker as pw
-            left join sys_user as u on u.user_id = pw.project_leader
+        select pw.id, pw.project_id, p.project_number, p.project_name, pw.in_worker, pw.out_worker from cmc_project_worker as pw
             left join cmc_project as p on p.project_id = pw.project_id
     </sql>
 
@@ -35,7 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCmcProjectWorkerVo"/>
         <where>  
             <if test="projectId != null  and projectId != ''"> and pw.project_id = #{projectId}</if>
-            <if test="projectLeader != null  and projectLeader != ''"> and pw.project_leader = #{projectLeader}</if>
             <if test="inWorker != null  and inWorker != ''"> and pw.in_worker = #{inWorker}</if>
             <if test="outWorker != null  and outWorker != ''"> and pw.out_worker = #{outWorker}</if>
         </where>
@@ -46,24 +37,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <select id="selectCmcProjectWorkerListByProjectLeader" parameterType="String" resultMap="CmcProjectWorkerResult">
-        <include refid="selectCmcProjectWorkerVo"/>
-        where pw.project_leader = #{projectLeader}
-    </select>
-
     <insert id="insertCmcProjectWorker" parameterType="CmcProjectWorker">
         insert into cmc_project_worker
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="projectId != null">project_id,</if>
-            <if test="projectLeader != null">project_leader,</if>
             <if test="inWorker != null">in_worker,</if>
             <if test="outWorker != null">out_worker,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="projectId != null">#{projectId},</if>
-            <if test="projectLeader != null">#{projectLeader},</if>
             <if test="inWorker != null">#{inWorker},</if>
             <if test="outWorker != null">#{outWorker},</if>
          </trim>
@@ -73,7 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_project_worker
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
-            <if test="projectLeader != null">project_leader = #{projectLeader},</if>
             <if test="inWorker != null">in_worker = #{inWorker},</if>
             <if test="outWorker != null">out_worker = #{outWorker},</if>
         </trim>

oa-back/sql/sql.sql

@@ -90,58 +90,58 @@ create table sys_user (
 -- 初始化-用户信息表数据
 -- ----------------------------
 insert into sys_user values (1, 104, 'admin', 'admin', '00', '', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '192.168.28.136', '2024-03-18 10:17:49', null, '2024-01-04 17:22:48', null, '2024-03-18 10:17:48', '管理员', null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (2, 101, '13982275233', '刘光庆', '00', '', '13982275233', '0', '', '$2a$10$pcdc8BbNDNiWaQUU14BC3eGWxB4sSJOQZBL9QFftkhkjcbYU03DNi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (2, 101, '13982275233', '刘光庆', '00', '', '13982275233', '0', '', '$2a$10$pcdc8BbNDNiWaQUU14BC3eGWxB4sSJOQZBL9QFftkhkjcbYU03DNi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '7', null, null, null, null, null);
 insert into sys_user values (3, 101, '13808211356', '向发廷', '00', '', '13808211356', '0', '', '$2a$10$zynAhjpaUxERmH4yo9R9s.O.oUgpxwRKtKA6X74ncn0z1ajFxqMyq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (4, 101, '13608089391', '王渊', '00', '', '13608089391', '0', '', '$2a$10$sKWfjdS0vJMA194/pu9q/e8Etz6kNBTzlURGDtKreBE8oHsRWP9hW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (4, 101, '13608089391', '王渊', '00', '', '13608089391', '0', '', '$2a$10$sKWfjdS0vJMA194/pu9q/e8Etz6kNBTzlURGDtKreBE8oHsRWP9hW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '6', null, null, null, null, null);
 insert into sys_user values (5, 101, '13808210959', '饶兴贵', '00', '', '13808210959', '0', '', '$2a$10$oyppe5szUKvS7tmJGPEMAOokXiWFJys5MMfOWFc6.ETpyBgCDo/42', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (6, 101, '13308085432', '阴学军', '00', '', '13308085432', '0', '', '$2a$10$nb/NapsXWQd/IfPbrqXKjefXlOKmRB5ScgVneGxPgEyo4FZ8.RMOi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (7, 101, '13908178105', '樊宽林', '00', '', '13908178105', '0', '', '$2a$10$wnFsEXdHdJCgVYffXW7FRerg0c3v3S.aVqtdiWrtSAt9KntmW6iIu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (8, 104, '18034708068', '徐婷', '00', '', '18034708068', '1', '', '$2a$10$3NJkNMrq0/vwnw5E3z6wI.TutQnqhwSuMFDPxV/OMe9IXt0fTobNW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (9, 102, '13880963113', '陈洪', '00', '', '13880963113', '0', '', '$2a$10$xVZmDdG0DUlGjuGMFi6WEem4pWuLKlqrg27VuBRbn3vfKq8ATWzVa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (10, 102, '13981868188', '刘非', '00', '', '13981868188', '0', '', '$2a$10$XCXSEHjvWp9IFbQIXfh/gu5i8R87DjKMHsEu.qioLaZLVDB3wr1z2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (11, 102, '13882236733', '杨卫', '00', '', '13882236733', '0', '', '$2a$10$buRf8Vh0f4./GVx9WV6zkO1LOKSIEnTK4tzXefEh6gcY2JfcI4gPO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (12, 102, '13980583883', '宁瑶', '00', '', '13980583883', '0', '', '$2a$10$srx9flT57EE/f2euaLgrIeud6Ujnz3HS3qfNYm7DXFY6XZ5p5Aai2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (13, 105, '18190819097', '贾春华', '00', '', '18190819097', '0', '', '$2a$10$QSI1Pl1YK6kGt0zLDNv1COQyK8UDLWhBq26QSXEPpikIDArtqjeau', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (14, 106, '15928150405', '刘楠', '00', '', '15928150405', '0', '', '$2a$10$6tmHn6r5Dy6/qdu/ZotiSObzEr7zymkKL/g/VkcdUjV16OezZFALu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (7, 101, '13908178105', '樊宽林', '00', '', '13908178105', '0', '', '$2a$10$wnFsEXdHdJCgVYffXW7FRerg0c3v3S.aVqtdiWrtSAt9KntmW6iIu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '6', null, null, null, null, null);
+insert into sys_user values (8, 104, '18034708068', '徐婷', '00', '', '18034708068', '1', '', '$2a$10$3NJkNMrq0/vwnw5E3z6wI.TutQnqhwSuMFDPxV/OMe9IXt0fTobNW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '5', null, null, null, null, null);
+insert into sys_user values (9, 102, '13880963113', '陈洪', '00', '', '13880963113', '0', '', '$2a$10$xVZmDdG0DUlGjuGMFi6WEem4pWuLKlqrg27VuBRbn3vfKq8ATWzVa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '6', null, null, null, null, null);
+insert into sys_user values (10, 102, '13981868188', '刘非', '00', '', '13981868188', '0', '', '$2a$10$XCXSEHjvWp9IFbQIXfh/gu5i8R87DjKMHsEu.qioLaZLVDB3wr1z2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '6', null, null, null, null, null);
+insert into sys_user values (11, 102, '13882236733', '杨卫', '00', '', '13882236733', '0', '', '$2a$10$buRf8Vh0f4./GVx9WV6zkO1LOKSIEnTK4tzXefEh6gcY2JfcI4gPO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '6', null, null, null, null, null);
+insert into sys_user values (12, 102, '13980583883', '宁瑶', '00', '', '13980583883', '0', '', '$2a$10$srx9flT57EE/f2euaLgrIeud6Ujnz3HS3qfNYm7DXFY6XZ5p5Aai2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '6', null, null, null, null, null);
+insert into sys_user values (13, 105, '18190819097', '贾春华', '00', '', '18190819097', '0', '', '$2a$10$QSI1Pl1YK6kGt0zLDNv1COQyK8UDLWhBq26QSXEPpikIDArtqjeau', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '6', null, null, null, null, null);
+insert into sys_user values (14, 106, '15928150405', '刘楠', '00', '', '15928150405', '0', '', '$2a$10$6tmHn6r5Dy6/qdu/ZotiSObzEr7zymkKL/g/VkcdUjV16OezZFALu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '6', null, null, null, null, null);
 insert into sys_user values (15, 104, '13678018998', '张明勇', '00', '', '13678018998', '0', '', '$2a$10$TKhy.bdUf4CmSN4nnVGZIeuQvtaFc1V/cXKT87sCjpOwvLOGpDuC.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (16, 104, '13683488600', '陈建贤', '00', '', '13683488600', '0', '', '$2a$10$/2zL9VLX21iPxTVPklI11uOanp0bcR90mgCc9tIz6.Ux1/tegzFBG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (17, 104, '13438165216', '张国芳', '00', '', '13438165216', '1', '', '$2a$10$sKkER/2RwOhIcufS8ceg..D9TchtO/R4nFCP1cDpW4BsS47TcqqRC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (18, 104, '15181125323', '简鑫', '00', '', '15181125323', '1', '', '$2a$10$v2mVQvW5BsZnrxJ6j.AHRebGVQMRI3jaDlX0lDQnpBD.Y86VSnf9K', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (19, 104, '13378256139', '谢辉波', '00', '', '13378256139', '0', '', '$2a$10$mZT.3thlsNmtiGXrgJxIm.QbktUAa9blLqwOq7LhGfy1XG1xnAzEm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (20, 105, '13550342375', '李胜才', '00', '', '13550342375', '0', '', '$2a$10$lUhqpfwHzoVXPDC6qRu8su8HWlLJ49SCEo1NDXyFf2q5C8hThZbXi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (21, 105, '13568885428', '杨俊', '00', '', '13568885428', '0', '', '$2a$10$CSpKNIxy1hlgONyLZNk9hupaQXiwpGEJYv8DFcSebuIp81J6aheeO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (20, 105, '13550342375', '李胜才', '00', '', '13550342375', '0', '', '$2a$10$lUhqpfwHzoVXPDC6qRu8su8HWlLJ49SCEo1NDXyFf2q5C8hThZbXi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '4', null, null, null, null, null);
+insert into sys_user values (21, 105, '13568885428', '杨俊', '00', '', '13568885428', '0', '', '$2a$10$CSpKNIxy1hlgONyLZNk9hupaQXiwpGEJYv8DFcSebuIp81J6aheeO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '4', null, null, null, null, null);
 insert into sys_user values (22, 105, '13882200825', '夏夏', '00', '', '13882200825', '0', '', '$2a$10$WMD98fLsImPZ9rJwyIely.j5AKiQyUt/I3qT/Xcg5EdQCIkxx4kq2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (23, 105, '18373705527', '柯枭', '00', '', '18373705527', '1', '', '$2a$10$EMikBVL2M4b97n.MJmMCNO1YiFl49bjWWXZkFDZqvVkOpYhb5FEe6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (24, 105, '18202833529', '黎超', '00', '', '18202833529', '0', '', '$2a$10$MkPiNt69sG3HQg9EY3cpv.0Sw1iq53NMq/kdplK9W8ohqqY/dlUxC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (25, 105, '13111885671', '刘兴', '00', '', '13111885671', '0', '', '$2a$10$Ag2jfz8ppoSP4bpohVVD1evq8glP6O4tY0HD9DoXXhsPpxSP8egSy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (26, 105, '18782949671', '梁洁', '00', '', '18782949671', '1', '', '$2a$10$BZurM7Hzy/aquuAlLkk/pOD.y0Ks.BtYcCTTyEwtJHY3QEgFdwRBe', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (27, 105, '18681251027', '高天沄', '00', '', '18681251027', '0', '', '$2a$10$xk96PJpjcUIWEo9RTTOKYubqeSXETSUSbRYFjpCgSr1z9PPKUSKsu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (28, 106, '18780223280', '周文婷*', '00', '', '18780223280', '1', '', '$2a$10$pg.prMidA.76KkPRsZsOQuKStpl74J29heNpxCtJbZqDl7i9DjIuu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (28, 106, '18780223280', '周文婷*', '00', '', '18780223280', '1', '', '$2a$10$pg.prMidA.76KkPRsZsOQuKStpl74J29heNpxCtJbZqDl7i9DjIuu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '4', null, null, null, null, null);
 insert into sys_user values (29, 106, '18202802155', '彭敏', '00', '', '18202802155', '1', '', '$2a$10$ozjePPQbsp9YORLj7r4.K.lTC/9E/ANgDsOHsEyHlQ9DP2MtggiAO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (30, 106, '13699682119', '苟丹', '00', '', '13699682119', '1', '', '$2a$10$Jt.lg9CXVwlm0puSYFS6IOjxrSPAAHuf5gFmRtRX89IAwJlL8bm4e', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (31, 106, '15102831685', '宋丹丹', '00', '', '15102831685', '1', '', '$2a$10$/j4MpWKxCUekgxiTD1yyyOpOVJme5YbfJz042FuNJLuccxkC2yJSm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (32, 107, '18828096127', '朱静', '00', '', '18828096127', '0', '', '$2a$10$PrXuWRk4u9d05TNI9MAGjeGwmsSglOtGNKX.fjDuRwmTfVSFr4x9C', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (33, 107, '13882148315', '陈尚云', '00', '', '13882148315', '0', '', '$2a$10$I7CDnjCXqmbFmxdgcsoZ/uhgvEahRGZ/u3P4bdIU1Kic49Itu97JG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (32, 107, '18828096127', '朱静', '00', '', '18828096127', '0', '', '$2a$10$PrXuWRk4u9d05TNI9MAGjeGwmsSglOtGNKX.fjDuRwmTfVSFr4x9C', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '5', null, null, null, null, null);
+insert into sys_user values (33, 107, '13882148315', '陈尚云', '00', '', '13882148315', '0', '', '$2a$10$I7CDnjCXqmbFmxdgcsoZ/uhgvEahRGZ/u3P4bdIU1Kic49Itu97JG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '5', null, null, null, null, null);
 insert into sys_user values (34, 107, '18408201550', '邹帅民', '00', '', '18408201550', '0', '', '$2a$10$VC/JGLy.P6yJ5LJHmuq2dur.wnHYDzzxjyaizC8fYVNRq5DBmjjIm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (35, 107, '13808178930', '周芝', '00', '', '13808178930', '1', '', '$2a$10$4SuEJ.5YZSnk3UlpISWBmer7UZVMBKuMNBiG2/lUKafwNr1jI1UF2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (36, 107, '18780290087', '苟旭', '00', '', '18780290087', '0', '', '$2a$10$QCU/ERPaKSs5CAuWWB2WZ.13fxht6GKgGORCBS8DUy3qBmJybgzM.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (37, 107, '18483229950', '唐浩', '00', '', '18483229950', '0', '', '$2a$10$B..WW48a/JzGIgxdKoQEuu70YDGVmqJf/PV/WzcWjhatTZMA9Ch..', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (38, 108, '18280462009', '刘媛媛', '00', '', '18280462009', '1', '', '$2a$10$SWNBLt43nQQJPC58DZmZcuHqkhre8lOMfl87AnM5UKuMrMfuPpaO6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (39, 108, '18200194440', '吴振', '00', '', '18200194440', '0', '', '$2a$10$a3ozNbqM6BYYISEJGIpx5O83L1RpMXNc4A9gpPu93qZ9PahUzx24u', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (38, 108, '18280462009', '刘媛媛', '00', '', '18280462009', '1', '', '$2a$10$SWNBLt43nQQJPC58DZmZcuHqkhre8lOMfl87AnM5UKuMrMfuPpaO6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '5', null, null, null, null, null);
+insert into sys_user values (39, 108, '18200194440', '吴振', '00', '', '18200194440', '0', '', '$2a$10$a3ozNbqM6BYYISEJGIpx5O83L1RpMXNc4A9gpPu93qZ9PahUzx24u', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '4', null, null, null, null, null);
 insert into sys_user values (40, 108, '15892280776', '王刚', '00', '', '15892280776', '0', '', '$2a$10$ulhCOUUylhfnX7iccme6I.zpwLdnvU3zXXuMJ9LtRILnviD6Pvg9u', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (41, 108, '18140026972', '朱倪强', '00', '', '18140026972', '0', '', '$2a$10$HLRPkMz/orRnHouLjKNoH.Mn..dH97urH6up1x5AO0ZmtL64wp5XG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (42, 108, '18408248664', '李圆', '00', '', '18408248664', '1', '', '$2a$10$nMUdzmsF1Tk1FOR7k92kMulRN31LkiWV45F3eAAvNwCS8acu9endK', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (43, 108, '18783205676', '李泳龙', '00', '', '18783205676', '0', '', '$2a$10$LHQQe3UHQgaJDCnPl.gujuBKgRhrMN88kPKRxev2HSvOrV2IDRAfG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (44, 108, '13684023317', '唐伟', '00', '', '13684023317', '0', '', '$2a$10$wkhl3nWazhW8eQpc3D9S4OJibMFwQLq3.Ocxa6RxbAK.RNRTqyT0K', '0', '0', '', null, 'admin', '2024-03-22 10:06:10', '', null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (45, 109, '13402863790', '何杰', '00', '', '13402863790', '0', '', '$2a$10$XZhKTnoYh.zS/TczIVjJyOVMvwjQ.fiH3QtTpB9M2OaHnhpIiOYWS', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (45, 109, '13402863790', '何杰', '00', '', '13402863790', '0', '', '$2a$10$XZhKTnoYh.zS/TczIVjJyOVMvwjQ.fiH3QtTpB9M2OaHnhpIiOYWS', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '5', null, null, null, null, null);
 insert into sys_user values (46, 109, '18224091291', '杨玉婧', '00', '', '18224091291', '1', '', '$2a$10$goGcN9K63wIO7t8Rkw95kuMb1twHzRU51Dk6q31/.Hejl2Aro0kVq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (47, 109, '15196615885', '余思翰', '00', '', '15196615885', '1', '', '$2a$10$IjogDx43u3xmI2TigAo6CugCKh.AAmwOSf1nKBCWlJ/cEhgpX.H3e', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (48, 109, '17716873691', '阮梦妍', '00', '', '17716873691', '1', '', '$2a$10$XXlN3NzrRMBmMudrV3ZgOOtEq.RML/KrrVhN/uh.rpP7chAqy8QTe', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (49, 109, '15881196342', '赵芩', '00', '', '15881196342', '1', '', '$2a$10$x2pMljHso1uFHnjDpFu0/OPGrU1ITvl7hnv/bwFFQVUIH/mQ39k2G', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (50, 109, '18502889383', '王荣华', '00', '', '18502889383', '0', '', '$2a$10$G7uXmOzRgagbI2jske8meuu8p0QgvTvMxLDzV0gQWHVaKJTsW6e3i', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (51, 109, '19982093641', '屈亚星', '00', '', '19982093641', '1', '', '$2a$10$gklMWtGS2E8tdWakJpNk9OyEv2g/2MGuQupEH0Q7zCpZI9XJPMxyC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (52, 110, '13880509805', '吴凯', '00', '', '13880509805', '0', '', '$2a$10$AN5g8asAyLLW9.POKvkh8.WPCKqzf4Ze71ltLA.wIbEqIH3fQSj0q', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (53, 110, '13981911565', '李旭', '00', '', '13981911565', '0', '', '$2a$10$j4GUGW8LwJVW5kS98xis3.PYbeMsqjJwiJBnmj1lYpS04hqp7IvMi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (52, 110, '13880509805', '吴凯', '00', '', '13880509805', '0', '', '$2a$10$AN5g8asAyLLW9.POKvkh8.WPCKqzf4Ze71ltLA.wIbEqIH3fQSj0q', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '5', null, null, null, null, null);
+insert into sys_user values (53, 110, '13981911565', '李旭', '00', '', '13981911565', '0', '', '$2a$10$j4GUGW8LwJVW5kS98xis3.PYbeMsqjJwiJBnmj1lYpS04hqp7IvMi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '5', null, null, null, null, null);
 insert into sys_user values (54, 110, '13708077449', '马如坤', '00', '', '13708077449', '0', '', '$2a$10$SO9HTWCXPMBbHiMUs73YdON7RYGfi0LbB/Tfyq5e7BZaxSbJvTB3S', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (55, 110, '13684088875', '张进', '00', '', '13684088875', '0', '', '$2a$10$TMJoxh5FamkqFR7crz.eh.1/jwx9JdyAm9SAE/wzZdwgzfqjljvGC', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (56, 110, '13550225550', '冉洪芳', '00', '', '13550225550', '1', '', '$2a$10$N0iuZU3JhPqLBogqtMbmeuL1aGb/D3E0Yh3UUoJX6yV.iaVT1WBhq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
@@ -151,8 +151,8 @@ insert into sys_user values (59, 110, '13658078979', '王晶丽', '00', '', '136
 insert into sys_user values (60, 110, '13488986700', '罗业华', '00', '', '13488986700', '0', '', '$2a$10$8np5PzaPEkMQwRYUzSnUX.pDQSRdbpFXyzhtYvBj11OzTaNmGAEtG', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (61, 110, '13540297596', '郎悟灵', '00', '', '13540297596', '1', '', '$2a$10$BU3usTExEEbFa7VGIbnOgeAJ3CsJXPkzV6ZTH2xRtu70Es76RP5j.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (62, 110, '18030862435', '黄俊峰', '00', '', '18030862435', '0', '', '$2a$10$gBqKUDSxjc4mHUp6Pcrp8evF1BVhgkpq8cm65iqWtHkkDP1wk/Jaa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (63, 111, '15881027005', '赵洪', '00', '', '15881027005', '0', '', '$2a$10$HbyEXT7JR0HMv/rqi9YuQOKCyDxZg/uYgayoSOcE2.tDSVNS0OBpW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (64, 111, '18782047395', '雷情情', '00', '', '18782047395', '1', '', '$2a$10$DLeq2ePfvTS9cAarUu87LuM8d1nwJR5t/OBI3kc5nT858nIo0vpR2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (63, 111, '15881027005', '赵洪', '00', '', '15881027005', '0', '', '$2a$10$HbyEXT7JR0HMv/rqi9YuQOKCyDxZg/uYgayoSOcE2.tDSVNS0OBpW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '4', null, null, null, null, null);
+insert into sys_user values (64, 111, '18782047395', '雷情情', '00', '', '18782047395', '1', '', '$2a$10$DLeq2ePfvTS9cAarUu87LuM8d1nwJR5t/OBI3kc5nT858nIo0vpR2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '4', null, null, null, null, null);
 insert into sys_user values (65, 111, '13668275672', '刘向东', '00', '', '13668275672', '0', '', '$2a$10$GUkGxa.u4jsBVE5mAXVTcetM0t6JIxMPUthi6v5IitkVSZUlpzf5.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (66, 111, '13880738396', '徐志勇', '00', '', '13880738396', '0', '', '$2a$10$toSkneflSQedWXrjbim6lut03gEx1HlV4FV1UFYocdtDpEhpbbLam', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (67, 111, '15828108217', '李敏', '00', '', '15828108217', '1', '', '$2a$10$c8ADHg87uPh0KaTXl.hWm.5z4hVDRtFmTprgfAJ1y.yVj27mEvV8i', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
@@ -171,8 +171,8 @@ insert into sys_user values (79, 111, '15208122776', '张杰', '00', '', '152081
 insert into sys_user values (80, 111, '17345094889', '廖双', '00', '', '17345094889', '0', '', '$2a$10$AA3hI9GxRBB3XD9N/NthD.nqYf487wG3BvJQgYsSTublKos1Gy1Km', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (81, 111, '15520996706', '廖吉兴', '00', '', '15520996706', '0', '', '$2a$10$/KNuVYgY/iKADZZg.iykyuJK/rrgi/CpbZy.ZFv3NKm4MrpqBnCFu', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (82, 111, '15692823805', '王海宾', '00', '', '15692823805', '0', '', '$2a$10$OF1jB2LgFMeaakI6NTPqx.nTTe4bKzZeaP9dYccOk0v0rdCzja7Jy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (83, 112, '13540773353', '杨振', '00', '', '13540773353', '0', '', '$2a$10$m8MnVkkjv9DT7GRaVDfG9e0lQM79NJPBwFQL3eckGh32qylKlNeky', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (84, 112, '18380220140', '甘雨婷', '00', '', '18380220140', '1', '', '$2a$10$HXgw5OtU9uUCiKbSAPG0xe5PwGiZWlCIlJtltgXdtCYIZxIcKw01S', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (83, 112, '13540773353', '杨振', '00', '', '13540773353', '0', '', '$2a$10$m8MnVkkjv9DT7GRaVDfG9e0lQM79NJPBwFQL3eckGh32qylKlNeky', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '5', null, null, null, null, null);
+insert into sys_user values (84, 112, '18380220140', '甘雨婷', '00', '', '18380220140', '1', '', '$2a$10$HXgw5OtU9uUCiKbSAPG0xe5PwGiZWlCIlJtltgXdtCYIZxIcKw01S', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '4', null, null, null, null, null);
 insert into sys_user values (85, 112, '13608005983', '周强', '00', '', '13608005983', '0', '', '$2a$10$jIiDO3ighwg51nlJe4WbZet365ysf61KTuqrDNsF9YD90fHAMf9cy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (86, 112, '13540422960', '邹霞', '00', '', '13540422960', '1', '', '$2a$10$JGmiiO3vjhEF5e2BXubE1uE/DRzpcmK3SMBZo/EDExsd8L9TWqEHm', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (87, 112, '13488985627', '罗声燕', '00', '', '13488985627', '1', '', '$2a$10$.lFR.S8c/i3550O88zhk4OIyeYF2vmulknGqBvE/hi8b9id1RLNry', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
@@ -190,8 +190,8 @@ insert into sys_user values (98, 112, '13882487125', '赵明焱', '00', '', '138
 insert into sys_user values (99, 112, '18228226661', '董旭鹏', '00', '', '18228226661', '0', '', '$2a$10$yaBpFaISskiafcOa/k28VeSQSMiYhCxbtmMoXN/fruESTkMs4RwA6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (100, 112, '15775308748', '邓汶滨', '00', '', '15775308748', '0', '', '$2a$10$5L36DYl/Q.wmGKsolG/x0u4vnK78sVY59Qjx6fQA3z9n4dl62ykM.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (101, 112, '19949408104', '罗毅', '00', '', '19949408104', '0', '', '$2a$10$2QEEZ1VZ0Me6Ndaoon78Z.V7mBAyLIZKf7EokR/zILsd837A7ITgq', '0', '0', '', null, null, '2024-01-04 17:22:48', '', null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (102, 113, '13688460154', '周全', '00', '', '13688460154', '0', '', '$2a$10$TQMgM2lTRkeTB4YY5IHQ0.xvCGZlnd774UdWe.OPGElTkRuLAsEz6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (103, 113, '13688404696', '柏金川', '00', '', '13688404696', '0', '', '$2a$10$4ih05H.SB537jI2sHx756.hQvWBbm.4ViXs7HFKndjDQDCyvYz1rO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (102, 113, '13688460154', '周全', '00', '', '13688460154', '0', '', '$2a$10$TQMgM2lTRkeTB4YY5IHQ0.xvCGZlnd774UdWe.OPGElTkRuLAsEz6', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '5', null, null, null, null, null);
+insert into sys_user values (103, 113, '13688404696', '柏金川', '00', '', '13688404696', '0', '', '$2a$10$4ih05H.SB537jI2sHx756.hQvWBbm.4ViXs7HFKndjDQDCyvYz1rO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '4', null, null, null, null, null);
 insert into sys_user values (104, 113, '15802829286', '向艳雄', '00', '', '15802829286', '0', '', '$2a$10$FQo1zf1ss2OZw4eIlzzxwOyPV0FkkLDN0ZBxqRSIijNpUCCSxBjQy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (105, 113, '13594658239', '黄安堂', '00', '', '13594658239', '0', '', '$2a$10$uSefDVQx.kottALOIZptjO0RnZhvITS4QTnXjSBJddqYfOftdZ8Pa', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (106, 113, '13408566079', '李学勇', '00', '', '13408566079', '0', '', '$2a$10$8ru4dmjHBh21h8C3FTpdMeqsG4RHVyvqmqUFRFCDCUok2uH2ZLjiy', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
@@ -227,7 +227,7 @@ insert into sys_user values (135, 200, '15828156243', '廖勇', '00', '', '15828
 insert into sys_user values (136, 200, '14726050305', '康科伟', '00', '', '14726050305', '0', '', '$2a$10$04.7zNYdTwXzlQ8J0SYNaOZMc.iarm2gBeD37na6.aAtuBzfnpnUO', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (137, 200, '18111675896', '熊艳华', '00', '', '18111675896', '0', '', '$2a$10$uLfMqz3YfEuAO8TI0XOzE.Xn0FZA7U6zrfss6Xp.anF4xUZNXT37y', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (138, 200, '18982085285', '赵永来', '00', '', '18982085285', '0', '', '$2a$10$TzKjV2T1FJ7YubxeIZZnmuLBsdppYlHoxruXCh0aBhHyV/yLGaiai', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
-insert into sys_user values (139, 116, '15982167611', '刘洋', '00', '', '15982167611', '0', '', '$2a$10$qxB0MTpLA7WzUhBpQlrC5u.7JymKt2bwAJ9gupwWQeKcANtov0qn.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
+insert into sys_user values (139, 116, '15982167611', '刘洋', '00', '', '15982167611', '0', '', '$2a$10$qxB0MTpLA7WzUhBpQlrC5u.7JymKt2bwAJ9gupwWQeKcANtov0qn.', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, '4', null, null, null, null, null);
 insert into sys_user values (140, 116, '17345090038', '郑鹏', '00', '', '17345090038', '0', '', '$2a$10$meTOhyDbWqzhrzCFDGM3hu.cOFwinewDE1Jp3YYR/ThYBvOssce7G', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (141, 116, '17612894797', '黄强', '00', '', '17612894797', '0', '', '$2a$10$JyofvRfiRj5Ug2G4ux00eOtMvQSOKu.tjo0.Juey2xMZSsAggVE76', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
 insert into sys_user values (142, 117, '18602830814', '黄梅琳', '00', '', '18602830814', '1', '', '$2a$10$Ij6SqoLMDrpLBJ87rKqIh.8JDRNMROQQyHQSZV5wsUn7ybJ53ip86', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null, null, null, null, null, null);
@@ -391,7 +391,6 @@ insert into sys_menu values('119',  '岗位工资', '4',   '2', 'salary',     'o
 insert into sys_menu values('500',  '操作日志', '108', '1', 'operlog',    'monitor/operlog/index',    '', 1, 0, 'C', '0', '0', 'monitor:operlog:list',    'form',          'admin', sysdate(), '', null, '操作日志菜单');
 insert into sys_menu values('501',  '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor',    'admin', sysdate(), '', null, '登录日志菜单');
 -- 用户管理按钮
 insert into sys_menu values('1001', '用户查询', '100', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:query',          '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1002', '用户新增', '100', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:add',            '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1003', '用户修改', '100', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit',           '#', 'admin', sysdate(), '', null, '');
@@ -682,7 +681,6 @@ create table sys_role_menu (
 -- ----------------------------
 -- 初始化-角色和菜单关联表数据
 -- ----------------------------
-insert into sys_role_menu values ('2', '1000');
 insert into sys_role_menu values ('2', '1001');
 insert into sys_role_menu values ('2', '1017');
 insert into sys_role_menu values ('3', '4');
@@ -877,7 +875,7 @@ insert into sys_user_post values (113, 26);
 insert into sys_user_post values (114, 26);
 insert into sys_user_post values (115, 26);
 insert into sys_user_post values (116, 26);
-insert into sys_user_post values (117, 26);
+insert into sys_user_post values (117, 13);
 insert into sys_user_post values (118, 26);
 insert into sys_user_post values (119, 26);
 insert into sys_user_post values (120, 26);
@@ -1356,7 +1354,7 @@ create table cmc_project  (
   project_id			char(19)				not null 			comment '项目id',
   project_number		varchar(10)				default null		comment '项目编号',
   project_name			varchar(50)				default null		comment '项目名称',
-  project_leader		varchar(3)				default null		comment '项目负责人',
+  project_leader		bigint					default null		comment '项目负责人',
   is_finished			char(1)					default null		comment '项目状态（0进行中、1已结束）',
   project_source		char(1)					default null		comment '项目来源（0院内、1院外）',
   party_a				varchar(50)				default null		comment '甲方单位',
@@ -1365,7 +1363,7 @@ create table cmc_project  (
   contract_id			char(10)				default null		comment '合同编码',
   project_type			varchar(20)				default null		comment '项目类型',
   project_level			char(1)					default null		comment '项目级别（0一般项目、1重大项目）',
-  project_registrant	varchar(3)				default null		comment '项目登记人',
+  project_registrant	bigint					default null		comment '项目登记人',
   undertaking_dept		varchar(20)				default null		comment '承担部门',
   create_time			datetime				default null		comment '项目登记时间',
   remark				varchar(255)			default null		comment '项目备注',
@@ -1391,8 +1389,8 @@ INSERT INTO cmc_project VALUES ('13', '2022C12', '硬梁包电站扯索坝和二
 INSERT INTO cmc_project VALUES ('14', '2022C29', '雅安市名山区百丈镇临溪河综合整治项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('15', '2022C46', '猴子岩水电站取水口及水厂新址1:500地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('16', '2022C56', '新华水力发电有限公司博州10万千瓦储热型光热配建90万千瓦新能源项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('17', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('18', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('17', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,112,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('18', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,112,108', NULL, NULL);
 INSERT INTO cmc_project VALUES ('19', '2022C76', '芦山县市政公园恢复及重建工程项目地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('20', '2022C81', ' 宜宾蟠龙抽水蓄能电站地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('21', '2022C85', '金沙江上游清洁能源基地叶巴滩抽水蓄能电站地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -1406,93 +1404,92 @@ INSERT INTO cmc_project VALUES ('28', '2022W30', '广元市自然资源局昭化
 INSERT INTO cmc_project VALUES ('29', '2022W34', '大唐观音岩水电站2022年度变形监测控制网复测及坝前淤积和坝后冲刷测量项目', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('30', '2022W38', '仪陇县林权数据整合建库采购项目政府采购合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('31', '2022W45', '国网西藏拉萨发电公司羊湖电站压力钢管永久变形监测沉降水准工作基点改造施工合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('32', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('33', '2023C02', '江油抽水蓄能电站可研阶段工程区1:1000地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('34', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', '83', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('32', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('33', '2023C02', '江油抽水蓄能电站可研阶段工程区1:1000地形图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('34', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', 83, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('35', '2023C08', '孟底沟水电站2023年地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('36', '2023C10', '德登抽水蓄能电站规划阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('37', '2023C101', 'ML水电站可研阶段1:1000地形图测绘', '83', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('37', '2023C101', 'ML水电站可研阶段1:1000地形图测绘', 83, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112', NULL, NULL);
 INSERT INTO cmc_project VALUES ('38', '2023C102', '硬梁包水电站建设征地移民安置土地开发整理临时占地复垦刘河坝1:1000地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('39', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('40', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('39', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('40', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('41', '2023C18', '芦山抽水蓄能电站可研阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('42', '2023C20', '平昌抽水蓄能电站（苟家河库址）预可、可研阶段地形图测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('43', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('44', '2023C23', 'YX移民项目地形图测绘', '84', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('45', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('46', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', '39', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '200,216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('43', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('44', '2023C23', 'YX移民项目地形图测绘', 84, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112,111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('45', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('46', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', 39, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '108,111', NULL, NULL);
 INSERT INTO cmc_project VALUES ('47', '2023C29', 'ML坝址实景三维模型及库区电子沙盘制作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('48', '2023C40', '金阳施控网成果复核', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('49', '2023C41', 'ML库区点位配合测量（配合基础设施分公司）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('50', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', NULL, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL, NULL);
-INSERT INTO cmc_project VALUES ('51', '2023C47', '绵竹抽水蓄能电站界桩测设工作', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('52', '2023C49', '甘孜抽水蓄能水电站地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('53', '2023C52', '老木孔航电枢纽工程排涝区域1:2000地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200,103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('54', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1:2000地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('55', '2023C54', '国能大渡河汉源永利坪光伏电站项目1:500地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('51', '2023C47', '绵竹抽水蓄能电站界桩测设工作', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('52', '2023C49', '甘孜抽水蓄能水电站地形图测绘', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('53', '2023C52', '老木孔航电枢纽工程排涝区域1:2000地形图测绘', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108,112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('54', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1:2000地形图测绘', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('55', '2023C54', '国能大渡河汉源永利坪光伏电站项目1:500地形图测绘', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
 INSERT INTO cmc_project VALUES ('56', '2023C56', '长河坝水电站汤坝居民点和土地复垦外部引水工程地形地类图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('57', '2023C57', '官地水电站地形图测绘本', '39', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '200,216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('58', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('59', '2023C59', '老沟水库库容曲线测量', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('60', '2023C60', '大渡河流域扩机电站坐标转换', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('61', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('62', '2023C62', '铜街子水电站坝后段及渣场1:500地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('63', '2023C63', '波罗水电站补充地形地类图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('64', '2023C66', '硬梁包水电站库区实物指标配合测量', NULL, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('65', '2023C69', '金沙江岗托水电站地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('66', '2023C72', '江油抽水蓄能电站界桩测设工作', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('57', '2023C57', '官地水电站地形图测绘本', 39, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '108,111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('58', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('59', '2023C59', '老沟水库库容曲线测量', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('60', '2023C60', '大渡河流域扩机电站坐标转换', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('61', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('62', '2023C62', '铜街子水电站坝后段及渣场1:500地形图测绘', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('63', '2023C63', '波罗水电站补充地形地类图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('64', '2023C66', '硬梁包水电站库区实物指标配合测量', NULL, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112,112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('65', '2023C69', '金沙江岗托水电站地形图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('66', '2023C72', '江油抽水蓄能电站界桩测设工作', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,112', NULL, NULL);
 INSERT INTO cmc_project VALUES ('67', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('68', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', '84', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('69', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', '66', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('70', '2023C76', '牙根二级水电站1:2000地形地类图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200,103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('71', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', '84', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('72', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('73', '2023C80', '安徽西形冲抽水蓄能电站可研阶段地形图测绘项目', '83', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('74', '2023C82', '叙州区抽水蓄能电站1:2000地形图测绘', '84', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('75', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', '83', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('76', '2023C86', '叶巴滩水电站连接道路硬化改建工程1:2000地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('77', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', '84', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('78', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', '64', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('79', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', '83', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('80', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('81', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', '64', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('82', '2023C94', 'JW梯级电站可研阶段地形图测绘', '83', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('83', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', '64', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('84', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', '64', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('85', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', '84', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('86', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', NULL, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('87', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('88', '2023HY01', '航测遥感中心零星及借调项目', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('89', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO cmc_project VALUES ('68', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', 84, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('69', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', 66, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('70', '2023C76', '牙根二级水电站1:2000地形地类图测绘', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108,112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('71', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', 84, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112,112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('72', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('73', '2023C80', '安徽西形冲抽水蓄能电站可研阶段地形图测绘项目', 83, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('74', '2023C82', '叙州区抽水蓄能电站1:2000地形图测绘', 84, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('75', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', 83, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('76', '2023C86', '叶巴滩水电站连接道路硬化改建工程1:2000地形图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('77', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', 84, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('78', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', 64, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('79', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', 83, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('80', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('81', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', 64, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('82', '2023C94', 'JW梯级电站可研阶段地形图测绘', 83, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112,111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('83', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', 64, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('84', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', 64, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('85', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', 84, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('86', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', NULL, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('87', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('88', '2023HY01', '航测遥感中心零星及借调项目', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('89', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('90', '2023W03', '雅砻江二滩水电站大坝外部变形观测及谷坡稳定性监测（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('91', '2023W06', '四川大渡河双江口水电站枢纽工程测量中心服务（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('92', '2023W08', '大渡河金川水电站工程测量中心劳务配合（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('93', '2023W09', '国能四川阿水电力开发有限公司绰斯甲水电站工程测量中心技术服务（2023年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('94', '2023W11', '四川省盐源县测量标志普查维护工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('95', '2023W13', '拉萨水环境项目测绘工作', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('95', '2023W13', '拉萨水环境项目测绘工作', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
 INSERT INTO cmc_project VALUES ('96', '2023W16', '泸定水电站2023年水库泥沙监测服务', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('97', '2023W19', '国网拉萨发电公司2023年直孔、羊湖电站变形监测及资料整编技术服务合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('98', '2023W21', '大渡河公司大岗山水电站大坝及库岸边坡监测设备设施完善工程合同', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('99', '2023W23', '马来西亚东海岸铁路项目精测网复测', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('100', '2023W24', '双流地形图测绘', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
+INSERT INTO cmc_project VALUES ('100', '2023W24', '双流地形图测绘', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112', NULL, NULL);
 INSERT INTO cmc_project VALUES ('101', '2023W26', '巴福大健康组团路网一标段第三方监测外协合同协议书', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('102', '2023W27', '简阳1:2000地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('102', '2023W27', '简阳1:2000地形图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
 INSERT INTO cmc_project VALUES ('103', '2023W28', '安州区黄洞子沟河道清淤项目测绘工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('104', '2023W31', '黄河干流四川段防洪治理工程初设阶段勘察工作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('105', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,103,200', NULL, NULL);
-INSERT INTO cmc_project VALUES ('106', '2024C03', '川藏铁路康定段三道桥放线配合测量', '84', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103,216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('105', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,112,108', NULL, NULL);
+INSERT INTO cmc_project VALUES ('106', '2024C03', '川藏铁路康定段三道桥放线配合测量', 84, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112,111', NULL, NULL);
 INSERT INTO cmc_project VALUES ('107', '2024C05', '卡瓦白庆抽水蓄能电站可研阶段地形图测绘', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('108', '2024C06', '安徽芜湖西形冲抽水蓄能电站建设征地界桩测设及居民点等地形地类图测绘', '96', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '103', NULL, NULL);
-INSERT INTO cmc_project VALUES ('109', '2024C07', '绵竹抽水蓄能电站技施阶段测绘工作', '79', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('110', '2024C08', '猴子岩水电站江口村及周边1:1000地形地类图测绘', '74', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
-INSERT INTO cmc_project VALUES ('111', '2024HY01', '航测遥感中心借调、零星项目', '63', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216', NULL, NULL);
+INSERT INTO cmc_project VALUES ('108', '2024C06', '安徽芜湖西形冲抽水蓄能电站建设征地界桩测设及居民点等地形地类图测绘', 96, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '112', NULL, NULL);
+INSERT INTO cmc_project VALUES ('109', '2024C07', '绵竹抽水蓄能电站技施阶段测绘工作', 79, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('110', '2024C08', '猴子岩水电站江口村及周边1:1000地形地类图测绘', 74, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
+INSERT INTO cmc_project VALUES ('111', '2024HY01', '航测遥感中心借调、零星项目', 63, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', NULL, NULL);
 INSERT INTO cmc_project VALUES ('112', '2024W01', '重庆区县建成区实景三维制作', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO cmc_project VALUES ('113', '2024W02', '凤山平乐风电场地形图测绘', '75', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '216,200', NULL, NULL);
+INSERT INTO cmc_project VALUES ('113', '2024W02', '凤山平乐风电场地形图测绘', 75, '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111,108', NULL, NULL);
 INSERT INTO cmc_project VALUES ('114', '2024W08', '国能四川阿水电力开发有限公司绰斯甲水电站工程测量中心技术服务（2024年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('115', '2024W09', '四川省雅砻江两河口水电站工程测量中心服务（2024年）', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO cmc_project VALUES ('116', '2024W11', '国网拉萨发电公司2024年直孔、羊湖电站变形监测及资料整编', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-
 -- ----------------------------
 -- 24、cmc项目内容表
 -- ----------------------------
@@ -3724,70 +3721,49 @@ drop table if exists `cmc_project_worker`;
 create table `cmc_project_worker`  (
   `id` 				varchar(32) not null 	comment 'id',
   `project_id` 		varchar(32) default null comment '项目id',
-  `project_leader` 	varchar(32) default null comment '项目负责人',
-  `in_worker` 		varchar(32) default null comment '内业负责人',
-  `out_worker` 		varchar(32) default null comment '外业负责人',
+  `in_worker` 		varchar(32) default null comment '内业作业员',
+  `out_worker` 		varchar(32) default null comment '外业作业员',
   primary key (`id`)
 ) engine = innodb comment = 'cmc项目人员表';
 
 -- ----------------------------
 -- 初始化-项目人员表数据
 -- ----------------------------
-INSERT INTO `cmc_project_worker` VALUES ('1633765257669246978', '1633765257669246977', '83', '73', '83');
-INSERT INTO `cmc_project_worker` VALUES ('1633768222907957250', '1633768222907957249', '63', '63', '63');
-INSERT INTO `cmc_project_worker` VALUES ('1633770811569471491', '1633770811569471490', '74', '72', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1633771027018285058', '1633771027018285057', '74', '72', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1633771294472273923', '1633771294472273922', '74', '74', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1633781742236073986', '1633781742236073985', '63', '63', '63');
-INSERT INTO `cmc_project_worker` VALUES ('1641355612560293890', '1641355612560293889', '39', '39', '39');
-INSERT INTO `cmc_project_worker` VALUES ('1641805297456513027', '1641805297456513026', '63', '63', '63');
-INSERT INTO `cmc_project_worker` VALUES ('1641807061123596291', '1641807061123596290', '63', '63', '63');
-INSERT INTO `cmc_project_worker` VALUES ('1652690353125326850', '1652690353125326849', '74', '74', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1658656258510553090', '1658656258510553089', '84', '84', '84');
-INSERT INTO `cmc_project_worker` VALUES ('1673601192074149891', '1673601192074149890', '63', '72', '75');
-INSERT INTO `cmc_project_worker` VALUES ('1673601523608715267', '1673601523608715266', '63', '72', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1673601908515799043', '1673601908515799042', '63', '64', '63');
-INSERT INTO `cmc_project_worker` VALUES ('1673602123545182211', '1673602123545182210', '63', '64', '63');
-INSERT INTO `cmc_project_worker` VALUES ('1676948354560425987', '1676948354560425986', '74', '74', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1676948591949643778', '1676948591949643777', '63', '64', '63');
-INSERT INTO `cmc_project_worker` VALUES ('1676948942941585411', '1676948942941585410', '39', '39', '63');
-INSERT INTO `cmc_project_worker` VALUES ('1679769237196898307', '1679769237196898306', '74', '84', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1679769589929476098', '1679769589929476097', '74', '84', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1679769796872241155', '1679769796872241154', '74', '74', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1679770747494465539', '1679770747494465538', '63', '63', '66');
-INSERT INTO `cmc_project_worker` VALUES ('1679772570787774467', '1679772570787774466', '63', '75', '75');
-INSERT INTO `cmc_project_worker` VALUES ('1685853339360690178', '1685853339360690177', '74', '74', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1685853709264748547', '1685853709264748546', '74', '74', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1694527969734688771', '1694527969734688770', '74', '71', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1694528325550080003', '1694528325550080002', '74', '64', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1697108010087743491', '1697108010087743490', '63', '98', '77');
-INSERT INTO `cmc_project_worker` VALUES ('1702491945512730627', '1702491945512730626', '63', '64', '96');
-INSERT INTO `cmc_project_worker` VALUES ('1702492292125818882', '1702492292125818881', '66', '66', '66');
-INSERT INTO `cmc_project_worker` VALUES ('1707211932139782147', '1707211932139782146', '84', '84', '96');
-INSERT INTO `cmc_project_worker` VALUES ('1707626752387317763', '1707626752387317762', '84', '84', '95');
-INSERT INTO `cmc_project_worker` VALUES ('1713455412201652226', '1713455412201652225', '63', '64', '63');
-INSERT INTO `cmc_project_worker` VALUES ('1715703538933301250', '1715703538933301249', '83', '83', '83');
-INSERT INTO `cmc_project_worker` VALUES ('1718965187043655683', '1718965187043655682', '84', '84', '95');
-INSERT INTO `cmc_project_worker` VALUES ('1718973009617747971', '1718973009617747970', '83', '84', '83');
-INSERT INTO `cmc_project_worker` VALUES ('1721876576657735683', '1721876576657735682', '83', '83', '83');
-INSERT INTO `cmc_project_worker` VALUES ('1729523067262074883', '1729523067262074882', '74', '64', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1729523327598329858', '1729523327594135553', '64', '64', '69');
-INSERT INTO `cmc_project_worker` VALUES ('1729523650169667587', '1729523650169667586', '63', '74', '64');
-INSERT INTO `cmc_project_worker` VALUES ('1729523884455100419', '1729523884455100418', '64', '74', '64');
-INSERT INTO `cmc_project_worker` VALUES ('1730092422756564994', '1730092422756564993', '84', '84', '95');
-INSERT INTO `cmc_project_worker` VALUES ('1731465142576611331', '1731465142576611330', '83', '84', '83');
-INSERT INTO `cmc_project_worker` VALUES ('1737454765236813826', '1737454765236813825', '83', '84', '83');
-INSERT INTO `cmc_project_worker` VALUES ('1739658607567306755', '1739658607567306754', '74', '64', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1739658998220587010', '1739658998220587009', '74', '74', '74');
-INSERT INTO `cmc_project_worker` VALUES ('1739961827233628163', '1739961827233628162', '84', '84', '98');
-INSERT INTO `cmc_project_worker` VALUES ('1741422198586867715', '1741422198586867714', '64', '64', '75');
-INSERT INTO `cmc_project_worker` VALUES ('1741422566360219651', '1741422566360219650', '64', '64', '75');
-INSERT INTO `cmc_project_worker` VALUES ('1752902350986543106', '1752902350986543105', '63', '63', '63');
-INSERT INTO `cmc_project_worker` VALUES ('1752903021416677379', '1752903021416677378', '75', '75', '75');
-INSERT INTO `cmc_project_worker` VALUES ('1763373750750806018', '1763373750746611714', '84', '84', '66');
-INSERT INTO `cmc_project_worker` VALUES ('1764836188989947907', '1764836188989947906', '96', '96', '96');
-INSERT INTO `cmc_project_worker` VALUES ('1765673949439459330', '1765673949439459329', '79', '79', '79');
-INSERT INTO `cmc_project_worker` VALUES ('1765674388075577347', '1765674388075577346', '74', '64', '74');
+INSERT INTO cmc_project_worker VALUES ('1673601908515799042', '53', 64, 63);
+INSERT INTO cmc_project_worker VALUES ('1673602123545182210', '54', 64, 63);
+INSERT INTO cmc_project_worker VALUES ('1676948591949643777', '59', 64, 63);
+INSERT INTO cmc_project_worker VALUES ('1713455412201652225', '72', 64, 63);
+INSERT INTO cmc_project_worker VALUES ('1676948942941585410', '57', 39, 63);
+INSERT INTO cmc_project_worker VALUES ('1729523650169667586', '80', 74, 64);
+INSERT INTO cmc_project_worker VALUES ('1729523884455100418', '81', 74, 64);
+INSERT INTO cmc_project_worker VALUES ('1763373750746611714', '106', 84, 66);
+INSERT INTO cmc_project_worker VALUES ('1679770747494465538', '51', 63, 66);
+INSERT INTO cmc_project_worker VALUES ('1729523327594135553', '78', 64, 69);
+INSERT INTO cmc_project_worker VALUES ('1679769237196898306', '17', 84, 74);
+INSERT INTO cmc_project_worker VALUES ('1679769589929476097', '18', 84, 74);
+INSERT INTO cmc_project_worker VALUES ('1633770811569471490', '32', 72, 74);
+INSERT INTO cmc_project_worker VALUES ('1633771027018285057', '33', 72, 74);
+INSERT INTO cmc_project_worker VALUES ('1673601523608715266', '55', 72, 74);
+INSERT INTO cmc_project_worker VALUES ('1694527969734688770', '63', 71, 74);
+INSERT INTO cmc_project_worker VALUES ('1739658607567306754', '105', 64, 74);
+INSERT INTO cmc_project_worker VALUES ('1765674388075577346', '110', 64, 74);
+INSERT INTO cmc_project_worker VALUES ('1694528325550080002', '65', 64, 74);
+INSERT INTO cmc_project_worker VALUES ('1729523067262074882', '76', 64, 74);
+INSERT INTO cmc_project_worker VALUES ('1673601192074149890', '52', 72, 75);
+INSERT INTO cmc_project_worker VALUES ('1741422198586867714', '83', 64, 75);
+INSERT INTO cmc_project_worker VALUES ('1741422566360219650', '84', 64, 75);
+INSERT INTO cmc_project_worker VALUES ('1697108010087743490', '66', 98, 77);
+INSERT INTO cmc_project_worker VALUES ('1737454765236813825', '37', 84, 83);
+INSERT INTO cmc_project_worker VALUES ('1718973009617747970', '75', 84, 83);
+INSERT INTO cmc_project_worker VALUES ('1731465142576611330', '82', 84, 83);
+INSERT INTO cmc_project_worker VALUES ('1633765257669246977', '34', 73, 83);
+INSERT INTO cmc_project_worker VALUES ('1707626752387317762', '68', 84, 95);
+INSERT INTO cmc_project_worker VALUES ('1718965187043655682', '74', 84, 95);
+INSERT INTO cmc_project_worker VALUES ('1730092422756564993', '77', 84, 95);
+INSERT INTO cmc_project_worker VALUES ('1707211932139782146', '71', 84, 96);
+INSERT INTO cmc_project_worker VALUES ('1702491945512730626', '70', 64, 96);
+INSERT INTO cmc_project_worker VALUES ('1739961827233628162', '85', 84, 98);
+
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;

oa-ui/src/api/oa/budget/budget.js

@@ -26,6 +26,15 @@ export function addBudget(data) {
   })
 }
 
+// 新增cmc预算管理
+export function submitBudget(data) {
+  return request({
+    url: '/oa/budget/submit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改cmc预算管理
 export function updateBudget(data) {
   return request({

oa-ui/src/api/oa/project/project.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-01-30 16:37:46
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-03-27 16:28:08
+ */
 /*
  * @Author: wrh
  * @Date: 2024-01-30 16:37:46
@@ -23,6 +29,15 @@ export function getProject(projectId) {
   })
 }
 
+// 获取项目负责人负责的项目详细信息
+export function getListByProjectLeader(projectLeader) {
+  return request({
+    url: '/oa/project/projectLeader',
+    method: 'get',
+    params: projectLeader
+  })
+}
+
 // 新增cmc项目
 export function addProject(data) {
   return request({

oa-ui/src/api/oa/project/projectWorker.js

@@ -17,15 +17,6 @@ export function getProjectWorker(id) {
   })
 }
 
-// 获取项目负责人负责的项目详细信息
-export function getListByProjectLeader(projectLeader) {
-  return request({
-    url: '/oa/projectWorker/projectLeader',
-    method: 'get',
-    params: projectLeader
-  })
-}
-
 // 新增cmc项目人员
 export function addProjectWorker(data) {
   return request({

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: wrh
- * @LastEditTime: 2024-03-25 17:24:13
+ * @LastEditTime: 2024-03-27 16:47:27
 -->
 
 <template>
@@ -18,7 +18,7 @@
                 <el-col :span="6" :xs="24">
                   <el-form-item label="申请人：" prop="user.nickName">
                     <!-- <el-input v-model="form.user"></el-input> -->
-                    {{ form.user.nickName }}
+                    {{ form.applierUser ? form.applierUser.nickName : form.user.nickName }}
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
@@ -47,7 +47,7 @@
                   }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
                   }}</el-descriptions-item>
-                  <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
+                  <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
                   }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-03-25 16:49:48
+ * @LastEditTime: 2024-03-27 16:47:23
 -->
 
 <template>
@@ -18,7 +18,7 @@
                 <el-col :span="6" :xs="24">
                   <el-form-item label="申请人：" prop="user.nickName">
                     <!-- <el-input v-model="form.user"></el-input> -->
-                    {{ form.user.nickName }}
+                    {{ form.applierUser ? form.applierUser.nickName : form.user.nickName }}
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
@@ -47,7 +47,7 @@
                     }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
                     }}</el-descriptions-item>
-                  <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
+                  <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
                     }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
@@ -101,8 +101,8 @@
               </el-form-item>
               <!-- 设备安排 -->
               <el-form-item label-width="120px" label="设备选择：">
-                <el-select v-model="form.devices" filterable placeholder="请选择" @change="handleSelectDevice" clearable :disabled="taskName != '安排设备'">
-                  <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.deviceNumber" :value="item.deviceId">
+                <el-select v-model="form.devices" filterable multiple placeholder="请选择" @change="handleSelectDevice" clearable :disabled="taskName != '安排设备'">
+                  <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.brand + item.series + item.name + item.code" :value="item.deviceId">
                   </el-option>
                 </el-select>
                 <el-descriptions border v-if="isDeviceSelect" style="margin-top: 10px;" :column="1">
@@ -114,6 +114,8 @@
                     }}</el-descriptions-item>
                   <el-descriptions-item label="规格型号" label-class-name="my-label">{{ chooseDevice.series
                     }}</el-descriptions-item>
+                  <el-descriptions-item label="存放地点" label-class-name="my-label">{{ chooseDevice.place
+                    }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
             </el-form>
@@ -184,7 +186,8 @@ export default {
           deptName: '',
         },
         applyDate: new Date(),
-        days: ""
+        days: "",
+        devices: []
       },
       projectList: [],
       chooseProject: {},
@@ -220,7 +223,6 @@ export default {
     // 初始化表单
     initForm() {
       getDeviceApproval(this.taskForm.formId).then(res => {
-        console.log(res.data)
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.user.nickName = this.$store.getters.name;
@@ -230,6 +232,16 @@ export default {
         } else {
           this.formTotal = 1;
           let data = res.data;
+          if (res.data.devices == null || res.data.devices == undefined || res.data.devices == "") {
+            data.devices = []
+          } else {
+            data.devices = data.devices.split(',');
+            let arr = []
+            for (let d of data.devices) {
+              arr.push(parseInt(d))
+            }
+            data.devices = arr;
+          }
           this.form = data;
           getProject(data.projectId).then(response => {
             this.chooseProject = response.data;
@@ -348,7 +360,7 @@ export default {
     // 选择设备
     handleSelectDevice(val) {
       if (val != "" && val != undefined && val != null) {
-        getDevice(val).then(res => {
+        getDevice(val[val.length - 1]).then(res => {
           this.chooseDevice = res.data;
           this.isDeviceSelect = true
         })

oa-ui/src/views/oa/budget/addBudget.vue

@@ -44,7 +44,7 @@
             {{ projectForm.projectName }}
           </el-form-item>
           <el-form-item label="项目负责人：" prop="projectLeader">
-            {{ projectForm.projectLeader }}
+            {{ projectForm.projectLeaderUser ? projectForm.projectLeaderUser.nickName : '' }}
           </el-form-item>
           <el-form-item label="项目类型：" prop="projectType">
             {{ projectForm.projectType }}

oa-ui/src/views/oa/budget/index.vue

@@ -1,3 +1,9 @@
+<!--
+ * @Author: wrh
+ * @Date: 2024-03-25 17:38:39
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-03-27 10:00:27
+-->
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
@@ -167,8 +173,9 @@
 
     <el-table v-loading="loading" :data="budgetList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="预算id" align="center" prop="budgetId" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
+      <!-- <el-table-column label="预算id" align="center" prop="budgetId" /> -->
+      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
+      <el-table-column label="项目名称" align="center" prop="project.projectName" />
       <el-table-column label="人员成本" align="center" prop="staffCost" />
       <el-table-column label="车辆成本" align="center" prop="carCost" />
       <el-table-column label="设备成本" align="center" prop="deviceCost" />
@@ -180,8 +187,8 @@
       <el-table-column label="其他费用" align="center" prop="otherExpense" />
       <el-table-column label="直接成本" align="center" prop="directExpense" />
       <el-table-column label="预算总额" align="center" prop="totalBudget" />
-      <el-table-column label="编制人" align="center" prop="compiler" />
-      <el-table-column label="审核人" align="center" prop="auditor" />
+      <el-table-column label="编制人" align="center" prop="compilerUser.nickName" />
+      <el-table-column label="审核人" align="center" prop="auditorUser.nickName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -265,7 +272,7 @@
 </template>
 
 <script>
-import { listBudget, getBudget, delBudget, addBudget, updateBudget } from "@/api/oa/budget/budget";
+import { listBudget, getBudget, delBudget, addBudget, submitBudget, updateBudget } from "@/api/oa/budget/budget";
 
 export default {
   name: "Budget",

oa-ui/src/views/oa/car/expense.vue

@@ -46,7 +46,7 @@
           <i class="el-icon-user-solid"></i>
           驾驶员
         </template>
-        {{ carInfo.driver }}
+        {{ carInfo.driverUser ? carInfo.driverUser.nickName : '' }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">

oa-ui/src/views/oa/car/index.vue

@@ -37,7 +37,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="车辆id" align="center" prop="carId" /> -->
       <el-table-column label="车牌号" align="center" prop="licensePlate" />
-      <!-- <el-table-column label="驾驶员" align="center" prop="driver" /> -->
+      <el-table-column label="驾驶员" align="center" prop="driverUser.nickName" />
       <el-table-column label="品牌" align="center" prop="brand" />
       <el-table-column label="车型" align="center" prop="series" />
       <el-table-column label="购置时间" align="center" prop="acquisitionTime" />

oa-ui/src/views/oa/device/approval.vue

@@ -134,7 +134,7 @@
         <el-table-column type="index" width="55" align="center" label="序号" />
         <el-table-column label="申请人" align="center" prop="user.nickName">
           <template slot-scope="scope">
-            {{ scope.row.user ? scope.row.user.nickName : '' }}
+            {{ scope.row.applierUser ? scope.row.applierUser.nickName : '' }}
           </template>
         </el-table-column>
         <el-table-column label="使用部门" align="center" prop="dept.deptName">

oa-ui/src/views/oa/staff/info.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
  * @LastEditors: wrh
- * @LastEditTime: 2024-03-26 17:42:45
+ * @LastEditTime: 2024-03-27 16:33:09
 -->
 <template>
   <div class="bg">
@@ -77,7 +77,7 @@
       </el-col>
       <el-col :span="17" class="stateInfo">
         <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="参与项目" name="1">
+          <el-tab-pane label="负责项目" name="1">
             <projectInfo></projectInfo>
           </el-tab-pane>
           <el-tab-pane label="变更记录" name="2">

oa-ui/src/views/oa/staff/projectInfo.vue

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-03-26 17:54:49
+ * @LastEditTime: 2024-03-27 16:30:37
 -->
 <template>
   <div>
@@ -26,11 +26,11 @@
 </el-table-column>
 </el-table> -->
     <el-collapse v-model="activeNames" @change="handleChange">
-      <el-collapse-item :name="item.project.projectNumber" v-for="item in tableData" :key="item.project.projectNumber">
+      <el-collapse-item :name="item.projectNumber" v-for="item in tableData" :key="item.projectNumber">
         <template slot="title">
           <div>
             <svg-icon icon-class="ArrowRight" class="info-icon"></svg-icon>
-            {{ item.project.projectNumber + ' ' + ' ' + item.project.projectName + ' ' + ' ' + item.user.nickName }}
+            {{ item.projectNumber + ' ' + ' ' + item.projectName + ' ' + ' ' + item.projectLeaderUser.nickName }}
           </div>
         </template>
         <div>暂无信息，敬请期待</div>
@@ -41,7 +41,7 @@
 
 <script>
 
-import { listProjectWorker, getProjectWorker, getListByProjectLeader, delProjectWorker, addProjectWorker, updateProjectWorker } from "@/api/oa/project/projectWorker";
+import { listProject, getProject, getListByProjectLeader, delProject, addProject, updateProject } from "@/api/oa/project/project";
 
 export default {
   data() {