新增合作单位、业主单位修改

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

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcPartyA;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -74,7 +75,10 @@ public class CmcPartnerController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcPartner cmcPartner)
     {
-        cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
+        if (cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1 < 1000)
+            cmcPartner.setPartnerId("0" + (cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
+        else
+            cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
         return toAjax(cmcPartnerService.insertCmcPartner(cmcPartner));
     }
 

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

@@ -74,7 +74,10 @@ public class CmcPartyAController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcPartyA cmcPartyA)
     {
-        cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
+        if (cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1 < 1000)
+            cmcPartyA.setPartyAId("0" + (cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
+        else
+            cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
         return toAjax(cmcPartyAService.insertCmcPartyA(cmcPartyA));
     }
 

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

@@ -103,11 +103,15 @@ public class CmcTechnicalPlanController extends BaseController
             cmcTechnicalPlan.setTechnicalDesigner(getLoginUser().getUserId());
             cmcTechnicalPlan.setTechnicalUploadTime(new Date());
         }
-        if ((cmcTechnicalPlan.getModifyDocument() != null || cmcTechnicalPlan.getTechnicalComment() != null) && cmcTechnicalPlan.getManageComment() == null) {
+        if ((cmcTechnicalPlan.getModifyDocument() != null || cmcTechnicalPlan.getTechnicalComment() != null) && cmcTechnicalPlan.getTechDeptComment() == null) {
             cmcTechnicalPlan.setTechnicalAuditor(getLoginUser().getUserId());
             cmcTechnicalPlan.setTechApprovalTime(new Date());
         }
-        if (cmcTechnicalPlan.getManageComment() != null) {
+        if ((cmcTechnicalPlan.getReviseDocument() != null || cmcTechnicalPlan.getTechDeptComment() != null) && cmcTechnicalPlan.getManageComment() == null) {
+            cmcTechnicalPlan.setTechDeptLeader(getLoginUser().getUserId());
+            cmcTechnicalPlan.setTechDeptTime(new Date());
+        }
+        if (cmcTechnicalPlan.getManageComment() != null || cmcTechnicalPlan.getFinalDocument() != null) {
             cmcTechnicalPlan.setManagerUserId(getLoginUser().getUserId());
             cmcTechnicalPlan.setManageApprovalTime(new Date());
         }

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-12 16:12:36
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-12 16:18:28
 -->
 <template>
   <div class="app-container">
@@ -12,12 +12,12 @@
         <el-row>
           <el-checkbox v-model="safe" disabled>安全交底</el-checkbox>
           <el-link class="ml20 mr20" type="primary" @click="openSafe = true">安全交底记录表</el-link>
-          <el-button plain type="warning" size="mini" @click="handleUrge('1')" v-if="!safe">发送企业微信消息催促相关人员</el-button>
+          <el-button plain type="warning" size="mini" @click="handleUrge('1')" v-if="!safe">发送企业微信消息提醒相关人员</el-button>
         </el-row>
         <el-row>
           <el-checkbox v-model="tech" disabled>技术交底</el-checkbox>
           <el-link class="ml20 mr20" type="primary" @click="openTech = true">技术交底记录表</el-link>
-          <el-button plain type="warning" size="mini" @click="handleUrge('2')" v-if="!tech">发送企业微信消息催促相关人员</el-button>
+          <el-button plain type="warning" size="mini" @click="handleUrge('2')" v-if="!tech">发送企业微信消息提醒相关人员</el-button>
         </el-row>
         <el-row>
           <el-checkbox v-model="plan" disabled>技术方案</el-checkbox>