模块开发12

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

@@ -63,12 +63,15 @@ public class MoneyCost implements Serializable {
     @ApiModelProperty(value = "财务费用", position = 5)
     private String finance;
 
-
     /**
      * 公司名称
      */
     @ApiModelProperty(value = "公司名称", position = 6)
     private String company;
 
-
+    /**
+     * 财务费用
+     */
+    @ApiModelProperty(value = "研发费用", position = 7)
+    private String research;
 }

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

@@ -31,12 +31,12 @@ public class MoneyIncomeAddParam {
     private String time;
 
 
-    @ApiModelProperty(value = "组织id", required = true)
-    private String orgId;
-
-
-    @ApiModelProperty(value = "公司名称", required = true)
-    private String company;
+//    @ApiModelProperty(value = "组织id", required = true)
+//    private String orgId;
+//
+//
+//    @ApiModelProperty(value = "公司名称", required = true)
+//    private String company;
 
 
     @ApiModelProperty(value = "时间，格式为'2024'", required = true)

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," +
+        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

@@ -14,6 +14,8 @@ import vip.xiaonuo.money.param.MoneyIncomeParam;
 import vip.xiaonuo.money.service.IMoneyIncomeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import vip.xiaonuo.sys.modular.org.entity.SysOrg;
+import vip.xiaonuo.sys.modular.org.mapper.SysOrgMapper;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -38,6 +40,8 @@ public class MoneyIncomeServiceImpl extends ServiceImpl<MoneyIncomeMapper, Money
     private MoneyIncomeMapper incomeMapper;
     @Autowired
     private MoneyBusinessMapper businessMapper;
+    @Autowired
+    private SysOrgMapper orgMapper;
 
 
     @Override
@@ -200,23 +204,25 @@ public class MoneyIncomeServiceImpl extends ServiceImpl<MoneyIncomeMapper, Money
 
     @Override
     public CommonResult add(MoneyIncomeAddParam addParam) {
-        String orgId = addParam.getOrgId();
         String time = addParam.getTime();
-        QueryWrapper<MoneyIncome> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("year", time).eq("org_id", orgId);
-        MoneyIncome moneyIncome = incomeMapper.selectOne(queryWrapper);
-        if (ObjectUtil.isNotEmpty(moneyIncome)) {
-            moneyIncome.setCompanyName(addParam.getCompany());
-            moneyIncome.setYear(addParam.getTime());
-            moneyIncome.setYearTarget(addParam.getYearTarget());
-            incomeMapper.updateById(moneyIncome);
-        } else {
-            MoneyIncome income = new MoneyIncome();
-            income.setCompanyName(addParam.getCompany());
-            income.setYear(addParam.getTime());
-            income.setYearTarget(addParam.getYearTarget());
-            income.setOrgId(orgId);
-            incomeMapper.insert(income);
+        List<SysOrg> sysOrgs = orgMapper.selectList(new QueryWrapper<SysOrg>().eq("CATEGORY", "COMPANY").eq("PARENT_ID", "1543842934270394368"));
+        for (SysOrg sysOrg : sysOrgs) {
+            QueryWrapper<MoneyIncome> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("year", time).eq("org_id", sysOrg.getId());
+            MoneyIncome moneyIncome = incomeMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isNotEmpty(moneyIncome)) {
+                moneyIncome.setCompanyName(sysOrg.getName());
+                moneyIncome.setYear(addParam.getTime());
+                moneyIncome.setYearTarget(addParam.getYearTarget());
+                incomeMapper.updateById(moneyIncome);
+            } else {
+                MoneyIncome income = new MoneyIncome();
+                income.setCompanyName(sysOrg.getName());
+                income.setYear(addParam.getTime());
+                income.setYearTarget(addParam.getYearTarget());
+                income.setOrgId(sysOrg.getId());
+                incomeMapper.insert(income);
+            }
         }
         return CommonResult.ok();
     }