1

huimv-farm/src/main/java/vip/xiaonuo/money/controller/MoneyBusinessController.java

@@ -16,6 +16,7 @@ import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.hr.modular.baseemployeeinfo.entity.HrBaseEmployeeInfo;
 import vip.xiaonuo.hr.modular.baseemployeeinfo.param.HrBaseEmployeeInfoPageParam;
 import vip.xiaonuo.money.entity.MoneyBusiness;
+import vip.xiaonuo.money.param.MoneyAnalysisParam;
 import vip.xiaonuo.money.param.MoneyBusinessPageParam;
 import vip.xiaonuo.money.param.MoneyBusinessParam;
 import vip.xiaonuo.money.service.IMoneyBusinessService;
@@ -76,4 +77,12 @@ public class MoneyBusinessController {
         businessService.deleteBusiness(business);
         return CommonResult.ok();
     }
+
+
+    @ApiOperation("董事长页面指标卡")
+    @PostMapping("/money/dsBusAll")
+    public CommonResult<Map<String ,String >> dsBusAll(@RequestBody MoneyAnalysisParam moneyAnalysisParam) {
+        Map<String ,String > map =  businessService.dsBusAll(moneyAnalysisParam);
+        return CommonResult.data(map);
+    }
 }

huimv-farm/src/main/java/vip/xiaonuo/money/mapper/MoneyBusinessMapper.java

@@ -1,8 +1,13 @@
 package vip.xiaonuo.money.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.money.entity.MoneyBusiness;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 财务营业情况 Mapper 接口
@@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MoneyBusinessMapper extends BaseMapper<MoneyBusiness> {
 
+    List<MoneyBusiness> dsBusAll(@Param(Constants.WRAPPER)  QueryWrapper<MoneyBusiness> wapper);
 }

huimv-farm/src/main/java/vip/xiaonuo/money/param/DsBusAllParam.java

@@ -0,0 +1,53 @@
+package vip.xiaonuo.money.param;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sun.istack.NotNull;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DsBusAllParam {
+    @ApiModelProperty(value = "营业收入", position = 2)
+    private String businessIncome;
+    private String businessIncomeOnYear;
+
+    /**
+     * 营业成本
+     */
+    @ApiModelProperty(value = "营业成本", position = 3)
+    private String businessCost;
+    private String businessCostOnYear;
+
+    /**
+     * 净利润
+     */
+    @ApiModelProperty(value = "净利润", position = 4)
+    private String profit;
+    private String profitOnYear;
+
+    /**
+     * 已交税金
+     */
+    @ApiModelProperty(value = "已交税金", position = 5)
+    private String taxes;
+    private String taxesOnYear;
+
+    /**
+     * 当前资金余额
+     */
+    @ApiModelProperty(value = "当前资金余额", position = 6)
+    private String balance;
+    private String balanceOnYear;
+
+    @ApiModelProperty(value = "银行借款金额", position = 6)
+    private String borrowPrice;
+    private String borrowPriceOnYear;
+
+
+
+
+
+}

huimv-farm/src/main/java/vip/xiaonuo/money/service/IMoneyBusinessService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import vip.xiaonuo.money.entity.MoneyBusiness;
 import com.baomidou.mybatisplus.extension.service.IService;
+import vip.xiaonuo.money.param.MoneyAnalysisParam;
 import vip.xiaonuo.money.param.MoneyBusinessPageParam;
 import vip.xiaonuo.money.param.MoneyBusinessParam;
 
@@ -38,4 +39,5 @@ public interface IMoneyBusinessService extends IService<MoneyBusiness> {
     //财务指标卡删除
     void deleteBusiness(MoneyBusiness business);
 
+    Map<String, String> dsBusAll(MoneyAnalysisParam moneyAnalysisParam);
 }

huimv-farm/src/main/java/vip/xiaonuo/money/service/impl/MoneyBusinessServiceImpl.java

