依斯呗修改

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

@@ -107,6 +107,8 @@ public class GroupBudgetReviewController {
             groupBudgetReview.setRejectReason(rejectReason);
         }
         groupBudgetReview.setStatus(checkType);
+        groupBudgetReview.setCheckerId(checker.getId());
+        groupBudgetReview.setChecker(checker.getName());
         if(!groupBudgetReviewService.updateById(groupBudgetReview)){
             httpRespMsg.setError("验证失败");
             return httpRespMsg;
@@ -157,7 +159,7 @@ public class GroupBudgetReviewController {
     }
 
     @RequestMapping("/list")
-    public HttpRespMsg list(String startDate,String endDate,Integer projectId,Integer status,String submitUserId){
+    public HttpRespMsg list(String startDate,String endDate,Integer projectId,Integer status,String checkUserId){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
 
@@ -171,8 +173,8 @@ public class GroupBudgetReviewController {
         if(status!=null){
             queryWrapper.eq(GroupBudgetReview::getStatus,status-1);
         }
-        if(!StringUtils.isEmpty(submitUserId)){
-            queryWrapper.eq(GroupBudgetReview::getCreatorId,submitUserId);
+        if(!StringUtils.isEmpty(checkUserId)){
+            queryWrapper.eq(GroupBudgetReview::getCheckerId,checkUserId);
         }
         List<GroupBudgetReview> list = groupBudgetReviewService.list(queryWrapper);
         TimeType timeType = timeTypeMapper.selectById(companyId);
@@ -201,7 +203,7 @@ public class GroupBudgetReviewController {
     }
 
     @RequestMapping("/export")
-    public HttpRespMsg export(String startDate,String endDate,Integer projectId,Integer status,String submitUserId){
+    public HttpRespMsg export(String startDate,String endDate,Integer projectId,Integer status,String checkUserId){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -215,10 +217,10 @@ public class GroupBudgetReviewController {
             queryWrapper.eq(GroupBudgetReview::getProjectId,projectId);
         }
         if(status!=null){
-            queryWrapper.eq(GroupBudgetReview::getStatus,status);
+            queryWrapper.eq(GroupBudgetReview::getStatus,status-1);
         }
-        if(!StringUtils.isEmpty(submitUserId)){
-            queryWrapper.eq(GroupBudgetReview::getCreatorId,submitUserId);
+        if(!StringUtils.isEmpty(checkUserId)){
+            queryWrapper.eq(GroupBudgetReview::getCreatorId,checkUserId);
         }
         List<GroupBudgetReview> list = groupBudgetReviewService.list(queryWrapper);
         List<List<String>> dataList=new ArrayList<>();

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

@@ -19,7 +19,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2024-02-19
+ * @since 2024-04-01
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -126,6 +126,18 @@ public class GroupBudgetReview extends Model<GroupBudgetReview> {
     @TableField(exist = false)
     private String nowEstimatedWorkTime;
 
+    /**
+     * 审核人id
+     */
+    @TableField("checker_id")
+    private String checkerId;
+
+    /**
+     * 审核人
+     */
+    @TableField("checker")
+    private String checker;
+
 
 
 

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/GroupBudgetReviewMapper.xml

@@ -19,11 +19,13 @@
         <result column="project_name" property="projectName" />
         <result column="remark" property="remark" />
         <result column="reject_reason" property="rejectReason" />
+        <result column="checker_id" property="checkerId" />
+        <result column="checker" property="checker" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, group_id, old_man_day, change_man_day, now_man_day, status, create_time, company_id, creator_id, group_name, creator, project_id, project_name, remark, reject_reason
+        id, group_id, old_man_day, change_man_day, now_man_day, status, create_time, company_id, creator_id, group_name, creator, project_id, project_name, remark, reject_reason, checker_id, checker
     </sql>
 
 </mapper>

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

@@ -24,7 +24,7 @@
                 <!-- 审核人 -->
                 <div class="budgetReviewHeader_FormItem">
                     <div class="budgetReviewHeader_FormItemText">审核人：</div>
-                    <el-select v-model="screeningConditionForm.submitUserId" filterable placeholder="请选择审核人" clearable
+                    <el-select v-model="screeningConditionForm.checkUserId" filterable placeholder="请选择审核人" clearable
                         size="small" v-if="user.userNameNeedTranslate != 1" style="width: 130px;" @change="getList">
                         <el-option v-for="item in usersList" :key="item.id" :label="item.name + '\u3000' + item.jobNumber"
                             :value="item.id">
@@ -32,7 +32,7 @@
                             <span class="selectProleft">{{ item.name }}</span>
                         </el-option>
                     </el-select>
-                    <selectCat :size="'small'" :subject="usersList" :subjectId="screeningConditionForm.submitUserId"
+                    <selectCat :size="'small'" :subject="usersList" :subjectId="screeningConditionForm.checkUserId"
                         :clearable="true" :filterable="true" :searchBoxTop="1" stinction="'1'" @selectCal="selectCal"
                         v-if="user.userNameNeedTranslate == 1" :widthStr="'130'"></selectCat>
                 </div>
@@ -205,7 +205,7 @@ export default {
             screeningConditionForm: {
                 projectId: '',
                 dateRange: '',
-                submitUserId: '',
+                checkUserId: '',
                 status: ''
             }
         };
@@ -277,11 +277,11 @@ export default {
         //获取待审核的数据列表
         getList() {
             this.listLoading = true;
-            const { projectId, dateRange, submitUserId, status } = this.screeningConditionForm;
+            const { projectId, dateRange, checkUserId, status } = this.screeningConditionForm;
             const params = {
                 ...(projectId && { projectId }),
-                ...(dateRange && { startTime: dateRange[0], endTime: dateRange[1] }),
-                ...(submitUserId && { submitUserId }),
+                ...(dateRange && { startDate: dateRange[0], endDate: dateRange[1] }),
+                ...(checkUserId && { checkUserId }),
                 ...(status && { status }),
             };
             this.http.post("/group-budget-review/list", {
@@ -350,7 +350,7 @@ export default {
         selectCal(obj) {
             console.log(obj, '过来的数据')
             if (obj.distinction == 1) {
-                this.screeningConditionForm.submitUserId = obj.id
+                this.screeningConditionForm.checkUserId = obj.id
                 this.getList()
             }
         },
@@ -366,11 +366,11 @@ export default {
         },
         // 导出
         exportReport() {
-            const { projectId, dateRange, submitUserId, status } = this.screeningConditionForm;
+            const { projectId, dateRange, checkUserId, status } = this.screeningConditionForm;
             const params = {
                 ...(projectId && { projectId }),
                 ...(dateRange && { startTime: dateRange[0], endTime: dateRange[1] }),
-                ...(submitUserId && { submitUserId }),
+                ...(checkUserId && { checkUserId }),
                 ...(status && { status }),
             };
             this.exporListLoading = true;

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -4160,7 +4160,7 @@
       let lastwd = [this.getAutoWeekDate(lastdate)[0],this.getAutoWeekDate(lastdate)[6]]
       if(e){
         this.WorktimeDatepickValue = lastwd 
-        this.showMonthWorkTime()
+        this.showMonthWorkTime('first')
         
       }else{
         this.WorktimeDatepickValue = lastwd 
@@ -4173,7 +4173,7 @@
       let nowwd = [this.getAutoWeekDate(nowdate)[0],this.getAutoWeekDate(nowdate)[6]]
       if(e){
         this.WorktimeDatepickValue = nowwd 
-        this.showMonthWorkTime()
+        this.showMonthWorkTime('first')
       }else{
         this.WorktimeDatepickValue = nowwd 
         this.showMonthNotWorkTime()
@@ -4185,7 +4185,7 @@
       let nextwd = [this.getAutoWeekDate(nextdate)[0],this.getAutoWeekDate(nextdate)[6]]
       if(e){
         this.WorktimeDatepickValue = nextwd 
-        this.showMonthWorkTime()
+        this.showMonthWorkTime('first')
       }else{
         this.WorktimeDatepickValue = nextwd 
         this.showMonthNotWorkTime()