Skip to content

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

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

parent 53052611
Show whitespace changes
Inline Side-by-side
Showing with 252 additions and 190 deletions
zh-baseversion-admin/src/main/java/com/zehong/web/controller/lpgRegulation/TLpgGasBottleFilesController.java
View file @ 8d2145db
package com.zehong.web.controller.lpgRegulation;
import java.util.List;
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;
......@@ -56,8 +53,8 @@ public class TLpgGasBottleFilesController extends BaseController
@GetMapping("/export")
public AjaxResult export(TLpgGasBottleFiles tLpgGasBottleFiles)
{
List<TLpgGasBottleFiles> list = tLpgGasBottleFilesService.selectTLpgGasBottleFilesList(tLpgGasBottleFiles);
ExcelUtil<TLpgGasBottleFiles> util = new ExcelUtil<TLpgGasBottleFiles>(TLpgGasBottleFiles.class);
List<TLpgGasBottleFiles> list = tLpgGasBottleFilesService.exportTLpgGasBottleFilesList(tLpgGasBottleFiles);
ExcelUtil<TLpgGasBottleFiles> util = new ExcelUtil<>(TLpgGasBottleFiles.class);
return util.exportExcel(list, "液化石油气-气瓶档案数据");
}
......@@ -124,8 +121,8 @@ public class TLpgGasBottleFilesController extends BaseController
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);
tLpgGasBottleFilesService.importLpgGasBottleFilesInfo(XmbhList, updateSupport, response);
return AjaxResult.success();
}
}
zh-baseversion-admin/src/main/java/com/zehong/web/controller/task/TimeTasksController.java
View file @ 8d2145db
......@@ -138,29 +138,29 @@ public class TimeTasksController {
tLpgGasBottleFiles.setVolume(new BigDecimal(0));
}
tLpgGasBottleFiles.setAppId(jsonObject.getString("appId"));
tLpgGasBottleFiles.setqRcode(jsonObject.getString("qRcode"));
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.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.setgPressure(new BigDecimal(gpressure));
tLpgGasBottleFiles.setGpressure(new BigDecimal(gpressure));
} else {
tLpgGasBottleFiles.setgPressure(new BigDecimal(0));
tLpgGasBottleFiles.setGpressure(new BigDecimal(0));
}
String wpressure = jsonObject.getString("wpressure");
if (wpressure != null && !wpressure.isEmpty()) {
tLpgGasBottleFiles.setwPressure(new BigDecimal(wpressure));
tLpgGasBottleFiles.setWpressure(new BigDecimal(wpressure));
} else {
tLpgGasBottleFiles.setwPressure(new BigDecimal(0));
tLpgGasBottleFiles.setWpressure(new BigDecimal(0));
}
String selfWeight = jsonObject.getString("selfWeight");
if (selfWeight != null && !selfWeight.isEmpty()) {
......
zh-baseversion-system/src/main/java/com/zehong/system/domain/TLpgGasBottleFiles.java
View file @ 8d2145db
......@@ -3,8 +3,6 @@ package com.zehong.system.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
......@@ -27,7 +25,7 @@ public class TLpgGasBottleFiles extends BaseEntity
/** 气瓶条码 */
@Excel(name = "气瓶条码", width = 30 )
private String qRcode;
private String qrcode;
/** 登记证号 */
@Excel(name = "登记证号", width = 30 )
......@@ -80,7 +78,7 @@ public class TLpgGasBottleFiles extends BaseEntity
private Date upTime;
/** 状态1 新增、2 修改、-1、删除 （默认1） 3.注销 */
@Excel(name = "气瓶状态 ", readConverterExp = "1=新增,2=修改,-1=删除")
//@Excel(name = "气瓶状态 ", readConverterExp = "1=新增,2=修改,-1=删除") 2024-09-13 wh 去掉，感觉监管不需要
private String state;
/** 修改人姓名 */
......@@ -89,12 +87,12 @@ public class TLpgGasBottleFiles extends BaseEntity
/** 上检日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "上检日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date pChkDate;
private Date pchkDate;
/** 下检日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "下检日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date nChkDate;
private Date nchkDate;
/** 生产日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
......@@ -113,11 +111,11 @@ public class TLpgGasBottleFiles extends BaseEntity
/** 公称压力Mpa */
@Excel(name = "公称压力/Mpa")
private BigDecimal gPressure;
private BigDecimal gpressure;
/** 水试验压力Mpa */
@Excel(name = "水试验压力/Mpa")
private BigDecimal wPressure;
private BigDecimal wpressure;
/** 标准重量KG */
@Excel(name = "标准重量/KG")
......@@ -176,7 +174,7 @@ public class TLpgGasBottleFiles extends BaseEntity
private Long inspectedTimes;
/** 是否专用(1:专用 2：托管) */
@Excel(name = "是否专用")
//@Excel(name = "是否专用") 2024-09-13 wh 去掉，感觉监管不需要
private String isSpecialized;
/** 阀厂家 */
......@@ -216,15 +214,6 @@ public class TLpgGasBottleFiles extends BaseEntity
public void setMakeInfo(String makeInfo) {
this.makeInfo = makeInfo;
}
public String getqRcode() {
return qRcode;
}
public void setqRcode(String qRcode) {
this.qRcode = qRcode;
}
public String getRegCode() {
return regCode;
}
......@@ -345,22 +334,6 @@ public class TLpgGasBottleFiles extends BaseEntity
this.upOptName = upOptName;
}
public Date getpChkDate() {
return pChkDate;
}
public void setpChkDate(Date pChkDate) {
this.pChkDate = pChkDate;
}
public Date getnChkDate() {
return nChkDate;
}
public void setnChkDate(Date nChkDate) {
this.nChkDate = nChkDate;
}
public Date getProductDate() {
return productDate;
}
......@@ -385,22 +358,6 @@ public class TLpgGasBottleFiles extends BaseEntity
this.safeJudgeDate = safeJudgeDate;
}
public BigDecimal getgPressure() {
return gPressure;
}
public void setgPressure(BigDecimal gPressure) {
this.gPressure = gPressure;
}
public BigDecimal getwPressure() {
return wPressure;
}
public void setwPressure(BigDecimal wPressure) {
this.wPressure = wPressure;
}
public BigDecimal getSelfWeight() {
return selfWeight;
}
......@@ -569,12 +526,52 @@ public class TLpgGasBottleFiles extends BaseEntity
this.rowVersion = rowVersion;
}
public String getQrcode() {
return qrcode;
}
public void setQrcode(String qrcode) {
this.qrcode = qrcode;
}
public Date getPchkDate() {
return pchkDate;
}
public void setPchkDate(Date pchkDate) {
this.pchkDate = pchkDate;
}
public Date getNchkDate() {
return nchkDate;
}
public void setNchkDate(Date nchkDate) {
this.nchkDate = nchkDate;
}
public BigDecimal getGpressure() {
return gpressure;
}
public void setGpressure(BigDecimal gpressure) {
this.gpressure = gpressure;
}
public BigDecimal getWpressure() {
return wpressure;
}
public void setWpressure(BigDecimal wpressure) {
this.wpressure = wpressure;
}
@Override
public String toString() {
return "TLpgGasBottleFiles{" +
"gasBottleFilesId=" + gasBottleFilesId +
", makeInfo='" + makeInfo + '\'' +
", qRcode='" + qRcode + '\'' +
", qRcode='" + qrcode + '\'' +
", regCode='" + regCode + '\'' +
", equNo='" + equNo + '\'' +
", equType='" + equType + '\'' +
......@@ -590,13 +587,13 @@ public class TLpgGasBottleFiles extends BaseEntity
", upTime=" + upTime +
", state='" + state + '\'' +
", upOptName='" + upOptName + '\'' +
", pChkDate=" + pChkDate +
", nChkDate=" + nChkDate +
", pChkDate=" + pchkDate +
", nChkDate=" + nchkDate +
", productDate=" + productDate +
", discardDate=" + discardDate +
", safeJudgeDate=" + safeJudgeDate +
", gPressure=" + gPressure +
", wPressure=" + wPressure +
", gPressure=" + gpressure +
", wPressure=" + wpressure +
", selfWeight=" + selfWeight +
", thickness=" + thickness +
", permitNo='" + permitNo + '\'' +
......
zh-baseversion-system/src/main/java/com/zehong/system/mapper/TLpgGasBottleFilesMapper.java
View file @ 8d2145db
......@@ -28,6 +28,13 @@ public interface TLpgGasBottleFilesMapper
*/
public List<TLpgGasBottleFiles> selectTLpgGasBottleFilesList(TLpgGasBottleFiles tLpgGasBottleFiles);
/**
* 导出查询
* @param tLpgGasBottleFiles t
* @return r
*/
public List<TLpgGasBottleFiles> exportTLpgGasBottleFilesList(TLpgGasBottleFiles tLpgGasBottleFiles);
/**
* 根据 气瓶条码 集合查询数据
* @param codeList codelist
......@@ -43,6 +50,13 @@ public interface TLpgGasBottleFilesMapper
*/
public int insertTLpgGasBottleFiles(TLpgGasBottleFiles tLpgGasBottleFiles);
/**
* 批量插入
* @param list list
* @return r
*/
public int insertBatch(List<TLpgGasBottleFiles> list);
/**
* 修改液化石油气-气瓶档案
*
......
zh-baseversion-system/src/main/java/com/zehong/system/service/ITLpgGasBottleFilesService.java
View file @ 8d2145db
......@@ -31,6 +31,12 @@ public interface ITLpgGasBottleFilesService
*/
public List<TLpgGasBottleFiles> selectTLpgGasBottleFilesList(TLpgGasBottleFiles tLpgGasBottleFiles);
/**
* 导出查询
* @param tLpgGasBottleFiles t
* @return r
*/
public List<TLpgGasBottleFiles> exportTLpgGasBottleFilesList(TLpgGasBottleFiles tLpgGasBottleFiles);
/**
* 新增液化石油气-气瓶档案
*
......@@ -70,6 +76,6 @@ public interface ITLpgGasBottleFilesService
* @param response res
* @return r
*/
public Map<String,Object> importLpgGasBottleFilesInfo(List<TLpgGasBottleFiles> xmbhList, boolean updateSupport, HttpServletResponse response);
public void importLpgGasBottleFilesInfo(List<TLpgGasBottleFiles> xmbhList, boolean updateSupport, HttpServletResponse response);
}
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TLpgAirChargeFilesServiceImpl.java
View file @ 8d2145db
......@@ -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::getqRcode));
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
View file @ 8d2145db
......@@ -98,13 +98,13 @@ public class TLpgDeliveryRecordServiceImpl implements ITLpgDeliveryRecordService
// 气瓶条码处理
TLpgGasBottleFiles tLpgGasBottleFiles = new TLpgGasBottleFiles();
tLpgGasBottleFiles.setqRcode(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).getqRcode());
lpgDeliveryRecord.setBottleCode(tLpgGasBottleFiles1.get(0).getQrcode());
// 燃气用户处理
......
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TLpgGasBottleFilesServiceImpl.java
View file @ 8d2145db
......@@ -48,6 +48,16 @@ public class TLpgGasBottleFilesServiceImpl implements ITLpgGasBottleFilesService
return tLpgGasBottleFilesMapper.selectTLpgGasBottleFilesList(tLpgGasBottleFiles);
}
/**
* 导出
* @param tLpgGasBottleFiles t
* @return r
*/
@Override
public List<TLpgGasBottleFiles> exportTLpgGasBottleFilesList(TLpgGasBottleFiles tLpgGasBottleFiles) {
return tLpgGasBottleFilesMapper.exportTLpgGasBottleFilesList(tLpgGasBottleFiles);
}
/**
* 新增液化石油气-气瓶档案
*
......@@ -104,12 +114,9 @@ public class TLpgGasBottleFilesServiceImpl implements ITLpgGasBottleFilesService
* @return r
*/
@Override
public Map<String, Object> importLpgGasBottleFilesInfo(List<TLpgGasBottleFiles> xmbhList, boolean updateSupport, HttpServletResponse response) {
for (TLpgGasBottleFiles tLpgGasBottleFiles : xmbhList) {
System.out.println(tLpgGasBottleFiles.getqRcode());
public void importLpgGasBottleFilesInfo(List<TLpgGasBottleFiles> xmbhList, boolean updateSupport, HttpServletResponse response) {
if (xmbhList.size() > 0) {
tLpgGasBottleFilesMapper.insertBatch(xmbhList);
}
return null;
}
}
zh-baseversion-system/src/main/resources/mapper/system/TLpgGasBottleFilesMapper.xml
View file @ 8d2145db
......@@ -16,20 +16,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="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="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="wpressure" column="f_g_pressure" />
<result property="gpressure" column="f_w_pressure" />
<result property="selfWeight" column="f_self_weight" />
<result property="thickness" column="f_thickness" />
<result property="permitNo" column="f_permit_no" />
......@@ -61,20 +61,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
f_opt_name, f_add_time, f_up_time, f_up_opt_name, f_row_version from t_lpg_gas_bottle_files
</sql>
<sql id="exportTLpgGasBottleFilesVo">
select f_gas_bottle_files_id, f_reg_code, f_equ_no, f_equ_type, f_medium, f_make_date, f_make_info, f_self_id,f_pressure, f_volume, f_app_id, f_q_rcode,f_build_user,f_p_chk_date, f_n_chk_date, f_product_date, f_discard_date, f_safe_judge_date, f_g_pressure, f_w_pressure, f_self_weight, f_thickness, f_permit_no, f_valve_name, f_pay_image, f_batch_image, f_device_image, f_check_image, f_equ_no_image, f_self_id_image, f_bot_image, f_bot_spec_name, f_bottle_type, f_inspected_times,
f_is_specialized,
f_valve_manu_facturer, f_inspection_label, f_third_party_label, f_hole_code, f_bottle_storage_type,
f_state,
f_opt_name, f_add_time, f_up_time, f_up_opt_name, f_row_version from t_lpg_gas_bottle_files
</sql>
<select id="selectTLpgGasBottleFilesList" parameterType="TLpgGasBottleFiles" resultMap="TLpgGasBottleFilesResult">
<include refid="selectTLpgGasBottleFilesVo"/>
<where>
<if test="pChkDate != null "> and f_p_chk_date = #{pChkDate}</if>
<if test="nChkDate != null "> and f_n_chk_date = #{nChkDate}</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="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="qrcode != null and qrcode != ''"> and f_q_rcode like concat('%', #{qrcode}, '%')</if>
<if test="state != null "> and f_state = #{state}</if>
</where>
</select>
<select id="exportTLpgGasBottleFilesList" parameterType="TLpgGasBottleFiles" resultMap="TLpgGasBottleFilesResult">
<include refid="exportTLpgGasBottleFilesVo"/>
<where>
<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 qrcode != ''"> and f_q_rcode like concat('%', #{qrcode}, '%')</if>
<if test="state != null "> and f_state = #{state}</if>
</where>
</select>
......@@ -90,6 +116,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectTLpgGasBottleFilesVo"/>
where f_gas_bottle_files_id = #{fGasBottleFilesId}
</select>
<insert id="insertBatch" parameterType="list">
insert into t_lpg_gas_bottle_files (f_reg_code, f_equ_no,f_equ_type,f_medium,f_make_date,f_make_info,
f_self_id,f_pressure,f_volume,f_app_id,f_q_rcode,f_build_user,f_p_chk_date,f_n_chk_date,f_product_date,
f_discard_date,f_safe_judge_date,f_g_pressure,f_w_pressure,f_self_weight,f_thickness,f_permit_no,
f_valve_name,f_bot_spec_name,f_bottle_type,f_inspected_times,f_is_specialized,f_valve_manu_facturer,
f_inspection_label, f_third_party_label,f_hole_code,f_bottle_storage_type,f_state,f_opt_name,f_add_time,
f_up_time,f_up_opt_name,f_row_version)
values
<foreach collection="list" item="item" index="index" separator=",">
(#{item.regCode,jdbcType=VARCHAR}, #{item.equNo}, #{item.equType,jdbcType=VARCHAR},
#{item.medium,jdbcType=VARCHAR}, #{item.makeDate,jdbcType=VARCHAR}, #{item.makeInfo},
#{item.selfId},#{item.pressure},#{item.volume},#{item.appId},
#{item.qrcode},#{item.buildUser},#{item.pchkDate},#{item.nchkDate},#{item.productDate},
#{item.discardDate,jdbcType=VARCHAR}, #{item.safeJudgeDate}, #{item.gpressure,jdbcType=VARCHAR},
#{item.wpressure,jdbcType=VARCHAR}, #{item.selfWeight,jdbcType=VARCHAR}, #{item.thickness},
#{item.permitNo},#{item.valveName},#{item.botSpecName},#{item.bottleType},
#{item.inspectedTimes},#{item.isSpecialized},#{item.valveManuFacturer},#{item.inspectionLabel},#{item.thirdPartyLabel},
#{item.holeCode,jdbcType=VARCHAR}, #{item.bottleStorageType}, #{item.state,jdbcType=VARCHAR},
#{item.optName,jdbcType=VARCHAR}, #{item.addTime}, #{item.upTime},
#{item.upOptName},#{item.rowVersion})
</foreach>
</insert>
<insert id="insertTLpgGasBottleFiles" parameterType="TLpgGasBottleFiles" useGeneratedKeys="true" keyProperty="fGasBottleFilesId">
insert into t_lpg_gas_bottle_files
......@@ -105,15 +154,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="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="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="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>
......@@ -153,15 +202,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="qrcode != null">#{qrcode},</if>
<if test="buildUser != null">#{buildUser},</if>
<if test="pChkDate != null">#{pChkDate},</if>
<if test="nChkDate != null">#{nChkDate},</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="gpressure != null">#{gpressure},</if>
<if test="wpressure != null">#{wpressure},</if>
<if test="selfWeight != null">#{selfWeight},</if>
<if test="fThickness != null">#{fThickness},</if>
<if test="permitNo != null">#{permitNo},</if>
......@@ -206,15 +255,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="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="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="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>
......
zh-baseversion-web/src/views/lpgRegulation/gasbottlefiles/components/indexInfo.vue
View file @ 8d2145db
......@@ -7,7 +7,7 @@
<el-col :span="12">
<el-form-item label="生产(制造)单位">
<span v-if="detailInfo.fMakeInfo">{{ detailInfo.fMakeInfo }}</span>
<span v-if="detailInfo.makeInfo">{{ detailInfo.makeInfo }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......@@ -15,7 +15,7 @@
<el-col :span="12">
<el-form-item label="气瓶条码">
<span v-if="detailInfo.fQRcode">{{ detailInfo.fQRcode }}</span>
<span v-if="detailInfo.qrcode">{{ detailInfo.qrcode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......@@ -23,137 +23,137 @@
<el-col :span="12">
<el-form-item label="产品编号">
<span v-if="detailInfo.fEquNo">{{ detailInfo.fEquNo }}</span>
<span v-if="detailInfo.equNo">{{ detailInfo.equNo }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备类型">
<span v-if="detailInfo.fEquType">{{ detailInfo.fEquType }}</span>
<span v-if="detailInfo.equType">{{ detailInfo.equType }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="充装介质">
<span v-if="detailInfo.fMedium">{{ detailInfo.fMedium }}</span>
<span v-if="detailInfo.medium">{{ detailInfo.medium }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产日期">
<span v-if="detailInfo.fProductDate">{{ detailInfo.fProductDate }}</span>
<span v-if="detailInfo.productDate">{{ detailInfo.productDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="登记证号">
<span v-if="detailInfo.fRegCode">{{ detailInfo.fRegCode }}</span>
<span v-if="detailInfo.regCode">{{ detailInfo.regCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单位内编号">
<span v-if="detailInfo.fSelfId">{{ detailInfo.fSelfId }}</span>
<span v-if="detailInfo.selfId">{{ detailInfo.selfId }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公称工作压力(MPa)">
<span v-if="detailInfo.fPressure">{{ detailInfo.fPressure}}</span>
<span v-if="detailInfo.pressure">{{ detailInfo.pressure}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="容积(L)">
<span v-if="detailInfo.fVolume">{{ detailInfo.fVolume}}</span>
<span v-if="detailInfo.volume">{{ detailInfo.volume}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="使用单位">
<span v-if="detailInfo.fBuildUser">{{ detailInfo.fBuildUser}}</span>
<span v-if="detailInfo.buildUser">{{ detailInfo.buildUser}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上检日期">
<span v-if="detailInfo.fPChkDate">{{ detailInfo.fPChkDate }}</span>
<span v-if="detailInfo.pchkDate">{{ detailInfo.pchkDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="下检日期">
<span v-if="detailInfo.fNChkDate">{{ detailInfo.fNChkDate }}</span>
<span v-if="detailInfo.nchkDate">{{ detailInfo.nchkDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产日期">
<span v-if="detailInfo.fProductDate">{{ detailInfo.fProductDate }}</span>
<span v-if="detailInfo.productDate">{{ detailInfo.productDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报废日期">
<span v-if="detailInfo.fDiscardDate">{{ detailInfo.fDiscardDate }}</span>
<span v-if="detailInfo.discardDate">{{ detailInfo.discardDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安全评定日期">
<span v-if="detailInfo.fSafeJudgeDate">{{ detailInfo.fSafeJudgeDate }}</span>
<span v-if="detailInfo.safeJudgeDate">{{ detailInfo.safeJudgeDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公称压力">
<span v-if="detailInfo.fGPressure">{{ detailInfo.fGPressure }}</span>
<span v-if="detailInfo.gpressure">{{ detailInfo.gpressure }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="水试验压力">
<span v-if="detailInfo.fWPressure">{{ detailInfo.fWPressure }}</span>
<span v-if="detailInfo.wpressure">{{ detailInfo.wpressure }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准重量">
<span v-if="detailInfo.fSelfWeight">{{ detailInfo.fSelfWeight }}</span>
<span v-if="detailInfo.selfWeight">{{ detailInfo.selfWeight }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="壁厚">
<span v-if="detailInfo.fThickness">{{ detailInfo.fThickness }}</span>
<span v-if="detailInfo.thickness">{{ detailInfo.thickness }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="气瓶许可证号">
<span v-if="detailInfo.fPermitNo">{{ detailInfo.fPermitNo }}</span>
<span v-if="detailInfo.permitNo">{{ detailInfo.permitNo }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="阀类型名称">
<span v-if="detailInfo.fValveName">{{ detailInfo.fValveName }}</span>
<span v-if="detailInfo.valveName">{{ detailInfo.valveName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="钢瓶交付文件照片">
<el-image
:src="detailInfo.fPayImage"
:preview-src-list="[detailInfo.fPayImage]"
v-if="detailInfo.fPayImage != '' && detailInfo.fPayImage != null"
:src="detailInfo.payImage"
:preview-src-list="[detailInfo.payImage]"
v-if="detailInfo.payImage != '' && detailInfo.payImage != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
......@@ -163,9 +163,9 @@
<el-col :span="12">
<el-form-item label="检验质量证明书照片">
<el-image
:src="detailInfo.fBatchImage"
:preview-src-list="[detailInfo.fBatchImage]"
v-if="detailInfo.fBatchImage != '' && detailInfo.fBatchImage != null"
:src="detailInfo.batchImage"
:preview-src-list="[detailInfo.batchImage]"
v-if="detailInfo.batchImage != '' && detailInfo.batchImage != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
......@@ -176,9 +176,9 @@
<el-col :span="12">
<el-form-item label="制造监督检验证书照片">
<el-image
:src="detailInfo.fDeviceImage"
:preview-src-list="[detailInfo.fDeviceImage]"
v-if="detailInfo.fDeviceImage != '' && detailInfo.fDeviceImage != null"
:src="detailInfo.deviceImage"
:preview-src-list="[detailInfo.deviceImage]"
v-if="detailInfo.deviceImage != '' && detailInfo.deviceImage != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
......@@ -188,9 +188,9 @@
<el-col :span="12">
<el-form-item label="检验报告照片">
<el-image
:src="detailInfo.fCheckImage"
:preview-src-list="[detailInfo.fCheckImage]"
v-if="detailInfo.fCheckImage != '' && detailInfo.fCheckImage != null"
:src="detailInfo.checkImage"
:preview-src-list="[detailInfo.checkImage]"
v-if="detailInfo.checkImage != '' && detailInfo.checkImage != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
......@@ -200,9 +200,9 @@
<el-col :span="12">
<el-form-item label="产品编号照片">
<el-image
:src="detailInfo.fEquNoImage"
:preview-src-list="[detailInfo.fEquNoImage]"
v-if="detailInfo.fEquNoImage != '' && detailInfo.fEquNoImage != null"
:src="detailInfo.equNoImage"
:preview-src-list="[detailInfo.equNoImage]"
v-if="detailInfo.equNoImage != '' && detailInfo.equNoImage != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
......@@ -212,9 +212,9 @@
<el-col :span="12">
<el-form-item label="单位内编号照片">
<el-image
:src="detailInfo.fSelfIdImage"
:preview-src-list="[detailInfo.fSelfIdImage]"
v-if="detailInfo.fSelfIdImage != '' && detailInfo.fSelfIdImage != null"
:src="detailInfo.selfIdImage"
:preview-src-list="[detailInfo.selfIdImage]"
v-if="detailInfo.selfIdImage != '' && detailInfo.selfIdImage != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
......@@ -224,9 +224,9 @@
<el-col :span="12">
<el-form-item label="钢瓶信息照片">
<el-image
:src="detailInfo.fBotImage"
:preview-src-list="[detailInfo.fBotImage]"
v-if="detailInfo.fBotImage != '' && detailInfo.fBotImage != null"
:src="detailInfo.botImage"
:preview-src-list="[detailInfo.botImage]"
v-if="detailInfo.botImage != '' && detailInfo.botImage != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
......@@ -235,64 +235,64 @@
</el-col>
<el-col :span="12">
<el-form-item label="钢瓶规格名称">
<span v-if="detailInfo.fBotSpecName">{{ detailInfo.fBotSpecName }}</span>
<span v-if="detailInfo.botSpecName">{{ detailInfo.botSpecName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="钢瓶型号">
<span v-if="detailInfo.fBottleType">{{ detailInfo.fBottleType }}</span>
<span v-if="detailInfo.bottleType">{{ detailInfo.bottleType }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="已检验次数">
<span v-if="detailInfo.fInspectedTimes">{{ detailInfo.fInspectedTimes }}</span>
<span v-if="detailInfo.inspectedTimes">{{ detailInfo.inspectedTimes }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12"> 2024-09-13 wh 去掉，感觉监管不需要
<el-form-item label="是否专用">
<span v-if="detailInfo.fIsSpecialized">{{detailInfo.fIsSpecialized}}</span>
<span v-if="detailInfo.isSpecialized">{{detailInfo.isSpecialized}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="阀厂家">
<span v-if="detailInfo.fValveManuFacturer">{{ detailInfo.fValveManuFacturer }}</span>
<span v-if="detailInfo.valveManuFacturer">{{ detailInfo.valveManuFacturer }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检验标牌">
<span v-if="detailInfo.fInspectionLabel">{{ detailInfo.fInspectionLabel }}</span>
<span v-if="detailInfo.inspectionLabel">{{ detailInfo.inspectionLabel }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="第三方标签">
<span v-if="detailInfo.fThirdPartyLabel">{{ detailInfo.fThirdPartyLabel }}</span>
<span v-if="detailInfo.thirdPartyLabel">{{ detailInfo.thirdPartyLabel }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="孔洞码">
<span v-if="detailInfo.fHoleCode">{{ detailInfo.fHoleCode }}</span>
<span v-if="detailInfo.holeCode">{{ detailInfo.holeCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="存储类型">
<span v-if="detailInfo.fBottleStorageType">{{ detailInfo.fBottleStorageType }}</span>
<span v-if="detailInfo.bottleStorageType">{{ detailInfo.bottleStorageType }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12"> 2024-09-13 wh 去掉，感觉监管不需要
<el-form-item label="钢瓶状态">
<span v-if="detailInfo.fState">{{ detailInfo.fState}}</span>
<span v-if="detailInfo.state">{{ detailInfo.state}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</el-form>
</el-dialog>
......
zh-baseversion-web/src/views/lpgRegulation/gasbottlefiles/index.vue
View file @ 8d2145db
......@@ -10,16 +10,16 @@
/>
</el-form-item>
<el-form-item label="气瓶条码" prop="qRcode">
<el-form-item label="气瓶条码" prop="qrcode">
<el-input
v-model="queryParams.qRcode"
v-model="queryParams.qrcode"
placeholder="请输入气瓶条码"
clearable
size="small"
/>
</el-form-item>
<el-form-item label="钢瓶状态" prop="fState">
<!-- <el-form-item label="钢瓶状态" prop="fState"> 2024-09-13 wh 去掉，感觉监管不需要
<el-select v-model="queryParams.state" placeholder="请选择钢瓶状态" clearable>
<el-option
v-for="item in stateOptions"
......@@ -28,7 +28,7 @@
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -64,17 +64,17 @@
<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="makeInfo" :show-overflow-tooltip="true"/>
<el-table-column label="气瓶条码" align="center" prop="qRcode" :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">
<el-table-column label="上检日期" align="center" prop="pchkDate">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.pChkDate, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.pchkDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="下检日期" align="center" prop="nChkDate">
<el-table-column label="下检日期" align="center" prop="nchkDate">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.nChkDate, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.nchkDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="生产日期" align="center" prop="productDate">
......@@ -93,7 +93,7 @@
</template>
</el-table-column>
<el-table-column label="已检验次数" align="center" prop="inspectedTimes"/>
<el-table-column label="钢瓶状态" align="center" prop="state"/>
<!-- <el-table-column label="钢瓶状态" align="center" prop="state"/> 2024-09-13 wh 去掉，感觉监管不需要 -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -217,12 +217,12 @@ export default {
pageNum: 1,
pageSize: 10,
cChkDate: null,
nChkDate: null,
nchkDate: null,
productDate: null,
discardDate: null,
safeJudgeDate: null,
gPressure: null,
wPressure: null,
gpressure: null,
wpressure: null,
selfWeight: null,
permitNo: null,
valveName: null,
......@@ -263,15 +263,7 @@ export default {
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();
},
......@@ -352,7 +344,7 @@ export default {
sbCode: null,
cardRecId: null,
appId: null,
qRcode: null,
qrcode: null,
cardSendMan: null,
cardSendDeptCode: null,
cardSendDeptName: null,
......@@ -362,13 +354,13 @@ export default {
bak0: null,
bak1: null,
bak2: null,
pChkDate: null,
nChkDate: null,
pchkDate: null,
nchkDate: null,
productDate: null,
discardDate: null,
safeJudgeDate: null,
gPressure: null,
wPressure: null,
gpressure: null,
wpressure: null,
selfWeight: null,
thickness: null,
permitNo: null,
......
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