项目流转子流程，预算、安全、技术交底

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

@@ -5,7 +5,6 @@ import java.text.SimpleDateFormat;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+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 com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcProjectComment;
+import com.ruoyi.oa.service.ICmcProjectCommentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc项目审批Controller
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+@RestController
+@RequestMapping("/oa/projectComment")
+public class CmcProjectCommentController extends BaseController
+{
+    @Autowired
+    private ICmcProjectCommentService cmcProjectCommentService;
+
+    /**
+     * 查询cmc项目审批列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectComment:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcProjectComment cmcProjectComment)
+    {
+        startPage();
+        List<CmcProjectComment> list = cmcProjectCommentService.selectCmcProjectCommentList(cmcProjectComment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc项目审批列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectComment:export')")
+    @Log(title = "cmc项目审批", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcProjectComment cmcProjectComment)
+    {
+        List<CmcProjectComment> list = cmcProjectCommentService.selectCmcProjectCommentList(cmcProjectComment);
+        ExcelUtil<CmcProjectComment> util = new ExcelUtil<CmcProjectComment>(CmcProjectComment.class);
+        util.exportExcel(response, list, "cmc项目审批数据");
+    }
+
+    /**
+     * 获取cmc项目审批详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectComment:query')")
+    @GetMapping(value = "/{projectId}")
+    public AjaxResult getInfo(@PathVariable("projectId") String projectId)
+    {
+        return success(cmcProjectCommentService.selectCmcProjectCommentByProjectId(projectId));
+    }
+
+    /**
+     * 新增cmc项目审批
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectComment:add')")
+    @Log(title = "cmc项目审批", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcProjectComment cmcProjectComment)
+    {
+        return toAjax(cmcProjectCommentService.insertCmcProjectComment(cmcProjectComment));
+    }
+
+    /**
+     * 修改cmc项目审批
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectComment:edit')")
+    @Log(title = "cmc项目审批", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcProjectComment cmcProjectComment)
+    {
+        return toAjax(cmcProjectCommentService.updateCmcProjectComment(cmcProjectComment));
+    }
+
+    /**
+     * 删除cmc项目审批
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectComment:remove')")
+    @Log(title = "cmc项目审批", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{projectIds}")
+    public AjaxResult remove(@PathVariable String[] projectIds)
+    {
+        return toAjax(cmcProjectCommentService.deleteCmcProjectCommentByProjectIds(projectIds));
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+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 com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcProjectProgress;
+import com.ruoyi.oa.service.ICmcProjectProgressService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc项目进度Controller
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+@RestController
+@RequestMapping("/oa/projectProgress")
+public class CmcProjectProgressController extends BaseController
+{
+    @Autowired
+    private ICmcProjectProgressService cmcProjectProgressService;
+
+    /**
+     * 查询cmc项目进度列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectProgress:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcProjectProgress cmcProjectProgress)
+    {
+        startPage();
+        List<CmcProjectProgress> list = cmcProjectProgressService.selectCmcProjectProgressList(cmcProjectProgress);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc项目进度列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectProgress:export')")
+    @Log(title = "cmc项目进度", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcProjectProgress cmcProjectProgress)
+    {
+        List<CmcProjectProgress> list = cmcProjectProgressService.selectCmcProjectProgressList(cmcProjectProgress);
+        ExcelUtil<CmcProjectProgress> util = new ExcelUtil<CmcProjectProgress>(CmcProjectProgress.class);
+        util.exportExcel(response, list, "cmc项目进度数据");
+    }
+
+    /**
+     * 获取cmc项目进度详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectProgress:query')")
+    @GetMapping(value = "/{progressId}")
+    public AjaxResult getInfo(@PathVariable("progressId") String progressId)
+    {
+        return success(cmcProjectProgressService.selectCmcProjectProgressByProgressId(progressId));
+    }
+
+    /**
+     * 新增cmc项目进度
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectProgress:add')")
+    @Log(title = "cmc项目进度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
+    {
+        return toAjax(cmcProjectProgressService.insertCmcProjectProgress(cmcProjectProgress));
+    }
+
+    /**
+     * 修改cmc项目进度
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectProgress:edit')")
+    @Log(title = "cmc项目进度", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcProjectProgress cmcProjectProgress)
+    {
+        return toAjax(cmcProjectProgressService.updateCmcProjectProgress(cmcProjectProgress));
+    }
+
+    /**
+     * 删除cmc项目进度
+     */
+    @PreAuthorize("@ss.hasPermi('oa:projectProgress:remove')")
+    @Log(title = "cmc项目进度", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{progressIds}")
+    public AjaxResult remove(@PathVariable String[] progressIds)
+    {
+        return toAjax(cmcProjectProgressService.deleteCmcProjectProgressByProgressIds(progressIds));
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+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 com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcTechnical;
+import com.ruoyi.oa.service.ICmcTechnicalService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc技术方案Controller
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+@RestController
+@RequestMapping("/oa/technical")
+public class CmcTechnicalController extends BaseController
+{
+    @Autowired
+    private ICmcTechnicalService cmcTechnicalService;
+
+    /**
+     * 查询cmc技术方案列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:technical:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcTechnical cmcTechnical)
+    {
+        startPage();
+        List<CmcTechnical> list = cmcTechnicalService.selectCmcTechnicalList(cmcTechnical);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc技术方案列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:technical:export')")
+    @Log(title = "cmc技术方案", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcTechnical cmcTechnical)
+    {
+        List<CmcTechnical> list = cmcTechnicalService.selectCmcTechnicalList(cmcTechnical);
+        ExcelUtil<CmcTechnical> util = new ExcelUtil<CmcTechnical>(CmcTechnical.class);
+        util.exportExcel(response, list, "cmc技术方案数据");
+    }
+
+    /**
+     * 获取cmc技术方案详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:technical:query')")
+    @GetMapping(value = "/{technicalId}")
+    public AjaxResult getInfo(@PathVariable("technicalId") String technicalId)
+    {
+        return success(cmcTechnicalService.selectCmcTechnicalByTechnicalId(technicalId));
+    }
+
+    /**
+     * 新增cmc技术方案
+     */
+    @PreAuthorize("@ss.hasPermi('oa:technical:add')")
+    @Log(title = "cmc技术方案", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcTechnical cmcTechnical)
+    {
+        return toAjax(cmcTechnicalService.insertCmcTechnical(cmcTechnical));
+    }
+
+    /**
+     * 修改cmc技术方案
+     */
+    @PreAuthorize("@ss.hasPermi('oa:technical:edit')")
+    @Log(title = "cmc技术方案", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcTechnical cmcTechnical)
+    {
+        return toAjax(cmcTechnicalService.updateCmcTechnical(cmcTechnical));
+    }
+
+    /**
+     * 删除cmc技术方案
+     */
+    @PreAuthorize("@ss.hasPermi('oa:technical:remove')")
+    @Log(title = "cmc技术方案", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{technicalIds}")
+    public AjaxResult remove(@PathVariable String[] technicalIds)
+    {
+        return toAjax(cmcTechnicalService.deleteCmcTechnicalByTechnicalIds(technicalIds));
+    }
+}

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

@@ -73,6 +73,8 @@ public class SysPostController extends BaseController
     public AjaxResult getDeptLeader(String userId)
     {
         SysUser deptLeader = postService.selectDeptLeaderByUserId(userId);
+        if (deptLeader == null)
+            deptLeader = postService.selectViceDeptLeaderByUserId(userId);
         return success(deptLeader);
     }
 
@@ -83,6 +85,8 @@ public class SysPostController extends BaseController
     public AjaxResult getDeptLeaderByDeptId(String deptId)
     {
         SysUser deptLeader = postService.selectDeptLeaderByDeptId(deptId);
+        if (deptLeader == null)
+            deptLeader = postService.selectViceDeptLeaderByDeptId(deptId);
         return success(deptLeader);
     }
 
@@ -187,13 +191,13 @@ public class SysPostController extends BaseController
 
     private SysUser getManageId(Long id) {
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("2", Arrays.asList(103,105,113));
-        jsonObject.put("7", Arrays.asList(104, 112, 116));
-        jsonObject.put("9", Arrays.asList(108, 109));
-        jsonObject.put("10", Arrays.asList(110, 111));
-        jsonObject.put("11", Arrays.asList(106, 107));
-        jsonObject.put("12", Arrays.asList(117));
-        jsonObject.put("13", Arrays.asList(114, 115));
+        jsonObject.put("2", Arrays.asList(104,106,114));
+        jsonObject.put("7", Arrays.asList(105, 113, 117));
+        jsonObject.put("9", Arrays.asList(109, 110));
+        jsonObject.put("10", Arrays.asList(111, 112));
+        jsonObject.put("11", Arrays.asList(107, 108));
+        jsonObject.put("12", Arrays.asList(118));
+        jsonObject.put("13", Arrays.asList(115, 116));
         Iterator<String> iterator = jsonObject.keySet().iterator();
         String manageId = "";
         while(iterator.hasNext()){

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallBudgetActivityExecutionListener.java

@@ -0,0 +1,43 @@
+package com.ruoyi.flowable.oa;
+
+import org.flowable.bpmn.model.CallActivity;
+import org.flowable.bpmn.model.ExtensionAttribute;
+import org.flowable.bpmn.model.ExtensionElement;
+import org.flowable.bpmn.model.IOParameter;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+@Component("CallBudgetActivityExecutionListener")
+public class CallBudgetActivityExecutionListener implements ExecutionListener {
+    @Override
+    public void notify(DelegateExecution delegateExecution) {
+        CallActivity callActivity = (CallActivity)delegateExecution.getCurrentFlowElement();
+        String initiator = null;
+        Map<String, List<ExtensionElement>> extensionElements = callActivity.getExtensionElements();
+        for(Map.Entry<String, List<ExtensionElement>> entry: extensionElements.entrySet()) {
+            // 这一层读取的就是 button 类似的标签
+            String attributeName = entry.getKey();
+            List<ExtensionElement> attributeValueList = entry.getValue();
+            if (attributeName.equals("budgetInitiator")) {
+                for(ExtensionElement item: attributeValueList) {
+                    // 处理 类似button  ExtensionElement 里面的属性
+                    Map<String, List<ExtensionAttribute>> extensionElementAttributes = item.getAttributes();
+                    for (Map.Entry<String, List<ExtensionAttribute>> tmpEntry : extensionElementAttributes.entrySet()) {
+                        initiator = tmpEntry.getValue().get(0).getValue(); //  把子流程的发起人找到
+                    }
+                }
+            }
+        }
+        List<IOParameter> ioParameterList = callActivity.getInParameters();
+        for (IOParameter ioParameter: ioParameterList) {
+            String source = ioParameter.getSource();
+            if (source.equals("budgetInitiator")) {
+                delegateExecution.setVariable(source, initiator); // 把子流程的发起人先给到父流程，然后用引擎的能力进行传递
+            }
+        }
+    }
+}

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/MyServiceTask.java

@@ -1,97 +0,0 @@
-package com.ruoyi.flowable.oa;
-
-import com.ruoyi.common.utils.SnowFlake;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.oa.domain.CmcAssess;
-import com.ruoyi.oa.domain.CmcAssessContent;
-import com.ruoyi.oa.domain.CmcAssessContentWork;
-import com.ruoyi.oa.mapper.CmcAssessContentMapper;
-import com.ruoyi.oa.mapper.CmcAssessContentWorkMapper;
-import com.ruoyi.oa.mapper.CmcAssessMapper;
-import org.flowable.engine.ProcessEngine;
-import org.flowable.engine.ProcessEngines;
-import org.flowable.engine.RuntimeService;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.flowable.engine.task.Comment;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class MyServiceTask implements JavaDelegate {
-    public List<String> fieldList = Arrays.asList("role", "familiar", "remark");
-
-    @Override
-    public void execute(DelegateExecution execution) {
-        CmcAssessMapper cmcAssessMapper = SpringUtils.getBean(CmcAssessMapper.class);
-        CmcAssessContentMapper cmcAssessContentMapper = SpringUtils.getBean(CmcAssessContentMapper.class);
-        CmcAssessContentWorkMapper cmcAssessContentWorkMapper = SpringUtils.getBean(CmcAssessContentWorkMapper.class);
-        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-        RuntimeService runtimeService = processEngine.getRuntimeService();
-        Map<String,Object> variables = runtimeService.getVariables(execution.getId());
-        String processInstance = execution.getProcessInstanceId();
-        CmcAssess cmcAssess = new CmcAssess();
-        SnowFlake snowFlake = new SnowFlake();
-//        cmcAssess = cmcAssessMapper.selectCmcAssessByAssessId("0");
-        cmcAssess.setAssessId(snowFlake.generateId());
-        cmcAssessMapper.insertCmcAssess(cmcAssess);
-        for(String key : variables.keySet()){
-            if (removeDigital(key).equals("role") && !variables.get(key).toString().equals("")) {
-                CmcAssessContent cmcAssessContent = new CmcAssessContent();
-                cmcAssessContent.setContentId(cmcAssess.getAssessId() + key.substring(4));
-                cmcAssessContentMapper.insertCmcAssessContent(cmcAssessContent);
-            }
-        }
-        for(String key : variables.keySet()){
-            if (key.length() == 5 && key.startsWith("f") && !variables.get(key).toString().equals("")) {
-                CmcAssessContentWork cmcAssessContentWork = new CmcAssessContentWork();
-                cmcAssessContentWork.setWorkId(cmcAssess.getAssessId() + key.substring(1));
-                cmcAssessContentWork.setWorkLoad(variables.get(key).toString());
-                cmcAssessContentWorkMapper.insertCmcAssessContentWork(cmcAssessContentWork);
-            }
-            if (key.equals("INITIATOR"))
-                cmcAssess.setUserId((Long) variables.get(key));
-            if (removeDigital(key).equals(fieldList.get(0))) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentMapper.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(4)).get(0);
-                if (cmcAssessContent != null) {
-                    cmcAssessContent.setRole(variables.get(key).toString());
-                    cmcAssessContentMapper.updateCmcAssessContent(cmcAssessContent);
-                }
-            }
-            if (removeDigital(key).equals(fieldList.get(1))) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentMapper.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(8)).get(0);
-                if (cmcAssessContent != null) {
-                    cmcAssessContent.setFamiliar(variables.get(key).toString());
-                    cmcAssessContentMapper.updateCmcAssessContent(cmcAssessContent);
-                }
-            }
-            if (removeDigital(key).equals(fieldList.get(2))) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentMapper.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(6)).get(0);
-                if (cmcAssessContent != null) {
-                    cmcAssessContent.setRemark(variables.get(key).toString());
-                    cmcAssessContentMapper.updateCmcAssessContent(cmcAssessContent);
-                }
-            }
-
-        }
-        for (Comment comment: processEngine.getTaskService().getProcessInstanceComments(processInstance))
-            System.out.println(comment.getFullMessage());
-        System.out.println("========MyServiceTask==========");
-        System.out.println(variables);
-        System.out.println(processInstance);
-    }
-
-    /**
-     * 剔除数字
-     * @param value
-     */
-    public String removeDigital(String value){
-        Pattern p = Pattern.compile("[\\d]");
-        Matcher matcher = p.matcher(value);
-        return matcher.replaceAll("");
-    }
-
-}

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

