日报相关填报修改

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

@@ -4,9 +4,12 @@ package com.management.platform.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.management.platform.entity.Department;
-import com.management.platform.entity.User;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.*;
 import com.management.platform.entity.vo.DepartmentVO;
+import com.management.platform.mapper.PlanMapper;
+import com.management.platform.mapper.PlanProcedureTotalMapper;
+import com.management.platform.mapper.ReportMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.DepartmentService;
 import com.management.platform.util.HttpRespMsg;
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -37,6 +41,12 @@ public class DepartmentController {
     private HttpServletRequest request;
     @Resource
     private UserMapper userMapper;
+    @Resource
+    private ReportMapper reportMapper;
+    @Resource
+    private PlanMapper planMapper;
+    @Resource
+    private PlanProcedureTotalMapper planProcedureTotalMapper;
     /**
      * 获取带有层级的部门列表
      */
@@ -175,5 +185,35 @@ public class DepartmentController {
     public  HttpRespMsg getMyGroups(HttpServletRequest request){
         return  departmentService.getMyGroups(request);
     }
+
+    @RequestMapping("getMyManageUserList")
+    public HttpRespMsg getMyManageUserList(HttpServletRequest request, String date){
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        //检查是否单位部门负责人
+        List<Integer> manageDeptList = departmentService.getAllManagedDeptIdList(user, departmentService.list());
+        //查找相关计划
+        if (manageDeptList.size() > 0) {
+            List<Plan> planList = planMapper.selectList(new QueryWrapper<Plan>().in("station_id", manageDeptList));
+            List<Integer> collect = planList.stream().map(Plan::getId).collect(Collectors.toList());
+            if (collect.size() > 0) {
+                List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().select("distinct creator_id").in("plan_id", collect).eq("create_date", date));
+                if (reportList.size() > 0) {
+                    List<String> userIds = reportList.stream().map(Report::getCreatorId).collect(Collectors.toList());
+                    List<User> userList = userMapper.selectList(new QueryWrapper<User>().select("id,name,work_type_id,work_type").in("id", userIds));
+                    httpRespMsg.data = userList;
+                }
+            }
+        }
+        if (httpRespMsg.data == null) {
+            //取他自己
+            httpRespMsg.data = userMapper.selectList(new QueryWrapper<User>().select("id,name,work_type_id,work_type").eq("id", user.getId()));
+        }
+
+        List<User> userList = userMapper.selectList(null);
+        List<User> collect = userList.stream().filter(item -> item.getDepartmentId().equals(user.getDepartmentId())).collect(Collectors.toList());
+        httpRespMsg.setData(collect);
+        return httpRespMsg;
+    }
 }
 

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

