Merge remote-tracking branch 'origin/master'

value

2024-06-07 6c3b64f52182038accf1c27a2f040d64ddc4528a

Merge remote-tracking branch 'origin/master'

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -17,9 +17,7 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.data.*;
import com.deepoove.poi.data.style.BorderStyle;
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.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
@@ -115,6 +113,9 @@

    @Resource
    private InsBushingService insBushingService;

    @Resource
    private InsFiberMapper insFiberMapper;

    @Resource
    private InsOrderFileMapper insOrderFileMapper;
@@ -466,7 +467,6 @@
                }
                insUnPassService.saveBatch(insUnPasses);
            }

            InsOrder insOrder = insOrderMapper.selectById(orderId);
            Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
            List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
@@ -704,10 +704,10 @@
                    tableRenderData.setRows(rows);
                    int countSize = tableRenderData.getRows().get(0).getCells().size();
                    for (RowRenderData row : tableRenderData.getRows()) {
                        /*for (CellRenderData cell : row.getCells()) {
                        for (CellRenderData cell : row.getCells()) {
                            System.out.print(cell.getParagraphs().get(0).getContents());
                        }
                        System.out.println("");*/
                        System.out.println("");
                        if (row.getCells().size() != countSize) {
                            throw new ErrorException("每行单元格不相等");
                        }
@@ -793,6 +793,187 @@
                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));
                    long size = insProducts1.size();
                    long size2 = insProducts1.stream().map(InsProduct::getInsFiberId).distinct().count();
                    List<RowRenderData> rows = new ArrayList<>();
                    //判断检验项目是否有父子关系
                    Boolean state = true;
                    for (InsProduct insProduct : insProducts1) {
                        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 < size + 2; 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("管色标\nPipe∑100");
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
                                    cellRenderData.setParagraphs(paragraphRenderDataList);
                                    cells.add(cellRenderData);
                                } else if (j == 1) {
                                    //第二列
                                    textRenderData.setText("光纤色标\nScanning Number∑101");
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
                                    cellRenderData.setParagraphs(paragraphRenderDataList);
                                    cells.add(cellRenderData);
                                } else {
                                    //项目信息
                                    textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn()+"∑"+(j+101));
                                    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("管色标\nPipe∑100");
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
                                    cellRenderData.setParagraphs(paragraphRenderDataList);
                                    cells.add(cellRenderData);
                                } else if (j == 1) {
                                    //第二列
                                    textRenderData.setText("光纤色标\tScanning Number∑101");
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
                                    cellRenderData.setParagraphs(paragraphRenderDataList);
                                    cells.add(cellRenderData);
                                } else {
                                    //项目信息
                                    //判断是否有项目子类
                                    if (insProducts1.get((int) (j - 2)).getInspectionItemSubclass().equals("") || insProducts1.get((int) (j - 2)).getInspectionItemSubclass() == null) {
                                        textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn()+"∑"+(j+101));
                                    } else {
                                        textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItemSubclass() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemSubclassEn());
                                    }
                                    renderData.add(textRenderData);
                                    paragraphRenderData.setContents(renderData);
                                    paragraphRenderDataList.add(paragraphRenderData);
                                    cellRenderData.setParagraphs(paragraphRenderDataList);
                                    cells.add(cellRenderData);
                                }
                            } else {
                                int aa = 0;
                                if (a == 2) {
                                    aa = (int) i - 2;
                                } else aa = (int) i - 1;
                                InsFiber insFiber = insFiberMapper.selectById(insProducts1.get(aa).getInsFiberId());
                                //填值
                                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 {
                                    //项目信息
                                    textRenderData.setText(insProducts1.get((int) (j - 2)).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);
                });
            }


            XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
                    new HashMap<String, Object>() {{
@@ -803,6 +984,7 @@
                        put("sampleSize", samples.size());
                        put("tables", tables);
                        put("tableSize", tables.size() + 1);
                        put("tables2", tables2);
                        put("standardMethod", (standardMethod2.toString().equals("null") ? "" : standardMethod2));
                        put("deviceList", finalDeviceList);
                        put("twoCode", Pictures.ofLocal(codePath).create());

 inspect-server/src/main/resources/static/report-template.docx

Binary files differ

 performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java

@@ -70,7 +70,7 @@
    }

    @ValueClassify("工时管理")
    @ApiOperation(value = "批准")
    @ApiOperation(value = "辅助工时批准")
    @PostMapping("/approve")
    public Result approve(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
        return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));

 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java

@@ -13,6 +13,7 @@
import com.yuanchu.mom.mapper.RoleMapper;
import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.Custom;
import com.yuanchu.mom.pojo.Role;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.CustomService;
import com.yuanchu.mom.service.UserService;
@@ -26,6 +27,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
public class UserServiceImp implements UserService {
@@ -107,7 +109,10 @@

    @Override
    public List<User> getUserMenu() {
        return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId));
        List<Integer> roleIds = roleMapper.selectList(Wrappers.<Role>lambdaQuery().ne(Role::getCategory, 10003)).stream().map(Role::getId).distinct().collect(Collectors.toList());
        return userMapper.selectList(Wrappers.<User>lambdaQuery()
                .in(User::getRoleId, roleIds)
                .eq(User::getState, 1).select(User::getName, User::getId));
    }

    //获取设备负责人