@@ -1,6 +1,7 @@
 package com.ruoyi.oa.domain;
 
-import com.ruoyi.common.core.domain.entity.SysUser;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -10,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * cmc项目对象 cmc_project
  *
  * @author cmc
- * @date 2024-02-28
+ * @date 2024-04-01
  */
 public class CmcProject extends BaseEntity
 {
@@ -31,14 +32,12 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目负责人")
     private Long projectLeader;
 
-    private SysUser projectLeaderUser;
-
     /** 项目状态（0进行中、1已结束） */
-    @Excel(name = "项目状态", readConverterExp = "0=进行中、1=已结束")
+    @Excel(name = "项目状态", readConverterExp = "0=进行中、1已结束")
     private String isFinished;
 
     /** 项目来源（0院内、1院外） */
-    @Excel(name = "项目来源", readConverterExp = "0=院内、1=院外")
+    @Excel(name = "项目来源", readConverterExp = "0=院内、1院外")
     private String projectSource;
 
     /** 甲方单位 */
@@ -62,19 +61,48 @@ public class CmcProject extends BaseEntity
     private String projectType;
 
     /** 项目级别（0一般项目、1重大项目） */
-    @Excel(name = "项目级别", readConverterExp = "0=一般项目、1=重大项目")
+    @Excel(name = "项目级别", readConverterExp = "0=一般项目、1重大项目")
     private String projectLevel;
 
     /** 项目登记人 */
     @Excel(name = "项目登记人")
     private Long projectRegistrant;
 
-    private SysUser projectRegistrantUser;
-
     /** 承担部门 */
     @Excel(name = "承担部门")
     private String undertakingDept;
 
+    /** 项目安排人 */
+    @Excel(name = "项目安排人")
+    private Long projectPlanner;
+
+    /** 现场负责人 */
+    @Excel(name = "现场负责人")
+    private Long siteLeader;
+
+    /** 项目安排日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "项目安排日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planTime;
+
+    /** 进场时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "进场时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date entryTime;
+
+    /** 撤场时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "撤场时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date exitTime;
+
+    /** 预算id */
+    @Excel(name = "预算id")
+    private String budgetId;
+
+    /** 技术方案id */
+    @Excel(name = "技术方案id")
+    private String technicalId;
+
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
@@ -111,15 +139,6 @@ public class CmcProject extends BaseEntity
     {
         return projectLeader;
     }
-    public SysUser getProjectLeaderUser()
-    {
-        return projectLeaderUser;
-    }
-
-    public void setProjectLeader(SysUser projectLeaderUser)
-    {
-        this.projectLeaderUser = projectLeaderUser;
-    }
     public void setIsFinished(String isFinished)
     {
         this.isFinished = isFinished;
@@ -166,15 +185,14 @@ public class CmcProject extends BaseEntity
         return telephone;
     }
     public void setContractId(String contractId)
-{
-    this.contractId = contractId;
-}
+    {
+        this.contractId = contractId;
+    }
 
     public String getContractId()
     {
         return contractId;
     }
-
     public void setProjectType(String projectType)
     {
         this.projectType = projectType;
@@ -202,23 +220,77 @@ public class CmcProject extends BaseEntity
     {
         return projectRegistrant;
     }
-    public SysUser getProjectRegistrantUser()
+    public void setUndertakingDept(String undertakingDept)
     {
-        return projectRegistrantUser;
+        this.undertakingDept = undertakingDept;
     }
 
-    public void setProjectRegistrantUser(SysUser projectRegistrantUser)
+    public String getUndertakingDept()
     {
-        this.projectRegistrantUser = projectRegistrantUser;
+        return undertakingDept;
     }
-    public void setUndertakingDept(String undertakingDept)
+    public void setProjectPlanner(Long projectPlanner)
     {
-        this.undertakingDept = undertakingDept;
+        this.projectPlanner = projectPlanner;
     }
 
-    public String getUndertakingDept()
+    public Long getProjectPlanner()
     {
-        return undertakingDept;
+        return projectPlanner;
+    }
+    public void setSiteLeader(Long siteLeader)
+    {
+        this.siteLeader = siteLeader;
+    }
+
+    public Long getSiteLeader()
+    {
+        return siteLeader;
+    }
+    public void setPlanTime(Date planTime)
+    {
+        this.planTime = planTime;
+    }
+
+    public Date getPlanTime()
+    {
+        return planTime;
+    }
+    public void setEntryTime(Date entryTime)
+    {
+        this.entryTime = entryTime;
+    }
+
+    public Date getEntryTime()
+    {
+        return entryTime;
+    }
+    public void setExitTime(Date exitTime)
+    {
+        this.exitTime = exitTime;
+    }
+
+    public Date getExitTime()
+    {
+        return exitTime;
+    }
+    public void setBudgetId(String budgetId)
+    {
+        this.budgetId = budgetId;
+    }
+
+    public String getBudgetId()
+    {
+        return budgetId;
+    }
+    public void setTechnicalId(String technicalId)
+    {
+        this.technicalId = technicalId;
+    }
+
+    public String getTechnicalId()
+    {
+        return technicalId;
     }
 
     @Override
@@ -238,6 +310,15 @@ public class CmcProject extends BaseEntity
                 .append("projectLevel", getProjectLevel())
                 .append("projectRegistrant", getProjectRegistrant())
                 .append("undertakingDept", getUndertakingDept())
+                .append("projectPlanner", getProjectPlanner())
+                .append("siteLeader", getSiteLeader())
+                .append("createTime", getCreateTime())
+                .append("planTime", getPlanTime())
+                .append("entryTime", getEntryTime())
+                .append("exitTime", getExitTime())
+                .append("remark", getRemark())
+                .append("budgetId", getBudgetId())
+                .append("technicalId", getTechnicalId())
                 .toString();
     }
 }

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

@@ -0,0 +1,168 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc项目审批对象 cmc_project_comment
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public class CmcProjectComment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目id */
+    private String projectId;
+
+    /** 经营审核意见 */
+    @Excel(name = "经营审核意见")
+    private String jyComment;
+
+    /** 经营审核人 */
+    @Excel(name = "经营审核人")
+    private Long jyApprover;
+
+    /** 经营审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "经营审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date jyApprovalTime;
+
+    /** 分管审核意见 */
+    @Excel(name = "分管审核意见")
+    private String manageComment;
+
+    /** 分管审核人 */
+    @Excel(name = "分管审核人")
+    private Long manageApprover;
+
+    /** 分管审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date manageApprovalTime;
+
+    /** 生产确认意见 */
+    @Excel(name = "生产确认意见")
+    private String scComment;
+
+    /** 生产确认人 */
+    @Excel(name = "生产确认人")
+    private String scApprover;
+
+    /** 生产确认时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生产确认时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date scApprovalTime;
+
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setJyComment(String jyComment) 
+    {
+        this.jyComment = jyComment;
+    }
+
+    public String getJyComment() 
+    {
+        return jyComment;
+    }
+    public void setJyApprover(Long jyApprover) 
+    {
+        this.jyApprover = jyApprover;
+    }
+
+    public Long getJyApprover() 
+    {
+        return jyApprover;
+    }
+    public void setJyApprovalTime(Date jyApprovalTime) 
+    {
+        this.jyApprovalTime = jyApprovalTime;
+    }
+
+    public Date getJyApprovalTime() 
+    {
+        return jyApprovalTime;
+    }
+    public void setManageComment(String manageComment) 
+    {
+        this.manageComment = manageComment;
+    }
+
+    public String getManageComment() 
+    {
+        return manageComment;
+    }
+    public void setManageApprover(Long manageApprover) 
+    {
+        this.manageApprover = manageApprover;
+    }
+
+    public Long getManageApprover() 
+    {
+        return manageApprover;
+    }
+    public void setManageApprovalTime(Date manageApprovalTime) 
+    {
+        this.manageApprovalTime = manageApprovalTime;
+    }
+
+    public Date getManageApprovalTime() 
+    {
+        return manageApprovalTime;
+    }
+    public void setScComment(String scComment) 
+    {
+        this.scComment = scComment;
+    }
+
+    public String getScComment() 
+    {
+        return scComment;
+    }
+    public void setScApprover(String scApprover) 
+    {
+        this.scApprover = scApprover;
+    }
+
+    public String getScApprover() 
+    {
+        return scApprover;
+    }
+    public void setScApprovalTime(Date scApprovalTime) 
+    {
+        this.scApprovalTime = scApprovalTime;
+    }
+
+    public Date getScApprovalTime() 
+    {
+        return scApprovalTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("projectId", getProjectId())
+            .append("jyComment", getJyComment())
+            .append("jyApprover", getJyApprover())
+            .append("jyApprovalTime", getJyApprovalTime())
+            .append("manageComment", getManageComment())
+            .append("manageApprover", getManageApprover())
+            .append("manageApprovalTime", getManageApprovalTime())
+            .append("scComment", getScComment())
+            .append("scApprover", getScApprover())
+            .append("scApprovalTime", getScApprovalTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc项目进度对象 cmc_project_progress
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public class CmcProjectProgress extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目进度id */
+    private String progressId;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 累计进度 */
+    @Excel(name = "累计进度")
+    private String percentage;
+
+    /** 截止日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "截止日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date date;
+
+    /** 情况说明 */
+    @Excel(name = "情况说明")
+    private String situation;
+
+    public void setProgressId(String progressId) 
+    {
+        this.progressId = progressId;
+    }
+
+    public String getProgressId() 
+    {
+        return progressId;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setPercentage(String percentage) 
+    {
+        this.percentage = percentage;
+    }
+
+    public String getPercentage() 
+    {
+        return percentage;
+    }
+    public void setDate(Date date) 
+    {
+        this.date = date;
+    }
+
+    public Date getDate() 
+    {
+        return date;
+    }
+    public void setSituation(String situation) 
+    {
+        this.situation = situation;
+    }
+
+    public String getSituation() 
+    {
+        return situation;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("progressId", getProgressId())
+            .append("projectId", getProjectId())
+            .append("percentage", getPercentage())
+            .append("date", getDate())
+            .append("situation", getSituation())
+            .toString();
+    }
+}

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

