财务，日报审核记录，修复钉钉PC端无法进入的bug

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

@@ -0,0 +1,106 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.Project;
+import com.management.platform.entity.ProjectBasecost;
+import com.management.platform.entity.ProjectCategory;
+import com.management.platform.entity.ProjectCategory;
+import com.management.platform.mapper.*;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-03-24
+ */
+@RestController
+@RequestMapping("/project-category")
+public class ProjectCategoryController {
+
+    @Resource
+    private HttpServletRequest request;
+    @Resource
+    UserMapper userMapper;
+    @Resource
+    ProjectCategoryMapper projectCategoryMapper;
+
+    @Resource
+    ProjectMapper projectMapper;
+
+    @RequestMapping("/addOrMod")
+    public HttpRespMsg addOrMod(ProjectCategory setting) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if (StringUtils.isEmpty(setting.getName())) {
+            msg.setError("名称不能为空");
+            return msg;
+        }
+        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
+        if (setting.getId() == null) {
+            setting.setCompanyId(companyId);
+            int count = projectCategoryMapper.selectCount(new QueryWrapper<ProjectCategory>().eq("name", setting.getName()).eq("company_id", setting.getCompanyId()));
+            if (count > 0) {
+                msg.setError("该名称已存在");
+            } else {
+                projectCategoryMapper.insert(setting);
+                msg.data = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id", companyId));
+            }
+        } else {
+            int count = projectCategoryMapper.selectCount(new QueryWrapper<ProjectCategory>().eq("name", setting.getName())
+                    .eq("company_id", companyId).ne("id", setting.getId()));
+            if (count > 0) {
+                msg.setError("该名称已存在");
+            } else {
+                //检查名称是否有变化
+                ProjectCategory oldSetting = projectCategoryMapper.selectById(setting.getId());
+                if (!setting.getName().equals(oldSetting.getName())) {
+                    projectCategoryMapper.updateById(setting);
+                    Project cost = new Project();
+                    cost.setCategoryName(setting.getName());
+                    projectMapper.update(cost, new QueryWrapper<Project>().eq("category", setting.getId()));
+                }
+                msg.data = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id", companyId));
+            }
+        }
+
+        return msg;
+    }
+
+    @RequestMapping("/list")
+    public HttpRespMsg list() {
+        HttpRespMsg msg = new HttpRespMsg();
+
+        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
+        List<ProjectCategory> list = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id", companyId));
+        msg.data = list;
+
+        return msg;
+    }
+
+    @RequestMapping("/delete")
+    public HttpRespMsg delete(Integer id) {
+        HttpRespMsg msg = new HttpRespMsg();
+        ProjectCategory ProjectCategory = projectCategoryMapper.selectById(id);
+        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
+        if (!ProjectCategory.getCompanyId().equals(companyId)) {
+            msg.setError("无权操作");
+        } else {
+            projectCategoryMapper.deleteById(id);
+        }
+
+        return msg;
+    }
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-03-24
+ */
+@RestController
+@RequestMapping("/report-alog-membdate")
+public class ReportAlogMembdateController {
+
+}
+

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

@@ -0,0 +1,84 @@
+package com.management.platform.controller;
+
+
+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.entity.ReportAlogMembdate;
+import com.management.platform.entity.ReportAuditLog;
+import com.management.platform.entity.ReportImportLog;
+import com.management.platform.entity.User;
+import com.management.platform.mapper.ReportAlogMembdateMapper;
+import com.management.platform.mapper.ReportAuditLogMapper;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-03-24
+ */
+@RestController
+@RequestMapping("/report-audit-log")
+public class ReportAuditLogController {
+
+    @Resource
+    private HttpServletRequest request;
+    @Resource
+    ReportAuditLogMapper reportAuditLogMapper;
+    @Resource
+    ReportAlogMembdateMapper reportAlogMembdateMapper;
+    @Resource
+    UserMapper userMapper;
+
+    @RequestMapping("getImportAuditLog")
+    public HttpRespMsg getImportAuditLog(Integer companyId, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
+        String token = request.getHeader("TOKEN");
+        User user = userMapper.selectById(token);
+        HttpRespMsg msg = new HttpRespMsg();
+        if (user.getRole() == 1 || user.getRole() == 2) {
+            QueryWrapper<ReportAuditLog> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("company_id", companyId).eq("audit_channel", 0).orderByDesc("indate");
+            IPage<ReportAuditLog> iPage = reportAuditLogMapper.selectPage(new Page<>(pageIndex, pageSize),
+                    queryWrapper);
+            List<ReportAuditLog> list = iPage.getRecords();
+            if (list.size() > 0) {
+                //还有获取各项的人员日期名单
+                List<Integer> ids = list.stream().map(ReportAuditLog::getId).collect(Collectors.toList());
+
+                List<ReportAlogMembdate> membList = reportAlogMembdateMapper.selectList(new QueryWrapper<ReportAlogMembdate>().in("rlog_id", ids));
+                list.forEach(l->{
+                    l.setMembdateList(membList.stream().filter(m->m.getRlogId().equals(l.getId())).collect(Collectors.toList()));
+                });
+            }
+
+            Long total = iPage.getTotal();
+            Map<String, Object> map = new HashMap<>();
+            map.put("records", list);
+            map.put("total", total);
+            msg.data = map;
+        } else {
+            Map<String, Object> map = new HashMap<>();
+            map.put("records", new ArrayList<>());
+            map.put("total", 0);
+            msg.data = map;
+        }
+        return msg;
+    }
+}
+

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

@@ -0,0 +1,42 @@
+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 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-03-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ProjectCategory extends Model<ProjectCategory> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("name")
+    private String name;
+
+    @TableField("company_id")
+    private Integer companyId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,55 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-03-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ReportAlogMembdate extends Model<ReportAlogMembdate> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("create_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate createDate;
+
+    @TableField("user_id")
+    private String userId;
+
+    @TableField("user_name")
+    private String userName;
+
+    /**
+     * 主表id
+     */
+    @TableField("rlog_id")
+    private Integer rlogId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ReportAuditLog.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 java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-03-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ReportAuditLog extends Model<ReportAuditLog> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("user_id")
+    private String userId;
+
+    @TableField("user_name")
+    private String userName;
+
+    @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime indate;
+
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 审核结果:通过或者驳回+原因
+     */
+    @TableField("result")
+    private String result;
+
+    /**
+     * 0-导入审核
+     */
+    @TableField("audit_channel")
+    private Integer auditChannel;
+
+
+    @TableField(exist = false)
+    private List<ReportAlogMembdate> membdateList;
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+<?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.ProjectCategoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ProjectCategory">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="company_id" property="companyId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, company_id
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?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.ReportAlogMembdateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ReportAlogMembdate">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="user_id" property="userId" />
+        <result column="user_name" property="userName" />
+        <result column="rlog_id" property="rlogId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, create_date, user_id, user_name, rlog_id
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.ReportAuditLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ReportAuditLog">
+        <id column="id" property="id" />
+        <result column="user_id" property="userId" />
+        <result column="user_name" property="userName" />
+        <result column="indate" property="indate" />
+        <result column="company_id" property="companyId" />
+        <result column="result" property="result" />
+        <result column="audit_channel" property="auditChannel" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, user_id, user_name, indate, company_id, result, audit_channel
+    </sql>
+
+</mapper>

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

@@ -116,7 +116,7 @@
                     if (url.indexOf(key) > 0) {
                         var corpId = url.substring(url.indexOf(key)+key.length,url.indexOf('#'));
                         dd.ready(function() {
-                            this.isDingchg()
+                            that.isDingchg()
                             dd.runtime.permission.requestAuthCode({
                                 corpId: corpId, // 企业id
                                 onSuccess: function (info) {

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

@@ -1003,12 +1003,19 @@ import { error } from 'dingtalk-jsapi';
                         this.listLoading = false;
                         this.isUploading = false;
                         if (res.code == "ok") {
-                            let tis = ''
-                            this.user.timeType.financeAudit == '1' ? tis = '导入成功，请等待审核' : tis = '导入成功'
-                            this.$message({
-                                message: tis,
-                                type: "success"
-                            });
+                            if (this.user.timeType.financeAudit == 1 ) {
+                                this.$message({
+                                    message: '导入成功，请等待审核',
+                                    type: "warning"
+                                });
+                                this.getMonths();
+                            } else {
+                                this.$message({
+                                    message: '导入成功',
+                                    type: "success"
+                                });
+                            }
+                            
                             this.importDialog = false;
                             //重新读取列表
                             this.getList();

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

@@ -612,12 +612,12 @@
                     <el-form-item prop="name">
                         <el-input v-model="templateForm.name" placeholder="请输入模板名称" maxlength="12"
                             show-word-limit clearable></el-input>
-                            <div>
+                            <!-- <div>
                                 <span>同时保存</span>
                                 <el-checkbox v-model="templateForm.saveTask" label="任务"></el-checkbox>
                                 <el-checkbox v-model="templateForm.saveRisk" label="风险"></el-checkbox>
                                 <el-checkbox v-model="templateForm.saveMileStone" label="里程碑"></el-checkbox>
-                            </div>
+                            </div> -->
                     </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">

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

@@ -36,7 +36,7 @@
                     <el-button @click="batchApprove(true)" style="margin-left:10px;" :disabled="multipleSelection.length==0">批量通过</el-button>
                     <el-button @click="batchApprove(false)"  :disabled="multipleSelection.length==0">批量驳回</el-button>
                 </el-form-item>
-                <el-form-item style="margin-left:20px;">
+                <el-form-item style="margin-left:20px;" v-if="user.role==1||user.role==2">
                    <el-link type="primary" @click="recordList(),recordDialogVisible = true,pageIndexList = 1,pageSizeList = 20">审核记录</el-link>
                 </el-form-item>