费用报销增加支付方式

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

@@ -0,0 +1,37 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.ExpensePayWay;
+import com.management.platform.service.ExpensePayWayService;
+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 2024-01-09
+ */
+@RestController
+@RequestMapping("/expense-pay-way")
+public class ExpensePayWayController {
+
+    @Resource
+    private ExpensePayWayService expensePayWayService;
+    @RequestMapping("/get")
+    public HttpRespMsg get(Integer companyId) {
+        List<ExpensePayWay> data = expensePayWayService.list(new QueryWrapper<ExpensePayWay>().eq("company_id", companyId));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = data;
+        return msg;
+    }
+}
+

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

@@ -2,11 +2,13 @@ package com.management.platform.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.ExpensePayWay;
 import com.management.platform.entity.ExpenseSheet;
 import com.management.platform.entity.User;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.SysFunctionMapper;
 import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.ExpensePayWayService;
 import com.management.platform.service.ExpenseSheetService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,6 +41,8 @@ public class ExpenseSheetController {
     private HttpServletRequest request;
     @Resource
     SysFunctionMapper sysFunctionMapper;
+    @Resource
+    ExpensePayWayService expensePayWayService;
 
     @RequestMapping("/getNextCode")
     public HttpRespMsg getNextCode() {
@@ -127,15 +131,20 @@ public class ExpenseSheetController {
     }
 
     @RequestMapping("/editSendExpense")
-    public HttpRespMsg sendExpense(String expenseIds,Integer sendState){
+    public HttpRespMsg sendExpense(String expenseIds,Integer sendState, Integer payWayId){
         HttpRespMsg msg=new HttpRespMsg();
         String[] split = expenseIds.split(",");
         List<String> asList = Arrays.asList(split);
         List<Integer> ids = asList.stream().map(i -> Integer.parseInt(i)).collect(Collectors.toList());
         ids.add(-1);
+        ExpensePayWay payway = expensePayWayService.getById(payWayId);
         List<ExpenseSheet> expenseSheets = expenseSheetService.list(new QueryWrapper<ExpenseSheet>().in("id", ids));
         expenseSheets.forEach(e->{
             e.setSendState(sendState);
+            if (payway != null) {
+                e.setPayWayId(payWayId);
+                e.setPayWayName(payway.getName());
+            }
         });
         if(!expenseSheetService.updateBatchById(expenseSheets)){
             msg.setError("验证失败");

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ExpensePayWay.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 2024-01-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ExpensePayWay extends Model<ExpensePayWay> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("company_id")
+    private Integer companyId;
+
+    @TableField("name")
+    private String name;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -20,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-12-16
+ * @since 2024-01-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -142,6 +142,19 @@ public class ExpenseSheet extends Model<ExpenseSheet> {
     @TableField(exist = false)
     private String secondCheckerName;
 
+    /**
+     * 支付方式id
+     */
+    @TableField("pay_way_id")
+    private Integer payWayId;
+
+    /**
+     * 支付方式名称
+     */
+    @TableField("pay_way_name")
+    private String payWayName;
+
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

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

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

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

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ExpensePayWay;
+import com.management.platform.mapper.ExpensePayWayMapper;
+import com.management.platform.service.ExpensePayWayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-01-09
+ */
+@Service
+public class ExpensePayWayServiceImpl extends ServiceImpl<ExpensePayWayMapper, ExpensePayWay> implements ExpensePayWayService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ExpensePayWayMapper.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.ExpensePayWayMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ExpensePayWay">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="name" property="name" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, company_id, name
+    </sql>
+
+</mapper>

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

@@ -21,11 +21,13 @@
         <result column="first_checker_id" property="firstCheckerId" />
         <result column="second_checker_id" property="secondCheckerId" />
         <result column="review_process" property="reviewProcess" />
+        <result column="pay_way_id" property="payWayId" />
+        <result column="pay_way_name" property="payWayName" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, code, company_id, owner_id, owner_name, create_date, ticket_num, type, status, remark, total_amount, operator_id, deny_reason, send_state, first_checker_id, second_checker_id, review_process
+        id, code, company_id, owner_id, owner_name, create_date, ticket_num, type, status, remark, total_amount, operator_id, deny_reason, send_state, first_checker_id, second_checker_id, review_process, pay_way_id, pay_way_name
     </sql>
 
 </mapper>