Skip to content

Z
zh-baseversion-project
Commit 4e237651 authored by xulihui's avatar xulihui
Browse files
Options

bug修复

parent 6e0c7f24
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 69 deletions
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TEmployedPeopleInfoController.java
View file @ 4e237651
......@@ -149,8 +149,8 @@ public class TEmployedPeopleInfoController extends BaseController
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport, HttpServletResponse response) throws Exception
{
ExcelUtil<TEmployedPeopleInfoError> util = new ExcelUtil<>(TEmployedPeopleInfoError.class);
List<TEmployedPeopleInfoError> XmbhList = util.importExcel(file.getInputStream());
ExcelUtil<TEmployedPeopleInfo> util = new ExcelUtil<>(TEmployedPeopleInfo.class);
List<TEmployedPeopleInfo> XmbhList = util.importExcel(file.getInputStream());
String operName = SecurityUtils.getLoginUser().getUsername();
String message = tEmployedPeopleInfoService.importEmployedPeopleInfo(XmbhList, updateSupport, operName,response);
return AjaxResult.success(message);
......
zh-baseversion-system/src/main/java/com/zehong/system/domain/TEmployedPeopleInfo.java
View file @ 4e237651
......@@ -17,6 +17,8 @@ public class TEmployedPeopleInfo extends BaseEntity
/** 从业人员id */
private Long employedPeopleId;
private Long employedPeopleErrorId;
/** 姓名 */
@Excel(name = "姓名")
private String employedPeopleName;
......@@ -154,6 +156,14 @@ public class TEmployedPeopleInfo extends BaseEntity
this.employedPeopleName = employedPeopleName;
}
public Long getEmployedPeopleErrorId() {
return employedPeopleErrorId;
}
public void setEmployedPeopleErrorId(Long employedPeopleErrorId) {
this.employedPeopleErrorId = employedPeopleErrorId;
}
public String getEmployedPeopleName()
{
return employedPeopleName;
......
zh-baseversion-system/src/main/java/com/zehong/system/domain/TEmployedPeopleInfoError.java
View file @ 4e237651
......@@ -7,7 +7,7 @@ import com.zehong.common.core.domain.BaseEntity;
/**
* 从业人员错误导入记录对象 t_employed_people_info_error
*
*
* @author zehong
* @date 2024-06-01
*/
......@@ -27,20 +27,21 @@ public class TEmployedPeopleInfoError extends BaseEntity
@Excel(name = "身份证号")
private String idCard;
/** 职业技能岗位证书编号 */
@Excel(name = "职业技能岗位证书编号")
/** 技能岗位证书编号 */
@Excel(name = "技能岗位证书编号")
private String certificateNum;
/** 受聘企业名称 */
@Excel(name = "受聘企业名称")
private String beyondEnterpriseName;
/** 报考类型 */
@Excel(name = "报考类型")
@Excel(name = "发证部门")
private String registerExaminationType;
/** 人员类型：1.主要负责人 2.安全管理人员3.运行维护和抢修人员 */
@Excel(name = "人员类型")
@Excel(name = "任职岗位")
private String peopleOccupation;
/** 发证日期 */
......@@ -56,84 +57,84 @@ public class TEmployedPeopleInfoError extends BaseEntity
@Excel(name = "错误信息")
private String errorMsg;
public void setEmployedPeopleErrorId(Long employedPeopleErrorId)
public void setEmployedPeopleErrorId(Long employedPeopleErrorId)
{
this.employedPeopleErrorId = employedPeopleErrorId;
}
public Long getEmployedPeopleErrorId()
public Long getEmployedPeopleErrorId()
{
return employedPeopleErrorId;
}
public void setEmployedPeopleName(String employedPeopleName)
public void setEmployedPeopleName(String employedPeopleName)
{
this.employedPeopleName = employedPeopleName;
}
public String getEmployedPeopleName()
public String getEmployedPeopleName()
{
return employedPeopleName;
}
public void setIdCard(String idCard)
public void setIdCard(String idCard)
{
this.idCard = idCard;
}
public String getIdCard()
public String getIdCard()
{
return idCard;
}
public void setCertificateNum(String certificateNum)
public void setCertificateNum(String certificateNum)
{
this.certificateNum = certificateNum;
}
public String getCertificateNum()
public String getCertificateNum()
{
return certificateNum;
}
public void setBeyondEnterpriseName(String beyondEnterpriseName)
public void setBeyondEnterpriseName(String beyondEnterpriseName)
{
this.beyondEnterpriseName = beyondEnterpriseName;
}
public String getBeyondEnterpriseName()
public String getBeyondEnterpriseName()
{
return beyondEnterpriseName;
}
public void setRegisterExaminationType(String registerExaminationType)
public void setRegisterExaminationType(String registerExaminationType)
{
this.registerExaminationType = registerExaminationType;
}
public String getRegisterExaminationType()
public String getRegisterExaminationType()
{
return registerExaminationType;
}
public void setPeopleOccupation(String peopleOccupation)
public void setPeopleOccupation(String peopleOccupation)
{
this.peopleOccupation = peopleOccupation;
}
public String getPeopleOccupation()
public String getPeopleOccupation()
{
return peopleOccupation;
}
public void setIssueDate(String issueDate)
public void setIssueDate(String issueDate)
{
this.issueDate = issueDate;
}
public String getIssueDate()
public String getIssueDate()
{
return issueDate;
}
public void setCertificateChange(String certificateChange)
public void setCertificateChange(String certificateChange)
{
this.certificateChange = certificateChange;
}
public String getCertificateChange()
public String getCertificateChange()
{
return certificateChange;
}
......@@ -149,16 +150,16 @@ public class TEmployedPeopleInfoError extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("employedPeopleErrorId", getEmployedPeopleErrorId())
.append("employedPeopleName", getEmployedPeopleName())
.append("idCard", getIdCard())
.append("certificateNum", getCertificateNum())
.append("beyondEnterpriseName", getBeyondEnterpriseName())
.append("registerExaminationType", getRegisterExaminationType())
.append("peopleOccupation", getPeopleOccupation())
.append("issueDate", getIssueDate())
.append("certificateChange", getCertificateChange())
.append("createBy", getCreateBy())
.toString();
.append("employedPeopleErrorId", getEmployedPeopleErrorId())
.append("employedPeopleName", getEmployedPeopleName())
.append("idCard", getIdCard())
.append("certificateNum", getCertificateNum())
.append("beyondEnterpriseName", getBeyondEnterpriseName())
.append("registerExaminationType", getRegisterExaminationType())
.append("peopleOccupation", getPeopleOccupation())
.append("issueDate", getIssueDate())
.append("certificateChange", getCertificateChange())
.append("createBy", getCreateBy())
.toString();
}
}
zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/TEnterpriseInfoVO.java
View file @ 4e237651
......@@ -19,7 +19,7 @@ public class TEnterpriseInfoVO extends BaseEntity
{
/** 企业id */
private Long enterpriseId;
private String enterpriseId;
/** 企业名称 */
private String enterpriseName;
......
zh-baseversion-system/src/main/java/com/zehong/system/mapper/TEnterpriseInfoMapper.java
View file @ 4e237651
......@@ -44,6 +44,8 @@ public interface TEnterpriseInfoMapper
*/
public List<TEnterpriseInfo> selectTEnterpriseInfoList(TEnterpriseInfo tEnterpriseInfo);
public List<TEnterpriseInfo> selectTEnterpriseInfoListByEnterpriseName(TEnterpriseInfo tEnterpriseInfo);
/**
* 无条件查询所有企业
* @return r
......
zh-baseversion-system/src/main/java/com/zehong/system/service/ITEmployedPeopleInfoService.java
View file @ 4e237651
......@@ -83,7 +83,7 @@ public interface ITEmployedPeopleInfoService
* @param operName 操作用户
* @return 结果
*/
public String importEmployedPeopleInfo(List<TEmployedPeopleInfoError> XmbhList, Boolean isUpdateSupport, String operName, HttpServletResponse response);
public String importEmployedPeopleInfo(List<TEmployedPeopleInfo> XmbhList, Boolean isUpdateSupport, String operName, HttpServletResponse response);
/**
* 查询当前用户导入 从业人员的错误数据总数
......
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TEmployedPeopleInfoServiceImpl.java
View file @ 4e237651
......@@ -132,7 +132,7 @@ public class TEmployedPeopleInfoServiceImpl implements ITEmployedPeopleInfoServi
}
@Override
public String importEmployedPeopleInfo(List<TEmployedPeopleInfoError> employedPeopleInfos, Boolean isUpdateSupport, String operName, HttpServletResponse response) {
public String importEmployedPeopleInfo(List<TEmployedPeopleInfo> employedPeopleInfos, Boolean isUpdateSupport, String operName, HttpServletResponse response) {
if (CollectionUtils.isEmpty(employedPeopleInfos)) {
throw new BaseException("导入数据不能为空！ ");
......@@ -141,7 +141,7 @@ public class TEmployedPeopleInfoServiceImpl implements ITEmployedPeopleInfoServi
TEmployedPeopleInfoError employedPeopleInfoError;
TEmployedPeopleInfo tEmployedPeopleInfoForInsert;
StringBuilder stringBuilder;
for (TEmployedPeopleInfoError tEmployedPeopleInfo : employedPeopleInfos){
for (TEmployedPeopleInfo tEmployedPeopleInfo : employedPeopleInfos){
stringBuilder = new StringBuilder();
try {
......
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TEnterpriseInfoServiceImpl.java
View file @ 4e237651
......@@ -155,10 +155,18 @@ public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService
for (TEnterpriseInfo enterpriseInfo : tEnterpriseInfos) {
try {
checkUploadRequired(enterpriseInfo);
SysUser user = SecurityUtils.getLoginUser().getUser();
enterpriseInfo.setCreateEnterpriseId(user.getDeptId());
enterpriseInfo.setEnterpriseId(UUID.randomUUID().toString());
this.insertTEnterpriseInfo(enterpriseInfo);
TEnterpriseInfo query = new TEnterpriseInfo();
query.setEnterpriseName(enterpriseInfo.getEnterpriseName());
List<TEnterpriseInfo> queryTEnterpriseInfo = tEnterpriseInfoMapper.selectTEnterpriseInfoListByEnterpriseName(query);
if (StringUtils.isNull(queryTEnterpriseInfo) || queryTEnterpriseInfo.size() == 0){
SysUser user = SecurityUtils.getLoginUser().getUser();
enterpriseInfo.setCreateEnterpriseId(user.getDeptId());
enterpriseInfo.setEnterpriseId(UUID.randomUUID().toString());
this.insertTEnterpriseInfo(enterpriseInfo);
}else if (isUpdateSupport){
enterpriseInfo.setEnterpriseId(queryTEnterpriseInfo.get(0).getEnterpriseId());
this.updateTEnterpriseInfo(enterpriseInfo);
}
successNum++;
successMsg.append("<br/>" + successNum + "、项目编号 " + enterpriseInfo.getEnterpriseName() + " 导入成功");
} catch (Exception e) {
......
zh-baseversion-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.xml
View file @ 4e237651
......@@ -48,15 +48,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="legalRepresentative != null and legalRepresentative != ''"> and legal_representative = #{legalRepresentative}</if>
<if test="businessArea != null and businessArea != ''"> and business_area = #{businessArea}</if>
<if test="haslicenseKey != null and haslicenseKey != ''">
<if test="haslicenseKey == 1">and license_key is not null</if>
<if test="haslicenseKey == 0">and license_key is null</if>
<if test="haslicenseKey == 1">and (license_key is not null and license_key != '')</if>
<if test="haslicenseKey == 0">and (license_key is null or license_key = '')</if>
</if>
<if test="licenseKey != null and licenseKey != ''"> and license_key = #{licenseKey}</if>
<if test="licenseValidityTime != null and licenseValidityTime != ''"> and license_validity_time = #{licenseValidityTime}</if>
<if test="annualSupervisionInspection != null and annualSupervisionInspection != ''"> and annual_supervision_inspection = #{annualSupervisionInspection}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
order by enterprise_id desc
order by create_time desc
</select>
<select id="selectTEnterpriseInfoListByEnterpriseName" parameterType="TEnterpriseInfo" resultMap="TEnterpriseInfoResult">
<include refid="selectTEnterpriseInfoVo"/>
<where>
1=1 and is_del='0'
<if test="enterpriseId != '-2' and enterpriseId != null and enterpriseId != ''">
and enterprise_id = #{enterpriseId}
</if>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name = #{enterpriseName}</if>
</where>
order by create_time desc
</select>
<select id="queryAllEnterprise" resultMap="TEnterpriseInfoResult">
<include refid="selectTEnterpriseInfoVo"/>
......
zh-baseversion-web/src/views/regulation/info/index.vue
View file @ 4e237651
......@@ -318,7 +318,7 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的企业数据
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
......
zh-baseversion-web/src/views/regulation/staEnterpriseInfor/index.vue
View file @ 4e237651
......@@ -192,91 +192,91 @@
<el-row>
<el-col :span="12">
<el-form-item label="企业主要负责人数量" prop="fResponsibleCount">
<el-input v-model="form.fResponsibleCount" placeholder="请输入企业主要负责人数量" />
<el-input v-model="form.fResponsibleCount" type="number" placeholder="请输入企业主要负责人数量" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安全生产管理人数量" prop="fManagementCount">
<el-input v-model="form.fManagementCount" placeholder="请输入安全生产管理人数量" />
<el-input v-model="form.fManagementCount" type="number" placeholder="请输入安全生产管理人数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="运行、维护和抢修人数量" prop="fMaintenanceCount">
<el-input v-model="form.fMaintenanceCount" placeholder="请输入运行、维护和抢修人数量" />
<el-input v-model="form.fMaintenanceCount" type="number" placeholder="请输入运行、维护和抢修人数量" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="企业主要负责人持证数量" prop="fResponsibleCertCount">
<el-input v-model="form.fResponsibleCertCount" placeholder="请输入企业主要负责人持证数量" />
<el-input v-model="form.fResponsibleCertCount" type="number" placeholder="请输入企业主要负责人持证数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="安全生产管理人持证数量" prop="fManagementCertCount">
<el-input v-model="form.fManagementCertCount" placeholder="请输入安全生产管理人持证数量" />
<el-input v-model="form.fManagementCertCount" type="number" placeholder="请输入安全生产管理人持证数量" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="运行、维护和抢修人支持数量" prop="fMaintenanceCertCount">
<el-input v-model="form.fMaintenanceCertCount" placeholder="请输入运行、维护和抢修人支持数量" />
<el-input v-model="form.fMaintenanceCertCount" type="number" placeholder="请输入运行、维护和抢修人支持数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="门站数量" prop="fStationCount">
<el-input v-model="form.fStationCount" placeholder="请输入门站数量" />
<el-input v-model="form.fStationCount" type="number" placeholder="请输入门站数量" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="燃气储配站数量" prop="fStorageStationCount">
<el-input v-model="form.fStorageStationCount" placeholder="请输入燃气储配站数量" />
<el-input v-model="form.fStorageStationCount" type="number" placeholder="请输入燃气储配站数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="气化站数量" prop="fGasificationStationCount">
<el-input v-model="form.fGasificationStationCount" placeholder="请输入气化站数量" />
<el-input v-model="form.fGasificationStationCount" type="number" placeholder="请输入气化站数量" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="混气站数量" prop="fMixingStationCount">
<el-input v-model="form.fMixingStationCount" placeholder="请输入混气站数量" />
<el-input v-model="form.fMixingStationCount" type="number" placeholder="请输入混气站数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="加气站数量" prop="fGasStationCount">
<el-input v-model="form.fGasStationCount" placeholder="请输入加气站数量" />
<el-input v-model="form.fGasStationCount" type="number" placeholder="请输入加气站数量" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="灌装站数量" prop="fFillingStationCount">
<el-input v-model="form.fFillingStationCount" placeholder="请输入灌装站数量" />
<el-input v-model="form.fFillingStationCount" type="number" placeholder="请输入灌装站数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="供应站数量" prop="fSupplyStationCount">
<el-input v-model="form.fSupplyStationCount" placeholder="请输入供应站数量" />
<el-input v-model="form.fSupplyStationCount" type="number" placeholder="请输入供应站数量" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="调压站数量" prop="fPressureStationCount">
<el-input v-model="form.fPressureStationCount" placeholder="请输入调压站数量" />
<el-input v-model="form.fPressureStationCount" type="number" placeholder="请输入调压站数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="其他站数量" prop="fOtherStationCount">
<el-input v-model="form.fOtherStationCount" placeholder="请输入其他站数量" />
<el-input v-model="form.fOtherStationCount" type="number" placeholder="请输入其他站数量" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -641,7 +641,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const fEnterpriseId = row.fEnterpriseId || this.ids
const fEnterpriseId = row.fEnterpriseId || this.ids
getInfor(fEnterpriseId).then(response => {
this.form = response.data;
this.open = true;
......@@ -650,7 +650,7 @@ export default {
},
/** 详情按钮操作 */
handleView(row) {
const fEnterpriseId = row.fEnterpriseId;
const fEnterpriseId = row.fEnterpriseId;
getInfor(fEnterpriseId).then(response => {
this.viewForm = response.data;
this.viewOpen = true;
......@@ -678,9 +678,9 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const fEnterpriseIds = row.fEnterpriseId || this.ids;
const fEnterpriseIds = row.fEnterpriseId || this.ids;
this.$confirm('是否确认删除年度行业指标汇总 - 燃气企业基本情况信息编号为"' + fEnterpriseIds + '"的数据项？', "警告", {
confirmButtonText: "确定",
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
......@@ -704,9 +704,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有年度行业指标汇总 - 燃气企业基本情况信息数据项？', "警告", {
confirmButtonText: "确定",
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
......
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