增加项目复核人

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -172,7 +172,9 @@ public class ProjectController {
                                    Double outputValue,
                                    Integer deptId,
                                    @RequestParam(defaultValue = "false") boolean onlyChangeParticipate,
-                                   String buId,Double manDay,String  manDayStartDate,String plate1,
+                                   String buId,Double manDay,String  manDayStartDate,
+                                   String reviwerId,
+                                   String plate1,
                                    String plate2,
                                    String plate3,
                                    String plate4,
@@ -185,7 +187,7 @@ public class ProjectController {
         return projectService.editProject(id, name, code, userId, inchargerId, isPublic, planStartDate, planEndDate, level, contractAmount,changeContractReason,
                 projectBaseCostData,projectKeyNodesData,
                  budget,customerId,chosenLeaders, associateDegrees, associateDegreeNames,
-                taskGpIncharge,auditUserIds, ccUserIds, category, projectDesc,projectMainId, providerIds, providerNames, request,projectSeparate,outputValue,deptId,onlyChangeParticipate,buId,manDay,manDayStartDate,plate1,plate2,plate3,plate4,plate5,plate6,plate7,plate8,plate9,plate10);
+                taskGpIncharge,auditUserIds, ccUserIds, category, projectDesc,projectMainId, providerIds, providerNames, request,projectSeparate,outputValue,deptId,onlyChangeParticipate,buId,manDay,manDayStartDate,reviwerId, plate1,plate2,plate3,plate4,plate5,plate6,plate7,plate8,plate9,plate10);
     }
 
     @RequestMapping("/adjustBase")

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Project.java

@@ -26,7 +26,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-11-19
+ * @since 2024-07-11
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -477,6 +477,12 @@ public class Project extends Model<Project> {
 
     @TableField(exist = false)
     private String groupName;
+    /**
+     * 项目复审人
+     */
+    @TableField("reviwer_id")
+    private String reviwerId;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java

@@ -49,7 +49,9 @@ public interface ProjectService extends IService<Project> {
                             String providerIds,
                             String providerNames,
                             HttpServletRequest request,
-                            ProjectSeparate projectSeparate,Double outputValue,Integer deptId,boolean onlyChangeParticipate,String buId,Double manDay,String manDayStartDate,String plate1,
+                            ProjectSeparate projectSeparate,Double outputValue,Integer deptId,boolean onlyChangeParticipate,String buId,Double manDay,String manDayStartDate,
+                            String reviwerId,
+                            String plate1,
                             String plate2,
                             String plate3,
                             String plate4,

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -704,7 +704,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                    String providerIds,
                                    String providerNames,
                                    HttpServletRequest request,
-                                   ProjectSeparate projectSeparate,Double outputValue,Integer deptId,boolean onlyChangeParticipate,String buId,Double manDay,String  manDayStartDate,String plate1,
+                                   ProjectSeparate projectSeparate,Double outputValue,Integer deptId,boolean onlyChangeParticipate,String buId,Double manDay,String  manDayStartDate,
+                                   String reviwerId,
+                                   String plate1,
                                    String plate2,
                                    String plate3,
                                    String plate4,
@@ -745,6 +747,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         }
         boolean inchargerChanged = false;
         String oldInchargerId = null;
+        Project oldProject = null;
         if (id == null) {
             //新增项目
             if (name == null) {
@@ -780,6 +783,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                     convertDepartmentIdToCascade(0) :
                                     convertDepartmentIdToCascade(deptId))
                             .setProviderNames(providerNames)
+                            .setReviwerId(reviwerId)
                             .setPlate1(plate1)
                             .setPlate2(plate2)
                             .setPlate3(plate3)
@@ -885,7 +889,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
             }
         } else {
-            Project oldProject = projectMapper.selectById(id);
+            oldProject = projectMapper.selectById(id);
             isNew = false;
             //修改项目
             //检查项目编号不能重复
@@ -897,10 +901,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 //httpRespMsg.setError("提交失败：项目编号已存在");
                 httpRespMsg.setError(MessageUtils.message("project.submitFailByNoRepeat"));
             } else {
-                Project project = projectMapper.selectById(id);
-                if (inchargerId != null && !inchargerId.equals(project.getInchargerId())) {
+                if (inchargerId != null && !inchargerId.equals(oldProject.getInchargerId())) {
                     inchargerChanged = true;
-                    oldInchargerId = project.getInchargerId();
+                    oldInchargerId = oldProject.getInchargerId();
                 }
                 Project p = new Project();
                 p.setProjectName(name).setId(id).setCompanyId(companyId).setProjectCode(code != null?code.trim():null).setInchargerId(inchargerId)
@@ -920,6 +923,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 convertDepartmentIdToCascade(0) :
                                 convertDepartmentIdToCascade(deptId))
                         .setProviderNames(providerNames)
+                        .setReviwerId(reviwerId)
                         .setPlate1(plate1)
                         .setPlate2(plate2)
                         .setPlate3(plate3)
@@ -1276,6 +1280,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                     }
 