@@ -133,14 +133,16 @@ public class ReportController {
 //    }
 //
 //
-//    /**
-//     * 根据时间 获取本人报告信息 以及工时
-//     * date 日期 格式yyyy-mm-dd
-//     */
-//    @RequestMapping("/getReport")
-//    public HttpRespMsg getReport(@RequestParam String date) {
-//        return reportService.getReport(date, request);
-//    }
+    /**
+     * 根据时间 获取本人报告信息 以及工时
+     * date 日期 格式yyyy-mm-dd
+     */
+    @RequestMapping("/getReportById")
+    public HttpRespMsg getReportById(@RequestParam Integer id) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = reportService.getById(id);
+        return msg;
+    }
 //
 //    @RequestMapping("/getCardTime")
 //    public HttpRespMsg getCardTime(@RequestParam String date) {

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

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-11-20
+ * @since 2023-11-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -144,6 +144,13 @@ public class Report extends Model<Report> {
     @TableField(exist = false)
     private Boolean isFinish;
 
+    /**
+     * 1-进行中，2-已完工，3-已中止(员工自己中止或者管理端中止）
+     */
+    @TableField("status")
+    private Integer status;
+
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -27,7 +27,7 @@ public interface ReportService extends IService<Report> {
 //
 //    HttpRespMsg exportReport(@RequestParam String startDate, @RequestParam String endDate, Integer projectId,Integer stateKey,Integer departmentId, HttpServletRequest request);
 //
-//    HttpRespMsg getReport(String date, HttpServletRequest request);
+    HttpRespMsg getReport(String date, HttpServletRequest request);
 //
 //    HttpRespMsg getCardTime(String date, HttpServletRequest request);
 //
@@ -140,4 +140,5 @@ public interface ReportService extends IService<Report> {
     HttpRespMsg exportDpetStatisticsProgressList(String deptId, String userId, String startDate, String endDate);
 
     HttpRespMsg exportReport(String startDate, String endDate, Integer planId, Integer stateKey, Integer departmentId, HttpServletRequest request);
+
 }

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

@@ -73,6 +73,7 @@ public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTota
                 planMap.put("task_name", map.get("task_name"));
                 planMap.put("task_change_notice_num", map.get("task_change_notice_num"));
                 planMap.put("plan_type", map.get("plan_type"));
+                planMap.put("num", map.get("num"));
                 planMap.put("procedureList", procedureList);
                 resultList.add(planMap);
             } else {
@@ -82,10 +83,10 @@ public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTota
             HashMap procedureMap = new HashMap();
             procedureMap.put("id", map.get("id"));
             procedureMap.put("procedure_name", map.get("procedure_name"));
-            procedureMap.put("work_time", map.get("work_time"));
-            procedureMap.put("job_of_money", map.get("job_of_money"));
-            procedureMap.put("progress", map.get("progress"));
+            procedureMap.put("work_time", map.get("total_working_hours"));
+            procedureMap.put("job_of_money", map.get("total_wages"));
             procedureMap.put("checker_name", map.get("checker_name"));
+            procedureMap.put("num", map.get("num"));
             procedureMap.put("checker_id", map.get("checker_id"));
             procedureMap.put("check_type", map.get("check_type"));
             procedureMap.put("plan_check_type", map.get("plan_check_type"));

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

@@ -28,6 +28,7 @@ import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.Executor;
@@ -125,7 +126,15 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         Integer companyId = user.getCompanyId();
         report.setCreatorId(token);
         LocalDate today = LocalDate.now();
-        report.setCreateDate(today);
+        LocalDate targetDate = null;
+        if (report.getId() == null) {
+            report.setCreateDate(today);
+            targetDate = today;
+        } else {
+            Report report1 = reportMapper.selectById(report.getId());
+            targetDate = report1.getCreateDate();
+            report.setCreateDate(report1.getCreateDate());
+        }
         report.setCompanyId(companyId);
 
         Plan plan = planMapper.selectById(report.getPlanId());
@@ -143,7 +152,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         }
 
         //检查今日该员工的该工序是否已经有报工
-        Report todayReport = reportMapper.selectOne(new QueryWrapper<Report>().eq("creator_id", token).eq("user_procedure_team_id", report.getUserProcedureTeamId()).eq("create_date", today));
+        Report todayReport = reportMapper.selectOne(new QueryWrapper<Report>().eq("creator_id", token).eq("user_procedure_team_id", report.getUserProcedureTeamId()).eq("create_date", targetDate));
         //计算工作时长
         ProdProcedureTeam prodProcedureTeam = prodProcedureTeamMapper.selectById(report.getUserProcedureTeamId());
         //总计划任务的工序中有总工时和总工价
@@ -152,7 +161,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
         //核算本次填报的件数是否合法
         List<Report> allFileProcReportList = reportMapper.selectList(new QueryWrapper<Report>().eq("plan_id", report.getPlanId()).eq("prod_procedure_id", report.getProdProcedureId()));
-        double allFileProcNum = allFileProcReportList.stream().filter(item->!(item.getCreatorId().equals(token) && item.getCreateDate().isEqual(today))).mapToDouble(Report::getFinishNum).sum();
+        allFileProcReportList.forEach(all->{
+            System.out.println(all.getCreatorId()+" "+all.getCreateDate()+" "+all.getFinishNum());
+        });
+        final LocalDate fDate = targetDate;
+        double allFileProcNum = allFileProcReportList.stream().filter(item->!(item.getCreatorId().equals(token) && item.getCreateDate().isEqual(fDate))).mapToDouble(Report::getFinishNum).sum();
         if (allFileProcNum + report.getFinishNum() > plan.getNum()) {
             httpRespMsg.setError("填报的件数超过了剩余可填报件数："+(plan.getNum() - allFileProcNum)+", 请联系班组长协调解决");
             return httpRespMsg;
@@ -179,6 +192,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 report.setCheckerId(user.getId());
             }
             prodProcedureTeam.setCheckerId(report.getCheckerId());
+
         }
         prodProcedureTeam.setUpdateTime(LocalDateTime.now());
 //        prodProcedureTeam.setProgress(report.getProgress());
