Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -2,6 +2,7 @@ package com.management.platform.controller;
 
 
 import com.management.platform.entity.BusinessTrip;
+import com.management.platform.entity.LeaveSheet;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.BusinessTripService;
 import com.management.platform.util.HttpRespMsg;
@@ -45,6 +46,14 @@ public class BusinessTripController {
 
     }
 
+
+    @RequestMapping("/cancel")
+    public HttpRespMsg cancel(Integer id) {
+        String userId = request.getHeader("Token");
+        return businessTripService.cancel(id, userId);
+    }
+
+
     @RequestMapping("/delete")
     public HttpRespMsg delete(Integer id) {
         return businessTripService.delete(id);
@@ -55,16 +64,18 @@ public class BusinessTripController {
         return businessTripService.queryList(sheet, pageIndex, pageSize,checkState);
     }
 
+    @RequestMapping("/auditList")
+    public HttpRespMsg auditList(BusinessTrip sheet, @RequestParam Integer pageIndex, @RequestParam Integer pageSize, @RequestParam(defaultValue = "0") Integer checkState) {
+        return businessTripService.auditList(sheet, pageIndex, pageSize, checkState);
+    }
+
     @RequestMapping("/approve")
     public HttpRespMsg approve(Integer id) {
-
         return businessTripService.approve(id);
-
     }
     @RequestMapping("/deny")
-    public HttpRespMsg deny(Integer id, String denyReason) {
-
-        return businessTripService.deny(id, denyReason);
+    public HttpRespMsg deny(Integer id, String reason) {
+        return businessTripService.deny(id, reason);
 
     }
 

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

@@ -0,0 +1,39 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.BustripAuditLog;
+import com.management.platform.entity.LeaveAuditLog;
+import com.management.platform.mapper.BustripAuditLogMapper;
+import com.management.platform.mapper.LeaveAuditLogMapper;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-12-12
+ */
+@RestController
+@RequestMapping("/bustrip-audit-log")
+public class BustripAuditLogController {
+    @Resource
+    BustripAuditLogMapper bustripAuditLogMapper;
+
+    @RequestMapping("/getBySheetId")
+    public HttpRespMsg getBySheetId(int sheetId) {
+        List<BustripAuditLog> list = bustripAuditLogMapper.selectList(new QueryWrapper<BustripAuditLog>().eq("sheet_id", sheetId));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = list;
+        return msg;
+    }
+}
+

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

@@ -197,7 +197,7 @@ public class StagesController {
         } else {
             queryWrapper.orderByAsc(order);
         }
-        List<Task> tasks = taskService.simpleList(queryWrapper);
+        List<Task> tasks = taskService.simpleList(queryWrapper,null,null);
         //没有权限只能看到自己创建的，负责的和待分配的任务
         List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部任务");
         if (functionList.size() == 0 && !userId.equals(project.getInchargerId())) {
@@ -206,7 +206,7 @@ public class StagesController {
         List<Task> subTasks = new ArrayList<>();
         if (tasks.size() > 0) {
             List<Integer> collect = tasks.stream().map(Task::getId).collect(Collectors.toList());
-            List<Task> subLists = taskService.simpleList(new QueryWrapper<Task>().in("parent_tid", collect));
+            List<Task> subLists = taskService.simpleList(new QueryWrapper<Task>().in("parent_tid", collect),null,null);
             if (functionList.size() == 0 && !userId.equals(project.getInchargerId())) {
                 subLists = subLists.stream().filter(t->t.getExecutorId() == null || t.getExecutorId().contains(userId) || userId.equals(t.getCreaterId())).collect(Collectors.toList());
             }

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

@@ -3,7 +3,10 @@ package com.management.platform.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.IPage;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
@@ -289,7 +292,7 @@ public class TaskController {
 
     private void updateProjectProgress(Integer projectId) {
         //只有里程碑才更新项目进度, 非已撤销状态的
-        List<Task> all = taskMapper.simpleList(new QueryWrapper<Task>().eq("project_id", projectId).ne("task_status", 2).eq("task_type",1));
+        List<Task> all = taskMapper.simpleList(new QueryWrapper<Task>().eq("project_id", projectId).ne("task_status", 2).eq("task_type",1),null,null);
         Project project = new Project();
         project.setId(projectId);
         if (all.size() > 0) {
@@ -441,8 +444,10 @@ public class TaskController {
 
 
     @RequestMapping("/list")
-    public HttpRespMsg list(Task task, Integer viewId, String order, boolean isDesc) {
+    public HttpRespMsg list(Task task, Integer viewId, String order, boolean isDesc,Integer pageIndex,Integer pageSize) {
         HttpRespMsg msg = new HttpRespMsg();
+        Integer size=pageSize;
+        Integer start=(pageIndex-1)*pageSize;
         String userId = request.getHeader("Token");
         User user = userMapper.selectById(userId);
         Project project = projectService.getById(task.getProjectId());
@@ -480,8 +485,8 @@ public class TaskController {
             //已超期的任务,未完成的任务
             queryWrapper.lt("end_date", LocalDate.now()).eq("task_status", 0);
         }
-        List<Task> list = taskService.simpleList(queryWrapper);
-
+        List<Task> list = taskService.simpleList(queryWrapper,start,size);
+        int total = taskMapper.selectCount(queryWrapper);
         //没有权限只能看到自己创建的，负责的和待分配的任务
         List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部任务");
         if (functionList.size() == 0 && !userId.equals(project.getInchargerId())) {
@@ -495,7 +500,10 @@ public class TaskController {
             }
 
         });
-        msg.data = list;
+        Map map=new HashMap();
+        map.put("records",list);
+        map.put("total",total);
+        msg.data = map;
         return msg;
     }
 

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

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2022-07-15
+ * @since 2022-12-12
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -127,12 +127,6 @@ public class BusinessTrip extends Model<BusinessTrip> {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime indate;
 
-    @TableField(exist = false)
-    private String departmentName;
-
-    @TableField(exist = false)
-    List<BustripProject> projectList;
-
     /**
      * 是否已经关联
      */
@@ -151,6 +145,35 @@ public class BusinessTrip extends Model<BusinessTrip> {
     @TableField("gmt_finished")
     private String gmtFinished;
 
+    /**
+     * 审核人id
+     */
+    @TableField("auditor_id")
+    private String auditorId;
+
+    /**
+     * 审核人姓名
+     */
+    @TableField("auditor_name")
+    private String auditorName;
+
+    /**
+     * 1-部门审核,2-指定人员审核
+     */
+    @TableField("auditor_type")
+    private Integer auditorType;
+
+    /**
+     * 当前审核节点id
+     */
+    @TableField("cur_audit_setting_id")
+    private Integer curAuditSettingId;
+
+    @TableField(exist = false)
+    private String departmentName;
+
+    @TableField(exist = false)
+    List<BustripProject> projectList;
 
     @Override
     protected Serializable pkVal() {

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

@@ -0,0 +1,67 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-12-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BustripAuditLog extends Model<BustripAuditLog> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 表单id
+     */
+    @TableField("sheet_id")
+    private Integer sheetId;
+
+    /**
+     * 审批节点id
+     */
+    @TableField("audit_node_id")
+    private Integer auditNodeId;
+
+    @TableField("auditor_id")
+    private String auditorId;
+
+    @TableField("auditor_name")
+    private String auditorName;
+
+    /**
+     * 是否审核通过，1-通过，0-驳回
+     */
+    @TableField("is_pass")
+    private Integer isPass;
+
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    @TableField("deny_reason")
+    private String denyReason;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.BustripAuditLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-12-12
+ */
+public interface BustripAuditLogMapper extends BaseMapper<BustripAuditLog> {
+
+}

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

@@ -1,6 +1,7 @@
 package com.management.platform.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.management.platform.entity.Task;
@@ -24,7 +25,7 @@ public interface TaskMapper extends BaseMapper<Task> {
     List getStagesPanel(Integer projectId);
     List getTopCostTask(Integer projectId);
 
-    List<Task> simpleList(@Param(Constants.WRAPPER) Wrapper wrapper);
+    List<Task> simpleList(@Param(Constants.WRAPPER) Wrapper wrapper,Integer start,Integer size);
 
     List<Task> nameList(@Param(Constants.WRAPPER) Wrapper wrapper);
 

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

@@ -29,4 +29,8 @@ public interface BusinessTripService extends IService<BusinessTrip> {
     HttpRespMsg modifyProject(BusinessTrip sheet);
 
     HttpRespMsg exportData(BusinessTrip sheet,Integer keyword, String startDate, String endDate, String userId);
+
+    HttpRespMsg auditList(BusinessTrip sheet, Integer pageIndex, Integer pageSize, Integer checkState);
+
+    HttpRespMsg cancel(Integer id, String userId);
 }

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.BustripAuditLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-12-12
+ */
+public interface BustripAuditLogService extends IService<BustripAuditLog> {
+
+}

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

@@ -1,6 +1,7 @@
 package com.management.platform.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.management.platform.entity.Task;
 import com.management.platform.entity.TaskGroup;
@@ -27,7 +28,7 @@ public interface TaskService extends IService<Task> {
     HttpRespMsg getTopCostTask(Integer projectId);
 
     //获取不带任务描述的列表数据
-    List<Task> simpleList(Wrapper<Task> queryWrapper);
+    List<Task> simpleList(Wrapper<Task> queryWrapper,Integer start,Integer size);
     List<Task> nameList(Wrapper<Task> queryWrapper);
 
 

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

@@ -22,7 +22,7 @@ import java.util.List;
  */
 public interface WxCorpInfoService extends IService<WxCorpInfo> {
 
-    public void sendWXCorpMsg(WxCorpInfo corpInfo, String corpUserid, String msg);
+    public void sendWXCorpMsg(WxCorpInfo corpInfo, String corpUserid, String msg, String pageRouter, Integer msgType);
 
     public void sendWXCorpTemplateCardMsg(WxCorpInfo corpInfo, String corpUserid, JSONObject msg);
 

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

@@ -35,8 +35,6 @@ public class AuditWorkflowSettingServiceImpl extends ServiceImpl<AuditWorkflowSe
     UserMapper userMapper;
     @Resource
     DepartmentMapper departmentMapper;
-    @Resource
-    ReportMapper reportMapper;
 
     @Override
     public List<AuditWorkflowSetting> get(Integer deptId, Integer type) {
@@ -55,7 +53,8 @@ public class AuditWorkflowSettingServiceImpl extends ServiceImpl<AuditWorkflowSe
                 setting.setAuditDeptId(dept.getDepartmentId());
                 setting.setAuditDeptName(dept.getDepartmentName());
                 setting.setIsFinal(1);
-                setting.setAuditorType(type);
+                setting.setAuditorType(1);//按部门
+                setting.setType(type);
                 auditWorkflowSettingMapper.insert(setting);
                 auditWorkflowTimeSettings.add(setting);
             }

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

@@ -1,14 +1,19 @@
 package com.management.platform.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.management.platform.controller.AuditWorkflowSettingController;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
+import com.management.platform.service.AuditWorkflowSettingService;
 import com.management.platform.service.BusinessTripService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.service.DepartmentService;
+import com.management.platform.service.WxCorpInfoService;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
@@ -42,6 +47,10 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
     @Resource
     private BustripProjectMapper bustripProjectMapper;
     @Resource
+    AuditWorkflowSettingMapper auditWorkflowSettingMapper;
+    @Resource
+    BustripAuditLogMapper bustripAuditLogMapper;
+    @Resource
     private TimeTypeMapper timeTypeMapper;
     @Resource
     private HttpServletRequest request;
@@ -57,6 +66,14 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
     LocaleInformationMapper localeInformationMapper;
     @Resource
     CompanyMapper companyMapper;
+    @Resource
+    AuditWorkflowSettingService auditWorkflowSettingService;
+    @Resource
+    WxCorpInfoMapper wxCorpInfoMapper;
+    @Resource
+    WxCorpInfoService wxCorpInfoService;
+    @Resource
+    InformationMapper informationMapper;
 
     @Override
     public HttpRespMsg modifyProject(BusinessTrip sheet) {
@@ -153,6 +170,73 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
         return httpRespMsg;
     }
 
+    @Override
+    public HttpRespMsg auditList(BusinessTrip sheet, Integer pageIndex, Integer pageSize, Integer checkState) {
+        QueryWrapper<BusinessTrip> queryWrapper = new QueryWrapper<BusinessTrip>();
+        String token = request.getHeader("TOKEN");
+        User user = userMapper.selectById(token);
+
+        sheet.setCompanyId(user.getCompanyId());
+
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        queryWrapper.eq("company_id", sheet.getCompanyId()).orderByDesc("id");
+        queryWrapper.eq("status", 1);
+        queryWrapper.eq("auditor_id", user.getId());
+
+        if (!StringUtils.isEmpty(sheet.getOwnerId())) {
+            queryWrapper.eq("owner_id", sheet.getOwnerId());
+        }
+        if (sheet.getStartDate() != null && sheet.getEndDate() != null) {
+            queryWrapper.le("start_date", sheet.getEndDate()).ge("end_date", sheet.getStartDate());
+        }
+        if (!StringUtils.isEmpty(sheet.getWay())) {
+            queryWrapper.eq("way", sheet.getWay());
+        }
+        if (checkState==1){
+            queryWrapper.ge("day_count",10);
+        }
+        IPage<BusinessTrip> listIPager = businessTripMapper.selectPage(new Page<>(pageIndex, pageSize),
+                queryWrapper);
+        List<BusinessTrip> records = listIPager.getRecords();
+//        List<String> userIds = records.stream().map(BusinessTrip::getOwnerId).collect(Collectors.toList());
+//        if (userIds.size() > 0) {
+//            List<User> userList = userMapper.getUserWithDept(new QueryWrapper<User>().in("id", userIds));
+//            records.stream().forEach(r->{
+//                Optional<User> find = userList.stream().filter(u->u.getId().equals(r.getOwnerId())).findFirst();
+//                if (find.isPresent()) {
+//                    r.setDept(find.get().getDepartmentName());
+//                }
+//            });
+//        }
+
+        Long total = listIPager.getTotal();
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("records", records);
+        map.put("total", total);
+        httpRespMsg.data = map;
+        return httpRespMsg;
+    }
+
+    @Override
+    public HttpRespMsg cancel(Integer id, String userId) {
+        HttpRespMsg msg = new HttpRespMsg();
+        BusinessTrip oldSheet = businessTripMapper.selectById(id);
+        if (oldSheet.getStatus() == 0) {
+            msg.setError("当前出差申请已通过，无法撤销");
+        } else if (oldSheet.getStatus() == 2) {
+            msg.setError("当前出差申请已驳回，无法撤销");
+        } else {
+            BusinessTrip sheet = new BusinessTrip();
+            sheet.setId(id);
+            sheet.setStatus(3);//撤销状态
+            businessTripMapper.updateById(sheet);
+            //删除相关的审批记录
+            bustripAuditLogMapper.delete(new QueryWrapper<BustripAuditLog>().eq("sheet_id", id));
+        }
+        return msg;
+    }
+
     @Override
     public HttpRespMsg add(BusinessTrip sheet) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -166,8 +250,36 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
         sheet.setOwnerName(user.getName());
         sheet.setCompanyId(user.getCompanyId());
         sheet.setStatus(1);//填报时是待审核状态
+
+        //获取第一个审批人
+        User owner = userMapper.selectById(sheet.getOwnerId());
+        if (owner.getDepartmentId() == 0) {
+            //没有部门，不能提交出差申请
+            msg.setError("请联系管理员设置您所在部门");
+            return msg;
+        } else {
+            List<AuditWorkflowSetting> auditList = auditWorkflowSettingService.get(owner.getDepartmentId(), AuditWorkflowSettingController.TYPE_LEAVE);
+            if (auditList.size() > 0) {
+                AuditWorkflowSetting workflowNode = auditList.get(0);
+                if (workflowNode.getAuditorType() == 1) {
+                    //部门负责人
+                    Department dept = departmentMapper.selectById(workflowNode.getAuditDeptId());
+                    if (dept.getManagerId() == null) {
+                        msg.setError("请联系管理员设置您所在部门的主要负责人");
+                        return msg;
+                    }
+                    sheet.setAuditorId(dept.getManagerId());
+                    sheet.setAuditorName(userMapper.selectById(dept.getManagerId()).getName());
+                } else if (workflowNode.getAuditorType() == 2) {
+                    //指定一个人审批
+                    sheet.setAuditorId(workflowNode.getUserId());
+                    sheet.setAuditorName(workflowNode.getUserName());
+                }
+                sheet.setCurAuditSettingId(workflowNode.getId());
+            }
+        }
+
         if (isNew) {
-            //检查该时间段是否已经有按天请假
             QueryWrapper<BusinessTrip> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("owner_id", sheet.getOwnerId());
             queryWrapper.le("start_date", sheet.getEndDate()).ge("end_date", sheet.getStartDate());
@@ -176,16 +288,97 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
             if (count > 0) {
                 //msg.setError("该时间段已有出差申请，不能重复提交");
                 msg.setError(MessageUtils.message("leave.businessRepeat"));
+                return msg;
             } else {
                 businessTripMapper.insert(sheet);
             }
         } else {
             businessTripMapper.updateById(sheet);
         }
-
+        sheet = businessTripMapper.selectById(sheet.getId());
+        saveNotifyToAuditor(sheet);
+        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+        if (wxCorpInfo != null) {
+            sendAuditNotifyMsg(wxCorpInfo, user, sheet);
+        }
         return msg;
     }
 
+
+    //发送审核结果消息提醒
+    private void sendAuditResult(WxCorpInfo wxCorpInfo, User auditor, BusinessTrip sheet, String denyReason) {
+        //推送到企业微信
+        StringBuilder stringBuilder = new StringBuilder();
+        String applyTimeDesc = "";
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("M月d日");
+        if (sheet.getStartDate().isEqual(sheet.getEndDate())) {
+            applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate());
+        } else {
+            applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) +"至" + dateTimeFormatter.format(sheet.getEndDate());
+        }
+
+        stringBuilder.append("$userName="+auditor.getCorpwxUserid()+"$")
+                .append(sheet.getStatus() == 0?"通过":"驳回")
+                .append("了您")
+                .append(applyTimeDesc)
+                .append("的出差申请。");
+        if (sheet.getStatus() == 2) {
+            //驳回加原因
+            stringBuilder.append("原因: ").append(denyReason);
+        }
+
+        String ownerId = sheet.getOwnerId();
+        User owner = userMapper.selectById(ownerId);
+        wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,owner.getCorpwxUserid(), stringBuilder.toString(), "awayOffice",
+                sheet.getStatus() == 0?WxCorpInfoServiceImpl.TEXT_CARD_MSG_BUSTRIP_AGREE:WxCorpInfoServiceImpl.TEXT_CARD_MSG_BUSTRIP_DENY);
+
+    }
+
+    private void saveNotifyToApplier(BusinessTrip sheet) {
+        String applyTimeDesc = "";
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("M月d日");
+        if (sheet.getStartDate().isEqual(sheet.getEndDate())) {
+            applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate());
+        } else {
+            applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) +"至" + dateTimeFormatter.format(sheet.getEndDate()) ;
+        }
+        String ownerId = sheet.getOwnerId();
+        User owner = userMapper.selectById(ownerId);
+        User auditor = userMapper.selectById(sheet.getAuditorId());
+        //系统内消息
+        Information information=new Information();
+        information.setUserId(owner.getId());
+        information.setTime(LocalDateTime.now());
+        information.setMsg("您"+applyTimeDesc + "出差申请审核"+(sheet.getStatus() == 0?"已通过":"已驳回")+", 审核人:"
+                +(auditor.getCorpwxUserid() != null ? ("$userName="+auditor.getCorpwxUserid()+"$"):auditor.getName()));
+        information.setType(5);
+        information.setContent(sheet.getId()+"");
+        informationMapper.insert(information);
+    }
+
+    private void saveNotifyToAuditor(BusinessTrip sheet) {
+        //系统内消息
+        Information information=new Information();
+        information.setUserId(sheet.getAuditorId());
+        information.setTime(LocalDateTime.now());
+        User owner = userMapper.selectById(sheet.getOwnerId());
+        information.setMsg("出差待审核, 申请人:" + (owner.getCorpwxUserid() != null?("$userName="+owner.getCorpwxUserid()+"$"):owner.getName()));
+        information.setType(5);
+        information.setContent(sheet.getId()+"");
+        informationMapper.insert(information);
+    }
+
+    //发送待审核提醒
+    private void sendAuditNotifyMsg(WxCorpInfo wxCorpInfo, User applier, BusinessTrip sheet) {
+        //推送到企业微信
+        StringBuilder sb = new StringBuilder();
+        sb.append("出差申请待审核，申请人：").append("$userName="+applier.getCorpwxUserid()+"$");
+
+        String auditorId = sheet.getAuditorId();
+        User auditor = userMapper.selectById(auditorId);
+        wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,auditor.getCorpwxUserid(), sb.toString(), "awayOffice", WxCorpInfoServiceImpl.TEXT_CARD_MSG_BUSTRIP_WAITING_AUDIT);
+    }
+
     @Override
     public HttpRespMsg delete(Integer id) {
         HttpRespMsg msg=new HttpRespMsg();
@@ -298,21 +491,128 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
 
     @Override
     public HttpRespMsg approve(Integer id) {
-        BusinessTrip sheet = new BusinessTrip();
-        sheet.setId(id);
-        sheet.setStatus(0);
-        businessTripMapper.updateById(sheet);
-        return new HttpRespMsg();
+        String token = request.getHeader("TOKEN");
+        //检查操作人权限
+        User user = userMapper.selectById(token);
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        BusinessTrip originSheet = businessTripMapper.selectById(id);
+        if (user.getId().equals(originSheet.getAuditorId())) {
+            //是当前的审核人，获取下个审核节点
+            AuditWorkflowSetting auditWorkflowSetting = auditWorkflowSettingMapper.selectById(originSheet.getCurAuditSettingId());
+            BusinessTrip sheet = new BusinessTrip();
+            sheet.setId(id);
+            if (auditWorkflowSetting == null) {
+                //当前审核节点已不存在，直接审核通过
+                sheet.setStatus(0);
+            } else {
+                Integer seq = auditWorkflowSetting.getSeq();
+                AuditWorkflowSetting nextAuditNode = auditWorkflowSettingMapper.selectOne(new QueryWrapper<AuditWorkflowSetting>().eq("type", 2).eq("seq", (seq + 1)).eq("dept_id", auditWorkflowSetting.getDeptId()));
+                System.out.println("nextAuditNode=="+nextAuditNode);
+                if (nextAuditNode == null) {
+                    sheet.setStatus(0);
+                } else {
+                    //进入下个审核节点
+                    if (nextAuditNode.getAuditorType() == 1) {
+                        //部门负责人审核
+                        Department department = departmentMapper.selectById(nextAuditNode.getAuditDeptId());
+                        if (department == null) {
+                            //部门已被删除，直接审核通过
+                            sheet.setStatus(0);
+                        } else {
+                            if (department.getManagerId() == null) {
+                                httpRespMsg.setError("尚未设置下个节点的部门负责人，请联系管理员");
+                                return httpRespMsg;
+                            } else {
+                                sheet.setCurAuditSettingId(nextAuditNode.getId());
+                                sheet.setAuditorId(department.getManagerId());
+                                sheet.setAuditorName(userMapper.selectById(department.getManagerId()).getName());
+                                sheet.setAuditorType(nextAuditNode.getAuditorType());
+                            }
+                        }
+                    } else if (nextAuditNode.getAuditorType() == 2){
+                        //指定人员审核
+                        sheet.setCurAuditSettingId(nextAuditNode.getId());
+                        sheet.setAuditorId(nextAuditNode.getUserId());
+                        sheet.setAuditorName(nextAuditNode.getUserName());
+                        sheet.setAuditorType(nextAuditNode.getAuditorType());
+                    }
+                }
+            }
+            businessTripMapper.updateById(sheet);
+            //保存审核记录
+            saveAgreeLog(id, auditWorkflowSetting, user);
+            //最终审核通过，发送通过消息
+            sheet = businessTripMapper.selectById(id);
+            WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+            if (wxCorpInfo != null) {
+                if (sheet.getStatus() == 0) {
+                    //最终通过
+                    sendAuditResult(wxCorpInfo, user, sheet, null);
+                } else {
+                    //通知下个节点的审核人去审核
+                    sendAuditNotifyMsg(wxCorpInfo, user, sheet);
+                }
+            }
+            if (sheet.getStatus() == 0) {
+                //最终通过
+                saveNotifyToApplier(sheet);
+            } else {
+                //通知下个节点的审核人去审核
+                saveNotifyToAuditor(sheet);
+            }
+        }
+        return httpRespMsg;
+    }
+
+
+    private void saveAgreeLog(int sheetId, AuditWorkflowSetting curAuditNode, User operator) {
+        BustripAuditLog log = new BustripAuditLog();
+        log.setSheetId(sheetId);
+        if (curAuditNode != null) {
+            log.setAuditNodeId(curAuditNode.getId());
+        }
+        log.setAuditorId(operator.getId());
+        log.setAuditorName(operator.getName());
+        log.setIsPass(1);
+        bustripAuditLogMapper.insert(log);
+    }
+    private void saveDenyLog(int sheetId, AuditWorkflowSetting curAuditNode, User operator, String reason) {
+        BustripAuditLog log = new BustripAuditLog();
+        log.setSheetId(sheetId);
+        if (curAuditNode != null) {
+            log.setAuditNodeId(curAuditNode.getId());
+        }
+        log.setAuditorId(operator.getId());
+        log.setAuditorName(operator.getName());
+        log.setIsPass(0);
+        log.setDenyReason(reason);
+        bustripAuditLogMapper.insert(log);
     }
 
     @Override
-    public HttpRespMsg deny(Integer id, String denyReason) {
-        BusinessTrip sheet = new BusinessTrip();
-        sheet.setId(id);
-        sheet.setStatus(2);
-        sheet.setDenyReason(denyReason);
-        businessTripMapper.updateById(sheet);
-        return new HttpRespMsg();
+    public HttpRespMsg deny(Integer id, String reason) {
+        String token = request.getHeader("TOKEN");
+        //检查操作人权限
+        User user = userMapper.selectById(token);
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        BusinessTrip originSheet = businessTripMapper.selectById(id);
+        if (user.getId().equals(originSheet.getAuditorId())) {
+            //是当前的审核人，获取当前审核节点
+            AuditWorkflowSetting auditWorkflowSetting = auditWorkflowSettingMapper.selectById(originSheet.getCurAuditSettingId());
+            BusinessTrip sheet = new BusinessTrip();
+            sheet.setId(id);
+            sheet.setStatus(2);
+            businessTripMapper.updateById(sheet);
+            saveDenyLog(id, auditWorkflowSetting, user, reason);
+            sheet = businessTripMapper.selectById(id);
+            WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+            if (wxCorpInfo != null) {
+                sendAuditResult(wxCorpInfo, user, sheet, reason);
+            }
+            saveNotifyToApplier(sheet);
+        }
+
+        return httpRespMsg;
     }
 
     @Override

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.BustripAuditLog;
+import com.management.platform.mapper.BustripAuditLogMapper;
+import com.management.platform.service.BustripAuditLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-12-12
+ */
+@Service
+public class BustripAuditLogServiceImpl extends ServiceImpl<BustripAuditLogMapper, BustripAuditLog> implements BustripAuditLogService {
+
+}

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

@@ -44,7 +44,7 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
         try {
             User user = userMapper.selectById(request.getHeader("token"));
             List<Information> information = informationMapper.selectList(new QueryWrapper<Information>()
-                    .eq("user_id", user.getId()).orderByDesc("time").last("LIMIT 10"));
+                    .eq("user_id", user.getId()).orderByDesc("time").last("LIMIT 20"));
             WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",user.getCompanyId()));
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 List<User> users = userMapper.selectList(new QueryWrapper<User>().eq("company_id",user.getCompanyId()));

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

@@ -104,6 +104,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
             if (count > 0) {
                 //msg.setError("该时间段已有请假申请，不能重复请假");
                 msg.setError(MessageUtils.message("leave.repeatedLeave"));
+                return msg;
             }
         }
 
@@ -188,16 +189,6 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
         String ownerId = sheet.getOwnerId();
         User owner = userMapper.selectById(ownerId);
         wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfo,owner.getCorpwxUserid(), json);
-
-        //系统内消息
-        Information information=new Information();
-        information.setUserId(owner.getId());
-        information.setTime(LocalDateTime.now());
-        information.setMsg("您"+applyTimeDesc + "请假申请审核"+(sheet.getStatus() == 1?"已通过":"已驳回")+", 审核人:"+("$userName="+auditor.getCorpwxUserid()+"$"));
-        information.setType(4);
-        information.setContent(sheet.getId()+"");
-        information.setMsg(applyTimeDesc);
-        informationMapper.insert(information);
     }
 
     private void saveNotifyToApplier(LeaveSheet sheet) {
@@ -216,7 +207,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
         Information information=new Information();
         information.setUserId(owner.getId());
         information.setTime(LocalDateTime.now());
-        information.setMsg("您"+applyTimeDesc + "请假申请审核"+(sheet.getStatus() == 1?"已通过":"已驳回")+", 审核人:"
+        information.setMsg("您"+applyTimeDesc + "请假申请审核"+(sheet.getStatus() == 0?"已通过":"已驳回")+", 审核人:"
                 +(auditor.getCorpwxUserid() != null ? ("$userName="+auditor.getCorpwxUserid()+"$"):auditor.getName()));
         information.setType(4);
         information.setContent(sheet.getId()+"");
@@ -361,7 +352,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
                 sheet.setStatus(0);
             } else {
                 Integer seq = auditWorkflowSetting.getSeq();
-                AuditWorkflowSetting nextAuditNode = auditWorkflowSettingMapper.selectOne(new QueryWrapper<AuditWorkflowSetting>().eq("seq", (seq + 1)).eq("dept_id", auditWorkflowSetting.getDeptId()));
+                AuditWorkflowSetting nextAuditNode = auditWorkflowSettingMapper.selectOne(new QueryWrapper<AuditWorkflowSetting>().eq("type", 1).eq("seq", (seq + 1)).eq("dept_id", auditWorkflowSetting.getDeptId()));
                 if (nextAuditNode == null) {
                     sheet.setStatus(0);
                 } else {
@@ -665,7 +656,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
         if (oldSheet.getStatus() == 0) {
             msg.setError("当前请假申请已通过，无法撤销");
         } else if (oldSheet.getStatus() == 2) {
-            msg.setError("当前请假申已驳回，无法撤销");
+            msg.setError("当前请假申请已驳回，无法撤销");
         } else {
             LeaveSheet sheet = new LeaveSheet();
             sheet.setId(id);

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

@@ -49,25 +49,36 @@ public class ProjectMainServiceImpl extends ServiceImpl<ProjectMainMapper, Proje
         ProjectCategory projectCategory = projectCategoryMapper.selectById(projectMain.getCategoryId());
         projectMain.setCategoryName(projectCategory.getName());
         if(projectMain.getId()!=null){
+            ProjectMain oldProject = projectMainMapper.selectById(projectMain.getId());
             Integer count = projectMainMapper.selectCount(new QueryWrapper<ProjectMain>().eq("company_id", projectMain.getCompanyId())
                     .eq("code", projectMain.getCode()).ne("id", projectMain.getId()));
-            Integer count1 = projectMainMapper.selectCount(new QueryWrapper<ProjectMain>().eq("company_id", projectMain.getCompanyId())
-                    .eq("name", projectMain.getName()).ne("id", projectMain.getId()));
             if(count>0){
                 //httpRespMsg.setError("编号已存在");
                 httpRespMsg.setError(MessageUtils.message("other.NumAlreadyExists"));
                 return httpRespMsg;
             }
+            Integer count1 = projectMainMapper.selectCount(new QueryWrapper<ProjectMain>().eq("company_id", projectMain.getCompanyId())
+                    .eq("name", projectMain.getName()).ne("id", projectMain.getId()));
             if(count1>0){
                 //httpRespMsg.setError("名称已存在");
                 httpRespMsg.setError(MessageUtils.message("name.nameRepeat"));
                 return httpRespMsg;
             }
+            boolean nameChanged = !oldProject.getName().equals(projectMain.getName());
+            boolean categoryChanged = !oldProject.getCategoryId().equals(projectMain.getCategoryId());
             projectMainMapper.updateById(projectMain);
             //修改主项目名称  更新项目表
-            List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().eq("project_main_id", projectMain.getId()));
-            projectList.forEach(pl->pl.setProjectMainName(projectMain.getName()));
-            projectService.updateBatchById(projectList);
+            Project updateP = new Project();
+            if (nameChanged) {
+                updateP.setProjectMainName(projectMain.getName());
+            }
+            if (categoryChanged) {
+                updateP.setCategory(projectMain.getCategoryId());
+                updateP.setCategoryName(projectMain.getCategoryName());
+            }
+            if (nameChanged || categoryChanged) {
+                projectService.update(updateP, new QueryWrapper<Project>().eq("project_main_id", projectMain.getId()));
+            }
         }else {
             Integer count2 = projectMainMapper.selectCount(new QueryWrapper<ProjectMain>().eq("company_id", projectMain.getCompanyId())
                     .eq("code", projectMain.getCode()));

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

@@ -1509,7 +1509,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
     @Override
     public HttpRespMsg taskSum(Integer id, HttpServletRequest request) {
-        List<Task> allTask = taskMapper.simpleList(new QueryWrapper<Task>().eq("project_id", id));
+        List<Task> allTask = taskMapper.simpleList(new QueryWrapper<Task>().eq("project_id", id),null,null);
         long finishCount = allTask.stream().filter(t -> t.getTaskStatus() == 1).count();
         long unfinishCount = allTask.stream().filter(t -> t.getTaskStatus() == 0).count();
         long timeupCount = allTask.stream().filter(t -> t.getTaskStatus() == 0 && t.getEndDate() != null && t.getEndDate().isBefore(LocalDate.now())).count();

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

@@ -97,6 +97,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Resource
     private SysFunctionMapper sysFunctionMapper;
     @Resource
+    private UserFvTimeMapper userFvTimeMapper;
+    @Resource
     private ProjectBasecostSettingMapper projectBasecostSettingMapper;
     @Resource
     private UserDingdingTimeMapper userDingdingTimeMapper;
@@ -658,6 +660,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     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>()
@@ -713,7 +722,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 UserDingdingTime time = dingdingTimes.get(0);
                 msg.data = time;
             }
-        } else if (timeType.getShowCorpwxCardtime() == 1) {
+        }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);
+                msg.data=time;
+            }
+        }  else if (timeType.getShowCorpwxCardtime() == 1) {
             List<UserCorpwxTime> corpwxTimes = userCorpwxTimeMapper.selectList(new QueryWrapper<UserCorpwxTime>()
                     .eq("corpwx_userid", user.getCorpwxUserid()).eq("create_date", date));
             if (corpwxTimes.size() > 0) {
@@ -1255,6 +1271,28 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         }
                     }
                 }
+            } else if(timeType.getSyncFanwei()==1){
+                //泛微的情况
+                QueryWrapper<UserFvTime> userFvTimeQueryWrapper = new QueryWrapper<>();
+                if (nameList.size() > 0) {
+                    for (Map map : nameList) {
+                        String itemUid = (String)map.get("userId");
+                        String dateStr = (String)map.get("dateStr");
+                        userFvTimeQueryWrapper.or(wrapper->wrapper.eq("user_id", itemUid).eq("work_date", dateStr));
+                    }
+                    List<UserFvTime> timeList = userFvTimeMapper.selectList(userFvTimeQueryWrapper);
+                    //过滤匹配当前的数据
+                    for (Map map : nameList) {
+                        String itemUid = (String)map.get("userId");
+                        String dateStr = (String)map.get("dateStr");
+                        Optional<UserFvTime> first = timeList.stream().filter(time -> time.getUserId().equals(itemUid) && dtf.format(time.getWorkDate()).equals(dateStr)).findFirst();
+                        if (first.isPresent()) {
+                            double wh = first.get().getWorkHours();
+                            //赋值打卡时长
+                            map.put("cardHours", wh);
+                        }
+                    }
+                }
             }
             httpRespMsg.data = nameList;
         } catch (NullPointerException e) {
@@ -1824,7 +1862,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         User user = userList.stream().filter(u -> u.getId().equals(uid)).findFirst().get();
                         //优先企业微信推送消息
                         if (wxCorpInfo != null && user.getCorpwxUserid() != null) {
-                            wxCorpInfoService.sendWXCorpMsg(wxCorpInfo, user.getCorpwxUserid(), msg);
+                            wxCorpInfoService.sendWXCorpMsg(wxCorpInfo, user.getCorpwxUserid(), msg, null, WxCorpInfoServiceImpl.TEXT_CARD_MSG_REPORT_AGREE);
                         } else if (user.getWxOpenid() != null){
                             pushPass(p.getProjectName(), user);
                         }
@@ -2039,7 +2077,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         }
         if (corpwxUserid != null) {
             WxCorpInfo info = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", company.getId()));
-            wxCorpInfoService.sendWXCorpMsg(info, corpwxUserid, str);
+            wxCorpInfoService.sendWXCorpMsg(info, corpwxUserid, str, null, WxCorpInfoServiceImpl.TEXT_CARD_MSG_REPORT_DENY);
         } else if (reporter.getWxOpenid() != null){
             //发送个人微信通知
             pushReject(str, reporter, user.getName(), reason);
@@ -3254,7 +3292,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         TimeType timeType = timeTypeMapper.selectById(companyId);
         //获取钉钉的请假日期
         List<LeaveSheet> leaveSheets = null;
-        if (timeType.getSyncDingding() == 1) {
+        if (timeType.getSyncDingding() == 1||timeType.getSyncFanwei()==1) {
             List<String> userIds = new ArrayList<>();
             for (UserMonthWork work : userMonthWorks) {
                 userIds.add(work.userId);
@@ -3292,7 +3330,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
             });
             //钉钉请假的数据
-            if (timeType.getSyncDingding() == 1 && leaveSheets != null && leaveSheets.size() > 0) {
+            if ((timeType.getSyncDingding() == 1 || timeType.getSyncFanwei()==1)&& leaveSheets != null && leaveSheets.size() > 0) {
                 List<LeaveSheet> curUserLeaveList = leaveSheets.stream().filter(leave -> leave.getOwnerId().equals(userMonthWork.userId)).collect(Collectors.toList());
                 curUserLeaveList.forEach(leave->{
                     LocalDate startDate1 = leave.getStartDate();
@@ -4763,7 +4801,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             }
             if (corpwxUserid != null) {
                 WxCorpInfo info = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", company.getId()));
-                wxCorpInfoService.sendWXCorpMsg(info, corpwxUserid, str);
+                wxCorpInfoService.sendWXCorpMsg(info, corpwxUserid, str, null, WxCorpInfoServiceImpl.TEXT_CARD_MSG_REPORT_DENY);
             } else if (reporter.getWxOpenid() != null){
                 //发送个人微信通知
                 pushReject(str, reporter, user.getName(), reason);
@@ -4958,7 +4996,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<UserDingdingTime> dingdingTimes = userDingdingTimeMapper.selectList(new QueryWrapper<UserDingdingTime>()
                     .eq("user_id", userId).in("work_date", dateList));
             msg.data = dingdingTimes;
-        } else if (timeType.getShowCorpwxCardtime() == 1) {
+        } else if(timeType.getSyncFanwei()==1){
+            List<UserFvTime> userFvTimes = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>()
+                    .eq("user_id", userId).in("work_date", dateList));
+            msg.data = userFvTimes;
+        }else if (timeType.getShowCorpwxCardtime() == 1) {
             List<UserCorpwxTime> corpwxTimes = userCorpwxTimeMapper.selectList(new QueryWrapper<UserCorpwxTime>()
                     .eq("corpwx_userid", user.getCorpwxUserid()).in("create_date", dateList));
             msg.data = corpwxTimes;

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

@@ -103,10 +103,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
     }
 
     @Override
-    public List<Task> simpleList(Wrapper<Task> queryWrapper) {
-        return taskMapper.simpleList(queryWrapper);
+    public List<Task> simpleList(Wrapper<Task> queryWrapper,Integer start,Integer size) {
+        return taskMapper.simpleList(queryWrapper,start,size);
     }
 
+
     @Override
     public List<Task> nameList(Wrapper<Task> queryWrapper) {
         return taskMapper.nameList(queryWrapper);
@@ -692,5 +693,4 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         httpRespMsg.data=list;
         return httpRespMsg;
     }
-
 }

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

@@ -66,6 +66,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpInfo> implements WxCorpInfoService {
+
     public static String URL_SEND_WXCORP_MSG = "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=ACCESS_TOKEN";
     //获取临时素材url
     public static String URL_GET_MEDIA = "https://qyapi.weixin.qq.com/cgi-bin/media/get?access_token=ACCESS_TOKEN&media_id=MEDIA_ID";
@@ -82,6 +83,11 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
 
     public static final String GET_USER_INFO_WITHDP = "https://qyapi.weixin.qq.com/cgi-bin/user/list?access_token=ACCESS_TOKEN&department_id=DEPARTMENT_ID";
 
+    public static final int TEXT_CARD_MSG_BUSTRIP_WAITING_AUDIT = 0;//出差待审核
+    public static final int TEXT_CARD_MSG_BUSTRIP_AGREE = 1;//出差审核通过
+    public static final int TEXT_CARD_MSG_BUSTRIP_DENY = 2;//出差审核驳回
+    public static final int TEXT_CARD_MSG_REPORT_DENY = 10;//日报驳回
+    public static final int TEXT_CARD_MSG_REPORT_AGREE = 11; //日报审核通过
 
     @Value("${suitId}")
     private String suitId;
@@ -236,7 +242,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
         return resultUrl;
     }
     @Override
-    public void sendWXCorpMsg(WxCorpInfo corpInfo, String corpUserid, String msg) {
+    public void sendWXCorpMsg(WxCorpInfo corpInfo, String corpUserid, String msg, String pageRouter, Integer msgType) {
         try {
             if (isDev) return;
             log.info("发送企业微信消息===" + corpUserid);
@@ -247,12 +253,26 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
             headers.setContentType(MediaType.APPLICATION_JSON);
             JSONObject reqParam = new JSONObject();
             reqParam.put("touser", corpUserid);
-            reqParam.put("msgtype", "text");
+            reqParam.put("msgtype", "textcard");
             reqParam.put("enable_id_trans", 1);
             reqParam.put("agentid", corpInfo.getAgentid());
-            JSONObject contentJson = new JSONObject();
-            contentJson.put("content", msg);
-            reqParam.put("text", contentJson);
+            JSONObject cardJson = new JSONObject();
+            String title = "";
+            String jumpUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://worktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect";
+
+            if (StringUtils.isEmpty(pageRouter)) {
+                title = "通知";
+                jumpUrl = jumpUrl.replace("STATE", "0");
+            } else {
+                jumpUrl = jumpUrl.replace("STATE", pageRouter);
+                if ("awayOffice".equals(pageRouter)) {
+                    //出差
+                    title = "出差通知";
+                }
+            }
+            cardJson.put("title", title);
+            cardJson.put("description", msg);
+            reqParam.put("textcard", cardJson);
 
             HttpEntity<String> requestEntity = new HttpEntity<String>(reqParam.toJSONString(), headers);
             ResponseEntity<String> responseEntity = this.restTemplate.exchange(url,

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

@@ -23,6 +23,10 @@
         <result column="is_linked" property="isLinked" />
         <result column="procinst_id" property="procinstId" />
         <result column="gmt_finished" property="gmtFinished" />
+        <result column="auditor_id" property="auditorId" />
+        <result column="auditor_name" property="auditorName" />
+        <result column="auditor_type" property="auditorType" />
+        <result column="cur_audit_setting_id" property="curAuditSettingId" />
     </resultMap>
     <resultMap id="BaseResultMap1" type="com.management.platform.entity.BusinessTrip">
         <result column="owner_id" property="ownerId" />
@@ -32,8 +36,9 @@
     </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, owner_id, owner_name, reason, start_date, end_date, way, city_from, city_to, go_back, day_count, remark, status, deny_reason, indate, is_linked, procinst_id, gmt_finished
+        id, company_id, owner_id, owner_name, reason, start_date, end_date, way, city_from, city_to, go_back, day_count, remark, status, deny_reason, indate, is_linked, procinst_id, gmt_finished, auditor_id, auditor_name, auditor_type, cur_audit_setting_id
     </sql>
+
     <select id="summaryData"  resultMap="BaseResultMap1">
         select owner_id, owner_name, sum(day_count) as day_count, department.department_name as department_name from business_trip
         left join user on user.id = business_trip.owner_id
@@ -43,6 +48,7 @@
             and owner_name like '%${keyword}%'
         </if>
         and business_trip.company_id = #{companyId}
+        and business_trip.status = 0
         group by owner_id
     </select>
 

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.BustripAuditLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.BustripAuditLog">
+        <id column="id" property="id" />
+        <result column="sheet_id" property="sheetId" />
+        <result column="audit_node_id" property="auditNodeId" />
+        <result column="auditor_id" property="auditorId" />
+        <result column="auditor_name" property="auditorName" />
+        <result column="is_pass" property="isPass" />
+        <result column="indate" property="indate" />
+        <result column="deny_reason" property="denyReason" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, sheet_id, audit_node_id, auditor_id, auditor_name, is_pass, indate, deny_reason
+    </sql>
+
+</mapper>

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

@@ -38,6 +38,7 @@
             and owner_name like '%${keyword}%'
         </if>
         and company_id = #{companyId}
+        and status = 0
         group by owner_id
     </select>
 

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

@@ -98,6 +98,9 @@
         select id, name, creater_id, creater_name, creator_color, executor_id, executor_name, executor_color, task_level, task_status, create_date, end_date, project_id, stages_id, company_id, indate, parent_tid, group_id, seq, plan_hours, task_type, parent_tname, finish_date, start_date
         from task
         ${ew.customSqlSegment}
+        <if test="start!=null and size!=null">
+            limit #{start},#{size}
+        </if>
     </select>
     <select id="nameList" resultMap="BaseResultMap">
         select id, name, task_level, stages_id, company_id, indate,  group_id, seq,task_type,task_desc

fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -36,11 +36,11 @@
     <transition name="el-zoom-in-top">
       <div v-show="show" style="position: relative;z-index: 999;"> 
         <!-- 搜索框 -->
-        <div class="searchBox">
+        <!-- <div class="searchBox">
             <el-input :placeholder="$t('peaseenterthe')" size="mini" v-model="searchTex" style="width: 150px" @focus="searchBox()">
                 <el-button slot="append" icon="el-icon-search" size="mini" @click="searchLick()"></el-button>
             </el-input>
-        </div>
+        </div> -->
         <div class="transitionBox" :style="filterable ? 'margin: 30px 0;' : ''">
             <ul class="transitionBoxUl">
                 <li :class="transitionBoxLiIdx == index ? 'liHover' : ''" v-for="(item, index) in options" :key="index" @mouseover="liMouseOver(index)" @click="liClick(item, index)"> 

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -521,9 +521,13 @@
                             this.$router.push("/expense");
                             this.drawer = false;
                         } else if (type == 4) {
-                            //4- 任务有新进展
+                            //4- 请假消息
                             this.$router.push("/leave");
                             this.drawer = false;
+                        } else if (type == 5) {
+                            //5- 出差消息
+                            this.$router.push("/awayOffice");
+                            this.drawer = false;
                         }
                         
                     } else {

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -9,31 +9,27 @@
                     <i class="iconfont firerock-icontianbao"></i>
                     <span slot="title">{{ $t('businesstriisallowed') }}</span>
                 </el-menu-item>
-                <el-submenu index="2" v-if="permissions.awayOfficeAll">
-                    <template slot="title">
-                        <i class="iconfont firerock-iconbaoxiaodan"></i>
-                        <span>{{ $t('businesstriplist') }}</span>
-                    </template>
-                    <!-- 导航切换 -->
-                    <el-menu-item index="2-1" v-if="permissions.awayOfficeAll"><p @click="bills(false, 2)">{{ $t('all') }}</p></el-menu-item>
-                    <el-menu-item index="2-2" v-if="permissions.awayOfficeAudit && !isSyncData"><p @click="bills(true, 1)">{{ $t('state.WaitingAudit') }}</p></el-menu-item>
-                </el-submenu>
-                <el-menu-item index="3" @click="bills(false, 2)" v-if="!permissions.awayOfficeAll">
-                    <i class="iconfont firerock-iconbaoxiaodan"></i>
-                    <span slot="title">{{ $t('mbusinesstrip') }}</span>
+                <el-menu-item index="2" @select="bills" @click="auditList()" v-if="permissions.awayOfficeAudit">
+                <i class="iconfont firerock-iconbaoxiaodan"></i>
+                <span slot="title">出差审核</span>
                 </el-menu-item>
+                <el-menu-item index="3" @select="bills" @click="bills(false, 2)" >
+                <i class="iconfont firerock-iconbaoxiaodan"></i>
+                <span slot="title">{{ $t('businesstriplist') }}</span>
+                </el-menu-item>
+                
                 <el-menu-item index="4" v-if="permissions.awayOfficeStatistical">
                     <template slot="title">
                         <i class="iconfont firerock-icontianbao"></i>
                         <span slot="title">{{ $t('businessstatistics') }}</span>
                     </template>
                 </el-menu-item>
-                <!-- <el-menu-item index="5" v-if="permissions.awayOfficeProcess">
+                <el-menu-item index="5" v-if="permissions.awayOfficeProcess">
                     <template slot="title">
                         <i class="iconfont firerock-iconliucheng"></i>
                         <span slot="title">{{ $t('businesstriApprovalProcess') }}</span>
                     </template>
-                </el-menu-item> -->
+                </el-menu-item>
             </el-menu>
         </el-col>
     </div>
@@ -144,6 +140,20 @@
                         <el-form-item :label="$t('travelnote')" style="width:635px">
                             <el-input type="textarea" v-model="addform.remark" :rows="3" style="width: 100%" maxlength="100" show-word-limit></el-input>
                         </el-form-item>
+                        <!--流程显示-->
+                        <el-form-item label="审批流程" style="width: 100%;color:#606266" >
+                        <span v-for="(item, index) in curWorkflowList" :key="item.id" >
+                            <span v-if="index>0"><i class="el-icon-right"></i></span>
+                            <span><i class="el-icon-s-custom"></i></span>
+                            <span v-if="user.userNameNeedTranslate == 1">
+                            <span v-if="item.auditorType == 1"><ww-open-data type='departmentName' :openid='item.auditDeptName' ></ww-open-data>(主要负责人)</span>
+                            <ww-open-data type='userName' :openid='item.userName' v-if="item.auditorType == 2"></ww-open-data>
+                            </span>
+                            <span v-if="user.userNameNeedTranslate == 0">
+                            {{item.auditorType == 1?(item.auditDeptName+'(主要负责人)'):item.userName}}
+                            </span>
+                        </span>
+                        </el-form-item>
                 </el-form>
                 <div>
                     <p style="width:635px;text-align:center;">
@@ -219,7 +229,7 @@
                             <div><span :style="scope.row.dayCount >= 10 ? 'color:#e62412' : ''">{{scope.row.dayCount}}{{ $t('time.day') }}</span></div>
                         </template>
                     </el-table-column>
-                    <el-table-column :label="$t('detailsbusinessrip')" width="600" align="center">
+                    <el-table-column :label="$t('detailsbusinessrip')" width="600" align="center" v-if="isSyncData">
                         <template slot-scope="scope">
                             <div v-for="item in scope.row.projectList" :key="item.projectId" class="detailsScope">
                                 <span>{{item.startDate + $t('other.to') + item.endDate}}</span><span>{{item.projectName}}</span><span>{{item.degreeName}}</span>
@@ -258,13 +268,18 @@
                     <el-table-column prop="status" :label="$t('state.states')" width="100" fixed="right">
                         <template slot-scope="scope">
                             <span v-if="scope.row.status == 0">{{ $t('state.approved') }}</span>
-                            <span v-if="scope.row.status == 1" style="color: orange">{{ $t('state.WaitingAudit') }}</span>
+                            <div v-if="scope.row.status == 1" style="color: orange"><span>{{ $t('state.WaitingAudit') }}-</span>
+                                <span v-if="user.userNameNeedTranslate != 1">{{scope.row.auditorName}}</span>
+                                <span v-if="user.userNameNeedTranslate == 1">
+                                <ww-open-data type='userName' :openid='scope.row.auditorName'></ww-open-data>
+                                </span>
+                            </div>
                             <span v-if="scope.row.status == 2" style="color: red">{{ $t('btn.rejected') }}</span>
                             <span v-if="scope.row.status == 3" style="color: #666666">{{ $t('btn.undo') }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column v-if="!isSyncData" :label="isAuditList ? $t('other.audit') : $t('operation')" width="180" fixed="right" >
-                        <template slot-scope="scope">
+                        <!-- <template slot-scope="scope">
                             <div v-if="isAuditList">
                                 <el-button icon="el-icon-check" circle size="mini" @click="approve(scope.row)"></el-button>
                                 <el-button icon="el-icon-close" circle size="mini"  @click="deny(scope.row)"></el-button>
@@ -273,6 +288,17 @@
                                 <el-button v-if="permissions.awayOfficeDelete && ((scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.awayOfficeAll)" icon="el-icon-delete" circle size="mini"  @click="deletes(scope.row)"></el-button>
                                 <el-button v-if="((scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.awayOfficeAll) || scope.row.status == 1" icon="el-icon-edit" circle size="mini" @click="editor(scope.row)"></el-button>
                             </div>
+                        </template> -->
+                        <template slot-scope="scope">
+                        <div v-if="isAuditList" >
+                            <el-button icon="el-icon-check" circle size="mini" @click.stop.native="approve(scope.row)"></el-button>
+                            <el-button icon="el-icon-close" circle size="mini"  @click.stop.native="deny(scope.row)"></el-button>
+                        </div>
+                        <div v-if="!isAuditList && ((scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.awayOfficeAll)">
+                            <el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2" @click.stop.native="deletes(scope.row)" >删除</el-button>
+                            <el-button size="mini" v-if="scope.row.status == 1" @click.stop.native="cancel(scope.row)">撤回</el-button>
+                            <el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2 " type="primary" @click.stop.native="editor(scope.row)">重新提交</el-button>
+                        </div>
                         </template>
                     </el-table-column>
                     <el-table-column v-if="isSyncData" :label="$t('operation')" width="150" fixed="right">
@@ -281,6 +307,9 @@
                             <el-button v-if="permissions.awayOfficeDelete" icon="el-icon-delete" circle size="mini" @click="deleteOfDingding(scope.row)"></el-button>
                         </template>
                     </el-table-column>
+
+                    
+                    
                 </el-table>
                 <!-- 页码 -->
                 <div class="poss">
@@ -394,7 +423,7 @@
                             <div style="width:100%;margin:0 auto;margin-bottom:30px;position: absolute;bottom: 0px;text-align: center; ">
                                 <el-button type="primary" @click="submitInsert">{{ $t('save') }}</el-button>
                             </div>
-                        </div>
+                        </div> 
                     </el-scrollbar>
                 </el-col>
             </div>
@@ -402,7 +431,8 @@
                 <el-form label-width="140px">
                     <el-form-item :label="$t('selectdepartmentsdesignatepersonnel')" >
                         <el-cascader filterable ref="deptCascader" v-model="curDeptId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%" @change="chooseDept" v-if="user.userNameNeedTranslate != 1" :options="soption" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable></el-cascader>
-                        <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
+                        <!-- <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :subjectId="this.selectedAuuid" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader> -->
+                        <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :userName="true" :subjectId="this.selectedAuuid" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
                     </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
@@ -529,7 +559,7 @@
                 </template>
             </el-table-column>
             <el-table-column prop="reason" :label="$t('travelreason')" width="150" header-align="center"></el-table-column>
-            <el-table-column prop="projectName" :label="$t('screening.inputProject')" width="150" align="center"></el-table-column>
+            <el-table-column prop="projectName" :label="$t('screening.inputProject')" width="150" align="center" v-if="isSyncData"></el-table-column>
             <el-table-column :label="$t('traffictools')" width="120" align="center">
                 <template slot-scope="scope">
                     <span v-if="scope.row.way == 0">{{ $t('plane') }}</span>
@@ -550,7 +580,7 @@
             <el-table-column prop="endDate" :label="$t('endtimeofbusinesstrip')" width="150" align="center"></el-table-column>
             <el-table-column prop="remark" :label="$t('bei-zhu')" width="200">
                 <template slot-scope="scope">
-                    <el-popover placement="top-start" title="$t('biao-ti')" width="200" trigger="hover" :content="scope.row.remark">
+                    <el-popover placement="top-start" width="200" trigger="hover" :content="scope.row.remark">
                         <div slot="reference" class="apls">{{scope.row.remark}}</div>
                     </el-popover>
                 </template>
@@ -659,6 +689,28 @@
             <el-button type="primary" @click="listSynchronize()" :loading="synchronizeLoading">{{ $t('synchronous') }}</el-button>
         </span>
     </el-dialog>
+
+    <el-dialog :title="$t('defaultText.pleaseEnterTheReason')"  v-if="denyDialogV" :visible.sync="denyDialogV" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <div>
+            <el-input type="textarea" v-model="denyInfo.reason" rows="2" :placeholder="$t('reasonforyourdecisiontoreject')" />
+        </div>
+        <div slot="footer" class="dialog-footer">
+            <el-button  @click="denyDialogV = false" >{{ $t('btn.cancel') }}</el-button>
+            <el-button type="primary" @click="submitDeny()" >{{ $t('btn.determine') }}</el-button>
+        </div>
+    </el-dialog>
+    <el-dialog :title="$t('title.reviewProcess')" v-if="denyReasonVisible" :visible.sync="denyReasonVisible" customClass="customWidth" width="400px">
+        <div style="padding:20px 40px 20px 0">
+            <el-timeline :reverse="false">
+                <el-timeline-item v-for="item in auditLogList" :key="item.id" :timestamp="item.indate">
+                  <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data> </span>
+                  <span v-if="user.userNameNeedTranslate == 0">{{item.auditorName}}</span>
+                  <span> {{item.isPass==0?"驳回了请假申请。":"审核通过。"}}</span>
+                  <span v-if="item.isPass == 0">原因：{{item.denyReason}}</span>
+                  </el-timeline-item>
+            </el-timeline>
+        </div>
+    </el-dialog>
 </section>
 </template>
 
@@ -691,6 +743,8 @@ export default {
         //         }
         //     };
         return {
+            denyDialogV: false,
+            denyInfo: {},
             summaryLoading: false,
             displayTable: false,
             formloading: false,
@@ -807,7 +861,10 @@ export default {
 
             isOverTendays: false,
             tableListLoading: false,
-
+            
+            curWorkflowList:{},
+            denyReasonVisible : false,
+            auditLogList:[],
         }
     },
     created(){
@@ -828,9 +885,8 @@ export default {
         this.getTableList()
         this.getProjectList()
         this.getDepartment()
-        
-        
-        // console.log("session",this.wuduData);
+        this.getAuditWorkflow();
+        this.getUsers()
     },
     methods: {
         // 自定义事件
@@ -842,6 +898,25 @@ export default {
                 this.ownerIdsId = obj.id
             }
         },
+        //获取添加出差单时的审批流
+        getAuditWorkflow() {
+            this.http.post('/audit-workflow-setting/get',{deptId: this.user.departmentId, type: 2},
+                res => {
+                if(res.code == 'ok'){
+                    this.curWorkflowList = res.data;
+                }else{
+                    this.$message({
+                    message: res.msg,
+                    type: 'error'
+                    })
+                }
+                },err => {
+                this.$message({
+                    message: err,
+                    type: 'error'
+                })
+            })
+        },
         dingdingListExport(){
             let parameter = {
                 keyword: ''
@@ -1097,7 +1172,8 @@ export default {
             // console.log("keypath",keyPath)
             if (keyPath[0] == '1') {
                 this.displayTable = false;
-                this.apk = 0
+                this.apk = 0;
+                this.getAuditWorkflow();
             } else if(keyPath[0] == '2' || keyPath[0] == '3') {
                 this.displayTable = true;
                 this.apk = 0
@@ -1116,6 +1192,46 @@ export default {
                 this.apk = 2
             }
         },
+        auditList() {
+            this.falg = 1
+            this.code = 1
+            this.tableList = []
+            this.displayTable = true;
+            this.isAuditList = true;
+            this.loading = true
+            this.page = '1'
+            var param = { pageIndex: this.page,
+                            pageSize: this.size,
+                            // createDate: this.createDate,
+                            startDate: this.createDate == null ? '' : this.createDate[0],
+                            endDate: this.createDate == null ? '' : this.createDate[1],
+                            ownerId: this.ownerIds,
+                            way: this.type,
+                        };
+            this.tableList = [];
+            this.total = 0;
+            this.http.post('/business-trip/auditList', param,
+                res => {
+                    if (res.code == "ok") {
+                        this.tableList = res.data.records
+                        this.total = res.data.total
+                        this.loading = false
+                    } else {
+                    this.loading = false
+                        this.$message({
+                        message: res.msg,
+                        type: "error"
+                        });
+                    }
+                },
+                error => {
+                this.loading = false
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+            });
+        },
         // 导航切换
         bills(audit, tr){
             if(tr) {
@@ -1347,7 +1463,11 @@ export default {
             },
             res => {
                 if (res.code == "ok") {
-                    this.billss(true);
+                    this.auditList();
+                    this.$message({
+                        message: '操作成功',
+                        type: "success"
+                        });
                 } else {
                     this.$message({
                     message: res.msg,
@@ -1363,12 +1483,21 @@ export default {
             });
         },
         deny(item) {
-            //审核驳回
-            this.http.post('/business-trip/deny', {id:item.id
-            },
+            this.denyDialogV = true;
+            this.denyInfo = {id:item.id, reason:null};
+        },
+        
+        submitDeny(id) {
+        //审核驳回
+        this.http.post('/business-trip/deny', this.denyInfo,
             res => {
                 if (res.code == "ok") {
-                    this.billss(true);
+                    this.auditList();
+                    this.denyDialogV = false;
+                    this.$message({
+                        message: '操作成功',
+                        type: "success"
+                        });
                 } else {
                     this.$message({
                     message: res.msg,
@@ -1383,6 +1512,33 @@ export default {
                 });
             });
         },
+        cancel(e) {
+            this.$confirm('确定要撤回该出差申请吗', this.$t('other.prompts'), {
+                //type: 'warning'
+            }).then(() => {
+                this.http.post('/business-trip/cancel', {id:e.id},
+                res => {
+                    if (res.code == "ok") {
+                        this.bills();
+                        this.$message({
+                            message: '操作成功',
+                            type: "success"
+                        });
+                    } else {
+                        this.$message({
+                        message: res.msg,
+                        type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            });
+        },
         // 操作 - 删除
         deletes(e) {
             this.$confirm(this.$t('deleteit'), this.$t('other.prompts'), {}).then(() => {
@@ -1516,8 +1672,8 @@ export default {
                 pageIndex: this.detailspage,
                 pageSize: this.detailssize,
                 status: 0,
-                startDate: '',
-                endDate: '',
+                startDate: this.searchDates[0],
+                endDate: this.searchDates[1],
                 ownerId: this.detailsuserid,
                 way: '',
             };
@@ -1570,8 +1726,8 @@ export default {
                     var list = res.data , list1 = JSON.parse(JSON.stringify(res.data));
                     this.sdata = list;
                     this.soption = [
-                        {value: 1 , label : this.$t('lable.department') , children : this.changeArr(list1)},
-                        {value: 2 , label : this.$t('designatedpersonnel'),children : this.susers}
+                        {value: 1 , label : this.$t('lable.department') , children : this.changeArr(list1), type: 'dep'},
+                        {value: 2 , label : this.$t('designatedpersonnel'),children : this.susers, type: 'user'}
                     ]
                 } else {
                     this.$message({
@@ -1698,7 +1854,14 @@ export default {
             this.dialogVisible = false;
             if (this.curDeptId == null) return;
 
-            var node = this.user.userNameNeedTranslate != '1' ? this.vueCasaderItem : this.$refs.deptCascader.getCheckedNodes()[0];
+            // var node = this.user.userNameNeedTranslate != '1' ? this.vueCasaderItem : this.$refs.deptCascader.getCheckedNodes()[0];
+            var node = ''
+            if(this.user.userNameNeedTranslate != 1) {
+              // node = this.user.userNameNeedTranslate != '1' ? this.vueCasaderItem : this.$refs.deptCascader.getCheckedNodes()[0];
+              node = this.$refs.deptCascader.getCheckedNodes()[0];
+            } else {
+              node = this.addNodeObj
+            }
 
             // var node = this.$refs.deptCascader.getCheckedNodes()[0];
             if (this.isAdd) {
@@ -1726,19 +1889,24 @@ export default {
                 this.dataArray.splice(this.sindex, 0, nodes);
             } else {
             //编辑
-                this.dataArray[this.sindex].auditDeptId = node.value;
-                this.dataArray[this.sindex].auditDeptName = node.label;
+                if(node.type == 'dep') {
+                  this.dataArray[this.sindex].auditDeptId = node.value;
+                  this.dataArray[this.sindex].auditDeptName = node.label;
+                  this.dataArray[this.sindex].auditorType = 1
+                  this.dataArray[this.sindex].userId = ''
+                  this.dataArray[this.sindex].userName = ''
+                } else {
+                  this.dataArray[this.sindex].userId = node.value;
+                  this.dataArray[this.sindex].userName = node.label;
+                  this.dataArray[this.sindex].auditDeptId = ''
+                  this.dataArray[this.sindex].auditDeptName = ''
+                  this.dataArray[this.sindex].auditorType = 2
+                }
             }
         },
 
 
         getUsers() {
-            // this.http.post(this.port.manage.list, {
-            //     departmentId: -1,
-            //     pageIndex: 1,
-            //     // pageSize: 99999
-            //     pageSize: -1
-            // },
             this.http.post('/user/getSimpleActiveUserList', {},
             res => {
                 if (res.code == "ok") {
@@ -1746,7 +1914,8 @@ export default {
                     // this.users = res.data.records;
                     this.users = res.data;
                     for (let i = 0; i < this.users.length; i++) {
-                        this.susers.push({value:this.users[i].id,label:this.users[i].name})
+                        // this.susers.push({value:this.users[i].id,label:this.users[i].name})
+                        this.susers.push({value:this.users[i].id,label:this.users[i].name,type: 'user'})
                     }
                     // if (this.user.role == 0) {
                     //     this.editItemForm.ownerId = this.user.id;
@@ -1837,6 +2006,16 @@ export default {
                     }
                 );
             },
+            vueCasader(obj) {
+                if(obj.distinction == 1) {
+                    let arr = []
+                    arr.push(obj.id)
+                    this.curDeptId = arr
+                    this.vueCasaderItem = obj.item
+                    this.addNodeObj = obj.item
+                    console.log(obj, '选中的')
+                }
+            }
         //获取项目列表
             // getProjectList() {
             //     this.listLoading = true;

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -130,7 +130,7 @@
                     <el-input ref="ipts" v-model="addForm.tel" :placeholder="$t('peaseenterthe')" style="width: 250px"></el-input>
                 </el-form-item>
                 <!-- 单选 -->
-                <el-form-item style="display: inline-block;width:300px" :label="$t('lengthunit')">
+                <el-form-item style="display: inline-block;width:300px;margin-right: 400px" :label="$t('lengthunit')">
                     <el-radio-group v-model="addForm.timeType" @change="chanRadio()" style="display:inline-block;width:240px">
                         <el-radio label="0">{{ $t('accordingdays') }}</el-radio>
                         <el-radio label="1" v-if="addForm.leaveType != 6">{{ $t('leavehour') }}</el-radio>
@@ -284,7 +284,7 @@
                 <el-table-column prop="remark" :label="$t('bei-zhu')" min-width="200" header-align="center">
                   <template slot-scope="scope">
                     <!-- <div class="apls">{{scope.row.remark}}</div> -->
-                    <el-popover placement="top-start" :title="$t('biao-ti')" width="200" trigger="hover" :content="scope.row.remark">
+                    <el-popover placement="top-start"  width="200" trigger="hover" :content="scope.row.remark">
                       <div slot="reference" class="apls">{{scope.row.remark}}</div>
                     </el-popover>
                   </template>
@@ -429,7 +429,6 @@
                     <icon class="iconfont firerock-iconInsertLine addNode" @click="showNodeDialog(0)"></icon>
                     <icon class="iconfont firerock-iconright"></icon>
                     <span v-for="(item, index) in dataArray" :key="item.seq" >
-                        
                         <el-button type="primary" v-if="item.auditorType == 1 && user.userNameNeedTranslate == 1" @click="editNodeDialog(index, item)">
                           <!-- {{item.auditDeptName}} -->
                           <ww-open-data type='departmentName' :openid='item.auditDeptName'></ww-open-data>
@@ -951,10 +950,10 @@ export default {
       this.getUsers()
     }else{
       this.getUsers() // 获取人员信息
-    this.getDepartment();
-    this.getAl();
-    this.getApproverList();
-    this.getAuditWorkflow();
+      this.getDepartment();
+      this.getAl();
+      this.getApproverList();
+      this.getAuditWorkflow();
     }
   },
   filters: {},
@@ -1493,9 +1492,21 @@ export default {
                 
               } else {
                 //编辑
-                this.dataArray[this.sindex].auditDeptId = node.value;
-                this.dataArray[this.sindex].auditDeptName = node.label;
+                if(node.type == 'dep') {
+                  this.dataArray[this.sindex].auditDeptId = node.value;
+                  this.dataArray[this.sindex].auditDeptName = node.label;
+                  this.dataArray[this.sindex].auditorType = 1
+                  this.dataArray[this.sindex].userId = ''
+                  this.dataArray[this.sindex].userName = ''
+                } else {
+                  this.dataArray[this.sindex].userId = node.value;
+                  this.dataArray[this.sindex].userName = node.label;
+                  this.dataArray[this.sindex].auditDeptId = ''
+                  this.dataArray[this.sindex].auditDeptName = ''
+                  this.dataArray[this.sindex].auditorType = 2
+                }
               }
+              console.log(this.dataArray, '数据')
             },
     deleteNode() {
                 this.dialogVisible = false;
@@ -1535,6 +1546,10 @@ export default {
         res => {
             if (res.code == "ok") {
                 this.auditList();
+                this.$message({
+                        message: '操作成功',
+                        type: "success"
+                        });
             } else {
                 this.$message({
                 message: res.msg,
@@ -1561,6 +1576,10 @@ export default {
             if (res.code == "ok") {
                 this.auditList();
                 this.denyDialogV = false;
+                this.$message({
+                        message: '操作成功',
+                        type: "success"
+                        });
             } else {
                 this.$message({
                 message: res.msg,
@@ -1576,12 +1595,6 @@ export default {
         });
     },
     getUsers() {
-      // this.http.post(this.port.manage.list, {
-      //       departmentId: -1,
-      //       pageIndex: 1,
-      //       // pageSize: 99999
-      //       pageSize: -1
-      //   },
       this.http.post('/user/getSimpleActiveUserList', {},
         res => {
             if (res.code == "ok") {
@@ -1666,7 +1679,7 @@ export default {
                     startDate: this.createDate == null ? '' : this.createDate[0],
                     endDate: this.createDate == null ? '' : this.createDate[1],
                     ownerId: this.ownerIds,
-                    leaveType: this.type,
+                    way: this.type,
                   };
       this.list = [];
       // this.total = 0;

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

@@ -242,7 +242,7 @@
                         <!--列表-->
                         <el-table v-if="displayTable" :data="taskDataList" 
                         :header-cell-style="{'font-weight':'normal'}" border
-                        highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;margin-top:10px;" @row-click="taskLineClick">
+                        highlight-current-row v-loading="listLoading" :height="tableHeight - 20" style="width: 100%;margin-top:10px;" @row-click="taskLineClick">
                             <el-table-column fixed :label="$t('wan-cheng')"  width="50">
                                 <template slot-scope="scope">
                                     <el-checkbox :disabled="scope.row.taskStatus==2" v-model="scope.row.isFinish" size="large" class="cb"  
@@ -322,6 +322,17 @@
                                 </template>
                             </el-table-column>
                         </el-table>
+                        <el-col :span="24" class="toolbar" v-if="displayTable">
+                        <el-pagination
+                            @size-change="taskListSizeChange"
+                            @current-change="taskListPageChange"
+                            :page-sizes="[20 , 50 , 80 , 100]"
+                            :page-size="taskListSize"
+                            layout="total, sizes, prev, pager, next"
+                            :total="taskListTotal"
+                            style="float:right;"
+                        ></el-pagination>
+                        </el-col>
                     </el-main>
                 </el-container>
             </el-tab-pane>
@@ -1292,7 +1303,11 @@
                 groupDetailData: {},
                 groupDetailTil: '',
                 setTemplateData: {},
-                setTemplateDialog: false
+                setTemplateDialog: false,
+                
+                taskListPage: 1,
+                taskListSize: 20,
+                taskListTotal: 0
             };
             
         },
@@ -2313,19 +2328,30 @@
                     this.getViewTaskList();
                 }
             },
+
+            taskListPageChange(val){
+                this.taskListPage = val
+                this.getViewTaskList()
+            },
+            taskListSizeChange(val){
+                this.taskListSize = val
+                this.taskListPage = 1
+                this.getViewTaskList()
+            },
             //加载视图任务列表
             getViewTaskList() {
-                this.http.post('/task/list',{projectId: this.curProjectId, viewId: this.selectedGroup.id, order: this.order, isDesc: this.isDesc},
+                this.http.post('/task/list',{projectId: this.curProjectId, viewId: this.selectedGroup.id, order: this.order, isDesc: this.isDesc,pageIndex: this.taskListPage,pageSize:this.taskListSize},
                 res => {
                     if (res.code == "ok") {
                         // this.taskDataList = res.data;
                         // console.log(this.taskDataList, '任务视图的列表')
-                        for(var i in res.data) {
-                            if(res.data[i].executorName != null) {
-                                res.data[i].executorName = res.data[i].executorName.split(',')
+                        for(var i in res.data.records) {
+                            if(res.data.records[i].executorName != null) {
+                                res.data.records[i].executorName = res.data.records[i].executorName.split(',')
                             }
                         }
-                        this.taskDataList = res.data;
+                        this.taskDataList = res.data.records;
+                        this.taskListTotal = res.data.total
                         console.log(this.taskDataList, '任务视图的列表')
                         this.taskDataList.forEach(t=>{
                             t.isFinish = t.taskStatus==1?true:false;
@@ -2746,6 +2772,7 @@
                 this.selectedGroup = this.viewList.filter(g=>g.id == index)[0];
                 this.getViewTaskList();
                 this.displayTable = true;
+                this.taskListPage = 1
             } ,
             groupChange(index, indexPath) {
                 console.log('店家了')

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

@@ -14,7 +14,9 @@
           <template slot-scope="scope">
             <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'user'">
               <span v-for="(item, index) in scope.row.userNameList" :key="index">
-                <ww-open-data type='userName' :openid='scope.row.text'></ww-open-data>
+                <!-- <ww-open-data type='userName' :openid='scope.row.text'></ww-open-data> -->
+                <ww-open-data type='userName' :openid='item'></ww-open-data>
+                <span v-if="index < scope.row.userNameList.length - 1">,</span>
               </span>
             </span>
             <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'user'">{{scope.row.proNameText}}</span>
@@ -99,6 +101,7 @@ export default {
 
     // this.treeDataList = this.integrationTree(this.tasks.data)
     console.log(this.mergeList, '合并数据')
+    console.log(this.treeDataList, '合并完全的数据')
   },
   methods: {
     // 递归加颜色以及存储需要合并的数据
@@ -106,20 +109,31 @@ export default {
       for (let i in data) {
             if(this.stafforpro == '按项目查看') {
               data[i].color = '#409EFF'
-              if(data[i].type == 'user' && data[i].text) {
+              // if(data[i].type == 'user' && data[i].text) {
+              //   let arr = []
+              //   if(data[i].text.indexOf('/') != '-1') {
+              //     let str = data[i].text.split('/')[0]
+              //     if(str.indexOf(',') != '-1') {
+              //       let arrList = str.split(',')
+              //       data[i].userNameList = arrList
+              //     } else {
+              //       arr.push(str)
+              //       data[i].userNameList = arr
+              //     }
+              //     data[i].proNameText = data[i].text.split('/')[1]
+              //   }
+              // }
+              if(data[i].translationType == 'user' && data[i].text) {
                 let arr = []
-                if(data[i].text.indexOf('/') != '-1') {
-                  let str = data[i].text.split('/')[0]
-                  if(str.indexOf(',') != '-1') {
-                    let arrList = str.split(',')
-                    data[i].userNameList = arrList
-                  } else {
-                    arr.push(str)
-                    data[i].userNameList = arr
+                arr = data[i].text.split(',')
+                for(var j in arr) {
+                  if(arr[j].indexOf('/') != '-1') {
+                    arr[j] = arr[j].split('/')[0]
                   }
-                  data[i].proNameText = data[i].text.split('/')[1]
                 }
+                data[i].userNameList = arr
               }
+
             }
             this.num++
             let obj = {

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

@@ -1630,7 +1630,14 @@
         <el-dialog :title="$t('title.reviewProcess')" v-if="approvalProcessDialog" :visible.sync="approvalProcessDialog" customClass="customWidth" width="400px">
             <div style="padding:20px 40px 20px 0">
                 <el-timeline :reverse="false">
-                    <el-timeline-item v-for="item in approvalProcessData" :key="item.id" :timestamp="item.operateDate">{{item.msg}}</el-timeline-item>
+                    <el-timeline-item v-for="item in approvalProcessData" :key="item.id" :timestamp="item.operateDate">
+                        {{item.msg}}
+                        <span v-if="user.userNameNeedTranslate != 1">{{msg}}</span>
+                        <span v-if="user.userNameNeedTranslate == 1">
+                            <span><ww-open-data type='userName' :openid='msgCon.one'></ww-open-data></span>
+                            <span>{{msgCon.two}}</span>
+                        </span>
+                    </el-timeline-item>
                 </el-timeline>
             </div>
         </el-dialog>
@@ -2100,6 +2107,15 @@
                 },res => {
                     if(res.code == 'ok'){
                         this.approvalProcessDialog = true
+                        if(this.user.userNameNeedTranslate == 1) {
+                            for(var i in res.data) {
+                                let obj = {
+                                    one: res.data[i].msg.split('$userName=')[1].split('$')[0],
+                                    two: res.data[i].msg.split('$userName=')[1].split('$')[1],
+                                }
+                                res.data[i].msgCon = obj
+                            }
+                        }
                         this.approvalProcessData = res.data
                     }else{
                         this.$message({