1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SpeedExpenseInfoController.java

@@ -57,6 +57,15 @@ public class SpeedExpenseInfoController {
     public String editInfo(@RequestBody SpeedExpenseInfo speedExpenseInfo){
         return speedExpenseInfoService.editInfo(speedExpenseInfo);
     }
+    /**
+     * 查询总费用
+     * @param speedExpenseInfo
+     * @return
+     */
+    @GetMapping("/selectExpenseTotal")
+    public SpeedExpenseInfo selectExpenseTotal(SpeedExpenseInfo speedExpenseInfo) {
+        return speedExpenseInfoService.selectExpenseTotal(speedExpenseInfo);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SpeedExpenseInfo.java

@@ -79,6 +79,16 @@ public class SpeedExpenseInfo extends BaseModel<SpeedExpenseInfo> {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(exist = false)
     private Date endDate;
+    /**
+     * 收入
+     */
+    @TableField(exist = false)
+    private Double income;
+    /**
+     * 支出
+     */
+    @TableField(exist = false)
+    private Double pay;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/SpeedExpenseInfoMapper.java

@@ -19,4 +19,6 @@ public interface SpeedExpenseInfoMapper extends BaseMapper<SpeedExpenseInfo> {
     Integer getCountByCondition(Map<String, Object> pageView);
 
     List<SpeedExpenseInfo> getListByCondition(Map<String, Object> pageView);
+
+    SpeedExpenseInfo getExpenseTotal(Map<String, Object> pageView);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISpeedExpenseInfoService.java

@@ -21,4 +21,6 @@ public interface ISpeedExpenseInfoService extends IService<SpeedExpenseInfo> {
     void deleteInfo(String id);
 
     String editInfo(SpeedExpenseInfo speedExpenseInfo);
+
+    SpeedExpenseInfo selectExpenseTotal(SpeedExpenseInfo speedExpenseInfo);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -1215,7 +1215,8 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
         else if ("3".equals(expenseInfo1.getExpensesPurpose()) && "5".equals(expenseInfo1.getAutoAssign())) {
             //查询该仓库是否有燃料款信息
             CoalPaymentInfo coalPaymentInfo = coalPaymentInfoService.selectOne(new EntityWrapper<CoalPaymentInfo>()
-            .eq("warehouse_name",expenseInfo1.getWarehouseName()));
+                    .eq("comp_id",expenseInfo1.getCompId())
+                    .eq("warehouse_name",expenseInfo1.getWarehouseName()));
             if (coalPaymentInfo == null){
                 //为空，新增
                 CoalPaymentInfo coalPaymentInfo1 = new CoalPaymentInfo();

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SpeedExpenseInfoServiceImpl.java

@@ -67,4 +67,15 @@ public class SpeedExpenseInfoServiceImpl extends ServiceImpl<SpeedExpenseInfoMap
         this.updateById(speedExpenseInfo);
         return "ok";
     }
+
+    @Override
+    public SpeedExpenseInfo selectExpenseTotal(SpeedExpenseInfo speedExpenseInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        //公司id
+        pageView.put("compId", speedExpenseInfo.getCompId());
+        pageView.put("startDate", speedExpenseInfo.getStartDate());
+        pageView.put("endDate", speedExpenseInfo.getEndDate());
+        SpeedExpenseInfo speedExpenseInfo1 = baseMapper.getExpenseTotal(pageView);
+        return speedExpenseInfo1;
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SpeedExpenseInfoMapper.xml

@@ -51,4 +51,26 @@
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
     </select>
+    <select id="getExpenseTotal" parameterType="Map" resultType="com.yh.saas.plugin.yiliangyiyun.entity.SpeedExpenseInfo">
+        SELECT
+        IFNULL(SUM(b.amount_money),0) as income,
+        IFNULL(SUM(c.amount_money),0) as pay
+        FROM speed_expense_info a
+        LEFT JOIN speed_expense_info b ON b.id = a.id
+        AND b.delete_flag = 0
+        AND b.expenses_type = '收入'
+        LEFT JOIN speed_expense_info c ON c.id = a.id
+        AND c.delete_flag = 0
+        AND c.expenses_type = '支出'
+        WHERE a.delete_flag = '0'
+        and a.comp_id= #{compId}
+        <if test="startDate != null">
+            AND (DATE_FORMAT(a.create_date ,"%Y%m%d") >=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(a.create_date ,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+    </select>
 </mapper>