Commit 4386434e authored by Fuzy's avatar Fuzy

修正

parent 284e533f
package com.ruoyi.system.controller; package com.ruoyi.system.controller;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.model.wages.dao.LinXiInquireAboutSubjectAssistance; import com.ruoyi.system.model.power.dto.DanHouInquireAboutSubjectAssistance;
import com.ruoyi.system.model.power.dto.DanHouInquireAboutSubjectAssistanceDto;
import com.ruoyi.system.model.power.dto.LinXiInquireAboutSubjectAssistance;
import com.ruoyi.system.service.PowerVoucherConversionService; import com.ruoyi.system.service.PowerVoucherConversionService;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
...@@ -12,6 +16,8 @@ import java.util.List; ...@@ -12,6 +16,8 @@ import java.util.List;
* 2024/8/1 * 2024/8/1
* 凭证转换---电力 * 凭证转换---电力
*/ */
@RestController
@RequestMapping("/powerVoucherConversion")
public class PowerVoucherConversionController { public class PowerVoucherConversionController {
private PowerVoucherConversionService powerVoucherConversionService; private PowerVoucherConversionService powerVoucherConversionService;
...@@ -30,4 +36,15 @@ public class PowerVoucherConversionController { ...@@ -30,4 +36,15 @@ public class PowerVoucherConversionController {
List<LinXiInquireAboutSubjectAssistance> voList = powerVoucherConversionService.inquireAboutSubjectAssistance(LinXiInquireAboutSubjectAssistance); List<LinXiInquireAboutSubjectAssistance> voList = powerVoucherConversionService.inquireAboutSubjectAssistance(LinXiInquireAboutSubjectAssistance);
return AjaxResult.success(voList); return AjaxResult.success(voList);
} }
/**
* 单侯电力凭证信息查询
* @param danHouInquireAboutSubjectAssistanceDto
* @return
*/
@PostMapping("/shanHouVoucherConversion")
public AjaxResult shanHouVoucherConversion(@RequestBody DanHouInquireAboutSubjectAssistanceDto danHouInquireAboutSubjectAssistanceDto) {
List<DanHouInquireAboutSubjectAssistance> voList = powerVoucherConversionService.shanHouVoucherConversion(danHouInquireAboutSubjectAssistanceDto);
return AjaxResult.success(voList);
}
} }
package com.ruoyi.system.model.power.dto;
import com.ruoyi.system.model.power.model.DanHouVoucherModel;
import lombok.Data;
/**
* 2024/8/2
* 单侯矿凭证入参---返回参数
*/
@Data
public class DanHouInquireAboutSubjectAssistance {
// 一级分类
private String levelOneClassification;
// 二级分类
private String levelTwoClassification;
// 金额
private String money;
private DanHouVoucherModel danHouVoucherModel;
}
package com.ruoyi.system.model.power.dto;
import com.ruoyi.system.model.power.model.DanHouVoucherModel;
import lombok.Data;
import java.util.List;
/**
* 2024/8/2
* 单侯矿凭证入参
*/
@Data
public class DanHouInquireAboutSubjectAssistanceDto {
private String years;
private List<DanHouInquireAboutSubjectAssistance> list;
}
...@@ -6,6 +6,7 @@ import java.util.List; ...@@ -6,6 +6,7 @@ import java.util.List;
/** /**
* 2024/7/24 * 2024/7/24
* 林西矿凭证入参
*/ */
@Data @Data
public class LinXiInquireAboutSubjectAssistance { public class LinXiInquireAboutSubjectAssistance {
......
package com.ruoyi.system.model.power.model;
import lombok.Data;
import java.util.List;
/**
* 2024/8/2
*/
@Data
public class DanHouVoucherModel {
private String abstracts;
private String subjects;
private List<String> ancillaryAccounting;
public DanHouVoucherModel(String abstracts, String subjects, List<String> ancillaryAccounting) {
this.abstracts = abstracts;
this.subjects = subjects;
this.ancillaryAccounting = ancillaryAccounting;
}
public DanHouVoucherModel() {
}
}
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.ruoyi.system.model.power.dto.DanHouInquireAboutSubjectAssistance;
import com.ruoyi.system.model.power.dto.DanHouInquireAboutSubjectAssistanceDto;
import com.ruoyi.system.model.power.dto.LinXiInquireAboutSubjectAssistance; import com.ruoyi.system.model.power.dto.LinXiInquireAboutSubjectAssistance;
import java.util.List; import java.util.List;
...@@ -10,4 +12,5 @@ import java.util.List; ...@@ -10,4 +12,5 @@ import java.util.List;
public interface PowerVoucherConversionService { public interface PowerVoucherConversionService {
List<LinXiInquireAboutSubjectAssistance> inquireAboutSubjectAssistance(List<LinXiInquireAboutSubjectAssistance> linXiInquireAboutSubjectAssistance); List<LinXiInquireAboutSubjectAssistance> inquireAboutSubjectAssistance(List<LinXiInquireAboutSubjectAssistance> linXiInquireAboutSubjectAssistance);
List<DanHouInquireAboutSubjectAssistance> shanHouVoucherConversion(DanHouInquireAboutSubjectAssistanceDto linXiInquireAboutSubjectAssistance);
} }
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import com.ruoyi.system.model.power.dto.DanHouInquireAboutSubjectAssistance;
import com.ruoyi.system.model.power.dto.DanHouInquireAboutSubjectAssistanceDto;
import com.ruoyi.system.model.power.dto.LinXiInquireAboutSubjectAssistance; import com.ruoyi.system.model.power.dto.LinXiInquireAboutSubjectAssistance;
import com.ruoyi.system.model.power.model.DanHouVoucherModel;
import com.ruoyi.system.service.PowerVoucherConversionService; import com.ruoyi.system.service.PowerVoucherConversionService;
import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -11,6 +16,7 @@ import java.util.stream.Collectors; ...@@ -11,6 +16,7 @@ import java.util.stream.Collectors;
* 2024/8/1 * 2024/8/1
* 凭证转换---电力 * 凭证转换---电力
*/ */
@Service
public class PowerVoucherConversionServiceImpl implements PowerVoucherConversionService { public class PowerVoucherConversionServiceImpl implements PowerVoucherConversionService {
@Override @Override
/** /**
...@@ -55,4 +61,39 @@ public class PowerVoucherConversionServiceImpl implements PowerVoucherConversion ...@@ -55,4 +61,39 @@ public class PowerVoucherConversionServiceImpl implements PowerVoucherConversion
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
/**
* 单侯凭证辅助核算调取部分
*
* @param danHouInquireAboutSubjectAssistanceDto
* @return
*/
@Override
public List<DanHouInquireAboutSubjectAssistance> shanHouVoucherConversion(DanHouInquireAboutSubjectAssistanceDto danHouInquireAboutSubjectAssistanceDto) {
List<DanHouInquireAboutSubjectAssistance> danHouInquireAboutSubjectAssistances = danHouInquireAboutSubjectAssistanceDto.getList();
String date = danHouInquireAboutSubjectAssistanceDto.getYears();
Map<String, DanHouVoucherModel> map = new HashMap<>();
map.put("内部单位往来-北阳庄矿", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费北阳庄矿", "1135001002", Arrays.asList("客商:01120301")));
map.put("内部单位往来-崔家寨矿", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费崔家寨矿", "1135001002", Arrays.asList("客商:011203")));
map.put("内部单位往来-西细庄矿", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费西细庄矿", "1135001002", Arrays.asList("客商:011203")));
map.put("内部单位往来-兴源矿", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费兴源矿", "1135001002", Arrays.asList("客商:011203")));
map.put("内部单位往来-综合服务中心", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费综合服务中心", "1135001002", Arrays.asList("客商:011203")));
map.put("基本生产-原煤", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费", "5002003", Arrays.asList("产品成本来源类别:0102_CW0025_100SX", "物料基本分类:MT01")));
map.put("基本生产-选煤-自产", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费", "5002003", Arrays.asList("产品成本来源类别:04_CW0025_1005Q", "物料基本分类:MT0303")));
map.put("制造费用-原煤", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费", "5101003", Arrays.asList("产品成本来源类别:0102_CW0025_100SX", "物料基本分类:MT01")));
map.put("管理费用", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费", "6602002003", Arrays.asList("部门:01_011204")));
map.put("其他业务成本-供电", new DanHouVoucherModel("转" + date + "电费结转外转电费", "6402003", Arrays.asList("其他业务支出费用要素:03_CW0029_10070")));
map.put("其他业务成本-生活用电", new DanHouVoucherModel("转" + date + "生活用电电费", "6402003", Arrays.asList("其他业务支出费用要素:03_CW0029_10070")));
map.put("安全费用-排水电费", new DanHouVoucherModel("转" + date + "排水电费", "4302002003004", Arrays.asList("投资项目费用要素:03_CW0010_100ZY", "安全生产费工程:03_CW0011_1000U")));
map.put("研发支出-村庄群下压煤安全开采新工艺设计研究", new DanHouVoucherModel("转" + date + "研发支出电费", "5301002010", Arrays.asList("项目:020181_011204")));
map.put("合计", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费", "2241005", null));
map.put("销售费用", new DanHouVoucherModel("转" + date + "电费结转外转电费收内部单位电费", "6601003", null));
List<DanHouInquireAboutSubjectAssistance> collect = danHouInquireAboutSubjectAssistances.parallelStream().filter(v -> !v.getLevelOneClassification().endsWith("-")).collect(Collectors.toList());
for (DanHouInquireAboutSubjectAssistance assistance : collect) {
String abs = assistance.getLevelOneClassification();
if (assistance.getLevelTwoClassification() != null && !"".equals(assistance.getLevelTwoClassification())) abs = abs + "-" + assistance.getLevelTwoClassification();
assistance.setDanHouVoucherModel(map.get(abs));
}
return collect;
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment