模块开发12

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

@@ -9,8 +9,10 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import vip.xiaonuo.money.entity.MoneyProduce;
+import vip.xiaonuo.money.entity.MoneyProduce0422;
 import vip.xiaonuo.money.entity.MoneyProduceIncome;
 import vip.xiaonuo.money.entity.vo.MoneyProduceScreenVo;
+import vip.xiaonuo.money.mapper.MoneyProduce0422Mapper;
 import vip.xiaonuo.money.mapper.MoneyProduceIncomeMapper;
 import vip.xiaonuo.money.mapper.MoneyProduceMapper;
 import vip.xiaonuo.money.param.MoneyAnalysisParam;
@@ -42,42 +44,91 @@ public class MoneyProduceServiceImpl extends ServiceImpl<MoneyProduceMapper, Mon
     private MoneyProduceMapper produceMapper;
     @Autowired
     private MoneyProduceIncomeMapper incomeMapper;
+    @Autowired
+    private MoneyProduce0422Mapper produce0422Mapper;
 
     @Override
     public MoneyProduce analysisIncome(MoneyAnalysisParam analysisParam) {
         String orgId = analysisParam.getOrgId();
         Integer type = analysisParam.getType();//是否包含关联交易
         String time = analysisParam.getTime();//2024-10
-        QueryWrapper<MoneyProduce> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId).eq("transaction_type", type);
+        QueryWrapper<MoneyProduce0422> produce0422QueryWrapper = new QueryWrapper<>();
+        produce0422QueryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
         if ("".equals(time) || null == time) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
-            queryWrapper.ge("create_time", dateTime);
+            produce0422QueryWrapper.ge("create_time", dateTime);
         } else {
-            String year = time.substring(0, 4);
-            queryWrapper.between("create_time", year + "-01-01 00:00:00", time + "-31 23:59:59");
+//            String year = time.substring(0, 4);
+            produce0422QueryWrapper.between("create_time", time + "-01 00:00:00", time + "-31 23:59:59");
         }
-        queryWrapper.select(" IFNULL(sum(nf_cholesterol),'0') nfCholesterol," +
-                "IFNULL(sum(breed_cholesterol),'0') breedCholesterol," +
-                "IFNULL(sum(sheep_alcohol),'0') sheepAlcohol," +
-                "IFNULL(sum(sheep_sour),'0') sheepSour," +
-                "IFNULL(sum(sheep_sour_bing),'0') sheepSourBing," +
-                "IFNULL(sum(other),'0') other");
-        MoneyProduce produce1 = produceMapper.selectOne(queryWrapper);
+        List<MoneyProduce0422> produce0422s = produce0422Mapper.selectList(produce0422QueryWrapper);
+        double v1 = 0.0000;
+        double v2 = 0.0000;
+        double v3 = 0.0000;
+        double v4 = 0.0000;
+        double v5 = 0.0000;
+        double v6 = 0.0000;
+        if (produce0422s.size() != 0) {
+            for (MoneyProduce0422 produce0422 : produce0422s) {
+                    if (produce0422.getMaterialType() == 0) {
+                        if ("".equals(produce0422.getMaterialAmount()) || null == produce0422.getMaterialAmount()) {
+                            v1 = v1;
+                        } else {
+                            v1 = v1 + Double.parseDouble(produce0422.getMaterialAmount());
+                        }
+                    } else if (produce0422.getMaterialType() == 1) {
+                        if ("".equals(produce0422.getMaterialAmount()) || null == produce0422.getMaterialAmount()) {
+                            v2 = v2;
+                        } else {
+                            v2 = v2 + Double.parseDouble(produce0422.getMaterialAmount());
+                        }
+
+                    }else if (produce0422.getMaterialType() == 2) {
+                        if ("".equals(produce0422.getMaterialAmount()) || null == produce0422.getMaterialAmount()) {
+                            v3 = v3;
+                        } else {
+                            v3 = v3 + Double.parseDouble(produce0422.getMaterialAmount());
+                        }
+
+                    }else if (produce0422.getMaterialType() == 3) {
+                        if ("".equals(produce0422.getMaterialAmount()) || null == produce0422.getMaterialAmount()) {
+                            v4 = v4;
+                        } else {
+                            v4 = v4 + Double.parseDouble(produce0422.getMaterialAmount());
+                        }
+
+                    }else if (produce0422.getMaterialType() == 4) {
+                        if ("".equals(produce0422.getMaterialAmount()) || null == produce0422.getMaterialAmount()) {
+                            v5 = v5;
+                        } else {
+                            v5 = v5 + Double.parseDouble(produce0422.getMaterialAmount());
+                        }
 
+                    }else if (produce0422.getMaterialType() == 5) {
+                        if ("".equals(produce0422.getMaterialAmount()) || null == produce0422.getMaterialAmount()) {
+                            v6 = v6;
+                        } else {
+                            v6 = v6 + Double.parseDouble(produce0422.getMaterialAmount());
+                        }
+
+                    }
+                }
+
+        }
         MoneyProduce produce = new MoneyProduce();
         BigDecimal math = new BigDecimal("10000");
-        BigDecimal bd = new BigDecimal(produce1.getNfCholesterol());
+
+        BigDecimal bd = new BigDecimal(v1);
         bd = bd.divide(math, 2, RoundingMode.HALF_UP);
-        BigDecimal bd1 = new BigDecimal(produce1.getBreedCholesterol());
+        BigDecimal bd1 = new BigDecimal(v2);
         bd1 = bd1.divide(math, 2, RoundingMode.HALF_UP);
