From 8299dc8cd015c354ce0765a130583a16d994a1b0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 08 七月 2024 14:25:52 +0800
Subject: [PATCH] 骑缝章1.0
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 1029 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 939 insertions(+), 90 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 6d58dd7..4bb2475 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -1,12 +1,18 @@
package com.yuanchu.mom.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,48 +20,51 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.data.*;
-import com.deepoove.poi.data.style.Style;
-import com.deepoove.poi.data.style.TableStyle;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.util.TableTools;
+import com.deepoove.poi.xwpf.WidthScalePattern;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.ExcelDto;
-import com.yuanchu.mom.dto.InsOrderPlanDTO;
-import com.yuanchu.mom.dto.SampleProductDto;
+import com.yuanchu.mom.dto.*;
+import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
-import com.yuanchu.mom.exception.ErrorException;
-import com.yuanchu.mom.service.InsOrderPlanService;
-import com.yuanchu.mom.service.InsOrderService;
-import com.yuanchu.mom.service.StandardTemplateService;
-import com.yuanchu.mom.utils.GiveCode;
+import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.MatrixToImageWriter;
import com.yuanchu.mom.utils.QueryWrappers;
+import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
import com.yuanchu.mom.vo.InsOrderPlanVO;
+import com.yuanchu.mom.vo.ProductVo;
+import com.yuanchu.mom.vo.SampleVo;
import org.apache.commons.io.IOUtils;
-import org.apache.poi.xwpf.usermodel.TableRowAlign;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.poi.xwpf.usermodel.*;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.*;
+import java.math.BigInteger;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
*/
@Service
-//@AllArgsConstructor
public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
@Resource
@@ -82,9 +91,6 @@
private String twoCode;
@Resource
- private GiveCode giveCode;
-
- @Resource
private InsReportMapper insReportMapper;
@Resource
@@ -92,6 +98,39 @@
@Resource
private InsProductUserMapper insProductUserMapper;
+
+ @Resource
+ private InsUnPassService insUnPassService;
+
+ @Resource
+ AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
+
+ @Resource
+ private InformationNotificationService informationNotificationService;
+
+ @Resource
+ private UserMapper userMapper;
+
+ @Resource
+ private CustomMapper customMapper;
+
+ @Value("${file.path}")
+ private String imgUrl;
+
+ @Resource
+ private InsBushingService insBushingService;
+
+ @Resource
+ private InsBushingMapper insBushingMapper;
+
+ @Resource
+ private InsFiberMapper insFiberMapper;
+
+ @Resource
+ private InsFibersMapper insFibersMapper;
+
+ @Resource
+ private InsOrderFileMapper insOrderFileMapper;
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -103,6 +142,20 @@
insOrderPlanDTO.setUserId(userId.longValue());
}
IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
+ map.put("body", insOrderPage);
+ return map;
+ }
+
+ @Override
+ public Map<String, Object> inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(InsOrderPlanTaskSwitchVo.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
+ Integer userId = map1.get("userId");
+ if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
+ insOrderPlanDTO.setUserId(userId.longValue());
+ }
+ IPage<InsOrderPlanTaskSwitchVo> insOrderPage = insSampleMapper.inspectionOrderDetailsTaskSwitching(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
map.put("body", insOrderPage);
return map;
}
@@ -129,16 +182,188 @@
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 1));
}
Map<String, Object> map = insOrderService.getInsOrderAndSample(id, laboratory);
- Set<Integer> set = new HashSet<>();
- Map<Integer, String> map2 = new HashMap<>();
List<SampleProductDto> list = JSON.parseArray(JSON.toJSONString(map.get("sampleProduct")), SampleProductDto.class);
for (SampleProductDto samples : list) {
if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
- getTemplateThing(set, map2, samples);
+ samples.setBushing(insBushingService.selectBushingBySampleId(samples.getId()));
}
map.put("sampleProduct", list);
return map;
}
+
+ @Override
+ public List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory) {
+ List<InsProduct> insProducts = new ArrayList<>();
+ switch (type) {
+ case 0:
+ insProducts = insSampleMapper.getInsProduct1(id, laboratory);
+ break;
+ case 1:
+ insProducts = insSampleMapper.getInsProduct2(id);
+ break;
+ case 2:
+ insProducts = insSampleMapper.getInsProduct3(id);
+ break;
+ }
+ Set<Integer> set = new HashSet<>();
+ Map<Integer, String> map2 = new HashMap<>();
+ if (BeanUtil.isEmpty(insProducts)) return null;
+ getTemplateThing(set, map2, insProducts);
+ return insProducts;
+ }
+
+ @Override
+ public List<String> checkSubmitPlan(Integer orderId, String laboratory) {
+ List<String> collect = new ArrayList<>();
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
+ List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).eq(InsProduct::getInsResult, 0));
+ if (insProducts.size() > 0) {
+ collect = insProducts.stream().map(insProduct -> {
+ return insProduct.getInspectionItem() + "-" + insProduct.getInspectionItemSubclass();
+ }).collect(Collectors.toList());
+ }
+ return collect;
+ }
+
+ @Override
+ public Map<String, Object> getFileList(Page page, InsOrderFile insOrderFile) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(InsOrderFile.class));
+ IPage<InsOrderFile> insOrderFileIPage = insOrderFileMapper.getFileList(page, QueryWrappers.queryWrappers(insOrderFile));
+ map.put("body", insOrderFileIPage);
+ return map;
+ }
+
+ @Override
+ public int uploadFile(Integer orderId, MultipartFile file) {
+ String urlString;
+ String pathName;
+ String path;
+ String filename = file.getOriginalFilename();
+ String contentType = file.getContentType();
+ InsOrderFile insOrderFile = new InsOrderFile();
+ insOrderFile.setInsOrderId(orderId);
+ insOrderFile.setFileName(filename);
+ if (contentType != null && contentType.startsWith("image/")) {
+ // 鏄浘鐗�
+ path = imgUrl;
+ insOrderFile.setType(1);
+ } else {
+ // 鏄枃浠�
+ path = wordUrl;
+ insOrderFile.setType(2);
+ }
+ try {
+ File realpath = new File(path);
+ if (!realpath.exists()) {
+ realpath.mkdirs();
+ }
+ pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
+ urlString = realpath + "/" + pathName;
+ file.transferTo(new File(urlString));
+ insOrderFile.setFileUrl(pathName);
+ return insOrderFileMapper.insert(insOrderFile);
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.err.println("闄勪欢涓婁紶閿欒");
+ return 0;
+ }
+ }
+
+ //鍒囨崲璁板綍妯＄増鏌ヨ妫�楠屽唴瀹�
+ @Override
+ public Map<String, Object> getReportModel(Integer sampleId) {
+ Map<String, Object> map = new HashMap<>();
+ //鍏堟煡鍑哄绠�
+ List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
+ List<InsFibers> fibers = new ArrayList<>();
+ List<InsFiber> fiber = new ArrayList<>();
+ for (InsBushing insBushing : insBushings) {
+ //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
+ List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
+ if (CollectionUtils.isNotEmpty(insFibers)) {
+ fibers.addAll(insFibers);
+ //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
+ List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().in(InsFiber::getInsFibersId, insFibers.stream().map(InsFibers::getId).collect(Collectors.toList())));
+ fiber.addAll(fiberList);
+ } else {
+ //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
+ List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
+ fiber.addAll(insFiberList);
+ }
+ }
+ map.put("鍏夌氦甯�", fibers);
+ map.put("鍏夌氦", fiber);
+ return map;
+ }
+
+ //娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)
+ @Override
+ public Map<String, Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
+ Map<String, Object> map = new HashMap<>();
+ //鏍峰搧淇℃伅
+ SampleVo sampleVo = insSampleMapper.getDetailById(sampleId);
+ map.put("sampleVo", sampleVo);
+ List<ProductVo> productVos = new ArrayList<>();
+ //鍏堟煡鍑鸿繖涓牱鍝佷笅鏈夊摢浜涚鑹叉爣,鍏夌氦甯�,鍏夌氦鑹叉爣
+ //鍏堟煡鍑哄绠�
+ List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
+ for (InsBushing insBushing : insBushings) {
+ //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
+ List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
+ if (CollectionUtils.isNotEmpty(insFibers)) {
+ for (InsFibers insFiber : insFibers) {
+ //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
+ List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsFibersId, insFiber.getId()));
+ for (InsFiber fiber : fiberList) {
+ //鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, sampleId)
+ .eq(InsProduct::getInspectionItem, inspectionItem)
+ .eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
+ .eq(InsProduct::getInsFiberId, fiber.getId()));
+ for (InsProduct insProduct : insProducts) {
+ InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ ProductVo productVo = new ProductVo();
+ productVo.setCode(insFiber.getCode());
+ productVo.setColor(fiber.getColor());
+ productVo.setBushColor(fiber.getBushColor());
+ if (ObjectUtils.isNotEmpty(insProductResult)) {
+ insProduct.setInsProductResult(insProductResult);
+ }
+ productVo.setInsProduct(insProduct);
+ productVos.add(productVo);
+ }
+ }
+ }
+ } else {
+ //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
+ List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
+ for (InsFiber fiber : insFiberList) {
+ //鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, sampleId)
+ .eq(InsProduct::getInspectionItem, inspectionItem)
+ .eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
+ .eq(InsProduct::getInsFiberId, fiber.getId()));
+ for (InsProduct insProduct : insProducts) {
+ InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ ProductVo productVo = new ProductVo();
+ productVo.setCode("/");
+ productVo.setColor(fiber.getColor());
+ productVo.setBushColor(fiber.getBushColor());
+ insProduct.setInsProductResult(insProductResult);
+ productVo.setInsProduct(insProduct);
+ productVos.add(productVo);
+ }
+ }
+ }
+ }
+ map.put("productVos", productVos);
+ return map;
+ }
+
@Override
public void saveInsContext(Map<String, Object> insContext) {
@@ -148,9 +373,12 @@
JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
InsProduct insProduct = new InsProduct();
insProduct.setId(Integer.parseInt(k));
- InsProductResult result = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
- if (BeanUtil.isEmpty(result)) {
+ List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ InsProductResult result;
+ if (CollectionUtils.isEmpty(results)) {
result = new InsProductResult();
+ } else {
+ result = results.get(0);
}
result.setInsProductId(Integer.parseInt(k));
if (jo.get("insValue") != null) {
@@ -187,9 +415,10 @@
JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
if (resValue.get("v") != null) {
Object o = JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v");
- insProduct.setLastValue(o==null?null:(o + ""));
+ insProduct.setLastValue(o.equals("") ? null : (o.toString()));
}
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
if (jo.get("equipValue") != null) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
List<Map<String, Object>> ev = new ArrayList<>();
@@ -230,6 +459,36 @@
insProduct.setUpdateUser(userId);
insProductMapper.updateById(insProduct);
insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+
+ insProduct = insProductMapper.selectById(insProduct);
+
+ //鏌ヨ妫�楠屽崟淇℃伅
+ InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(insProduct.getInsSampleId()).getInsOrderId());
+ //鏍￠獙濡傛灉杩欎釜浜鸿繖涓娴嬮」鐩凡缁忔坊鍔犺繃浜嗗垯涓嶉渶瑕佸啀鏂板
+ Long count = auxiliaryOutputWorkingHoursMapper.selectCount(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
+ .eq(AuxiliaryOutputWorkingHours::getCheck, userId)
+ .eq(AuxiliaryOutputWorkingHours::getInspectProject, insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem())
+ .eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode()));
+ if (count == 0 && ObjectUtils.isNotEmpty(insProduct.getManHour())) {
+ //娣诲姞姣忎釜浜虹殑浜ч噺宸ユ椂
+ AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
+ auxiliaryOutputWorkingHours.setInspectProject(insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem());//妫�娴嬮」鐩�
+ auxiliaryOutputWorkingHours.setOrderNo(insOrder.getEntrustCode());//闈炲姞鐝鎵樺崟鍙�
+ auxiliaryOutputWorkingHours.setWorkTime(insProduct.getManHour());//闈炲姞鐝伐鏃�
+ auxiliaryOutputWorkingHours.setAmount(1);//闈炲姞鐝暟閲�
+ auxiliaryOutputWorkingHours.setOutputWorkTime(insProduct.getManHour());//浜ч噺宸ユ椂
+ auxiliaryOutputWorkingHours.setManHourGroup(insProduct.getManHourGroup());//宸ユ椂鍒嗙粍
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ auxiliaryOutputWorkingHours.setDateTime(LocalDateTime.now().toLocalDate().atStartOfDay().format(formatters));//鏃ユ湡
+ LocalDateTime localDateTime = LocalDateTime.now();
+ DateTime parse = DateUtil.parse(localDateTime.format(formatter));
+ auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//鏄熸湡
+ auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//鍛ㄦ
+ auxiliaryOutputWorkingHours.setCheck(userId);//妫�娴嬩汉
+ auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours);
+ }
+
InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
insSample.setInsState(1);
Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
@@ -243,11 +502,23 @@
});
return insContext.keySet().stream().findFirst().orElse(null);
}).thenAccept(res -> {
- if(res!=null){
+ if (res != null) {
int pId = Integer.parseInt(res.replaceAll("\\D+", ""));
- // TODO: 2024/5/4 銆愬墠缃�戦渶瑕侀�氳繃pid鑾峰彇妫�楠屽崟褰撳墠璇曢獙瀹ゆ墍鏈夐」鐩槸鍚︽湁妫�楠岀粨鏋滃悗杩涜鍒ゆ柇妫�楠屽崟鏄惁鏇存敼鎴愨�滃凡妫�鈥濈姸鎬侊紱鍓嶇疆瀹屾垚鍚庡彲鑳戒細瀵艰嚧澶嶆牳鎺ュ彛鍒ゆ柇鏄惁浜х敓鎶ュ憡鐨勯�昏緫閿欒
-// InsProduct insProduct = insProductMapper.selectById(pId);
-// insSampleMapper.selectList(Wrappers.<>)
+ InsProduct insProduct = insProductMapper.selectById(pId);
+ // 閫氳繃pId 鑾峰彇褰撳墠鏍锋湰id
+ int sampleId = insProductMapper.selectById(pId).getInsSampleId();
+ // 閫氳繃鏍锋湰id鑾峰彇璁㈠崟id
+ int orderId = insSampleMapper.selectById(sampleId).getInsOrderId();
+ // 閫氳繃璁㈠崟id鏌ユ壘鎵�鏈夋牱鏈琲d
+ List<Integer> sampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
+ // 閫氳繃妫�鏌ユ瘡涓�涓牱鏈琲d鏌ュ埌灞炰簬妫�楠岄」缁撹 is null鐨勬暟閲�
+ Long count = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()).eq(InsProduct::getState, 1));
+ if (count == 0) {
+ insOrderStateMapper.update(new InsOrderState(), Wrappers.<InsOrderState>lambdaUpdate()
+ .eq(InsOrderState::getInsOrderId, orderId)
+ .eq(InsOrderState::getLaboratory, insProduct.getSonLaboratory())
+ .set(InsOrderState::getInsState, 2));
+ }
}
}).exceptionally(e -> {
e.printStackTrace();
@@ -270,31 +541,63 @@
Integer num = (type == 1 ? 5 : 4);
LocalDateTime now = LocalDateTime.now();
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, now).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell).set(InsOrderState::getVerifyUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
- List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, orderId));
- long count = insOrderStates.stream().filter(a -> a.getInsState() == 5).count();
- // TODO: 2024/5/5 銆愬悗缃�戞姤鍛婃槸鍚︾敓鎴愮殑鍒ゆ柇鍙兘浼氬洜涓哄墠缃搷浣滃鑷存案杩滃垽鏂笉閫氳繃
- if (count == insOrderStates.size() && num == 5) {
+ Long count = insOrderStateMapper.selectCount(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, orderId).ne(InsOrderState::getInsState, 5));
+ if (count == 0 && num == 5) {
+ List<InsUnPass> insUnPasses = new ArrayList<>();
+ /*鏍峰搧涓嬬殑椤圭洰鍙鏈変竴涓」鐩笉鍚堟牸鍒欐楠岀粨鏋滀负0,鍚﹀垯涓�1*/
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId));
+ for (InsSample insSample : insSamples) {
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, insSample.getId()).eq(InsProduct::getState, 1));
+ List<Integer> results = insProducts.stream().map(InsProduct::getInsResult).filter(str -> str != null).collect(Collectors.toList());
+ if (results.contains(0)) {
+ insSample.setInsResult(0);
+ } else {
+ insSample.setInsResult(1);
+ }
+ insSampleMapper.updateById(insSample);
+ /*澶嶆牳閫氳繃鍚庯紝灏嗕笉鍚堟牸鐨勯」鐩俊鎭坊鍔犲埌ins_un_pass琛ㄤ腑*/
+ for (InsProduct insProduct : insProducts) {
+ if (insProduct.getInsResult() == 0) {
+ InsUnPass insUnPass = new InsUnPass();
+ insUnPass.setId(null);
+ insUnPass.setModel(insSample.getModel());
+ insUnPass.setSample(insSample.getSample());
+ insUnPass.setInspectionItem(insProduct.getInspectionItem());
+ insUnPass.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());
+ insUnPass.setLastValue(insProduct.getLastValue());
+ insUnPass.setEntrustCode(insOrderMapper.selectById(orderId).getEntrustCode());
+ List<Integer> userIds = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery().eq(InsProductUser::getInsProductId, insProduct.getId())).stream().map(InsProductUser::getCreateUser).distinct().collect(Collectors.toList());
+ String name = userMapper.selectBatchIds(userIds).stream().map(User::getName).collect(Collectors.joining(","));
+ insUnPass.setName(name);
+ insUnPasses.add(insUnPass);
+ }
+ }
+ }
+ insUnPassService.saveBatch(insUnPasses);
InsOrder insOrder = insOrderMapper.selectById(orderId);
Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
InsReport insReport = new InsReport();
- insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
+ insReport.setCode(insOrder.getEntrustCode());
insReport.setInsOrderId(orderId);
- Set<Integer> set = new HashSet<>();
- Map<Integer, String> map2 = new HashMap<>();
List<Map<String, Object>> tables = new ArrayList<>();
Set<String> standardMethod = new HashSet<>();
Set<String> deviceSet = new HashSet<>();
Set<String> models = new HashSet<>();
AtomicReference<Integer> productSize = new AtomicReference<>(0);
String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
+ AtomicReference<String> resultCh = new AtomicReference<>("");
+ AtomicReference<String> resultEn = new AtomicReference<>("");
samples.forEach(a -> {
+ Set<Integer> set = new HashSet<>();
+ Map<Integer, String> map2 = new HashMap<>();
+ Long productCount = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, a.getId()));
+ productSize.set(productSize.get() + Integer.parseInt(productCount + ""));
models.add(a.getModel());
+ standardMethod.add(baseMapper.getStandardMethodCode(a.getStandardMethodListId()));
Set<String> templateSet = new HashSet<>();
- getTemplateThing(set, map2, a);
+ getTemplateThing(set, map2, a.getInsProduct());
for (InsProduct b : a.getInsProduct()) {
- standardMethod.add(b.getMethodS());
- productSize.set(productSize.get() + 1);
if (b.getInsProductResult() != null) {
List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
for (JSONObject jsonObject : jsonObjects) {
@@ -303,12 +606,16 @@
}
}
}
+ if (b.getTemplate() == null) {
+ continue;
+ }
if (b.getTemplate().size() == 0) {
continue;
}
templateSet.add(JSON.toJSONString(b.getTemplate()));
}
AtomicInteger index = new AtomicInteger();
+ Set<String> itemSet = new HashSet<>();
templateSet.forEach(tem -> {
Set<Integer> set2 = new HashSet<>();
List<RowRenderData> rows = new ArrayList<>();
@@ -345,12 +652,18 @@
List<JSONObject> temp = JSON.parseArray(JSON.toJSONString(excelDtos), JSONObject.class);
Map<String, InsProduct> pMap = new HashMap<>();
Set<String> delRSet = new HashSet<>();
+ delRSet.add("0");
for (JSONObject jo1 : temp) {
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
+ if (Integer.parseInt(jo1.get("c") + "") > 9) {
+ delSet.add(jo1.get("c") + "");
+ continue;
+ }
if (v.get("ps") != null) {
int count3 = 0;
String str = "";
- if ("妫�楠屽��".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧鍚嶇О".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧缂栫爜".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+ String s = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
+ if ("妫�楠屽��".equals(s) || "璁惧鍚嶇О".equals(s) || "璁惧缂栫爜".equals(s) || "璇曢獙鏂规硶".equals(s) || "妫�娴嬫柟娉�".equals(s)) {
delSet.add(jo1.get("c") + "");
continue;
}
@@ -384,11 +697,8 @@
delRSet.add(jo1.get("r") + "");
}
}
- } else {
- if ("鍙傛暟".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
}
}
- // TODO: 2024/5/5 涓嬪垪寰幆缂哄皯word鍚堝苟鍗曞厓鏍肩殑鎿嶄綔
for (int i = 0; i < temp.size(); i++) {
JSONObject jo1 = temp.get(i);
TextRenderData textRenderData = new TextRenderData();
@@ -411,7 +721,7 @@
if (p != null && v.get("ps") != null) {
String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
if (value.equals("瑕佹眰鍊�")) {
- textRenderData.setText(p.getAsk());
+ textRenderData.setText(ObjectUtils.isNotEmpty(p.getTell()) ? p.getTell() : "");
} else if (value.equals("鍗曚綅")) {
textRenderData.setText(p.getUnit());
} else if (value.equals("缁撹")) {
@@ -420,6 +730,8 @@
textRenderData.setText("鈭�");
break;
case 0:
+ resultCh.set(resultCh.get() + "銆�" + p.getInspectionItem() + (Objects.equals(p.getInspectionItemSubclass(), "") ? "" : " " + p.getInspectionItemSubclass()));
+ resultEn.set(resultEn.get() + "銆�" + p.getInspectionItemEn() + ((Objects.equals(p.getInspectionItemSubclassEn(), "") || Objects.equals(p.getInspectionItemSubclassEn(), null)) ? "" : " " + p.getInspectionItemSubclassEn()));
textRenderData.setText("脳");
break;
default:
@@ -427,7 +739,9 @@
break;
}
} else if (value.equals("搴忓彿")) {
- index.getAndIncrement();
+ if (itemSet.add(p.getInspectionItem())) {
+ index.getAndIncrement();
+ }
textRenderData.setText(index + "");
} else if (value.equals("璁＄畻鍊�")) {
JSONArray jsonArray = JSON.parseArray(p.getInsProductResult().getComValue());
@@ -442,6 +756,18 @@
textRenderData.setText(a.getSample());
} else if (value.equals("璇曢獙鏂规硶")) {
textRenderData.setText(p.getMethodS());
+ } else if (value.equals("妫�楠岄」")) {
+ if (ObjectUtils.isEmpty(p.getInspectionItemEn())) {
+ textRenderData.setText(p.getInspectionItem());
+ } else {
+ textRenderData.setText(p.getInspectionItem() + "&" + p.getInspectionItemEn());
+ }
+ } else if (value.equals("妫�楠屽瓙椤�")) {
+ if (ObjectUtils.isEmpty(p.getInspectionItemSubclassEn())) {
+ textRenderData.setText(p.getInspectionItemSubclass());
+ } else {
+ textRenderData.setText(p.getInspectionItemSubclass() + "&" + p.getInspectionItemSubclassEn());
+ }
} else {
textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
}
@@ -456,6 +782,8 @@
textRenderData.setText("鉁�");
break;
case 0:
+ resultCh.set(resultCh.get() + "銆�" + p.getInspectionItem() + (p.getInspectionItemSubclass().equals("") ? "" : " " + p.getInspectionItemSubclass()));
+ resultEn.set(resultEn.get() + "銆�" + p.getInspectionItemEn() + ((Objects.equals(p.getInspectionItemSubclassEn(), "") || Objects.equals(p.getInspectionItemSubclassEn(), null)) ? "" : " " + p.getInspectionItemSubclassEn()));
textRenderData.setText("鉁�");
break;
default:
@@ -474,9 +802,11 @@
} else {
textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
}
+ if (jo1.get("mc") != null) {
+ textRenderData.setText(textRenderData.getText() + "鈭�" + jo1.get("mc"));
+ }
Style style = new Style();
- style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
-// style.setFontSize(v.get("fs")==null?14:Integer.parseInt(v.get("fs")+""));
+ style.setFontFamily("瀹嬩綋");
if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
} else {
@@ -484,36 +814,74 @@
}
textRenderData.setStyle(style);
text.add(textRenderData);
- if (i == temp.size() - 1) {
- TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
- rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
- rows.add(rowRenderData);
- text = new ArrayList<>();
- }
}
+ TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+ rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
+ if (rowRenderData.getCells().size() != 0) {
+ rows.add(rowRenderData);
+ }
+ List<TableRenderData> tables1 = new ArrayList<>();
TableRenderData tableRenderData = new TableRenderData();
- tableRenderData.setRows(rows);
- TableStyle tableStyle = new TableStyle();
- /*JSONObject styleJo = JSON.parseObject(JSON.toJSONString(b.getStyle().get("columnlen")));
- List<Integer> colLen = new ArrayList<>();
- int colSize = rows.get(0).getCells().size();
- int colOne = Integer.parseInt(b.getTemplate().get(0).get("r") + "");
- for (int i = colOne; i < colSize + colOne; i++) {
- if (styleJo.get(i + "") == null) {
- colLen.add(pxToCm(100));
- } else {
- int i1 = Integer.parseInt(styleJo.get(i + "") + "");
- colLen.add(pxToCm(i1));
+ tableRenderData.setRows(new ArrayList<>());
+ double totalHeight = 0.0; // 鐢ㄤ簬璺熻釜褰撳墠琛ㄦ牸鐨勬�昏楂�
+ double heightThreshold = 8000.0; // 闃堝�硷紝
+ List<RowRenderData> firstTwoRows = new ArrayList<>(); // 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
+ // 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
+ if (rows.size() >= 2) {
+ firstTwoRows.add(rows.get(0));
+ firstTwoRows.add(rows.get(1));
+ }
+ for (RowRenderData row : rows) {
+ double rowHeight = row.getRowStyle().getHeight(); // 鑾峰彇褰撳墠琛岀殑琛岄珮
+ totalHeight += rowHeight; // 鏇存柊鎬昏楂�
+ if (totalHeight >= heightThreshold) {
+ // 鍒涘缓鏂拌〃鏍煎苟澶嶅埗鍓嶄袱琛�
+ TableRenderData newTableRenderData = new TableRenderData();
+ newTableRenderData.setRows(new ArrayList<>(firstTwoRows));
+ //璁剧疆鏍峰紡
+ TableStyle tableStyle = new TableStyle();
+ tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
+ tableStyle.setWidth("10000");
+ tableStyle.setAlign(TableRowAlign.CENTER);
+ BorderStyle borderStyle = new BorderStyle();
+ borderStyle.setColor("000000");
+ borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+ borderStyle.setSize(14);
+ tableStyle.setLeftBorder(borderStyle);
+ tableStyle.setTopBorder(borderStyle);
+ tableStyle.setRightBorder(borderStyle);
+ tableStyle.setBottomBorder(borderStyle);
+ tableRenderData.setTableStyle(tableStyle);
+ newTableRenderData.setTableStyle(tableStyle);
+ tables1.add(tableRenderData);
+ tableRenderData = newTableRenderData;
+ totalHeight = rowHeight;
}
- }*/
-// tableStyle.setColWidths(ArrayUtils.toPrimitive(colLen.toArray(new Integer[0])));
- tableStyle.setAlign(TableRowAlign.CENTER);
- tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
- tableRenderData.setTableStyle(tableStyle);
- Map<String, Object> table = new HashMap<>();
- table.put("table", tableRenderData);
- table.put("report", insReport);
- tables.add(table);
+ tableRenderData.getRows().add(row);
+ }
+ if (!tableRenderData.getRows().isEmpty()) {
+ //璁剧疆鏍峰紡
+ TableStyle tableStyle = new TableStyle();
+ tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
+ tableStyle.setWidth("10000");
+ tableStyle.setAlign(TableRowAlign.CENTER);
+ BorderStyle borderStyle = new BorderStyle();
+ borderStyle.setColor("000000");
+ borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+ borderStyle.setSize(14);
+ tableStyle.setLeftBorder(borderStyle);
+ tableStyle.setTopBorder(borderStyle);
+ tableStyle.setRightBorder(borderStyle);
+ tableStyle.setBottomBorder(borderStyle);
+ tableRenderData.setTableStyle(tableStyle);
+ tables1.add(tableRenderData);
+ }
+ tables1.forEach(table -> {
+ Map<String, Object> tableMap = new HashMap<>();
+ tableMap.put("table", table);
+ tableMap.put("report", insReport);
+ tables.add(tableMap);
+ });
});
});
String url;
@@ -536,7 +904,10 @@
tables.forEach(table -> {
table.put("tableSize", tables.size() + 1);
});
- List<Map<String, String>> deviceList = insOrderMapper.selectDeviceList(deviceSet);
+ List<Map<String, String>> deviceList = null;
+ if (deviceSet.size() != 0) {
+ deviceList = insOrderMapper.selectDeviceList(deviceSet);
+ }
Map<String, String> codeStr = new HashMap<>();
codeStr.put("鎶ュ憡缂栧彿", insReport.getCode());
codeStr.put("鏍峰搧鍚嶇О", insOrder.getSample());
@@ -554,19 +925,282 @@
modelStr += "," + model;
}
String finalModelStr = modelStr;
+ String sampleEn = insSampleMapper.getSampleEn(insOrder.getSample());
+ String orderType = insOrderMapper.getEnumLabelByValue(insOrder.getOrderType());
+ String formType = insOrderMapper.getEnumLabelByValue(insOrder.getFormType());
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
+ List<Map<String, String>> finalDeviceList = deviceList;
+ Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery().eq(InsSampleUser::getInsSampleId, orderId).last("limit 1")).getUserId();
+ String signatureUrl;
+ try {
+ signatureUrl = userMapper.selectById(userId).getSignatureUrl();
+ } catch (Exception e) {
+ throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
+ }
+ //Custom custom = customMapper.selectById(user.get("company"));
+ Custom custom = customMapper.selectById(insOrder.getCompanyId());
+ if (!resultCh.get().equals("")) {
+ resultCh.set("渚濇嵁濮旀墭瑕佹眰锛�" + resultCh.get().replaceFirst("銆�", "") + "绛夋墍妫�椤圭洰涓嶇鍚堣姹傦紝鍏朵綑鎵�妫�椤圭洰鍧囩鍚堣姹傘��");
+ resultEn.set("According to commissioned requirements," + resultEn.get().replaceFirst("銆�", "") + " these inspected items do not meet the requirements, all other inspected items meet the requirements.");
+ } else {
+ resultCh.set("渚濇嵁濮旀墭瑕佹眰锛屾墍妫�椤圭洰鍧囩鍚堣姹傘��");
+ resultEn.set("According to commissioned requirements, all the tested items meet the requirements.");
+ }
+ /*鍏夌氦鐨勬楠屾姤鍛�*/
+ //鍏堝垽鏂槸鍚︽湁鍏夌氦閰嶇疆
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+ List<Integer> collect = insProducts.stream().map(InsProduct::getInsFiberId).filter(str -> str != null).collect(Collectors.toList());
+ List<Map<String, Object>> tables2 = new ArrayList<>();
+ if (collect.size() > 0) {
+ samples.forEach(sample -> {
+ List<InsProduct> insProducts1 = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .eq(InsProduct::getInsSampleId, sample.getId())
+ .isNotNull(InsProduct::getInsFiberId)
+ .isNull(InsProduct::getInspectionItemClass));
+ List<InsProduct> filteredProducts = insProducts1.stream()
+ .collect(Collectors.groupingBy(product -> product.getInspectionItem() + product.getInspectionItemSubclass()))
+ .values().stream()
+ .map(group -> group.get(0))
+ .sorted(Comparator.comparing(InsProduct::getInspectionItem))
+ .collect(Collectors.toList());
+ long size = insProducts1.stream().map(insProduct -> {
+ return (insProduct.getInspectionItem() + insProduct.getInspectionItemSubclass());
+ }).distinct().collect(Collectors.toList()).size();
+ long size2 = insProducts1.stream().map(InsProduct::getInsFiberId).distinct().count();
+ long number = 7;
+ long k = 0;
+ for (long c = 0; c < size; c++) {
+ if (c % number == 0) {
+ List<RowRenderData> rows = new ArrayList<>();
+ //鍒ゆ柇妫�楠岄」鐩槸鍚︽湁鐖跺瓙鍏崇郴
+ Boolean state = true;
+ for (InsProduct insProduct : filteredProducts) {
+ if (!insProduct.getInspectionItemSubclass().equals("") && insProduct.getInspectionItemSubclass() != null) {
+ state = false;
+ }
+ }
+ int a = 1;
+ if (!state) {
+ a = 2;
+ }
+ //琛ㄦ牸鐨勮鏁�
+ for (long i = 0; i < size2 + a; i++) {
+ RowRenderData rowRenderData = new RowRenderData();
+
+ RowStyle rowStyle = new RowStyle();
+ rowStyle.setHeight(40);
+ rowRenderData.setRowStyle(rowStyle);
+ List<CellRenderData> cells = new ArrayList<>();
+ //琛ㄦ牸鐨勫垪鏁�
+ for (long j = 0; j < 9; j++) {
+ CellRenderData cellRenderData = new CellRenderData();
+ CellStyle cellStyle = new CellStyle();
+ cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+ cellRenderData.setCellStyle(cellStyle);
+ List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+ ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+ ParagraphStyle paragraphStyle = new ParagraphStyle();
+ paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+ paragraphRenderData.setParagraphStyle(paragraphStyle);
+ List<RenderData> renderData = new ArrayList<>();
+ TextRenderData textRenderData = new TextRenderData();
+ Style style = new Style();
+ style.setFontFamily("瀹嬩綋");
+ style.setColor("000000");
+ textRenderData.setStyle(style);
+ if (i == 0) {
+ //绗竴琛�
+ if (j == 0) {
+ //绗竴鍒�
+ textRenderData.setText("绠¤壊鏍�&Pipe鈭�100");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (j == 1) {
+ //绗簩鍒�
+ textRenderData.setText("鍏夌氦鑹叉爣&Scanning Number鈭�101");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //椤圭洰淇℃伅
+ try {
+ filteredProducts.get((int) (j - 2 + k));
+ } catch (Exception e) {
+ continue;
+ }
+ textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItem() + "&" + insProducts1.get((int) (j - 2 + k)).getInspectionItemEn() + "鈭�" + (j + 101 + k));
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ } else if (a == 2 && i == 1) {
+ //鏈夌埗瀛愰」鐩叧绯荤殑绗笁琛�
+ if (j == 0) {
+ //绗竴鍒�
+ textRenderData.setText("绠¤壊鏍�&Pipe鈭�100");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (j == 1) {
+ //绗簩鍒�
+ textRenderData.setText("鍏夌氦鑹叉爣&Scanning Number鈭�101");
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //椤圭洰淇℃伅
+ try {
+ filteredProducts.get((int) (j - 2 + k));
+ } catch (Exception e) {
+ continue;
+ }
+ //鍒ゆ柇鏄惁鏈夐」鐩瓙绫�
+ if (filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass().equals("") || filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass() == null) {
+ textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItem() + "&" + filteredProducts.get((int) (j - 2 + k)).getInspectionItemEn() + "鈭�" + (j + 101 + k));
+ } else {
+ textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass() + "&" + filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclassEn());
+ }
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ } else {
+ int aa;
+ if (a == 2) {
+ aa = (int) i - 2;
+ } else aa = (int) i - 1;
+ List<Integer> list = insProducts1.stream().map(InsProduct::getInsFiberId).distinct().collect(Collectors.toList());
+ try {
+ insFiberMapper.selectById(list.get(aa));
+ } catch (Exception e) {
+ continue;
+ }
+ InsFiber insFiber = insFiberMapper.selectById(list.get(aa));
+ //濉��
+ if (j == 0) {
+ //绗竴鍒�
+ textRenderData.setText(insFiber.getBushColor());
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else if (j == 1) {
+ //绗簩鍒�
+ textRenderData.setText(insFiber.getColor());
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ } else {
+ //椤圭洰淇℃伅
+ try {
+ filteredProducts.get((int) (j - 2 + k));
+ } catch (Exception e) {
+ continue;
+ }
+ textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getLastValue());
+ renderData.add(textRenderData);
+ paragraphRenderData.setContents(renderData);
+ paragraphRenderDataList.add(paragraphRenderData);
+ cellRenderData.setParagraphs(paragraphRenderDataList);
+ cells.add(cellRenderData);
+ }
+ }
+ }
+ rowRenderData.setCells(cells);
+ if (rowRenderData.getCells().size() != 0) {
+ rows.add(rowRenderData);
+ }
+ }
+ TableRenderData tableRenderData = new TableRenderData();
+ tableRenderData.setRows(rows);
+ int countSize = tableRenderData.getRows().get(0).getCells().size();
+ for (RowRenderData row : tableRenderData.getRows()) {
+ for (CellRenderData cell : row.getCells()) {
+ System.out.print(cell.getParagraphs().get(0).getContents());
+ }
+ System.out.println("");
+ if (row.getCells().size() != countSize) {
+ throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
+ }
+ }
+ TableStyle tableStyle = new TableStyle();
+ tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+ tableStyle.setAlign(TableRowAlign.CENTER);
+ BorderStyle borderStyle = new BorderStyle();
+ borderStyle.setColor("000000");
+ borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+ borderStyle.setSize(14);
+ tableStyle.setLeftBorder(borderStyle);
+ tableStyle.setTopBorder(borderStyle);
+ tableStyle.setRightBorder(borderStyle);
+ tableStyle.setBottomBorder(borderStyle);
+ tableRenderData.setTableStyle(tableStyle);
+ Map<String, Object> table = new HashMap<>();
+ table.put("table2", tableRenderData);
+ table.put("report", insReport);
+ table.put("sample_number", sample.getSampleCode());
+ table.put("type", sample.getModel());
+ tables2.add(table);
+ k += 7;
+ }
+ }
+ });
+ }
+
+ /*鑾峰彇闄勪欢鍥剧墖绫诲瀷*/
+ List<Map<String, Object>> images = new ArrayList<>();
+ List<InsOrderFile> insOrderFiles = insOrderFileMapper.selectList(Wrappers.<InsOrderFile>lambdaQuery().eq(InsOrderFile::getType, 1).eq(InsOrderFile::getInsOrderId, orderId));
+ if (CollectionUtils.isNotEmpty(insOrderFiles)) {
+ insOrderFiles.forEach(insOrderFile -> {
+ Map<String, Object> image = new HashMap<>();
+ PictureRenderData pictureRenderData = Pictures.ofLocal(imgUrl + "/" + insOrderFile.getFileUrl()).sizeInCm(17, 20).create();
+ image.put("url", pictureRenderData);
+ image.put("report", insReport);
+ images.add(image);
+ });
+ }
+ //濮旀墭浜哄拰鐢佃瘽瀛楁鍒ゆ柇
+ if (ObjectUtils.isEmpty(insOrder.getPrepareUser())) {
+ insOrder.setPrepareUser("/");
+ }
+ if (ObjectUtils.isEmpty(insOrder.getPhone())) {
+ insOrder.setPhone("/");
+ }
+ //妫�楠岄」鐩殑鐜
+ InsProduct insProduct = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).eq(InsProduct::getInsSampleId, samples.get(0).getId())).get(0);
+ String environment = "";
+ environment = (ObjectUtils.isNotEmpty(insProduct.getTemperature()) ? insProduct.getTemperature() + "鈩� " : "") + (ObjectUtils.isNotEmpty(insProduct.getHumidity()) ? insProduct.getHumidity() + "%" : "");
+ String finalEnvironment = environment;
XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
put("order", insOrder);
put("report", insReport);
- put("user", user);
-// put("samples", samples);
- put("sampleSize", samples.size() + samples.get(0).getUnit());
+ put("environment", finalEnvironment);
+ put("custom", custom);
+ put("sampleSize", samples.size());
put("tables", tables);
put("tableSize", tables.size() + 1);
- put("standardMethod", standardMethod2);
- put("deviceList", deviceList);
+ put("tables2", tables2);
+ put("standardMethod", (standardMethod2.toString().equals("null") ? "" : standardMethod2));
+ put("deviceList", finalDeviceList);
put("twoCode", Pictures.ofLocal(codePath).create());
put("models", finalModelStr.replace(",", ""));
put("productSize", productSize);
@@ -575,18 +1209,150 @@
put("insTime", insOrder.getInsTime().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
put("insTimeEn", monthNames[insOrder.getInsTime().getMonthValue() - 1] + " " + now.getDayOfMonth() + ", " + now.getYear());
put("writeUrl", null);
- put("insUrl", null);
+ put("insUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
+ put("images", images);
put("examineUrl", null);
put("ratifyUrl", null);
+ put("sampleEn", sampleEn);
+ put("orderType", orderType);
+ put("getTime", insOrder.getExamineTime().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
+ put("getTimeEn", monthNames[insOrder.getExamineTime().getMonthValue() - 1] + " " + insOrder.getExamineTime().getDayOfMonth() + ", " + insOrder.getExamineTime().getYear());
+ put("seal1", null);
+ put("seal2", null);
+ put("formTypeCh", formType);
+ put("formTypeEn", insOrder.getFormType());
+ put("resultCh", resultCh.get());
+ put("resultEn", resultEn.get());
}});
try {
String name = insReport.getCode().replace("/", "") + ".docx";
template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
insReport.setUrl("/word/" + name);
insReportMapper.insert(insReport);
-// insOrder.setState(4);
insOrder.setInsState(5);
insOrderMapper.updateById(insOrder);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ // 澶勭悊鍚堝苟鍗曞厓鏍肩殑闂
+ String path = wordUrl + "/" + insReport.getCode().replace("/", "") + ".docx";
+ try {
+ FileInputStream stream = new FileInputStream(path);
+ XWPFDocument document = new XWPFDocument(stream);
+ List<XWPFTable> xwpfTables = document.getTables();
+
+ for (int i = 1; i < xwpfTables.size() - (deviceList == null ? 1 : 2); i++) {
+ Set<String> set1 = new HashSet<>();
+ Map<String, Map<String, Integer>> maps = new HashMap<>();
+
+ XWPFTable table = xwpfTables.get(i);
+ for (int j = 0; j < table.getRows().size(); j++) {
+ XWPFTableRow row = table.getRow(j);
+ if (row == null) continue;
+
+ for (int k = 0; k < row.getTableCells().size(); k++) {
+ XWPFTableCell cell = row.getCell(k);
+ if (cell == null || cell.getText() == null) continue;
+
+ if (cell.getText().indexOf("鈭�") > -1) {
+ String[] split = cell.getText().split("鈭�");
+ if (set1.add(split[1])) {
+ Map<String, Integer> map = new HashMap<>();
+ map.put("sr", j);
+ map.put("sc", k);
+ map.put("er", j + 0);
+ map.put("ec", k + 0);
+ maps.put(split[1], map);
+ } else {
+ Map<String, Integer> map1 = maps.get(split[1]);
+ if (j == map1.get("sr")) {
+ map1.put("ec", map1.get("ec") + 1);
+ } else if (k == map1.get("sc")) {
+ map1.put("er", map1.get("er") + 1);
+ }
+ }
+
+ String str = split[0];
+ cell.removeParagraph(0);
+ cell.setText(str);
+ cell.setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
+
+ if (cell.getParagraphArray(0) != null) {
+ cell.getParagraphArray(0).setAlignment(ParagraphAlignment.CENTER);
+ }
+ }
+ }
+ }
+
+ List<String> list = new ArrayList<>(maps.keySet());
+ for (int a = list.size() - 1; a >= 0; a--) {
+ Map<String, Integer> v = maps.get(list.get(a));
+ for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
+ if (v.get("ec") > v.get("sc")) {
+ XWPFTableRow row = table.getRow(v.get("sr") + j);
+ if (row != null) {
+ for (int col = v.get("sc"); col <= v.get("ec"); col++) {
+ XWPFTableCell cell = row.getCell(col);
+ if (cell == null) {
+ row.createCell(); // 鍒涘缓鏂扮殑鍗曞厓鏍间互闃茬┖鎸囬拡寮傚父
+ }
+ }
+ TableTools.mergeCellsHorizonal(table, v.get("sr") + j, v.get("sc"), v.get("ec"));
+ }
+ }
+ }
+ if (v.get("er") > v.get("sr")) {
+ for (int rowIdx = v.get("sr"); rowIdx <= v.get("er"); rowIdx++) {
+ XWPFTableRow row = table.getRow(rowIdx);
+ if (row != null) {
+ XWPFTableCell cell = row.getCell(v.get("sc"));
+ if (cell == null) {
+ row.createCell(); // 鍒涘缓鏂扮殑鍗曞厓鏍间互闃茬┖鎸囬拡寮傚父
+ }
+ }
+ }
+ TableTools.mergeCellsVertically(table, v.get("sc"), v.get("sr"), v.get("er"));
+ }
+ }
+ }
+
+ FileOutputStream fileOutputStream = new FileOutputStream(path);
+ document.write(fileOutputStream);
+ fileOutputStream.close();
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException(e);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ //澶勭悊涓嫳鏂囨崲琛岀殑闂
+ try {
+ FileInputStream stream1 = new FileInputStream(path);
+ XWPFDocument document1 = new XWPFDocument(stream1);
+ List<XWPFTable> xwpfTables1 = document1.getTables();
+ for (int i = 1; i < xwpfTables1.size() - (deviceList == null ? 1 : 2); i++) {
+ for (int j = 0; j < xwpfTables1.get(i).getRows().size(); j++) {
+ for (int k = 0; k < xwpfTables1.get(i).getRows().get(j).getTableCells().size(); k++) {
+ if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("&")) {
+ String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
+ String[] split = text.split("&");
+ xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+ XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
+ XWPFRun run = xwpfParagraph.createRun();
+ run.setText(split[0]);
+ if (ObjectUtils.isNotNull(split[1])) {
+ run.addBreak();
+ run.setText(split[1]);
+ }
+ xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
+ }
+ }
+ }
+ }
+ FileOutputStream fileOutputStream1 = new FileOutputStream(path);
+ document1.write(fileOutputStream1);
+ fileOutputStream1.close();
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -594,16 +1360,19 @@
return 1;
}
- private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, SampleProductDto a) {
- for (InsProduct product : a.getInsProduct()) {
+ private void getTemplateThing
+ (Set<Integer> set, Map<Integer, String> map2, List<InsProduct> insProducts) {
+ for (InsProduct product : insProducts) {
if (product.getTemplateId() == null) {
product.setTemplate(new ArrayList<>());
continue;
}
+ String thing = null;
if (product.getTemplateId() != null && set.add(product.getTemplateId())) {
map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
+ thing = map2.get(product.getTemplateId());
}
- String thing = map2.get(product.getTemplateId());
+// thing = map2.get(product.getTemplateId());
if (StrUtil.isNotEmpty(thing)) {
JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
@@ -619,22 +1388,102 @@
}
@Override
- public int submitPlan(Integer orderId, String laboratory) {
+ public int submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).isNull(InsProduct::getInsResult));
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).isNull(InsProduct::getInsResult).isNull(InsProduct::getInsFiberId).isNull(InsProduct::getInsFibersId));
+ insProducts.addAll(insProductMapper.selectFiberInsProduct(ids, laboratory));
if (insProducts.size() > 0) {
String str = "";
+ int count = 0;
for (InsProduct product : insProducts) {
- str += product.getInspectionItem() + product.getInspectionItemSubclass() + "锛�";
+ //濡傛灉鏄厜缂嗙殑娓╁害寰幆
+ if (product.getInspectionItem().equals("娓╁害寰幆") && insOrderMapper.selectById(orderId).getSampleType().equals("鍏夌紗")) {
+ //鏌ヨ閭ｄ簺寰幆娓╁害鐨勬楠岄」鐩殑缁撹鏄惁鍏ㄩ儴妫�楠�
+ List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, product.getInsSampleId())
+ .isNotNull(InsProduct::getInsFiberId).like(InsProduct::getInspectionItemSubclass, "鈩�"));
+ List<Integer> collect = insProductList.stream().filter(insProduct -> insProduct.getInsResult() != null).map(InsProduct::getInsResult).collect(Collectors.toList());
+ List<Integer> tt = new ArrayList<>();
+ tt.add(1);
+ if (collect.contains(0)) {
+ product.setInsResult(0);
+ } else if (collect.size() == insProductList.size() && collect.stream().distinct().collect(Collectors.toList()).containsAll(tt)) {
+ product.setInsResult(0);
+ }
+ insProductMapper.updateById(product);
+ } else {
+ count++;
+ str += "<br/>" + count + "锛�" + product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "<br/>";
+ }
}
- throw new ErrorException("浠ヤ笅鏄湭妫�楠岀殑椤圭洰锛�" + str);
+ throw new ErrorException("<strong>瀛樺湪寰呮楠岀殑椤圭洰锛�</strong><br/>" + str);
}
- insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3));
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3).set(InsOrderState::getVerifyUser, verifyUser));
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ InformationNotification info = new InformationNotification();
+ info.setCreateUser(insProductMapper.selectUserById(userId).get("name"));
+ info.setMessageType("2");
+ info.setTheme("澶嶆牳閫氱煡");
+ info.setContent("鎮ㄦ湁涓�鏉℃楠屼换鍔″緟澶嶆牳娑堟伅");
+ info.setSenderId(userId);
+ info.setConsigneeId(verifyUser);
+ info.setViewStatus(false);
+ info.setJumpPath("b1-inspect-order-plan");
+ informationNotificationService.addInformationNotification(info);
+ upPlanUser(verifyUser, orderId);
return 1;
}
public int pxToCm(int px) {
return px / 9;
}
+
+ // 鑾峰彇涓や釜localDateTime鐨勬瘡涓�澶�
+ public static List<LocalDateTime> getLocalDateTimesBetween(LocalDateTime start, LocalDateTime end) {
+ List<LocalDateTime> localDateTimes = new ArrayList<>();
+ LocalDate currentDate = start.toLocalDate();
+ LocalDateTime currentLocalDateTime = start;
+ while (!currentDate.isAfter(end.toLocalDate())) {
+ localDateTimes.add(currentLocalDateTime);
+ currentLocalDateTime = currentLocalDateTime.plusDays(1);
+ currentDate = currentDate.plusDays(1);
+ }
+ return localDateTimes;
+ }
+
+ public static String getWeek(String dayStr) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ Date date = sdf.parse(dayStr);
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+ int day = calendar.get(Calendar.DAY_OF_MONTH);
+ return day + " " + getWeekDay(dayOfWeek);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public static String getWeekDay(int dayOfWeek) {
+ switch (dayOfWeek) {
+ case Calendar.MONDAY:
+ return "鍛ㄤ竴";
+ case Calendar.TUESDAY:
+ return "鍛ㄤ簩";
+ case Calendar.WEDNESDAY:
+ return "鍛ㄤ笁";
+ case Calendar.THURSDAY:
+ return "鍛ㄥ洓";
+ case Calendar.FRIDAY:
+ return "鍛ㄤ簲";
+ case Calendar.SATURDAY:
+ return "鍛ㄥ叚";
+ case Calendar.SUNDAY:
+ return "鍛ㄦ棩";
+ default:
+ return "鏈煡";
+ }
+ }
}
--
Gitblit v1.9.3