@@ -2,6 +2,7 @@ package vip.xiaonuo.money.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.math.Money;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import vip.xiaonuo.money.entity.MoneyBusiness;
 import vip.xiaonuo.money.mapper.MoneyBusinessMapper;
+import vip.xiaonuo.money.param.MoneyAnalysisParam;
 import vip.xiaonuo.money.param.MoneyBusinessPageParam;
 import vip.xiaonuo.money.param.MoneyBusinessParam;
 import vip.xiaonuo.money.service.IMoneyBusinessService;
@@ -147,4 +149,21 @@ public class MoneyBusinessServiceImpl extends ServiceImpl<MoneyBusinessMapper, M
     public void deleteBusiness(MoneyBusiness business) {
         businessMapper.deleteById(business);
     }
+
+    @Override
+    public Map<String, String> dsBusAll(MoneyAnalysisParam moneyAnalysisParam) {
+        String orgId = moneyAnalysisParam.getOrgId();
+        String time = moneyAnalysisParam.getTime();
+        Date date ;
+        if (StringUtils.isBlank(time)){
+            date = DateUtil.beginOfMonth(new Date());
+        }else {
+            date = DateUtil.beginOfMonth(DateUtil.parseDate(time));
+        }
+        QueryWrapper<MoneyBusiness> wapper = new QueryWrapper<MoneyBusiness>();
+        wapper.eq("org_id", StringUtils.isNotBlank(orgId)).between("create_time", date, DateUtil.endOfMonth(date));
+//        MoneyBusiness moneyBusinesses =  businessMapper.dsBusAll(wapper);
+
+        return null;
+    }
 }

huimv-farm/src/main/java/vip/xiaonuo/sale/controller/ErpBaseMaterialController.java

@@ -170,9 +170,9 @@ public class ErpBaseMaterialController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除erp_base_material")
     @PostMapping("/huimv-farm/basematerial/delete")
