Merge remote-tracking branch 'origin/master'

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

@@ -22,6 +22,7 @@ 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.entity.vo.MoneyBusinessVo;
+import vip.xiaonuo.money.entity.vo.MoneyVo;
 import vip.xiaonuo.money.param.*;
 import vip.xiaonuo.money.service.IMoneyBusinessService;
 
@@ -46,6 +47,7 @@ public class MoneyBusinessController {
     private IMoneyBusinessService businessService;
 
 
+
     @ApiOperationSupport(order = 1)
     @ApiOperation("指标卡")
     @PostMapping("/money/listBusiness")
@@ -166,5 +168,45 @@ public class MoneyBusinessController {
         return CommonResult.ok();
     }
 
+    @ApiOperation("资金余额填报")
+    @PostMapping("/money/addBalance")
+    public CommonResult<JSONArray> addBalance(@RequestBody MoneyVo MoneyVo) {
+        String orgId = MoneyVo.getOrgId();
+        if (StringUtils.isBlank(orgId)){
+            throw new CommonException("请选择公司");
+        }
+        MoneyBusiness moneyBusiness = new MoneyBusiness();
+        moneyBusiness.setOrgId(MoneyVo.getOrgId());
+        moneyBusiness.setBalance(MoneyVo.getBalance());
+        moneyBusiness.setCreateTime(DateUtil.parse(MoneyVo.getCreateTime(),"yyyy-MM"));
+        businessService.save(moneyBusiness);
+        return CommonResult.ok();
+    }
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("资金余额列表")
+    @PostMapping("/money/listBalance")
+    public CommonResult<Page<MoneyBusiness>> listBalance(@RequestBody  MoneyParam pageParam) {
+        return  CommonResult.data(businessService.listBalance(pageParam));
+    }
 
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("资金余额删除")
+    @PostMapping("/money/deleteBalance")
+    public CommonResult<String> deleteBalance(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        businessService.removeById(id);
+        return CommonResult.ok();
+    }
+    @ApiOperationSupport(order = 4)
+    @ApiOperation("资金余额修改")
+    @PostMapping("/money/updateBalance")
+    public CommonResult<String> updateBalance(@RequestBody MoneyVo moneyBusinessParam) {
+
+        MoneyBusiness moneyBusiness = new MoneyBusiness();
+        moneyBusiness.setBalance(moneyBusinessParam.getBalance());
+        moneyBusiness.setId(moneyBusinessParam.getId());
+        moneyBusiness.setCreateTime(DateUtil.parse(moneyBusinessParam.getCreateTime(),"yyyy-MM"));
+        businessService.updateById(moneyBusiness);
+        return CommonResult.ok();
+    }
 }

huimv-farm/src/main/java/vip/xiaonuo/money/entity/vo/MoneyVo.java

@@ -0,0 +1,40 @@
+package vip.xiaonuo.money.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 财务营业情况
+ * </p>
+ *
+ * @author author
+ * @since 2024-11-19
+ */
+@Data
+public class MoneyVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private Integer id;
+
+    /**
+     * 组织id
+     */
+    @ApiModelProperty(value = "组织id", position = 1)
+    private String orgId;
+
+
+    @ApiModelProperty(value = "资金余额", position = 5)
+    private String balance;
+
+    @ApiModelProperty(value = "创建时间", position = 7)
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String  createTime;
+
+
+}

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright [2022] [https://www.baiduc.com]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.baiduc.com
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.baiduc.com
+ */
+package vip.xiaonuo.money.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 人员明细Id参数
+ *
+ * @author 余
+ * @date  2024/11/14 15:02
+ **/
+@Getter
+@Setter
+public class MoneyParam {
+
+
+    @ApiModelProperty(value = "orgId", required = true)
+    private String orgId;
+
+    @ApiModelProperty(value = "当前页码", required = true)
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "页大小", required = true)
+    private Integer pageSize;
+
+}

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

@@ -48,4 +48,7 @@ public interface IMoneyBusinessService extends IService<MoneyBusiness> {
     List<DsBusSaleMoneyParam> getMoneyDetail(DsBusParam dsBusParam);
 
     Page<MoneyBusiness> listBusines(MoneyOverduePageParam pageParam);
+
+    //资金余额
+    Page<MoneyBusiness> listBalance(MoneyParam pageParam);
 }

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

@@ -284,6 +284,14 @@ public class MoneyBusinessServiceImpl extends ServiceImpl<MoneyBusinessMapper, M
 
     }
 