+                    //有项目复核人的情况
+                    if (timeType.getReportAuditType() == 8) {
+                        if (oldProject.getReviwerId() != null && reviwerId != null && !oldProject.getReviwerId().equals(reviwerId)) {
+                            //发生变化，查找日报中待审核状态下的
+                        }
+                    }
                 }
             }
             //针对启用了简单非项目模式的情况，确保项目经理，级别，合同金额，开始日期，截止日期，预估工时都是null

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -207,6 +207,7 @@
     "waitForTheProjectReviewer": "Waiting for project reviewers",
     "audit": "review",
     "projectAuditor": "project reviewer",
+    "projectReviwer": "secondary reviewer",
     "reviewer": "Reviewer",
     "await": "await",
     "importWaitingForReview": "Import waiting for review",

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -207,6 +207,7 @@
     "waitForTheProjectReviewer": "待项目审核人",
     "audit": "审核",
     "projectAuditor": "项目审核人",
+    "projectReviwer": "项目复审人",
     "reviewer": "审核人",
     "await": "待",
     "importWaitingForReview": "导入待审核",

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -539,6 +539,16 @@
                             </el-option>
                         </el-select>
                         <selectCat v-if="user.userNameNeedTranslate == 1" :filterable="true" :size="'medium'" :subject="participator" :subjectId="addForm.inchargerId" :distinction="'3'" @selectCal="selectCal" :disabled="canOnlyModParticipator || projectManagerEdit || isShowProjectName"></selectCat>
+
+                        <!--项目复审人-->
+                        <span v-if="user.timeType.reportAuditType == 8" style="margin-left:63px;margin-right:10px;" >{{ $t('other.projectReviwer') }}</span>
+                        <el-select v-if="user.userNameNeedTranslate != 1" v-model="addForm.reviwerId" filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:32%;" :disabled="canOnlyModParticipator || projectManagerEdit">
+                            <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6;">{{ item.jobNumber }}</span>
+                            </el-option>
+                        </el-select>
+                        <selectCat v-if="user.userNameNeedTranslate == 1" :filterable="true" :size="'medium'" :subject="users" :subjectId="addForm.reviwerId" :distinction="'4'" @selectCal="selectCal" :disabled="canOnlyModParticipator || projectManagerEdit || isShowProjectName"></selectCat>
                     </el-form-item>
 
                     <span v-if="user.companyId != 469">
@@ -2035,7 +2045,7 @@ a {
                 selectedGroup:{},
                 changeParticipation:false,
                 participatorVisible: false,
-                participatorValue: []
+                participatorValue: [],
             };
         },
         // 过滤器
@@ -4680,12 +4690,6 @@ a {
                 })
             },
             getUsers() {
-                // this.http.post(this.port.manage.list, {
-                //     departmentId: -1,
-                //     pageIndex: 1,
-                //     // pageSize: 99999
-                //     pageSize: -1
-                // },
                 this.http.post('/user/getSimpleActiveUserList', {},
                 res => {
                     if (res.code == "ok") {