@@ -44,6 +44,11 @@ public class CmcProjectWork extends BaseEntity
     @Excel(name = "要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date deadline;
 
+    /** 实际完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实际完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date finishTime;
+
     public void setWorkId(String workId)
     {
         this.workId = workId;
@@ -107,6 +112,16 @@ public class CmcProjectWork extends BaseEntity
     {
         return deadline;
     }
+    public void setFinishTime(Date finishTime)
+    {
+        this.finishTime = finishTime;
+    }
+
+    public Date getFinishTime()
+    {
+        return finishTime;
+    }
+
 
     @Override
     public String toString() {
@@ -117,6 +132,7 @@ public class CmcProjectWork extends BaseEntity
             .append("unit", getUnit())
             .append("workload", getWorkload())
             .append("deadline", getDeadline())
+            .append("finishTime", getFinishTime())
             .toString();
     }
 }

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

@@ -0,0 +1,138 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc技术方案对象 cmc_technical
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public class CmcTechnical extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目id */
+    private String technicalId;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 技术负责人 */
+    @Excel(name = "技术负责人")
+    private Long technicalDirector;
+
+    /** 技术设计人 */
+    @Excel(name = "技术设计人")
+    private Long technicalDesigner;
+
+    /** 技术安排人 */
+    @Excel(name = "技术安排人")
+    private Long technicalPlanner;
+
+    /** 技术安排意见 */
+    @Excel(name = "技术安排意见")
+    private String technicalComment;
+
+    /** 质量检查员 */
+    @Excel(name = "质量检查员")
+    private String qualityInspector;
+
+    /** 技术安排时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "技术安排时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date technicalTime;
+
+    public void setTechnicalId(String technicalId) 
+    {
+        this.technicalId = technicalId;
+    }
+
+    public String getTechnicalId() 
+    {
+        return technicalId;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setTechnicalDirector(Long technicalDirector) 
+    {
+        this.technicalDirector = technicalDirector;
+    }
+
+    public Long getTechnicalDirector() 
+    {
+        return technicalDirector;
+    }
+    public void setTechnicalDesigner(Long technicalDesigner) 
+    {
+        this.technicalDesigner = technicalDesigner;
+    }
+
+    public Long getTechnicalDesigner() 
+    {
+        return technicalDesigner;
+    }
+    public void setTechnicalPlanner(Long technicalPlanner) 
+    {
+        this.technicalPlanner = technicalPlanner;
+    }
+
+    public Long getTechnicalPlanner() 
+    {
+        return technicalPlanner;
+    }
+    public void setTechnicalComment(String technicalComment) 
+    {
+        this.technicalComment = technicalComment;
+    }
+
+    public String getTechnicalComment() 
+    {
+        return technicalComment;
+    }
+    public void setQualityInspector(String qualityInspector) 
+    {
+        this.qualityInspector = qualityInspector;
+    }
+
+    public String getQualityInspector() 
+    {
+        return qualityInspector;
+    }
+    public void setTechnicalTime(Date technicalTime) 
+    {
+        this.technicalTime = technicalTime;
+    }
+
+    public Date getTechnicalTime() 
+    {
+        return technicalTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("technicalId", getTechnicalId())
+            .append("projectId", getProjectId())
+            .append("technicalDirector", getTechnicalDirector())
+            .append("technicalDesigner", getTechnicalDesigner())
+            .append("technicalPlanner", getTechnicalPlanner())
+            .append("technicalComment", getTechnicalComment())
+            .append("qualityInspector", getQualityInspector())
+            .append("technicalTime", getTechnicalTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProjectComment;
+
+/**
+ * cmc项目审批Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public interface CmcProjectCommentMapper 
+{
+    /**
+     * 查询cmc项目审批
+     * 
+     * @param projectId cmc项目审批主键
+     * @return cmc项目审批
+     */
+    public CmcProjectComment selectCmcProjectCommentByProjectId(String projectId);
+
+    /**
+     * 查询cmc项目审批列表
+     * 
+     * @param cmcProjectComment cmc项目审批
+     * @return cmc项目审批集合
+     */
+    public List<CmcProjectComment> selectCmcProjectCommentList(CmcProjectComment cmcProjectComment);
+
+    /**
+     * 新增cmc项目审批
+     * 
+     * @param cmcProjectComment cmc项目审批
+     * @return 结果
+     */
+    public int insertCmcProjectComment(CmcProjectComment cmcProjectComment);
+
+    /**
+     * 修改cmc项目审批
+     * 
+     * @param cmcProjectComment cmc项目审批
+     * @return 结果
+     */
+    public int updateCmcProjectComment(CmcProjectComment cmcProjectComment);
+
+    /**
+     * 删除cmc项目审批
+     * 
+     * @param projectId cmc项目审批主键
+     * @return 结果
+     */
+    public int deleteCmcProjectCommentByProjectId(String projectId);
+
+    /**
+     * 批量删除cmc项目审批
+     * 
+     * @param projectIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectCommentByProjectIds(String[] projectIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProjectProgress;
+
+/**
+ * cmc项目进度Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public interface CmcProjectProgressMapper 
+{
+    /**
+     * 查询cmc项目进度
+     * 
+     * @param progressId cmc项目进度主键
+     * @return cmc项目进度
+     */
+    public CmcProjectProgress selectCmcProjectProgressByProgressId(String progressId);
+
+    /**
+     * 查询cmc项目进度列表
+     * 
+     * @param cmcProjectProgress cmc项目进度
+     * @return cmc项目进度集合
+     */
+    public List<CmcProjectProgress> selectCmcProjectProgressList(CmcProjectProgress cmcProjectProgress);
+
+    /**
+     * 新增cmc项目进度
+     * 
+     * @param cmcProjectProgress cmc项目进度
+     * @return 结果
+     */
+    public int insertCmcProjectProgress(CmcProjectProgress cmcProjectProgress);
+
+    /**
+     * 修改cmc项目进度
+     * 
+     * @param cmcProjectProgress cmc项目进度
+     * @return 结果
+     */
+    public int updateCmcProjectProgress(CmcProjectProgress cmcProjectProgress);
+
+    /**
+     * 删除cmc项目进度
+     * 
+     * @param progressId cmc项目进度主键
+     * @return 结果
+     */
+    public int deleteCmcProjectProgressByProgressId(String progressId);
+
+    /**
+     * 批量删除cmc项目进度
+     * 
+     * @param progressIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectProgressByProgressIds(String[] progressIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcTechnical;
+
+/**
+ * cmc技术方案Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public interface CmcTechnicalMapper 
+{
+    /**
+     * 查询cmc技术方案
+     * 
+     * @param technicalId cmc技术方案主键
+     * @return cmc技术方案
+     */
+    public CmcTechnical selectCmcTechnicalByTechnicalId(String technicalId);
+
+    /**
+     * 查询cmc技术方案列表
+     * 
+     * @param cmcTechnical cmc技术方案
+     * @return cmc技术方案集合
+     */
+    public List<CmcTechnical> selectCmcTechnicalList(CmcTechnical cmcTechnical);
+
+    /**
+     * 新增cmc技术方案
+     * 
+     * @param cmcTechnical cmc技术方案
+     * @return 结果
+     */
+    public int insertCmcTechnical(CmcTechnical cmcTechnical);
+
+    /**
+     * 修改cmc技术方案
+     * 
+     * @param cmcTechnical cmc技术方案
+     * @return 结果
+     */
+    public int updateCmcTechnical(CmcTechnical cmcTechnical);
+
+    /**
+     * 删除cmc技术方案
+     * 
+     * @param technicalId cmc技术方案主键
+     * @return 结果
+     */
+    public int deleteCmcTechnicalByTechnicalId(String technicalId);
+
+    /**
+     * 批量删除cmc技术方案
+     * 
+     * @param technicalIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcTechnicalByTechnicalIds(String[] technicalIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProjectComment;
+
+/**
+ * cmc项目审批Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public interface ICmcProjectCommentService 
+{
+    /**
+     * 查询cmc项目审批
+     * 
+     * @param projectId cmc项目审批主键
+     * @return cmc项目审批
+     */
+    public CmcProjectComment selectCmcProjectCommentByProjectId(String projectId);
+
+    /**
+     * 查询cmc项目审批列表
+     * 
+     * @param cmcProjectComment cmc项目审批
+     * @return cmc项目审批集合
+     */
+    public List<CmcProjectComment> selectCmcProjectCommentList(CmcProjectComment cmcProjectComment);
+
+    /**
+     * 新增cmc项目审批
+     * 
+     * @param cmcProjectComment cmc项目审批
+     * @return 结果
+     */
+    public int insertCmcProjectComment(CmcProjectComment cmcProjectComment);
+
+    /**
+     * 修改cmc项目审批
+     * 
+     * @param cmcProjectComment cmc项目审批
+     * @return 结果
+     */
+    public int updateCmcProjectComment(CmcProjectComment cmcProjectComment);
+
+    /**
+     * 批量删除cmc项目审批
+     * 
+     * @param projectIds 需要删除的cmc项目审批主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectCommentByProjectIds(String[] projectIds);
+
+    /**
+     * 删除cmc项目审批信息
+     * 
+     * @param projectId cmc项目审批主键
+     * @return 结果
+     */
+    public int deleteCmcProjectCommentByProjectId(String projectId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProjectProgress;
+
+/**
+ * cmc项目进度Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public interface ICmcProjectProgressService 
+{
+    /**
+     * 查询cmc项目进度
+     * 
+     * @param progressId cmc项目进度主键
+     * @return cmc项目进度
+     */
+    public CmcProjectProgress selectCmcProjectProgressByProgressId(String progressId);
+
+    /**
+     * 查询cmc项目进度列表
+     * 
+     * @param cmcProjectProgress cmc项目进度
+     * @return cmc项目进度集合
+     */
+    public List<CmcProjectProgress> selectCmcProjectProgressList(CmcProjectProgress cmcProjectProgress);
+
+    /**
+     * 新增cmc项目进度
+     * 
+     * @param cmcProjectProgress cmc项目进度
+     * @return 结果
+     */
+    public int insertCmcProjectProgress(CmcProjectProgress cmcProjectProgress);
+
+    /**
+     * 修改cmc项目进度
+     * 
+     * @param cmcProjectProgress cmc项目进度
+     * @return 结果
+     */
+    public int updateCmcProjectProgress(CmcProjectProgress cmcProjectProgress);
+
+    /**
+     * 批量删除cmc项目进度
+     * 
+     * @param progressIds 需要删除的cmc项目进度主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectProgressByProgressIds(String[] progressIds);
+
+    /**
+     * 删除cmc项目进度信息
+     * 
+     * @param progressId cmc项目进度主键
+     * @return 结果
+     */
+    public int deleteCmcProjectProgressByProgressId(String progressId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcTechnical;
+
+/**
+ * cmc技术方案Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public interface ICmcTechnicalService 
+{
+    /**
+     * 查询cmc技术方案
+     * 
+     * @param technicalId cmc技术方案主键
+     * @return cmc技术方案
+     */
+    public CmcTechnical selectCmcTechnicalByTechnicalId(String technicalId);
+
+    /**
+     * 查询cmc技术方案列表
+     * 
+     * @param cmcTechnical cmc技术方案
+     * @return cmc技术方案集合
+     */
+    public List<CmcTechnical> selectCmcTechnicalList(CmcTechnical cmcTechnical);
+
+    /**
+     * 新增cmc技术方案
+     * 
+     * @param cmcTechnical cmc技术方案
+     * @return 结果
+     */
+    public int insertCmcTechnical(CmcTechnical cmcTechnical);
+
+    /**
+     * 修改cmc技术方案
+     * 
+     * @param cmcTechnical cmc技术方案
+     * @return 结果
+     */
+    public int updateCmcTechnical(CmcTechnical cmcTechnical);
+
+    /**
+     * 批量删除cmc技术方案
+     * 
+     * @param technicalIds 需要删除的cmc技术方案主键集合
+     * @return 结果
+     */
+    public int deleteCmcTechnicalByTechnicalIds(String[] technicalIds);
+
+    /**
+     * 删除cmc技术方案信息
+     * 
+     * @param technicalId cmc技术方案主键
+     * @return 结果
+     */
+    public int deleteCmcTechnicalByTechnicalId(String technicalId);
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcProjectCommentMapper;
+import com.ruoyi.oa.domain.CmcProjectComment;
+import com.ruoyi.oa.service.ICmcProjectCommentService;
+
+/**
+ * cmc项目审批Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+@Service
+public class CmcProjectCommentServiceImpl implements ICmcProjectCommentService 
+{
+    @Autowired
+    private CmcProjectCommentMapper cmcProjectCommentMapper;
+
+    /**
+     * 查询cmc项目审批
+     * 
+     * @param projectId cmc项目审批主键
+     * @return cmc项目审批
+     */
+    @Override
+    public CmcProjectComment selectCmcProjectCommentByProjectId(String projectId)
+    {
+        return cmcProjectCommentMapper.selectCmcProjectCommentByProjectId(projectId);
+    }
+
+    /**
+     * 查询cmc项目审批列表
+     * 
+     * @param cmcProjectComment cmc项目审批
+     * @return cmc项目审批
+     */
+    @Override
+    public List<CmcProjectComment> selectCmcProjectCommentList(CmcProjectComment cmcProjectComment)
+    {
+        return cmcProjectCommentMapper.selectCmcProjectCommentList(cmcProjectComment);
+    }
+
+    /**
+     * 新增cmc项目审批
+     * 
+     * @param cmcProjectComment cmc项目审批
+     * @return 结果
+     */
+    @Override
+    public int insertCmcProjectComment(CmcProjectComment cmcProjectComment)
+    {
+        return cmcProjectCommentMapper.insertCmcProjectComment(cmcProjectComment);
+    }
+
+    /**
+     * 修改cmc项目审批
+     * 
+     * @param cmcProjectComment cmc项目审批
+     * @return 结果
+     */
+    @Override
+    public int updateCmcProjectComment(CmcProjectComment cmcProjectComment)
+    {
+        return cmcProjectCommentMapper.updateCmcProjectComment(cmcProjectComment);
+    }
+
+    /**
+     * 批量删除cmc项目审批
+     * 
+     * @param projectIds 需要删除的cmc项目审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectCommentByProjectIds(String[] projectIds)
+    {
+        return cmcProjectCommentMapper.deleteCmcProjectCommentByProjectIds(projectIds);
+    }
+
+    /**
+     * 删除cmc项目审批信息
+     * 
+     * @param projectId cmc项目审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectCommentByProjectId(String projectId)
+    {
+        return cmcProjectCommentMapper.deleteCmcProjectCommentByProjectId(projectId);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcProjectProgressMapper;
+import com.ruoyi.oa.domain.CmcProjectProgress;
+import com.ruoyi.oa.service.ICmcProjectProgressService;
+
+/**
+ * cmc项目进度Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+@Service
+public class CmcProjectProgressServiceImpl implements ICmcProjectProgressService 
+{
+    @Autowired
+    private CmcProjectProgressMapper cmcProjectProgressMapper;
+
+    /**
+     * 查询cmc项目进度
+     * 
+     * @param progressId cmc项目进度主键
+     * @return cmc项目进度
+     */
+    @Override
+    public CmcProjectProgress selectCmcProjectProgressByProgressId(String progressId)
+    {
+        return cmcProjectProgressMapper.selectCmcProjectProgressByProgressId(progressId);
+    }
+
+    /**
+     * 查询cmc项目进度列表
+     * 
+     * @param cmcProjectProgress cmc项目进度
+     * @return cmc项目进度
+     */
+    @Override
+    public List<CmcProjectProgress> selectCmcProjectProgressList(CmcProjectProgress cmcProjectProgress)
+    {
+        return cmcProjectProgressMapper.selectCmcProjectProgressList(cmcProjectProgress);
+    }
+
+    /**
+     * 新增cmc项目进度
+     * 
+     * @param cmcProjectProgress cmc项目进度
+     * @return 结果
+     */
+    @Override
+    public int insertCmcProjectProgress(CmcProjectProgress cmcProjectProgress)
+    {
+        return cmcProjectProgressMapper.insertCmcProjectProgress(cmcProjectProgress);
+    }
+
+    /**
+     * 修改cmc项目进度
+     * 
+     * @param cmcProjectProgress cmc项目进度
+     * @return 结果
+     */
+    @Override
+    public int updateCmcProjectProgress(CmcProjectProgress cmcProjectProgress)
+    {
+        return cmcProjectProgressMapper.updateCmcProjectProgress(cmcProjectProgress);
+    }
+
+    /**
+     * 批量删除cmc项目进度
+     * 
+     * @param progressIds 需要删除的cmc项目进度主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectProgressByProgressIds(String[] progressIds)
+    {
+        return cmcProjectProgressMapper.deleteCmcProjectProgressByProgressIds(progressIds);
+    }
+
+    /**
+     * 删除cmc项目进度信息
+     * 
+     * @param progressId cmc项目进度主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectProgressByProgressId(String progressId)
+    {
+        return cmcProjectProgressMapper.deleteCmcProjectProgressByProgressId(progressId);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcTechnicalMapper;
+import com.ruoyi.oa.domain.CmcTechnical;
+import com.ruoyi.oa.service.ICmcTechnicalService;
+
+/**
+ * cmc技术方案Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+@Service
+public class CmcTechnicalServiceImpl implements ICmcTechnicalService 
+{
+    @Autowired
+    private CmcTechnicalMapper cmcTechnicalMapper;
+
+    /**
+     * 查询cmc技术方案
+     * 
+     * @param technicalId cmc技术方案主键
+     * @return cmc技术方案
+     */
+    @Override
+    public CmcTechnical selectCmcTechnicalByTechnicalId(String technicalId)
+    {
+        return cmcTechnicalMapper.selectCmcTechnicalByTechnicalId(technicalId);
+    }
+
+    /**
+     * 查询cmc技术方案列表
+     * 
+     * @param cmcTechnical cmc技术方案
+     * @return cmc技术方案
+     */
+    @Override
+    public List<CmcTechnical> selectCmcTechnicalList(CmcTechnical cmcTechnical)
+    {
+        return cmcTechnicalMapper.selectCmcTechnicalList(cmcTechnical);
+    }
+
+    /**
+     * 新增cmc技术方案
+     * 
+     * @param cmcTechnical cmc技术方案
+     * @return 结果
+     */
+    @Override
+    public int insertCmcTechnical(CmcTechnical cmcTechnical)
+    {
+        return cmcTechnicalMapper.insertCmcTechnical(cmcTechnical);
+    }
+
+    /**
+     * 修改cmc技术方案
+     * 
+     * @param cmcTechnical cmc技术方案
+     * @return 结果
+     */
+    @Override
+    public int updateCmcTechnical(CmcTechnical cmcTechnical)
+    {
+        return cmcTechnicalMapper.updateCmcTechnical(cmcTechnical);
+    }
+
+    /**
+     * 批量删除cmc技术方案
+     * 
+     * @param technicalIds 需要删除的cmc技术方案主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcTechnicalByTechnicalIds(String[] technicalIds)
+    {
+        return cmcTechnicalMapper.deleteCmcTechnicalByTechnicalIds(technicalIds);
+    }
+
+    /**
+     * 删除cmc技术方案信息
+     * 
+     * @param technicalId cmc技术方案主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcTechnicalByTechnicalId(String technicalId)
+    {
+        return cmcTechnicalMapper.deleteCmcTechnicalByTechnicalId(technicalId);
+    }
+}

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

@@ -60,6 +60,14 @@ public interface SysUserPostMapper
      */
     public SysUser selectDeptLeaderByUserId(String userId);
 
+    /**
+     * 查询部门副主任
+     *
+     * @param
+     * @return 查询部门副主任
+     */
+    public SysUser selectViceDeptLeaderByUserId(String userId);
+
     /**
      * 查询部门主任
      *
@@ -67,4 +75,12 @@ public interface SysUserPostMapper
      * @return 查询部门主任
      */
     public SysUser selectDeptLeaderByDeptId(String deptId);
+
+    /**
+     * 查询部门副主任
+     *
+     * @param
+     * @return 查询部门副主任
+     */
+    public SysUser selectViceDeptLeaderByDeptId(String deptId);
 }

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

@@ -116,6 +116,14 @@ public interface ISysPostService
      */
     public SysUser selectDeptLeaderByUserId(String userId);
 
+    /**
+     * 查询部门副主任
+     *
+     * @param
+     * @return 查询部门副主任
+     */
+    public SysUser selectViceDeptLeaderByUserId(String userId);
+
     /**
      * 查询部门主任
      *
@@ -123,4 +131,12 @@ public interface ISysPostService
      * @return 查询部门主任
      */
     public SysUser selectDeptLeaderByDeptId(String deptId);
+
+    /**
+     * 查询部门副主任
+     *
+     * @param
+     * @return 查询部门副主任
+     */
+    public SysUser selectViceDeptLeaderByDeptId(String deptId);
 }

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

@@ -200,6 +200,17 @@ public class SysPostServiceImpl implements ISysPostService
         return userPostMapper.selectDeptLeaderByUserId(userId);
     }
 
