1

huimv-farm/src/main/java/vip/xiaonuo/importData/entity/BalanceData.java

@@ -17,4 +17,5 @@ public class BalanceData {
 
     @ApiModelProperty(value = "创建时间", position = 3)
     private Date  createTime;
+    private Date  deadline;
 }

huimv-farm/src/main/java/vip/xiaonuo/importData/entity/BankData.java

@@ -58,4 +58,8 @@ public class BankData {
 
     @ApiModelProperty(value = "是否还款", position = 11)
     private Integer isRepayment;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date deadline;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/importData/entity/OverdueData.java

@@ -66,6 +66,9 @@ public class OverdueData {
     @ApiModelProperty(value = "逾期天数", position = 8)
     private String yqts;
 
+    @ApiModelProperty(value = "截止日期", position = 8)
+    private Date deadline;
+
 
 
 }

huimv-farm/src/main/java/vip/xiaonuo/importData/entity/RemoveData.java

@@ -58,4 +58,5 @@ public class RemoveData {
 
     @ApiModelProperty(value = "交易关联方", position = 8)
     private String customerName;
+    private String num;
 }

huimv-farm/src/main/java/vip/xiaonuo/importData/service/impl/ImportDataImpl.java

@@ -234,9 +234,9 @@ public class ImportDataImpl implements ImportData {
                 if (moneyData.getCreateTime() == null) {
                 } else {
                     MoneyCost moneyCost = new MoneyCost();
-                    moneyCost.setSale(moneyData.getSale());
-                    moneyCost.setManage(moneyData.getManage());
-                    moneyCost.setFinance(moneyData.getFinance());
+                    moneyCost.setSale(getFloat(moneyData.getSale()));
+                    moneyCost.setManage(getFloat(moneyData.getManage()));
+                    moneyCost.setFinance(getFloat(moneyData.getFinance()));
                     moneyCost.setCreateTime(moneyData.getCreateTime());
                     moneyCost.setOrgId(orgId);
                     moneyCost.setCompany(org.getName());
@@ -254,6 +254,15 @@ public class ImportDataImpl implements ImportData {
         return CommonResult.ok();
     }
 
+    private static String getFloat(String sale) {
+
+        if (StringUtils.isNotBlank(sale)){
+            return String.format("%.2f",Double.parseDouble(sale));
+        }else {
+            return "0";
+        }
+    }
+
     @Override
     public CommonResult importOverdue(HttpServletRequest httpServletRequest, String orgId, MultipartFile files) {
         Map<String , String> map = new HashMap<>();
@@ -275,6 +284,7 @@ public class ImportDataImpl implements ImportData {
         map.put("到期日期" , "endTime");
         map.put("逾期天数" , "yqts");
         map.put("合同号" , "documentNumber");
+        map.put("截止日期" , "deadline");
 
 
 //        SysOrg org = orgMapper.selectOne(new QueryWrapper<SysOrg>().eq("id", orgId));
@@ -301,12 +311,13 @@ public class ImportDataImpl implements ImportData {
 
                     overdue.setUserName(overdueData.getUserName());
                     overdue.setBz(overdueData.getBz());
-                    overdue.setYbje(overdueData.getYbje());
-                    overdue.setRmbje(overdueData.getRmbje());
+                    overdue.setYbje(getFloat(overdueData.getYbje()));
+                    overdue.setRmbje(getFloat(overdueData.getRmbje()));
                     overdue.setXsrq(overdueData.getXsrq());
                     overdue.setSkqx(overdueData.getSkqx());
                     overdue.setEndTime(overdueData.getEndTime());
                     overdue.setYqts(overdueData.getYqts());
+                    overdue.setDeadline(overdueData.getDeadline());
                     overdue.setDocumentNumber(overdueData.getDocumentNumber());
                     overdueMapper.insert(overdue);
                 }
@@ -329,10 +340,11 @@ public class ImportDataImpl implements ImportData {
 //        map.put("填报公司" , "orgName");
         map.put("资金余额" , "balance");
         map.put("创建时间" , "createTime");
+        map.put("截止日期" , "deadline");
 
 
 
-        SysOrg org = orgMapper.selectOne(new QueryWrapper<SysOrg>().eq("id", orgId));
+//        SysOrg org = orgMapper.selectOne(new QueryWrapper<SysOrg>().eq("id", orgId));
         try(
                 //这里面的对象会自动关闭
                 InputStream in = files.getInputStream();
@@ -347,8 +359,9 @@ public class ImportDataImpl implements ImportData {
                 } else {
                     MoneyBusiness moneyBusiness = new MoneyBusiness();
                     moneyBusiness.setOrgId(orgId);
-                    moneyBusiness.setBalance(balanceData.getBalance());
+                    moneyBusiness.setBalance(getFloat(balanceData.getBalance()));
                     moneyBusiness.setCreateTime(balanceData.getCreateTime());
+                    moneyBusiness.setDeadline(balanceData.getDeadline());
                     businessMapper.insert(moneyBusiness);
                 }
 
@@ -375,6 +388,7 @@ public class ImportDataImpl implements ImportData {
         map.put("借款利率(%)" , "bankRank");
         map.put("借款类型" , "bankType");
         map.put("还款时间" , "repaymentTime");
+        map.put("截止日期" , "deadline");
 
         SysOrg org = orgMapper.selectOne(new QueryWrapper<SysOrg>().eq("id", orgId));
         try(
@@ -392,13 +406,14 @@ public class ImportDataImpl implements ImportData {
                     moneyBorrowWarning.setOrgId(orgId);
                     moneyBorrowWarning.setCompany(org.getName());
                     moneyBorrowWarning.setMoneyType(bankData.getMoneyType());
-                    moneyBorrowWarning.setBorrowPrice(bankData.getBorrowPrice());
+                    moneyBorrowWarning.setBorrowPrice(getFloat(bankData.getBorrowPrice()));
                     moneyBorrowWarning.setBorrowTime(bankData.getBorrowTime());
                     moneyBorrowWarning.setBankName(bankData.getBankName());
-                    moneyBorrowWarning.setBankRank(bankData.getBankRank());
+                    moneyBorrowWarning.setBankRank(getFloat(bankData.getBankRank()));
                     moneyBorrowWarning.setBankType(bankData.getBankType());
                     moneyBorrowWarning.setEndTime(bankData.getEndTime());
                     moneyBorrowWarning.setRepaymentTime(bankData.getRepaymentTime());
+                    moneyBorrowWarning.setDeadline(bankData.getDeadline());
 
                     moneyBorrowWarningMapper.insert(moneyBorrowWarning);
                 }
@@ -419,7 +434,9 @@ public class ImportDataImpl implements ImportData {
 
         Map<String , String> map = new HashMap<>();
         //表头与键值对的映射关系
+        map.put("序号" , "num");
         map.put("填报时间" , "createTime");
+
         map.put("交易关联方", "customerName");
         map.put("物料名称" , "materialName");
         map.put("金额" , "materialAmount");
@@ -434,6 +451,11 @@ public class ImportDataImpl implements ImportData {
             //根据名称获取单张表对象 也可以使用getSheetAt(int index)获取单张表的对象 获取第一张表
             Sheet sheet = workbook.getSheetAt(0);
             List<RemoveData> list = ExcelImportSheet.getListFromExcel(sheet , RemoveData.class , map);
+            MoneyProduce0422 moneyProduce0422 = moneyProduce0422Mapper.selectOne(new QueryWrapper<MoneyProduce0422>().isNotNull("write_money").orderByDesc("id").last("limit 1"));
+            Integer num = 1;
+            if (ObjectUtil.isNotEmpty(moneyProduce0422) && StringUtils.isNotBlank(moneyProduce0422.getNum())){
+                num =Integer.parseInt(moneyProduce0422.getNum().split("-")[0]) +1 ;
+            }
             for (RemoveData bankData : list) {
                 if (StringUtils.isNotBlank( bankData.getMaterialAmount())) {
                     MoneyProduce0422 produce0422= new MoneyProduce0422();
@@ -442,10 +464,11 @@ public class ImportDataImpl implements ImportData {
                     produce0422.setMaterialName(bankData.getMaterialName());
                     produce0422.setMaterialType(getMaterType(bankData.getMaterialName()));
                     produce0422.setMaterialAmount(String.format("%.2f", Double.parseDouble(  bankData.getMaterialAmount()) * -1.0));
-                    produce0422.setWriteMoney(bankData.getMaterialAmount());
+                    produce0422.setWriteMoney(getFloat(bankData.getMaterialAmount()));
                     produce0422.setOrgName(org.getName());
                     produce0422.setCustomerName(bankData.getCustomerName());
                     produce0422.setIsWrite(1);
+                    produce0422.setNum(num +"-" + bankData.getNum());
                     moneyProduce0422Mapper.insert(produce0422);
                 }
 
@@ -461,6 +484,8 @@ public class ImportDataImpl implements ImportData {
 
     }
 
+
+
     private Integer getMaterType(String fname) {
         if ("NF级胆固醇".equals(fname)){
             return 0;

huimv-farm/src/main/java/vip/xiaonuo/importData/utils/ExcelImportSheet.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.importData.utils;
 
+import cn.hutool.core.util.ObjectUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -67,7 +68,10 @@ public class ExcelImportSheet {
             for (int j = 0; j < row.getLastCellNum(); j++) {
                 //获取一个单元格
                 Cell cell = row.getCell(j);
-
+                if (ObjectUtil.isNull(cell)){
+                    continue;
+                }
+                System.out.println(i +"----" + j +"----" +paramsList.get(j) +"----" +typeClass.get(j) +"=="+cell );
                 //调用泛型对象的set方法设置单元格里的值 这也就是为什么我们要获取属性顺序以及其对应的类型
                 cs.getMethod(getSetterMethodName(paramsList.get(j)) , typeClass.get(j))
                         .invoke(e , getValueFromType(cell , typeClass.get(j)));

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

@@ -98,7 +98,7 @@ public class MoneyOverdueController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("客户筛选")
     @PostMapping("/money-overdue/keHu")
-    public CommonResult< List<MoneyOverdue>> keHu(@RequestBody MoneyOverdue moneyOverdue) {
+    public CommonResult< List<MoneyWriteOverdue>> keHu(@RequestBody MoneyWriteOverdue moneyOverdue) {
 
         return CommonResult.data(  overdueService.keHu(moneyOverdue));
     }

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

@@ -87,4 +87,8 @@ public class MoneyBorrowWarning implements Serializable {
     @ApiModelProperty(value = "是否还款", position = 11)
     private Integer isRepayment;
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date deadline;
+
+
 }

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

@@ -73,6 +73,7 @@ public class MoneyBusiness implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间", position = 7)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date createTime;
 
 
@@ -90,4 +91,7 @@ public class MoneyBusiness implements Serializable {
 
     @ApiModelProperty(value = "产值", position = 10)
     private String outputValue;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date deadline;
 }

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

@@ -82,5 +82,6 @@ public class MoneyProduce0422 implements Serializable {
 
     @ApiModelProperty(value = "交易关联方", position = 8)
     private String customerName;
+    private String num;
 
 }

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

@@ -97,5 +97,8 @@ public class MoneyWriteOverdue implements Serializable {
     private String skqx;
     @ApiModelProperty(value = "逾期天数", position = 8)
     private String yqts;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty(value = "截止日期", position = 8)
+    private Date deadline;
 
 }

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

@@ -51,4 +51,6 @@ public class MoneyBusinessVo implements Serializable {
     @ApiModelProperty(value = "产值", position = 10)
     private String outputValue;
 
+
+
 }

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

@@ -34,6 +34,7 @@ public class MoneyVo implements Serializable {
 
     @ApiModelProperty(value = "创建时间", position = 7)
     private String  createTime;
+    private String deadline;
 
 
 }

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

@@ -85,6 +85,9 @@ public class MoneyWriteOverdueAddParam  {
     private String skqx;
     @ApiModelProperty(value = "逾期天数", position = 8)
     private String yqts;
+    @ApiModelProperty(value = "截止日期", position = 8)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date deadline;
 
 
 

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

@@ -39,5 +39,5 @@ public interface IMoneyOverdueService extends IService<MoneyOverdue> {
 
     //客户列表
     List<MoneyOverdue> listUserName(Map<String,String> paramsMap);
-    List<MoneyOverdue>  keHu(MoneyOverdue moneyOverdue);
+    List<MoneyWriteOverdue>  keHu(MoneyWriteOverdue moneyOverdue);
 }

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

@@ -72,11 +72,11 @@ public class MoneyBorrowWarningServiceImpl extends ServiceImpl<MoneyBorrowWarnin
         queryWrapper.eq(StringUtils.isNotBlank(borrowParam.getBankName()), "bank_name", borrowParam.getBankName());
         queryWrapper.select(" IFNULL(sum(borrow_price),'0') borrowPrice");
         MoneyBorrowWarning borrowWarning = borrowWarningMapper.selectOne(queryWrapper);
-        BigDecimal math = new BigDecimal("10000");
-        BigDecimal bg = new BigDecimal(borrowWarning.getBorrowPrice());
-        bg = bg.divide(math, 2, RoundingMode.HALF_UP);
+//        BigDecimal math = new BigDecimal("10000");
+//        BigDecimal bg = new BigDecimal(borrowWarning.getBorrowPrice());
+//        bg = bg.divide(math, 2, RoundingMode.HALF_UP);
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("money", bg.toString());
+        jsonObject.put("money", borrowWarning.getBorrowPrice());
         return jsonObject;
     }
 

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

@@ -105,12 +105,8 @@ public class MoneyIncomeServiceImpl extends ServiceImpl<MoneyIncomeMapper, Money
         if (Double.valueOf(income.getYearTarget()) == 0) {
             incomeVo.setRank("100");
         }else{
-            double v = actual / Double.valueOf(incomeVo.getYearTarget());
-            if (v > 100) {
-                incomeVo.setRank("100");
-            } else {
-                incomeVo.setRank(def.format(v));
-            }
+            double v = actual / (Double.parseDouble(incomeVo.getYearTarget() )*100);
+            incomeVo.setRank(def.format(v));
         }
 
         return incomeVo;

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

@@ -49,14 +49,12 @@ public class MoneyOverdueServiceImpl extends ServiceImpl<MoneyOverdueMapper, Mon
         QueryWrapper<MoneyWriteOverdue> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
         Date date = new Date();
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-        calendar.add(Calendar.MONTH, -1);
-        queryWrapper.ge("end_time", calendar.getTime());
-        queryWrapper.select("convert(IFNULL(sum(money),'0'),decimal(10,2)) money");
+
+        queryWrapper.le("end_time", DateUtil.offsetMonth(date ,-1));
+        queryWrapper.select("convert(IFNULL(sum(rmbje),'0') /10000,decimal(10,2)) rmbje");
         MoneyWriteOverdue writeOverdue = writeOverdueMapper.selectOne(queryWrapper);
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("money", writeOverdue.getMoney());
+        jsonObject.put("money", writeOverdue.getRmbje());
         return jsonObject;
     }
 
@@ -65,7 +63,7 @@ public class MoneyOverdueServiceImpl extends ServiceImpl<MoneyOverdueMapper, Mon
         String orgId = overdueParam.getOrgId();
         QueryWrapper<MoneyWriteOverdue> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
-        queryWrapper.select("sum(money) money,end_time endTime");
+        queryWrapper.select("sum(rmbje) rmbje,end_time endTime");
         List<MoneyWriteOverdue> writeOverdues = writeOverdueMapper.selectList(queryWrapper);
         double count = 0.00;
         double isOverdue = 0.00;
@@ -145,19 +143,21 @@ public class MoneyOverdueServiceImpl extends ServiceImpl<MoneyOverdueMapper, Mon
         String userName = overduePageParam.getUserName();
 
         QueryWrapper<MoneyWriteOverdue> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId).orderByDesc("create_time");
+        queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId).orderByDesc("id");
         queryWrapper.eq(StringUtils.isNotBlank(userName), "user_name", userName);
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.DAY_OF_MONTH, 15);
-        if (null == type) {
-        } else if (0 == type) {
-            queryWrapper.ge("end_time", calendar.getTime());
-        } else if (1 == type) {
-            queryWrapper.le("end_time", DateUtil.beginOfDay(new Date()));
-        } else if (2 == type) {
-            queryWrapper.between("end_time", DateUtil.beginOfDay(new Date()), calendar.getTime());
+        if (ObjectUtil.isNotEmpty(type)){
+            if (0 == type) {
+                queryWrapper.between("end_time", DateUtil.beginOfMonth(new Date()), calendar.getTime());
+            } else if (1 == type) {
+                queryWrapper.ge("end_time", calendar.getTime());
+            } else if (2== type) {
+                queryWrapper.le("end_time", new Date());
+            }
         }
 
+
         Page<MoneyWriteOverdue> page = new Page<>(pageNum, pageSize);
         Page<MoneyWriteOverdue> selectPage = writeOverdueMapper.selectPage(page, queryWrapper);
         return selectPage;
@@ -173,9 +173,9 @@ public class MoneyOverdueServiceImpl extends ServiceImpl<MoneyOverdueMapper, Mon
     }
 
     @Override
-    public List<MoneyOverdue>  keHu(MoneyOverdue moneyOverdue) {
+    public List<MoneyWriteOverdue>  keHu(MoneyWriteOverdue moneyOverdue) {
         String orgId = moneyOverdue.getOrgId();
-        List<MoneyOverdue> moneyOverdues = overdueMapper.selectList(new QueryWrapper<MoneyOverdue>().select("user_name").eq(StringUtils.isNotBlank(orgId), "org_id", orgId).groupBy("user_name"));
+        List<MoneyWriteOverdue> moneyOverdues = writeOverdueMapper.selectList(new QueryWrapper<MoneyWriteOverdue>().select("user_name").eq(StringUtils.isNotBlank(orgId), "org_id", orgId).groupBy("user_name"));
 
         return moneyOverdues;
     }

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

@@ -247,15 +247,22 @@ public class SaleTargetServiceImpl extends ServiceImpl<SaleTargetMapper, SaleTar
         //逾期应收款金额
         QueryWrapper<MoneyWriteOverdue> saleReceiveQueryWrapper = new QueryWrapper<>();
         saleReceiveQueryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
-        saleReceiveQueryWrapper.between("end_time", time + "-01 00:00:00", time + "-31 23:59:59");
-        saleReceiveQueryWrapper.select(" IFNULL(sum(rmbje),'0') rmbje");
+        saleReceiveQueryWrapper.between("deadline", time + "-01 00:00:00", time + "-31 23:59:59");
+        saleReceiveQueryWrapper.select("IFNULL(sum(rmbje),'0') rmbje");
         MoneyWriteOverdue monthReceive = writeOverdueMapper.selectOne(saleReceiveQueryWrapper);
         saleReceiveQueryWrapper.clear();
         saleReceiveQueryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
-        saleReceiveQueryWrapper.between("end_time", lastYear+"-"+month + "-01 00:00:00", lastYear+"-"+month + "-31 23:59:59");
+        saleReceiveQueryWrapper.between("deadline", lastYear+"-"+month + "-01 00:00:00", lastYear+"-"+month + "-31 23:59:59");
         saleReceiveQueryWrapper.select(" IFNULL(sum(rmbje),'0') rmbje");
         MoneyWriteOverdue yearReceive = writeOverdueMapper.selectOne(saleReceiveQueryWrapper);
 
+
+        saleReceiveQueryWrapper.clear();
+        saleReceiveQueryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
+        saleReceiveQueryWrapper.select("ROUND(IFNULL(SUM(rmbje),0) /10000,2)  rmbje");
+        MoneyWriteOverdue countReceive = writeOverdueMapper.selectOne(saleReceiveQueryWrapper);
+
+
         DecimalFormat def = new DecimalFormat("0.00");
         BigDecimal math = new BigDecimal("10000");
 
@@ -302,7 +309,7 @@ public class SaleTargetServiceImpl extends ServiceImpl<SaleTargetMapper, SaleTar
         BigDecimal bg4 = new BigDecimal(deliverYear.getSaleDeliverMoney());
         vo.setSaleDeliverMoneyYear(bg4.divide(math, 2, RoundingMode.HALF_UP).toString());
 
-        if (yearReceive.getRmbje().equals("0")) {
+        if ("0".equals(yearReceive.getRmbje())) {
             vo.setReceiveMoneyRate("0");
         } else {
             double v = (Double.valueOf(monthReceive.getRmbje()) - Double.valueOf(yearReceive.getRmbje()))/Double.valueOf(yearReceive.getRmbje());
@@ -312,14 +319,12 @@ public class SaleTargetServiceImpl extends ServiceImpl<SaleTargetMapper, SaleTar
                 vo.setReceiveMoneyRate(def.format(v * 100));
             }
         }
-        BigDecimal bg3 = new BigDecimal(monthReceive.getRmbje());
-        vo.setReceiveMoney(bg3.divide(math, 2, RoundingMode.HALF_UP).toString());
-
-
+        vo.setReceiveMoney(String.format("%.2f",Double.parseDouble(countReceive.getRmbje())));
         return vo;
     }
 
 
+
     public  String calculateYOYChange(double currentValue, double previousValue) {
         // 处理零值情况
         if (previousValue == 0) {

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

@@ -13,7 +13,7 @@
     ROUND(IFNULL(SUM(taxes), 0)/10000, 2) AS taxes,
     ROUND(IFNULL(SUM(balance), 0)/10000, 2) AS balance,
    ROUND(IFNULL( (SELECT SUM(borrow_price)
-     FROM `money_borrow_warning`  ${ew.customSqlSegment} ), 0)/10000, 2) AS borrow_price
+     FROM `money_borrow_warning`  ${ew.customSqlSegment} ), 0), 2) AS borrow_price
 FROM
     `money_business`
      ${ew.customSqlSegment}
@@ -68,9 +68,9 @@ FROM
 
     </select>
     <select id="getBorrowDetailMonth" resultType="vip.xiaonuo.money.param.DsBusAllParam">
-          SELECT ROUND(IFNULL(SUM(borrow_price), 0)/10000, 2)  borrow_price , DATE_FORMAT(borrow_time, '%Y-%m') AS ymonth ,
+          SELECT ROUND(IFNULL(SUM(borrow_price), 0), 2)  borrow_price , DATE_FORMAT(borrow_time, '%Y-%m') AS ymonth ,
        (
-        SELECT ROUND(IFNULL(SUM(borrow_price), 0)/10000, 2)
+        SELECT ROUND(IFNULL(SUM(borrow_price), 0), 2)
         FROM `money_borrow_warning`
         WHERE DATE_FORMAT(repayment_time, '%Y-%m') = DATE_FORMAT(mb.borrow_price, '%Y-%m')
        
@@ -81,9 +81,9 @@ FROM
 
     </select>
     <select id="getBorrowDetailYear" resultType="vip.xiaonuo.money.param.DsBusAllParam">
-           SELECT ROUND(IFNULL(SUM(borrow_price), 0)/10000, 2)  borrow_price , DATE_FORMAT(borrow_time, '%Y') AS ymonth ,
+           SELECT ROUND(IFNULL(SUM(borrow_price), 0), 2)  borrow_price , DATE_FORMAT(borrow_time, '%Y') AS ymonth ,
        (
-        SELECT ROUND(IFNULL(SUM(borrow_price), 0)/10000, 2)
+        SELECT ROUND(IFNULL(SUM(borrow_price), 0), 2)
         FROM `money_borrow_warning`
         WHERE DATE_FORMAT(repayment_time, '%Y') = DATE_FORMAT(mb.borrow_price, '%Y') -- 确保与主查询的月份相匹配
        
@@ -94,7 +94,7 @@ FROM
 
     </select>
     <select id="zhiBiao" resultType="vip.xiaonuo.money.entity.MoneyBusiness">
-        SELECT ROUND(IFNULL(SUM(people_money),0),2)  peopleMoney ,ROUND(IFNULL(SUM(output_value),0),2)   outputValue  FROM `money_business`
+        SELECT ROUND(IFNULL(SUM(people_money),0)/10000,2)  peopleMoney ,ROUND(IFNULL(SUM(output_value),0)/10000 ,2)   outputValue  FROM `money_business`
 ${ew.customSqlSegment}
     </select>
 

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

@@ -4,21 +4,34 @@
 
 
     <select id="getUserRank" resultType="vip.xiaonuo.money.entity.vo.MoneyBorrowUserVo">
-      SELECT
+
     w.`user_name` as userName,
     w.collect_price as collectPrice,
-    COALESCE(o.money, 0) AS overduePrice
+    COALESCE(o.rmbje, 0) AS overduePrice
 FROM
     `money_overdue`  AS w
 LEFT JOIN
     money_write_overdue AS o
 ON
     w.user_name = o.user_name
-   <!-- WHERE date_time between #{startTime} and #{endTime}
+    WHERE date_time between #{startTime} and #{endTime}
         <if test="orgId!=null and orgId!=''">
             and  w.org_id = #{orgId}
-        </if>-->
+        </if>
 	GROUP BY  w.user_name
 	ORDER BY w.collect_price DESC
+
+<!--        SELECT-->
+<!--        user_name as userName,-->
+<!--        sum(rmbje) as collectPrice,-->
+<!--        COALESCE(rmbje, 0) AS overduePrice-->
+<!--        FROM-->
+<!--        money_write_overdue-->
+
+<!--        <if test="orgId!=null and orgId!=''">-->
+<!--            where  org_id = #{orgId}-->
+<!--        </if>-->
+<!--             GROUP BY  user_name-->
+<!--            ORDER BY rmbje DESC-->
     </select>
 </mapper>