-    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
-                                                   CommonValidList<ErpBaseMaterialIdParam> erpBaseMaterialIdParamList) {
-        erpBaseMaterialService.delete(erpBaseMaterialIdParamList);
+    public CommonResult<String> delete(@RequestBody
+                                                   Map<String ,Integer> map) {
+        erpBaseMaterialService.delete(map);
         return CommonResult.ok();
     }
 

huimv-farm/src/main/java/vip/xiaonuo/sale/entity/ErpBaseMaterial.java

@@ -32,7 +32,7 @@ import java.util.List;
 public class ErpBaseMaterial {
 
     /** ID */
-    @TableId
+    @TableId(type=IdType.AUTO)
     @ApiModelProperty(value = "ID", position = 1)
     private Integer id;
 

huimv-farm/src/main/java/vip/xiaonuo/sale/service/ErpBaseMaterialService.java

@@ -22,6 +22,7 @@ import vip.xiaonuo.sale.param.ErpBaseMaterialIdParam;
 import vip.xiaonuo.sale.param.ErpBaseMaterialPageParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * erp_base_materialService接口
@@ -61,7 +62,7 @@ public interface ErpBaseMaterialService extends IService<ErpBaseMaterial> {
      * @author 1
      * @date  2025/02/18 13:54
      */
-    void delete(List<ErpBaseMaterialIdParam> erpBaseMaterialIdParamList);
+    void delete(Map<String ,Integer> map);
 
     /**
      * 获取erp_base_material详情

huimv-farm/src/main/java/vip/xiaonuo/sale/service/impl/ErpBaseMaterialServiceImpl.java

@@ -37,6 +37,7 @@ import vip.xiaonuo.sale.param.ErpBaseMaterialPageParam;
 import vip.xiaonuo.sale.service.ErpBaseMaterialService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * erp_base_materialService接口实现类
@@ -111,14 +112,13 @@ public class ErpBaseMaterialServiceImpl extends ServiceImpl<ErpBaseMaterialMappe
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void delete(List<ErpBaseMaterialIdParam> erpBaseMaterialIdParamList) {
-        for (ErpBaseMaterialIdParam erpBaseMaterialIdParam : erpBaseMaterialIdParamList) {
-            if (erpBaseMaterialMapper.exists(new QueryWrapper<ErpBaseMaterial>().eq("parent_id",erpBaseMaterialIdParam.getId()))){
-                throw new CommonException("该物料有下级无聊，请删除");
-            }
+    public void delete(Map<String ,Integer> map) {
+        if (erpBaseMaterialMapper.exists(new QueryWrapper<ErpBaseMaterial>().eq("parent_id",map.get("id")))){
+            throw new CommonException("该物料有下级物料，请删除");
         }
         // 执行删除
-        this.removeByIds(CollStreamUtil.toList(erpBaseMaterialIdParamList, ErpBaseMaterialIdParam::getId));
+
+        this.removeById(map.get("id"));
     }
 
     @Override

huimv-farm/src/main/java/vip/xiaonuo/sale/service/impl/SaleProduceServiceImpl.java

@@ -55,12 +55,12 @@ public class SaleProduceServiceImpl extends ServiceImpl<SaleProduceMapper, SaleP
                 QueryWrapper<SaleProduce> queryWrapper = new QueryWrapper<>();
                 queryWrapper.like("produce_name", material.getMaterialName());
                 queryWrapper.between("create_time", time + "-01 00:00:00", time + "-31 23:59:59");
-                queryWrapper.select(" IFNULL(sum(sale_money),'0') saleMoney,convert(IFNULL(avg(price),'0'),decimal(10,2))");
+                queryWrapper.select(" IFNULL(sum(sale_money),'0') saleMoney,convert(IFNULL(avg(price),'0'),decimal(10,2) ) price");
                 SaleProduce monthProduce = produceMapper.selectOne(queryWrapper);
                 QueryWrapper<SaleProduce> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.like("produce_name", material.getMaterialName());
                 queryWrapper1.between("create_time", year + "-01-01 00:00:00", year + "-12-31 23:59:59");
-                queryWrapper1.select(" IFNULL(sum(sale_money),'0') saleMoney,convert(IFNULL(avg(price),'0'),decimal(10,2))");
+                queryWrapper1.select(" IFNULL(sum(sale_money),'0') saleMoney,convert(IFNULL(avg(price),'0'),decimal(10,2) ) price");
                 SaleProduce yearProduce = produceMapper.selectOne(queryWrapper1);
 
                 monthSaleMoney = monthSaleMoney + Double.valueOf(monthProduce.getSaleMoney());
@@ -137,7 +137,7 @@ public class SaleProduceServiceImpl extends ServiceImpl<SaleProduceMapper, SaleP
                 QueryWrapper<SaleProduce> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.like("produce_name", material.getMaterialName());
                 queryWrapper1.between("create_time", last + "-"+i+"-01 00:00:00", last +"-"+i+"-31 23:59:59");
-                queryWrapper1.select(" sum(sale_money) saleMoney,create_time createTime");
+                queryWrapper1.select(" IFNULL(sum(sale_money),'0') saleMoney,create_time createTime");
                 SaleProduce yearProduce = produceMapper.selectOne(queryWrapper1);
                 lastYearMoney = lastYearMoney + Double.valueOf(yearProduce.getSaleMoney());
             }

huimv-farm/src/main/resources/mapper/MoneyBusinessMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.money.mapper.MoneyBusinessMapper">
 
+
+    <select id="dsBusAll" resultType="vip.xiaonuo.money.entity.MoneyBusiness">
+      SELECT
+    id,
+    org_id,
+    ROUND(IFNULL(SUM(business_income), 0), 2) AS business_income,
+    ROUND(IFNULL(SUM(business_cost), 0), 2) AS business_cost,
+    ROUND(IFNULL(SUM(profit), 0), 2) AS profit,
+    ROUND(IFNULL(SUM(taxes), 0), 2) AS taxes,
+    ROUND(IFNULL(SUM(balance), 0), 2) AS balance
+FROM
+    `money_business`
+     ${ew.customSqlSegment}
+    </select>
 </mapper>