账户监测修改

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/controller/HlwCompanyAccountCalculationController.java

@@ -22,6 +22,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * @Description: 平台企业账户监测
@@ -47,8 +48,8 @@ public class HlwCompanyAccountCalculationController extends JeecgController<HlwC
     @ApiOperation(value = "企业账户入账监测", notes = "企业账户入账监测")
     @GetMapping(value = "/companyAccountInCalculation")
     public Result<?> companyAccountInCalculation() {
-        HlwCompanyAccountCalculation hlwCompanyAccountCalculation = hlwCompanyAccountCalculationService.getCompanyAccountInCalculation();
-        return Result.ok(hlwCompanyAccountCalculation);
+        List<HlwCompanyAccountCalculation> hlwCompanyAccountCalculation = hlwCompanyAccountCalculationService.getCompanyAccountInCalculation();
+        return Result.ok(hlwCompanyAccountCalculation.size()>0?hlwCompanyAccountCalculation:null);
     }
 
 
@@ -63,8 +64,8 @@ public class HlwCompanyAccountCalculationController extends JeecgController<HlwC
     @ApiOperation(value = "企业账户出账总表监测", notes = "企业账户出账总表监测")
     @GetMapping(value = "/companyAccountOutCalculation")
     public Result<?> companyAccountOutCalculation() {
-        HlwCompanyAccountCalculation hlwCompanyAccountCalculation = hlwCompanyAccountCalculationService.getCompanyAccountOutCalculation();
-        return Result.ok(hlwCompanyAccountCalculation);
+        List<HlwCompanyAccountCalculation> hlwCompanyAccountCalculation = hlwCompanyAccountCalculationService.getCompanyAccountOutCalculation();
+        return Result.ok(hlwCompanyAccountCalculation.size()>0?hlwCompanyAccountCalculation:null);
     }
 
 
@@ -78,8 +79,8 @@ public class HlwCompanyAccountCalculationController extends JeecgController<HlwC
     @ApiOperation(value = "企业账户出账明细监测", notes = "企业账户出账明细监测")
     @GetMapping(value = "/companyAccountOutDetailCalculation")
     public Result<?> companyAccountOutDetailCalculation() {
-        HlwCompanyAccountCalculation hlwCompanyAccountCalculation = hlwCompanyAccountCalculationService.getCompanyAccountOutDetailCalculation();
-        return Result.ok(hlwCompanyAccountCalculation);
+        List<HlwCompanyAccountCalculation> hlwCompanyAccountCalculation = hlwCompanyAccountCalculationService.getCompanyAccountOutDetailCalculation();
+        return Result.ok(hlwCompanyAccountCalculation.size()>0?hlwCompanyAccountCalculation:null);
     }
 
 

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/mapper/HlwCompanyAccountCalculationMapper.java

@@ -19,11 +19,11 @@ import java.util.List;
  */
 public interface HlwCompanyAccountCalculationMapper extends BaseMapper<HlwCompanyAccountCalculation> {
 
-    HlwCompanyAccountCalculation getCompanyAccountInCalculation();
+    List<HlwCompanyAccountCalculation> getCompanyAccountInCalculation();
 
-    HlwCompanyAccountCalculation getCompanyAccountOutCalculation();
+    List<HlwCompanyAccountCalculation> getCompanyAccountOutCalculation();
 
-    HlwCompanyAccountCalculation getCompanyAccountOutDetailCalculation();
+    List<HlwCompanyAccountCalculation> getCompanyAccountOutDetailCalculation();
 
     Double getTotalOut();
 

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/service/IHlwCompanyAccountCalculationService.java

@@ -18,11 +18,11 @@ import java.util.List;
 public interface IHlwCompanyAccountCalculationService extends IService<HlwCompanyAccountCalculation> {
 
 
-    HlwCompanyAccountCalculation getCompanyAccountInCalculation();
+    List<HlwCompanyAccountCalculation> getCompanyAccountInCalculation();
 
-    HlwCompanyAccountCalculation getCompanyAccountOutCalculation();
+    List<HlwCompanyAccountCalculation> getCompanyAccountOutCalculation();
 
-    HlwCompanyAccountCalculation getCompanyAccountOutDetailCalculation();
+    List<HlwCompanyAccountCalculation> getCompanyAccountOutDetailCalculation();
 
     Double getTotalOut();
 

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/service/impl/HlwCompanyAccountCalculationServiceImpl.java

@@ -25,19 +25,19 @@ import java.util.List;
 @Service
 public class HlwCompanyAccountCalculationServiceImpl extends ServiceImpl<HlwCompanyAccountCalculationMapper, HlwCompanyAccountCalculation> implements IHlwCompanyAccountCalculationService {
     @Override
-    public HlwCompanyAccountCalculation getCompanyAccountInCalculation() {
+    public  List<HlwCompanyAccountCalculation> getCompanyAccountInCalculation() {
         return baseMapper.getCompanyAccountInCalculation();
     }
 
 
     @Override
-    public HlwCompanyAccountCalculation getCompanyAccountOutCalculation() {
+    public  List<HlwCompanyAccountCalculation> getCompanyAccountOutCalculation() {
         return baseMapper.getCompanyAccountOutCalculation();
     }
 
 
     @Override
-    public HlwCompanyAccountCalculation getCompanyAccountOutDetailCalculation() {
+    public  List<HlwCompanyAccountCalculation> getCompanyAccountOutDetailCalculation() {
         return baseMapper.getCompanyAccountOutDetailCalculation();
     }