赛元导入新需求

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

@@ -2192,6 +2192,12 @@ public class ReportController {
         return reportService.denyHisReport(hisId, reason, request);
     }
 
+    @RequestMapping("/batchDenyHisReport")
+    public HttpRespMsg batchDenyHisReport(@RequestParam Integer reportAuditLogId,
+                                     String reason, HttpServletRequest request) {
+        return reportService.batchDenyHisReport(reportAuditLogId, reason, request);
+    }
+
     @RequestMapping("/getMembList")
     public HttpRespMsg getMembList(@RequestParam(required=false) String date, HttpServletRequest request) {
         if (date == null) {

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

@@ -165,4 +165,6 @@ public interface ReportService extends IService<Report> {
     HttpRespMsg getReportListWithTransfer(String startDate, String endDate, String userIds, Integer projectId, Integer pageIndex, Integer pageSize);
 
     HttpRespMsg transferReport(String reportIds, Integer projectId, Integer groupId, Integer stageId);
+
+    HttpRespMsg batchDenyHisReport(Integer reportAuditLogId, String reason, HttpServletRequest request);
 }

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

@@ -5122,12 +5122,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                 report.setWorkingTime(time);
                                 report.setMultiWorktime(timeType.getMultiWorktime());
                                 report.setFillUserid(user.getId());
-                                if (timeType.getNeedDeptAudit() == 0) {
-                                    report.setState(1);//导入的直接算审核通过
+                                //赛元微电子，导入的按照项目审核的模式进行
+                                if (company.getId() == 469) {
+                                    report.setState(0);//待审核员审核
                                 } else {
-                                    report.setState(-1);//待部门上级审核员审核
-                                    report.setDepartmentAuditState(1);//部门已审核，到上层领导审核
+                                    if (timeType.getNeedDeptAudit() == 0) {
+                                        report.setState(1);//导入的直接算审核通过
+                                    } else {
+                                        //赛元微电子，导入的按照项目审核的模式进行
+                                        report.setState(-1);
+                                        report.setDepartmentAuditState(1);//部门已审核，到上层领导审核
+                                    }
                                 }
+
                                 report.setCreateDate(LocalDate.parse(reportDate, dtf));
                                 report.setCost(reportCreator.getCost()==null?new BigDecimal(0) : reportCreator.getCost().multiply(new BigDecimal(time)));
                                 reportList.add(report);
@@ -7020,7 +7027,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 //发送个人微信通知
                 pushReject(str, reporter, user.getName(), reason);
             }
-
         } catch (NullPointerException e) {
             //httpRespMsg.setError("验证失败");
             httpRespMsg.setError(MessageUtils.message("access.verificationError"));
@@ -9861,4 +9867,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg batchDenyHisReport(Integer reportAuditLogId, String reason, HttpServletRequest request) {
+        List<ReportAlogMembdate> list = reportAlogMembdateMapper.selectList(new QueryWrapper<ReportAlogMembdate>().eq("rlog_id", reportAuditLogId));
+        for (ReportAlogMembdate logMembItem : list) {
+            HttpRespMsg msg = denyHisReport(logMembItem.getId(), reason, request);
+            if (msg.code.equals("error")) {
+                //异常需要跳出
+                return msg;
+            }
+        }
+        return new HttpRespMsg();
+    }
 }