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

zh-baseversion-admin/src/main/java/com/zehong/web/controller/lpgRegulation/TLpgGasBottleFilesController.java

 package com.zehong.web.controller.lpgRegulation;
 
 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.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +21,9 @@ import com.zehong.system.domain.TLpgGasBottleFiles;
 import com.zehong.system.service.ITLpgGasBottleFilesService;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 液化石油气-气瓶档案Controller
@@ -94,4 +99,33 @@ public class TLpgGasBottleFilesController extends BaseController
     {
         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

@@ -101,7 +101,7 @@ public class TimeTasksController {
         List<TLpgGasBottleFiles> selectUpTime = tLpgGasBottleFilesService.selectTLpgGasBottleFilesList(new TLpgGasBottleFiles());
         String lastRowVersion = "0";
         if(selectUpTime!=null && selectUpTime.size()>0){
-            lastRowVersion = selectUpTime.get(0).getfRowVersion();
+            lastRowVersion = selectUpTime.get(0).getRowVersion();
         }
         param.put("lastUpTime","");
         param.put("state",0);
@@ -118,86 +118,86 @@ public class TimeTasksController {
             for(int i = 0; i < data.size(); i++){
                 JSONObject jsonObject = data.getJSONObject(i);
                 TLpgGasBottleFiles tLpgGasBottleFiles = new TLpgGasBottleFiles();
-                tLpgGasBottleFiles.setfRegCode(jsonObject.getString("regCode"));
-                tLpgGasBottleFiles.setfEquNo(jsonObject.getString("equNo"));
-                tLpgGasBottleFiles.setfEquType(jsonObject.getString("equType"));
-                tLpgGasBottleFiles.setfMedium(jsonObject.getString("medium"));
-                tLpgGasBottleFiles.setfMakeDate(jsonObject.getDate("makeDate"));
-                tLpgGasBottleFiles.setfMakeInfo(jsonObject.getString("makeInfo"));
-                tLpgGasBottleFiles.setfSelfId(jsonObject.getString("selfId"));
+                tLpgGasBottleFiles.setRegCode(jsonObject.getString("regCode"));
+                tLpgGasBottleFiles.setEquNo(jsonObject.getString("equNo"));
+                tLpgGasBottleFiles.setEquType(jsonObject.getString("equType"));
+                tLpgGasBottleFiles.setMedium(jsonObject.getString("medium"));
+                tLpgGasBottleFiles.setMakeDate(jsonObject.getDate("makeDate"));
+                tLpgGasBottleFiles.setMakeInfo(jsonObject.getString("makeInfo"));
+                tLpgGasBottleFiles.setSelfId(jsonObject.getString("selfId"));
                 String pressure = jsonObject.getString("pressure");
                 if (pressure != null && !pressure.isEmpty()) {
-                    tLpgGasBottleFiles.setfPressure(new BigDecimal(pressure));
+                    tLpgGasBottleFiles.setPressure(new BigDecimal(pressure));
                 } else {
-                    tLpgGasBottleFiles.setfPressure(new BigDecimal(0));
+                    tLpgGasBottleFiles.setPressure(new BigDecimal(0));
                 }
                 String volume = jsonObject.getString("volume");
                 if (volume != null && !volume.isEmpty()) {
-                    tLpgGasBottleFiles.setfVolume(new BigDecimal(volume));
+                    tLpgGasBottleFiles.setVolume(new BigDecimal(volume));
                 } else {
-                    tLpgGasBottleFiles.setfVolume(new BigDecimal(0));
+                    tLpgGasBottleFiles.setVolume(new BigDecimal(0));
                 }
-                tLpgGasBottleFiles.setfAppId(jsonObject.getString("appId"));
-                tLpgGasBottleFiles.setfQRcode(jsonObject.getString("qRcode"));
-                tLpgGasBottleFiles.setfBuildUser(jsonObject.getString("buildUser"));
-                tLpgGasBottleFiles.setfAddTime(jsonObject.getDate("addtime"));
-                tLpgGasBottleFiles.setfOptName(jsonObject.getString("optName"));
-                tLpgGasBottleFiles.setfUpTime(jsonObject.getDate("uptime"));
-                tLpgGasBottleFiles.setfState(jsonObject.getString("state"));
-                tLpgGasBottleFiles.setfUpOptName(jsonObject.getString("upOptName"));
-                tLpgGasBottleFiles.setfPChkDate(jsonObject.getDate("pChkDate"));
-                tLpgGasBottleFiles.setfNChkDate(jsonObject.getDate("nChkDate"));
-                tLpgGasBottleFiles.setfProductDate(jsonObject.getDate("productDate"));
-                tLpgGasBottleFiles.setfDiscardDate(jsonObject.getDate("discardDate"));
-                tLpgGasBottleFiles.setfSafeJudgeDate(jsonObject.getDate("safeJudgeDate"));
+                tLpgGasBottleFiles.setAppId(jsonObject.getString("appId"));
+                tLpgGasBottleFiles.setqRcode(jsonObject.getString("qRcode"));
+                tLpgGasBottleFiles.setBuildUser(jsonObject.getString("buildUser"));
+                tLpgGasBottleFiles.setAddTime(jsonObject.getDate("addtime"));
+                tLpgGasBottleFiles.setOptName(jsonObject.getString("optName"));
+                tLpgGasBottleFiles.setUpTime(jsonObject.getDate("uptime"));
+                tLpgGasBottleFiles.setState(jsonObject.getString("state"));
+                tLpgGasBottleFiles.setUpOptName(jsonObject.getString("upOptName"));
+                tLpgGasBottleFiles.setpChkDate(jsonObject.getDate("pChkDate"));
+                tLpgGasBottleFiles.setnChkDate(jsonObject.getDate("nChkDate"));
+                tLpgGasBottleFiles.setProductDate(jsonObject.getDate("productDate"));
+                tLpgGasBottleFiles.setDiscardDate(jsonObject.getDate("discardDate"));
+                tLpgGasBottleFiles.setSafeJudgeDate(jsonObject.getDate("safeJudgeDate"));
                 String gpressure = jsonObject.getString("gpressure");
                 if (gpressure != null && !gpressure.isEmpty()) {
-                    tLpgGasBottleFiles.setfGPressure(new BigDecimal(gpressure));
+                    tLpgGasBottleFiles.setgPressure(new BigDecimal(gpressure));
                 } else {
-                    tLpgGasBottleFiles.setfGPressure(new BigDecimal(0));
+                    tLpgGasBottleFiles.setgPressure(new BigDecimal(0));
                 }
                 String wpressure = jsonObject.getString("wpressure");
                 if (wpressure != null && !wpressure.isEmpty()) {
-                    tLpgGasBottleFiles.setfWPressure(new BigDecimal(wpressure));
+                    tLpgGasBottleFiles.setwPressure(new BigDecimal(wpressure));
                 } else {
-                    tLpgGasBottleFiles.setfWPressure(new BigDecimal(0));
+                    tLpgGasBottleFiles.setwPressure(new BigDecimal(0));
                 }
                 String selfWeight = jsonObject.getString("selfWeight");
                 if (selfWeight != null && !selfWeight.isEmpty()) {
-                    tLpgGasBottleFiles.setfSelfWeight(new BigDecimal(selfWeight));
+                    tLpgGasBottleFiles.setSelfWeight(new BigDecimal(selfWeight));
                 } else {
-                    tLpgGasBottleFiles.setfSelfWeight(new BigDecimal(0));
+                    tLpgGasBottleFiles.setSelfWeight(new BigDecimal(0));
                 }
                 String thickness = jsonObject.getString("thickness");
                 if (thickness != null && !thickness.isEmpty()) {
-                    tLpgGasBottleFiles.setfThickness(new BigDecimal(thickness));
+                    tLpgGasBottleFiles.setThickness(new BigDecimal(thickness));
                 } else {
-                    tLpgGasBottleFiles.setfThickness(new BigDecimal(0));
+                    tLpgGasBottleFiles.setThickness(new BigDecimal(0));
                 }
-                tLpgGasBottleFiles.setfPermitNo(jsonObject.getString("permitNo"));
-                tLpgGasBottleFiles.setfValveName(jsonObject.getString("valveTypeName"));
-                tLpgGasBottleFiles.setfPayImage(jsonObject.getString("payImage"));
-                tLpgGasBottleFiles.setfBatchImage(jsonObject.getString("batchImage"));
-                tLpgGasBottleFiles.setfDeviceImage(jsonObject.getString("deviceImage"));
-                tLpgGasBottleFiles.setfCheckImage(jsonObject.getString("checkImage"));
-                tLpgGasBottleFiles.setfEquNoImage(jsonObject.getString("equNoImage"));
-                tLpgGasBottleFiles.setfSelfIdImage(jsonObject.getString("selfIdImage"));
-                tLpgGasBottleFiles.setfBotImage(jsonObject.getString("botImage"));
-                tLpgGasBottleFiles.setfBotSpecName(jsonObject.getString("botSpecName"));
-                tLpgGasBottleFiles.setfBottleType(jsonObject.getString("bottleType"));
+                tLpgGasBottleFiles.setPermitNo(jsonObject.getString("permitNo"));
+                tLpgGasBottleFiles.setValveName(jsonObject.getString("valveTypeName"));
+                tLpgGasBottleFiles.setPayImage(jsonObject.getString("payImage"));
+                tLpgGasBottleFiles.setBatchImage(jsonObject.getString("batchImage"));
+                tLpgGasBottleFiles.setDeviceImage(jsonObject.getString("deviceImage"));
+                tLpgGasBottleFiles.setCheckImage(jsonObject.getString("checkImage"));
+                tLpgGasBottleFiles.setEquNoImage(jsonObject.getString("equNoImage"));
+                tLpgGasBottleFiles.setSelfIdImage(jsonObject.getString("selfIdImage"));
+                tLpgGasBottleFiles.setBotImage(jsonObject.getString("botImage"));
+                tLpgGasBottleFiles.setBatchImage(jsonObject.getString("botSpecName"));
+                tLpgGasBottleFiles.setBottleType(jsonObject.getString("bottleType"));
                 String inspectedTimes = jsonObject.getString("inspectedTimes");
                 if (inspectedTimes != null && !inspectedTimes.isEmpty()) {
-                    tLpgGasBottleFiles.setfInspectedTimes(Long.valueOf(inspectedTimes));
+                    tLpgGasBottleFiles.setInspectedTimes(Long.valueOf(inspectedTimes));
                 } else {
-                    tLpgGasBottleFiles.setfInspectedTimes(0L);
+                    tLpgGasBottleFiles.setInspectedTimes(0L);
                 }
-                tLpgGasBottleFiles.setfIsSpecialized(jsonObject.getString("isSpecialized"));
-                tLpgGasBottleFiles.setfValveManuFacturer(jsonObject.getString("valveManufacturer"));
-                tLpgGasBottleFiles.setfInspectionLabel(jsonObject.getString("inspectionLabel"));
-                tLpgGasBottleFiles.setfThirdPartyLabel(jsonObject.getString("thirdPartyLabel"));
-                tLpgGasBottleFiles.setfHoleCode(jsonObject.getString("holeCode"));
-                tLpgGasBottleFiles.setfBottleStorageType(jsonObject.getString("bottleStorageType"));
-                tLpgGasBottleFiles.setfRowVersion(jsonObject.getString("rowVersion"));
+                tLpgGasBottleFiles.setIsSpecialized(jsonObject.getString("isSpecialized"));
+                tLpgGasBottleFiles.setValveManuFacturer(jsonObject.getString("valveManufacturer"));
+                tLpgGasBottleFiles.setInspectionLabel(jsonObject.getString("inspectionLabel"));
+                tLpgGasBottleFiles.setThirdPartyLabel(jsonObject.getString("thirdPartyLabel"));
+                tLpgGasBottleFiles.setHoleCode(jsonObject.getString("holeCode"));
+                tLpgGasBottleFiles.setBottleStorageType(jsonObject.getString("bottleStorageType"));
+                tLpgGasBottleFiles.setRowVersion(jsonObject.getString("rowVersion"));
                 tLpgGasBottleFilesService.insertTLpgGasBottleFiles(tLpgGasBottleFiles);
             }
             if(data.size()==100){

zh-baseversion-system/src/main/java/com/zehong/system/domain/TLpgGasBottleFiles.java

@@ -19,652 +19,605 @@ public class TLpgGasBottleFiles extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** id */
-    private Long fGasBottleFilesId;
+    private Long gasBottleFilesId;
 
     /** 生产(制造单位) */
     @Excel(name = "生产(制造单位) ", width = 30 )
-    private String fMakeInfo;
+    private String makeInfo;
 
     /** 气瓶条码 */
     @Excel(name = "气瓶条码", width = 30 )
-    private String fQRcode;
+    private String qRcode;
 
     /** 登记证号 */
     @Excel(name = "登记证号", width = 30 )
-    private String fRegCode;
+    private String regCode;
 
     /** 产品编号 */
     @Excel(name = "产品编号", width = 30 )
-    private String fEquNo;
+    private String equNo;
 
     /** 设备类型 */
     @Excel(name = "设备类型", width = 30 )
-    private String fEquType;
+    private String equType;
 
     /** 充装介质 */
     @Excel(name = "充装介质", width = 30 )
-    private String fMedium;
+    private String medium;
 
     /** 生产日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fMakeDate;
+    private Date makeDate;
 
     /** 单位内编号 */
     @Excel(name = "单位内编号", width = 30 )
-    private String fSelfId;
+    private String selfId;
 
     /** 压力 */
     @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 )
-    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.注销 */
     @Excel(name = "气瓶状态 ", readConverterExp = "1=新增,2=修改,-1=删除")
-    private String fState;
+    private String state;
 
     /** 修改人姓名 */
-    private String fUpOptName;
+    private String upOptName;
 
     /** 上检日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "上检日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fPChkDate;
+    private Date pChkDate;
 
     /** 下检日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "下检日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fNChkDate;
+    private Date nChkDate;
 
     /** 生产日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fProductDate;
+    private Date productDate;
 
     /** 报废日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "报废日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fDiscardDate;
+    private Date discardDate;
 
     /** 安全评定日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "安全评定日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fSafeJudgeDate;
+    private Date safeJudgeDate;
 
     /** 公称压力Mpa */
     @Excel(name = "公称压力/Mpa")
-    private BigDecimal fGPressure;
+    private BigDecimal gPressure;
 
     /** 水试验压力Mpa */
     @Excel(name = "水试验压力/Mpa")
-    private BigDecimal fWPressure;
+    private BigDecimal wPressure;
 
     /** 标准重量KG */
     @Excel(name = "标准重量/KG")
-    private BigDecimal fSelfWeight;
+    private BigDecimal selfWeight;
 
     /** 壁厚mm */
     @Excel(name = "壁厚/mm")
-    private BigDecimal fThickness;
+    private BigDecimal thickness;
 
     /** 气瓶许可证号 */
     @Excel(name = "气瓶许可证号")
-    private String fPermitNo;
+    private String permitNo;
 
     /** 阀类型名称 */
     @Excel(name = "阀类型名称")
-    private String fValveName;
+    private String valveName;
 
     /** 钢瓶交付文件照片 */
-    @Excel(name = "钢瓶交付文件照片")
-    private String fPayImage;
+    //@Excel(name = "钢瓶交付文件照片")
+    private String payImage;
 
     /** 检验质量证明书照片 */
-    @Excel(name = "检验质量证明书照片")
-    private String fBatchImage;
+    //@Excel(name = "检验质量证明书照片")
+    private String batchImage;
 
     /** 制造监督检验证书照片 */
-    @Excel(name = "制造监督检验证书照片")
-    private String fDeviceImage;
+    //@Excel(name = "制造监督检验证书照片")
+    private String deviceImage;
 
     /** 检验报告照片 */
-    @Excel(name = "检验报告照片")
-    private String fCheckImage;
+    //@Excel(name = "检验报告照片")
+    private String checkImage;
 
     /** 产品编号照片 */
-    @Excel(name = "产品编号照片")
-    private String fEquNoImage;
+    //@Excel(name = "产品编号照片")
+    private String equNoImage;
 
     /** 单位内编号照片 */
-    @Excel(name = "单位内编号照片")
-    private String fSelfIdImage;
+    //@Excel(name = "单位内编号照片")
+    private String selfIdImage;
 
     /** 钢瓶信息照片 */
-    @Excel(name = "钢瓶信息照片")
-    private String fBotImage;
+    //@Excel(name = "钢瓶信息照片")
+    private String botImage;
 
     /** 钢瓶规格名称 */
     @Excel(name = "钢瓶规格名称")
-    private String fBotSpecName;
+    private String botSpecName;
 
     /** 钢瓶型号 */
     @Excel(name = "钢瓶型号")
-    private String fBottleType;
+    private String bottleType;
 
     /** 已检验次数 */
     @Excel(name = "已检验次数")
-    private Long fInspectedTimes;
+    private Long inspectedTimes;
 
     /** 是否专用(1:专用 2：托管) */
     @Excel(name = "是否专用")
-    private String fIsSpecialized;
+    private String isSpecialized;
 
     /** 阀厂家 */
     @Excel(name = "阀厂家")
-    private String fValveManuFacturer;
+    private String valveManuFacturer;
 
     /** 检验标牌(有/无) */
     @Excel(name = "检验标牌")
-    private String fInspectionLabel;
+    private String inspectionLabel;
 
     /** 第三方标签 */
     @Excel(name = "第三方标签")
-    private String fThirdPartyLabel;
+    private String thirdPartyLabel;
 
     /** 孔洞码 */
     @Excel(name = "孔洞码")
-    private String fHoleCode;
+    private String holeCode;
 
     /** 存储类型(气相/液相) */
     @Excel(name = "存储类型")
-    private String fBottleStorageType;
+    private String bottleStorageType;
 
-    private String fRowVersion;
+    private String rowVersion;
 
-    public String getfRowVersion() {
-        return fRowVersion;
+    public Long getGasBottleFilesId() {
+        return gasBottleFilesId;
     }
 
-    public void setfRowVersion(String fRowVersion) {
-        this.fRowVersion = fRowVersion;
+    public void setGasBottleFilesId(Long gasBottleFilesId) {
+        this.gasBottleFilesId = gasBottleFilesId;
     }
 
-    public String getfValveName() {
-        return fValveName;
+    public String getMakeInfo() {
+        return makeInfo;
     }
 
-    public void setfValveName(String fValveName) {
-        this.fValveName = fValveName;
+    public void setMakeInfo(String makeInfo) {
+        this.makeInfo = makeInfo;
     }
 
-    public String getfState() {
-        return fState;
+    public String getqRcode() {
+        return qRcode;
     }
 
-    public void setfState(String fState) {
-        this.fState = fState;
+    public void setqRcode(String qRcode) {
+        this.qRcode = qRcode;
     }
 
-    public String getfBuildUser() {
-        return fBuildUser;
+    public String getRegCode() {
+        return regCode;
     }
 
-    public void setfBuildUser(String fBuildUser) {
-        this.fBuildUser = fBuildUser;
+    public void setRegCode(String regCode) {
+        this.regCode = regCode;
     }
 
-    public void setfGasBottleFilesId(Long fGasBottleFilesId)
-    {
-        this.fGasBottleFilesId = fGasBottleFilesId;
+    public String getEquNo() {
+        return equNo;
     }
 
-    public Long getfGasBottleFilesId()
-    {
-        return fGasBottleFilesId;
+    public void setEquNo(String equNo) {
+        this.equNo = equNo;
     }
 
-    public void setfRegCode(String fRegCode) {
-        this.fRegCode = fRegCode;
+    public String getEquType() {
+        return equType;
     }
 
-    public String getfRegCode()
-    {
-        return fRegCode;
+    public void setEquType(String equType) {
+        this.equType = equType;
     }
 
-    public void setfEquNo(String fEquNo) 
-    {
-        this.fEquNo = fEquNo;
+    public String getMedium() {
+        return medium;
     }
 
-    public String getfEquNo() 
-    {
-        return fEquNo;
+    public void setMedium(String medium) {
+        this.medium = medium;
     }
 
-
-    public void setfEquType(String fEquType) 
-    {
-        this.fEquType = fEquType;
+    public Date getMakeDate() {
+        return makeDate;
     }
 
-    public String getfEquType() 
-    {
-        return fEquType;
+    public void setMakeDate(Date makeDate) {
+        this.makeDate = makeDate;
     }
 
-    public void setfMedium(String fMedium) 
-    {
-        this.fMedium = fMedium;
+    public String getSelfId() {
+        return selfId;
     }
 
-    public String getfMedium() 
-    {
-        return fMedium;
+    public void setSelfId(String selfId) {
+        this.selfId = selfId;
     }
-    public void setfMakeDate(Date fMakeDate) 
-    {
-        this.fMakeDate = fMakeDate;
+
+    public BigDecimal getPressure() {
+        return pressure;
     }
 
-    public Date getfMakeDate() 
-    {
-        return fMakeDate;
+    public void setPressure(BigDecimal pressure) {
+        this.pressure = pressure;
     }
-    public void setfMakeInfo(String fMakeInfo) 
-    {
-        this.fMakeInfo = fMakeInfo;
+
+    public BigDecimal getVolume() {
+        return volume;
     }
 
-    public String getfMakeInfo() 
-    {
-        return fMakeInfo;
+    public void setVolume(BigDecimal volume) {
+        this.volume = volume;
     }
-    public void setfSelfId(String fSelfId) 
-    {
-        this.fSelfId = fSelfId;
+
+    public String getAppId() {
+        return appId;
     }
 
-    public String getfSelfId() 
-    {
-        return fSelfId;
+    public void setAppId(String appId) {
+        this.appId = appId;
     }
-    public void setfPressure(BigDecimal fPressure) 
-    {
-        this.fPressure = fPressure;
+
+    public String getBuildUser() {
+        return buildUser;
     }
 
-    public BigDecimal getfPressure() 
-    {
-        return fPressure;
+    public void setBuildUser(String buildUser) {
+        this.buildUser = buildUser;
     }
-    public void setfVolume(BigDecimal fVolume) 
-    {
-        this.fVolume = fVolume;
+
+    public Date getAddTime() {
+        return addTime;
     }
 
-    public BigDecimal getfVolume() 
-    {
-        return fVolume;
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
     }
 
-    public void setfAppId(String fAppId) 
-    {
-        this.fAppId = fAppId;
+    public String getOptName() {
+        return optName;
     }
 
-    public String getfAppId() 
-    {
-        return fAppId;
+    public void setOptName(String optName) {
+        this.optName = optName;
     }
-    public void setfQRcode(String fQRcode) 
-    {
-        this.fQRcode = fQRcode;
+
+    public Date getUpTime() {
+        return upTime;
     }
 
-    public String getfQRcode() 
-    {
-        return fQRcode;
+    public void setUpTime(Date upTime) {
+        this.upTime = upTime;
     }
 
-    public void setfPChkDate(Date fPChkDate) 
-    {
-        this.fPChkDate = fPChkDate;
+    public String getState() {
+        return state;
     }
 
-    public Date getfPChkDate() 
-    {
-        return fPChkDate;
+    public void setState(String state) {
+        this.state = state;
     }
-    public void setfNChkDate(Date fNChkDate) 
-    {
-        this.fNChkDate = fNChkDate;
+
+    public String getUpOptName() {
+        return upOptName;
     }
 
-    public Date getfNChkDate() 
-    {
-        return fNChkDate;
+    public void setUpOptName(String upOptName) {
+        this.upOptName = upOptName;
     }
-    public void setfProductDate(Date fProductDate) 
-    {
-        this.fProductDate = fProductDate;
+
+    public Date getpChkDate() {
+        return pChkDate;
     }
 
-    public Date getfProductDate() 
-    {
-        return fProductDate;
+    public void setpChkDate(Date pChkDate) {
+        this.pChkDate = pChkDate;
     }
-    public void setfDiscardDate(Date fDiscardDate) 
-    {
-        this.fDiscardDate = fDiscardDate;
+
+    public Date getnChkDate() {
+        return nChkDate;
     }
 
-    public Date getfDiscardDate() 
-    {
-        return fDiscardDate;
+    public void setnChkDate(Date nChkDate) {
+        this.nChkDate = nChkDate;
     }
-    public void setfSafeJudgeDate(Date fSafeJudgeDate) 
-    {
-        this.fSafeJudgeDate = fSafeJudgeDate;
+
+    public Date getProductDate() {
+        return productDate;
     }
 
-    public Date getfSafeJudgeDate() 
-    {
-        return fSafeJudgeDate;
+    public void setProductDate(Date productDate) {
+        this.productDate = productDate;
     }
-    public void setfGPressure(BigDecimal fGPressure) 
-    {
-        this.fGPressure = fGPressure;
+
+    public Date getDiscardDate() {
+        return discardDate;
     }
 
-    public BigDecimal getfGPressure() 
-    {
-        return fGPressure;
+    public void setDiscardDate(Date discardDate) {
+        this.discardDate = discardDate;
     }
-    public void setfWPressure(BigDecimal fWPressure) 
-    {
-        this.fWPressure = fWPressure;
+
+    public Date getSafeJudgeDate() {
+        return safeJudgeDate;
     }
 
-    public BigDecimal getfWPressure() 
-    {
-        return fWPressure;
+    public void setSafeJudgeDate(Date safeJudgeDate) {
+        this.safeJudgeDate = safeJudgeDate;
     }
-    public void setfSelfWeight(BigDecimal fSelfWeight) 
-    {
-        this.fSelfWeight = fSelfWeight;
+
+    public BigDecimal getgPressure() {
+        return gPressure;
     }
 
-    public BigDecimal getfSelfWeight() 
-    {
-        return fSelfWeight;
+    public void setgPressure(BigDecimal gPressure) {
+        this.gPressure = gPressure;
     }
-    public void setfThickness(BigDecimal fThickness) 
-    {
-        this.fThickness = fThickness;
+
+    public BigDecimal getwPressure() {
+        return wPressure;
     }
 
-    public BigDecimal getfThickness() 
-    {
-        return fThickness;
+    public void setwPressure(BigDecimal wPressure) {
+        this.wPressure = wPressure;
     }
-    public void setfPermitNo(String fPermitNo) 
-    {
-        this.fPermitNo = fPermitNo;
+
+    public BigDecimal getSelfWeight() {
+        return selfWeight;
     }
 
-    public String getfPermitNo() 
-    {
-        return fPermitNo;
+    public void setSelfWeight(BigDecimal selfWeight) {
+        this.selfWeight = selfWeight;
     }
 
-    public void setfPayImage(String fPayImage) 
-    {
-        this.fPayImage = fPayImage;
+    public BigDecimal getThickness() {
+        return thickness;
     }
 
-    public String getfPayImage() 
-    {
-        return fPayImage;
+    public void setThickness(BigDecimal thickness) {
+        this.thickness = thickness;
     }
-    public void setfBatchImage(String fBatchImage) 
-    {
-        this.fBatchImage = fBatchImage;
+
+    public String getPermitNo() {
+        return permitNo;
     }
 
-    public String getfBatchImage() 
-    {
-        return fBatchImage;
+    public void setPermitNo(String permitNo) {
+        this.permitNo = permitNo;
     }
-    public void setfDeviceImage(String fDeviceImage) 
-    {
-        this.fDeviceImage = fDeviceImage;
+
+    public String getValveName() {
+        return valveName;
     }
 
-    public String getfDeviceImage() 
-    {
-        return fDeviceImage;
+    public void setValveName(String valveName) {
+        this.valveName = valveName;
     }
-    public void setfCheckImage(String fCheckImage) 
-    {
-        this.fCheckImage = fCheckImage;
+
+    public String getPayImage() {
+        return payImage;
     }
 
-    public String getfCheckImage() 
-    {
-        return fCheckImage;
+    public void setPayImage(String payImage) {
+        this.payImage = payImage;
     }
-    public void setfEquNoImage(String fEquNoImage) 
-    {
-        this.fEquNoImage = fEquNoImage;
+
+    public String getBatchImage() {
+        return batchImage;
     }
 
-    public String getfEquNoImage() 
-    {
-        return fEquNoImage;
+    public void setBatchImage(String batchImage) {
+        this.batchImage = batchImage;
     }
-    public void setfSelfIdImage(String fSelfIdImage) 
-    {
-        this.fSelfIdImage = fSelfIdImage;
+
+    public String getDeviceImage() {
+        return deviceImage;
     }
 
-    public String getfSelfIdImage() 
-    {
-        return fSelfIdImage;
+    public void setDeviceImage(String deviceImage) {
+        this.deviceImage = deviceImage;
     }
-    public void setfBotImage(String fBotImage) 
-    {
-        this.fBotImage = fBotImage;
+
+    public String getCheckImage() {
+        return checkImage;
     }
 
-    public String getfBotImage() 
-    {
-        return fBotImage;
+    public void setCheckImage(String checkImage) {
+        this.checkImage = checkImage;
     }
 
-    public void setfBotSpecName(String fBotSpecName) 
-    {
-        this.fBotSpecName = fBotSpecName;
+    public String getEquNoImage() {
+        return equNoImage;
     }
 
-    public String getfBotSpecName() 
-    {
-        return fBotSpecName;
+    public void setEquNoImage(String equNoImage) {
+        this.equNoImage = equNoImage;
     }
-    public void setfBottleType(String fBottleType) 
-    {
-        this.fBottleType = fBottleType;
+
+    public String getSelfIdImage() {
+        return selfIdImage;
     }
 
-    public String getfBottleType() 
-    {
-        return fBottleType;
+    public void setSelfIdImage(String selfIdImage) {
+        this.selfIdImage = selfIdImage;
     }
-    public void setfInspectedTimes(Long fInspectedTimes) 
-    {
-        this.fInspectedTimes = fInspectedTimes;
+
+    public String getBotImage() {
+        return botImage;
     }
 
-    public Long getfInspectedTimes() 
-    {
-        return fInspectedTimes;
+    public void setBotImage(String botImage) {
+        this.botImage = botImage;
     }
-    public void setfIsSpecialized(String fIsSpecialized)
-    {
-        this.fIsSpecialized = fIsSpecialized;
+
+    public String getBotSpecName() {
+        return botSpecName;
     }
 
-    public String getfIsSpecialized()
-    {
-        return fIsSpecialized;
+    public void setBotSpecName(String botSpecName) {
+        this.botSpecName = botSpecName;
     }
-    public void setfValveManuFacturer(String fValveManuFacturer) 
-    {
-        this.fValveManuFacturer = fValveManuFacturer;
+
+    public String getBottleType() {
+        return bottleType;
     }
 
-    public String getfValveManuFacturer() 
-    {
-        return fValveManuFacturer;
+    public void setBottleType(String bottleType) {
+        this.bottleType = bottleType;
     }
-    public void setfInspectionLabel(String fInspectionLabel) 
-    {
-        this.fInspectionLabel = fInspectionLabel;
+
+    public Long getInspectedTimes() {
+        return inspectedTimes;
     }
 
-    public String getfInspectionLabel() 
-    {
-        return fInspectionLabel;
+    public void setInspectedTimes(Long inspectedTimes) {
+        this.inspectedTimes = inspectedTimes;
     }
-    public void setfThirdPartyLabel(String fThirdPartyLabel) 
-    {
-        this.fThirdPartyLabel = fThirdPartyLabel;
+
+    public String getIsSpecialized() {
+        return isSpecialized;
     }
 
-    public String getfThirdPartyLabel() 
-    {
-        return fThirdPartyLabel;
+    public void setIsSpecialized(String isSpecialized) {
+        this.isSpecialized = isSpecialized;
     }
-    public void setfHoleCode(String fHoleCode) 
-    {
-        this.fHoleCode = fHoleCode;
+
+    public String getValveManuFacturer() {
+        return valveManuFacturer;
     }
 
-    public String getfHoleCode() 
-    {
-        return fHoleCode;
+    public void setValveManuFacturer(String valveManuFacturer) {
+        this.valveManuFacturer = valveManuFacturer;
     }
-    public void setfBottleStorageType(String fBottleStorageType) 
-    {
-        this.fBottleStorageType = fBottleStorageType;
+
+    public String getInspectionLabel() {
+        return inspectionLabel;
     }
 
-    public String getfBottleStorageType() 
-    {
-        return fBottleStorageType;
+    public void setInspectionLabel(String inspectionLabel) {
+        this.inspectionLabel = inspectionLabel;
     }
 
-    public void setfOptName(String fOptName) 
-    {
-        this.fOptName = fOptName;
+    public String getThirdPartyLabel() {
+        return thirdPartyLabel;
     }
 
-    public String getfOptName() 
-    {
-        return fOptName;
+    public void setThirdPartyLabel(String thirdPartyLabel) {
+        this.thirdPartyLabel = thirdPartyLabel;
     }
-    public void setfAddTime(Date fAddTime) 
-    {
-        this.fAddTime = fAddTime;
+
+    public String getHoleCode() {
+        return holeCode;
     }
 
-    public Date getfAddTime() 
-    {
-        return fAddTime;
+    public void setHoleCode(String holeCode) {
+        this.holeCode = holeCode;
     }
-    public void setfUpTime(Date fUpTime) 
-    {
-        this.fUpTime = fUpTime;
+
+    public String getBottleStorageType() {
+        return bottleStorageType;
     }
 
-    public Date getfUpTime() 
-    {
-        return fUpTime;
+    public void setBottleStorageType(String bottleStorageType) {
+        this.bottleStorageType = bottleStorageType;
     }
 
-    public void setfUpOptName(String fUpOptName) 
-    {
-        this.fUpOptName = fUpOptName;
+    public String getRowVersion() {
+        return rowVersion;
     }
 
-    public String getfUpOptName() 
-    {
-        return fUpOptName;
+    public void setRowVersion(String rowVersion) {
+        this.rowVersion = rowVersion;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("fGasBottleFilesId", getfGasBottleFilesId())
-            .append("fRegCode", getfRegCode())
-            .append("fEquNo", getfEquNo())
-            .append("fEquType", getfEquType())
-            .append("fMedium", getfMedium())
-            .append("fMakeDate", getfMakeDate())
-            .append("fMakeInfo", getfMakeInfo())
-            .append("fSelfId", getfSelfId())
-            .append("fPressure", getfPressure())
-            .append("fVolume", getfVolume())
-            .append("fPChkDate", getfPChkDate())
-            .append("fNChkDate", getfNChkDate())
-            .append("fProductDate", getfProductDate())
-            .append("fDiscardDate", getfDiscardDate())
-            .append("fSafeJudgeDate", getfSafeJudgeDate())
-            .append("fGPressure", getfGPressure())
-            .append("fWPressure", getfWPressure())
-            .append("fSelfWeight", getfSelfWeight())
-            .append("fThickness", getfThickness())
-            .append("fPermitNo", getfPermitNo())
-            .append("fPayImage", getfPayImage())
-            .append("fBatchImage", getfBatchImage())
-            .append("fDeviceImage", getfDeviceImage())
-            .append("fCheckImage", getfCheckImage())
-            .append("fEquNoImage", getfEquNoImage())
-            .append("fSelfIdImage", getfSelfIdImage())
-            .append("fBotImage", getfBotImage())
-            .append("fBotSpecName", getfBotSpecName())
-            .append("fBottleType", getfBottleType())
-            .append("fInspectedTimes", getfInspectedTimes())
-            .append("fIsSpecialized", getfIsSpecialized())
-            .append("fValveManuFacturer", getfValveManuFacturer())
-            .append("fInspectionLabel", getfInspectionLabel())
-            .append("fThirdPartyLabel", getfThirdPartyLabel())
-            .append("fHoleCode", getfHoleCode())
-            .append("fBottleStorageType", getfBottleStorageType())
-            .append("fOptName", getfOptName())
-            .append("fAddTime", getfAddTime())
-            .append("fUpTime", getfUpTime())
-            .append("fUpOptName", getfUpOptName())
-            .toString();
+        return "TLpgGasBottleFiles{" +
+                "gasBottleFilesId=" + gasBottleFilesId +
+                ", makeInfo='" + makeInfo + '\'' +
+                ", qRcode='" + qRcode + '\'' +
+                ", regCode='" + regCode + '\'' +
+                ", equNo='" + equNo + '\'' +
+                ", equType='" + equType + '\'' +
+                ", medium='" + medium + '\'' +
+                ", makeDate=" + makeDate +
+                ", selfId='" + selfId + '\'' +
+                ", pressure=" + pressure +
+                ", volume=" + volume +
+                ", appId='" + appId + '\'' +
+                ", buildUser='" + buildUser + '\'' +
+                ", addTime=" + addTime +
+                ", optName='" + optName + '\'' +
+                ", upTime=" + upTime +
+                ", state='" + state + '\'' +
+                ", upOptName='" + upOptName + '\'' +
+                ", pChkDate=" + pChkDate +
+                ", nChkDate=" + nChkDate +
+                ", productDate=" + productDate +
+                ", discardDate=" + discardDate +
+                ", safeJudgeDate=" + safeJudgeDate +
+                ", gPressure=" + gPressure +
+                ", wPressure=" + wPressure +
+                ", selfWeight=" + selfWeight +
+                ", thickness=" + thickness +
+                ", permitNo='" + permitNo + '\'' +
+                ", valveName='" + valveName + '\'' +
+                ", payImage='" + payImage + '\'' +
+                ", batchImage='" + batchImage + '\'' +
+                ", deviceImage='" + deviceImage + '\'' +
+                ", checkImage='" + checkImage + '\'' +
+                ", equNoImage='" + equNoImage + '\'' +
+                ", selfIdImage='" + selfIdImage + '\'' +
+                ", botImage='" + botImage + '\'' +
+                ", botSpecName='" + botSpecName + '\'' +
+                ", bottleType='" + bottleType + '\'' +
+                ", inspectedTimes=" + inspectedTimes +
+                ", isSpecialized='" + isSpecialized + '\'' +
+                ", valveManuFacturer='" + valveManuFacturer + '\'' +
+                ", inspectionLabel='" + inspectionLabel + '\'' +
+                ", thirdPartyLabel='" + thirdPartyLabel + '\'' +
+                ", holeCode='" + holeCode + '\'' +
+                ", bottleStorageType='" + bottleStorageType + '\'' +
+                ", rowVersion='" + rowVersion + '\'' +
+                '}';
     }
 }

zh-baseversion-system/src/main/java/com/zehong/system/service/ITLpgGasBottleFilesService.java

 package com.zehong.system.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.TLpgGasBottleFiles;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 液化石油气-气瓶档案Service接口
  * 
@@ -58,4 +62,14 @@ public interface ITLpgGasBottleFilesService
      * @return 结果
      */
     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

@@ -152,7 +152,7 @@ public class TLpgAirChargeFilesServiceImpl implements ITLpgAirChargeFilesService
             // 这是 上面气瓶条码 有的气瓶数据
             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();
 

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TLpgDeliveryRecordServiceImpl.java

@@ -98,13 +98,13 @@ public class TLpgDeliveryRecordServiceImpl implements ITLpgDeliveryRecordService
 
             // 气瓶条码处理
             TLpgGasBottleFiles tLpgGasBottleFiles = new TLpgGasBottleFiles();
-            tLpgGasBottleFiles.setfQRcode(tLpgDeliveryRecordImportVo.getBottleCode());
+            tLpgGasBottleFiles.setqRcode(tLpgDeliveryRecordImportVo.getBottleCode());
             List<TLpgGasBottleFiles> tLpgGasBottleFiles1 = tLpgGasBottleFilesMapper.selectTLpgGasBottleFilesList(tLpgGasBottleFiles);
             if (tLpgGasBottleFiles1 == null || tLpgGasBottleFiles1.size() == 0) {
                 errorNum ++;
                 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

 package com.zehong.system.service.impl;
 
 import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TLpgGasBottleFilesMapper;
 import com.zehong.system.domain.TLpgGasBottleFiles;
 import com.zehong.system.service.ITLpgGasBottleFilesService;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 液化石油气-气瓶档案Service业务层处理
  * 
@@ -16,7 +21,7 @@ import com.zehong.system.service.ITLpgGasBottleFilesService;
 @Service
 public class TLpgGasBottleFilesServiceImpl implements ITLpgGasBottleFilesService 
 {
-    @Autowired
+    @Resource
     private TLpgGasBottleFilesMapper tLpgGasBottleFilesMapper;
 
     /**
@@ -90,4 +95,21 @@ public class TLpgGasBottleFilesServiceImpl implements ITLpgGasBottleFilesService
     {
         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

@@ -5,52 +5,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zehong.system.mapper.TLpgGasBottleFilesMapper">
     
     <resultMap type="TLpgGasBottleFiles" id="TLpgGasBottleFilesResult">
-        <result property="fGasBottleFilesId"    column="f_gas_bottle_files_id"    />
-        <result property="fRegCode"    column="f_reg_code"    />
-        <result property="fEquNo"    column="f_equ_no"    />
-        <result property="fEquType"    column="f_equ_type"    />
-        <result property="fMedium"    column="f_medium"    />
-        <result property="fMakeDate"    column="f_make_date"    />
-        <result property="fMakeInfo"    column="f_make_info"    />
-        <result property="fSelfId"    column="f_self_id"    />
-        <result property="fPressure"    column="f_pressure"    />
-        <result property="fVolume"    column="f_volume"    />
-        <result property="fAppId"    column="f_app_id"    />
-        <result property="fQRcode"    column="f_q_rcode"    />
-        <result property="fBuildUser"    column="f_build_user"    />
-        <result property="fOptName"    column="f_opt_name"    />
-        <result property="fAddTime"    column="f_add_time"    />
-        <result property="fUpTime"    column="f_up_time"    />
-        <result property="fState"    column="f_state"    />
-        <result property="fUpOptName"    column="f_up_opt_name"    />
-        <result property="fPChkDate"    column="f_p_chk_date"    />
-        <result property="fNChkDate"    column="f_n_chk_date"    />
-        <result property="fProductDate"    column="f_product_date"    />
-        <result property="fDiscardDate"    column="f_discard_date"    />
-        <result property="fSafeJudgeDate"    column="f_safe_judge_date"    />
-        <result property="fGPressure"    column="f_g_pressure"    />
-        <result property="fWPressure"    column="f_w_pressure"    />
-        <result property="fSelfWeight"    column="f_self_weight"    />
-        <result property="fThickness"    column="f_thickness"    />
-        <result property="fPermitNo"    column="f_permit_no"    />
-        <result property="fValveName"    column="f_valve_name"    />
-        <result property="fPayImage"    column="f_pay_image"    />
-        <result property="fBatchImage"    column="f_batch_image"    />
-        <result property="fDeviceImage"    column="f_device_image"    />
-        <result property="fCheckImage"    column="f_check_image"    />
-        <result property="fEquNoImage"    column="f_equ_no_image"    />
-        <result property="fSelfIdImage"    column="f_self_id_image"    />
-        <result property="fBotImage"    column="f_bot_image"    />
-        <result property="fBotSpecName"    column="f_bot_spec_name"    />
-        <result property="fBottleType"    column="f_bottle_type"    />
-        <result property="fInspectedTimes"    column="f_inspected_times"    />
-        <result property="fIsSpecialized"    column="f_is_specialized"    />
-        <result property="fValveManuFacturer"    column="f_valve_manu_facturer"    />
-        <result property="fInspectionLabel"    column="f_inspection_label"    />
-        <result property="fThirdPartyLabel"    column="f_third_party_label"    />
-        <result property="fHoleCode"    column="f_hole_code"    />
-        <result property="fBottleStorageType"    column="f_bottle_storage_type"    />
-        <result property="fRowVersion"    column="f_row_version"    />
+        <result property="gasBottleFilesId"    column="f_gas_bottle_files_id"    />
+        <result property="regCode"    column="f_reg_code"    />
+        <result property="equNo"    column="f_equ_no"    />
+        <result property="equType"    column="f_equ_type"    />
+        <result property="medium"    column="f_medium"    />
+        <result property="makeDate"    column="f_make_date"    />
+        <result property="makeInfo"    column="f_make_info"    />
+        <result property="selfId"    column="f_self_id"    />
+        <result property="pressure"    column="f_pressure"    />
+        <result property="volume"    column="f_volume"    />
+        <result property="appId"    column="f_app_id"    />
+        <result property="qRcode"    column="f_q_rcode"    />
+        <result property="buildUser"    column="f_build_user"    />
+        <result property="optName"    column="f_opt_name"    />
+        <result property="addTime"    column="f_add_time"    />
+        <result property="upTime"    column="f_up_time"    />
+        <result property="state"    column="f_state"    />
+        <result property="upOptName"    column="f_up_opt_name"    />
+        <result property="pChkDate"    column="f_p_chk_date"    />
+        <result property="nChkDate"    column="f_n_chk_date"    />
+        <result property="productDate"    column="f_product_date"    />
+        <result property="discardDate"    column="f_discard_date"    />
+        <result property="safeJudgeDate"    column="f_safe_judge_date"    />
+        <result property="gPressure"    column="f_g_pressure"    />
+        <result property="wPressure"    column="f_w_pressure"    />
+        <result property="selfWeight"    column="f_self_weight"    />
+        <result property="thickness"    column="f_thickness"    />
+        <result property="permitNo"    column="f_permit_no"    />
+        <result property="valveName"    column="f_valve_name"    />
+        <result property="payImage"    column="f_pay_image"    />
+        <result property="batchImage"    column="f_batch_image"    />
+        <result property="deviceImage"    column="f_device_image"    />
+        <result property="checkImage"    column="f_check_image"    />
+        <result property="equNoImage"    column="f_equ_no_image"    />
+        <result property="selfIdImage"    column="f_self_id_image"    />
+        <result property="botImage"    column="f_bot_image"    />
+        <result property="botSpecName"    column="f_bot_spec_name"    />
+        <result property="bottleType"    column="f_bottle_type"    />
+        <result property="inspectedTimes"    column="f_inspected_times"    />
+        <result property="isSpecialized"    column="f_is_specialized"    />
+        <result property="valveManuFacturer"    column="f_valve_manu_facturer"    />
+        <result property="inspectionLabel"    column="f_inspection_label"    />
+        <result property="thirdPartyLabel"    column="f_third_party_label"    />
+        <result property="holeCode"    column="f_hole_code"    />
+        <result property="bottleStorageType"    column="f_bottle_storage_type"    />
+        <result property="rowVersion"    column="f_row_version"    />
     </resultMap>
 
     <sql id="selectTLpgGasBottleFilesVo">
@@ -64,18 +64,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTLpgGasBottleFilesList" parameterType="TLpgGasBottleFiles" resultMap="TLpgGasBottleFilesResult">
         <include refid="selectTLpgGasBottleFilesVo"/>
         <where>  
-            <if test="fPChkDate != null "> and f_p_chk_date = #{fPChkDate}</if>
-            <if test="fNChkDate != null "> and f_n_chk_date = #{fNChkDate}</if>
-            <if test="fProductDate != null "> and f_product_date = #{fProductDate}</if>
-            <if test="fDiscardDate != null "> and f_discard_date = #{fDiscardDate}</if>
-            <if test="fSafeJudgeDate != null "> and f_safe_judge_date = #{fSafeJudgeDate}</if>
-            <if test="fGPressure != null "> and f_g_pressure = #{fGPressure}</if>
-            <if test="fWPressure != null "> and f_w_pressure = #{fWPressure}</if>
-            <if test="fSelfWeight != null "> and f_self_weight = #{fSelfWeight}</if>
-            <if test="fPermitNo != null  and fPermitNo != ''"> and f_permit_no = #{fPermitNo}</if>
-            <if test="fValveName != null "> and f_valve_name like concat('%', #{fValveName}, '%')</if>
-            <if test="fQRcode != null and fQRcode != ''"> and f_q_rcode like concat('%', #{fQRcode}, '%')</if>
-            <if test="fState != null "> and f_state = #{fState}</if>
+            <if test="pChkDate != null "> and f_p_chk_date = #{pChkDate}</if>
+            <if test="nChkDate != null "> and f_n_chk_date = #{nChkDate}</if>
+            <if test="productDate != null "> and f_product_date = #{productDate}</if>
+            <if test="discardDate != null "> and f_discard_date = #{discardDate}</if>
+            <if test="safeJudgeDate != null "> and f_safe_judge_date = #{safeJudgeDate}</if>
+            <if test="gPressure != null "> and f_g_pressure = #{gPressure}</if>
+            <if test="wPressure != null "> and f_w_pressure = #{wPressure}</if>
+            <if test="selfWeight != null "> and f_self_weight = #{selfWeight}</if>
+            <if test="permitNo != null  and fPermitNo != ''"> and f_permit_no = #{permitNo}</if>
+            <if test="valveName != null "> and f_valve_name like concat('%', #{valveName}, '%')</if>
+            <if test="qRcode != null and fQRcode != ''"> and f_q_rcode like concat('%', #{qRcode}, '%')</if>
+            <if test="state != null "> and f_state = #{state}</if>
         </where>
     </select>
     <select id="queryAllByFQRcodeList" resultMap="TLpgGasBottleFilesResult">
@@ -94,153 +94,153 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTLpgGasBottleFiles" parameterType="TLpgGasBottleFiles" useGeneratedKeys="true" keyProperty="fGasBottleFilesId">
         insert into t_lpg_gas_bottle_files
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fRegCode != null">f_reg_code,</if>
-            <if test="fEquNo != null">f_equ_no,</if>
-            <if test="fEquType != null">f_equ_type,</if>
-            <if test="fMedium != null">f_medium,</if>
-            <if test="fMakeDate != null">f_make_date,</if>
-            <if test="fMakeInfo != null">f_make_info,</if>
-            <if test="fSelfId != null">f_self_id,</if>
+            <if test="regCode != null">f_reg_code,</if>
+            <if test="equNo != null">f_equ_no,</if>
+            <if test="equType != null">f_equ_type,</if>
+            <if test="medium != null">f_medium,</if>
+            <if test="makeDate != null">f_make_date,</if>
+            <if test="makeInfo != null">f_make_info,</if>
+            <if test="selfId != null">f_self_id,</if>
 
-            <if test="fPressure != null">f_pressure,</if>
-            <if test="fVolume != null">f_volume,</if>
-            <if test="fAppId != null">f_app_id,</if>
-            <if test="fQRcode != null">f_q_rcode,</if>
-            <if test="fBuildUser != null">f_build_user,</if>
-            <if test="fPChkDate != null">f_p_chk_date,</if>
-            <if test="fNChkDate != null">f_n_chk_date,</if>
-            <if test="fProductDate != null">f_product_date,</if>
-            <if test="fDiscardDate != null">f_discard_date,</if>
-            <if test="fSafeJudgeDate != null">f_safe_judge_date,</if>
-            <if test="fGPressure != null">f_g_pressure,</if>
-            <if test="fWPressure != null">f_w_pressure,</if>
-            <if test="fSelfWeight != null">f_self_weight,</if>
-            <if test="fThickness != null">f_thickness,</if>
-            <if test="fPermitNo != null">f_permit_no,</if>
-            <if test="fValveName != null">f_valve_name,</if>
-            <if test="fPayImage != null">f_pay_image,</if>
-            <if test="fBatchImage != null">f_batch_image,</if>
-            <if test="fDeviceImage != null">f_device_image,</if>
-            <if test="fCheckImage != null">f_check_image,</if>
-            <if test="fEquNoImage != null">f_equ_no_image,</if>
-            <if test="fSelfIdImage != null">f_self_id_image,</if>
-            <if test="fBotImage != null">f_bot_image,</if>
-            <if test="fBotSpecName != null">f_bot_spec_name,</if>
-            <if test="fBottleType != null">f_bottle_type,</if>
-            <if test="fInspectedTimes != null">f_inspected_times,</if>
-            <if test="fIsSpecialized != null">f_is_specialized,</if>
-            <if test="fValveManuFacturer != null">f_valve_manu_facturer,</if>
-            <if test="fInspectionLabel != null">f_inspection_label,</if>
-            <if test="fThirdPartyLabel != null">f_third_party_label,</if>
-            <if test="fHoleCode != null">f_hole_code,</if>
-            <if test="fBottleStorageType != null">f_bottle_storage_type,</if>
-            <if test="fState != null">f_state,</if>
-            <if test="fOptName != null">f_opt_name,</if>
-            <if test="fAddTime != null">f_add_time,</if>
-            <if test="fUpTime != null">f_up_time,</if>
-            <if test="fUpOptName != null">f_up_opt_name,</if>
-            <if test="fRowVersion != null">f_row_version,</if>
+            <if test="pressure != null">f_pressure,</if>
+            <if test="volume != null">f_volume,</if>
+            <if test="appId != null">f_app_id,</if>
+            <if test="qRcode != null">f_q_rcode,</if>
+            <if test="buildUser != null">f_build_user,</if>
+            <if test="pChkDate != null">f_p_chk_date,</if>
+            <if test="nChkDate != null">f_n_chk_date,</if>
+            <if test="productDate != null">f_product_date,</if>
+            <if test="discardDate != null">f_discard_date,</if>
+            <if test="safeJudgeDate != null">f_safe_judge_date,</if>
+            <if test="gPressure != null">f_g_pressure,</if>
+            <if test="wPressure != null">f_w_pressure,</if>
+            <if test="selfWeight != null">f_self_weight,</if>
+            <if test="thickness != null">f_thickness,</if>
+            <if test="permitNo != null">f_permit_no,</if>
+            <if test="valveName != null">f_valve_name,</if>
+            <if test="payImage != null">f_pay_image,</if>
+            <if test="batchImage != null">f_batch_image,</if>
+            <if test="deviceImage != null">f_device_image,</if>
+            <if test="checkImage != null">f_check_image,</if>
+            <if test="equNoImage != null">f_equ_no_image,</if>
+            <if test="selfIdImage != null">f_self_id_image,</if>
+            <if test="botImage != null">f_bot_image,</if>
+            <if test="botSpecName != null">f_bot_spec_name,</if>
+            <if test="bottleType != null">f_bottle_type,</if>
+            <if test="inspectedTimes != null">f_inspected_times,</if>
+            <if test="isSpecialized != null">f_is_specialized,</if>
+            <if test="valveManuFacturer != null">f_valve_manu_facturer,</if>
+            <if test="inspectionLabel != null">f_inspection_label,</if>
+            <if test="thirdPartyLabel != null">f_third_party_label,</if>
+            <if test="holeCode != null">f_hole_code,</if>
+            <if test="bottleStorageType != null">f_bottle_storage_type,</if>
+            <if test="state != null">f_state,</if>
+            <if test="optName != null">f_opt_name,</if>
+            <if test="addTime != null">f_add_time,</if>
+            <if test="upTime != null">f_up_time,</if>
+            <if test="upOptName != null">f_up_opt_name,</if>
+            <if test="rowVersion != null">f_row_version,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fRegCode != null">#{fRegCode},</if>
-            <if test="fEquNo != null">#{fEquNo},</if>
-            <if test="fEquType != null">#{fEquType},</if>
-            <if test="fMedium != null">#{fMedium},</if>
-            <if test="fMakeDate != null">#{fMakeDate},</if>
-            <if test="fMakeInfo != null">#{fMakeInfo},</if>
-            <if test="fSelfId != null">#{fSelfId},</if>
+            <if test="regCode != null">#{regCode},</if>
+            <if test="equNo != null">#{equNo},</if>
+            <if test="equType != null">#{equType},</if>
+            <if test="medium != null">#{medium},</if>
+            <if test="makeDate != null">#{makeDate},</if>
+            <if test="makeInfo != null">#{makeInfo},</if>
+            <if test="selfId != null">#{selfId},</if>
 
-            <if test="fPressure != null">#{fPressure},</if>
-            <if test="fVolume != null">#{fVolume},</if>
-            <if test="fAppId != null">#{fAppId},</if>
-            <if test="fQRcode != null">#{fQRcode},</if>
-            <if test="fBuildUser != null">#{fBuildUser},</if>
-            <if test="fPChkDate != null">#{fPChkDate},</if>
-            <if test="fNChkDate != null">#{fNChkDate},</if>
-            <if test="fProductDate != null">#{fProductDate},</if>
-            <if test="fDiscardDate != null">#{fDiscardDate},</if>
-            <if test="fSafeJudgeDate != null">#{fSafeJudgeDate},</if>
-            <if test="fGPressure != null">#{fGPressure},</if>
-            <if test="fWPressure != null">#{fWPressure},</if>
-            <if test="fSelfWeight != null">#{fSelfWeight},</if>
+            <if test="pressure != null">#{pressure},</if>
+            <if test="volume != null">#{volume},</if>
+            <if test="appId != null">#{appId},</if>
+            <if test="qRcode != null">#{qRcode},</if>
+            <if test="buildUser != null">#{buildUser},</if>
+            <if test="pChkDate != null">#{pChkDate},</if>
+            <if test="nChkDate != null">#{nChkDate},</if>
+            <if test="productDate != null">#{productDate},</if>
+            <if test="discardDate != null">#{discardDate},</if>
+            <if test="safeJudgeDate != null">#{safeJudgeDate},</if>
+            <if test="gPressure != null">#{gPressure},</if>
+            <if test="wPressure != null">#{wPressure},</if>
+            <if test="selfWeight != null">#{selfWeight},</if>
             <if test="fThickness != null">#{fThickness},</if>
-            <if test="fPermitNo != null">#{fPermitNo},</if>
-            <if test="fValveName != null">#{fValveName},</if>
-            <if test="fPayImage != null">#{fPayImage},</if>
-            <if test="fBatchImage != null">#{fBatchImage},</if>
-            <if test="fDeviceImage != null">#{fDeviceImage},</if>
-            <if test="fCheckImage != null">#{fCheckImage},</if>
-            <if test="fEquNoImage != null">#{fEquNoImage},</if>
-            <if test="fSelfIdImage != null">#{fSelfIdImage},</if>
-            <if test="fBotImage != null">#{fBotImage},</if>
-            <if test="fBotSpecName != null">#{fBotSpecName},</if>
-            <if test="fBottleType != null">#{fBottleType},</if>
-            <if test="fInspectedTimes != null">#{fInspectedTimes},</if>
-            <if test="fIsSpecialized != null">#{fIsSpecialized},</if>
-            <if test="fValveManuFacturer != null">#{fValveManuFacturer},</if>
-            <if test="fInspectionLabel != null">#{fInspectionLabel},</if>
-            <if test="fThirdPartyLabel != null">#{fThirdPartyLabel},</if>
-            <if test="fHoleCode != null">#{fHoleCode},</if>
-            <if test="fBottleStorageType != null">#{fBottleStorageType},</if>
-            <if test="fState != null">#{fState},</if>
-            <if test="fOptName != null">#{fOptName},</if>
-            <if test="fAddTime != null">#{fAddTime},</if>
-            <if test="fUpTime != null">#{fUpTime},</if>
+            <if test="permitNo != null">#{permitNo},</if>
+            <if test="valveName != null">#{valveName},</if>
+            <if test="payImage != null">#{payImage},</if>
+            <if test="batchImage != null">#{batchImage},</if>
+            <if test="deviceImage != null">#{deviceImage},</if>
+            <if test="checkImage != null">#{checkImage},</if>
+            <if test="equNoImage != null">#{equNoImage},</if>
+            <if test="selfIdImage != null">#{selfIdImage},</if>
+            <if test="botImage != null">#{botImage},</if>
+            <if test="botSpecName != null">#{botSpecName},</if>
+            <if test="bottleType != null">#{bottleType},</if>
+            <if test="inspectedTimes != null">#{inspectedTimes},</if>
+            <if test="isSpecialized != null">#{isSpecialized},</if>
+            <if test="valveManuFacturer != null">#{valveManuFacturer},</if>
+            <if test="inspectionLabel != null">#{inspectionLabel},</if>
+            <if test="thirdPartyLabel != null">#{thirdPartyLabel},</if>
+            <if test="holeCode != null">#{holeCode},</if>
+            <if test="bottleStorageType != null">#{bottleStorageType},</if>
+            <if test="state != null">#{state},</if>
+            <if test="optName != null">#{optName},</if>
+            <if test="addTime != null">#{addTime},</if>
+            <if test="upTime != null">#{upTime},</if>
 
-            <if test="fUpOptName != null">#{fUpOptName},</if>
-            <if test="fRowVersion != null">#{fRowVersion},</if>
+            <if test="upOptName != null">#{upOptName},</if>
+            <if test="rowVersion != null">#{rowVersion},</if>
          </trim>
     </insert>
 
     <update id="updateTLpgGasBottleFiles" parameterType="TLpgGasBottleFiles">
         update t_lpg_gas_bottle_files
         <trim prefix="SET" suffixOverrides=",">
-            <if test="fRegCode != null">f_reg_code = #{fRegCode},</if>
-            <if test="fEquNo != null">f_equ_no = #{fEquNo},</if>
-            <if test="fEquType != null">f_equ_type = #{fEquType},</if>
-            <if test="fMedium != null">f_medium = #{fMedium},</if>
-            <if test="fMakeDate != null">f_make_date = #{fMakeDate},</if>
-            <if test="fMakeInfo != null">f_make_info = #{fMakeInfo},</if>
-            <if test="fSelfId != null">f_self_id = #{fSelfId},</if>
+            <if test="regCode != null">f_reg_code = #{regCode},</if>
+            <if test="equNo != null">f_equ_no = #{equNo},</if>
+            <if test="equType != null">f_equ_type = #{equType},</if>
+            <if test="medium != null">f_medium = #{medium},</if>
+            <if test="makeDate != null">f_make_date = #{makeDate},</if>
+            <if test="makeInfo != null">f_make_info = #{makeInfo},</if>
+            <if test="selfId != null">f_self_id = #{selfId},</if>
 
-            <if test="fPressure != null">f_pressure = #{fPressure},</if>
-            <if test="fVolume != null">f_volume = #{fVolume},</if>
-            <if test="fAppId != null">f_app_id = #{fAppId},</if>
-            <if test="fQRcode != null">f_q_rcode = #{fQRcode},</if>
-            <if test="fBuildUser != null">f_build_user = #{fBuildUser},</if>
-            <if test="fPChkDate != null">f_p_chk_date = #{fPChkDate},</if>
-            <if test="fNChkDate != null">f_n_chk_date = #{fNChkDate},</if>
-            <if test="fProductDate != null">f_product_date = #{fProductDate},</if>
-            <if test="fDiscardDate != null">f_discard_date = #{fDiscardDate},</if>
-            <if test="fSafeJudgeDate != null">f_safe_judge_date = #{fSafeJudgeDate},</if>
-            <if test="fGPressure != null">f_g_pressure = #{fGPressure},</if>
-            <if test="fWPressure != null">f_w_pressure = #{fWPressure},</if>
-            <if test="fSelfWeight != null">f_self_weight = #{fSelfWeight},</if>
-            <if test="fThickness != null">f_thickness = #{fThickness},</if>
-            <if test="fPermitNo != null">f_permit_no = #{fPermitNo},</if>
-            <if test="fValveName != null">f_valve_name = #{fValveName},</if>
-            <if test="fPayImage != null">f_pay_image = #{fPayImage},</if>
-            <if test="fBatchImage != null">f_batch_image = #{fBatchImage},</if>
-            <if test="fDeviceImage != null">f_device_image = #{fDeviceImage},</if>
-            <if test="fCheckImage != null">f_check_image = #{fCheckImage},</if>
-            <if test="fEquNoImage != null">f_equ_no_image = #{fEquNoImage},</if>
-            <if test="fSelfIdImage != null">f_self_id_image = #{fSelfIdImage},</if>
-            <if test="fBotImage != null">f_bot_image = #{fBotImage},</if>
-            <if test="fBotSpecName != null">f_bot_spec_name = #{fBotSpecName},</if>
-            <if test="fBottleType != null">f_bottle_type = #{fBottleType},</if>
-            <if test="fInspectedTimes != null">f_inspected_times = #{fInspectedTimes},</if>
-            <if test="fIsSpecialized != null">f_is_specialized = #{fIsSpecialized},</if>
-            <if test="fValveManuFacturer != null">f_valve_manu_facturer = #{fValveManuFacturer},</if>
-            <if test="fInspectionLabel != null">f_inspection_label = #{fInspectionLabel},</if>
-            <if test="fThirdPartyLabel != null">f_third_party_label = #{fThirdPartyLabel},</if>
-            <if test="fHoleCode != null">f_hole_code = #{fHoleCode},</if>
-            <if test="fBottleStorageType != null">f_bottle_storage_type = #{fBottleStorageType},</if>
-            <if test="fState != null">f_state = #{fState},</if>
-            <if test="fOptName != null">f_opt_name = #{fOptName},</if>
-            <if test="fAddTime != null">f_add_time = #{fAddTime},</if>
-            <if test="fUpTime != null">f_up_time = #{fUpTime},</if>
-            <if test="fUpOptName != null">f_up_opt_name = #{fUpOptName},</if>
-            <if test="fRowVersion != null">f_row_version = #{fRowVersion},</if>
+            <if test="pressure != null">f_pressure = #{pressure},</if>
+            <if test="volume != null">f_volume = #{volume},</if>
+            <if test="appId != null">f_app_id = #{appId},</if>
+            <if test="qRcode != null">f_q_rcode = #{qRcode},</if>
+            <if test="buildUser != null">f_build_user = #{buildUser},</if>
+            <if test="pChkDate != null">f_p_chk_date = #{pChkDate},</if>
+            <if test="nChkDate != null">f_n_chk_date = #{nChkDate},</if>
+            <if test="productDate != null">f_product_date = #{productDate},</if>
+            <if test="discardDate != null">f_discard_date = #{discardDate},</if>
+            <if test="safeJudgeDate != null">f_safe_judge_date = #{safeJudgeDate},</if>
+            <if test="gPressure != null">f_g_pressure = #{gPressure},</if>
+            <if test="wPressure != null">f_w_pressure = #{wPressure},</if>
+            <if test="selfWeight != null">f_self_weight = #{selfWeight},</if>
+            <if test="thickness != null">f_thickness = #{thickness},</if>
+            <if test="permitNo != null">f_permit_no = #{permitNo},</if>
+            <if test="valveName != null">f_valve_name = #{valveName},</if>
+            <if test="payImage != null">f_pay_image = #{payImage},</if>
+            <if test="batchImage != null">f_batch_image = #{batchImage},</if>
+            <if test="deviceImage != null">f_device_image = #{deviceImage},</if>
+            <if test="checkImage != null">f_check_image = #{checkImage},</if>
+            <if test="equNoImage != null">f_equ_no_image = #{equNoImage},</if>
+            <if test="selfIdImage != null">f_self_id_image = #{selfIdImage},</if>
+            <if test="botImage != null">f_bot_image = #{botImage},</if>
+            <if test="botSpecName != null">f_bot_spec_name = #{botSpecName},</if>
+            <if test="bottleType != null">f_bottle_type = #{bottleType},</if>
+            <if test="inspectedTimes != null">f_inspected_times = #{inspectedTimes},</if>
+            <if test="isSpecialized != null">f_is_specialized = #{isSpecialized},</if>
+            <if test="valveManuFacturer != null">f_valve_manu_facturer = #{valveManuFacturer},</if>
+            <if test="inspectionLabel != null">f_inspection_label = #{inspectionLabel},</if>
+            <if test="thirdPartyLabel != null">f_third_party_label = #{thirdPartyLabel},</if>
+            <if test="holeCode != null">f_hole_code = #{holeCode},</if>
+            <if test="bottleStorageType != null">f_bottle_storage_type = #{bottleStorageType},</if>
+            <if test="state != null">f_state = #{state},</if>
+            <if test="optName != null">f_opt_name = #{optName},</if>
+            <if test="addTime != null">f_add_time = #{addTime},</if>
+            <if test="upTime != null">f_up_time = #{upTime},</if>
+            <if test="upOptName != null">f_up_opt_name = #{upOptName},</if>
+            <if test="rowVersion != null">f_row_version = #{rowVersion},</if>
         </trim>
         where f_gas_bottle_files_id = #{fGasBottleFilesId}
     </update>

zh-baseversion-web/src/api/lpgRegulation/files.js

@@ -51,3 +51,12 @@ export function exportFiles(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

 <template>
   <div class="app-container">
     <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
-          v-model="queryParams.fMakeInfo"
+          v-model="queryParams.makeInfo"
           placeholder="请输入生产(制造)单位"
           clearable
           size="small"
         />
       </el-form-item>
 
-      <el-form-item label="气瓶条码" prop="fQRcode">
+      <el-form-item label="气瓶条码" prop="qRcode">
         <el-input
-          v-model="queryParams.fQRcode"
+          v-model="queryParams.qRcode"
           placeholder="请输入气瓶条码"
           clearable
           size="small"
@@ -20,9 +20,9 @@
       </el-form-item>
 
       <el-form-item label="钢瓶状态" prop="fState">
-        <el-select v-model="queryParams.fState" placeholder="请选择钢瓶状态" clearable>
+        <el-select v-model="queryParams.state" placeholder="请选择钢瓶状态" clearable>
           <el-option
-            v-for="item in fStateOptions"
+            v-for="item in stateOptions"
             :key="item.value"
             :label="item.label"
             :value="item.value">
@@ -46,43 +46,54 @@
           @click="handleExport"
           v-hasPermi="['system:files:export']"
         >导出</el-button>
+        
       </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>
     </el-row>
 
     <el-table v-loading="loading" :data="filesList" @selection-change="handleSelectionChange">
       <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="fQRcode" :show-overflow-tooltip="true"/>
-      <el-table-column label="钢瓶规格名称" align="center" prop="fBotSpecName" :show-overflow-tooltip="true"/>
-      <el-table-column label="钢瓶型号" align="center" prop="fBottleType" :show-overflow-tooltip="true"/>
-      <el-table-column label="上检日期" align="center" prop="fPChkDate">
+      <el-table-column label="生产(制造)单位" align="center" prop="makeInfo" :show-overflow-tooltip="true"/>
+      <el-table-column label="气瓶条码" align="center" prop="qRcode" :show-overflow-tooltip="true"/>
+      <el-table-column label="钢瓶规格名称" align="center" prop="botSpecName" :show-overflow-tooltip="true"/>
+      <el-table-column label="钢瓶型号" align="center" prop="bottleType" :show-overflow-tooltip="true"/>
+      <el-table-column label="上检日期" align="center" prop="pChkDate">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fPChkDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.pChkDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="下检日期" align="center" prop="fNChkDate">
+      <el-table-column label="下检日期" align="center" prop="nChkDate">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fNChkDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.nChkDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="生产日期" align="center" prop="fProductDate">
+      <el-table-column label="生产日期" align="center" prop="productDate">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fProductDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="报废日期" align="center" prop="fDiscardDate">
+      <el-table-column label="报废日期" align="center" prop="discardDate">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fDiscardDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.discardDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="安全评定日期" align="center" prop="fSafeJudgeDate">
+      <el-table-column label="安全评定日期" align="center" prop="safeJudgeDate">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fSafeJudgeDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.safeJudgeDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="已检验次数" align="center" prop="fInspectedTimes"/>
-      <el-table-column label="钢瓶状态" align="center"  prop="fState"/>
+      <el-table-column label="已检验次数" align="center" prop="inspectedTimes"/>
+      <el-table-column label="钢瓶状态" align="center"  prop="state"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -104,13 +115,45 @@
     />
     <!-- 详情 -->
     <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>
 </template>
 
 <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 DetailInfo from "./components/indexInfo";
+import { getToken } from "@/utils/auth"; 
 
 export default {
   name: "Files",
@@ -119,7 +162,23 @@ export default {
   },
   data() {
     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,
           label: '新增'
@@ -157,18 +216,18 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        fPChkDate: null,
-        fNChkDate: null,
-        fProductDate: null,
-        fDiscardDate: null,
-        fSafeJudgeDate: null,
-        fGPressure: null,
-        fWPressure: null,
-        fSelfWeight: null,
-        fPermitNo: null,
-        fValveName: null,
-        fState: null,
-        fMakeInfo: null
+        cChkDate: null,
+        nChkDate: null,
+        productDate: null,
+        discardDate: null,
+        safeJudgeDate: null,
+        gPressure: null,
+        wPressure: null,
+        selfWeight: null,
+        permitNo: null,
+        valveName: null,
+        state: null,
+        makeInfo: null
       },
       // 表单参数
       form: {},
@@ -181,14 +240,55 @@ export default {
     this.getList();
   },
   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 - 下发字典翻译
     fStateFormat(row, column ) {
-      if (row.fState === 1) {
+      if (row.state === 1) {
           return "新增"
-      } else if(row.fState  === 2) {
+      } else if(row.state  === 2) {
           return "修改"
-      } else if(row.fState  === -1) {
+      } else if(row.state  === -1) {
           return "删除"
       }
     },
@@ -210,97 +310,97 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        fGasBottleFilesId: null,
-        fStationId: null,
-        fRegId: null,
-        fRegCode: null,
-        fEquNo: null,
-        fEquTypeCode: null,
-        fEquType: null,
-        fMediumCode: null,
-        fMedium: null,
-        fMakeDate: null,
-        fMakeInfo: null,
-        fSelfId: null,
-        fNumber: null,
-        fAllowedFillingWeight: null,
-        fWayCard: null,
-        fProvinceCode: null,
-        fProvinceName: null,
-        fCityCode: null,
-        fCityName: null,
-        fCountryCode: null,
-        fCountryName: null,
-        fPressure: null,
-        fVolume: null,
-        fVolumeUnit: null,
-        fCheckId: null,
-        fCheckReportNo: null,
-        fIsCard: null,
-        fDepartmentId: null,
-        fCheckDeptCode: null,
-        fCheckDeptName: null,
-        fCheckDate: null,
-        fNextCheckDate: null,
-        fScrapId: null,
-        fScrapDate: null,
-        fScrapNo: null,
-        fBottleStatus: "0",
-        fReportStatus: 0,
-        fChangeStatus: 0,
-        fStatus: "0",
-        fSbCode: null,
-        fCardRecId: null,
-        fAppId: null,
-        fQRcode: null,
-        fCardSendMan: null,
-        fCardSendDeptCode: null,
-        fCardSendDeptName: null,
-        fCardSendTime: null,
-        fBuildUserId: null,
-        fBuildUser: null,
-        fBak0: null,
-        fBak1: null,
-        fBak2: null,
-        fPChkDate: null,
-        fNChkDate: null,
-        fProductDate: null,
-        fDiscardDate: null,
-        fSafeJudgeDate: null,
-        fGPressure: null,
-        fWPressure: null,
-        fSelfWeight: null,
-        fThickness: null,
-        fPermitNo: null,
-        fValveType: null,
-        fValveName: null,
-        fImageList: null,
-        fPayImage: null,
-        fBatchImage: null,
-        fDeviceImage: null,
-        fCheckImage: null,
-        fEquNoImage: null,
-        fSelfIdImage: null,
-        fBotImage: null,
-        fBotSpecType: null,
-        fBotSpecName: null,
-        fBottleType: null,
-        fInspectedTimes: null,
-        fIsSpecialized: null,
-        fValveManuFacturer: null,
-        fInspectionLabel: null,
-        fThirdPartyLabel: null,
-        fHoleCode: null,
-        fBottleStorageType: null,
-        fSourceFrom: null,
-        fRowVersion: null,
-        fState: null,
-        fOptId: null,
-        fOptName: null,
-        fAddTime: null,
-        fUpTime: null,
-        fUpOptId: null,
-        fUpOptName: null
+        gasBottleFilesId: null,
+        stationId: null,
+        regId: null,
+        regCode: null,
+        equNo: null,
+        equTypeCode: null,
+        equType: null,
+        mediumCode: null,
+        medium: null,
+        makeDate: null,
+        makeInfo: null,
+        selfId: null,
+        number: null,
+        allowedFillingWeight: null,
+        wayCard: null,
+        provinceCode: null,
+        provinceName: null,
+        cityCode: null,
+        cityName: null,
+        countryCode: null,
+        countryName: null,
+        pressure: null,
+        volume: null,
+        volumeUnit: null,
+        checkId: null,
+        checkReportNo: null,
+        isCard: null,
+        departmentId: null,
+        checkDeptCode: null,
+        checkDeptName: null,
+        checkDate: null,
+        nextCheckDate: null,
+        scrapId: null,
+        scrapDate: null,
+        scrapNo: null,
+        bottleStatus: "0",
+        reportStatus: 0,
+        changeStatus: 0,
+        status: "0",
+        sbCode: null,
+        cardRecId: null,
+        appId: null,
+        qRcode: null,
+        cardSendMan: null,
+        cardSendDeptCode: null,
+        cardSendDeptName: null,
+        cardSendTime: null,
+        buildUserId: null,
+        buildUser: null,
+        bak0: null,
+        bak1: null,
+        bak2: null,
+        pChkDate: null,
+        nChkDate: null,
+        productDate: null,
+        discardDate: null,
+        safeJudgeDate: null,
+        gPressure: null,
+        wPressure: null,
+        selfWeight: null,
+        thickness: null,
+        permitNo: null,
+        valveType: null,
+        valveName: null,
+        imageList: null,
+        payImage: null,
+        batchImage: null,
+        deviceImage: null,
+        checkImage: null,
+        equNoImage: null,
+        selfIdImage: null,
+        botImage: null,
+        botSpecType: null,
+        botSpecName: null,
+        bottleType: null,
+        inspectedTimes: null,
+        isSpecialized: null,
+        valveManuFacturer: null,
+        inspectionLabel: null,
+        thirdPartyLabel: null,
+        holeCode: null,
+        bottleStorageType: null,
+        sourceFrom: null,
+        rowVersion: null,
+        state: null,
+        optId: null,
+        optName: null,
+        addTime: null,
+        upTime: null,
+        upOptId: null,
+        upOptName: null
       };
       this.resetForm("form");
     },
@@ -316,13 +416,13 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.fGasBottleFilesId)
+      this.ids = selection.map(item => item.gasBottleFilesId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
     //详情
     handleDetail(row){
-      this.$refs.detail.getDetailInfo(row.fGasBottleFilesId);
+      this.$refs.detail.getDetailInfo(row.gasBottleFilesId);
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -332,11 +432,13 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
+          this.$showLoading.show();
           this.exportLoading = true;
           return exportFiles(queryParams);
         }).then(response => {
           this.download(response.msg);
           this.exportLoading = false;
+          this.$showLoading.hide();
         }).catch(() => {});
     }
   }