From 71f44d71edeabfdcc83366127a2f1f40f5a8de3e Mon Sep 17 00:00:00 2001
From: 123456 <123456>
Date: 星期三, 17 七月 2024 16:08:32 +0800
Subject: [PATCH] 费用统计分页查询功能修改
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 291 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 249 insertions(+), 42 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index a832e63..2e1b90b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -15,19 +15,20 @@
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.InsOrderService;
+import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -48,6 +49,7 @@
private InsSampleMapper insSampleMapper;
private InsProductMapper insProductMapper;
+ private InsProductService insProductService;
private GiveCode giveCode;
@@ -81,11 +83,11 @@
if (map1.get("look") == 1) {
//涓汉
sampleOrderDto.setCreateUser(map1.get("userId"));
- }else {
+ } else {
//缁勭粐
try {
sampleOrderDto.setCompany(customMapper.selectById(user.getCompany()).getCompany());
- }catch (NullPointerException e){
+ } catch (NullPointerException e) {
throw new ErrorException("鎵句笉鍒版墍灞炲崟浣�");
}
}
@@ -133,7 +135,8 @@
public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing) {
insOrder.setState(0);
String code = customMapper.selectById(insOrder.getCompanyId()).getCode2();
- insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyyyMMdd"));
+ //insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "", "yyMMdd"));
+ String giveCode = this.giveCode.giveCode("JCZX-" + code + "-", "ins_order", "", "yyMMdd");
insOrderMapper.insert(insOrder);
AtomicInteger count = new AtomicInteger();
list.forEach(a -> {
@@ -141,72 +144,202 @@
a.setId(null);
a.setInsOrderId(insOrder.getId());
if (StrUtil.isEmpty(a.getSampleCode())) {
- a.setSampleCode(giveCode.giveCode("", "ins_sample", "", "yyMMdd")+"-"+count.get());
+ a.setSampleCode(giveCode.split("-")[2] + "-" + count.get());
}
insSampleMapper.insert(a);
if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
- addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
+ addInsProductMethod(a.getId(), a.getInsProduct(), null, 0, false);
+ if (ObjectUtil.isNotEmpty(a.getBushing())) {
+ for (BushingDto bushingDto : a.getBushing()) {
+ bushingDto.setInsSampleId(a.getId());
+ insBushingMapper.insert(bushingDto);
+ if (bushingDto.getFiber().size() != 0) {
+ for (FiberDto fiberDto : bushingDto.getFiber()) {
+ fiberDto.setInsBushingId(bushingDto.getId());
+ insFiberMapper.insert(fiberDto);
+ addInsProductMethod(a.getId(), a.getInsProduct(), fiberDto.getId(), 2, true);
+ addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2, false);
+ }
+ } else {
+ for (FibersDto fibersDto : bushingDto.getFibers()) {
+ fibersDto.setInsBushingId(bushingDto.getId());
+ fibersDto.setCode(this.giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
+ insFibersMapper.insert(fibersDto);
+ for (FiberDto fiberDto : fibersDto.getFiber()) {
+ fiberDto.setInsFibersId(fibersDto.getId());
+ insFiberMapper.insert(fiberDto);
+ addInsProductMethod(a.getId(), a.getInsProduct(), fiberDto.getId(), 2, true);
+ addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2, false);
+ }
+ //addInsProductMethod(a.getId(), a.getInsProduct(), fibersDto.getId(), 1);
+ addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1, false);
+ }
+ }
+ }
+ }
}
- if (ObjectUtil.isNotEmpty(a.getBushing())) {
+ if (ObjectUtil.isNotEmpty(a.getInsulating())) {
+ List<InsProduct> ip2 = new ArrayList<>();
+ for (Integer i = 0; i < a.getInsulating().getNum(); i++) {
+ ip2.addAll(a.getInsulating().getInsProduct());
+ }
+ for (InsProduct product : ip2) {
+ product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
+ }
+ addInsProductMethod(a.getId(), ip2, null, 0, false);
+ }
+ if (ObjectUtil.isNotEmpty(a.getSheath())) {
+ for (InsProduct product : a.getSheath().getInsProduct()) {
+ product.setStandardMethodListId(a.getSheath().getStandardMethodListId());
+ }
+ addInsProductMethod(a.getId(), a.getSheath().getInsProduct(), null, 0, false);
+ }
+ if (ObjectUtil.isNotEmpty(a.getChildSampleList())) {
+ for (SampleProductDto b : a.getChildSampleList()) {
+ for (int i = 0; i < b.getNum(); i++) {
+ b.setId(null);
+ b.setInsOrderId(insOrder.getId());
+ b.setParentId(a.getId());
+ if (StrUtil.isEmpty(b.getSampleCode())) {
+ b.setSampleCode(this.giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
+ }
+ insSampleMapper.insert(b);
+ if (ObjectUtil.isNotEmpty(b.getInsProduct())) {
+ addInsProductMethod(b.getId(), b.getInsProduct(), null, 0, false);
+ }
+ }
+ }
+ }
+ if (ObjectUtil.isEmpty(a.getInsProduct()) && ObjectUtil.isNotEmpty(a.getBushing())) {
for (BushingDto bushingDto : a.getBushing()) {
bushingDto.setInsSampleId(a.getId());
insBushingMapper.insert(bushingDto);
- if(bushingDto.getFiber().size()!=0){
+ if (bushingDto.getFiber().size() != 0) {
for (FiberDto fiberDto : bushingDto.getFiber()) {
fiberDto.setInsBushingId(bushingDto.getId());
insFiberMapper.insert(fiberDto);
- addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2);
+ addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2, false);
}
- }else{
+ } else {
for (FibersDto fibersDto : bushingDto.getFibers()) {
fibersDto.setInsBushingId(bushingDto.getId());
- fibersDto.setCode(giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
+ fibersDto.setCode(this.giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
insFibersMapper.insert(fibersDto);
for (FiberDto fiberDto : fibersDto.getFiber()) {
fiberDto.setInsFibersId(fibersDto.getId());
insFiberMapper.insert(fiberDto);
- addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2);
+ addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2, false);
}
- addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1);
+ addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1, false);
}
}
}
}
});
for (List<Integer> i : pairing) {
- SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0))), SampleProductDto.class);
- sample.setSampleCode(list.get(i.get(0)-1).getSampleCode() + "/" +list.get(i.get(1)-1).getSampleCode());
+ SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0) - 1)), SampleProductDto.class);
+ sample.setSampleCode(list.get(i.get(0) - 1).getSampleCode() + "/" + list.get(i.get(1) - 1).getSampleCode());
sample.setId(null);
insSampleMapper.insert(sample);
- InsProduct insProduct = sample.getInsProduct().stream().filter(a -> Objects.equals(a.getInspectionItem(), "鐔旀帴鎹熻��")).findFirst().get();
- insProduct.setId(null);
- insProduct.setInsSampleId(sample.getId());
- insProductMapper.insert(insProduct);
+ try {
+ List<InsProduct> insProducts = sample.getInsProduct().stream().filter(a -> Objects.equals(a.getInspectionItem(), "鍏夌氦鎺ュご鎹熻��")).collect(Collectors.toList());
+ for (InsProduct insProduct : insProducts) {
+ insProduct.setId(null);
+ insProduct.setInsSampleId(sample.getId());
+ insProductMapper.insert(insProduct);
+ }
+ } catch (Exception e) {
+ }
}
return insOrder.getId();
}
- private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type) {
+ private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type, Boolean is) {
+ InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(sampleId).getInsOrderId());
for (InsProduct product : productList) {
- if(product.getState()==1 && !product.getInspectionItem().equals("鐔旀帴鎹熻��")){
- switch (type){
- case 1:
- product.setInsFibersId(id);
- break;
- case 2:
- product.setInsFiberId(id);
- break;
+ if (product.getState() == 1 && !product.getInspectionItem().equals("鍏夌氦鎺ュご鎹熻��")) {
+ //鍒ゆ柇鍏夌紗鐨勬俯搴﹀惊鐜」鐩坊鍔�
+ if (insOrder.getSampleType().equals("鍏夌紗") && product.getInspectionItem().equals("娓╁害寰幆") && type != 0) {
+ List<InsProduct> insProductes = new ArrayList<>();
+ List<InsProduct> insProducts = new ArrayList<>();
+ String[] strings = product.getAsk().split(";");
+
+ for (int i = 0; i < strings.length; i++) {
+ int count = Integer.parseInt(strings[strings.length - 1]);
+ if (i != strings.length - 1) {
+ InsProduct insProduct = new InsProduct();
+ switch (type) {
+ case 1:
+ insProduct.setInsFibersId(id);
+ break;
+ case 2:
+ insProduct.setInsFiberId(id);
+ break;
+ }
+ String[] split = strings[i].split(",");
+ if (split[0].equals("20鈩�")) {
+ insProduct.setInspectionItem(count + "");//妫�楠岄」--寰幆娆℃暟
+ } else {
+ insProduct.setInspectionItem("1");//妫�楠岄」--寰幆娆℃暟
+ }
+ insProduct.setInspectionItemSubclass(split[0]);//妫�楠岄」--娓╁害
+ insProduct.setInspectionItemClass(split[1]);//妫�楠岄」--鍏夌氦椤圭洰
+ insProduct.setAsk(split[2]);//妫�楠岃姹�
+ insProduct.setTell(strings[i]);//妫�楠屾弿杩�
+ insProduct.setInsSampleId(sampleId);
+ insProduct.setState(1);
+ insProduct.setFactory(product.getFactory());
+ insProduct.setLaboratory(product.getLaboratory());
+ insProduct.setSampleType(product.getSampleType());
+ insProduct.setSample(product.getSample());
+ insProduct.setModel(product.getModel());
+ insProduct.setSonLaboratory(product.getSonLaboratory());
+ insProduct.setUnit(product.getUnit());
+ insProduct.setManHourGroup(product.getManHourGroup());
+ insProduct.setInspectionItemType("0");
+ insProduct.setInspectionValueType("1");
+ insProducts.add(insProduct);
+ insProductes.add(insProduct);
+ } else {
+ //鏈�鍚庝竴涓暟鎹槸璇存槑浼氬惊鐜灏戞
+ if (count > 1) {
+ //寰幆瓒呰繃1娆�
+ for (int j = 2; j <= count; j++) {
+ for (InsProduct insProduct : insProducts) {
+ if (!insProduct.getInspectionItemSubclass().equals("20鈩�") && !insProduct.getInspectionItemSubclass().equals("20鈩�(甯告俯)")) {
+ InsProduct insProduct1 = new InsProduct();
+ BeanUtils.copyProperties(insProduct, insProduct1);
+ insProduct1.setInspectionItem(j + "");
+ insProductes.add(insProduct1);
+ }
+ }
+ }
+ }
+ }
+ }
+ insProductService.saveBatch(insProductes);
+ } else {
+ if (!is) {
+ switch (type) {
+ case 1:
+ product.setInsFibersId(id);
+ break;
+ case 2:
+ product.setInsFiberId(id);
+ break;
+ }
+ product.setId(null);
+ product.setCreateTime(null);
+ product.setUpdateTime(null);
+ product.setUpdateTime(null);
+ product.setUpdateUser(null);
+ product.setInsSampleId(sampleId);
+ if (product.getInspectionItemSubclass() == null) {
+ product.setInspectionItemSubclass("");
+ }
+ insProductMapper.insert(product);
+ }
}
- product.setId(null);
- product.setCreateTime(null);
- product.setUpdateTime(null);
- product.setUpdateTime(null);
- product.setUpdateUser(null);
- product.setInsSampleId(sampleId);
- if (product.getInspectionItemSubclass() == null) {
- product.setInspectionItemSubclass("");
- }
- insProductMapper.insert(product);
}
}
}
@@ -224,6 +357,15 @@
@Override
public int upInsOrderOfState(InsOrder insOrder) {
insOrder.setExamineTime(LocalDateTime.now());
+ if (insOrder.getState() == 1) {
+ //瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
+ String code = baseMapper.selLaboratoryCode(insOrder.getLaboratory());
+ if (StringUtils.isEmpty(code)) {
+ code = "";
+ }
+ String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2();
+ insOrder.setEntrustCode(giveCode.giveCode2("JCZX/" + code + "-" + code2 + "-", insOrder.getCompanyId(), insOrder.getLaboratory(), "ins_order", "", "yyMM"));
+ }
return insOrderMapper.updateById(insOrder);
}
@@ -234,6 +376,9 @@
List<SampleProductDto> list = insSampleMapper.getInsOrderAndSample(id, laboratory);
map.put("insOrder", insOrder);
map.put("sampleProduct", list);
+ //鏌ヨ鎵�鏈夎褰曟ā鐗堝幓閲�
+ List<Map<Integer, Object>> list2 = insOrderMapper.selectReportModelByOrderId(id, laboratory);
+ map.put("reportModel", list2);
return map;
}
@@ -254,7 +399,48 @@
map.put("head", PrintChina.printChina(CostStatisticsDto.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("costStatistics");
if (map1.get("look") == 1) costStatisticsDto.setCreateUser(map1.get("userId"));
- map.put("body", insOrderMapper.selectCostStatistics(page, QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59")));
+ IPage<CostStatisticsDto> costStatisticsDtoIPage = insOrderMapper.selectCostStatistics(page, QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59"));
+ List<CostStatisticsDto> costStatisticsDtoList = costStatisticsDtoIPage.getRecords();
+ for (CostStatisticsDto statisticsDto : costStatisticsDtoList) {
+ statisticsDto.setNum(1);
+ }
+ List<CostStatisticsDto> costStatisticsDtoList1 = deduplicateAndSumCounts(costStatisticsDtoList);
+ costStatisticsDtoIPage.setRecords(costStatisticsDtoList1);
+ map.put("body", costStatisticsDtoIPage);
+ return map;
+ }
+ private static List<CostStatisticsDto> deduplicateAndSumCounts(List<CostStatisticsDto> list) {
+ // 浣跨敤涓�涓� Map 鏉ュ瓨鏀惧凡缁忓嚭鐜拌繃鐨� inspectionItem + entrustCode + sample 鐨勭粍鍚�
+ Map<String, CostStatisticsDto> map = new HashMap<>();
+ // 閬嶅巻鍒楄〃杩涜鍘婚噸鍜岃鏁�
+ for (CostStatisticsDto dto : list) {
+ String key = dto.getInspectionItem() + dto.getEntrustCode() + dto.getSample();
+ if (map.containsKey(key)) {
+ // 濡傛灉宸茬粡瀛樺湪锛屽垯绱姞鏁伴噺
+ CostStatisticsDto existingDto = map.get(key);
+ existingDto.setNum(existingDto.getNum() + dto.getNum());
+ existingDto.setPrice(existingDto.getPrice().add(dto.getPrice()));
+ } else {
+ // 濡傛灉涓嶅瓨鍦紝鍒欐斁鍏� Map 涓�
+ map.put(key, dto);
+ }
+ }
+ // 灏� Map 涓殑鍊艰浆涓� List 杩斿洖
+ return new ArrayList<>(map.values());
+ }
+
+ @Override
+ public Map<String, Object> costStatistics2(CostStatisticsDto costStatisticsDto) {
+ Map<String, Object> map = new HashMap<>();
+ String dates = costStatisticsDto.getDates();
+ String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
+ costStatisticsDto.setDates(null);
+ List<CostStatisticsDto> costStatisticsDtos = insOrderMapper.selectCostStatistics2(QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59"));
+ double totalPrice = costStatisticsDtos.stream()
+ .filter(dto -> dto.getPrice() != null) // 杩囨护鎺変环鏍间负 null 鐨勫璞�
+ .mapToDouble(value -> value.getPrice().doubleValue())
+ .sum();
+ map.put("total",totalPrice);
return map;
}
@@ -272,6 +458,27 @@
public int updateStatus(Integer id) {
return insOrderMapper.updateStatus(id);
}
+
+ //鏍囩鎵撳嵃
+ @Override
+ public List<SampleProductDto3> labelPrinting(String ids) {
+ List<Integer> list = Arrays.stream(ids.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+ List<SampleProductDto3> sampleProductDtos = insSampleMapper.selectSampleProductListByOrderId3(list);
+ Set<String> processedCodes = new HashSet<>();
+ //濡傛灉鏄厜绾ゆ垨鑰呮槸鍏夌氦甯﹂粯璁ゅ彧鎵撳嵃绗竴涓�
+ List<SampleProductDto3> sampleProductDto3s = sampleProductDtos.stream().filter(sampleProductDto3 -> {
+ if (!"鍏夌氦".equals(sampleProductDto3.getIoSampleType()) && !"鍏夌氦甯�".equals(sampleProductDto3.getIoSampleType())) {
+ return true;
+ }
+ if (processedCodes.contains(sampleProductDto3.getCode())) {
+ return false;
+ } else {
+ processedCodes.add(sampleProductDto3.getCode());
+ return true;
+ }
+ }).collect(Collectors.toList());
+ return sampleProductDto3s;
+ }
}
--
Gitblit v1.9.3