inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -7,10 +7,7 @@ import com.yuanchu.mom.annotation.ValueClassify; import com.yuanchu.mom.dto.*; import com.yuanchu.mom.mapper.InsSampleUserMapper; import com.yuanchu.mom.pojo.InsOrderFile; import com.yuanchu.mom.pojo.InsOrderState; import com.yuanchu.mom.pojo.InsProductResult; import com.yuanchu.mom.pojo.InsSampleUser; import com.yuanchu.mom.pojo.*; import com.yuanchu.mom.service.*; import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.vo.InsProductResultVo; @@ -67,6 +64,13 @@ } @ValueClassify("检验任务") @ApiOperation(value = "样品编号更改") @PostMapping("/changeSampleCode") public Result changeSampleCode(@RequestBody InsSample insSample) { return Result.success(insOrderPlanService.changeSampleCode(insSample.getId(),insSample.getSampleCode())); } @ValueClassify("检验任务") @ApiOperation(value = "认领任务计划") @PostMapping("/claimInsOrderPlan") public Result claimInsOrderPlan(@RequestBody InsOrderPlanDTO data) { inspect-server/src/main/java/com/yuanchu/mom/dto/InsOrderPlanDTO.java
@@ -43,4 +43,7 @@ private String sendTime; private String userName; } inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -25,7 +25,7 @@ */ public interface InsSampleMapper extends BaseMapper<InsSample> { IPage<InsOrderPlanVO> findInsSampleAndOrder(@Param("page") Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userName") String userName, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory, @Param("sampleCode") String sampleCode); IPage<InsOrderPlanVO> findInsSampleAndOrder(@Param("page") Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("myName") String myName, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory, @Param("sampleCode") String sampleCode); IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
@@ -75,5 +75,6 @@ int saveInsContext2s(InsProductResultDtos insProductResultDtos); //样品编号更改 int changeSampleCode(Integer sampleId, String sampleCode); } inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -139,16 +139,21 @@ map.put("head", PrintChina.printChina(InsOrderPlanVO.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null); String laboratory = null; String userName = null; String myName = null; if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) { userName = userMapper.selectById(map1.get("userId")).getName(); myName = userMapper.selectById(map1.get("userId")).getName(); insOrderPlanDTO.setUserId(null); } //检验人 if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserName())){ myName=(ObjectUtils.isNotNull(myName)?myName+",":"")+insOrderPlanDTO.getUserName(); insOrderPlanDTO.setUserName(null); } String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//试验室 insOrderPlanDTO.setSonLaboratory(null); String sampleCode = insOrderPlanDTO.getSampleCode(); insOrderPlanDTO.setSampleCode(null); IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userName, sonLaboratory, laboratory,sampleCode); IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), myName, sonLaboratory, laboratory,sampleCode); map.put("body", insOrderPage); return map; } @@ -928,6 +933,15 @@ return 1; } //样品编号更改 @Override public int changeSampleCode(Integer sampleId, String sampleCode) { InsSample insSample = new InsSample(); insSample.setId(sampleId); insSample.setSampleCode(sampleCode); return insSampleMapper.updateById(insSample); } /** * 震动doc文件解析 * @param urlString inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -2742,98 +2742,6 @@ )); insOrderDocFiles.addAll(insOrderFiles); radiationReportNum = insOrderFiles.size(); // if (insOrderFiles.size() > 0) { // int aa = 0; // for (InsOrderFile insOrderFile : insOrderFiles) { // try { // XWPFDocument circuitParamsDoc = new XWPFDocument(new FileInputStream(wordUrl + "/" + insOrderFile.getFileUrl())); // // 遍历电路参数文件的所有元素，段落和表格 // for (IBodyElement element : circuitParamsDoc.getBodyElements()) { // Map<String, Object> table3 = new HashMap<>(); // TableRenderData tableData = new TableRenderData(); // List<RowRenderData> rows = new ArrayList<>(); // if (element instanceof XWPFTable) { // aa += 1; // XWPFTable tab = (XWPFTable) element; // List<XWPFTableRow> row = tab.getRows(); // for (int i = 0; i < row.size(); i++) { // RowRenderData rowRenderData = new RowRenderData(); // List<CellRenderData> cells = new ArrayList<>(); // List<XWPFTableCell> cell = row.get(i).getTableCells(); // for (int j = 0; j < cell.size(); j++) { // CellRenderData cellRenderData = new CellRenderData(); // 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); // CTTcPr tcPr = cell.get(j).getCTTc().getTcPr(); // if (tcPr != null) { // //合并列 // CTHMerge hMerge = tcPr.getHMerge(); // if (ObjectUtils.isNotEmpty(hMerge)) { // if (STMerge.RESTART.equals(hMerge.getVal()) || STMerge.CONTINUE.equals(hMerge.getVal())) { // int index = j; // String text = null; // while (text == null || text.equals("")) { // if (index < 0) { // text = "/"; // } // text = cell.get(index).getText(); // index--; // } // textRenderData.setText(text + "∑88" + aa + i); // } // } // //合并行 // CTVMerge vMerge = tcPr.getVMerge(); // if (ObjectUtils.isNotEmpty(vMerge)) { // if (STMerge.RESTART.equals(vMerge.getVal()) || STMerge.CONTINUE.equals(vMerge.getVal())) { // int index = i; // String text = null; // while (text == null || text.equals("")) { // if (index < 0) { // text = "/"; // break; // } // text = row.get(index).getCell(j).getText(); // index--; // } // if (text.equals("合格") || text.equals("不合格")) { // textRenderData.setText(text + "∑25" + aa + j); // } else { // textRenderData.setText(text + "∑22" + aa + j); // } // } // } // } else { // textRenderData.setText(cell.get(j).getText()); // } // renderData.add(textRenderData); // paragraphRenderData.setContents(renderData); // paragraphRenderDataList.add(paragraphRenderData); // cellRenderData.setParagraphs(paragraphRenderDataList); // cells.add(cellRenderData); // } // rowRenderData.setCells(cells); // rows.add(rowRenderData); // } // tableData.setRows(rows); // table3.put("table3", tableData); // tables3.add(table3); // } // } // } catch (IOException e) { // e.printStackTrace(); // } // } // } } //辐射的标题 String title3 = ""; inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -84,9 +84,9 @@ <if test="sampleCode !=null and sampleCode!=''"> and (isa.sample_code like CONCAT ('%', #{sampleCode},'%') ) </if> <if test="userName !=null and userName!=''"> and ( (userName like CONCAT ('%', #{userName},'%') ) or (checkName like CONCAT ('%', #{userName},'%') ) ) <if test="myName !=null and myName!=''"> and ( (userName like CONCAT ('%', #{myName},'%') ) or (checkName like CONCAT ('%', #{myName},'%') ) ) </if> ) a ON ios.ins_order_id = a.id AND ios.laboratory = #{sonLaboratory} and ios.ins_sample_id=a.sampleId