+    /**
+     * 查询部门副主任
+     *
+     * @param
+     * @return 查询部门副主任
+     */
+    @Override
+    public SysUser selectViceDeptLeaderByUserId(String userId) {
+        return userPostMapper.selectViceDeptLeaderByUserId(userId);
+    }
+
     /**
      * 查询部门主任
      *
@@ -210,4 +221,15 @@ public class SysPostServiceImpl implements ISysPostService
     public SysUser selectDeptLeaderByDeptId(String deptId) {
         return userPostMapper.selectDeptLeaderByDeptId(deptId);
     }
+
+    /**
+     * 查询部门副主任
+     *
+     * @param
+     * @return 查询部门副主任
+     */
+    @Override
+    public SysUser selectViceDeptLeaderByDeptId(String deptId) {
+        return userPostMapper.selectViceDeptLeaderByDeptId(deptId);
+    }
 }

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

@@ -11,11 +11,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId"    column="user_id"    />
         <result property="comment"    column="comment"    />
         <result property="commentTime"    column="comment_time"    />
-        <result property="isSign"    column="is_sign"    />
     </resultMap>
 
     <sql id="selectCmcContractCommentVo">
-        select comment_id, contract_id, dept_id, user_id, comment, comment_time, is_sign from cmc_contract_comment
+        select comment_id, contract_id, dept_id, user_id, comment, comment_time from cmc_contract_comment
     </sql>
 
     <select id="selectCmcContractCommentList" parameterType="CmcContractComment" resultMap="CmcContractCommentResult">
@@ -26,7 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="comment != null  and comment != ''"> and comment = #{comment}</if>
             <if test="commentTime != null "> and comment_time = #{commentTime}</if>
-            <if test="isSign != null  and isSign != ''"> and is_sign = #{isSign}</if>
         </where>
     </select>
     
@@ -44,7 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id,</if>
             <if test="comment != null">comment,</if>
             <if test="commentTime != null">comment_time,</if>
-            <if test="isSign != null">is_sign,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="commentId != null">#{commentId},</if>
@@ -53,7 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">#{userId},</if>
             <if test="comment != null">#{comment},</if>
             <if test="commentTime != null">#{commentTime},</if>
-            <if test="isSign != null">#{isSign},</if>
          </trim>
     </insert>
 
@@ -65,7 +61,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id = #{userId},</if>
             <if test="comment != null">comment = #{comment},</if>
             <if test="commentTime != null">comment_time = #{commentTime},</if>
