LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 首页收入分类统计，增加部门筛选

Browse Source
This commit is contained in:
lijiarao
2022-09-26 16:28:19 +08:00
parent a8dff572a1
commit 13a9683489
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java
+5 -4
View File
@@ -69,15 +69,16 @@ public class IndexController {
@DictPoint @DictPoint
@ApiOperation(value = "收入分类统计") @ApiOperation(value = "收入分类统计")
@GetMapping(value = "/incomeClassificationStatistics") @GetMapping(value = "/incomeClassificationStatistics")
public Result<List<PieChartVO>> incomeClassificationStatistics(@RequestParam(name="type", defaultValue = "1")Integer type) { public Result<List<PieChartVO>> incomeClassificationStatistics(@RequestParam(name="type", defaultValue = "1")Integer type,
@RequestParam(name="departCode",required = false)String departCode) {
if (Objects.equals(type,1)){ if (Objects.equals(type,1)){
List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type); List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type,departCode);
return Result.OK(pieChartVOS); return Result.OK(pieChartVOS);
}else if (Objects.equals(type,2)){ }else if (Objects.equals(type,2)){
List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("confirmNoTaxAmount", type); List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("confirmNoTaxAmount", type, departCode);
return Result.OK(pieChartVOS); return Result.OK(pieChartVOS);
}else if (Objects.equals(type,3)){ }else if (Objects.equals(type,3)){
List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type); List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney", type, departCode);
return Result.OK(pieChartVOS); return Result.OK(pieChartVOS);
}else { }else {
return Result.OK(); return Result.OK();
jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
+3 -3
View File
@@ -212,13 +212,13 @@ public class IndexService {
} }
public List<PieChartVO> totalAmountClassificationStatistics(String column, Integer type) { public List<PieChartVO> totalAmountClassificationStatistics(String column, Integer type, String departCode) {
String year = String.valueOf(DateUtil.year(new DateTime())); String year = String.valueOf(DateUtil.year(new DateTime()));
List<AmountClassDTO> amountClassDTOS; List<AmountClassDTO> amountClassDTOS;
if (!Objects.equals(type,3)){ if (!Objects.equals(type,3)){
amountClassDTOS = payWorkingGroupMapper.amountClass(year,column); amountClassDTOS = payWorkingGroupMapper.amountClass(year,column,departCode);
}else { }else {
amountClassDTOS = payWorkingGroupMapper.amountClass1(year,column); amountClassDTOS = payWorkingGroupMapper.amountClass1(year,column,departCode);
} }
BigDecimal all = amountClassDTOS.stream().map(AmountClassDTO::getMoney).reduce(BigDecimal.ZERO,BigDecimal::add); BigDecimal all = amountClassDTOS.stream().map(AmountClassDTO::getMoney).reduce(BigDecimal.ZERO,BigDecimal::add);
List<PieChartVO> pieChartVOS = new ArrayList<>(); List<PieChartVO> pieChartVOS = new ArrayList<>();
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+2 -2
View File
@@ -227,9 +227,9 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
List<AllProjectStatistics> cumulativeListAllMoney(); List<AllProjectStatistics> cumulativeListAllMoney();
List<AmountClassDTO> amountClass(@Param("year") String year, @Param("column") String column); List<AmountClassDTO> amountClass(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode);
List<AmountClassDTO> amountClass1(@Param("year") String year, @Param("column") String column); List<AmountClassDTO> amountClass1(@Param("year") String year, @Param("column") String column, @Param("departCode") String departCode);
List<YearMoneyDTO> getYearMoneyDTO(); List<YearMoneyDTO> getYearMoneyDTO();
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+6
View File
@@ -2402,6 +2402,9 @@
FROM v_statistical v FROM v_statistical v
<where> <where>
confirmDate like concat('%',#{year},'%') confirmDate like concat('%',#{year},'%')
<if test="departCode != null and departCode != ''">
and departCode = #{departCode}
</if>
</where> </where>
GROUP BY chargeUse GROUP BY chargeUse
</select> </select>
@@ -2675,6 +2678,9 @@
order by pp.createTime) v order by pp.createTime) v
<where> <where>
confirmDate like concat('%',#{year},'%') confirmDate like concat('%',#{year},'%')
<if test="departCode != null and departCode != ''">
and departCode = #{departCode}
</if>
</where> </where>
GROUP BY chargeUse GROUP BY chargeUse
</select> </select>