Skip to content

Z
zh-baseversion-project
Commit 53052611 authored by wanghao's avatar wanghao
Browse files
Options

1 液化石油气监管-气瓶档案导入-功能开发, 涉及到实体类解析报错问题处理.

parent a40e906b
Show whitespace changes
Inline Side-by-side
Showing with 879 additions and 745 deletions
zh-baseversion-admin/src/main/java/com/zehong/web/controller/lpgRegulation/TLpgGasBottleFilesController.java
View file @ 53052611
package com.zehong.web.controller.lpgRegulation; package com.zehong.web.controller.lpgRegulation;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize; import java.util.Map;
import com.zehong.system.domain.TLpgAirChargeFiles;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -19,6 +21,9 @@ import com.zehong.system.domain.TLpgGasBottleFiles; ...@@ -19,6 +21,9 @@ import com.zehong.system.domain.TLpgGasBottleFiles;
import com.zehong.system.service.ITLpgGasBottleFilesService; import com.zehong.system.service.ITLpgGasBottleFilesService;
import com.zehong.common.utils.poi.ExcelUtil; import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo; import com.zehong.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
/** /**
* 液化石油气-气瓶档案Controller * 液化石油气-气瓶档案Controller
...@@ -94,4 +99,33 @@ public class TLpgGasBottleFilesController extends BaseController ...@@ -94,4 +99,33 @@ public class TLpgGasBottleFilesController extends BaseController
{ {
return toAjax(tLpgGasBottleFilesService.deleteTLpgGasBottleFilesByIds(fGasBottleFilesIds)); return toAjax(tLpgGasBottleFilesService.deleteTLpgGasBottleFilesByIds(fGasBottleFilesIds));
} }
/**
* 模版下载
* @return r
*/
@GetMapping("/importTemplate")
public AjaxResult importTemplate(){
ExcelUtil<TLpgGasBottleFiles> util = new ExcelUtil<>(TLpgGasBottleFiles.class);
return util.importTemplateExcel("气瓶档案数据");
}
/**
* 文件导入
* @param file f
* @param updateSupport u
* @return r
* @throws Exception r
*/
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport, HttpServletResponse response) throws Exception
{
ExcelUtil<TLpgGasBottleFiles> util = new ExcelUtil<>(TLpgGasBottleFiles.class);
List<TLpgGasBottleFiles> XmbhList = util.importExcel(file.getInputStream());
Map<String, Object> map = tLpgGasBottleFilesService.importLpgGasBottleFilesInfo(XmbhList, updateSupport, response);
return AjaxResult.success(map);
}
} }
zh-baseversion-admin/src/main/java/com/zehong/web/controller/task/TimeTasksController.java
View file @ 53052611
...@@ -101,7 +101,7 @@ public class TimeTasksController { ...@@ -101,7 +101,7 @@ public class TimeTasksController {
List<TLpgGasBottleFiles> selectUpTime = tLpgGasBottleFilesService.selectTLpgGasBottleFilesList(new TLpgGasBottleFiles()); List<TLpgGasBottleFiles> selectUpTime = tLpgGasBottleFilesService.selectTLpgGasBottleFilesList(new TLpgGasBottleFiles());
String lastRowVersion = "0"; String lastRowVersion = "0";
if(selectUpTime!=null && selectUpTime.size()>0){ if(selectUpTime!=null && selectUpTime.size()>0){
lastRowVersion = selectUpTime.get(0).getfRowVersion(); lastRowVersion = selectUpTime.get(0).getRowVersion();
} }
param.put("lastUpTime",""); param.put("lastUpTime","");
param.put("state",0); param.put("state",0);
...@@ -118,86 +118,86 @@ public class TimeTasksController { ...@@ -118,86 +118,86 @@ public class TimeTasksController {
for(int i = 0; i < data.size(); i++){ for(int i = 0; i < data.size(); i++){
JSONObject jsonObject = data.getJSONObject(i); JSONObject jsonObject = data.getJSONObject(i);
TLpgGasBottleFiles tLpgGasBottleFiles = new TLpgGasBottleFiles(); TLpgGasBottleFiles tLpgGasBottleFiles = new TLpgGasBottleFiles();
tLpgGasBottleFiles.setfRegCode(jsonObject.getString("regCode")); tLpgGasBottleFiles.setRegCode(jsonObject.getString("regCode"));
tLpgGasBottleFiles.setfEquNo(jsonObject.getString("equNo")); tLpgGasBottleFiles.setEquNo(jsonObject.getString("equNo"));
tLpgGasBottleFiles.setfEquType(jsonObject.getString("equType")); tLpgGasBottleFiles.setEquType(jsonObject.getString("equType"));
tLpgGasBottleFiles.setfMedium(jsonObject.getString("medium")); tLpgGasBottleFiles.setMedium(jsonObject.getString("medium"));
tLpgGasBottleFiles.setfMakeDate(jsonObject.getDate("makeDate")); tLpgGasBottleFiles.setMakeDate(jsonObject.getDate("makeDate"));
tLpgGasBottleFiles.setfMakeInfo(jsonObject.getString("makeInfo")); tLpgGasBottleFiles.setMakeInfo(jsonObject.getString("makeInfo"));
tLpgGasBottleFiles.setfSelfId(jsonObject.getString("selfId")); tLpgGasBottleFiles.setSelfId(jsonObject.getString("selfId"));
String pressure = jsonObject.getString("pressure"); String pressure = jsonObject.getString("pressure");
if (pressure != null && !pressure.isEmpty()) { if (pressure != null && !pressure.isEmpty()) {
tLpgGasBottleFiles.setfPressure(new BigDecimal(pressure)); tLpgGasBottleFiles.setPressure(new BigDecimal(pressure));
} else { } else {
tLpgGasBottleFiles.setfPressure(new BigDecimal(0)); tLpgGasBottleFiles.setPressure(new BigDecimal(0));
} }
String volume = jsonObject.getString("volume"); String volume = jsonObject.getString("volume");
if (volume != null && !volume.isEmpty()) { if (volume != null && !volume.isEmpty()) {
tLpgGasBottleFiles.setfVolume(new BigDecimal(volume)); tLpgGasBottleFiles.setVolume(new BigDecimal(volume));
} else { } else {
tLpgGasBottleFiles.setfVolume(new BigDecimal(0)); tLpgGasBottleFiles.setVolume(new BigDecimal(0));
} }
tLpgGasBottleFiles.setfAppId(jsonObject.getString("appId")); tLpgGasBottleFiles.setAppId(jsonObject.getString("appId"));
tLpgGasBottleFiles.setfQRcode(jsonObject.getString("qRcode")); tLpgGasBottleFiles.setqRcode(jsonObject.getString("qRcode"));
tLpgGasBottleFiles.setfBuildUser(jsonObject.getString("buildUser")); tLpgGasBottleFiles.setBuildUser(jsonObject.getString("buildUser"));
tLpgGasBottleFiles.setfAddTime(jsonObject.getDate("addtime")); tLpgGasBottleFiles.setAddTime(jsonObject.getDate("addtime"));
tLpgGasBottleFiles.setfOptName(jsonObject.getString("optName")); tLpgGasBottleFiles.setOptName(jsonObject.getString("optName"));
tLpgGasBottleFiles.setfUpTime(jsonObject.getDate("uptime")); tLpgGasBottleFiles.setUpTime(jsonObject.getDate("uptime"));
tLpgGasBottleFiles.setfState(jsonObject.getString("state")); tLpgGasBottleFiles.setState(jsonObject.getString("state"));
tLpgGasBottleFiles.setfUpOptName(jsonObject.getString("upOptName")); tLpgGasBottleFiles.setUpOptName(jsonObject.getString("upOptName"));
tLpgGasBottleFiles.setfPChkDate(jsonObject.getDate("pChkDate")); tLpgGasBottleFiles.setpChkDate(jsonObject.getDate("pChkDate"));
tLpgGasBottleFiles.setfNChkDate(jsonObject.getDate("nChkDate")); tLpgGasBottleFiles.setnChkDate(jsonObject.getDate("nChkDate"));
tLpgGasBottleFiles.setfProductDate(jsonObject.getDate("productDate")); tLpgGasBottleFiles.setProductDate(jsonObject.getDate("productDate"));
tLpgGasBottleFiles.setfDiscardDate(jsonObject.getDate("discardDate")); tLpgGasBottleFiles.setDiscardDate(jsonObject.getDate("discardDate"));
tLpgGasBottleFiles.setfSafeJudgeDate(jsonObject.getDate("safeJudgeDate")); tLpgGasBottleFiles.setSafeJudgeDate(jsonObject.getDate("safeJudgeDate"));
String gpressure = jsonObject.getString("gpressure"); String gpressure = jsonObject.getString("gpressure");
if (gpressure != null && !gpressure.isEmpty()) { if (gpressure != null && !gpressure.isEmpty()) {
tLpgGasBottleFiles.setfGPressure(new BigDecimal(gpressure)); tLpgGasBottleFiles.setgPressure(new BigDecimal(gpressure));
} else { } else {
tLpgGasBottleFiles.setfGPressure(new BigDecimal(0)); tLpgGasBottleFiles.setgPressure(new BigDecimal(0));
} }
String wpressure = jsonObject.getString("wpressure"); String wpressure = jsonObject.getString("wpressure");
if (wpressure != null && !wpressure.isEmpty()) { if (wpressure != null && !wpressure.isEmpty()) {
tLpgGasBottleFiles.setfWPressure(new BigDecimal(wpressure)); tLpgGasBottleFiles.setwPressure(new BigDecimal(wpressure));
} else { } else {
tLpgGasBottleFiles.setfWPressure(new BigDecimal(0)); tLpgGasBottleFiles.setwPressure(new BigDecimal(0));
} }
String selfWeight = jsonObject.getString("selfWeight"); String selfWeight = jsonObject.getString("selfWeight");
if (selfWeight != null && !selfWeight.isEmpty()) { if (selfWeight != null && !selfWeight.isEmpty()) {
tLpgGasBottleFiles.setfSelfWeight(new BigDecimal(selfWeight)); tLpgGasBottleFiles.setSelfWeight(new BigDecimal(selfWeight));
} else { } else {
tLpgGasBottleFiles.setfSelfWeight(new BigDecimal(0)); tLpgGasBottleFiles.setSelfWeight(new BigDecimal(0));
} }
String thickness = jsonObject.getString("thickness"); String thickness = jsonObject.getString("thickness");
if (thickness != null && !thickness.isEmpty()) { if (thickness != null && !thickness.isEmpty()) {
tLpgGasBottleFiles.setfThickness(new BigDecimal(thickness)); tLpgGasBottleFiles.setThickness(new BigDecimal(thickness));
} else { } else {
tLpgGasBottleFiles.setfThickness(new BigDecimal(0)); tLpgGasBottleFiles.setThickness(new BigDecimal(0));
} }
tLpgGasBottleFiles.setfPermitNo(jsonObject.getString("permitNo")); tLpgGasBottleFiles.setPermitNo(jsonObject.getString("permitNo"));
tLpgGasBottleFiles.setfValveName(jsonObject.getString("valveTypeName")); tLpgGasBottleFiles.setValveName(jsonObject.getString("valveTypeName"));
tLpgGasBottleFiles.setfPayImage(jsonObject.getString("payImage")); tLpgGasBottleFiles.setPayImage(jsonObject.getString("payImage"));
tLpgGasBottleFiles.setfBatchImage(jsonObject.getString("batchImage")); tLpgGasBottleFiles.setBatchImage(jsonObject.getString("batchImage"));
tLpgGasBottleFiles.setfDeviceImage(jsonObject.getString("deviceImage")); tLpgGasBottleFiles.setDeviceImage(jsonObject.getString("deviceImage"));
tLpgGasBottleFiles.setfCheckImage(jsonObject.getString("checkImage")); tLpgGasBottleFiles.setCheckImage(jsonObject.getString("checkImage"));
tLpgGasBottleFiles.setfEquNoImage(jsonObject.getString("equNoImage")); tLpgGasBottleFiles.setEquNoImage(jsonObject.getString("equNoImage"));
tLpgGasBottleFiles.setfSelfIdImage(jsonObject.getString("selfIdImage")); tLpgGasBottleFiles.setSelfIdImage(jsonObject.getString("selfIdImage"));
tLpgGasBottleFiles.setfBotImage(jsonObject.getString("botImage")); tLpgGasBottleFiles.setBotImage(jsonObject.getString("botImage"));
tLpgGasBottleFiles.setfBotSpecName(jsonObject.getString("botSpecName")); tLpgGasBottleFiles.setBatchImage(jsonObject.getString("botSpecName"));
tLpgGasBottleFiles.setfBottleType(jsonObject.getString("bottleType")); tLpgGasBottleFiles.setBottleType(jsonObject.getString("bottleType"));
String inspectedTimes = jsonObject.getString("inspectedTimes"); String inspectedTimes = jsonObject.getString("inspectedTimes");
if (inspectedTimes != null && !inspectedTimes.isEmpty()) { if (inspectedTimes != null && !inspectedTimes.isEmpty()) {
tLpgGasBottleFiles.setfInspectedTimes(Long.valueOf(inspectedTimes)); tLpgGasBottleFiles.setInspectedTimes(Long.valueOf(inspectedTimes));
} else { } else {
tLpgGasBottleFiles.setfInspectedTimes(0L); tLpgGasBottleFiles.setInspectedTimes(0L);
} }
tLpgGasBottleFiles.setfIsSpecialized(jsonObject.getString("isSpecialized")); tLpgGasBottleFiles.setIsSpecialized(jsonObject.getString("isSpecialized"));
tLpgGasBottleFiles.setfValveManuFacturer(jsonObject.getString("valveManufacturer")); tLpgGasBottleFiles.setValveManuFacturer(jsonObject.getString("valveManufacturer"));
tLpgGasBottleFiles.setfInspectionLabel(jsonObject.getString("inspectionLabel")); tLpgGasBottleFiles.setInspectionLabel(jsonObject.getString("inspectionLabel"));
tLpgGasBottleFiles.setfThirdPartyLabel(jsonObject.getString("thirdPartyLabel")); tLpgGasBottleFiles.setThirdPartyLabel(jsonObject.getString("thirdPartyLabel"));
tLpgGasBottleFiles.setfHoleCode(jsonObject.getString("holeCode")); tLpgGasBottleFiles.setHoleCode(jsonObject.getString("holeCode"));
tLpgGasBottleFiles.setfBottleStorageType(jsonObject.getString("bottleStorageType")); tLpgGasBottleFiles.setBottleStorageType(jsonObject.getString("bottleStorageType"));
tLpgGasBottleFiles.setfRowVersion(jsonObject.getString("rowVersion")); tLpgGasBottleFiles.setRowVersion(jsonObject.getString("rowVersion"));
tLpgGasBottleFilesService.insertTLpgGasBottleFiles(tLpgGasBottleFiles); tLpgGasBottleFilesService.insertTLpgGasBottleFiles(tLpgGasBottleFiles);
} }
if(data.size()==100){ if(data.size()==100){
......
zh-baseversion-system/src/main/java/com/zehong/system/domain/TLpgGasBottleFiles.java
View file @ 53052611
...@@ -19,652 +19,605 @@ public class TLpgGasBottleFiles extends BaseEntity ...@@ -19,652 +19,605 @@ public class TLpgGasBottleFiles extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** id */ /** id */
private Long fGasBottleFilesId; private Long gasBottleFilesId;
/** 生产(制造单位) */ /** 生产(制造单位) */
@Excel(name = "生产(制造单位) ", width = 30 ) @Excel(name = "生产(制造单位) ", width = 30 )
private String fMakeInfo; private String makeInfo;
/** 气瓶条码 */ /** 气瓶条码 */
@Excel(name = "气瓶条码", width = 30 ) @Excel(name = "气瓶条码", width = 30 )
private String fQRcode; private String qRcode;
/** 登记证号 */ /** 登记证号 */
@Excel(name = "登记证号", width = 30 ) @Excel(name = "登记证号", width = 30 )
private String fRegCode; private String regCode;
/** 产品编号 */ /** 产品编号 */
@Excel(name = "产品编号", width = 30 ) @Excel(name = "产品编号", width = 30 )
private String fEquNo; private String equNo;
/** 设备类型 */ /** 设备类型 */
@Excel(name = "设备类型", width = 30 ) @Excel(name = "设备类型", width = 30 )
private String fEquType; private String equType;
/** 充装介质 */ /** 充装介质 */
@Excel(name = "充装介质", width = 30 ) @Excel(name = "充装介质", width = 30 )
private String fMedium; private String medium;
/** 生产日期 */ /** 生产日期 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date fMakeDate; private Date makeDate;
/** 单位内编号 */ /** 单位内编号 */
@Excel(name = "单位内编号", width = 30 ) @Excel(name = "单位内编号", width = 30 )
private String fSelfId; private String selfId;
/** 压力 */ /** 压力 */
@Excel(name = "压力", width = 30 ) @Excel(name = "压力", width = 30 )
private BigDecimal fPressure; private BigDecimal pressure;
/** 体积 */ /** 体积 */
private BigDecimal fVolume; private BigDecimal volume;
/** 电子标签 */ /** 电子标签 */
private String fAppId; private String appId;
/** 使用单位 */ /** 使用单位 */
@Excel(name = "使用单位", width = 30 ) @Excel(name = "使用单位", width = 30 )
private String fBuildUser; private String buildUser;
/** 录入日期 */ /** 录入日期 */
private Date fAddTime; private Date addTime;
/** 录入人姓名 */ /** 录入人姓名 */
private String fOptName; private String optName;
/** 更新日期 */ /** 更新日期 */
private Date fUpTime; private Date upTime;
/** 状态1 新增、2 修改、-1、删除 （默认1） 3.注销 */ /** 状态1 新增、2 修改、-1、删除 （默认1） 3.注销 */
@Excel(name = "气瓶状态 ", readConverterExp = "1=新增,2=修改,-1=删除") @Excel(name = "气瓶状态 ", readConverterExp = "1=新增,2=修改,-1=删除")
private String fState; private String state;
/** 修改人姓名 */ /** 修改人姓名 */
private String fUpOptName; private String upOptName;
/** 上检日期 */ /** 上检日期 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "上检日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "上检日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date fPChkDate; private Date pChkDate;
/** 下检日期 */ /** 下检日期 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "下检日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "下检日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date fNChkDate; private Date nChkDate;
/** 生产日期 */ /** 生产日期 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date fProductDate; private Date productDate;
/** 报废日期 */ /** 报废日期 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "报废日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "报废日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date fDiscardDate; private Date discardDate;
/** 安全评定日期 */ /** 安全评定日期 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "安全评定日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "安全评定日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date fSafeJudgeDate; private Date safeJudgeDate;
/** 公称压力Mpa */ /** 公称压力Mpa */
@Excel(name = "公称压力/Mpa") @Excel(name = "公称压力/Mpa")
private BigDecimal fGPressure; private BigDecimal gPressure;
/** 水试验压力Mpa */ /** 水试验压力Mpa */
@Excel(name = "水试验压力/Mpa") @Excel(name = "水试验压力/Mpa")
private BigDecimal fWPressure; private BigDecimal wPressure;
/** 标准重量KG */ /** 标准重量KG */
@Excel(name = "标准重量/KG") @Excel(name = "标准重量/KG")
private BigDecimal fSelfWeight; private BigDecimal selfWeight;
/** 壁厚mm */ /** 壁厚mm */
@Excel(name = "壁厚/mm") @Excel(name = "壁厚/mm")
private BigDecimal fThickness; private BigDecimal thickness;
/** 气瓶许可证号 */ /** 气瓶许可证号 */
@Excel(name = "气瓶许可证号") @Excel(name = "气瓶许可证号")
private String fPermitNo; private String permitNo;
/** 阀类型名称 */ /** 阀类型名称 */
@Excel(name = "阀类型名称") @Excel(name = "阀类型名称")
private String fValveName; private String valveName;
/** 钢瓶交付文件照片 */ /** 钢瓶交付文件照片 */
@Excel(name = "钢瓶交付文件照片") //@Excel(name = "钢瓶交付文件照片")
private String fPayImage; private String payImage;
/** 检验质量证明书照片 */ /** 检验质量证明书照片 */
@Excel(name = "检验质量证明书照片") //@Excel(name = "检验质量证明书照片")
private String fBatchImage; private String batchImage;
/** 制造监督检验证书照片 */ /** 制造监督检验证书照片 */
@Excel(name = "制造监督检验证书照片") //@Excel(name = "制造监督检验证书照片")
private String fDeviceImage; private String deviceImage;
/** 检验报告照片 */ /** 检验报告照片 */
@Excel(name = "检验报告照片") //@Excel(name = "检验报告照片")
private String fCheckImage; private String checkImage;
/** 产品编号照片 */ /** 产品编号照片 */
@Excel(name = "产品编号照片") //@Excel(name = "产品编号照片")
private String fEquNoImage; private String equNoImage;
/** 单位内编号照片 */ /** 单位内编号照片 */
@Excel(name = "单位内编号照片") //@Excel(name = "单位内编号照片")
private String fSelfIdImage; private String selfIdImage;
/** 钢瓶信息照片 */ /** 钢瓶信息照片 */
@Excel(name = "钢瓶信息照片") //@Excel(name = "钢瓶信息照片")
private String fBotImage; private String botImage;
/** 钢瓶规格名称 */ /** 钢瓶规格名称 */
@Excel(name = "钢瓶规格名称") @Excel(name = "钢瓶规格名称")
private String fBotSpecName; private String botSpecName;
/** 钢瓶型号 */ /** 钢瓶型号 */
@Excel(name = "钢瓶型号") @Excel(name = "钢瓶型号")
private String fBottleType; private String bottleType;
/** 已检验次数 */ /** 已检验次数 */
@Excel(name = "已检验次数") @Excel(name = "已检验次数")
private Long fInspectedTimes; private Long inspectedTimes;
/** 是否专用(1:专用 2：托管) */ /** 是否专用(1:专用 2：托管) */
@Excel(name = "是否专用") @Excel(name = "是否专用")
private String fIsSpecialized; private String isSpecialized;
/** 阀厂家 */ /** 阀厂家 */
@Excel(name = "阀厂家") @Excel(name = "阀厂家")
private String fValveManuFacturer; private String valveManuFacturer;
/** 检验标牌(有/无) */ /** 检验标牌(有/无) */
@Excel(name = "检验标牌") @Excel(name = "检验标牌")
private String fInspectionLabel; private String inspectionLabel;
/** 第三方标签 */ /** 第三方标签 */
@Excel(name = "第三方标签") @Excel(name = "第三方标签")
private String fThirdPartyLabel; private String thirdPartyLabel;
/** 孔洞码 */ /** 孔洞码 */
@Excel(name = "孔洞码") @Excel(name = "孔洞码")
private String fHoleCode; private String holeCode;
/** 存储类型(气相/液相) */ /** 存储类型(气相/液相) */
@Excel(name = "存储类型") @Excel(name = "存储类型")
private String fBottleStorageType; private String bottleStorageType;
private String fRowVersion; private String rowVersion;
public String getfRowVersion() { public Long getGasBottleFilesId() {
return fRowVersion; return gasBottleFilesId;
} }
public void setfRowVersion(String fRowVersion) { public void setGasBottleFilesId(Long gasBottleFilesId) {
this.fRowVersion = fRowVersion; this.gasBottleFilesId = gasBottleFilesId;
} }
public String getfValveName() { public String getMakeInfo() {
return fValveName; return makeInfo;
} }
public void setfValveName(String fValveName) { public void setMakeInfo(String makeInfo) {
this.fValveName = fValveName; this.makeInfo = makeInfo;
} }
public String getfState() { public String getqRcode() {
return fState; return qRcode;
} }
public void setfState(String fState) { public void setqRcode(String qRcode) {
this.fState = fState; this.qRcode = qRcode;
} }
public String getfBuildUser() { public String getRegCode() {
return fBuildUser; return regCode;
} }
public void setfBuildUser(String fBuildUser) { public void setRegCode(String regCode) {
this.fBuildUser = fBuildUser; this.regCode = regCode;
} }
public void setfGasBottleFilesId(Long fGasBottleFilesId) public String getEquNo() {
{ return equNo;
this.fGasBottleFilesId = fGasBottleFilesId;
} }
public Long getfGasBottleFilesId() public void setEquNo(String equNo) {
{ this.equNo = equNo;
return fGasBottleFilesId;
} }
public void setfRegCode(String fRegCode) { public String getEquType() {
this.fRegCode = fRegCode; return equType;
} }
public String getfRegCode() public void setEquType(String equType) {
{ this.equType = equType;
return fRegCode;
} }
public void setfEquNo(String fEquNo) public String getMedium() {
{ return medium;
this.fEquNo = fEquNo;
} }
public String getfEquNo() public void setMedium(String medium) {
{ this.medium = medium;
return fEquNo;
} }
public Date getMakeDate() {
public void setfEquType(String fEquType) return makeDate;
{
this.fEquType = fEquType;
} }
public String getfEquType() public void setMakeDate(Date makeDate) {
{ this.makeDate = makeDate;
return fEquType;
} }
public void setfMedium(String fMedium) public String getSelfId() {
{ return selfId;
this.fMedium = fMedium;
} }
public String getfMedium() public void setSelfId(String selfId) {
{ this.selfId = selfId;
return fMedium;
} }
public void setfMakeDate(Date fMakeDate)
{ public BigDecimal getPressure() {
this.fMakeDate = fMakeDate; return pressure;
} }
public Date getfMakeDate() public void setPressure(BigDecimal pressure) {
{ this.pressure = pressure;
return fMakeDate;
} }
public void setfMakeInfo(String fMakeInfo)
{ public BigDecimal getVolume() {
this.fMakeInfo = fMakeInfo; return volume;
} }
public String getfMakeInfo() public void setVolume(BigDecimal volume) {
{ this.volume = volume;
return fMakeInfo;
} }
public void setfSelfId(String fSelfId)
{ public String getAppId() {
this.fSelfId = fSelfId; return appId;
} }
public String getfSelfId() public void setAppId(String appId) {
{ this.appId = appId;
return fSelfId;
} }
public void setfPressure(BigDecimal fPressure)
{ public String getBuildUser() {
this.fPressure = fPressure; return buildUser;
} }
public BigDecimal getfPressure() public void setBuildUser(String buildUser) {
{ this.buildUser = buildUser;
return fPressure;
} }
public void setfVolume(BigDecimal fVolume)
{ public Date getAddTime() {
this.fVolume = fVolume; return addTime;
} }
public BigDecimal getfVolume() public void setAddTime(Date addTime) {
{ this.addTime = addTime;
return fVolume;
} }
public void setfAppId(String fAppId) public String getOptName() {
{ return optName;
this.fAppId = fAppId;
} }
public String getfAppId() public void setOptName(String optName) {
{ this.optName = optName;
return fAppId;
} }
public void setfQRcode(String fQRcode)
{ public Date getUpTime() {
this.fQRcode = fQRcode; return upTime;
} }
public String getfQRcode() public void setUpTime(Date upTime) {
{ this.upTime = upTime;
return fQRcode;
} }
public void setfPChkDate(Date fPChkDate) public String getState() {
{ return state;
this.fPChkDate = fPChkDate;
} }
public Date getfPChkDate() public void setState(String state) {
{ this.state = state;
return fPChkDate;
} }
public void setfNChkDate(Date fNChkDate)
{ public String getUpOptName() {
this.fNChkDate = fNChkDate; return upOptName;
} }
public Date getfNChkDate() public void setUpOptName(String upOptName) {
{ this.upOptName = upOptName;
return fNChkDate;
} }
public void setfProductDate(Date fProductDate)
{ public Date getpChkDate() {
this.fProductDate = fProductDate; return pChkDate;
} }
public Date getfProductDate() public void setpChkDate(Date pChkDate) {
{ this.pChkDate = pChkDate;
return fProductDate;
} }
public void setfDiscardDate(Date fDiscardDate)
{ public Date getnChkDate() {
this.fDiscardDate = fDiscardDate; return nChkDate;
} }
public Date getfDiscardDate() public void setnChkDate(Date nChkDate) {
{ this.nChkDate = nChkDate;
return fDiscardDate;
} }
public void setfSafeJudgeDate(Date fSafeJudgeDate)
{ public Date getProductDate() {
this.fSafeJudgeDate = fSafeJudgeDate; return productDate;
} }
public Date getfSafeJudgeDate() public void setProductDate(Date productDate) {
{ this.productDate = productDate;
return fSafeJudgeDate;
} }
public void setfGPressure(BigDecimal fGPressure)
{ public Date getDiscardDate() {
this.fGPressure = fGPressure; return discardDate;
} }
public BigDecimal getfGPressure() public void setDiscardDate(Date discardDate) {
{ this.discardDate = discardDate;
return fGPressure;
} }
public void setfWPressure(BigDecimal fWPressure)
{ public Date getSafeJudgeDate() {
this.fWPressure = fWPressure; return safeJudgeDate;
} }
public BigDecimal getfWPressure() public void setSafeJudgeDate(Date safeJudgeDate) {
{ this.safeJudgeDate = safeJudgeDate;
return fWPressure;
} }
public void setfSelfWeight(BigDecimal fSelfWeight)
{ public BigDecimal getgPressure() {
this.fSelfWeight = fSelfWeight; return gPressure;
} }
public BigDecimal getfSelfWeight() public void setgPressure(BigDecimal gPressure) {
{ this.gPressure = gPressure;
return fSelfWeight;
} }
public void setfThickness(BigDecimal fThickness)
{ public BigDecimal getwPressure() {
this.fThickness = fThickness; return wPressure;
} }
public BigDecimal getfThickness() public void setwPressure(BigDecimal wPressure) {
{ this.wPressure = wPressure;
return fThickness;
} }
public void setfPermitNo(String fPermitNo)
{ public BigDecimal getSelfWeight() {
this.fPermitNo = fPermitNo; return selfWeight;
} }
public String getfPermitNo() public void setSelfWeight(BigDecimal selfWeight) {
{ this.selfWeight = selfWeight;
return fPermitNo;
} }
public void setfPayImage(String fPayImage) public BigDecimal getThickness() {
{ return thickness;
this.fPayImage = fPayImage;
} }
public String getfPayImage() public void setThickness(BigDecimal thickness) {
{ this.thickness = thickness;
return fPayImage;
} }
public void setfBatchImage(String fBatchImage)
{ public String getPermitNo() {
this.fBatchImage = fBatchImage; return permitNo;
} }
public String getfBatchImage() public void setPermitNo(String permitNo) {
{ this.permitNo = permitNo;
return fBatchImage;
} }
public void setfDeviceImage(String fDeviceImage)
{ public String getValveName() {
this.fDeviceImage = fDeviceImage; return valveName;
} }
public String getfDeviceImage() public void setValveName(String valveName) {
{ this.valveName = valveName;
return fDeviceImage;
} }
public void setfCheckImage(String fCheckImage)
{ public String getPayImage() {
this.fCheckImage = fCheckImage; return payImage;
} }
public String getfCheckImage() public void setPayImage(String payImage) {
{ this.payImage = payImage;
return fCheckImage;
} }
public void setfEquNoImage(String fEquNoImage)
{ public String getBatchImage() {
this.fEquNoImage = fEquNoImage; return batchImage;
} }
public String getfEquNoImage() public void setBatchImage(String batchImage) {
{ this.batchImage = batchImage;
return fEquNoImage;
} }
public void setfSelfIdImage(String fSelfIdImage)
{ public String getDeviceImage() {
this.fSelfIdImage = fSelfIdImage; return deviceImage;
} }
public String getfSelfIdImage() public void setDeviceImage(String deviceImage) {
{ this.deviceImage = deviceImage;
return fSelfIdImage;
} }
public void setfBotImage(String fBotImage)
{ public String getCheckImage() {
this.fBotImage = fBotImage; return checkImage;
} }
public String getfBotImage() public void setCheckImage(String checkImage) {
{ this.checkImage = checkImage;
return fBotImage;
} }
public void setfBotSpecName(String fBotSpecName) public String getEquNoImage() {
{ return equNoImage;
this.fBotSpecName = fBotSpecName;
} }
public String getfBotSpecName() public void setEquNoImage(String equNoImage) {
{ this.equNoImage = equNoImage;
return fBotSpecName;
} }
public void setfBottleType(String fBottleType)
{ public String getSelfIdImage() {
this.fBottleType = fBottleType; return selfIdImage;
} }
public String getfBottleType() public void setSelfIdImage(String selfIdImage) {
{ this.selfIdImage = selfIdImage;
return fBottleType;
} }
public void setfInspectedTimes(Long fInspectedTimes)
{ public String getBotImage() {
this.fInspectedTimes = fInspectedTimes; return botImage;
} }
public Long getfInspectedTimes() public void setBotImage(String botImage) {
{ this.botImage = botImage;
return fInspectedTimes;
} }
public void setfIsSpecialized(String fIsSpecialized)
{ public String getBotSpecName() {
this.fIsSpecialized = fIsSpecialized; return botSpecName;
} }
public String getfIsSpecialized() public void setBotSpecName(String botSpecName) {
{ this.botSpecName = botSpecName;
return fIsSpecialized;
} }
public void setfValveManuFacturer(String fValveManuFacturer)
{ public String getBottleType() {
this.fValveManuFacturer = fValveManuFacturer; return bottleType;
} }
public String getfValveManuFacturer() public void setBottleType(String bottleType) {
{ this.bottleType = bottleType;
return fValveManuFacturer;
} }
public void setfInspectionLabel(String fInspectionLabel)
{ public Long getInspectedTimes() {
this.fInspectionLabel = fInspectionLabel; return inspectedTimes;
} }
public String getfInspectionLabel() public void setInspectedTimes(Long inspectedTimes) {
{ this.inspectedTimes = inspectedTimes;
return fInspectionLabel;
} }
public void setfThirdPartyLabel(String fThirdPartyLabel)
{ public String getIsSpecialized() {
this.fThirdPartyLabel = fThirdPartyLabel; return isSpecialized;
} }
public String getfThirdPartyLabel() public void setIsSpecialized(String isSpecialized) {
{ this.isSpecialized = isSpecialized;
return fThirdPartyLabel;
} }
public void setfHoleCode(String fHoleCode)
{ public String getValveManuFacturer() {
this.fHoleCode = fHoleCode; return valveManuFacturer;
} }
public String getfHoleCode() public void setValveManuFacturer(String valveManuFacturer) {
{ this.valveManuFacturer = valveManuFacturer;
return fHoleCode;
} }
public void setfBottleStorageType(String fBottleStorageType)
{ public String getInspectionLabel() {
this.fBottleStorageType = fBottleStorageType; return inspectionLabel;
} }
public String getfBottleStorageType() public void setInspectionLabel(String inspectionLabel) {
{ this.inspectionLabel = inspectionLabel;
return fBottleStorageType;
} }
public void setfOptName(String fOptName) public String getThirdPartyLabel() {
{ return thirdPartyLabel;
this.fOptName = fOptName;
} }
public String getfOptName() public void setThirdPartyLabel(String thirdPartyLabel) {
{ this.thirdPartyLabel = thirdPartyLabel;
return fOptName;
} }
public void setfAddTime(Date fAddTime)
{ public String getHoleCode() {
this.fAddTime = fAddTime; return holeCode;
} }
public Date getfAddTime() public void setHoleCode(String holeCode) {
{ this.holeCode = holeCode;
return fAddTime;
} }
public void setfUpTime(Date fUpTime)
{ public String getBottleStorageType() {
this.fUpTime = fUpTime; return bottleStorageType;
} }
public Date getfUpTime() public void setBottleStorageType(String bottleStorageType) {
{ this.bottleStorageType = bottleStorageType;
return fUpTime;
} }
public void setfUpOptName(String fUpOptName) public String getRowVersion() {
{ return rowVersion;
this.fUpOptName = fUpOptName;
} }
public String getfUpOptName() public void setRowVersion(String rowVersion) {
{ this.rowVersion = rowVersion;
return fUpOptName;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return "TLpgGasBottleFiles{" +
.append("fGasBottleFilesId", getfGasBottleFilesId()) "gasBottleFilesId=" + gasBottleFilesId +
.append("fRegCode", getfRegCode()) ", makeInfo='" + makeInfo + '\'' +
.append("fEquNo", getfEquNo()) ", qRcode='" + qRcode + '\'' +
.append("fEquType", getfEquType()) ", regCode='" + regCode + '\'' +
.append("fMedium", getfMedium()) ", equNo='" + equNo + '\'' +
.append("fMakeDate", getfMakeDate()) ", equType='" + equType + '\'' +
.append("fMakeInfo", getfMakeInfo()) ", medium='" + medium + '\'' +
.append("fSelfId", getfSelfId()) ", makeDate=" + makeDate +
.append("fPressure", getfPressure()) ", selfId='" + selfId + '\'' +
.append("fVolume", getfVolume()) ", pressure=" + pressure +
.append("fPChkDate", getfPChkDate()) ", volume=" + volume +
.append("fNChkDate", getfNChkDate()) ", appId='" + appId + '\'' +
.append("fProductDate", getfProductDate()) ", buildUser='" + buildUser + '\'' +
.append("fDiscardDate", getfDiscardDate()) ", addTime=" + addTime +
.append("fSafeJudgeDate", getfSafeJudgeDate()) ", optName='" + optName + '\'' +
.append("fGPressure", getfGPressure()) ", upTime=" + upTime +
.append("fWPressure", getfWPressure()) ", state='" + state + '\'' +
.append("fSelfWeight", getfSelfWeight()) ", upOptName='" + upOptName + '\'' +
.append("fThickness", getfThickness()) ", pChkDate=" + pChkDate +
.append("fPermitNo", getfPermitNo()) ", nChkDate=" + nChkDate +
.append("fPayImage", getfPayImage()) ", productDate=" + productDate +
.append("fBatchImage", getfBatchImage()) ", discardDate=" + discardDate +
.append("fDeviceImage", getfDeviceImage()) ", safeJudgeDate=" + safeJudgeDate +
.append("fCheckImage", getfCheckImage()) ", gPressure=" + gPressure +
.append("fEquNoImage", getfEquNoImage()) ", wPressure=" + wPressure +
.append("fSelfIdImage", getfSelfIdImage()) ", selfWeight=" + selfWeight +
.append("fBotImage", getfBotImage()) ", thickness=" + thickness +
.append("fBotSpecName", getfBotSpecName()) ", permitNo='" + permitNo + '\'' +
.append("fBottleType", getfBottleType()) ", valveName='" + valveName + '\'' +
.append("fInspectedTimes", getfInspectedTimes()) ", payImage='" + payImage + '\'' +
.append("fIsSpecialized", getfIsSpecialized()) ", batchImage='" + batchImage + '\'' +
.append("fValveManuFacturer", getfValveManuFacturer()) ", deviceImage='" + deviceImage + '\'' +
.append("fInspectionLabel", getfInspectionLabel()) ", checkImage='" + checkImage + '\'' +
.append("fThirdPartyLabel", getfThirdPartyLabel()) ", equNoImage='" + equNoImage + '\'' +
.append("fHoleCode", getfHoleCode()) ", selfIdImage='" + selfIdImage + '\'' +
.append("fBottleStorageType", getfBottleStorageType()) ", botImage='" + botImage + '\'' +
.append("fOptName", getfOptName()) ", botSpecName='" + botSpecName + '\'' +
.append("fAddTime", getfAddTime()) ", bottleType='" + bottleType + '\'' +
.append("fUpTime", getfUpTime()) ", inspectedTimes=" + inspectedTimes +
.append("fUpOptName", getfUpOptName()) ", isSpecialized='" + isSpecialized + '\'' +
.toString(); ", valveManuFacturer='" + valveManuFacturer + '\'' +
", inspectionLabel='" + inspectionLabel + '\'' +
", thirdPartyLabel='" + thirdPartyLabel + '\'' +
", holeCode='" + holeCode + '\'' +
", bottleStorageType='" + bottleStorageType + '\'' +
", rowVersion='" + rowVersion + '\'' +
'}';
} }
} }
zh-baseversion-system/src/main/java/com/zehong/system/service/ITLpgGasBottleFilesService.java
View file @ 53052611
package com.zehong.system.service; package com.zehong.system.service;
import java.util.List; import java.util.List;
import java.util.Map;
import com.zehong.system.domain.TLpgGasBottleFiles; import com.zehong.system.domain.TLpgGasBottleFiles;
import javax.servlet.http.HttpServletResponse;
/** /**
* 液化石油气-气瓶档案Service接口 * 液化石油气-气瓶档案Service接口
* *
...@@ -58,4 +62,14 @@ public interface ITLpgGasBottleFilesService ...@@ -58,4 +62,14 @@ public interface ITLpgGasBottleFilesService
* @return 结果 * @return 结果
*/ */
public int deleteTLpgGasBottleFilesById(Long fGasBottleFilesId); public int deleteTLpgGasBottleFilesById(Long fGasBottleFilesId);
/**
* 导入
* @param xmbhList data
* @param updateSupport 是否更新
* @param response res
* @return r
*/
public Map<String,Object> importLpgGasBottleFilesInfo(List<TLpgGasBottleFiles> xmbhList, boolean updateSupport, HttpServletResponse response);
} }
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TLpgAirChargeFilesServiceImpl.java
View file @ 53052611
...@@ -152,7 +152,7 @@ public class TLpgAirChargeFilesServiceImpl implements ITLpgAirChargeFilesService ...@@ -152,7 +152,7 @@ public class TLpgAirChargeFilesServiceImpl implements ITLpgAirChargeFilesService
// 这是 上面气瓶条码 有的气瓶数据 // 这是 上面气瓶条码 有的气瓶数据
List<TLpgGasBottleFiles> tLpgGasBottleFiles2 = tLpgGasBottleFilesMapper.queryAllByFQRcodeList(collect); List<TLpgGasBottleFiles> tLpgGasBottleFiles2 = tLpgGasBottleFilesMapper.queryAllByFQRcodeList(collect);
// 按照 气瓶条码 分组 // 按照 气瓶条码 分组
Map<String, List<TLpgGasBottleFiles>> collect1 = tLpgGasBottleFiles2.stream().collect(Collectors.groupingBy(TLpgGasBottleFiles::getfQRcode)); Map<String, List<TLpgGasBottleFiles>> collect1 = tLpgGasBottleFiles2.stream().collect(Collectors.groupingBy(TLpgGasBottleFiles::getqRcode));
errorNum += noBarCodeList.size(); errorNum += noBarCodeList.size();
......
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TLpgDeliveryRecordServiceImpl.java
View file @ 53052611
...@@ -98,13 +98,13 @@ public class TLpgDeliveryRecordServiceImpl implements ITLpgDeliveryRecordService ...@@ -98,13 +98,13 @@ public class TLpgDeliveryRecordServiceImpl implements ITLpgDeliveryRecordService
// 气瓶条码处理 // 气瓶条码处理
TLpgGasBottleFiles tLpgGasBottleFiles = new TLpgGasBottleFiles(); TLpgGasBottleFiles tLpgGasBottleFiles = new TLpgGasBottleFiles();
tLpgGasBottleFiles.setfQRcode(tLpgDeliveryRecordImportVo.getBottleCode()); tLpgGasBottleFiles.setqRcode(tLpgDeliveryRecordImportVo.getBottleCode());
List<TLpgGasBottleFiles> tLpgGasBottleFiles1 = tLpgGasBottleFilesMapper.selectTLpgGasBottleFilesList(tLpgGasBottleFiles); List<TLpgGasBottleFiles> tLpgGasBottleFiles1 = tLpgGasBottleFilesMapper.selectTLpgGasBottleFilesList(tLpgGasBottleFiles);
if (tLpgGasBottleFiles1 == null || tLpgGasBottleFiles1.size() == 0) { if (tLpgGasBottleFiles1 == null || tLpgGasBottleFiles1.size() == 0) {
errorNum ++; errorNum ++;
continue; continue;
} }
lpgDeliveryRecord.setBottleCode(tLpgGasBottleFiles1.get(0).getfQRcode()); lpgDeliveryRecord.setBottleCode(tLpgGasBottleFiles1.get(0).getqRcode());
// 燃气用户处理 // 燃气用户处理
......
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TLpgGasBottleFilesServiceImpl.java
View file @ 53052611
package com.zehong.system.service.impl; package com.zehong.system.service.impl;
import java.util.List; import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TLpgGasBottleFilesMapper; import com.zehong.system.mapper.TLpgGasBottleFilesMapper;
import com.zehong.system.domain.TLpgGasBottleFiles; import com.zehong.system.domain.TLpgGasBottleFiles;
import com.zehong.system.service.ITLpgGasBottleFilesService; import com.zehong.system.service.ITLpgGasBottleFilesService;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
/** /**
* 液化石油气-气瓶档案Service业务层处理 * 液化石油气-气瓶档案Service业务层处理
* *
...@@ -16,7 +21,7 @@ import com.zehong.system.service.ITLpgGasBottleFilesService; ...@@ -16,7 +21,7 @@ import com.zehong.system.service.ITLpgGasBottleFilesService;
@Service @Service
public class TLpgGasBottleFilesServiceImpl implements ITLpgGasBottleFilesService public class TLpgGasBottleFilesServiceImpl implements ITLpgGasBottleFilesService
{ {
@Autowired @Resource
private TLpgGasBottleFilesMapper tLpgGasBottleFilesMapper; private TLpgGasBottleFilesMapper tLpgGasBottleFilesMapper;
/** /**
...@@ -90,4 +95,21 @@ public class TLpgGasBottleFilesServiceImpl implements ITLpgGasBottleFilesService ...@@ -90,4 +95,21 @@ public class TLpgGasBottleFilesServiceImpl implements ITLpgGasBottleFilesService
{ {
return tLpgGasBottleFilesMapper.deleteTLpgGasBottleFilesById(fGasBottleFilesId); return tLpgGasBottleFilesMapper.deleteTLpgGasBottleFilesById(fGasBottleFilesId);
} }
/**
* 气瓶档案导入
* @param xmbhList data
* @param updateSupport 是否更新
* @param response res
* @return r
*/
@Override
public Map<String, Object> importLpgGasBottleFilesInfo(List<TLpgGasBottleFiles> xmbhList, boolean updateSupport, HttpServletResponse response) {
for (TLpgGasBottleFiles tLpgGasBottleFiles : xmbhList) {
System.out.println(tLpgGasBottleFiles.getqRcode());
}
return null;
}
} }
zh-baseversion-system/src/main/resources/mapper/system/TLpgGasBottleFilesMapper.xml
View file @ 53052611
...@@ -5,52 +5,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -5,52 +5,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.zehong.system.mapper.TLpgGasBottleFilesMapper"> <mapper namespace="com.zehong.system.mapper.TLpgGasBottleFilesMapper">
<resultMap type="TLpgGasBottleFiles" id="TLpgGasBottleFilesResult"> <resultMap type="TLpgGasBottleFiles" id="TLpgGasBottleFilesResult">
<result property="fGasBottleFilesId" column="f_gas_bottle_files_id" /> <result property="gasBottleFilesId" column="f_gas_bottle_files_id" />
<result property="fRegCode" column="f_reg_code" /> <result property="regCode" column="f_reg_code" />
<result property="fEquNo" column="f_equ_no" /> <result property="equNo" column="f_equ_no" />
<result property="fEquType" column="f_equ_type" /> <result property="equType" column="f_equ_type" />
<result property="fMedium" column="f_medium" /> <result property="medium" column="f_medium" />
<result property="fMakeDate" column="f_make_date" /> <result property="makeDate" column="f_make_date" />
<result property="fMakeInfo" column="f_make_info" /> <result property="makeInfo" column="f_make_info" />
<result property="fSelfId" column="f_self_id" /> <result property="selfId" column="f_self_id" />
<result property="fPressure" column="f_pressure" /> <result property="pressure" column="f_pressure" />
<result property="fVolume" column="f_volume" /> <result property="volume" column="f_volume" />
<result property="fAppId" column="f_app_id" /> <result property="appId" column="f_app_id" />
<result property="fQRcode" column="f_q_rcode" /> <result property="qRcode" column="f_q_rcode" />
<result property="fBuildUser" column="f_build_user" /> <result property="buildUser" column="f_build_user" />
<result property="fOptName" column="f_opt_name" /> <result property="optName" column="f_opt_name" />
<result property="fAddTime" column="f_add_time" /> <result property="addTime" column="f_add_time" />
<result property="fUpTime" column="f_up_time" /> <result property="upTime" column="f_up_time" />
<result property="fState" column="f_state" /> <result property="state" column="f_state" />
<result property="fUpOptName" column="f_up_opt_name" /> <result property="upOptName" column="f_up_opt_name" />
<result property="fPChkDate" column="f_p_chk_date" /> <result property="pChkDate" column="f_p_chk_date" />
<result property="fNChkDate" column="f_n_chk_date" /> <result property="nChkDate" column="f_n_chk_date" />
<result property="fProductDate" column="f_product_date" /> <result property="productDate" column="f_product_date" />
<result property="fDiscardDate" column="f_discard_date" /> <result property="discardDate" column="f_discard_date" />
<result property="fSafeJudgeDate" column="f_safe_judge_date" /> <result property="safeJudgeDate" column="f_safe_judge_date" />
<result property="fGPressure" column="f_g_pressure" /> <result property="gPressure" column="f_g_pressure" />
<result property="fWPressure" column="f_w_pressure" /> <result property="wPressure" column="f_w_pressure" />
<result property="fSelfWeight" column="f_self_weight" /> <result property="selfWeight" column="f_self_weight" />
<result property="fThickness" column="f_thickness" /> <result property="thickness" column="f_thickness" />
<result property="fPermitNo" column="f_permit_no" /> <result property="permitNo" column="f_permit_no" />
<result property="fValveName" column="f_valve_name" /> <result property="valveName" column="f_valve_name" />
<result property="fPayImage" column="f_pay_image" /> <result property="payImage" column="f_pay_image" />
<result property="fBatchImage" column="f_batch_image" /> <result property="batchImage" column="f_batch_image" />
<result property="fDeviceImage" column="f_device_image" /> <result property="deviceImage" column="f_device_image" />
<result property="fCheckImage" column="f_check_image" /> <result property="checkImage" column="f_check_image" />
<result property="fEquNoImage" column="f_equ_no_image" /> <result property="equNoImage" column="f_equ_no_image" />
<result property="fSelfIdImage" column="f_self_id_image" /> <result property="selfIdImage" column="f_self_id_image" />
<result property="fBotImage" column="f_bot_image" /> <result property="botImage" column="f_bot_image" />
<result property="fBotSpecName" column="f_bot_spec_name" /> <result property="botSpecName" column="f_bot_spec_name" />
<result property="fBottleType" column="f_bottle_type" /> <result property="bottleType" column="f_bottle_type" />
<result property="fInspectedTimes" column="f_inspected_times" /> <result property="inspectedTimes" column="f_inspected_times" />
<result property="fIsSpecialized" column="f_is_specialized" /> <result property="isSpecialized" column="f_is_specialized" />
<result property="fValveManuFacturer" column="f_valve_manu_facturer" /> <result property="valveManuFacturer" column="f_valve_manu_facturer" />
<result property="fInspectionLabel" column="f_inspection_label" /> <result property="inspectionLabel" column="f_inspection_label" />
<result property="fThirdPartyLabel" column="f_third_party_label" /> <result property="thirdPartyLabel" column="f_third_party_label" />
<result property="fHoleCode" column="f_hole_code" /> <result property="holeCode" column="f_hole_code" />
<result property="fBottleStorageType" column="f_bottle_storage_type" /> <result property="bottleStorageType" column="f_bottle_storage_type" />
<result property="fRowVersion" column="f_row_version" /> <result property="rowVersion" column="f_row_version" />
</resultMap> </resultMap>
<sql id="selectTLpgGasBottleFilesVo"> <sql id="selectTLpgGasBottleFilesVo">
...@@ -64,18 +64,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -64,18 +64,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTLpgGasBottleFilesList" parameterType="TLpgGasBottleFiles" resultMap="TLpgGasBottleFilesResult"> <select id="selectTLpgGasBottleFilesList" parameterType="TLpgGasBottleFiles" resultMap="TLpgGasBottleFilesResult">
<include refid="selectTLpgGasBottleFilesVo"/> <include refid="selectTLpgGasBottleFilesVo"/>
<where> <where>
<if test="fPChkDate != null "> and f_p_chk_date = #{fPChkDate}</if> <if test="pChkDate != null "> and f_p_chk_date = #{pChkDate}</if>
<if test="fNChkDate != null "> and f_n_chk_date = #{fNChkDate}</if> <if test="nChkDate != null "> and f_n_chk_date = #{nChkDate}</if>
<if test="fProductDate != null "> and f_product_date = #{fProductDate}</if> <if test="productDate != null "> and f_product_date = #{productDate}</if>
<if test="fDiscardDate != null "> and f_discard_date = #{fDiscardDate}</if> <if test="discardDate != null "> and f_discard_date = #{discardDate}</if>
<if test="fSafeJudgeDate != null "> and f_safe_judge_date = #{fSafeJudgeDate}</if> <if test="safeJudgeDate != null "> and f_safe_judge_date = #{safeJudgeDate}</if>
<if test="fGPressure != null "> and f_g_pressure = #{fGPressure}</if> <if test="gPressure != null "> and f_g_pressure = #{gPressure}</if>
<if test="fWPressure != null "> and f_w_pressure = #{fWPressure}</if> <if test="wPressure != null "> and f_w_pressure = #{wPressure}</if>
<if test="fSelfWeight != null "> and f_self_weight = #{fSelfWeight}</if> <if test="selfWeight != null "> and f_self_weight = #{selfWeight}</if>
<if test="fPermitNo != null and fPermitNo != ''"> and f_permit_no = #{fPermitNo}</if> <if test="permitNo != null and fPermitNo != ''"> and f_permit_no = #{permitNo}</if>
<if test="fValveName != null "> and f_valve_name like concat('%', #{fValveName}, '%')</if> <if test="valveName != null "> and f_valve_name like concat('%', #{valveName}, '%')</if>
<if test="fQRcode != null and fQRcode != ''"> and f_q_rcode like concat('%', #{fQRcode}, '%')</if> <if test="qRcode != null and fQRcode != ''"> and f_q_rcode like concat('%', #{qRcode}, '%')</if>
<if test="fState != null "> and f_state = #{fState}</if> <if test="state != null "> and f_state = #{state}</if>
</where> </where>
</select> </select>
<select id="queryAllByFQRcodeList" resultMap="TLpgGasBottleFilesResult"> <select id="queryAllByFQRcodeList" resultMap="TLpgGasBottleFilesResult">
...@@ -94,153 +94,153 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -94,153 +94,153 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertTLpgGasBottleFiles" parameterType="TLpgGasBottleFiles" useGeneratedKeys="true" keyProperty="fGasBottleFilesId"> <insert id="insertTLpgGasBottleFiles" parameterType="TLpgGasBottleFiles" useGeneratedKeys="true" keyProperty="fGasBottleFilesId">
insert into t_lpg_gas_bottle_files insert into t_lpg_gas_bottle_files
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fRegCode != null">f_reg_code,</if> <if test="regCode != null">f_reg_code,</if>
<if test="fEquNo != null">f_equ_no,</if> <if test="equNo != null">f_equ_no,</if>
<if test="fEquType != null">f_equ_type,</if> <if test="equType != null">f_equ_type,</if>
<if test="fMedium != null">f_medium,</if> <if test="medium != null">f_medium,</if>
<if test="fMakeDate != null">f_make_date,</if> <if test="makeDate != null">f_make_date,</if>
<if test="fMakeInfo != null">f_make_info,</if> <if test="makeInfo != null">f_make_info,</if>
<if test="fSelfId != null">f_self_id,</if> <if test="selfId != null">f_self_id,</if>
<if test="fPressure != null">f_pressure,</if> <if test="pressure != null">f_pressure,</if>
<if test="fVolume != null">f_volume,</if> <if test="volume != null">f_volume,</if>
<if test="fAppId != null">f_app_id,</if> <if test="appId != null">f_app_id,</if>
<if test="fQRcode != null">f_q_rcode,</if> <if test="qRcode != null">f_q_rcode,</if>
<if test="fBuildUser != null">f_build_user,</if> <if test="buildUser != null">f_build_user,</if>
<if test="fPChkDate != null">f_p_chk_date,</if> <if test="pChkDate != null">f_p_chk_date,</if>
<if test="fNChkDate != null">f_n_chk_date,</if> <if test="nChkDate != null">f_n_chk_date,</if>
<if test="fProductDate != null">f_product_date,</if> <if test="productDate != null">f_product_date,</if>
<if test="fDiscardDate != null">f_discard_date,</if> <if test="discardDate != null">f_discard_date,</if>
<if test="fSafeJudgeDate != null">f_safe_judge_date,</if> <if test="safeJudgeDate != null">f_safe_judge_date,</if>
<if test="fGPressure != null">f_g_pressure,</if> <if test="gPressure != null">f_g_pressure,</if>
<if test="fWPressure != null">f_w_pressure,</if> <if test="wPressure != null">f_w_pressure,</if>
<if test="fSelfWeight != null">f_self_weight,</if> <if test="selfWeight != null">f_self_weight,</if>
<if test="fThickness != null">f_thickness,</if> <if test="thickness != null">f_thickness,</if>
<if test="fPermitNo != null">f_permit_no,</if> <if test="permitNo != null">f_permit_no,</if>
<if test="fValveName != null">f_valve_name,</if> <if test="valveName != null">f_valve_name,</if>
<if test="fPayImage != null">f_pay_image,</if> <if test="payImage != null">f_pay_image,</if>
<if test="fBatchImage != null">f_batch_image,</if> <if test="batchImage != null">f_batch_image,</if>
<if test="fDeviceImage != null">f_device_image,</if> <if test="deviceImage != null">f_device_image,</if>
<if test="fCheckImage != null">f_check_image,</if> <if test="checkImage != null">f_check_image,</if>
<if test="fEquNoImage != null">f_equ_no_image,</if> <if test="equNoImage != null">f_equ_no_image,</if>
<if test="fSelfIdImage != null">f_self_id_image,</if> <if test="selfIdImage != null">f_self_id_image,</if>
<if test="fBotImage != null">f_bot_image,</if> <if test="botImage != null">f_bot_image,</if>
<if test="fBotSpecName != null">f_bot_spec_name,</if> <if test="botSpecName != null">f_bot_spec_name,</if>
<if test="fBottleType != null">f_bottle_type,</if> <if test="bottleType != null">f_bottle_type,</if>
<if test="fInspectedTimes != null">f_inspected_times,</if> <if test="inspectedTimes != null">f_inspected_times,</if>
<if test="fIsSpecialized != null">f_is_specialized,</if> <if test="isSpecialized != null">f_is_specialized,</if>
<if test="fValveManuFacturer != null">f_valve_manu_facturer,</if> <if test="valveManuFacturer != null">f_valve_manu_facturer,</if>
<if test="fInspectionLabel != null">f_inspection_label,</if> <if test="inspectionLabel != null">f_inspection_label,</if>
<if test="fThirdPartyLabel != null">f_third_party_label,</if> <if test="thirdPartyLabel != null">f_third_party_label,</if>
<if test="fHoleCode != null">f_hole_code,</if> <if test="holeCode != null">f_hole_code,</if>
<if test="fBottleStorageType != null">f_bottle_storage_type,</if> <if test="bottleStorageType != null">f_bottle_storage_type,</if>
<if test="fState != null">f_state,</if> <if test="state != null">f_state,</if>
<if test="fOptName != null">f_opt_name,</if> <if test="optName != null">f_opt_name,</if>
<if test="fAddTime != null">f_add_time,</if> <if test="addTime != null">f_add_time,</if>
<if test="fUpTime != null">f_up_time,</if> <if test="upTime != null">f_up_time,</if>
<if test="fUpOptName != null">f_up_opt_name,</if> <if test="upOptName != null">f_up_opt_name,</if>
<if test="fRowVersion != null">f_row_version,</if> <if test="rowVersion != null">f_row_version,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fRegCode != null">#{fRegCode},</if> <if test="regCode != null">#{regCode},</if>
<if test="fEquNo != null">#{fEquNo},</if> <if test="equNo != null">#{equNo},</if>
<if test="fEquType != null">#{fEquType},</if> <if test="equType != null">#{equType},</if>
<if test="fMedium != null">#{fMedium},</if> <if test="medium != null">#{medium},</if>
<if test="fMakeDate != null">#{fMakeDate},</if> <if test="makeDate != null">#{makeDate},</if>
<if test="fMakeInfo != null">#{fMakeInfo},</if> <if test="makeInfo != null">#{makeInfo},</if>
<if test="fSelfId != null">#{fSelfId},</if> <if test="selfId != null">#{selfId},</if>
<if test="fPressure != null">#{fPressure},</if> <if test="pressure != null">#{pressure},</if>
<if test="fVolume != null">#{fVolume},</if> <if test="volume != null">#{volume},</if>
<if test="fAppId != null">#{fAppId},</if> <if test="appId != null">#{appId},</if>
<if test="fQRcode != null">#{fQRcode},</if> <if test="qRcode != null">#{qRcode},</if>
<if test="fBuildUser != null">#{fBuildUser},</if> <if test="buildUser != null">#{buildUser},</if>
<if test="fPChkDate != null">#{fPChkDate},</if> <if test="pChkDate != null">#{pChkDate},</if>
<if test="fNChkDate != null">#{fNChkDate},</if> <if test="nChkDate != null">#{nChkDate},</if>
<if test="fProductDate != null">#{fProductDate},</if> <if test="productDate != null">#{productDate},</if>
<if test="fDiscardDate != null">#{fDiscardDate},</if> <if test="discardDate != null">#{discardDate},</if>
<if test="fSafeJudgeDate != null">#{fSafeJudgeDate},</if> <if test="safeJudgeDate != null">#{safeJudgeDate},</if>
<if test="fGPressure != null">#{fGPressure},</if> <if test="gPressure != null">#{gPressure},</if>
<if test="fWPressure != null">#{fWPressure},</if> <if test="wPressure != null">#{wPressure},</if>
<if test="fSelfWeight != null">#{fSelfWeight},</if> <if test="selfWeight != null">#{selfWeight},</if>
<if test="fThickness != null">#{fThickness},</if> <if test="fThickness != null">#{fThickness},</if>
<if test="fPermitNo != null">#{fPermitNo},</if> <if test="permitNo != null">#{permitNo},</if>
<if test="fValveName != null">#{fValveName},</if> <if test="valveName != null">#{valveName},</if>
<if test="fPayImage != null">#{fPayImage},</if> <if test="payImage != null">#{payImage},</if>
<if test="fBatchImage != null">#{fBatchImage},</if> <if test="batchImage != null">#{batchImage},</if>
<if test="fDeviceImage != null">#{fDeviceImage},</if> <if test="deviceImage != null">#{deviceImage},</if>
<if test="fCheckImage != null">#{fCheckImage},</if> <if test="checkImage != null">#{checkImage},</if>
<if test="fEquNoImage != null">#{fEquNoImage},</if> <if test="equNoImage != null">#{equNoImage},</if>
<if test="fSelfIdImage != null">#{fSelfIdImage},</if> <if test="selfIdImage != null">#{selfIdImage},</if>
<if test="fBotImage != null">#{fBotImage},</if> <if test="botImage != null">#{botImage},</if>
<if test="fBotSpecName != null">#{fBotSpecName},</if> <if test="botSpecName != null">#{botSpecName},</if>
<if test="fBottleType != null">#{fBottleType},</if> <if test="bottleType != null">#{bottleType},</if>
<if test="fInspectedTimes != null">#{fInspectedTimes},</if> <if test="inspectedTimes != null">#{inspectedTimes},</if>
<if test="fIsSpecialized != null">#{fIsSpecialized},</if> <if test="isSpecialized != null">#{isSpecialized},</if>
<if test="fValveManuFacturer != null">#{fValveManuFacturer},</if> <if test="valveManuFacturer != null">#{valveManuFacturer},</if>
<if test="fInspectionLabel != null">#{fInspectionLabel},</if> <if test="inspectionLabel != null">#{inspectionLabel},</if>
<if test="fThirdPartyLabel != null">#{fThirdPartyLabel},</if> <if test="thirdPartyLabel != null">#{thirdPartyLabel},</if>
<if test="fHoleCode != null">#{fHoleCode},</if> <if test="holeCode != null">#{holeCode},</if>
<if test="fBottleStorageType != null">#{fBottleStorageType},</if> <if test="bottleStorageType != null">#{bottleStorageType},</if>
<if test="fState != null">#{fState},</if> <if test="state != null">#{state},</if>
<if test="fOptName != null">#{fOptName},</if> <if test="optName != null">#{optName},</if>
<if test="fAddTime != null">#{fAddTime},</if> <if test="addTime != null">#{addTime},</if>
<if test="fUpTime != null">#{fUpTime},</if> <if test="upTime != null">#{upTime},</if>
<if test="fUpOptName != null">#{fUpOptName},</if> <if test="upOptName != null">#{upOptName},</if>
<if test="fRowVersion != null">#{fRowVersion},</if> <if test="rowVersion != null">#{rowVersion},</if>
</trim> </trim>
</insert> </insert>
<update id="updateTLpgGasBottleFiles" parameterType="TLpgGasBottleFiles"> <update id="updateTLpgGasBottleFiles" parameterType="TLpgGasBottleFiles">
update t_lpg_gas_bottle_files update t_lpg_gas_bottle_files
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="fRegCode != null">f_reg_code = #{fRegCode},</if> <if test="regCode != null">f_reg_code = #{regCode},</if>
<if test="fEquNo != null">f_equ_no = #{fEquNo},</if> <if test="equNo != null">f_equ_no = #{equNo},</if>
<if test="fEquType != null">f_equ_type = #{fEquType},</if> <if test="equType != null">f_equ_type = #{equType},</if>
<if test="fMedium != null">f_medium = #{fMedium},</if> <if test="medium != null">f_medium = #{medium},</if>
<if test="fMakeDate != null">f_make_date = #{fMakeDate},</if> <if test="makeDate != null">f_make_date = #{makeDate},</if>
<if test="fMakeInfo != null">f_make_info = #{fMakeInfo},</if> <if test="makeInfo != null">f_make_info = #{makeInfo},</if>
<if test="fSelfId != null">f_self_id = #{fSelfId},</if> <if test="selfId != null">f_self_id = #{selfId},</if>
<if test="fPressure != null">f_pressure = #{fPressure},</if> <if test="pressure != null">f_pressure = #{pressure},</if>
<if test="fVolume != null">f_volume = #{fVolume},</if> <if test="volume != null">f_volume = #{volume},</if>
<if test="fAppId != null">f_app_id = #{fAppId},</if> <if test="appId != null">f_app_id = #{appId},</if>
<if test="fQRcode != null">f_q_rcode = #{fQRcode},</if> <if test="qRcode != null">f_q_rcode = #{qRcode},</if>
<if test="fBuildUser != null">f_build_user = #{fBuildUser},</if> <if test="buildUser != null">f_build_user = #{buildUser},</if>
<if test="fPChkDate != null">f_p_chk_date = #{fPChkDate},</if> <if test="pChkDate != null">f_p_chk_date = #{pChkDate},</if>
<if test="fNChkDate != null">f_n_chk_date = #{fNChkDate},</if> <if test="nChkDate != null">f_n_chk_date = #{nChkDate},</if>
<if test="fProductDate != null">f_product_date = #{fProductDate},</if> <if test="productDate != null">f_product_date = #{productDate},</if>
<if test="fDiscardDate != null">f_discard_date = #{fDiscardDate},</if> <if test="discardDate != null">f_discard_date = #{discardDate},</if>
<if test="fSafeJudgeDate != null">f_safe_judge_date = #{fSafeJudgeDate},</if> <if test="safeJudgeDate != null">f_safe_judge_date = #{safeJudgeDate},</if>
<if test="fGPressure != null">f_g_pressure = #{fGPressure},</if> <if test="gPressure != null">f_g_pressure = #{gPressure},</if>
<if test="fWPressure != null">f_w_pressure = #{fWPressure},</if> <if test="wPressure != null">f_w_pressure = #{wPressure},</if>
<if test="fSelfWeight != null">f_self_weight = #{fSelfWeight},</if> <if test="selfWeight != null">f_self_weight = #{selfWeight},</if>
<if test="fThickness != null">f_thickness = #{fThickness},</if> <if test="thickness != null">f_thickness = #{thickness},</if>
<if test="fPermitNo != null">f_permit_no = #{fPermitNo},</if> <if test="permitNo != null">f_permit_no = #{permitNo},</if>
<if test="fValveName != null">f_valve_name = #{fValveName},</if> <if test="valveName != null">f_valve_name = #{valveName},</if>
<if test="fPayImage != null">f_pay_image = #{fPayImage},</if> <if test="payImage != null">f_pay_image = #{payImage},</if>
<if test="fBatchImage != null">f_batch_image = #{fBatchImage},</if> <if test="batchImage != null">f_batch_image = #{batchImage},</if>
<if test="fDeviceImage != null">f_device_image = #{fDeviceImage},</if> <if test="deviceImage != null">f_device_image = #{deviceImage},</if>
<if test="fCheckImage != null">f_check_image = #{fCheckImage},</if> <if test="checkImage != null">f_check_image = #{checkImage},</if>
<if test="fEquNoImage != null">f_equ_no_image = #{fEquNoImage},</if> <if test="equNoImage != null">f_equ_no_image = #{equNoImage},</if>
<if test="fSelfIdImage != null">f_self_id_image = #{fSelfIdImage},</if> <if test="selfIdImage != null">f_self_id_image = #{selfIdImage},</if>
<if test="fBotImage != null">f_bot_image = #{fBotImage},</if> <if test="botImage != null">f_bot_image = #{botImage},</if>
<if test="fBotSpecName != null">f_bot_spec_name = #{fBotSpecName},</if> <if test="botSpecName != null">f_bot_spec_name = #{botSpecName},</if>
<if test="fBottleType != null">f_bottle_type = #{fBottleType},</if> <if test="bottleType != null">f_bottle_type = #{bottleType},</if>
<if test="fInspectedTimes != null">f_inspected_times = #{fInspectedTimes},</if> <if test="inspectedTimes != null">f_inspected_times = #{inspectedTimes},</if>
<if test="fIsSpecialized != null">f_is_specialized = #{fIsSpecialized},</if> <if test="isSpecialized != null">f_is_specialized = #{isSpecialized},</if>
<if test="fValveManuFacturer != null">f_valve_manu_facturer = #{fValveManuFacturer},</if> <if test="valveManuFacturer != null">f_valve_manu_facturer = #{valveManuFacturer},</if>
<if test="fInspectionLabel != null">f_inspection_label = #{fInspectionLabel},</if> <if test="inspectionLabel != null">f_inspection_label = #{inspectionLabel},</if>
<if test="fThirdPartyLabel != null">f_third_party_label = #{fThirdPartyLabel},</if> <if test="thirdPartyLabel != null">f_third_party_label = #{thirdPartyLabel},</if>
<if test="fHoleCode != null">f_hole_code = #{fHoleCode},</if> <if test="holeCode != null">f_hole_code = #{holeCode},</if>
<if test="fBottleStorageType != null">f_bottle_storage_type = #{fBottleStorageType},</if> <if test="bottleStorageType != null">f_bottle_storage_type = #{bottleStorageType},</if>
<if test="fState != null">f_state = #{fState},</if> <if test="state != null">f_state = #{state},</if>
<if test="fOptName != null">f_opt_name = #{fOptName},</if> <if test="optName != null">f_opt_name = #{optName},</if>
<if test="fAddTime != null">f_add_time = #{fAddTime},</if> <if test="addTime != null">f_add_time = #{addTime},</if>
<if test="fUpTime != null">f_up_time = #{fUpTime},</if> <if test="upTime != null">f_up_time = #{upTime},</if>
<if test="fUpOptName != null">f_up_opt_name = #{fUpOptName},</if> <if test="upOptName != null">f_up_opt_name = #{upOptName},</if>
<if test="fRowVersion != null">f_row_version = #{fRowVersion},</if> <if test="rowVersion != null">f_row_version = #{rowVersion},</if>
</trim> </trim>
where f_gas_bottle_files_id = #{fGasBottleFilesId} where f_gas_bottle_files_id = #{fGasBottleFilesId}
</update> </update>
......
zh-baseversion-web/src/api/lpgRegulation/files.js
View file @ 53052611
...@@ -51,3 +51,12 @@ export function exportFiles(query) { ...@@ -51,3 +51,12 @@ export function exportFiles(query) {
params: query params: query
}) })
} }
// 下载用户导入模板
export function importTemplate() {
return request({
url: '/lpg/gasbottlefiles/importTemplate',
method: 'get'
})
}
\ No newline at end of file
zh-baseversion-web/src/views/lpgRegulation/gasbottlefiles/index.vue
View file @ 53052611
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
<el-form-item label="生产(制造)单位" prop="fMakeInfo"> <el-form-item label="生产(制造)单位" prop="makeInfo">
<el-input <el-input
v-model="queryParams.fMakeInfo" v-model="queryParams.makeInfo"
placeholder="请输入生产(制造)单位" placeholder="请输入生产(制造)单位"
clearable clearable
size="small" size="small"
/> />
</el-form-item> </el-form-item>
<el-form-item label="气瓶条码" prop="fQRcode"> <el-form-item label="气瓶条码" prop="qRcode">
<el-input <el-input
v-model="queryParams.fQRcode" v-model="queryParams.qRcode"
placeholder="请输入气瓶条码" placeholder="请输入气瓶条码"
clearable clearable
size="small" size="small"
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
</el-form-item> </el-form-item>
<el-form-item label="钢瓶状态" prop="fState"> <el-form-item label="钢瓶状态" prop="fState">
<el-select v-model="queryParams.fState" placeholder="请选择钢瓶状态" clearable> <el-select v-model="queryParams.state" placeholder="请选择钢瓶状态" clearable>
<el-option <el-option
v-for="item in fStateOptions" v-for="item in stateOptions"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
...@@ -46,43 +46,54 @@ ...@@ -46,43 +46,54 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['system:files:export']" v-hasPermi="['system:files:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="info"
icon="el-icon-upload2"
size="mini"
@click="handleImport">导入</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="filesList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="filesList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="生产(制造)单位" align="center" prop="fMakeInfo" :show-overflow-tooltip="true"/> <el-table-column label="生产(制造)单位" align="center" prop="makeInfo" :show-overflow-tooltip="true"/>
<el-table-column label="气瓶条码" align="center" prop="fQRcode" :show-overflow-tooltip="true"/> <el-table-column label="气瓶条码" align="center" prop="qRcode" :show-overflow-tooltip="true"/>
<el-table-column label="钢瓶规格名称" align="center" prop="fBotSpecName" :show-overflow-tooltip="true"/> <el-table-column label="钢瓶规格名称" align="center" prop="botSpecName" :show-overflow-tooltip="true"/>
<el-table-column label="钢瓶型号" align="center" prop="fBottleType" :show-overflow-tooltip="true"/> <el-table-column label="钢瓶型号" align="center" prop="bottleType" :show-overflow-tooltip="true"/>
<el-table-column label="上检日期" align="center" prop="fPChkDate"> <el-table-column label="上检日期" align="center" prop="pChkDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.fPChkDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.pChkDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="下检日期" align="center" prop="fNChkDate"> <el-table-column label="下检日期" align="center" prop="nChkDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.fNChkDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.nChkDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产日期" align="center" prop="fProductDate"> <el-table-column label="生产日期" align="center" prop="productDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.fProductDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报废日期" align="center" prop="fDiscardDate"> <el-table-column label="报废日期" align="center" prop="discardDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.fDiscardDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.discardDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="安全评定日期" align="center" prop="fSafeJudgeDate"> <el-table-column label="安全评定日期" align="center" prop="safeJudgeDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.fSafeJudgeDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.safeJudgeDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="已检验次数" align="center" prop="fInspectedTimes"/> <el-table-column label="已检验次数" align="center" prop="inspectedTimes"/>
<el-table-column label="钢瓶状态" align="center" prop="fState"/> <el-table-column label="钢瓶状态" align="center" prop="state"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -104,13 +115,45 @@ ...@@ -104,13 +115,45 @@
/> />
<!-- 详情 --> <!-- 详情 -->
<DetailInfo ref="detail"/> <DetailInfo ref="detail"/>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
<br>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listFiles, getFiles, delFiles, addFiles, updateFiles, exportFiles } from "@/api/lpgRegulation/files"; import { listFiles, getFiles, delFiles, addFiles, updateFiles, exportFiles,importTemplate } from "@/api/lpgRegulation/files";
import ImageUpload from '@/components/ImageUpload'; import ImageUpload from '@/components/ImageUpload';
import DetailInfo from "./components/indexInfo"; import DetailInfo from "./components/indexInfo";
import { getToken } from "@/utils/auth";
export default { export default {
name: "Files", name: "Files",
...@@ -119,7 +162,23 @@ export default { ...@@ -119,7 +162,23 @@ export default {
}, },
data() { data() {
return { return {
fStateOptions:[
upload: {
// 是否显示弹出层（用户导入）
open: false,
// 弹出层标题（用户导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/lpg/gasbottlefiles/importData"
},
stateOptions:[
{ {
value: 1, value: 1,
label: '新增' label: '新增'
...@@ -157,18 +216,18 @@ export default { ...@@ -157,18 +216,18 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
fPChkDate: null, cChkDate: null,
fNChkDate: null, nChkDate: null,
fProductDate: null, productDate: null,
fDiscardDate: null, discardDate: null,
fSafeJudgeDate: null, safeJudgeDate: null,
fGPressure: null, gPressure: null,
fWPressure: null, wPressure: null,
fSelfWeight: null, selfWeight: null,
fPermitNo: null, permitNo: null,
fValveName: null, valveName: null,
fState: null, state: null,
fMakeInfo: null makeInfo: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -182,13 +241,54 @@ export default { ...@@ -182,13 +241,54 @@ export default {
}, },
methods: { methods: {
/** 下载模板操作 */
importTemplate() {
importTemplate().then(response => {
this.download(response.msg);
});
},
handleImport(){
this.upload.title = "气瓶档案导入"; // todo
this.upload.open = true;
},
// 文件上传处理中
handleFileUploadProgress(event,file,fileList) {
this.upload.isUploading = true;
this.$showLoading.show();
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
if (response.data != null) {
if (response.data.errorMsg != null && response.data.errorMsg !== "") {
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.data.errorMsg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
}else{
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + "成功：" + response.data.successNum + "条，失败：" + response.data.errorNum + "条" + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
}
} else {
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
}
this.getList();
this.$showLoading.hide();
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
},
// 是否下发 0-不下发 1 - 下发字典翻译 // 是否下发 0-不下发 1 - 下发字典翻译
fStateFormat(row, column ) { fStateFormat(row, column ) {
if (row.fState === 1) { if (row.state === 1) {
return "新增" return "新增"
} else if(row.fState === 2) { } else if(row.state === 2) {
return "修改" return "修改"
} else if(row.fState === -1) { } else if(row.state === -1) {
return "删除" return "删除"
} }
}, },
...@@ -210,97 +310,97 @@ export default { ...@@ -210,97 +310,97 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
fGasBottleFilesId: null, gasBottleFilesId: null,
fStationId: null, stationId: null,
fRegId: null, regId: null,
fRegCode: null, regCode: null,
fEquNo: null, equNo: null,
fEquTypeCode: null, equTypeCode: null,
fEquType: null, equType: null,
fMediumCode: null, mediumCode: null,
fMedium: null, medium: null,
fMakeDate: null, makeDate: null,
fMakeInfo: null, makeInfo: null,
fSelfId: null, selfId: null,
fNumber: null, number: null,
fAllowedFillingWeight: null, allowedFillingWeight: null,
fWayCard: null, wayCard: null,
fProvinceCode: null, provinceCode: null,
fProvinceName: null, provinceName: null,
fCityCode: null, cityCode: null,
fCityName: null, cityName: null,
fCountryCode: null, countryCode: null,
fCountryName: null, countryName: null,
fPressure: null, pressure: null,
fVolume: null, volume: null,
fVolumeUnit: null, volumeUnit: null,
fCheckId: null, checkId: null,
fCheckReportNo: null, checkReportNo: null,
fIsCard: null, isCard: null,
fDepartmentId: null, departmentId: null,
fCheckDeptCode: null, checkDeptCode: null,
fCheckDeptName: null, checkDeptName: null,
fCheckDate: null, checkDate: null,
fNextCheckDate: null, nextCheckDate: null,
fScrapId: null, scrapId: null,
fScrapDate: null, scrapDate: null,
fScrapNo: null, scrapNo: null,
fBottleStatus: "0", bottleStatus: "0",
fReportStatus: 0, reportStatus: 0,
fChangeStatus: 0, changeStatus: 0,
fStatus: "0", status: "0",
fSbCode: null, sbCode: null,
fCardRecId: null, cardRecId: null,
fAppId: null, appId: null,
fQRcode: null, qRcode: null,
fCardSendMan: null, cardSendMan: null,
fCardSendDeptCode: null, cardSendDeptCode: null,
fCardSendDeptName: null, cardSendDeptName: null,
fCardSendTime: null, cardSendTime: null,
fBuildUserId: null, buildUserId: null,
fBuildUser: null, buildUser: null,
fBak0: null, bak0: null,
fBak1: null, bak1: null,
fBak2: null, bak2: null,
fPChkDate: null, pChkDate: null,
fNChkDate: null, nChkDate: null,
fProductDate: null, productDate: null,
fDiscardDate: null, discardDate: null,
fSafeJudgeDate: null, safeJudgeDate: null,
fGPressure: null, gPressure: null,
fWPressure: null, wPressure: null,
fSelfWeight: null, selfWeight: null,
fThickness: null, thickness: null,
fPermitNo: null, permitNo: null,
fValveType: null, valveType: null,
fValveName: null, valveName: null,
fImageList: null, imageList: null,
fPayImage: null, payImage: null,
fBatchImage: null, batchImage: null,
fDeviceImage: null, deviceImage: null,
fCheckImage: null, checkImage: null,
fEquNoImage: null, equNoImage: null,
fSelfIdImage: null, selfIdImage: null,
fBotImage: null, botImage: null,
fBotSpecType: null, botSpecType: null,
fBotSpecName: null, botSpecName: null,
fBottleType: null, bottleType: null,
fInspectedTimes: null, inspectedTimes: null,
fIsSpecialized: null, isSpecialized: null,
fValveManuFacturer: null, valveManuFacturer: null,
fInspectionLabel: null, inspectionLabel: null,
fThirdPartyLabel: null, thirdPartyLabel: null,
fHoleCode: null, holeCode: null,
fBottleStorageType: null, bottleStorageType: null,
fSourceFrom: null, sourceFrom: null,
fRowVersion: null, rowVersion: null,
fState: null, state: null,
fOptId: null, optId: null,
fOptName: null, optName: null,
fAddTime: null, addTime: null,
fUpTime: null, upTime: null,
fUpOptId: null, upOptId: null,
fUpOptName: null upOptName: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -316,13 +416,13 @@ export default { ...@@ -316,13 +416,13 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.fGasBottleFilesId) this.ids = selection.map(item => item.gasBottleFilesId)
this.single = selection.length!==1 this.single = selection.length!==1
this.multiple = !selection.length this.multiple = !selection.length
}, },
//详情 //详情
handleDetail(row){ handleDetail(row){
this.$refs.detail.getDetailInfo(row.fGasBottleFilesId); this.$refs.detail.getDetailInfo(row.gasBottleFilesId);
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
...@@ -332,11 +432,13 @@ export default { ...@@ -332,11 +432,13 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(() => { }).then(() => {
this.$showLoading.show();
this.exportLoading = true; this.exportLoading = true;
return exportFiles(queryParams); return exportFiles(queryParams);
}).then(response => { }).then(response => {
this.download(response.msg); this.download(response.msg);
this.exportLoading = false; this.exportLoading = false;
this.$showLoading.hide();
}).catch(() => {}); }).catch(() => {});
} }
} }
......
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