-        BigDecimal bd2 = new BigDecimal(produce1.getSheepAlcohol());
+        BigDecimal bd2 = new BigDecimal(v3);
         bd2 = bd2.divide(math, 2, RoundingMode.HALF_UP);
-        BigDecimal bd3 = new BigDecimal(produce1.getSheepSour());
+        BigDecimal bd3 = new BigDecimal(v4);
         bd3 = bd3.divide(math, 2, RoundingMode.HALF_UP);
-        BigDecimal bd4 = new BigDecimal(produce1.getSheepSourBing());
+        BigDecimal bd4 = new BigDecimal(v5);
         bd4 = bd4.divide(math, 2, RoundingMode.HALF_UP);
-        BigDecimal bd5 = new BigDecimal(produce1.getOther());
+        BigDecimal bd5 = new BigDecimal(v6);
         bd5 = bd5.divide(math, 2, RoundingMode.HALF_UP);
 
 

snowy-plugin-api/snowy-plugin-auth-api/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.6.1
+version=2.0.0
+groupId=vip.xiaonuo
+artifactId=snowy-plugin-auth-api

snowy-plugin-api/snowy-plugin-auth-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,10 @@
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-auth-api\src\main\java\vip\xiaonuo\auth\core\enums\SaClientTypeEnum.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-auth-api\src\main\java\vip\xiaonuo\auth\core\util\StpClientUtil.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-auth-api\src\main\java\vip\xiaonuo\auth\core\pojo\SaBaseLoginUser.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-auth-api\src\main\java\vip\xiaonuo\auth\core\util\StpLoginUserUtil.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-auth-api\src\main\java\vip\xiaonuo\auth\core\annotation\SaClientCheckLogin.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-auth-api\src\main\java\vip\xiaonuo\auth\core\pojo\SaBaseClientLoginUser.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-auth-api\src\main\java\vip\xiaonuo\auth\core\util\StpClientLoginUserUtil.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-auth-api\src\main\java\vip\xiaonuo\auth\core\annotation\SaClientCheckPermission.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-auth-api\src\main\java\vip\xiaonuo\auth\api\SaBaseLoginUserApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-auth-api\src\main\java\vip\xiaonuo\auth\core\annotation\SaClientCheckRole.java

snowy-plugin-api/snowy-plugin-biz-api/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.6.1
+version=2.0.0
+groupId=vip.xiaonuo
+artifactId=snowy-plugin-biz-api

snowy-plugin-api/snowy-plugin-biz-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1 @@
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-biz-api\src\main\java\vip\xiaonuo\biz\package-info.java

snowy-plugin-api/snowy-plugin-client-api/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.6.1
+version=2.0.0
+groupId=vip.xiaonuo
+artifactId=snowy-plugin-client-api

snowy-plugin-api/snowy-plugin-client-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1 @@
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-client-api\src\main\java\vip\xiaonuo\client\package-info.java

snowy-plugin-api/snowy-plugin-dev-api/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.6.1
+version=2.0.0
+groupId=vip.xiaonuo
+artifactId=snowy-plugin-dev-api

snowy-plugin-api/snowy-plugin-dev-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,9 @@
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-dev-api\src\main\java\vip\xiaonuo\dev\api\DevMessageApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-dev-api\src\main\java\vip\xiaonuo\dev\api\DevJobApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-dev-api\src\main\java\vip\xiaonuo\dev\api\DevDictApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-dev-api\src\main\java\vip\xiaonuo\dev\api\DevEmailApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-dev-api\src\main\java\vip\xiaonuo\dev\api\DevConfigApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-dev-api\src\main\java\vip\xiaonuo\dev\api\DevFileApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-dev-api\src\main\java\vip\xiaonuo\dev\api\DevLogApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-dev-api\src\main\java\vip\xiaonuo\dev\api\DevSseApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-dev-api\src\main\java\vip\xiaonuo\dev\api\DevSmsApi.java

snowy-plugin-api/snowy-plugin-mobile-api/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.6.1
+version=2.0.0
+groupId=vip.xiaonuo
+artifactId=snowy-plugin-mobile-api

snowy-plugin-api/snowy-plugin-mobile-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,3 @@
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-mobile-api\src\main\java\vip\xiaonuo\mobile\api\MobileMenuApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-mobile-api\src\main\java\vip\xiaonuo\mobile\api\MobileModuleApi.java
+D:\huimv-garden\snowy-plugin-api\snowy-plugin-mobile-api\src\main\java\vip\xiaonuo\mobile\api\MobileButtonApi.java

snowy-plugin/snowy-plugin-biz/target/maven-archiver/pom.properties

@@ -1,11 +1,4 @@
-<<<<<<< Updated upstream
 #Created by Apache Maven 3.6.1
 version=2.0.0
 groupId=vip.xiaonuo
 artifactId=snowy-plugin-biz
-=======
-#Created by Apache Maven 3.6.3
-groupId=vip.xiaonuo
-artifactId=snowy-plugin-biz
-version=2.0.0
->>>>>>> Stashed changes

snowy-plugin/snowy-plugin-sys/target/maven-archiver/pom.properties

@@ -1,11 +1,4 @@
-<<<<<<< Updated upstream
 #Created by Apache Maven 3.6.1
 version=2.0.0
 groupId=vip.xiaonuo
 artifactId=snowy-plugin-sys
-=======
-#Created by Apache Maven 3.6.3
-groupId=vip.xiaonuo
-artifactId=snowy-plugin-sys
-version=2.0.0
->>>>>>> Stashed changes