-            <if test="isSign != null">is_sign = #{isSign},</if>
         </trim>
         where comment_id = #{commentId}
     </update>

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

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcProjectCommentMapper">
+    
+    <resultMap type="CmcProjectComment" id="CmcProjectCommentResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="jyComment"    column="jy_comment"    />
+        <result property="jyApprover"    column="jy_approver"    />
+        <result property="jyApprovalTime"    column="jy_approval_time"    />
+        <result property="manageComment"    column="manage_comment"    />
+        <result property="manageApprover"    column="manage_approver"    />
+        <result property="manageApprovalTime"    column="manage_approval_time"    />
+        <result property="scComment"    column="sc_comment"    />
+        <result property="scApprover"    column="sc_approver"    />
+        <result property="scApprovalTime"    column="sc_approval_time"    />
+    </resultMap>
+
+    <sql id="selectCmcProjectCommentVo">
+        select project_id, jy_comment, jy_approver, jy_approval_time, manage_comment, manage_approver, manage_approval_time, sc_comment, sc_approver, sc_approval_time from cmc_project_comment
+    </sql>
+
+    <select id="selectCmcProjectCommentList" parameterType="CmcProjectComment" resultMap="CmcProjectCommentResult">
+        <include refid="selectCmcProjectCommentVo"/>
+        <where>  
+            <if test="jyComment != null  and jyComment != ''"> and jy_comment = #{jyComment}</if>
+            <if test="jyApprover != null "> and jy_approver = #{jyApprover}</if>
+            <if test="jyApprovalTime != null "> and jy_approval_time = #{jyApprovalTime}</if>
+            <if test="manageComment != null  and manageComment != ''"> and manage_comment = #{manageComment}</if>
+            <if test="manageApprover != null "> and manage_approver = #{manageApprover}</if>
+            <if test="manageApprovalTime != null "> and manage_approval_time = #{manageApprovalTime}</if>
+            <if test="scComment != null  and scComment != ''"> and sc_comment = #{scComment}</if>
+            <if test="scApprover != null  and scApprover != ''"> and sc_approver = #{scApprover}</if>
+            <if test="scApprovalTime != null "> and sc_approval_time = #{scApprovalTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcProjectCommentByProjectId" parameterType="String" resultMap="CmcProjectCommentResult">
+        <include refid="selectCmcProjectCommentVo"/>
+        where project_id = #{projectId}
+    </select>
+        
+    <insert id="insertCmcProjectComment" parameterType="CmcProjectComment">
+        insert into cmc_project_comment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="jyComment != null">jy_comment,</if>
+            <if test="jyApprover != null">jy_approver,</if>
+            <if test="jyApprovalTime != null">jy_approval_time,</if>
+            <if test="manageComment != null">manage_comment,</if>
+            <if test="manageApprover != null">manage_approver,</if>
+            <if test="manageApprovalTime != null">manage_approval_time,</if>
+            <if test="scComment != null">sc_comment,</if>
+            <if test="scApprover != null">sc_approver,</if>
+            <if test="scApprovalTime != null">sc_approval_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="jyComment != null">#{jyComment},</if>
+            <if test="jyApprover != null">#{jyApprover},</if>
+            <if test="jyApprovalTime != null">#{jyApprovalTime},</if>
+            <if test="manageComment != null">#{manageComment},</if>
+            <if test="manageApprover != null">#{manageApprover},</if>
+            <if test="manageApprovalTime != null">#{manageApprovalTime},</if>
+            <if test="scComment != null">#{scComment},</if>
+            <if test="scApprover != null">#{scApprover},</if>
+            <if test="scApprovalTime != null">#{scApprovalTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcProjectComment" parameterType="CmcProjectComment">
+        update cmc_project_comment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jyComment != null">jy_comment = #{jyComment},</if>
+            <if test="jyApprover != null">jy_approver = #{jyApprover},</if>
+            <if test="jyApprovalTime != null">jy_approval_time = #{jyApprovalTime},</if>
+            <if test="manageComment != null">manage_comment = #{manageComment},</if>
+            <if test="manageApprover != null">manage_approver = #{manageApprover},</if>
+            <if test="manageApprovalTime != null">manage_approval_time = #{manageApprovalTime},</if>
+            <if test="scComment != null">sc_comment = #{scComment},</if>
+            <if test="scApprover != null">sc_approver = #{scApprover},</if>
+            <if test="scApprovalTime != null">sc_approval_time = #{scApprovalTime},</if>
+        </trim>
+        where project_id = #{projectId}
+    </update>
+
+    <delete id="deleteCmcProjectCommentByProjectId" parameterType="String">
+        delete from cmc_project_comment where project_id = #{projectId}
+    </delete>
+
+    <delete id="deleteCmcProjectCommentByProjectIds" parameterType="String">
+        delete from cmc_project_comment where project_id in 
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
+            #{projectId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -19,53 +19,50 @@
         <result property="projectLevel"    column="project_level"    />
         <result property="projectRegistrant"    column="project_registrant"    />
         <result property="undertakingDept"    column="undertaking_dept"    />
+        <result property="projectPlanner"    column="project_planner"    />
+        <result property="siteLeader"    column="site_leader"    />
         <result property="createTime"    column="create_time"    />
