Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

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

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

@@ -1795,10 +1795,11 @@ public class ReportController {
                                       String startDate,
                                       String endDate,
                                       String userId,
+                                      String auditUserId,
                                       HttpServletRequest request) {
         return reportService.getListByState(state, departmentId,
                 projectId,
-                date, startDate, endDate, userId,
+                date, startDate, endDate, userId,auditUserId,
                 request);
     }
 

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

@@ -931,7 +931,7 @@ public class TaskController {
      * @return
      */
     @RequestMapping("/listByPage")
-    public HttpRespMsg listByPage(Integer status, Integer viewId, @RequestParam(required = false, defaultValue = "1") Integer pageIndex, Integer pageSize,Integer type,Integer dateType,String startDate,String endDate,Integer deptId) {
+    public HttpRespMsg listByPage(Integer status, Integer viewId, @RequestParam(required = false, defaultValue = "1") Integer pageIndex, Integer pageSize,Integer type,Integer dateType,String startDate,String endDate,Integer deptId,Integer projectId,Integer groupId,String targetUserId) {
         HttpRespMsg msg = new HttpRespMsg();
         String userId = request.getHeader("Token");
         User user = userMapper.selectById(userId);
@@ -960,6 +960,15 @@ public class TaskController {
                     break;
             }
         }
+        if(projectId!=null){
+            queryWrapper.ge("task.project_id",projectId);
+        }
+        if(groupId!=null){
+            queryWrapper.ge("task.group_id",groupId);
+        }
+        if(targetUserId!=null){
+            queryWrapper.ge("task.creater_id",targetUserId);
+        }
 //        else if (viewId == 3) {
 //            //今天的任务
 //            queryWrapper.eq("end_date", LocalDate.now());

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

@@ -3,6 +3,7 @@ package com.management.platform.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.constant.Constant;
 import com.management.platform.entity.*;
@@ -87,6 +88,8 @@ public class UserController {
     private String dcFirst;
     @Value("${spring.ldap.base.dcSecond}")
     private String dcSecond;
+    @Resource
+    private UserWithBeisenMapper userWithBeisenMapper;
 
     /**
      * 登录网页端
@@ -460,5 +463,25 @@ public class UserController {
         return excludeService.insertUserExclude(userId);
     }
 
+    @RequestMapping("/updateUserJobNumber")
+    public HttpRespMsg updateUserJobNumber(String userId,String jobNumber) {
+        HttpRespMsg msg=new HttpRespMsg();
+        User user = userService.getById(userId);
+        if(user!=null){
+            UserWithBeisen userWithBeisen = userWithBeisenMapper.selectOne(new LambdaQueryWrapper<UserWithBeisen>().eq(UserWithBeisen::getJobNumber, jobNumber));
+            if(userWithBeisen==null){
+                msg.setError("工号["+jobNumber+"]在HR系统中不存在,请重新输入");
+                return msg;
+            }
+            user.setJobNumber(jobNumber);
+            if(!userService.updateById(user)){
+                msg.setError("验证失败");
+                return msg;
+            }
+        }
+        msg.setError("人员不存在");
+        return msg;
+    }
+
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ReportMapper.java

@@ -72,7 +72,8 @@ public interface ReportMapper extends BaseMapper<Report> {
                                                  @Param("isEngeering") Integer isEngeering,
                                                  @Param("startDate") String startDate,
                                                  @Param("endDate") String endDate,
-                                                 @Param("targetUserId") List<String> targetUserId
+                                                 @Param("targetUserId") List<String> targetUserId,
+                                                 @Param("auditUserId")String auditUserId
                                                  );
 
     //获取本人负责的专业的相关的日报

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

@@ -42,7 +42,7 @@ public interface ReportService extends IService<Report> {
                                String date,
                                String startDate,
                                String endDate,
-                               String userId,
+                               String userId,String auditUserId,
                                HttpServletRequest request);
 
     HttpRespMsg approveReport(String reportIds, Integer isDepartment, HttpServletRequest request,String evaluate);

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

@@ -1604,7 +1604,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                       String date,
                                       String startDate,
                                       String endDate,
-                                      String userId,HttpServletRequest request) {
+                                      String userId,String auditUserId,HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             User curUser = userMapper.selectById(request.getHeader("Token"));
@@ -1620,7 +1620,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             if (!StringUtils.isEmpty(userId)) {
                 targetUids = ListUtil.convertLongIdsArrayToList(userId);
             }
-            List<Map<String, Object>> auditReportList = reportMapper.getAuditReportList(date, companyId, departmentId, projectId, leaderId, isEngeering, startDate, endDate, targetUids);
+            List<Map<String, Object>> auditReportList = reportMapper.getAuditReportList(date, companyId, departmentId, projectId, leaderId, isEngeering, startDate, endDate, targetUids,auditUserId);
             //针对依斯贝增加服务名称显示
             if (companyId == 3092) {
                 List<SapProjectService> serviceList = sapProjectServiceMapper.selectList(new QueryWrapper<SapProjectService>().eq("company_id", companyId));
@@ -7151,7 +7151,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         List<Project> projectList = new ArrayList<>();
         if (collect.size() > 0) {
             projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect));
-            auditorList = userMapper.selectList(new QueryWrapper<User>().in("id", reportList.stream().map(Report::getProjectAuditorId).collect(Collectors.toList())));
+			auditorList = userMapper.selectList(new QueryWrapper<User>().in("id", reportList.stream().map(Report::getProjectAuditorId).collect(Collectors.toList())));
         } else {
             //没有项目，默认加载最近填报过的项目
             List<Report> oldReport = reportMapper.selectList(new QueryWrapper<Report>().select("distinct project_id").eq("creator_id", userId).orderByDesc("id").last("limit 5"));

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/SyncSapUtils.java

@@ -82,6 +82,7 @@ public class SyncSapUtils {
             sb.append("      </glob:ZManageProjectTaskWorkCreateRequest_sync>\n" +
                     "   </soapenv:Body>\n" +
                     "</soapenv:Envelope>");
+            System.out.println(sb.toString());
             String result = "";
             try {
                 if(isDev){
@@ -173,6 +174,7 @@ public class SyncSapUtils {
                 "   </soapenv:Body>\n" +
                 "</soapenv:Envelope>");
         String result = "";
+        System.out.println(sb.toString());
         XmlResponseData xmlResponseData = new XmlResponseData();
         try {
             if(isDev){
@@ -185,6 +187,7 @@ public class SyncSapUtils {
                 result = result.substring(result.indexOf(">")+1, result.lastIndexOf("</n0:EmployeeTimeAsBundleMaintainConfirmation_sync>"));
                 result="<XMLDATA>"+result+"</XMLDATA>";
             }
+            System.out.println(result);
             return result;
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -551,6 +551,10 @@
             AND ((a.is_dept_audit = 0 and a.project_auditor_id = #{auditorId} and a.project_audit_state = 0)
             or (a.is_dept_audit = 1 and a.audit_dept_managerid = #{auditorId}))
         </if>
+        <if test="auditUserId != null">
+            AND ((a.is_dept_audit = 0 and a.project_auditor_id = #{auditUserId} and a.project_audit_state = 0)
+            or (a.is_dept_audit = 1 and a.audit_dept_managerid = #{auditUserId}))
+        </if>
         <if test="isEngeering == 1">
             AND a.department_audit_state = 1
         </if>