1

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

@@ -514,12 +514,6 @@ public class ReportController {
                 multiDegrId[i] = null;
             }
         }
-        if (reportTargetDeptId == null) {
-            reportTargetDeptId = new Integer[projectId.length];
-            for (int i=0;i<reportTargetDeptId.length; i++) {
-                reportTargetDeptId[i] = null;
-            }
-        }
         if (company.getPackageProject() == 1) {
             //检查是否设置了预算的工时预警
             ProjectBasecostSetting alarmSetting = projectBasecostSettingMapper.selectOne(new QueryWrapper<ProjectBasecostSetting>()
@@ -896,7 +890,7 @@ public class ReportController {
                             report.setStage(stage[i]);
                             report.setCreateDate(localStartDate);
                             report.setCreatorId(token);
-                            report.setDeptId(reportTargetDeptId[i]!=null?reportTargetDeptId[i]:user.getDepartmentId());
+                            report.setDeptId(comTimeType.getUserWithMultiDept()==1?(reportTargetDeptId[i]==-1?user.getDepartmentId():reportTargetDeptId[i]):user.getDepartmentId());
                             report.setProjectAuditState(0);
                             report.setProjectAuditorId(projectAuditorId[i]);
                             report.setTaskFinish(taskFinish[i]);
@@ -1009,7 +1003,7 @@ public class ReportController {
                         report.setPicStr(picStr!=null?picStr[i]:null);
                         report.setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")));
                         report.setCreatorId(token);
-                        report.setDeptId(reportTargetDeptId[i]!=null?reportTargetDeptId[i]:user.getDepartmentId());
+                        report.setDeptId(comTimeType.getUserWithMultiDept()==1?(reportTargetDeptId[i]==-1?user.getDepartmentId():reportTargetDeptId[i]):user.getDepartmentId());
                         report.setProjectAuditState(0);
                         report.setProjectAuditorId(projectAuditorId[i]);
                         report.setTaskFinish(taskFinish[i]);
@@ -2641,8 +2635,8 @@ public class ReportController {
     }
 
     @RequestMapping("/changeReminder")
-    public HttpRespMsg changeReminder(String createDate,String userId) throws Exception {
-        return reportService.changeReminder(request,createDate,userId);
+    public HttpRespMsg changeReminder(String createDate,String userId,String startDate,String endDate) throws Exception {
+        return reportService.changeReminder(request,createDate,userId,startDate,endDate);
     }
 }
 

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

@@ -152,7 +152,7 @@ public interface ReportService extends IService<Report> {
 
     HttpRespMsg getDetailReportById(Integer reportId, HttpServletRequest request);
 
-    HttpRespMsg changeReminder(HttpServletRequest request,String createDate,String userId) throws Exception;
+    HttpRespMsg changeReminder(HttpServletRequest request,String createDate,String userId,String startDate,String endDate) throws Exception;
 
     HttpRespMsg getUserDailyWorkTimeReminder(HttpServletRequest request, String startDate, String endDate) throws Exception;
 

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

@@ -9045,13 +9045,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     }
 
     @Override
-    public HttpRespMsg changeReminder(HttpServletRequest request,String createDate,String userId) throws Exception {
+    public HttpRespMsg changeReminder(HttpServletRequest request,String createDate,String userId,String startDate,String endDate) throws Exception {
         HttpRespMsg msg=new HttpRespMsg();
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new LambdaQueryWrapper<WxCorpInfo>().eq(WxCorpInfo::getCompanyId, companyId));
         LocalDate now=LocalDate.now();
-        HttpRespMsg userDailyWorkTime = getUserDailyWorkTime(request, now.with(TemporalAdjusters.firstDayOfMonth()).format(df), now.with(TemporalAdjusters.lastDayOfMonth()).format(df));
+        HttpRespMsg userDailyWorkTime = getUserDailyWorkTime(request,startDate,endDate);
         Map<String, Object> map = (Map<String, Object>) userDailyWorkTime.getData();
         List<UserMonthWork> userDailyWorkTimeData = (List<UserMonthWork>) map.get("list");
         if(!StringUtils.isEmpty(userId)){

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

@@ -8110,8 +8110,8 @@
                                 return
                             }
 
-                            if(this.user.timeType.userWithMultiDept == 1&& this.workForm.domains[i].reportTargetDeptId) {
-                                formData.append('reportTargetDeptId', this.workForm.domains[i].reportTargetDeptId);
+                            if(this.user.timeType.userWithMultiDept == 1) {
+                                formData.append('reportTargetDeptId', this.workForm.domains[i].reportTargetDeptId||0);
                             }
                         }
                         this.submitingReport = true;