+    @Override
+    public Page<MoneyBusiness> listBalance(MoneyParam pageParam) {
+        QueryWrapper<MoneyBusiness> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(pageParam.getOrgId()), "org_id", pageParam.getOrgId()).ge("balance" ,0);
+        Page<MoneyBusiness> page = new Page<MoneyBusiness>(pageParam.getPageNum(), pageParam.getPageSize());
+        return this.page(page, queryWrapper);
+    }
+
     public static String calculateYOYChange(double currentValue, double previousValue) {
         // 处理零值情况
         if (previousValue == 0) {

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

@@ -46,7 +46,7 @@ public class MoneyCostServiceImpl extends ServiceImpl<MoneyCostMapper, MoneyCost
         QueryWrapper<MoneyCost> queryWrapper = new QueryWrapper<>();
         queryWrapper.ge("create_time", currentDateString);
         queryWrapper.eq(StringUtils.isNotBlank(outParam.getOrgId()), "org_id", outParam.getOrgId());
-        queryWrapper.select(" IFNULL(sum(manage),'0') manage,convert(IFNULL(sum(sale),'0'),decimal(10,2)) sale,IFNULL(sum(finance),'0') finance,,IFNULL(sum(research),'0') research," +
+        queryWrapper.select(" IFNULL(sum(manage),'0') manage,convert(IFNULL(sum(sale),'0'),decimal(10,2)) sale,IFNULL(sum(finance),'0') finance,IFNULL(sum(research),'0') research," +
                 "create_time createTime");
         queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
         queryWrapper.orderByAsc("create_time");

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

@@ -78,17 +78,17 @@ public class MoneyIncomeServiceImpl extends ServiceImpl<MoneyIncomeMapper, Money
         } else {
             for (MoneyBusiness business : businesses) {
                 if (business.getOrgId() != null) {
-                    if (business.getOrgId().equals("1543842934270394368")) {
+                    if ("1891303052992876545".equals(business.getOrgId())) {
                         BigDecimal bg1 = new BigDecimal(business.getBusinessIncome());
                         bg1 = bg1.divide(math, 2, RoundingMode.HALF_UP);
                         incomeVo.setShengWu(bg1.toString());
                         actual = actual + Double.valueOf(business.getBusinessIncome());
-                    } else if (business.getOrgId().equals("1856160630562635777")) {
+                    } else if ("1856160630562635777".equals(business.getOrgId())) {
                         BigDecimal bg2 = new BigDecimal(business.getBusinessIncome());
                         bg2 = bg2.divide(math, 2, RoundingMode.HALF_UP);
                         incomeVo.setYingYang(bg2.toString());
                         actual = actual + Double.valueOf(business.getBusinessIncome());
-                    } else if (business.getOrgId().equals("1856160687106048001")) {
+                    } else if ("1856160687106048001".equals(business.getOrgId())) {
                         BigDecimal bg3 = new BigDecimal(business.getBusinessIncome());
                         bg3 = bg3.divide(math, 2, RoundingMode.HALF_UP);
                         incomeVo.setXiaSha(bg3.toString());
@@ -143,19 +143,19 @@ public class MoneyIncomeServiceImpl extends ServiceImpl<MoneyIncomeMapper, Money
             income2.setYearTarget("0");
         } else {
             for (MoneyIncome moneyIncome : incomes) {
-                if (moneyIncome.getOrgId().equals("1891303052992876545")) {
+                if ("1891303052992876545".equals(moneyIncome.getOrgId())) {
                     BigDecimal bg1 = new BigDecimal(moneyIncome.getYearTarget());
                     bg1 = bg1.divide(math, 2, RoundingMode.HALF_UP);
                     income.setYearTarget(bg1.toString());
                     income.setCompanyName(moneyIncome.getCompanyName());
                     income.setCompanyType(1);
-                } else if (moneyIncome.getOrgId().equals("1856160630562635777")) {
+                } else if ("1856160630562635777".equals(moneyIncome.getOrgId())) {
                     BigDecimal bg2 = new BigDecimal(moneyIncome.getYearTarget());
                     bg2 = bg2.divide(math, 2, RoundingMode.HALF_UP);
                     income1.setYearTarget(bg2.toString());
                     income1.setCompanyName(moneyIncome.getCompanyName());
                     income1.setCompanyType(2);
-                } else if (moneyIncome.getOrgId().equals("1856160687106048001")) {
+                } else if ("1856160687106048001".equals(moneyIncome.getOrgId())) {
                     BigDecimal bg3 = new BigDecimal(moneyIncome.getYearTarget());
                     bg3 = bg3.divide(math, 2, RoundingMode.HALF_UP);
                     income2.setYearTarget(bg3.toString());
@@ -175,15 +175,15 @@ public class MoneyIncomeServiceImpl extends ServiceImpl<MoneyIncomeMapper, Money
         } else {
             for (MoneyBusiness business : businesses) {
                 if (business.getOrgId() != null) {
-                    if (business.getOrgId().equals("1891303052992876545")) {
+                    if ("1891303052992876545".equals(business.getOrgId())) {
                         BigDecimal bg1 = new BigDecimal(business.getBusinessIncome());
                         bg1 = bg1.divide(math, 2, RoundingMode.HALF_UP);
                         income.setYearActual(bg1.toString());
-                    } else if (business.getOrgId().equals("1856160630562635777")) {
+                    } else if ("1856160630562635777".equals(business.getOrgId())) {
                         BigDecimal bg2 = new BigDecimal(business.getBusinessIncome());
                         bg2 = bg2.divide(math, 2, RoundingMode.HALF_UP);
                         income1.setYearActual(bg2.toString());
-                    } else if (business.getOrgId().equals("1856160687106048001")) {
+                    } else if ("1856160687106048001".equals(business.getOrgId())) {
                         BigDecimal bg3 = new BigDecimal(business.getBusinessIncome());
                         bg3 = bg3.divide(math, 2, RoundingMode.HALF_UP);
                         income2.setYearActual(bg3.toString());