@@ -187,8 +201,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         if (report.getIsFinish() != null && report.getIsFinish().booleanValue()) {
             //完工了
             prodProcedureTeam.setStatus(2);//顺利完工
+            report.setStatus(2);//顺利完工
         } else if (report.getIsTerminated() != null && report.getIsTerminated().booleanValue()) {
             prodProcedureTeam.setStatus(3);//中止
+            report.setStatus(3);//中止
         }
 
         if (todayReport == null) {
@@ -425,27 +441,26 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         }
         return allList;
     }
-//
-//    //获取本人某天工作时间和已提交的报告
-//    @Override
-//    public HttpRespMsg getReport(String date, HttpServletRequest request) {
-//        HttpRespMsg httpRespMsg = new HttpRespMsg();
-//        try {
-//            String userId = request.getHeader("Token");
-//            Integer companyId = userMapper.selectById(userId).getCompanyId();
-//            Company company = companyMapper.selectById(companyId);
-//            Map<String, Object> resultMap = new HashMap<>();
-//            //获取某日本人的所有日志
-//            List<Report> reports = reportMapper.selectList(new QueryWrapper<Report>()
-//                    .eq("creator_id", userId)
-//                    .eq("create_date", LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+
+    //获取本人某天工作时间和已提交的报告
+    @Override
+    public HttpRespMsg getReport(String date, HttpServletRequest request) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        try {
+            String userId = request.getHeader("Token");
+            Integer companyId = userMapper.selectById(userId).getCompanyId();
+            Company company = companyMapper.selectById(companyId);
+            Map<String, Object> resultMap = new HashMap<>();
+            //获取某日本人的所有日志
+            List<Report> reports = reportMapper.selectList(new QueryWrapper<Report>()
+                    .eq("creator_id", userId)
+                    .eq("create_date", LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
 //            List<Integer> integerList = reports.stream().map(Report::getProjectId).collect(Collectors.toList());
 //            List<Project> allProjectList = projectMapper.selectList(new QueryWrapper<Project>()
 //                    .eq("company_id", userMapper.selectById(userId).getCompanyId()));
 //            List<SubProject> subProjectList = integerList.size() > 0?subProjectMapper.selectList(new QueryWrapper<SubProject>().in("project_id",integerList)):new ArrayList<>();
 //            List<ProjectAuditor> auditorList = integerList.size() > 0?projectAuditorMapper.selectList(new QueryWrapper<ProjectAuditor>().in("project_id", integerList)): new ArrayList<>();
 //
-//            ;
 //
 ////            List<UserRecentTask> taskList = integerList.size() > 0?userRecentTaskMapper.selectList(new QueryWrapper<UserRecentTask>().in("project_id", integerList).orderByDesc("id")):new ArrayList<>();
 //            List<Profession> professions = professionMapper.selectList(new QueryWrapper<Profession>().eq("company_id", companyId));
@@ -453,204 +468,28 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 //            List<ReportExtraDegree> degreeList = reportExtraDegreeMapper.selectList(new QueryWrapper<ReportExtraDegree>().eq("company_id", companyId));
 //            List<TaskGroup> taskGroups = integerList.size() > 0?taskGroupMapper.selectList(new QueryWrapper<TaskGroup>().in("project_id", integerList)):new ArrayList<>();
 //            List<Stages> stagesList = integerList.size() > 0?stagesMapper.selectList(new QueryWrapper<Stages>().in("project_id", integerList)) : new ArrayList<>();
-//            //获取当前项目的子项目列表，任务分组，任务列表，项目相关维度列表
-//            reports.forEach(r->{
-//                r.setSubProjectList(subProjectList.stream().filter(s->s.getProjectId().equals(r.getProjectId())).collect(Collectors.toList()));
-//                r.setTaskList(taskMapper.recentSimpleList(r.getProjectId(), userId));
-//                //获取当前项目的工程专业进度
-//                List<ReportProfessionProgress> progressList = reportProfessionProgressService.list(new QueryWrapper<ReportProfessionProgress>().eq("report_id", r.getId()));
-//                //去掉当前项目上已经不存在的专业
-//                List<ProjectProfession> projectProfessions = projectProfessionMapper.selectList(new QueryWrapper<ProjectProfession>().eq("project_id", r.getProjectId()));
-//                progressList = progressList.stream().filter(p->projectProfessions.stream().anyMatch(pp->pp.getProfessionId().equals(p.getProfessionId()))).collect(Collectors.toList());
-//                progressList.stream().forEach(p->{
-//                    p.setProfessionName(professions.stream().filter(m->m.getId().equals(p.getProfessionId())).findFirst().get().getName());
-//                });
-//                r.setProfessionProgressList(progressList);
-//                //获取任务阶段列表
-//                if (company.getPackageProject() == 1 && r.getGroupId() != null && r.getGroupId() != 0) {
-//                    r.setStages(stagesList.stream().filter(s->s.getGroupId() !=null && s.getGroupId().equals(r.getGroupId())).collect(Collectors.toList()));
-//                }
-//                //处理图片
-//                if (!StringUtils.isEmpty(r.getPicStr()) && !r.getPicStr().equals("@")) {
-//                    JSONArray array = JSONArray.parseArray(r.getPicStr().replaceAll("@", ","));
-//                    List<String> list = new ArrayList<>();
-//                    for (int i=0;i<array.size(); i++) {
-//                        String picName = array.getString(i);
-//                        if (!picName.contains(".")) {
-//                            picName += ".jpg";
-//                        }
-//                        list.add("/upload/"+picName);
-//                    }
-//                    r.setPics(list);
-//                }
-//                if (r.getMultiWorktime() == 1) {
-//                    //设置多个工时情况下的报告列表
-//                    String timeStr = r.getContent();
-//                    if (timeStr != null) {
-//                        JSONArray parse = JSONArray.parseArray(timeStr);
-//                        List<WorktimeItem> list = new ArrayList<>();
-//                        for (int i=0;i<parse.size(); i++) {
-//                            JSONObject obj = parse.getJSONObject(i);
-//                            list.add(JSONObject.toJavaObject(obj, WorktimeItem.class));
-//                        }
-//                        r.setWorktimeList(list);
-//                    }
-//                }
 //
-//                //处理维度列表数据
-//                if (timeTypeMapper.selectById(companyId).getCustomDegreeActive() == 1) {
-//                    Project project = allProjectList.stream().filter(p -> p.getId().equals(r.getProjectId())).findFirst().get();
-//                    String associateDegrees = project.getAssociateDegrees();
-//                    List<HashMap> degreeMapList = new ArrayList<>();
-//                    if (associateDegrees != null) {
-//                        String[] split = associateDegrees.split("\\,");
-//                        for (int i=0;i<split.length; i++) {
-//                            HashMap map = new HashMap();
-//                            if (!StringUtils.isEmpty(split[i])) {
-//                                Integer id = Integer.parseInt(split[i]);
-//                                map.put("id", id);
-//                                map.put("name", degreeList.stream().filter(d->d.getId().equals(id)).findFirst().get().getName());
-//                                degreeMapList.add(map);
-//                            }
-//                        }
-//                    }
-//                    r.setDegreeList(degreeMapList);
-//                }
-//                //检查是否是按照任务分组负责人审核
-////                Project curProject = allProjectList.stream().filter(ap->ap.getId().equals(r.getProjectId())).findFirst().get();
-//                int reportAuditType = timeTypeMapper.selectById(companyId).getReportAuditType();
-//                //分组
-//                if (company.getPackageProject() == 1) {
-//                    if (reportAuditType == 0) {
-//                        r.setTaskGroups(taskGroups.stream().filter(tg->tg.getProjectId().equals(r.getProjectId())).collect(Collectors.toList()));
-//                        if (r.getGroupId() != null && r.getGroupId() != 0) {
-//                            Optional<TaskGroup> optinal = taskGroups.stream().filter(tg->tg.getId().equals(r.getGroupId())).findFirst();
-//                            if (optinal.isPresent()) {
-//                                r.setGroupName(optinal.get().getName());
-//                            }
-//                        }
-//                    } else if (reportAuditType == 1 || reportAuditType == 2){
-//                        List<GroupParticipator> groupParticipatorList = groupParticipatorMapper.selectList(new QueryWrapper<GroupParticipator>());
-//                        if (groupParticipatorList.size() > 0) {
-//                            List<Integer> groupIds = groupParticipatorList.stream().map(GroupParticipator::getGroupId).collect(Collectors.toList());
-//                            List<TaskGroup> findGroups = taskGroups.stream().filter(tg->groupIds.contains(tg.getId()) || userId.equals(tg.getInchargerId())).collect(Collectors.toList());
-//                            r.setTaskGroups(findGroups);
-//                            if (r.getGroupId() != null && r.getGroupId() != 0) {
-//                                Optional<TaskGroup> optinal = taskGroups.stream().filter(tg->tg.getId().equals(r.getGroupId())).findFirst();
-//                                if (optinal.isPresent()) {
-//                                    r.setGroupName(optinal.get().getName());
-//                                }
-//                            }
-//                        }
-//                    }
-//                }
-//                //项目的审核人
-//                if (reportAuditType == 0) {
-//                    r.setAuditUserList(auditorList.stream().filter(au->au.getProjectId().equals(r.getProjectId())).collect(Collectors.toList()));
-//                    if (r.getProjectAuditorId() != null) {
-//                        Optional<ProjectAuditor> auItem = auditorList.stream().filter(au->au.getAuditorId().equals(r.getProjectAuditorId())).findFirst();
-//                        if (auItem.isPresent()) {
-//                            r.setProjectAuditorName(auItem.get().getAuditorName());
-//                        }
-//                    }
-//                } else if (reportAuditType == 1 || reportAuditType == 2) {
-//                    if (r.getGroupId() != null && r.getGroupId() != 0) {
-//                        //直接获取分组的负责人作为审核人
-//                        Optional<TaskGroup> tgoup = taskGroups.stream().filter(tg->tg.getId().equals(r.getGroupId())).findFirst();
-//                        if (tgoup.isPresent()) {
-//                            TaskGroup curGroup = tgoup.get();
-//                            if (curGroup.getInchargerId() != null) {
-//                                User user = userMapper.selectById(curGroup.getInchargerId());
-//                                HashMap map = new HashMap();
-//                                map.put("auditorId", user.getId());
-//                                map.put("auditorName", user.getName());
-//                                List list = new ArrayList();
-//                                list.add(map);
-//                                r.setAuditUserList(list);
-//                                if (r.getProjectAuditorId() != null) {
-//                                    r.setProjectAuditorName(user.selectById(r.getProjectAuditorId()).getName());
-//                                }
-//                            }
-//                        }
-//                    }
-//                } else if (reportAuditType == 3) {
-//                    //获取日报对应已经设置好的审核人和抄送人
-//                    ReportAuditorSetting reportAuditorSetting = reportAuditorSettingMapper.selectById(r.getId());
-//                    r.setAuditorSetting(reportAuditorSetting);
-//                    //手机端数据
-//                    if (reportAuditorSetting.getAuditorFirst() != null) {
-//                        User auditorItem = userMapper.selectOne(new QueryWrapper<User>().select("id, name").eq("id", reportAuditorSetting.getAuditorFirst()));
-//                        r.setAuditorFirst(auditorItem);
-//                    }
-//                    if (reportAuditorSetting.getAuditorSec() != null) {
-//                        User auditorItem = userMapper.selectOne(new QueryWrapper<User>().select("id, name").eq("id", reportAuditorSetting.getAuditorSec()));
-//                        r.setAuditorSec(auditorItem);
-//                    }
-//                    if (reportAuditorSetting.getAuditorThird() != null) {
-//                        User auditorItem = userMapper.selectOne(new QueryWrapper<User>().select("id, name").eq("id", reportAuditorSetting.getAuditorThird()));
-//                        r.setAuditorThird(auditorItem);
-//                    }
-//                    if (reportAuditorSetting.getCcUserid() != null) {
-//                        User auditorItem = userMapper.selectOne(new QueryWrapper<User>().select("id, name").eq("id", reportAuditorSetting.getCcUserid()));
-//                        r.setCcUserid(auditorItem);
-//                    }
-//                }
-//
-//            });
 //            resultMap.put("report", reports);
-//            TimeType timeType = timeTypeMapper.selectById(companyId);
-//            if (timeType.getShowDdCardtime() == 1) {
-//                List<UserDingdingTime> dingdingTimes = userDingdingTimeMapper.selectList(new QueryWrapper<UserDingdingTime>()
-//                        .eq("user_id", userId).eq("work_date", date));
-//                if (dingdingTimes.size() > 0) {
-//                    UserDingdingTime time = dingdingTimes.get(0);
-//                    resultMap.put("time", time);
-//                }
-//            }else if(timeType.getSyncFanwei()==1){
-//                List<UserFvTime> userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>()
-//                        .eq("user_id", userId).eq("work_date", date));
-//                if (userFvTimeList.size() > 0) {
-//                    UserFvTime time = userFvTimeList.get(0);
-//                    resultMap.put("time", time);
-//                }
-//            } else if (timeType.getShowCorpwxCardtime() == 1) {
-//                User user = userMapper.selectById(userId);
-//                List<UserCorpwxTime> corpwxTimes = userCorpwxTimeMapper.selectList(new QueryWrapper<UserCorpwxTime>()
-//                        .eq("corpwx_userid", user.getCorpwxUserid()).eq("create_date", date));
-//                if (corpwxTimes.size() > 0) {
-//                    UserCorpwxTime time = corpwxTimes.get(0);
-//                    resultMap.put("time", time);
-//                }
-//            }
-//
-//            //顺便返回公司的工作时间设置
-//            resultMap.put("timeType",timeType);
-//            //返回公司的项目工时预警的成本项列表
-//            List<ProjectBasecostSetting> timeBasecostList = new ArrayList<>();
-//            if (company.getPackageProject() == 1) {
-//                timeBasecostList = projectBasecostSettingMapper.selectList(new QueryWrapper<ProjectBasecostSetting>().eq("company_id", companyId).eq("alarm_type", 1));
-//            }
-//            //当天是否是工作日
-//            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-//            LocalDate lDate = LocalDate.parse(date, dtf);
-//            boolean isWorkDay = companyId == 817 ? WorkDayCalculateUtils.isWorkDayExceptSaturday(lDate) : WorkDayCalculateUtils.isWorkDay(lDate);
-//            resultMap.put("isWorkDay", isWorkDay);
-//
-//            resultMap.put("timeBasecostList",timeBasecostList);
-//
-//            httpRespMsg.data = resultMap;
-//        } catch (NullPointerException e) {
-//            e.printStackTrace();
-//            //httpRespMsg.setError("验证失败");
-//            httpRespMsg.setError(MessageUtils.message("Company.validationError"));
-//            return httpRespMsg;
-//        } catch (DateTimeParseException e) {
-//            //httpRespMsg.setError("日期格式有误");
-//            httpRespMsg.setError(MessageUtils.message("date.formatError"));
-//            return httpRespMsg;
-//        }
-//        return httpRespMsg;
-//    }
+
+            //当天是否是工作日
+            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDate lDate = LocalDate.parse(date, dtf);
+            boolean isWorkDay = WorkDayCalculateUtils.isWorkDay(lDate);
+            resultMap.put("isWorkDay", isWorkDay);
+
+            httpRespMsg.data = resultMap;
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            //httpRespMsg.setError("验证失败");
+            httpRespMsg.setError(MessageUtils.message("Company.validationError"));
+            return httpRespMsg;
+        } catch (DateTimeParseException e) {
+            //httpRespMsg.setError("日期格式有误");
+            httpRespMsg.setError(MessageUtils.message("date.formatError"));
+            return httpRespMsg;
+        }
+        return httpRespMsg;
+    }
 //
 //    @Override
 //    public HttpRespMsg getCardTime(String date, HttpServletRequest request) {

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ProdProcedureTeamMapper.xml

@@ -25,9 +25,9 @@
     </sql>
 
     <select id="getReportForWorkList" resultType="java.util.HashMap" >
-        SELECT a.*, plan_procedure_total.plan_id, plan_procedure_total.prod_procedure_id, date_format(plan.`start_date`,'%Y-%m-%d') as start_date, date_format(plan.`end_date`,'%Y-%m-%d') as end_date, plan.`plan_type`,
+        SELECT a.*, plan_procedure_total.plan_id, plan_procedure_total.prod_procedure_id,plan_procedure_total.total_working_hours,plan_procedure_total.total_wages, date_format(plan.`start_date`,'%Y-%m-%d') as start_date, date_format(plan.`end_date`,'%Y-%m-%d') as end_date, plan.`plan_type`,
         plan.`product_scheduling_num`,plan.task_type_name,plan.task_name,plan.task_change_notice_num,
-        product.`name` AS product_name,prod_procedure.name AS procedure_name, prod_procedure.check_type, plan.check_type as plan_check_type,plan.vehicle_num_start,plan.vehicle_num_end
+        product.`name` AS product_name,prod_procedure.name AS procedure_name, prod_procedure.check_type, plan.check_type as plan_check_type,plan.vehicle_num_start,plan.vehicle_num_end,plan.num
         FROM prod_procedure_team a
         left join plan_procedure_total on plan_procedure_total.id = a.plan_procedure_id
         LEFT JOIN plan ON plan.id = plan_procedure_total.plan_id

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ReportMapper.xml

@@ -20,8 +20,8 @@
         <result column="checker_id" property="checkerId" />
         <result column="user_procedure_team_id" property="userProcedureTeamId" />
         <result column="steel_num_array" property="steelNumArray" />
-        <result column="steel_num_array" property="steelNumArray" />
         <result column="finish_num" property="finishNum" />
+        <result column="status" property="status" />
     </resultMap>
     <resultMap id="FullMap" type="com.management.platform.entity.vo.ReportVO" extends="BaseResultMap">
         <result column="creatorName" property="creatorName" />
@@ -31,7 +31,7 @@
     </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, creator_id, create_date, working_time, create_time, cost, dept_id, company_id, plan_id, progress, product_id, prod_procedure_id, check_type, checker_id, user_procedure_team_id, steel_num_array, finish_num
+        id, creator_id, create_date, working_time, create_time, cost, dept_id, company_id, plan_id, progress, product_id, prod_procedure_id, check_type, checker_id, user_procedure_team_id, steel_num_array, finish_num, status
     </sql>
     <select id="getReportFillStatus" resultType="java.util.Map">
         SELECT DATE_FORMAT(create_date,'%Y-%m-%d') as createDate FROM report
@@ -263,7 +263,7 @@
                 and r.create_date between #{startDate} and #{endDate}
             </if>
             <if test="steelNum!=null and steelNum!=''">
-            JSON_CONTAINS(r.steel_num_array,CONCAT('"',#{steelNum},'"'))
+                JSON_CONTAINS(r.steel_num_array,CONCAT('"',#{steelNum},'"'))
             </if>
         </where>
         order by r.create_date desc

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/fillReport.vue

@@ -23,7 +23,7 @@
               <div v-else>无</div>
             </template>
           </van-cell>
-          <van-cell title="今日完成件数">
+          <van-cell title="当日完成件数">
             <template>
               <van-stepper v-model="reportForm.finishNum" step="0.1" :min="0" :max="1000" />
             </template>