+        <result property="planTime"    column="plan_time"    />
+        <result property="entryTime"    column="entry_time"    />
+        <result property="exitTime"    column="exit_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"    />
+        <result property="budgetId"    column="budget_id"    />
+        <result property="technicalId"    column="technical_id"    />
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        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
+        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, project_planner, site_leader, create_time, plan_time, entry_time, exit_time, remark, budget_id, technical_id from cmc_project
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         <where>
-            <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="projectLeader != null  and projectLeader != ''"> and p.project_leader like concat('%', #{projectLeader}, '%')</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>
+            <if test="projectNumber != null  and projectNumber != ''"> and project_number = #{projectNumber}</if>
+            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+            <if test="projectLeader != null "> and project_leader = #{projectLeader}</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 = #{partyA}</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and contact_person = #{contactPerson}</if>
+            <if test="telephone != null  and telephone != ''"> and telephone = #{telephone}</if>
+            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
+            <if test="projectType != null  and projectType != ''"> and project_type = #{projectType}</if>
+            <if test="projectLevel != null  and projectLevel != ''"> and project_level = #{projectLevel}</if>
+            <if test="projectRegistrant != null "> and project_registrant = #{projectRegistrant}</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and undertaking_dept = #{undertakingDept}</if>
+            <if test="projectPlanner != null "> and project_planner = #{projectPlanner}</if>
+            <if test="siteLeader != null "> and site_leader = #{siteLeader}</if>
+            <if test="planTime != null "> and plan_time = #{planTime}</if>
+            <if test="entryTime != null "> and entry_time = #{entryTime}</if>
+            <if test="exitTime != null "> and exit_time = #{exitTime}</if>
+            <if test="budgetId != null  and budgetId != ''"> and budget_id = #{budgetId}</if>
+            <if test="technicalId != null  and technicalId != ''"> and technical_id = #{technicalId}</if>
         </where>
     </select>
 
     <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
-        where p.project_id = #{projectId}
-    </select>
-
-    <select id="selectCmcProjectListByProjectLeader" parameterType="String" resultMap="CmcProjectResult">
-        <include refid="selectCmcProjectVo"/>
-        where p.project_leader = #{projectLeader}
+        where project_id = #{projectId}
     </select>
 
     <insert id="insertCmcProject" parameterType="CmcProject">
@@ -85,8 +82,15 @@
             <if test="projectLevel != null">project_level,</if>
             <if test="projectRegistrant != null">project_registrant,</if>
             <if test="undertakingDept != null">undertaking_dept,</if>
+            <if test="projectPlanner != null">project_planner,</if>
+            <if test="siteLeader != null">site_leader,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="planTime != null">plan_time,</if>
+            <if test="entryTime != null">entry_time,</if>
+            <if test="exitTime != null">exit_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="budgetId != null">budget_id,</if>
+            <if test="technicalId != null">technical_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -103,8 +107,15 @@
             <if test="projectLevel != null">#{projectLevel},</if>
             <if test="projectRegistrant != null">#{projectRegistrant},</if>
             <if test="undertakingDept != null">#{undertakingDept},</if>
+            <if test="projectPlanner != null">#{projectPlanner},</if>
+            <if test="siteLeader != null">#{siteLeader},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="planTime != null">#{planTime},</if>
+            <if test="entryTime != null">#{entryTime},</if>
+            <if test="exitTime != null">#{exitTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="budgetId != null">#{budgetId},</if>
+            <if test="technicalId != null">#{technicalId},</if>
         </trim>
     </insert>
 
@@ -124,8 +135,15 @@
             <if test="projectLevel != null">project_level = #{projectLevel},</if>
             <if test="projectRegistrant != null">project_registrant = #{projectRegistrant},</if>
             <if test="undertakingDept != null">undertaking_dept = #{undertakingDept},</if>
+            <if test="projectPlanner != null">project_planner = #{projectPlanner},</if>
+            <if test="siteLeader != null">site_leader = #{siteLeader},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="planTime != null">plan_time = #{planTime},</if>
+            <if test="entryTime != null">entry_time = #{entryTime},</if>
+            <if test="exitTime != null">exit_time = #{exitTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="budgetId != null">budget_id = #{budgetId},</if>
+            <if test="technicalId != null">technical_id = #{technicalId},</if>
         </trim>
         where project_id = #{projectId}
     </update>

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

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcProjectProgressMapper">
+    
+    <resultMap type="CmcProjectProgress" id="CmcProjectProgressResult">
+        <result property="progressId"    column="progress_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="percentage"    column="percentage"    />
+        <result property="date"    column="date"    />
+        <result property="situation"    column="situation"    />
+    </resultMap>
+
+    <sql id="selectCmcProjectProgressVo">
+        select progress_id, project_id, percentage, date, situation from cmc_project_progress
+    </sql>
+
+    <select id="selectCmcProjectProgressList" parameterType="CmcProjectProgress" resultMap="CmcProjectProgressResult">
+        <include refid="selectCmcProjectProgressVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="percentage != null  and percentage != ''"> and percentage = #{percentage}</if>
+            <if test="date != null "> and date = #{date}</if>
+            <if test="situation != null  and situation != ''"> and situation = #{situation}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcProjectProgressByProgressId" parameterType="String" resultMap="CmcProjectProgressResult">
+        <include refid="selectCmcProjectProgressVo"/>
+        where progress_id = #{progressId}
+    </select>
+        
+    <insert id="insertCmcProjectProgress" parameterType="CmcProjectProgress">
+        insert into cmc_project_progress
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="progressId != null">progress_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="percentage != null">percentage,</if>
+            <if test="date != null">date,</if>
+            <if test="situation != null">situation,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="progressId != null">#{progressId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="percentage != null">#{percentage},</if>
+            <if test="date != null">#{date},</if>
+            <if test="situation != null">#{situation},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcProjectProgress" parameterType="CmcProjectProgress">
+        update cmc_project_progress
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="percentage != null">percentage = #{percentage},</if>
+            <if test="date != null">date = #{date},</if>
+            <if test="situation != null">situation = #{situation},</if>
+        </trim>
+        where progress_id = #{progressId}
+    </update>
+
+    <delete id="deleteCmcProjectProgressByProgressId" parameterType="String">
+        delete from cmc_project_progress where progress_id = #{progressId}
+    </delete>
+
+    <delete id="deleteCmcProjectProgressByProgressIds" parameterType="String">
+        delete from cmc_project_progress where progress_id in 
+        <foreach item="progressId" collection="array" open="(" separator="," close=")">
+            #{progressId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -12,11 +12,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unit"    column="unit"    />
         <result property="workload"    column="workload"    />
         <result property="deadline"    column="deadline"    />
+        <result property="finishTime"    column="finish_time"    />
         <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectCmcProjectWorkVo">
-        select work_id, project_id, content, scale, unit, workload, deadline, remark from cmc_project_work
+        select work_id, project_id, content, scale, unit, workload, deadline, finish_time, remark from cmc_project_work
     </sql>
 
     <select id="selectCmcProjectWorkList" parameterType="CmcProjectWork" resultMap="CmcProjectWorkResult">
@@ -27,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
             <if test="workload != null  and workload != ''"> and workload = #{workload}</if>
             <if test="deadline != null "> and deadline like concat('%', #{deadline}, '%')</if>
+            <if test="finishTime != null "> and finish_time like concat('%', #{finishTime}, '%')</if>
         </where>
     </select>
     
@@ -45,7 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">unit,</if>
             <if test="workload != null">workload,</if>
             <if test="deadline != null">deadline,</if>
-            <if test="remark != null">remark,</if>
+            <if test="finishTime != null">remark,</if>
+            <if test="remark != null">finish_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workId != null">#{workId},</if>
@@ -55,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">#{unit},</if>
             <if test="workload != null">#{workload},</if>
             <if test="deadline != null">#{deadline},</if>
+            <if test="finishTime != null">#{finishTime},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
@@ -68,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">unit = #{unit},</if>
             <if test="workload != null">workload = #{workload},</if>
             <if test="deadline != null">deadline = #{deadline},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where work_id = #{workId}

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

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcTechnicalMapper">
+    
+    <resultMap type="CmcTechnical" id="CmcTechnicalResult">
+        <result property="technicalId"    column="technical_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="technicalDirector"    column="technical_director"    />
+        <result property="technicalDesigner"    column="technical_designer"    />
+        <result property="technicalPlanner"    column="technical_planner"    />
+        <result property="technicalComment"    column="technical_comment"    />
+        <result property="qualityInspector"    column="quality_inspector"    />
+        <result property="technicalTime"    column="technical_time"    />
+    </resultMap>
+
+    <sql id="selectCmcTechnicalVo">
+        select technical_id, project_id, technical_director, technical_designer, technical_planner, technical_comment, quality_inspector, technical_time from cmc_technical
+    </sql>
+
+    <select id="selectCmcTechnicalList" parameterType="CmcTechnical" resultMap="CmcTechnicalResult">
+        <include refid="selectCmcTechnicalVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="technicalDirector != null "> and technical_director = #{technicalDirector}</if>
+            <if test="technicalDesigner != null "> and technical_designer = #{technicalDesigner}</if>
+            <if test="technicalPlanner != null "> and technical_planner = #{technicalPlanner}</if>
+            <if test="technicalComment != null  and technicalComment != ''"> and technical_comment = #{technicalComment}</if>
+            <if test="qualityInspector != null  and qualityInspector != ''"> and quality_inspector = #{qualityInspector}</if>
+            <if test="technicalTime != null "> and technical_time = #{technicalTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcTechnicalByTechnicalId" parameterType="String" resultMap="CmcTechnicalResult">
+        <include refid="selectCmcTechnicalVo"/>
+        where technical_id = #{technicalId}
+    </select>
+        
+    <insert id="insertCmcTechnical" parameterType="CmcTechnical">
+        insert into cmc_technical
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="technicalId != null">technical_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="technicalDirector != null">technical_director,</if>
+            <if test="technicalDesigner != null">technical_designer,</if>
+            <if test="technicalPlanner != null">technical_planner,</if>
+            <if test="technicalComment != null">technical_comment,</if>
+            <if test="qualityInspector != null">quality_inspector,</if>
+            <if test="technicalTime != null">technical_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="technicalId != null">#{technicalId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="technicalDirector != null">#{technicalDirector},</if>
+            <if test="technicalDesigner != null">#{technicalDesigner},</if>
+            <if test="technicalPlanner != null">#{technicalPlanner},</if>
+            <if test="technicalComment != null">#{technicalComment},</if>
+            <if test="qualityInspector != null">#{qualityInspector},</if>
+            <if test="technicalTime != null">#{technicalTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcTechnical" parameterType="CmcTechnical">
+        update cmc_technical
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="technicalDirector != null">technical_director = #{technicalDirector},</if>
+            <if test="technicalDesigner != null">technical_designer = #{technicalDesigner},</if>
+            <if test="technicalPlanner != null">technical_planner = #{technicalPlanner},</if>
+            <if test="technicalComment != null">technical_comment = #{technicalComment},</if>
+            <if test="qualityInspector != null">quality_inspector = #{qualityInspector},</if>
+            <if test="technicalTime != null">technical_time = #{technicalTime},</if>
+        </trim>
+        where technical_id = #{technicalId}
+    </update>
+
+    <delete id="deleteCmcTechnicalByTechnicalId" parameterType="String">
+        delete from cmc_technical where technical_id = #{technicalId}
+    </delete>
+
+    <delete id="deleteCmcTechnicalByTechnicalIds" parameterType="String">
+        delete from cmc_technical where technical_id in 
+        <foreach item="technicalId" collection="array" open="(" separator="," close=")">
+            #{technicalId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -29,6 +29,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where up.post_id = 12
 	</select>
 
+	<select id="selectViceDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
+	select r.user_id, r.nick_name from
+	(select u1.user_id, u1.nick_name, u.dept_id from
+	sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
+	left join sys_user_post as up
+	on r.user_id = up.user_id
+	where up.post_id = 13 order by user_id desc limit 1
+	</select>
+
 	<select id="selectDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
 		select r.user_id, r.nick_name, up.post_id from
 		(select user_id, nick_name, dept_id from
@@ -38,6 +47,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where up.post_id = 12
 	</select>
 
+	<select id="selectViceDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name, up.post_id from
+		(select user_id, nick_name, dept_id from
+		sys_user where dept_id = #{param}) as r
+		left join sys_user_post as up
+		on r.user_id = up.user_id
+		where up.post_id = 13 order by user_id desc limit 1
+	</select>
+
 	<delete id="deleteUserPostByUserId" parameterType="Long">
 		delete from sys_user_post where user_id=#{userId}
 	</delete>

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-27 16:47:23
+ * @LastEditTime: 2024-03-29 10:23:41
 -->
 
 <template>
@@ -309,7 +309,6 @@ export default {
           });
         })
       } else if (this.taskName == '分管审核') {
-        this.$set(this.taskForm.variables, "approval", 16);
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);
           this.$emit('goBack')

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-19 11:10:54
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-02 15:56:25
 -->
 
 <template>
@@ -15,12 +15,7 @@
       </el-form-item>
       <el-form-item label="项目名称：" prop="projectName">
         <el-input v-model="addForm.projectName"></el-input>
-      </el-form-item>
-      <el-form-item label="项目负责人：" prop="projectLeader">
-        <el-tag effect="plain" type="warning" style="margin-right: 10px;"
-          v-if="addForm.projectLeader != undefined">{{ addForm.projectLeader }}</el-tag>
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
-      </el-form-item>
+      </el-form-item>      
       <el-form-item label="项目类型：" prop="projectType">
         <el-input v-model="addForm.projectType"></el-input>
       </el-form-item>
@@ -75,8 +70,7 @@
               <el-input v-model="work.remark" type="textarea" autosize clearable></el-input>
             </td>
             <td>
-              <el-button type="danger" icon="el-icon-minus" size="mini" circle
-                @click="deletWorkItem(index)"></el-button>
+              <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletWorkItem(index)"></el-button>
             </td>
           </tr>
         </table>
@@ -95,42 +89,25 @@
       <el-button type="primary" @click="confirmAddForm">确 定</el-button>
       <el-button @click="cancel">取 消</el-button>
     </div>
-    <!-- 人员选择对话框 -->
-    <el-dialog width="320px" title="选择项目负责人" :visible.sync="peopleVisible" append-to-body>
-      <el-form>
-        <el-form-item label="部门：">
-          <el-select v-model="peopleForm.deptId" @change="handleChangeDept">
-            <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName"
-              :value="item.deptId" v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="人员：">
-          <el-select v-model="peopleForm.userId">
-            <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName"
-              :value="item.userId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item style="text-align: center;">
-          <el-button @click="confirmPeople" type="primary">确定</el-button>
-          <el-button @click="cancelChoosePeople">取消</el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
+    
 
   </div>
 </template>
 
 <script>
 import { listProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
-import { listDept } from '@/api/system/dept'
-import { listUser, getUser } from '@/api/system/user'
+import { getUser } from '@/api/system/user'
+import { getUsersDeptLeaderByDept } from '@/api/system/post'
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 export default {
   props: {
     disable: {
       type: Boolean,
       require: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
     }
   },
   data() {
@@ -147,21 +124,12 @@ export default {
       projectList: [],
       total: 0,
       loading: true,
-      addOpen: false,
       modifyOpen: false,
-      title: '',
       addForm: {},
       rules: {
         projectNumber: [{ required: true, message: '请输入项目编号', trigger: 'blur' }],
         projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }]
       },
-      peopleVisible: false,
-      peopleForm: {
-        deptId: '',
-        deptList: [],
-        userId: '',
-        userList: []
-      },
       workList: [{
         content: '',
         scale: '',
@@ -177,7 +145,6 @@ export default {
   },
   created() {
     this.getList();
-    this.getDeptList();
   },
   methods: {
     // 查询项目列表
@@ -197,90 +164,29 @@ export default {
         this.loading = false;
       })
     },
-    getDeptList() {
-      listDept({
-        deptName: undefined,
-        status: undefined
-      }).then(res => {
-        this.peopleForm.deptList = res.data
-      })
-    },
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    handleAdd() {
-      this.title = '新增项目'
-      this.addOpen = true
-    },
-    handleUpdate(row) {
-      debugger
-      this.addForm = row;
-      this.title = '修改项目信息';
-      this.addOpen = true;
-    },
-    handleDelete(row) {
-      const projectIds = row.projectId || this.ids;
-      const projectNumbers = row.projectNumber || this.ids;
-      this.$modal.confirm('是否确认删除项目编号为"' + projectNumbers + '"的数据项？').then(function () {
-        return delProject(projectIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
     confirmAddForm() {
       this.addForm.workList = this.workList;
       let formData = new FormData();
       let form = JSON.stringify(this.addForm);
       formData.append("form", form);
-      console.log(this.title);
-      if (this.title == '新增项目')
-        submitProject(formData).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.addOpen = false;
-          this.getList();
-        });
-      else
-        modifyProject(formData).then(response => {
-          this.$modal.msgSuccess("修改成功");
-          this.addOpen = false;
-          this.getList();
-        });
-    },
-    // 人员选择
-    choosePeople() {
-      this.peopleVisible = true;
-    },
-    // 改变部门选择
-    handleChangeDept(deptId) {
-      this.peopleForm.userId = '';
-      listUser({ pageSize: 999999, deptId }).then(res => {
-        console.log(res);
-        this.peopleForm.userList = res.rows
+      // submitProject(formData).then(response => {
+      //   this.$modal.msgSuccess("新增成功");
+      //   this.getList();
+      // });
+      const params = { taskId: this.taskForm.taskId };
+      // 获取下一个流程节点
+      getNextFlowNode(params).then(res => {
+        getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
+          let userId = res.data.userId;
+          this.$set(this.taskForm.variables, "approval", userId);
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack')
+          });
+        })
       })
     },
-    // 确定项目负责人
-    confirmPeople() {
-      this.addForm.projectLeader = this.peopleForm.userId;
-      this.addForm.projectLeader = this.tagLeader()
-      this.peopleVisible = false
-    },
-    tagLeader() {
-      if (this.addForm.projectLeader == '' || this.addForm.projectLeader == undefined || this.addForm.projectLeader == null) {
-        return undefined
-      } else {
-        for (let user of this.peopleForm.userList) {
-          if (this.addForm.projectLeader == user.userId) {
-            return user.nickName
-          }
-        }
-      }
-    },
     cancel() {
-      this.peopleForm.deptId = '';
-      this.peopleForm.userId = '';
-      this.addOpen = false;
       this.addForm = {}
     },
     addWorkList() {
@@ -302,11 +208,6 @@ export default {
         arr.splice(index, 1);
       }
     },
-    cancelChoosePeople() {
-      this.peopleForm.deptId = '';
-      this.peopleForm.userId = '';
-      this.peopleVisible = false;
-    },
     querySearch(queryString, cb) {
       var restaurants = this.restaurants;
       var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;

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

@@ -1,45 +1,85 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-19 11:27:04
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-02 17:45:20
 -->
 <template>
   <div class="app-container">
-    <h2 style="text-align: center;">项目登记</h2>
+    <h2 style="text-align: center;">项目安排</h2>
     <el-form :model="form" :rules="rules" label-width="100px" :disable="disable">
       <el-form-item label="承担部门：" prop="undertakingDept">
-        <el-select v-model="form.deptId" multiple clearable  style="width:500px">
+        <el-select v-model="form.deptId" multiple clearable style="width:500px" @change="getDeptLeader">
           <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
             v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="部门负责人" prop="deptLeader">
-        <el-input v-model="form.deptLeader"></el-input>
+        <el-select v-model="form.deptLeader" multiple clearable style="width:500px">
+          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+            v-if="item.nickName != 'admin'">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="项目负责人" prop="projectLeader">
         <el-tag effect="plain" type="warning" style="margin-right: 10px;">{{ form.projectLeader }}</el-tag>
-        <el-button type="primary" plain size="mini">更换</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
       </el-form-item>
-      <el-form-item label="现场负责人">
-        <el-input v-model="form.deptLeader"></el-input>
+      <el-form-item label="现场负责人" prop="siteLeader">
+        <el-select v-model="form.siteLeader" filterable clearable style="width:500px">
+          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+            v-if="item.nickName != 'admin'">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="项目预算">
         <el-input v-model="form.deptLeader"></el-input>
       </el-form-item>
     </el-form>
-    
+    <!-- 人员选择对话框 -->
+    <el-dialog width="320px" title="选择项目负责人" :visible.sync="peopleVisible" append-to-body>
+      <el-form>
+        <el-form-item label="部门：">
+          <el-select v-model="peopleForm.deptId" @change="handleChangeDept">
+            <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
+              v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="人员：">
+          <el-select v-model="peopleForm.userId">
+            <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item style="text-align: center;">
+          <el-button @click="confirmPeople" type="primary">确定</el-button>
+          <el-button @click="cancelChoosePeople">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+    <div slot="footer" class="dialog-footer" style="text-align: center;">
+      <el-button type="primary" @click="confirmPlanForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
   </div>
 </template>
 
 <script>
 import { listDept } from '@/api/system/dept'
+import { listUser } from '@/api/system/user'
+import { getUsersDeptLeaderByDept } from '@/api/system/post'
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 export default {
   props: {
     disable: {
       type: Boolean,
       require: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
     }
   },
   data() {
@@ -47,23 +87,102 @@ export default {
       form: {},
       rules: {},
       deptList: [],
-      file:{
-        fileList:[]
-      }
+      userList: [],
+      deptLeaderList: [],
+      file: {
+        fileList: []
+      },
+      peopleVisible: false,
+      peopleForm: {
+        deptId: '',
+        deptList: [],
+        userId: '',
+        userList: []
+      },
     }
   },
   created() {
     this.getDeptList();
+    this.getUserList();
   },
   methods: {
+    getUserList() {
+      listUser({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.userList = res.rows
+      })
+    },
     getDeptList() {
       listDept({
         deptName: undefined,
         status: undefined
       }).then(res => {
         this.deptList = res.data
+        this.peopleForm.deptList = res.data
+      })
+    },
+    getDeptLeader(val) {
+      this.deptLeaderList = [];
+      for (let v of val) {
+        getUsersDeptLeaderByDept({ deptId: v }).then(res => {
+          this.deptLeaderList.push(res.data.userId);
+          this.form.deptLeader = this.deptLeaderList;
+        })
+      }
+    },
+    // 人员选择
+    choosePeople() {
+      this.peopleVisible = true;
+    },
+    // 改变部门选择
+    handleChangeDept(deptId) {
+      this.peopleForm.userId = '';
+      listUser({ pageSize: 999999, deptId }).then(res => {
+        this.peopleForm.userList = res.rows
       })
     },
+    // 确定项目负责人
+    confirmPeople() {
+      this.form.projectLeader = this.peopleForm.userId;
+      this.form.projectLeader = this.tagLeader()
+      this.peopleVisible = false
+    },
+    tagLeader() {
+      if (this.form.projectLeader == '' || this.form.projectLeader == undefined || this.form.projectLeader == null) {
+        return undefined
+      } else {
+        for (let user of this.peopleForm.userList) {
+          if (this.form.projectLeader == user.userId) {
+            return user.nickName
+          }
+        }
+      }
+    },
+    cancelChoosePeople() {
+      this.peopleForm.deptId = '';
+      this.peopleForm.userId = '';
+      this.peopleVisible = false;
+    },
+    confirmPlanForm() {
+      let formData = new FormData();
+      let form = JSON.stringify(this.form);
+      formData.append("form", form);
+      const params = { taskId: this.taskForm.taskId };
+      // 获取下一个流程节点
+      getNextFlowNode(params).then(res => {
+        this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
+        getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
+          let userId = res.data.userId;
+          this.$set(this.taskForm.variables, "approval", userId);
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack')
+          });
+        })
+      })
+    },
+    cancel() {
+      this.form = {}
+    },
   }
 }
 </script>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-19 10:11:01
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-02 14:56:03
 -->
 
 <template>
@@ -10,15 +10,16 @@
 
     <el-tabs tabPosition="left" type="card" class="tabs-border" v-model="activeName">
       <el-tab-pane label="项目登记">
-        <addproject :disable="taskName != '项目登记'"></addproject>
+        <addproject :taskForm = "taskForm" :disable="taskName != '项目登记'"></addproject>
       </el-tab-pane>
       <el-tab-pane label="项目安排">
-        <arrangeProject :disable="false"></arrangeProject>
+        <arrangeProject :taskForm = "taskForm" :disable="taskName != '项目安排'"></arrangeProject>
       </el-tab-pane>
       <el-tab-pane label="技术交底"></el-tab-pane>
       <el-tab-pane label="安全交底"></el-tab-pane>
       <el-tab-pane label="经营审核"></el-tab-pane>
       <el-tab-pane label="分管审核"></el-tab-pane>
+      <el-tab-pane label="生产确认"></el-tab-pane>
       <el-tab-pane label="项目生产"></el-tab-pane>
       <el-tab-pane label="质量检查"></el-tab-pane>
       <el-tab-pane label="成果归档"></el-tab-pane>
@@ -38,6 +39,9 @@ export default {
   props: {
     taskName: {
       type: String
+    },
+    taskForm: {
+      type: Object,
     }
   },
   components: {
@@ -138,25 +142,6 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
-    confirmAddForm() {
-      this.addForm.workList = this.workList;
-      let formData = new FormData();
-      let form = JSON.stringify(this.addForm);
-      formData.append("form", form);
-      console.log(this.title);
-      if (this.title == '新增项目')
-        submitProject(formData).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.addOpen = false;
-          this.getList();
-        });
-      else
-        modifyProject(formData).then(response => {
-          this.$modal.msgSuccess("修改成功");
-          this.addOpen = false;
-          this.getList();
-        });
-    },
     // 人员选择
     choosePeople() {
       this.peopleVisible = true;