Commit 82c9cc5b authored by 赵啸非's avatar 赵啸非

修改热门词汇

parent 34a3aed4
Pipeline #2434 failed with stages
...@@ -186,37 +186,39 @@ CREATE TABLE mortals_xhx_hotword ...@@ -186,37 +186,39 @@ CREATE TABLE mortals_xhx_hotword
-- ---------------------------- -- ----------------------------
-- 事项申请材料业务 -- 事项申请材料表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_matter_datum`; DROP TABLE IF EXISTS `mortals_xhx_matter_datum`;
CREATE TABLE mortals_xhx_matter_datum CREATE TABLE mortals_xhx_matter_datum(
( `id` bigint(20) AUTO_INCREMENT COMMENT '主键,自增长',
`id` bigint(20) AUTO_INCREMENT COMMENT '主键,自增长', `siteId` bigint(20) COMMENT '站点id',
`matterId` bigint(20) COMMENT '事项matter id', `matterId` bigint(20) COMMENT '事项matter id',
`siteId` bigint(20) COMMENT '站点ID', `deptId` bigint(20) COMMENT '部门ID',
`deptId` bigint(20) COMMENT '部门ID', `deptCode` varchar(255) COMMENT '部门编码',
`deptCode` varchar(256) COMMENT '部门编号', `deptName` varchar(255) COMMENT '部门名称',
`deptName` varchar(256) COMMENT '部门名称', `materialName` varchar(1024) NOT NULL COMMENT '材料名',
`materialName` varchar(1024) NOT NULL COMMENT '材料名', `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
`materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名', `source` tinyint(2) DEFAULT '0' COMMENT '事项来源(0.政务网,1.自定义)',
`source` tinyint(2) COMMENT '事项来源(0.政务网,1.自定义)', `isRecommend` tinyint(2) DEFAULT '0' COMMENT '是否推荐(0.未推荐,1.推荐)',
`isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐,1.推荐)', `total` int(8) DEFAULT '0' COMMENT '填单次数',
`total` int(8) COMMENT '填单次数', `sort` int(4) DEFAULT '0' COMMENT '排序',
`sort` int(4) COMMENT '排序', `samplePrint` int(9) DEFAULT '0' COMMENT '样表打印次数',
`samplePrint` int(4) COMMENT '样表打印次数', `fileName` varchar(255) COMMENT '填单的附件名称',
`fileName` varchar(255) COMMENT '填单的附件名称', `fileUrl` varchar(255) COMMENT '填单的附件下载地址',
`fileUrl` varchar(255) COMMENT '填单的附件下载地址', `filePreViewUrl` varchar(255) COMMENT '附件预览地址',
`sampleName` varchar(255) COMMENT '样表名称', `sampleName` varchar(255) COMMENT '样表名称',
`samplePath` varchar(255) COMMENT '样表地址', `samplePath` varchar(255) COMMENT '样表地址',
`templateName` varchar(255) COMMENT '模板名称', `templateName` varchar(255) COMMENT '模板名称',
`templatePath` varchar(255) COMMENT '模板地址', `templatePath` varchar(255) COMMENT '模板地址',
`preViewPath` varchar(255) COMMENT '样表预览地址', `preViewPath` varchar(255) COMMENT '样表预览地址',
`formContent` mediumtext COMMENT '表单内容', `formContent` mediumtext COMMENT '表单内容',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间', `updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料';
-- ---------------------------- -- ----------------------------
-- 打印提交表 -- 打印提交表
......
...@@ -154,6 +154,19 @@ ...@@ -154,6 +154,19 @@
<version>1.12.0</version> <version>1.12.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext7-core</artifactId>
<version>RELEASE</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.27</version>
</dependency>
</dependencies> </dependencies>
......
...@@ -14,6 +14,9 @@ import com.mortals.framework.util.DateUtils; ...@@ -14,6 +14,9 @@ import com.mortals.framework.util.DateUtils;
import freemarker.template.Configuration; import freemarker.template.Configuration;
import freemarker.template.Template; import freemarker.template.Template;
import lombok.extern.apachecommons.CommonsLog; import lombok.extern.apachecommons.CommonsLog;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.apache.xmlgraphics.image.loader.ImageInfo;
import sun.misc.BASE64Encoder; import sun.misc.BASE64Encoder;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
...@@ -115,7 +118,6 @@ public class WordUtil { ...@@ -115,7 +118,6 @@ public class WordUtil {
options.setUseAntiAliasing(true); options.setUseAntiAliasing(true);
options.setUseHighQualityRendering(true); options.setUseHighQualityRendering(true);
int pageCount = doc.getPageCount(); int pageCount = doc.getPageCount();
List<BufferedImage> imageList = new ArrayList<BufferedImage>(); List<BufferedImage> imageList = new ArrayList<BufferedImage>();
for (int i = 0; i < pageCount; i++) { for (int i = 0; i < pageCount; i++) {
OutputStream output = new ByteArrayOutputStream(); OutputStream output = new ByteArrayOutputStream();
...@@ -126,7 +128,6 @@ public class WordUtil { ...@@ -126,7 +128,6 @@ public class WordUtil {
} }
BufferedImage mergeImage = mergeImage(false, imageList); BufferedImage mergeImage = mergeImage(false, imageList);
ImageIO.write(mergeImage, "png", file); ImageIO.write(mergeImage, "png", file);
// 转换结束后时间 // 转换结束后时间
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
...@@ -151,6 +152,32 @@ public class WordUtil { ...@@ -151,6 +152,32 @@ public class WordUtil {
} }
} }
public static void pdfToImages(String filePath, String jpegPath) {
log.info(String.format("文件转换开始:%s", DateUtils.getCurrStrDateTime()));
// 转换开始前时间
long old = System.currentTimeMillis();
File file = new File(jpegPath);
List<BufferedImage> imageInfoList = new ArrayList<>();
try (PDDocument doc = PDDocument.load(new File(filePath))) {
PDFRenderer renderer = new PDFRenderer(doc);
int pageCount = doc.getNumberOfPages();
for (int i = 0; i < pageCount; i++) {
BufferedImage image = renderer.renderImage(i);
imageInfoList.add(image);
}
BufferedImage mergeImage = mergeImage(false, imageInfoList);
ImageIO.write(mergeImage, "png", file);
// 转换结束后时间
long now = System.currentTimeMillis();
//os.close();
log.info("文件转换结束,共耗时:" + ((now - old) / 1000.0) + "秒");
} catch (IOException e) {
log.error("生成预览图片异常:", e);
throw new AppException("生成预览图片异常");
}
}
/** /**
* 合并任数量的图片成一张图片 * 合并任数量的图片成一张图片
* *
...@@ -231,11 +258,19 @@ public class WordUtil { ...@@ -231,11 +258,19 @@ public class WordUtil {
} }
public static void main(String[] args) { public static void main(String[] args) {
String docPath = "E:\\pic\\doc\\附件1-四川省危险废物经营许可证申请表(补办)空白.docx"; /* String docPath = "E:\\pic\\doc\\附件1-四川省危险废物经营许可证申请表(补办)空白.docx";
String pdfPath = "E:\\pic\\pdf\\附件1-四川省危险废物经营许可证申请表(补办)空白.jpg"; String pdfPath = "E:\\pic\\pdf\\附件1-四川省危险废物经营许可证申请表(补办)空白.jpg";
WordUtil.convertWordToJPEG(docPath, pdfPath); WordUtil.convertWordToJPEG(docPath, jpgPath);*/
String pdfPath = "E:\\pic\\pdf\\1.pdf";
String jpgPath = "E:\\pic\\jpg\\1.jpg";
WordUtil.pdfToImages(pdfPath, jpgPath);
} }
......
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterDatumVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterDatumVo;
* 事项申请材料实体对象 * 事项申请材料实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-07 * @date 2022-12-15
*/ */
public class MatterDatumEntity extends MatterDatumVo { public class MatterDatumEntity extends MatterDatumVo {
...@@ -72,6 +72,10 @@ public class MatterDatumEntity extends MatterDatumVo { ...@@ -72,6 +72,10 @@ public class MatterDatumEntity extends MatterDatumVo {
* 填单的附件下载地址 * 填单的附件下载地址
*/ */
private String fileUrl; private String fileUrl;
/**
* 附件预览地址
*/
private String filePreViewUrl;
/** /**
* 样表名称 * 样表名称
*/ */
...@@ -296,6 +300,20 @@ public class MatterDatumEntity extends MatterDatumVo { ...@@ -296,6 +300,20 @@ public class MatterDatumEntity extends MatterDatumVo {
public void setFileUrl(String fileUrl){ public void setFileUrl(String fileUrl){
this.fileUrl = fileUrl; this.fileUrl = fileUrl;
} }
/**
* 获取 附件预览地址
* @return String
*/
public String getFilePreViewUrl(){
return filePreViewUrl;
}
/**
* 设置 附件预览地址
* @param filePreViewUrl
*/
public void setFilePreViewUrl(String filePreViewUrl){
this.filePreViewUrl = filePreViewUrl;
}
/** /**
* 获取 样表名称 * 获取 样表名称
* @return String * @return String
...@@ -416,6 +434,7 @@ public class MatterDatumEntity extends MatterDatumVo { ...@@ -416,6 +434,7 @@ public class MatterDatumEntity extends MatterDatumVo {
sb.append(",samplePrint:").append(getSamplePrint()); sb.append(",samplePrint:").append(getSamplePrint());
sb.append(",fileName:").append(getFileName()); sb.append(",fileName:").append(getFileName());
sb.append(",fileUrl:").append(getFileUrl()); sb.append(",fileUrl:").append(getFileUrl());
sb.append(",filePreViewUrl:").append(getFilePreViewUrl());
sb.append(",sampleName:").append(getSampleName()); sb.append(",sampleName:").append(getSampleName());
sb.append(",samplePath:").append(getSamplePath()); sb.append(",samplePath:").append(getSamplePath());
sb.append(",templateName:").append(getTemplateName()); sb.append(",templateName:").append(getTemplateName());
...@@ -455,6 +474,8 @@ public class MatterDatumEntity extends MatterDatumVo { ...@@ -455,6 +474,8 @@ public class MatterDatumEntity extends MatterDatumVo {
this.fileUrl = ""; this.fileUrl = "";
this.filePreViewUrl = null;
this.sampleName = null; this.sampleName = null;
this.samplePath = ""; this.samplePath = "";
......
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
* 事项申请材料查询对象 * 事项申请材料查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-07 * @date 2022-12-15
*/ */
public class MatterDatumQuery extends MatterDatumEntity { public class MatterDatumQuery extends MatterDatumEntity {
/** 开始 主键,自增长 */ /** 开始 主键,自增长 */
...@@ -135,6 +135,9 @@ public class MatterDatumQuery extends MatterDatumEntity { ...@@ -135,6 +135,9 @@ public class MatterDatumQuery extends MatterDatumEntity {
/** 填单的附件下载地址 */ /** 填单的附件下载地址 */
private List<String> fileUrlList; private List<String> fileUrlList;
/** 附件预览地址 */
private List<String> filePreViewUrlList;
/** 样表名称 */ /** 样表名称 */
private List<String> sampleNameList; private List<String> sampleNameList;
...@@ -851,6 +854,21 @@ public class MatterDatumQuery extends MatterDatumEntity { ...@@ -851,6 +854,21 @@ public class MatterDatumQuery extends MatterDatumEntity {
public void setFileUrlList(List<String> fileUrlList){ public void setFileUrlList(List<String> fileUrlList){
this.fileUrlList = fileUrlList; this.fileUrlList = fileUrlList;
} }
/**
* 获取 附件预览地址
* @return filePreViewUrlList
*/
public List<String> getFilePreViewUrlList(){
return this.filePreViewUrlList;
}
/**
* 设置 附件预览地址
* @param filePreViewUrlList
*/
public void setFilePreViewUrlList(List<String> filePreViewUrlList){
this.filePreViewUrlList = filePreViewUrlList;
}
/** /**
* 获取 样表名称 * 获取 样表名称
* @return sampleNameList * @return sampleNameList
...@@ -1589,6 +1607,25 @@ public class MatterDatumQuery extends MatterDatumEntity { ...@@ -1589,6 +1607,25 @@ public class MatterDatumQuery extends MatterDatumEntity {
} }
/**
* 设置 附件预览地址
* @param filePreViewUrl
*/
public MatterDatumQuery filePreViewUrl(String filePreViewUrl){
setFilePreViewUrl(filePreViewUrl);
return this;
}
/**
* 设置 附件预览地址
* @param filePreViewUrlList
*/
public MatterDatumQuery filePreViewUrlList(List<String> filePreViewUrlList){
this.filePreViewUrlList = filePreViewUrlList;
return this;
}
/** /**
* 设置 样表名称 * 设置 样表名称
* @param sampleName * @param sampleName
......
...@@ -88,6 +88,11 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -88,6 +88,11 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
@Autowired @Autowired
private PubdatumService pubdatumService; private PubdatumService pubdatumService;
public static String word[] = {"doc", "dot", "wps", "wpt", "docx", "dotx", "docm", "dotm"};
public static String imgs[] = {"jpg", "png", "jpeg", "gif"};
public static String pdf[] = {"pdf"};
@Override @Override
protected MatterDatumEntity findBefore(MatterDatumEntity params, PageInfo pageInfo, Context context) throws AppException { protected MatterDatumEntity findBefore(MatterDatumEntity params, PageInfo pageInfo, Context context) throws AppException {
if (com.mortals.xhx.common.utils.StringUtils.isNotEmpty(params.getMaterialName())) { if (com.mortals.xhx.common.utils.StringUtils.isNotEmpty(params.getMaterialName())) {
...@@ -158,28 +163,43 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -158,28 +163,43 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
if (count > 0) { if (count > 0) {
throw new AppException("当前材料名称已存在!"); throw new AppException("当前材料名称已存在!");
} }
//生成样表预览图片
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/"; String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
String samplePath = rootPath + entity.getSamplePath();
String prePath = "file/preview/"; String prePath = "file/preview/";
String newName = genPreviewPath(rootPath, prePath, entity.getFileUrl());
entity.setFilePreViewUrl(prePath + newName);
newName = genPreviewPath(rootPath, prePath, entity.getSamplePath());
entity.setPreViewPath(prePath + newName);
//校验模板变量正确性
if (!ObjectUtils.isEmpty(entity.getTemplatePath())) {
parseDocxToJson(entity);
}
super.saveBefore(entity, context);
}
private String genPreviewPath(String rootPath, String prePath, String tempPath) {
//生成样表预览图片
String samplePath = rootPath + tempPath;
String filePath = rootPath + prePath; String filePath = rootPath + prePath;
File pathDir = new File(filePath); File pathDir = new File(filePath);
if (!pathDir.exists()) { if (!pathDir.exists()) {
pathDir.mkdirs(); pathDir.mkdirs();
} }
String newName = RandomUtil.randomNumbers(12) + ".jpg"; String newName = RandomUtil.randomNumbers(12) + ".jpg";
String filePathAll = filePath + newName; String filePathAll = filePath + newName;
WordUtil.convertWordToJPEG(samplePath, filePathAll); //判断文件类型是否为doc pdf jpg png 等
String extName = FileUtil.getSuffix(samplePath);
if (this.isExsitArry(extName, word)) {
WordUtil.convertWordToJPEG(samplePath, filePathAll);
}else if(this.isExsitArry(extName, word)){
entity.setPreViewPath(prePath + newName);
//校验模板变量正确性
if (!ObjectUtils.isEmpty(entity.getTemplatePath())) {
parseDocxToJson(entity);
} }
super.saveBefore(entity, context);
return newName;
} }
@Override @Override
...@@ -491,6 +511,16 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -491,6 +511,16 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
super.findAfter(params, pageInfo, context, list); super.findAfter(params, pageInfo, context, list);
} }
public boolean isExsitArry(String chex, String arry[]) {
for (String ex : arry) {
if (chex.equalsIgnoreCase(ex)) {
return true;
}
}
return false;
}
public static void main(String[] args) { public static void main(String[] args) {
String colVal = "i_1_变更登记事项"; String colVal = "i_1_变更登记事项";
List<String> colKeys = StrSplitter.split(colVal, "_", true, true); List<String> colKeys = StrSplitter.split(colVal, "_", true, true);
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<result property="samplePrint" column="samplePrint" /> <result property="samplePrint" column="samplePrint" />
<result property="fileName" column="fileName" /> <result property="fileName" column="fileName" />
<result property="fileUrl" column="fileUrl" /> <result property="fileUrl" column="fileUrl" />
<result property="filePreViewUrl" column="filePreViewUrl" />
<result property="sampleName" column="sampleName" /> <result property="sampleName" column="sampleName" />
<result property="samplePath" column="samplePath" /> <result property="samplePath" column="samplePath" />
<result property="templateName" column="templateName" /> <result property="templateName" column="templateName" />
...@@ -81,6 +82,9 @@ ...@@ -81,6 +82,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileUrl') or colPickMode == 1 and data.containsKey('fileUrl')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileUrl') or colPickMode == 1 and data.containsKey('fileUrl')))">
a.fileUrl, a.fileUrl,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePreViewUrl') or colPickMode == 1 and data.containsKey('filePreViewUrl')))">
a.filePreViewUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sampleName') or colPickMode == 1 and data.containsKey('sampleName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sampleName') or colPickMode == 1 and data.containsKey('sampleName')))">
a.sampleName, a.sampleName,
</if> </if>
...@@ -113,18 +117,18 @@ ...@@ -113,18 +117,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="MatterDatumEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="MatterDatumEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_matter_datum insert into mortals_xhx_matter_datum
(siteId,matterId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,samplePrint,fileName,fileUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime) (siteId,matterId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,samplePrint,fileName,fileUrl,filePreViewUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime)
VALUES VALUES
(#{siteId},#{matterId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{source},#{isRecommend},#{total},#{sort},#{samplePrint},#{fileName},#{fileUrl},#{sampleName},#{samplePath},#{templateName},#{templatePath},#{preViewPath},#{formContent},#{createTime},#{createUserId},#{updateTime}) (#{siteId},#{matterId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{source},#{isRecommend},#{total},#{sort},#{samplePrint},#{fileName},#{fileUrl},#{filePreViewUrl},#{sampleName},#{samplePath},#{templateName},#{templatePath},#{preViewPath},#{formContent},#{createTime},#{createUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_matter_datum insert into mortals_xhx_matter_datum
(siteId,matterId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,samplePrint,fileName,fileUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime) (siteId,matterId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,samplePrint,fileName,fileUrl,filePreViewUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.matterId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.source},#{item.isRecommend},#{item.total},#{item.sort},#{item.samplePrint},#{item.fileName},#{item.fileUrl},#{item.sampleName},#{item.samplePath},#{item.templateName},#{item.templatePath},#{item.preViewPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime}) (#{item.siteId},#{item.matterId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.source},#{item.isRecommend},#{item.total},#{item.sort},#{item.samplePrint},#{item.fileName},#{item.fileUrl},#{item.filePreViewUrl},#{item.sampleName},#{item.samplePath},#{item.templateName},#{item.templatePath},#{item.preViewPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -200,6 +204,9 @@ ...@@ -200,6 +204,9 @@
<if test="(colPickMode==0 and data.containsKey('fileUrl')) or (colPickMode==1 and !data.containsKey('fileUrl'))"> <if test="(colPickMode==0 and data.containsKey('fileUrl')) or (colPickMode==1 and !data.containsKey('fileUrl'))">
a.fileUrl=#{data.fileUrl}, a.fileUrl=#{data.fileUrl},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('filePreViewUrl')) or (colPickMode==1 and !data.containsKey('filePreViewUrl'))">
a.filePreViewUrl=#{data.filePreViewUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('sampleName')) or (colPickMode==1 and !data.containsKey('sampleName'))"> <if test="(colPickMode==0 and data.containsKey('sampleName')) or (colPickMode==1 and !data.containsKey('sampleName'))">
a.sampleName=#{data.sampleName}, a.sampleName=#{data.sampleName},
</if> </if>
...@@ -380,6 +387,13 @@ ...@@ -380,6 +387,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="filePreViewUrl=(case" suffix="ELSE filePreViewUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePreViewUrl')) or (colPickMode==1 and !item.containsKey('filePreViewUrl'))">
when a.id=#{item.id} then #{item.filePreViewUrl}
</if>
</foreach>
</trim>
<trim prefix="sampleName=(case" suffix="ELSE sampleName end),"> <trim prefix="sampleName=(case" suffix="ELSE sampleName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('sampleName')) or (colPickMode==1 and !item.containsKey('sampleName'))"> <if test="(colPickMode==0 and item.containsKey('sampleName')) or (colPickMode==1 and !item.containsKey('sampleName'))">
...@@ -844,6 +858,21 @@ ...@@ -844,6 +858,21 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('filePreViewUrl')">
<if test="conditionParamRef.filePreViewUrl != null and conditionParamRef.filePreViewUrl != ''">
${_conditionType_} a.filePreViewUrl like #{${_conditionParam_}.filePreViewUrl}
</if>
<if test="conditionParamRef.filePreViewUrl == null">
${_conditionType_} a.filePreViewUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePreViewUrlList')">
${_conditionType_} a.filePreViewUrl in
<foreach collection="conditionParamRef.filePreViewUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sampleName')"> <if test="conditionParamRef.containsKey('sampleName')">
<if test="conditionParamRef.sampleName != null and conditionParamRef.sampleName != ''"> <if test="conditionParamRef.sampleName != null and conditionParamRef.sampleName != ''">
${_conditionType_} a.sampleName like #{${_conditionParam_}.sampleName} ${_conditionType_} a.sampleName like #{${_conditionParam_}.sampleName}
...@@ -1072,6 +1101,11 @@ ...@@ -1072,6 +1101,11 @@
<if test='orderCol.fileUrl != null and "DESC".equalsIgnoreCase(orderCol.fileUrl)'>DESC</if> <if test='orderCol.fileUrl != null and "DESC".equalsIgnoreCase(orderCol.fileUrl)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('filePreViewUrl')">
a.filePreViewUrl
<if test='orderCol.filePreViewUrl != null and "DESC".equalsIgnoreCase(orderCol.filePreViewUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('sampleName')"> <if test="orderCol.containsKey('sampleName')">
a.sampleName a.sampleName
<if test='orderCol.sampleName != null and "DESC".equalsIgnoreCase(orderCol.sampleName)'>DESC</if> <if test='orderCol.sampleName != null and "DESC".equalsIgnoreCase(orderCol.sampleName)'>DESC</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment