费控添加备用金统计

hx-form/src/main/java/com/fjhx/form/controller/cost/CostControlController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.form.entity.cost.dto.CostControlDto;
 import com.fjhx.form.entity.cost.dto.CostControlSelectDto;
 import com.fjhx.form.entity.cost.vo.CostControlVo;
+import com.fjhx.form.entity.cost.vo.CostImprestVo;
 import com.fjhx.form.service.cost.CostControlService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,4 +83,9 @@ public class CostControlController {
         costControlService.cancellation(dto.getId());
     }
 
+    @PostMapping("/getImprestInfoByUserId")
+    CostImprestVo getImprestInfoByUserId(@RequestBody CostControlDto dto) {
+        return costControlService.getImprestInfoByUserId(dto.getApplyUserId());
+    }
+
 }

hx-form/src/main/java/com/fjhx/form/entity/cost/po/CostControlDetail.java

@@ -234,14 +234,25 @@ public class CostControlDetail extends BasePo {
     /**
      * 批次信息
      */
+    @Label("批次信息")
     private String batchInfo;
 
     /**
+     * 税点算法
+     * 10：不含税金额*( 1+税点)
+     * 20：不含税金额/( 1-税点 )
+     */
+    @Label("税点算法")
+    private Integer taxMethod;
+    @Label("是否含税")
+    private Integer isIncludeTax;
+    @Label("剩余归还金额")
+    private BigDecimal unReturnAmount;
+
+    /**
      * 核算项目字符串拼接
      */
     private String calculateItemStr;
-
-
     private String calculateItemType1;
     private String calculateItemName1;
     private String calculateItemType2;

hx-form/src/main/java/com/fjhx/form/entity/cost/vo/CostImprestVo.java

@@ -0,0 +1,30 @@
+package com.fjhx.form.entity.cost.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 费控备用金申请归还信息
+ */
+@Getter
+@Setter
+public class CostImprestVo {
+    /**
+     * 申请人
+     */
+    private Long applyUserId;
+    /**
+     * 申请金额
+     */
+    private BigDecimal applyMoney;
+    /**
+     * 归还金额
+     */
+    private BigDecimal returnAmount;
+    /**
+     * 剩余金额
+     */
+    private BigDecimal unReturnAmount;
+}

hx-form/src/main/java/com/fjhx/form/mapper/cost/CostControlMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.form.entity.cost.po.CostControl;
 import com.fjhx.form.entity.cost.vo.CostControlVo;
+import com.fjhx.form.entity.cost.vo.CostImprestVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +26,5 @@ public interface CostControlMapper extends BaseMapper<CostControl> {
 
     CostControlVo detail(@Param("ew") IWrapper<Object> wrapper);
 
+    CostImprestVo getImprestInfoByUserId(@Param("applyUserId") Long applyUserId);
 }

hx-form/src/main/java/com/fjhx/form/service/cost/CostControlService.java

@@ -7,6 +7,7 @@ import com.fjhx.form.entity.cost.dto.CostControlSelectDto;
 import com.fjhx.form.entity.cost.po.CostControl;
 import com.fjhx.form.entity.cost.po.CostControlDetail;
 import com.fjhx.form.entity.cost.vo.CostControlVo;
+import com.fjhx.form.entity.cost.vo.CostImprestVo;
 import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
@@ -55,4 +56,6 @@ public interface CostControlService extends BaseService<CostControl> {
     void cancellation(Long id);
 
     void cancelSettlement(List<CostControlDetail> costControlDetailList);
+
+    CostImprestVo getImprestInfoByUserId(Long userId);
 }

hx-form/src/main/java/com/fjhx/form/service/cost/impl/CostControlServiceImpl.java

@@ -42,6 +42,7 @@ import com.fjhx.form.entity.cost.po.CostControl;
 import com.fjhx.form.entity.cost.po.CostControlDetail;
 import com.fjhx.form.entity.cost.vo.CostControlDetailVo;
 import com.fjhx.form.entity.cost.vo.CostControlVo;
+import com.fjhx.form.entity.cost.vo.CostImprestVo;
 import com.fjhx.form.mapper.cost.CostControlMapper;
 import com.fjhx.form.service.cost.CostControlDetailService;
 import com.fjhx.form.service.cost.CostControlService;
@@ -504,4 +505,13 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
         }
     }
 
+    /**
+     * 获取用户备用金信息
+     */
+    @Override
+    public CostImprestVo getImprestInfoByUserId(Long userId) {
+        Assert.notEmpty(userId, "申请人不能为空");
+        return baseMapper.getImprestInfoByUserId(userId);
+    }
+
 }

hx-form/src/main/resources/mapper/cost/CostControlMapper.xml

@@ -26,5 +26,18 @@
         from cost_control cc
             ${ew.customSqlSegment}
     </select>
+    <select id="getImprestInfoByUserId" resultType="com.fjhx.form.entity.cost.vo.CostImprestVo">
+        SELECT cc.apply_user_id,
+               sum(IF(pt.`name` LIKE '%备用金申请%', ccd.money, 0))           AS apply_money,
+               sum(IF(pt.`name` LIKE '%备用金归还%', ccd.money, 0))           AS return_amount,
+               sum(IF(pt.`name` LIKE '%备用金申请%', ccd.money, - ccd.money)) AS un_return_amount
+        FROM cost_control_detail ccd
+                 JOIN cost_control cc ON ccd.cost_control_id = cc.id
+                 JOIN payment_type pt ON cc.cost_type = pt.id
+        WHERE (pt.`name` LIKE '%备用金申请%' OR pt.`name` LIKE '%备用金归还%')
+          AND cc.`status` IN (10, 30, 60)
+          AND cc.apply_user_id = #{applyUserId}
+        GROUP BY cc.apply_user_id
+    </select>
 
 </mapper>