ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
@@ -181,17 +181,15 @@ XWPFDocument document = new XWPFDocument(fis); XWPFParagraph pic = document.createParagraph(); XWPFRun picRun = pic.createRun(); Map<String, Object> dataMap1 = new HashMap<>(); // dataMap.put("${picture}", picRun.addPicture( // new FileInputStream("/usr/local/project/file/1.jpg"), XWPFDocument.PICTURE_TYPE_JPEG, // "/usr/local/project/file/1.jpg", // Units.toEMU(60), // Units.toEMU(30) // )); dataMap.put("${picture}", picRun.addPicture( new FileInputStream("/usr/local/project/file/1.jpg"), XWPFDocument.PICTURE_TYPE_JPEG, "/usr/local/project/file/1.jpg", Units.toEMU(60), Units.toEMU(30) )); // 处理段落 for (XWPFParagraph paragraph : document.getParagraphs()) { replaceParagraph(paragraph, dataMap); replaceParagraph1(paragraph); } // 处理表格 @@ -200,7 +198,6 @@ for (XWPFTableCell cell : row.getTableCells()) { for (XWPFParagraph paragraph : cell.getParagraphs()) { replaceParagraph(paragraph, dataMap); replaceParagraph1(paragraph); } } } @@ -279,21 +276,6 @@ for (ReplacementInfo info : replacements) { replaceRunRange(paragraph, info); } } private static void replaceParagraph1(XWPFParagraph paragraph) throws IOException, InvalidFormatException { System.out.println("有image1"); List<XWPFRun> runs = paragraph.getRuns(); for (XWPFRun r : runs) { String text = r.getText(0); if (text != null && text.contains("{{image}}")) { System.out.println("有image2"); r.setText("", 0); FileInputStream is = new FileInputStream("/usr/local/project/file/1.jpg"); r.addBreak(); r.addPicture(is, XWPFDocument.PICTURE_TYPE_JPEG, "/usr/local/project/file/1.jpg", Units.toEMU(60), Units.toEMU(30)); is.close(); } } }
@@ -286,8 +286,9 @@ @ApiOperation(value = "管理员-房屋验收单列表") @PostMapping(value = "/admin/houseCheck") public R<PageInfo<TCheckAcceptRecordVO>> houseCheck(@RequestBody TCheckAcceptRecordAppletQuery query) { LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet(); query.setSysUserId(loginUserApplet.getUserId()); LoginUser loginUser = tokenService.getLoginUser(); SysUser sysUser = sysUserService.selectUserById(loginUser.getUserId()); query.setBusinessDeptId(sysUser.getBusinessDeptId()); return R.ok(checkAcceptRecordService.pageListApplet(query)); }
@@ -15,8 +15,6 @@ @ApiModelProperty(value = "状态 不传为全部 1待验收 2已验收") private Integer status; private String sysUserId; private String businessDeptId; } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCheckAcceptRecordServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.constant.DictConstants; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.mapper.TCheckAcceptRecordMapper; @@ -15,7 +14,6 @@ import com.ruoyi.system.model.THouse; import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery; import com.ruoyi.system.query.TCheckAcceptRecordQuery; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.TCheckAcceptRecordService; import com.ruoyi.system.vo.TCheckAcceptRecordVO; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +21,6 @@ import org.springframework.util.StringUtils; import java.util.List; import java.util.Objects; /** * <p> @@ -40,8 +37,6 @@ private TContractMapper contractMapper; @Autowired private THouseMapper houseMapper; @Autowired private ISysUserService sysUserService; @Override public PageInfo<TCheckAcceptRecordVO> pageList(TCheckAcceptRecordQuery query) { PageInfo<TCheckAcceptRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); @@ -61,14 +56,9 @@ @Override public PageInfo<TCheckAcceptRecordVO> pageListApplet(TCheckAcceptRecordAppletQuery query) { SysUser sysUser = sysUserService.selectUserById(Long.valueOf(query.getSysUserId())); String businessDeptId = ""; if (Objects.nonNull(sysUser) && !sysUser.getBusinessDeptId().equals("0")){ businessDeptId = sysUser.getBusinessDeptId(); query.setBusinessDeptId(businessDeptId); } List<TContract> tContracts = contractMapper.selectList(new LambdaQueryWrapper<TContract>().eq(StringUtils.hasLength(businessDeptId),TContract::getBusinessDeptId,businessDeptId)); List<THouse> tHouses = houseMapper.selectList(new LambdaQueryWrapper<THouse>().eq(StringUtils.hasLength(businessDeptId),THouse::getBusinessDeptId,businessDeptId)); String businessDeptId = query.getBusinessDeptId(); List<TContract> tContracts = contractMapper.selectList(new LambdaQueryWrapper<TContract>().eq(StringUtils.hasLength(businessDeptId) && !"0".equals(businessDeptId),TContract::getBusinessDeptId,businessDeptId)); List<THouse> tHouses = houseMapper.selectList(new LambdaQueryWrapper<THouse>().eq(StringUtils.hasLength(businessDeptId) && !"0".equals(businessDeptId),THouse::getBusinessDeptId,businessDeptId)); PageInfo<TCheckAcceptRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TCheckAcceptRecordVO> list = this.baseMapper.pageListApplet(query,pageInfo); list.forEach(item -> { ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
@@ -102,7 +102,7 @@ <if test="query.houseNameOrAddress != null and query.houseNameOrAddress != ''"> AND (h.house_name LIKE concat('%', #{query.houseNameOrAddress}, '%') or h.house_address LIKE concat('%', #{query.houseNameOrAddress}, '%')) </if> <if test="query.businessDeptId != null and query.businessDeptId != ''"> <if test="query.businessDeptId != null and query.businessDeptId != '' and query.businessDeptId!=0"> AND h.business_dept_id =#{query.businessDeptId} </if> AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
