WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

拆分条款修改

Browse Source
This commit is contained in:
liyawei
2022-03-24 11:18:04 +08:00
parent 8619773213
commit 53e9b377a0
9 changed files with 418 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java
+6 -5
View File
@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.hutool.core.util.ZipUtil; import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
@@ -102,7 +103,7 @@ public class SarFileSplitItemsEOController extends JeroController<SarFileSplitIt
} }
} }
IPage<SarFileSplitItemsEO> pageList = null; IPage<SarFileSplitItemsEO> pageList = new Page<>();
pageList.setRecords(rows); pageList.setRecords(rows);
pageList.setCurrent(page.getPage()); pageList.setCurrent(page.getPage());
pageList.setSize(page.getPageSize()); pageList.setSize(page.getPageSize());
@@ -423,13 +424,13 @@ public class SarFileSplitItemsEOController extends JeroController<SarFileSplitIt
// row1.createCell(4).setCellValue(time); // row1.createCell(4).setCellValue(time);
// row1.getCell(4).setCellStyle(cellStyle); // row1.getCell(4).setCellStyle(cellStyle);
// } // }
// row1.createCell(5).setCellValue(exportDto.getSvpps()); // row1.createCell(5).setCellValue(exportDto.getFunctionTerritory());
// row1.getCell(5).setCellStyle(cellStyle); // row1.getCell(5).setCellStyle(cellStyle);
// row1.createCell(6).setCellValue(exportDto.getApplyArctic()); // row1.createCell(6).setCellValue(exportDto.getApplyArctic());
// row1.getCell(6).setCellStyle(cellStyle); // row1.getCell(6).setCellStyle(cellStyle);
// row1.createCell(7).setCellValue(exportDto.getReferenceStand()); // row1.createCell(7).setCellValue(exportDto.getReferenceStand());
// row1.getCell(7).setCellStyle(cellStyle); // row1.getCell(7).setCellStyle(cellStyle);
// row1.createCell(8).setCellValue(exportDto.getRemarks()); // row1.createCell(8).setCellValue(exportDto.getTechnologyTerritory());
// row1.getCell(8).setCellStyle(cellStyle); // row1.getCell(8).setCellStyle(cellStyle);
// if (StringUtils.isNotEmpty(exportDto.getRelevanceFile())) { // if (StringUtils.isNotEmpty(exportDto.getRelevanceFile())) {
// List<AttFileEO> fileList = attFileEOService.getMultiFileInfos(exportDto.getRelevanceFile()); // List<AttFileEO> fileList = attFileEOService.getMultiFileInfos(exportDto.getRelevanceFile());
@@ -489,13 +490,13 @@ public class SarFileSplitItemsEOController extends JeroController<SarFileSplitIt
// row1.createCell(4).setCellValue(time); // row1.createCell(4).setCellValue(time);
// row1.getCell(4).setCellStyle(cellStyle); // row1.getCell(4).setCellStyle(cellStyle);
// } // }
// row1.createCell(5).setCellValue(exportDto.getSvpps()); // row1.createCell(5).setCellValue(exportDto.getFunctionTerritory());
// row1.getCell(5).setCellStyle(cellStyle); // row1.getCell(5).setCellStyle(cellStyle);
// row1.createCell(6).setCellValue(exportDto.getApplyArctic()); // row1.createCell(6).setCellValue(exportDto.getApplyArctic());
// row1.getCell(6).setCellStyle(cellStyle); // row1.getCell(6).setCellStyle(cellStyle);
// row1.createCell(7).setCellValue(exportDto.getReferenceStand()); // row1.createCell(7).setCellValue(exportDto.getReferenceStand());
// row1.getCell(7).setCellStyle(cellStyle); // row1.getCell(7).setCellStyle(cellStyle);
// row1.createCell(8).setCellValue(exportDto.getRemarks()); // row1.createCell(8).setCellValue(exportDto.getTechnologyTerritory());
// row1.getCell(8).setCellStyle(cellStyle); // row1.getCell(8).setCellStyle(cellStyle);
// if (StringUtils.isNotEmpty(exportDto.getRelevanceFile())) { // if (StringUtils.isNotEmpty(exportDto.getRelevanceFile())) {
// List<AttFileEO> fileList = attFileEOService.getMultiFileInfos(exportDto.getRelevanceFile()); // List<AttFileEO> fileList = attFileEOService.getMultiFileInfos(exportDto.getRelevanceFile());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitItemsExportDto.java
+10 -12
View File
@@ -1,9 +1,7 @@
package com.jero.modules.split.dto; package com.jero.modules.split.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@@ -22,15 +20,15 @@ public class FileSplitItemsExportDto {
private String itermsConditions; private String itermsConditions;
private String type; private String type;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") // @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date newcarPutTime; // private Date newcarPutTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") // @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date productPutTime; // private Date productPutTime;
private String svpps; private String functionTerritory;
private String applyArctic; // private String applyArctic;
private String referenceStand; // private String referenceStand;
private String remarks; private String technologyTerritory;
private String relevanceFile; // private String relevanceFile;
private String informationCategory;
private List<FileSplitValExportDto> itemValContent; private List<FileSplitValExportDto> itemValContent;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/SarFileSplitItemsImportDto.java
+20 -19
View File
@@ -3,8 +3,6 @@ package com.jero.modules.split.dto;
import lombok.Data; import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Date;
/** /**
* @Description: * @Description:
* @Author: yangxuenan * @Author: yangxuenan
@@ -21,26 +19,29 @@ public class SarFileSplitItemsImportDto {
@Excel(name = "条款内容", orderNum = "1") @Excel(name = "条款内容", orderNum = "1")
private String itermsConditions; private String itermsConditions;
@Excel(name = "新车型实施日期", orderNum = "1") // @Excel(name = "新车型实施日期", orderNum = "1")
private Date newcarPutTime; // private Date newcarPutTime;
//
// @Excel(name = "在产车实施日期", orderNum = "1")
// private Date productPutTime;
@Excel(name = "在产车实施日期", orderNum = "1") @Excel(name = "功能领域", orderNum = "1")
private Date productPutTime; private String functionTerritory;
@Excel(name = "关联零部件", orderNum = "1") // @Excel(name = "适用车型", orderNum = "1")
private String svpps; // private String applyArctic;
//
// @Excel(name = "引用标准", orderNum = "1")
// private String referenceStand;
@Excel(name = "适用车型", orderNum = "1") @Excel(name = "技术领域", orderNum = "1")
private String applyArctic; private String technologyTerritory;
@Excel(name = "引用标准", orderNum = "1") @Excel(name = "信息类别", orderNum = "1")
private String referenceStand; private String informationCategory;
@Excel(name = "备注", orderNum = "1") // @Excel(name = "关联文件", orderNum = "1")
private String remarks; // private String relevanceFile;
//
@Excel(name = "关联文件", orderNum = "1") // private String relevanceFileName;
private String relevanceFile;
private String relevanceFileName;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java
+12 -12
View File
@@ -22,17 +22,17 @@ public class SarFileSplitItemsEO implements Serializable {
private String itemsNum; private String itemsNum;
private String itemsName; private String itemsName;
private String itermsConditions; private String itermsConditions;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") // @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date newcarPutTime; // private Date newcarPutTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") // @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date productPutTime; // private Date productPutTime;
private String menuId; private String menuId;
private String svpps; private String functionTerritory;
private String applyArctic; // private String applyArctic;
private String referenceStand; // private String referenceStand;
private String specialRequest; private String informationCategory;
private String relevanceFile; // private String relevanceFile;
private String remarks; private String technologyTerritory;
private Integer validFlag; private Integer validFlag;
private String creationUser; private String creationUser;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@@ -48,8 +48,8 @@ public class SarFileSplitItemsEO implements Serializable {
private String sMenuId; private String sMenuId;
//特殊参数要求 //特殊参数要求
private List<SarFileSplitItemsParamsEO> paramsList; private List<SarFileSplitItemsParamsEO> paramsList;
private String relevanceFileAttid; // private String relevanceFileAttid;
private String issForce; // private String issForce;
List<String> itemsCondi; List<String> itemsCondi;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsEOMapper.xml
+91 -75
View File
@@ -8,40 +8,40 @@
<result column="items_num" property="itemsNum" /> <result column="items_num" property="itemsNum" />
<result column="items_name" property="itemsName" /> <result column="items_name" property="itemsName" />
<result column="iterms_conditions" property="itermsConditions" /> <result column="iterms_conditions" property="itermsConditions" />
<result column="newcar_put_time" property="newcarPutTime" /> <!-- <result column="newcar_put_time" property="newcarPutTime" />-->
<result column="product_put_time" property="productPutTime" /> <!-- <result column="product_put_time" property="productPutTime" />-->
<result column="menu_id" property="menuId" /> <result column="menu_id" property="menuId" />
<result column="svpps" property="svpps" /> <result column="function_territory" property="functionTerritory" />
<result column="apply_arctic" property="applyArctic" /> <!-- <result column="apply_arctic" property="applyArctic" />-->
<result column="reference_stand" property="referenceStand" /> <!-- <result column="reference_stand" property="referenceStand" />-->
<result column="special_request" property="specialRequest" /> <result column="information_category" property="informationCategory" />
<result column="relevance_file" property="relevanceFile" /> <!-- <result column="relevance_file" property="relevanceFile" />-->
<result column="remarks" property="remarks" /> <result column="technology_territory" property="technologyTerritory" />
<result column="valid_flag" property="validFlag" /> <result column="valid_flag" property="validFlag" />
<result column="creation_user" property="creationUser" /> <result column="creation_user" property="creationUser" />
<result column="creation_time" property="creationTime" /> <result column="creation_time" property="creationTime" />
<result column="modify_time" property="modifyTime" /> <result column="modify_time" property="modifyTime" />
<result column="modify_user" property="modifyUser" /> <result column="modify_user" property="modifyUser" />
<result column="iss_force" property="issForce" /> <!-- <result column="iss_force" property="issForce" />-->
</resultMap> </resultMap>
<resultMap id="BaseResultMapExport" type="com.jero.modules.split.dto.FileSplitItemsExportDto" > <resultMap id="BaseResultMapExport" type="com.jero.modules.split.dto.FileSplitItemsExportDto" >
<result column="id" property="id" /> <result column="id" property="id" />
<result column="items_num" property="itemsNum" /> <result column="items_num" property="itemsNum" />
<result column="items_name" property="itemsName" /> <result column="items_name" property="itemsName" />
<result column="iterms_conditions" property="itermsConditions" /> <result column="iterms_conditions" property="itermsConditions" />
<result column="newcar_put_time" property="newcarPutTime" /> <!-- <result column="newcar_put_time" property="newcarPutTime" />-->
<result column="product_put_time" property="productPutTime" /> <!-- <result column="product_put_time" property="productPutTime" />-->
<result column="svpps" property="svpps" /> <result column="function_territory" property="functionTerritory" />
<result column="apply_arctic" property="applyArctic" /> <!-- <result column="apply_arctic" property="applyArctic" />-->
<result column="reference_stand" property="referenceStand" /> <!-- <result column="reference_stand" property="referenceStand" />-->
<result column="remarks" property="remarks" /> <result column="technology_territory" property="technologyTerritory" />
<result column="relevance_file" property="relevanceFile" /> <!-- <result column="relevance_file" property="relevanceFile" />-->
</resultMap> </resultMap>
<!-- SAR_FILE_SPLIT_ITEMS table all fields --> <!-- SAR_FILE_SPLIT_ITEMS table all fields -->
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
SAR_FILE_SPLIT_ITEMS.id, SAR_FILE_SPLIT_ITEMS.info_id, SAR_FILE_SPLIT_ITEMS.items_num, items_name, iterms_conditions, newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, SAR_FILE_SPLIT_ITEMS.remarks, SAR_FILE_SPLIT_ITEMS.valid_flag, SAR_FILE_SPLIT_ITEMS.creation_user, SAR_FILE_SPLIT_ITEMS.creation_time, SAR_FILE_SPLIT_ITEMS.modify_time, SAR_FILE_SPLIT_ITEMS.modify_user,SAR_FILE_SPLIT_ITEMS.iss_force SAR_FILE_SPLIT_ITEMS.id, SAR_FILE_SPLIT_ITEMS.info_id, SAR_FILE_SPLIT_ITEMS.items_num, items_name, iterms_conditions, newcar_put_time, product_put_time, menu_id, function_territory, apply_arctic, reference_stand, information_category, relevance_file, SAR_FILE_SPLIT_ITEMS.technology_territory, SAR_FILE_SPLIT_ITEMS.valid_flag, SAR_FILE_SPLIT_ITEMS.creation_user, SAR_FILE_SPLIT_ITEMS.creation_time, SAR_FILE_SPLIT_ITEMS.modify_time, SAR_FILE_SPLIT_ITEMS.modify_user,SAR_FILE_SPLIT_ITEMS.iss_force
</sql> </sql>
<!-- 查询条件 --> <!-- 查询条件 -->
@@ -84,8 +84,8 @@
<if test="sMenuId != null" > <if test="sMenuId != null" >
and menu_id = #{sMenuId} and menu_id = #{sMenuId}
</if> </if>
<if test="svpps != null" > <if test="functionTerritory != null" >
and svpps ${svppsOperator} #{svpps} and function_territory ${functionTerritoryOperator} #{functionTerritory}
</if> </if>
<if test="applyArctic != null" > <if test="applyArctic != null" >
and apply_arctic ${applyArcticOperator} #{applyArctic} and apply_arctic ${applyArcticOperator} #{applyArctic}
@@ -93,14 +93,14 @@
<if test="referenceStand != null" > <if test="referenceStand != null" >
and reference_stand ${referenceStandOperator} #{referenceStand} and reference_stand ${referenceStandOperator} #{referenceStand}
</if> </if>
<if test="specialRequest != null" > <if test="informationCategory != null" >
and special_request ${specialRequestOperator} #{specialRequest} and information_category ${informationCategoryOperator} #{informationCategory}
</if> </if>
<if test="relevanceFile != null" > <if test="relevanceFile != null" >
and relevance_file ${relevanceFileOperator} #{relevanceFile} and relevance_file ${relevanceFileOperator} #{relevanceFile}
</if> </if>
<if test="remarks != null" > <if test="technologyTerritory != null" >
and SAR_FILE_SPLIT_ITEMS.remarks ${remarksOperator} #{remarks} and SAR_FILE_SPLIT_ITEMS.technology_territory ${technologyTerritoryOperator} #{technologyTerritory}
</if> </if>
<if test="validFlag != null" > <if test="validFlag != null" >
and SAR_FILE_SPLIT_ITEMS.valid_flag ${validFlagOperator} #{validFlag} and SAR_FILE_SPLIT_ITEMS.valid_flag ${validFlagOperator} #{validFlag}
@@ -138,7 +138,7 @@
SELECT SEQ_SAR_FILE_SPLIT_ITEMS.NEXTVAL FROM DUAL SELECT SEQ_SAR_FILE_SPLIT_ITEMS.NEXTVAL FROM DUAL
</selectKey> --> </selectKey> -->
insert into SAR_FILE_SPLIT_ITEMS(<include refid="Base_Column_List" />) insert into SAR_FILE_SPLIT_ITEMS(<include refid="Base_Column_List" />)
values (#{id, jdbcType=VARCHAR}, #{infoId, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itermsConditions, jdbcType=CLOB}, #{newcarPutTime, jdbcType=TIMESTAMP}, #{productPutTime, jdbcType=TIMESTAMP}, #{menuId, jdbcType=VARCHAR}, #{svpps, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{referenceStand, jdbcType=VARCHAR}, #{specialRequest, jdbcType=VARCHAR}, #{relevanceFile, jdbcType=VARCHAR}, #{remarks, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationUser, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}) values (#{id, jdbcType=VARCHAR}, #{infoId, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itermsConditions, jdbcType=CLOB}, #{newcarPutTime, jdbcType=TIMESTAMP}, #{productPutTime, jdbcType=TIMESTAMP}, #{menuId, jdbcType=VARCHAR}, #{functionTerritory, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{referenceStand, jdbcType=VARCHAR}, #{informationCategory, jdbcType=VARCHAR}, #{relevanceFile, jdbcType=VARCHAR}, #{technologyTerritory, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationUser, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR})
</insert> </insert>
<!-- 动态插入记录 主键是序列 --> <!-- 动态插入记录 主键是序列 -->
@@ -156,12 +156,12 @@
<if test="newcarPutTime != null" >newcar_put_time,</if> <if test="newcarPutTime != null" >newcar_put_time,</if>
<if test="productPutTime != null" >product_put_time,</if> <if test="productPutTime != null" >product_put_time,</if>
<if test="menuId != null" >menu_id,</if> <if test="menuId != null" >menu_id,</if>
<if test="svpps != null" >svpps,</if> <if test="functionTerritory != null" >function_territory,</if>
<if test="applyArctic != null" >apply_arctic,</if> <if test="applyArctic != null" >apply_arctic,</if>
<if test="referenceStand != null" >reference_stand,</if> <if test="referenceStand != null" >reference_stand,</if>
<if test="specialRequest != null" >special_request,</if> <if test="informationCategory != null" >information_category,</if>
<if test="relevanceFile != null" >relevance_file,</if> <if test="relevanceFile != null" >relevance_file,</if>
<if test="remarks != null" >remarks,</if> <if test="technologyTerritory != null" >technology_territory,</if>
<if test="validFlag != null" >valid_flag,</if> <if test="validFlag != null" >valid_flag,</if>
<if test="creationUser != null" >creation_user,</if> <if test="creationUser != null" >creation_user,</if>
<if test="creationTime != null" >creation_time,</if> <if test="creationTime != null" >creation_time,</if>
@@ -178,12 +178,12 @@
<if test="newcarPutTime != null" >#{newcarPutTime, jdbcType=TIMESTAMP},</if> <if test="newcarPutTime != null" >#{newcarPutTime, jdbcType=TIMESTAMP},</if>
<if test="productPutTime != null" >#{productPutTime, jdbcType=TIMESTAMP},</if> <if test="productPutTime != null" >#{productPutTime, jdbcType=TIMESTAMP},</if>
<if test="menuId != null" >#{menuId, jdbcType=VARCHAR},</if> <if test="menuId != null" >#{menuId, jdbcType=VARCHAR},</if>
<if test="svpps != null" >#{svpps, jdbcType=VARCHAR},</if> <if test="functionTerritory != null" >#{functionTerritory, jdbcType=VARCHAR},</if>
<if test="applyArctic != null" >#{applyArctic, jdbcType=VARCHAR},</if> <if test="applyArctic != null" >#{applyArctic, jdbcType=VARCHAR},</if>
<if test="referenceStand != null" >#{referenceStand, jdbcType=VARCHAR},</if> <if test="referenceStand != null" >#{referenceStand, jdbcType=VARCHAR},</if>
<if test="specialRequest != null" >#{specialRequest, jdbcType=VARCHAR},</if> <if test="informationCategory != null" >#{informationCategory, jdbcType=VARCHAR},</if>
<if test="relevanceFile != null" >#{relevanceFile, jdbcType=VARCHAR},</if> <if test="relevanceFile != null" >#{relevanceFile, jdbcType=VARCHAR},</if>
<if test="remarks != null" >#{remarks, jdbcType=VARCHAR},</if> <if test="technologyTerritory != null" >#{technologyTerritory, jdbcType=VARCHAR},</if>
<if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if> <if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if>
<if test="creationUser != null" >#{creationUser, jdbcType=VARCHAR},</if> <if test="creationUser != null" >#{creationUser, jdbcType=VARCHAR},</if>
<if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if> <if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
@@ -203,12 +203,12 @@
newcar_put_time = #{newcarPutTime}, newcar_put_time = #{newcarPutTime},
product_put_time = #{productPutTime}, product_put_time = #{productPutTime},
menu_id = #{menuId}, menu_id = #{menuId},
svpps = #{svpps}, function_territory = #{functionTerritory},
apply_arctic = #{applyArctic}, apply_arctic = #{applyArctic},
reference_stand = #{referenceStand}, reference_stand = #{referenceStand},
special_request = #{specialRequest}, information_category = #{informationCategory},
relevance_file = #{relevanceFile}, relevance_file = #{relevanceFile},
remarks = #{remarks}, technology_territory = #{technologyTerritory},
valid_flag = #{validFlag}, valid_flag = #{validFlag},
creation_user = #{creationUser}, creation_user = #{creationUser},
creation_time = #{creationTime}, creation_time = #{creationTime},
@@ -248,8 +248,8 @@
<if test="menuId != null" > <if test="menuId != null" >
menu_id = #{menuId}, menu_id = #{menuId},
</if> </if>
<if test="svpps != null" > <if test="functionTerritory != null" >
svpps = #{svpps}, function_territory = #{functionTerritory},
</if> </if>
<if test="applyArctic != null" > <if test="applyArctic != null" >
apply_arctic = #{applyArctic}, apply_arctic = #{applyArctic},
@@ -257,14 +257,14 @@
<if test="referenceStand != null" > <if test="referenceStand != null" >
reference_stand = #{referenceStand}, reference_stand = #{referenceStand},
</if> </if>
<if test="specialRequest != null" > <if test="informationCategory != null" >
special_request = #{specialRequest}, information_category = #{informationCategory},
</if> </if>
<if test="relevanceFile != null" > <if test="relevanceFile != null" >
relevance_file = #{relevanceFile}, relevance_file = #{relevanceFile},
</if> </if>
<if test="remarks != null" > <if test="technologyTerritory != null" >
remarks = #{remarks}, technology_territory = #{technologyTerritory},
</if> </if>
<if test="validFlag != null" > <if test="validFlag != null" >
valid_flag = #{validFlag}, valid_flag = #{validFlag},
@@ -309,41 +309,51 @@
<include refid="Base_Where_Clause"/> <include refid="Base_Where_Clause"/>
<if test="menuId != null"> <if test="menuId != null">
and SAR_FILE_SPLIT_ITEMS.MENU_ID in ( and SAR_FILE_SPLIT_ITEMS.MENU_ID in (
select SAR_FILE_SPLIT_MENU.id from SAR_FILE_SPLIT_MENU start with id=#{menuId} connect by prior id= p_id SELECT m.id
FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{menuId})) AS pids ) t
WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
) )
</if> </if>
</select> </select>
<!-- 查询SAR_FILE_SPLIT_ITEMS列表 --> <!-- 查询SAR_FILE_SPLIT_ITEMS列表 -->
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.jero.modules.split.page.SarFileSplitItemsEOPage"> <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.jero.modules.split.page.SarFileSplitItemsEOPage">
select * from select tmp_tb.* from
(select tmp_tb.* , rownum rn from (select <include refid="Base_Column_List" /> from SAR_FILE_SPLIT_ITEMS left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id
(select <include refid="Base_Column_List" /> from SAR_FILE_SPLIT_ITEMS left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id <include refid="Base_Where_Clause"/>
<include refid="Base_Where_Clause"/> <if test="menuId != null">
<if test="menuId != null"> and SAR_FILE_SPLIT_ITEMS.MENU_ID in (
and SAR_FILE_SPLIT_ITEMS.MENU_ID in ( SELECT m.id
select SAR_FILE_SPLIT_MENU.id from SAR_FILE_SPLIT_MENU start with id=#{menuId} connect by prior id= p_id FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{menuId})) AS pids ) t
) WHERE
</if> FIND_IN_SET( m.id, t.pids )
<if test="pager.orderCondition != null and pager.orderCondition != ''" > AND valid_flag = '0'
${pager.orderCondition} )
</if> </if>
) tmp_tb where rownum &lt;= ${pager.endIndex}) <if test="pager.orderCondition != null and pager.orderCondition != ''" >
where rn &gt;= ${pager.startIndex} ${pager.orderCondition}
</if>
) tmp_tb limit ${pager.startIndex-1}, ${pager.endIndex}
</select> </select>
<select id="queryByList2" resultMap="BaseResultMap" parameterType="com.jero.modules.split.page.SarFileSplitItemsEOPage"> <select id="queryByList2" resultMap="BaseResultMap" parameterType="com.jero.modules.split.page.SarFileSplitItemsEOPage">
select <include refid="Base_Column_List" /> from SAR_FILE_SPLIT_ITEMS left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id select <include refid="Base_Column_List" /> from SAR_FILE_SPLIT_ITEMS left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id
<include refid="Base_Where_Clause"/> <include refid="Base_Where_Clause"/>
<if test="menuId != null"> <if test="menuId != null">
and SAR_FILE_SPLIT_ITEMS.MENU_ID in ( and SAR_FILE_SPLIT_ITEMS.MENU_ID in (
select SAR_FILE_SPLIT_MENU.id from SAR_FILE_SPLIT_MENU start with id=#{menuId} connect by prior id= p_id SELECT m.id
) FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{menuId})) AS pids ) t
</if> WHERE
<if test="pager.orderCondition != null and pager.orderCondition != ''" > FIND_IN_SET( m.id, t.pids )
${pager.orderCondition} AND valid_flag = '0'
</if> )
</select> </if>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
</select>
<select id="queryByList" resultMap="BaseResultMap" parameterType="com.jero.modules.split.common.BasePage"> <select id="queryByList" resultMap="BaseResultMap" parameterType="com.jero.modules.split.common.BasePage">
select <include refid="Base_Column_List"/> from SAR_FILE_SPLIT_ITEMS select <include refid="Base_Column_List"/> from SAR_FILE_SPLIT_ITEMS
@@ -359,15 +369,15 @@
begin begin
<foreach collection="list" item="item" index="index" separator=";"> <foreach collection="list" item="item" index="index" separator=";">
insert into SAR_FILE_SPLIT_ITEMS insert into SAR_FILE_SPLIT_ITEMS
(id, info_id, items_num, items_name, newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, remarks, valid_flag, creation_user, creation_time, modify_time, (id, info_id, items_num, items_name, newcar_put_time, product_put_time, menu_id, function_territory, apply_arctic, reference_stand, information_category, relevance_file, technology_territory, valid_flag, creation_user, creation_time, modify_time,
modify_user, iterms_conditions) modify_user, iterms_conditions)
values ( values (
#{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR}, #{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR},
#{item.itemsName, jdbcType=VARCHAR}, #{item.itemsName, jdbcType=VARCHAR},
#{item.newcarPutTime, jdbcType=TIMESTAMP}, #{item.productPutTime, jdbcType=TIMESTAMP}, #{item.newcarPutTime, jdbcType=TIMESTAMP}, #{item.productPutTime, jdbcType=TIMESTAMP},
#{item.menuId, jdbcType=VARCHAR}, #{item.svpps, jdbcType=VARCHAR}, #{item.applyArctic, jdbcType=VARCHAR}, #{item.menuId, jdbcType=VARCHAR}, #{item.functionTerritory, jdbcType=VARCHAR}, #{item.applyArctic, jdbcType=VARCHAR},
#{item.referenceStand, jdbcType=VARCHAR}, #{item.specialRequest, jdbcType=VARCHAR}, #{item.referenceStand, jdbcType=VARCHAR}, #{item.informationCategory, jdbcType=VARCHAR},
#{item.relevanceFile, jdbcType=VARCHAR}, #{item.remarks, jdbcType=VARCHAR}, #{item.relevanceFile, jdbcType=VARCHAR}, #{item.technologyTerritory, jdbcType=VARCHAR},
#{item.validFlag, jdbcType=INTEGER}, #{item.creationUser, jdbcType=VARCHAR}, #{item.validFlag, jdbcType=INTEGER}, #{item.creationUser, jdbcType=VARCHAR},
#{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP},
#{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB} #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB}
@@ -405,9 +415,11 @@
select <include refid="Base_Column_List"/> from SAR_FILE_SPLIT_ITEMS select <include refid="Base_Column_List"/> from SAR_FILE_SPLIT_ITEMS
left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id
where SAR_FILE_SPLIT_ITEMS.valid_flag = '0' and menu_id in ( where SAR_FILE_SPLIT_ITEMS.valid_flag = '0' and menu_id in (
select SAR_FILE_SPLIT_MENU.id from SAR_FILE_SPLIT_MENU SELECT m.id
where valid_flag=0 FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{menuId})) AS pids ) t
start with id=#{menuId} connect by prior id= p_id WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
) )
order by SAR_FILE_SPLIT_MENU.display_seq asc order by SAR_FILE_SPLIT_MENU.display_seq asc
</select> </select>
@@ -431,14 +443,18 @@
<select id="queryByOrdersForExport" resultMap="BaseResultMapExport" parameterType="com.jero.modules.split.page.SarFileSplitItemsEOPage"> <select id="queryByOrdersForExport" resultMap="BaseResultMapExport" parameterType="com.jero.modules.split.page.SarFileSplitItemsEOPage">
select SAR_FILE_SPLIT_ITEMS.id,SAR_FILE_SPLIT_ITEMS.items_num,SAR_FILE_SPLIT_ITEMS.items_name, select SAR_FILE_SPLIT_ITEMS.id,SAR_FILE_SPLIT_ITEMS.items_num,SAR_FILE_SPLIT_ITEMS.items_name,
newcar_put_time,product_put_time,svpps,apply_arctic,reference_stand,SAR_FILE_SPLIT_ITEMS.remarks, newcar_put_time,product_put_time,function_territory,apply_arctic,reference_stand,SAR_FILE_SPLIT_ITEMS.technology_territory,
relevance_file relevance_file
from SAR_FILE_SPLIT_ITEMS from SAR_FILE_SPLIT_ITEMS
left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id
<include refid="Base_Where_Clause"/> <include refid="Base_Where_Clause"/>
<if test="menuId != null"> <if test="menuId != null">
and SAR_FILE_SPLIT_ITEMS.MENU_ID in ( and SAR_FILE_SPLIT_ITEMS.MENU_ID in (
select SAR_FILE_SPLIT_MENU.id from SAR_FILE_SPLIT_MENU start with id=#{menuId} connect by prior id= p_id SELECT m.id
FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{menuId})) AS pids ) t
WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
) )
</if> </if>
<if test="idList != null"> <if test="idList != null">
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
+47 -24
View File
@@ -199,15 +199,13 @@
<!-- 查询SAR_FILE_SPLIT_MENU列表 --> <!-- 查询SAR_FILE_SPLIT_MENU列表 -->
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.jero.modules.split.common.BasePage"> <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.jero.modules.split.common.BasePage">
select <include refid="Base_Column_List" /> from select tmp_tb.* from
(select tmp_tb.* , rownum rn from (select <include refid="Base_Column_List" /> from SAR_FILE_SPLIT_MENU
(select <include refid="Base_Column_List" /> from SAR_FILE_SPLIT_MENU <include refid="Base_Where_Clause"/>
<include refid="Base_Where_Clause"/> <if test="pager.orderCondition != null and pager.orderCondition != ''" >
<if test="pager.orderCondition != null and pager.orderCondition != ''" > ${pager.orderCondition}
${pager.orderCondition} </if>
</if> ) tmp_tb limit ${pager.startIndex-1}, ${pager.endIndex}
) tmp_tb where rownum &lt;= ${pager.endIndex})
where rn &gt;= ${pager.startIndex}
</select> </select>
<select id="queryByList" resultMap="BaseResultMap" parameterType="com.jero.modules.split.common.BasePage"> <select id="queryByList" resultMap="BaseResultMap" parameterType="com.jero.modules.split.common.BasePage">
@@ -263,21 +261,31 @@
</update> </update>
<select id="queryByPidExcpetSelf" resultMap="BaseResultMap" parameterType="com.jero.modules.split.entity.SarFileSplitMenuEO"> <select id="queryByPidExcpetSelf" resultMap="BaseResultMap" parameterType="com.jero.modules.split.entity.SarFileSplitMenuEO">
select SAR_FILE_SPLIT_MENU.* from SAR_FILE_SPLIT_MENU select m.*
where valid_flag=0 and id != #{id} from SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t
start with id=#{id} connect by prior id= parent_id WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
AND id != #{id}
</select> </select>
<delete id="deleteByPId" parameterType="java.lang.String"> <delete id="deleteByPId" parameterType="java.lang.String">
delete from SAR_FILE_SPLIT_MENU where id in ( delete from SAR_FILE_SPLIT_MENU where id in (
select id from SAR_FILE_SPLIT_MENU start with id=#{id} connect by prior id= parent_id SELECT m.id
FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t
WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
) )
</delete> </delete>
<select id="getMaxDisplayByid" resultType="java.lang.Integer" parameterType="com.jero.modules.split.common.BasePage"> <select id="getMaxDisplayByid" resultType="java.lang.Integer" parameterType="com.jero.modules.split.common.BasePage">
SELECT max(SAR_FILE_SPLIT_MENU.DISPLAY_SEQ) FROM SELECT max(m.DISPLAY_SEQ)
SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = parent_id FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t
WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
</select> </select>
<select id="getMaxDisplayByidNextLevel" resultType="java.lang.Integer" parameterType="java.lang.String"> <select id="getMaxDisplayByidNextLevel" resultType="java.lang.Integer" parameterType="java.lang.String">
@@ -286,8 +294,11 @@
</select> </select>
<select id="getChildrenCountByParentId" resultType="java.lang.Integer" parameterType="com.jero.modules.split.common.BasePage"> <select id="getChildrenCountByParentId" resultType="java.lang.Integer" parameterType="com.jero.modules.split.common.BasePage">
SELECT count(*) FROM SELECT count(*)
SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = parent_id FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t
WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
</select> </select>
<update id="updateChildrenDisplaySeqByIDAdd" parameterType="com.jero.modules.split.entity.SarFileSplitMenuEO" > <update id="updateChildrenDisplaySeqByIDAdd" parameterType="com.jero.modules.split.entity.SarFileSplitMenuEO" >
@@ -295,8 +306,13 @@
set display_seq = display_seq + #{childrenCount}, set display_seq = display_seq + #{childrenCount},
modify_time = #{modifyTime}, modify_time = #{modifyTime},
modify_user = #{modifyUser} modify_user = #{modifyUser}
where id in ( SELECT id FROM where id in (
SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = parent_id) SELECT m.id
FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t
WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
)
</update> </update>
<update id="updateChildrenDisplaySeqByIDCut" parameterType="com.jero.modules.split.entity.SarFileSplitMenuEO" > <update id="updateChildrenDisplaySeqByIDCut" parameterType="com.jero.modules.split.entity.SarFileSplitMenuEO" >
@@ -304,14 +320,21 @@
set display_seq = display_seq - #{childrenCount}, set display_seq = display_seq - #{childrenCount},
modify_time = #{modifyTime}, modify_time = #{modifyTime},
modify_user = #{modifyUser} modify_user = #{modifyUser}
where id in ( SELECT id FROM where id in (
SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = parent_id) SELECT m.id
FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t
WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
)
</update> </update>
<select id="queryAllChildrenByid" resultMap="BaseResultMap" parameterType="com.jero.modules.split.entity.SarFileSplitMenuEO"> <select id="queryAllChildrenByid" resultMap="BaseResultMap" parameterType="com.jero.modules.split.entity.SarFileSplitMenuEO">
select SAR_FILE_SPLIT_MENU.* from SAR_FILE_SPLIT_MENU select m.*
where valid_flag=0 from SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t
start with id=#{id} connect by prior id= parent_id WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
</select> </select>
<delete id="deleteByIdList" parameterType="java.util.List"> <delete id="deleteByIdList" parameterType="java.util.List">
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java
+6 -6
View File
@@ -35,18 +35,18 @@ public class SarFileSplitItemsEOPage extends BasePage {
private String productPutTimeOperator = "="; private String productPutTimeOperator = "=";
private String menuId; private String menuId;
private String menuIdOperator = "="; private String menuIdOperator = "=";
private String svpps; private String functionTerritory;
private String svppsOperator = "="; private String functionTerritoryOperator = "=";
private String applyArctic; private String applyArctic;
private String applyArcticOperator = "="; private String applyArcticOperator = "=";
private String referenceStand; private String referenceStand;
private String referenceStandOperator = "="; private String referenceStandOperator = "=";
private String specialRequest; private String informationCategory;
private String specialRequestOperator = "="; private String informationCategoryOperator = "=";
private String relevanceFile; private String relevanceFile;
private String relevanceFileOperator = "="; private String relevanceFileOperator = "=";
private String remarks; private String technologyTerritory;
private String remarksOperator = "="; private String technologyTerritoryOperator = "=";
private String validFlag; private String validFlag;
private String validFlagOperator = "="; private String validFlagOperator = "=";
private String creationUser; private String creationUser;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsEOService.java
+4 -4
View File
@@ -36,7 +36,7 @@ public interface ISarFileSplitItemsEOService extends IService<SarFileSplitItemsE
Map<String,String> moveSplitItemsVal(SarFileSplitItemsEOPage page) throws Exception ; Map<String,String> moveSplitItemsVal(SarFileSplitItemsEOPage page) throws Exception ;
void saveFileInfo (SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception; // void saveFileInfo (SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception;
int insert(SarFileSplitItemsEO SarFileSplitItemsEO); int insert(SarFileSplitItemsEO SarFileSplitItemsEO);
@@ -57,11 +57,11 @@ public interface ISarFileSplitItemsEOService extends IService<SarFileSplitItemsE
List<SarFileSplitItemsEO> queryByPage(SarFileSplitItemsEOPage page); List<SarFileSplitItemsEO> queryByPage(SarFileSplitItemsEOPage page);
public String insertSarStandFile(String standId, List<OSSFile> list, String standFileClassify,String newFiles) throws Exception ; // public String insertSarStandFile(String standId, List<OSSFile> list, String standFileClassify,String newFiles) throws Exception ;
public Map<String,List<String>> getNotDeleteMsgFile(SarFileSplitItemsEO sarFileSplitItemsEO); // public Map<String,List<String>> getNotDeleteMsgFile(SarFileSplitItemsEO sarFileSplitItemsEO);
public String getNotDelFile(String fileAttIds,List<String> getNotDeleteResId,List<String> getNotDeleteFileId); // public String getNotDelFile(String fileAttIds,List<String> getNotDeleteResId,List<String> getNotDeleteFileId);
public String insertItemTable(List<SarFileSplitItemsValEO> getValList,String itemId); public String insertItemTable(List<SarFileSplitItemsValEO> getValList,String itemId);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java
+222 -226
View File
@@ -8,9 +8,6 @@ import com.jero.modules.split.common.FileUnZip;
import com.jero.modules.split.common.SplitTableInfo; import com.jero.modules.split.common.SplitTableInfo;
import com.jero.modules.split.dto.*; import com.jero.modules.split.dto.*;
import com.jero.modules.split.entity.*; import com.jero.modules.split.entity.*;
import com.jero.modules.split.enums.StandFileClassifyEnum;
import com.jero.modules.split.enums.UseModuleEnum;
import com.jero.modules.split.enums.ValueStateEnum;
import com.jero.modules.split.mapper.*; import com.jero.modules.split.mapper.*;
import com.jero.modules.split.page.SarFileSplitItemsEOPage; import com.jero.modules.split.page.SarFileSplitItemsEOPage;
import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; import com.jero.modules.split.page.SarFileSplitItemsTableEOPage;
@@ -19,7 +16,6 @@ import com.jero.modules.split.page.SarFileSplitMenuEOPage;
import com.jero.modules.split.service.ISarFileSplitItemsEOService; import com.jero.modules.split.service.ISarFileSplitItemsEOService;
import com.jero.modules.split.service.ISarFileSplitItemsValEOService; import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
import com.jero.modules.split.service.ISarFileSplitMenuEOService; import com.jero.modules.split.service.ISarFileSplitMenuEOService;
import com.jero.modules.split.util.ExcelUtil;
import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.system.mapper.SysDictMapper;
import com.jero.modules.system.util.StringUtils; import com.jero.modules.system.util.StringUtils;
import com.jero.modules.system.util.UserUtils; import com.jero.modules.system.util.UserUtils;
@@ -437,53 +433,53 @@ public class SarFileSplitItemsEOServiceImpl extends ServiceImpl<SarFileSplitItem
} }
public void saveFileInfo (SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { // public void saveFileInfo (SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception {
//判断文件是否是新添加的 // //判断文件是否是新添加的
Map<String,List<String>> resultMap = getNotDeleteMsgFile(sarFileSplitItemsEO); // Map<String,List<String>> resultMap = getNotDeleteMsgFile(sarFileSplitItemsEO);
List<String> getNotDeleteResId = resultMap.get("notDelResIds"); // List<String> getNotDeleteResId = resultMap.get("notDelResIds");
List<String> getNotDeleteFileId = resultMap.get("notDelFileIds"); // List<String> getNotDeleteFileId = resultMap.get("notDelFileIds");
//删除文件资源表数据 // //删除文件资源表数据
SarFileSplitItemsResEO sarLawsResEO = new SarFileSplitItemsResEO(); // SarFileSplitItemsResEO sarLawsResEO = new SarFileSplitItemsResEO();
sarLawsResEO.setStandId(sarFileSplitItemsEO.getId()); // sarLawsResEO.setStandId(sarFileSplitItemsEO.getId());
if(getNotDeleteResId != null && !getNotDeleteResId.isEmpty()){ // if(getNotDeleteResId != null && !getNotDeleteResId.isEmpty()){
sarLawsResEO.setIdlist(getNotDeleteResId); // sarLawsResEO.setIdlist(getNotDeleteResId);
} else { // } else {
sarLawsResEO.setIdlist(null); // sarLawsResEO.setIdlist(null);
} // }
List<SarFileSplitItemsResEO> listRes = sarFileSplitItemsResEOMapper.selectByItemsIdAndId(sarLawsResEO); // List<SarFileSplitItemsResEO> listRes = sarFileSplitItemsResEOMapper.selectByItemsIdAndId(sarLawsResEO);
if (listRes != null) { // if (listRes != null) {
if (!listRes.isEmpty()) { // if (!listRes.isEmpty()) {
for (int r = 0; r < listRes.size(); r++) { // for (int r = 0; r < listRes.size(); r++) {
sarFileSplitItemsResEOMapper.deleteByPrimaryKey(listRes.get(r).getId()); // sarFileSplitItemsResEOMapper.deleteByPrimaryKey(listRes.get(r).getId());
} // }
} // }
} // }
//删除文件详情表数据 // //删除文件详情表数据
SarFileSplitItemsFileEO sarLawsFileEO = new SarFileSplitItemsFileEO(); // SarFileSplitItemsFileEO sarLawsFileEO = new SarFileSplitItemsFileEO();
sarLawsFileEO.setStandId(sarFileSplitItemsEO.getId()); // sarLawsFileEO.setStandId(sarFileSplitItemsEO.getId());
if(getNotDeleteFileId != null && !getNotDeleteFileId.isEmpty()){ // if(getNotDeleteFileId != null && !getNotDeleteFileId.isEmpty()){
sarLawsFileEO.setIdlist(getNotDeleteFileId); // sarLawsFileEO.setIdlist(getNotDeleteFileId);
}else { // }else {
sarLawsFileEO.setIdlist(null); // sarLawsFileEO.setIdlist(null);
} // }
List<SarFileSplitItemsFileEO> listFile = sarFileSplitItemsFileEOMapper.selectFileByItemsIdAndId(sarLawsFileEO); // List<SarFileSplitItemsFileEO> listFile = sarFileSplitItemsFileEOMapper.selectFileByItemsIdAndId(sarLawsFileEO);
if (listFile != null) { // if (listFile != null) {
if (!listFile.isEmpty()) { // if (!listFile.isEmpty()) {
for (int f = 0; f < listFile.size(); f++) { // for (int f = 0; f < listFile.size(); f++) {
sarFileSplitItemsFileEOMapper.deleteByPrimaryKey(listFile.get(f).getId()); // sarFileSplitItemsFileEOMapper.deleteByPrimaryKey(listFile.get(f).getId());
//删除文件信息表数据 // //删除文件信息表数据
// sarFileInfoEODao.deleteByfileId(listFile.get(f).getId()); //// sarFileInfoEODao.deleteByfileId(listFile.get(f).getId());
//删除转换表ot_convert数据 // //删除转换表ot_convert数据
// otConvertEODao.deleteByAttId(listFile.get(f).getAttId()); //// otConvertEODao.deleteByAttId(listFile.get(f).getAttId());
} // }
} // }
} // }
//添加新的文件表信息 // //添加新的文件表信息
if (StringUtils.isNotEmpty(sarFileSplitItemsEO.getRelevanceFile())) { // if (StringUtils.isNotEmpty(sarFileSplitItemsEO.getRelevanceFile())) {
List<OSSFile> fileList = ossFileService.getFileInfos(sarFileSplitItemsEO.getRelevanceFile()); // List<OSSFile> fileList = ossFileService.getFileInfos(sarFileSplitItemsEO.getRelevanceFile());
String reslist = insertSarStandFile(sarFileSplitItemsEO.getId(), fileList, StandFileClassifyEnum.RELEVANCE_FILE.getValue(),sarFileSplitItemsEO.getRelevanceFileAttid()); // String reslist = insertSarStandFile(sarFileSplitItemsEO.getId(), fileList, StandFileClassifyEnum.RELEVANCE_FILE.getValue(),sarFileSplitItemsEO.getRelevanceFileAttid());
} // }
} // }
@Override @Override
public int insert(SarFileSplitItemsEO sarFileSplitItemsEO) { public int insert(SarFileSplitItemsEO sarFileSplitItemsEO) {
@@ -530,105 +526,105 @@ public class SarFileSplitItemsEOServiceImpl extends ServiceImpl<SarFileSplitItem
return dao.queryByPage(page); return dao.queryByPage(page);
} }
public String insertSarStandFile(String standId, List<OSSFile> list, String standFileClassify, String newFiles) throws Exception { // public String insertSarStandFile(String standId, List<OSSFile> list, String standFileClassify, String newFiles) throws Exception {
String residlist = ""; // String residlist = "";
String newFileArr[] = newFiles.split(","); // String newFileArr[] = newFiles.split(",");
List<String> newAttList = Arrays.asList(newFileArr); // List<String> newAttList = Arrays.asList(newFileArr);
if (list != null) { // if (list != null) {
SarFileSplitItemsResEO sarStandResEO = new SarFileSplitItemsResEO(); // SarFileSplitItemsResEO sarStandResEO = new SarFileSplitItemsResEO();
SarFileSplitItemsFileEO sarStandFileEO = new SarFileSplitItemsFileEO(); // SarFileSplitItemsFileEO sarStandFileEO = new SarFileSplitItemsFileEO();
for (OSSFile fileInfo : list) { // for (OSSFile fileInfo : list) {
if(newAttList != null && newAttList.contains(fileInfo.getId())){ // if(newAttList != null && newAttList.contains(fileInfo.getId())){
//标准文件资源表存数据库 // //标准文件资源表存数据库
sarStandResEO.setStandId(standId); //标准ID // sarStandResEO.setStandId(standId); //标准ID
sarStandResEO.setStandFileClassify(standFileClassify); //文件分类 // sarStandResEO.setStandFileClassify(standFileClassify); //文件分类
sarStandResEO.setFileName(fileInfo.getFileName()); //文件名称@@@@@@@需要确定取name 还是 oldname // sarStandResEO.setFileName(fileInfo.getFileName()); //文件名称@@@@@@@需要确定取name 还是 oldname
//
// String fileSuffix = fileInfo.getFileName().substring(fileInfo.getFileName().lastIndexOf(".")+1);
// sarStandResEO.setFileSuffix(fileSuffix); //文件类型
// sarStandResEO.setId(UUID.randomUUID().toString().replace("-", ""));
// sarStandResEO.setCreationTime(new Date());
// sarStandResEO.setModifyTime(new Date());
// sarStandResEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
// int i = sarFileSplitItemsResEOMapper.insertSelective(sarStandResEO);
// residlist += sarStandResEO.getId() + ",";
// //标准文件详情表存数据库
// sarStandFileEO.setId(UUID.randomUUID().toString().replace("-", ""));
// sarStandFileEO.setCreationTime(new Date());
// sarStandFileEO.setModifyTime(new Date());
// sarStandFileEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
// sarStandFileEO.setStandId(standId); //标准ID
// sarStandFileEO.setResId(sarStandResEO.getId()); //资源ID
// sarStandFileEO.setAttId(fileInfo.getId()); //文件ID
// sarStandFileEO.setUseModel(UseModuleEnum.SOURCE_FILE.getValue()); //文件使用模式 //文件名称@@@@@@@需要修改
// sarFileSplitItemsFileEOMapper.insertSelective(sarStandFileEO);
//
// //文档转换
// if ("pdf".equals(fileSuffix) || "PDF".equals(fileSuffix)) {
// sarStandFileEO.setId(UUID.randomUUID().toString().replace("-", ""));
// sarStandFileEO.setUseModel(UseModuleEnum.WEB_FILE.getValue()); //文件使用模式 //文件名称@@@@@@@需要修改
// sarFileSplitItemsFileEOMapper.insertSelective(sarStandFileEO);
// } else {
// String filePath = fileInfo.getUrl();
//// ConvertMqEO convert = new ConvertMqEO();
//// convert.setLawsId(standId);
//// convert.setResId(sarStandResEO.getId());
//// convert.setAttId(fileInfo.getId());
//// convert.setFilePath(filePath);
//// convert.setAddOrUp("0");
//// convert.setFileSuffix(fileInfo.getFileSuffix());
//// convert.setConvertType(SarTypeEnum.SPLIT.getValue());
//// convertMq.sendMQ(convert);
// }
// } else {
// List<SarFileSplitItemsFileEO> getFile = sarFileSplitItemsFileEOMapper.selectFileMsgByAttId(fileInfo.getId());
// if(getFile != null && !getFile.isEmpty()){
// residlist += getFile.get(0).getResId() + ",";
// }
// }
//
// }
// }
// return residlist;
// }
String fileSuffix = fileInfo.getFileName().substring(fileInfo.getFileName().lastIndexOf(".")+1); // public Map<String,List<String>> getNotDeleteMsgFile(SarFileSplitItemsEO sarFileSplitItemsEO){
sarStandResEO.setFileSuffix(fileSuffix); //文件类型 // Map<String,List<String>> resultMap = new HashMap<>();
sarStandResEO.setId(UUID.randomUUID().toString().replace("-", "")); // List<String> getNotDeleteResId = new ArrayList<>();
sarStandResEO.setCreationTime(new Date()); // List<String> getNotDeleteFileId = new ArrayList<>();
sarStandResEO.setModifyTime(new Date()); // String newStandFile = "";
sarStandResEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); // //向文件表添加关联文件数据
int i = sarFileSplitItemsResEOMapper.insertSelective(sarStandResEO); // String newrelevanceFile = "";
residlist += sarStandResEO.getId() + ","; // if (StringUtils.isNotEmpty(sarFileSplitItemsEO.getRelevanceFile())) {
//标准文件详情表存数据库 // newrelevanceFile = getNotDelFile(sarFileSplitItemsEO.getRelevanceFile(),getNotDeleteResId,getNotDeleteFileId);
sarStandFileEO.setId(UUID.randomUUID().toString().replace("-", "")); // }
sarStandFileEO.setCreationTime(new Date()); // sarFileSplitItemsEO.setRelevanceFileAttid(newrelevanceFile);
sarStandFileEO.setModifyTime(new Date()); // resultMap.put("notDelResIds",getNotDeleteResId);
sarStandFileEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); // resultMap.put("notDelFileIds",getNotDeleteFileId);
sarStandFileEO.setStandId(standId); //标准ID // return resultMap;
sarStandFileEO.setResId(sarStandResEO.getId()); //资源ID // }
sarStandFileEO.setAttId(fileInfo.getId()); //文件ID //
sarStandFileEO.setUseModel(UseModuleEnum.SOURCE_FILE.getValue()); //文件使用模式 //文件名称@@@@@@@需要修改 // public String getNotDelFile(String fileAttIds,List<String> getNotDeleteResId,List<String> getNotDeleteFileId){
sarFileSplitItemsFileEOMapper.insertSelective(sarStandFileEO); // String splitFile[] = fileAttIds.split(",");
// String newFiles = "";
//文档转换 // for(int i=0;i<splitFile.length;i++){
if ("pdf".equals(fileSuffix) || "PDF".equals(fileSuffix)) { // List<SarFileSplitItemsFileEO> getFile = sarFileSplitItemsFileEOMapper.selectFileMsgByAttId(splitFile[i]);
sarStandFileEO.setId(UUID.randomUUID().toString().replace("-", "")); // if(getFile != null && !getFile.isEmpty()){
sarStandFileEO.setUseModel(UseModuleEnum.WEB_FILE.getValue()); //文件使用模式 //文件名称@@@@@@@需要修改 // for(SarFileSplitItemsFileEO sarStandFileEO : getFile){
sarFileSplitItemsFileEOMapper.insertSelective(sarStandFileEO); // getNotDeleteResId.add(sarStandFileEO.getResId());
} else { // getNotDeleteFileId.add(sarStandFileEO.getId());
String filePath = fileInfo.getUrl(); // }
// ConvertMqEO convert = new ConvertMqEO(); // List<SarFileSplitItemsFileEO> getWebFile = sarFileSplitItemsFileEOMapper.selectFileByAttId(splitFile[i]);
// convert.setLawsId(standId); // if(getWebFile != null && !getWebFile.isEmpty()){
// convert.setResId(sarStandResEO.getId()); // getNotDeleteFileId.add(getWebFile.get(0).getId());
// convert.setAttId(fileInfo.getId()); // }
// convert.setFilePath(filePath); //
// convert.setAddOrUp("0"); // } else {
// convert.setFileSuffix(fileInfo.getFileSuffix()); // newFiles += splitFile[i] + ",";
// convert.setConvertType(SarTypeEnum.SPLIT.getValue()); // }
// convertMq.sendMQ(convert); // }
} // return newFiles;
} else { // }
List<SarFileSplitItemsFileEO> getFile = sarFileSplitItemsFileEOMapper.selectFileMsgByAttId(fileInfo.getId());
if(getFile != null && !getFile.isEmpty()){
residlist += getFile.get(0).getResId() + ",";
}
}
}
}
return residlist;
}
public Map<String,List<String>> getNotDeleteMsgFile(SarFileSplitItemsEO sarFileSplitItemsEO){
Map<String,List<String>> resultMap = new HashMap<>();
List<String> getNotDeleteResId = new ArrayList<>();
List<String> getNotDeleteFileId = new ArrayList<>();
String newStandFile = "";
//向文件表添加关联文件数据
String newrelevanceFile = "";
if (StringUtils.isNotEmpty(sarFileSplitItemsEO.getRelevanceFile())) {
newrelevanceFile = getNotDelFile(sarFileSplitItemsEO.getRelevanceFile(),getNotDeleteResId,getNotDeleteFileId);
}
sarFileSplitItemsEO.setRelevanceFileAttid(newrelevanceFile);
resultMap.put("notDelResIds",getNotDeleteResId);
resultMap.put("notDelFileIds",getNotDeleteFileId);
return resultMap;
}
public String getNotDelFile(String fileAttIds,List<String> getNotDeleteResId,List<String> getNotDeleteFileId){
String splitFile[] = fileAttIds.split(",");
String newFiles = "";
for(int i=0;i<splitFile.length;i++){
List<SarFileSplitItemsFileEO> getFile = sarFileSplitItemsFileEOMapper.selectFileMsgByAttId(splitFile[i]);
if(getFile != null && !getFile.isEmpty()){
for(SarFileSplitItemsFileEO sarStandFileEO : getFile){
getNotDeleteResId.add(sarStandFileEO.getResId());
getNotDeleteFileId.add(sarStandFileEO.getId());
}
List<SarFileSplitItemsFileEO> getWebFile = sarFileSplitItemsFileEOMapper.selectFileByAttId(splitFile[i]);
if(getWebFile != null && !getWebFile.isEmpty()){
getNotDeleteFileId.add(getWebFile.get(0).getId());
}
} else {
newFiles += splitFile[i] + ",";
}
}
return newFiles;
}
public String insertItemTable(List<SarFileSplitItemsValEO> getValList,String itemId){ public String insertItemTable(List<SarFileSplitItemsValEO> getValList,String itemId){
String itemContent = "<table class=\'wordTable\'>"; String itemContent = "<table class=\'wordTable\'>";
@@ -1287,12 +1283,12 @@ public class SarFileSplitItemsEOServiceImpl extends ServiceImpl<SarFileSplitItem
i++; i++;
int countError = 0; //记录失败数据数量 int countError = 0; //记录失败数据数量
String errorMsg = "第" + i + "行："; String errorMsg = "第" + i + "行：";
dto.setRelevanceFileName(dto.getRelevanceFile()); // dto.setRelevanceFileName(dto.getRelevanceFile());
if (num > 0 && StringUtils.isEmpty(dto.getItemsNum()) && StringUtils.isEmpty(dto.getItemsName())) { if (num > 0 && StringUtils.isEmpty(dto.getItemsNum()) && StringUtils.isEmpty(dto.getItemsName())) {
String nowItemContent = dto.getItermsConditions(); String nowItemContent = dto.getItermsConditions();
BeanUtils.copyProperties(datas.get(num-1), dto); BeanUtils.copyProperties(datas.get(num-1), dto);
dto.setItermsConditions(nowItemContent); dto.setItermsConditions(nowItemContent);
dto.setRelevanceFile(dto.getRelevanceFileName()); // dto.setRelevanceFile(dto.getRelevanceFileName());
} }
if (StringUtils.isEmpty(dto.getItemsNum())) { if (StringUtils.isEmpty(dto.getItemsNum())) {
errorMsg += "条款号不能为空;"; errorMsg += "条款号不能为空;";
@@ -1312,82 +1308,82 @@ public class SarFileSplitItemsEOServiceImpl extends ServiceImpl<SarFileSplitItem
countError++; countError++;
} }
} }
String saveApplyCode = ""; // String saveApplyCode = "";
if (StringUtils.isNotEmpty(dto.getApplyArctic())) { // if (StringUtils.isNotEmpty(dto.getApplyArctic())) {
dto.setApplyArctic(dto.getApplyArctic().replace("，", ",")); // dto.setApplyArctic(dto.getApplyArctic().replace("，", ","));
String applys[] = dto.getApplyArctic().split(","); // String applys[] = dto.getApplyArctic().split(",");
if(applys.length>20){ // if(applys.length>20){
errorMsg += "适用车型选项不能超过20个;"; // errorMsg += "适用车型选项不能超过20个;";
countError++; // countError++;
} else if (dto.getApplyArctic().length() > 500) { // } else if (dto.getApplyArctic().length() > 500) {
errorMsg += "适用车型不能超过500个字符;"; // errorMsg += "适用车型不能超过500个字符;";
countError++; // countError++;
} else { // } else {
Set set = new HashSet(); // Set set = new HashSet();
for (int a = 0; a < applys.length; a++) { // for (int a = 0; a < applys.length; a++) {
String getDic = sysDictMapper.queryDictKeyByText("PRODUCTTYPE", applys[a]);; // String getDic = sysDictMapper.queryDictKeyByText("PRODUCTTYPE", applys[a]);;
if (getDic != null) { // if (getDic != null) {
saveApplyCode += getDic + ","; // saveApplyCode += getDic + ",";
} else { // } else {
errorMsg += "适用车型" + applys[a] + "不存在;"; // errorMsg += "适用车型" + applys[a] + "不存在;";
countError++; // countError++;
break; // break;
} // }
set.add(applys[a]); // set.add(applys[a]);
if (a==applys.length-1 && applys.length != set.size()){ // if (a==applys.length-1 && applys.length != set.size()){
errorMsg += "适用车型存在重复数据;"; // errorMsg += "适用车型存在重复数据;";
countError++; // countError++;
} // }
} // }
if (!saveApplyCode.equals("")){ // if (!saveApplyCode.equals("")){
dto.setApplyArctic(saveApplyCode.substring(0,saveApplyCode.length()-1)); // dto.setApplyArctic(saveApplyCode.substring(0,saveApplyCode.length()-1));
} // }
} // }
} // }
//关联文件 支持PDF、doc、docx文件， //关联文件 支持PDF、doc、docx文件，
if (StringUtils.isNotEmpty(dto.getRelevanceFile())) { // if (StringUtils.isNotEmpty(dto.getRelevanceFile())) {
dto.setRelevanceFile(dto.getRelevanceFile().replace("，", ",")); // dto.setRelevanceFile(dto.getRelevanceFile().replace("，", ","));
String[] filelist = dto.getRelevanceFile().split(","); // String[] filelist = dto.getRelevanceFile().split(",");
String fileidlist = ""; // String fileidlist = "";
if (filelist != null && filelist.length > 8) { // if (filelist != null && filelist.length > 8) {
errorMsg += "关联文件不能超过8个"; // errorMsg += "关联文件不能超过8个";
countError++; // countError++;
} else { // } else {
for (int ind = 0; ind < filelist.length; ind++) { // for (int ind = 0; ind < filelist.length; ind++) {
String filename = filelist[ind]; // String filename = filelist[ind];
String resultMes = ExcelUtil.validatePattern(filename); // String resultMes = ExcelUtil.validatePattern(filename);
if (StringUtils.isNotEmpty(resultMes)) { // if (StringUtils.isNotEmpty(resultMes)) {
errorMsg += "关联文件" + resultMes; // errorMsg += "关联文件" + resultMes;
countError++; // countError++;
continue; // continue;
} // }
List<File> nowfilelist = FileUnZip.readFileByFilename(filepath, filename); // List<File> nowfilelist = FileUnZip.readFileByFilename(filepath, filename);
if (nowfilelist.size() <= 0) { // if (nowfilelist.size() <= 0) {
errorMsg += "压缩包中没有关联文件" + filename + "文件;"; // errorMsg += "压缩包中没有关联文件" + filename + "文件;";
countError++; // countError++;
} else { // } else {
// 判断文件大小是否超过200M // // 判断文件大小是否超过200M
if (nowfilelist.get(0).length() > 200 * 1024 * 1024) { // if (nowfilelist.get(0).length() > 200 * 1024 * 1024) {
errorMsg += filename + "文件大小超过200M;"; // errorMsg += filename + "文件大小超过200M;";
countError++; // countError++;
continue; // continue;
} // }
OSSFile ossFile = new OSSFile(); // OSSFile ossFile = new OSSFile();
String id = UUID.randomUUID().toString().replace("-", ""); // String id = UUID.randomUUID().toString().replace("-", "");
ossFile.setId(id); // ossFile.setId(id);
ossFile.setFileName(nowfilelist.get(0).getName()); // ossFile.setFileName(nowfilelist.get(0).getName());
ossFile.setUrl(nowfilelist.get(0).getPath()); // ossFile.setUrl(nowfilelist.get(0).getPath());
boolean insertResult = ossFileService.save(ossFile); // boolean insertResult = ossFileService.save(ossFile);
if(insertResult){ // if(insertResult){
fileidlist += id + ","; // fileidlist += id + ",";
} // }
} // }
} // }
if (fileidlist != "") { // if (fileidlist != "") {
dto.setRelevanceFile(fileidlist.substring(0, fileidlist.length() - 1)); // dto.setRelevanceFile(fileidlist.substring(0, fileidlist.length() - 1));
} // }
} // }
} // }
if (countError > 0) { if (countError > 0) {
stringMessage.add(errorMsg); stringMessage.add(errorMsg);
} }