增加费用报销接口

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

@@ -44,7 +44,7 @@ public class EarningSnapshotController {
         User user = userMapper.selectById(userId);
         HttpRespMsg msg = new HttpRespMsg();
         Project project = projectMapper.selectById(projectId);
-        if (userId.equals(project.getInchargerId()) || userId.equals(project.getCreatorId())) {
+        if (userId.equals(project.getInchargerId()) || userId.equals(project.getCreatorId()) || user.getRole() > 0) {
             msg.data = earningSnapshotService.list(new QueryWrapper<EarningSnapshot>().eq("project_id", projectId).orderByDesc("id"));
         } else {
             msg.setError("无权查看");

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ExpenseItemController.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 2021-05-17
+ */
+@RestController
+@RequestMapping("/expense-item")
+public class ExpenseItemController {
+
+}
+

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

@@ -0,0 +1,59 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.ExpenseSheet;
+import com.management.platform.service.ExpenseSheetService;
+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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+@RestController
+@RequestMapping("/expense-sheet")
+public class ExpenseSheetController {
+
+    @Resource
+    ExpenseSheetService expenseSheetService;
+    @Resource
+    private HttpServletRequest request;
+
+    @RequestMapping("/getNextCode")
+    public HttpRespMsg getNextCode() {
+        String userId = request.getHeader("Token");
+        return expenseSheetService.getNextCode(userId);
+    }
+
+    @RequestMapping("/add")
+    public HttpRespMsg add(ExpenseSheet sheet, String items) {
+        String userId = request.getHeader("Token");
+        return expenseSheetService.add(sheet, items, userId);
+
+    }
+
+    @RequestMapping("/delete")
+    public HttpRespMsg delete(Integer id) {
+        return expenseSheetService.delete(id);
+
+    }
+
+    @RequestMapping("/list")
+    public HttpRespMsg list(ExpenseSheet sheet, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
+
+        return expenseSheetService.queryList(sheet, pageIndex, pageSize);
+
+    }
+}
+

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.PdfFile;
 import com.management.platform.service.PdfFileService;
 import com.management.platform.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -32,7 +33,7 @@ public class PdfFileController {
      * @return
      */
     @RequestMapping("/getProjectFile")
-    private HttpRespMsg getProjectFile(Integer fileId) {
+    public HttpRespMsg getProjectFile(Integer fileId) {
         List<PdfFile> pdfFileList = pdfFileService.list(new QueryWrapper<PdfFile>().eq("type", 1).eq("file_id", fileId));
         HttpRespMsg msg = new HttpRespMsg();
         if (pdfFileList.size() > 0) {

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

@@ -0,0 +1,91 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ExpenseItem extends Model<ExpenseItem> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 报销单id
+     */
+    @TableField("expense_id")
+    private Integer expenseId;
+
+    /**
+     * 项目id
+     */
+    @TableField("project_id")
+    private Integer projectId;
+
+    /**
+     * 费用日期
+     */
+    @TableField("happen_date")
+    private LocalDate happenDate;
+
+    /**
+     * 0-增值税专用发票，1-增值税普通发票
+     */
+    @TableField("invoice_type")
+    private Integer invoiceType;
+
+    /**
+     * 发票号
+     */
+    @TableField("invoice_no")
+    private String invoiceNo;
+
+    /**
+     * 税率
+     */
+    @TableField("tax_percent")
+    private Double taxPercent;
+
+    /**
+     * 税额
+     */
+    @TableField("tax_value")
+    private Double taxValue;
+
+    /**
+     * 费用金额
+     */
+    @TableField("amount")
+    private Double amount;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,84 @@
+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 2021-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ExpenseSheet extends Model<ExpenseSheet> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单据编号
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 公司id
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 填报人id
+     */
+    @TableField("owner_id")
+    private String ownerId;
+
+    /**
+     * 填报人姓名
+     */
+    @TableField("owner_name")
+    private String ownerName;
+
+    /**
+     * 发票张数
+     */
+    @TableField("ticket_num")
+    private Integer ticketNum;
+
+    /**
+     * 0-一般费用，1-差旅费，2-外包费用
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 0-未提交，1-待审核，2-审核通过，3-驳回
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

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

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

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

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

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

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

@@ -0,0 +1,25 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ExpenseSheet;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+public interface ExpenseSheetService extends IService<ExpenseSheet> {
+
+    HttpRespMsg add(ExpenseSheet sheet, String items, String userId);
+
+    HttpRespMsg delete(Integer id);
+
+    HttpRespMsg queryList(ExpenseSheet sheet,  Integer pageIndex,  Integer pageSize);
+
+    HttpRespMsg getNextCode(String userId);
+}

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ExpenseItem;
+import com.management.platform.mapper.ExpenseItemMapper;
+import com.management.platform.service.ExpenseItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+@Service
+public class ExpenseItemServiceImpl extends ServiceImpl<ExpenseItemMapper, ExpenseItem> implements ExpenseItemService {
+
+}

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

@@ -0,0 +1,124 @@
+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.entity.ExpenseItem;
+import com.management.platform.entity.ExpenseSheet;
+import com.management.platform.entity.Project;
+import com.management.platform.entity.User;
+import com.management.platform.mapper.ExpenseItemMapper;
+import com.management.platform.mapper.ExpenseSheetMapper;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.ExpenseItemService;
+import com.management.platform.service.ExpenseSheetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2021-05-17
+ */
+@Service
+@Transactional
+public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, ExpenseSheet> implements ExpenseSheetService {
+    @Resource
+    private UserMapper userMapper;
+    @Resource
+    private ExpenseSheetMapper expenseSheetMapper;
+    @Resource
+    private ExpenseItemService expenseItemService;
+
+
+
+    @Override
+    public HttpRespMsg add(ExpenseSheet sheet, String items, String userId) {
+        HttpRespMsg msg = new HttpRespMsg();
+        //检查code不能重复
+        Integer num = expenseSheetMapper.selectCount(new QueryWrapper<ExpenseSheet>().eq("code", sheet.getCode()));
+        if (num > 0) {
+            msg.setError("票据编号已存在");
+            return msg;
+        }
+        JSONArray array = JSONArray.parseArray(items);
+        sheet.setOwnerId(userId);
+        User user = userMapper.selectById(userId);
+        sheet.setOwnerName(user.getName());
+        sheet.setCompanyId(user.getCompanyId());
+        expenseSheetMapper.insert(sheet);
+        List<ExpenseItem> itemList = new ArrayList<ExpenseItem>();
+        for (int i=0;i<array.size(); i++) {
+            JSONObject obj = array.getJSONObject(i);
+            ExpenseItem expenseItem = JSONObject.toJavaObject(obj, ExpenseItem.class);
+            expenseItem.setExpenseId(sheet.getId());
+            itemList.add(expenseItem);
+        }
+        expenseItemService.saveBatch(itemList);
+
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg delete(Integer id) {
+        expenseItemService.remove(new QueryWrapper<ExpenseItem>().eq("expense_id", id));
+        expenseSheetMapper.deleteById(id);
+        return new HttpRespMsg();
+    }
+
+    @Override
+    public HttpRespMsg queryList(ExpenseSheet sheet, Integer pageIndex, Integer pageSize) {
+        QueryWrapper<ExpenseSheet> queryWrapper = new QueryWrapper<ExpenseSheet>();
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        queryWrapper.orderByDesc("id");
+        if (sheet.getCode() != null) {
+            queryWrapper.eq("code", sheet.getCode());
+        }
+        if (sheet.getOwnerId() != null) {
+            queryWrapper.eq("owner_id", sheet.getOwnerId());
+        }
+        IPage<ExpenseSheet> listIPager = expenseSheetMapper.selectPage(new Page<>(pageIndex, pageSize),
+                queryWrapper);
+        Long total = listIPager.getTotal();
+        Map<String, Object> map = new HashMap<>();
+        map.put("records", listIPager.getRecords());
+        map.put("total", total);
+        httpRespMsg.data = map;
+        return httpRespMsg;
+    }
+
+    @Override
+    public HttpRespMsg getNextCode(String userId) {
+        User user = userMapper.selectById(userId);
+        DateTimeFormatter yyyyMMdd = DateTimeFormatter.ofPattern("yyyyMMdd");
+        String format = yyyyMMdd.format(LocalDate.now());
+        List<ExpenseSheet> list = expenseSheetMapper.selectList(new QueryWrapper<ExpenseSheet>()
+                .eq("company_id", user.getCompanyId())
+                .like("code", format).orderByDesc("id").last("limit 1"));
+        int start = 1;
+        if (list.size() > 0) {
+            String code = list.get(0).getCode();
+            code = code.substring(format.length(), code.length());
+            start = Integer.parseInt(code) + 1;
+        }
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = format+start;
+        return msg;
+    }
+}

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

@@ -195,6 +195,24 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                         if (projectMapper.insert(project) == 0) {
                             httpRespMsg.setError("操作失败");
+                        } else {
+                            //创建项目涉及到基线成本数据，要填写到快照表中
+                            EarningSnapshot snapshot = new EarningSnapshot();
+                            snapshot.setProjectId(project.getId());
+                            snapshot.setContractAmount(project.getContractAmount());
+                            snapshot.setBaseMan(project.getBaseMan());
+                            snapshot.setBaseOutsourcing(project.getBaseOutsourcing());
+                            snapshot.setBaseFee(project.getBaseFee());
+                            snapshot.setBaseRisk1(project.getBaseRisk1());
+                            snapshot.setBaseRisk2(project.getBaseRisk2());
+                            snapshot.setCreatorId(user.getId());
+                            snapshot.setCreatorName(user.getName());
+                            int total = project.getBaseFee()+project.getBaseMan()+project.getBaseOutsourcing()+project.getBaseRisk1()+project.getBaseRisk2();
+
+                            snapshot.setProfitA(100.0*(project.getContractAmount() - total)/project.getContractAmount());
+                            snapshot.setProfitB(100.0*(project.getContractAmount() - total-project.getBaseRisk1())/project.getContractAmount());
+                            snapshot.setProfitC(100.0*(project.getContractAmount() - total-project.getBaseRisk1() - project.getBaseRisk2())/project.getContractAmount());
+                            earningSnapshotMapper.insert(snapshot);
                         }
                         id = project.getId();
                     }

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

@@ -0,0 +1,24 @@
+<?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.ExpenseItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ExpenseItem">
+        <id column="id" property="id" />
+        <result column="expense_id" property="expenseId" />
+        <result column="project_id" property="projectId" />
+        <result column="happen_date" property="happenDate" />
+        <result column="invoice_type" property="invoiceType" />
+        <result column="invoice_no" property="invoiceNo" />
+        <result column="tax_percent" property="taxPercent" />
+        <result column="tax_value" property="taxValue" />
+        <result column="amount" property="amount" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, expense_id, project_id, happen_date, invoice_type, invoice_no, tax_percent, tax_value, amount, remark
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,23 @@
+<?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.ExpenseSheetMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ExpenseSheet">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="company_id" property="companyId" />
+        <result column="owner_id" property="ownerId" />
+        <result column="owner_name" property="ownerName" />
+        <result column="ticket_num" property="ticketNum" />
+        <result column="type" property="type" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, code, company_id, owner_id, owner_name, ticket_num, type, status, remark
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,6 +1,6 @@
 var path = require('path')
 
-var ip = '192.168.2.21'
+var ip = '127.0.0.1'
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {

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

@@ -51,7 +51,7 @@
                                 <span v-else style="color:green">已读</span>
                             </template>
                         </el-table-column>
-                        <el-table-column property="content" label="时间" align="center"></el-table-column>
+                        <el-table-column property="indate" label="时间" align="center"></el-table-column>
                     </el-table>
                 </el-drawer>                
                 <el-dropdown trigger="hover" style="margin-left:10px;">