Skip to content

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

1 测试项目中 因企业id类型调整，别的使用企业时关联的id没有调整的，测试发现有以下模块： 

	燃气用户，用户管理，事件接报对象(TEventReceive),应急相应，任务下发，老旧管网改造，

2 培训管理-培训时长 字段改成 数字类型。

3 修复问题：农村双代用户 ，查询 使用所属企业查询 查不到数据。
parent 4689e6cf
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 25 deletions
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TPipeInfoController.java
View file @ b8dc6acb
......@@ -87,8 +87,6 @@ public class TPipeInfoController extends BaseController
String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tPipeInfo.getBeyondEnterpriseId());
tPipeInfo.setBeyondEnterpriseName(EnterpriseName);
//
return toAjax(tPipeInfoService.insertTPipeInfo(tPipeInfo));
}
......
zh-baseversion-system/src/main/java/com/zehong/system/domain/PipeDate.java
View file @ b8dc6acb
......@@ -39,7 +39,7 @@ public class PipeDate extends BaseEntity {
private String inspectionTime;
private int companyType;
private String companyType;
private int iconType;
......@@ -121,11 +121,11 @@ public class PipeDate extends BaseEntity {
this.iconType = iconType;
}
public int getCompanyType() {
public String getCompanyType() {
return companyType;
}
public void setCompanyType(int companyType) {
public void setCompanyType(String companyType) {
this.companyType = companyType;
}
......
zh-baseversion-system/src/main/java/com/zehong/system/domain/TEventReceive.java
View file @ b8dc6acb
......@@ -61,7 +61,7 @@ public class TEventReceive extends BaseEntity
/** 指派公司id */
@Excel(name = "指派公司id")
private Integer enterpriseId;
private String enterpriseId;
/** 指派公司名称 */
@Excel(name = "指派公司名称")
......@@ -212,12 +212,12 @@ public class TEventReceive extends BaseEntity
{
return describe;
}
public void setEnterpriseId(Integer enterpriseId)
public void setEnterpriseId(String enterpriseId)
{
this.enterpriseId = enterpriseId;
}
public Integer getEnterpriseId()
public String getEnterpriseId()
{
return enterpriseId;
}
......
zh-baseversion-system/src/main/java/com/zehong/system/domain/TPipeOldPlanProcess.java
View file @ b8dc6acb
......@@ -28,7 +28,7 @@ public class TPipeOldPlanProcess extends BaseEntity
/** 燃气企业编码，可为空 */
private String fEntUuid;
private Long fEnterpriseId;
private String fEnterpriseId;
/**
* 燃气企业名称 导出用
......@@ -164,11 +164,11 @@ public class TPipeOldPlanProcess extends BaseEntity
this.govUploadTime = govUploadTime;
}
public Long getfEnterpriseId() {
public String getfEnterpriseId() {
return fEnterpriseId;
}
public void setfEnterpriseId(Long fEnterpriseId) {
public void setfEnterpriseId(String fEnterpriseId) {
this.fEnterpriseId = fEnterpriseId;
}
......
zh-baseversion-system/src/main/resources/mapper/system/SysUserMapper.xml
View file @ b8dc6acb
......@@ -120,12 +120,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="deptId != null and deptId != ''">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if>
<if test="nickName != null and nickName != ''">nick_name,</if>
<if test="email != null and email != ''">email,</if>
<if test="avatar != null and avatar != ''">avatar,</if>
<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
<if test="phonenumber != null">phonenumber,</if>
<if test="sex != null and sex != ''">sex,</if>
<if test="password != null and password != ''">password,</if>
<if test="status != null and status != ''">status,</if>
......@@ -139,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="avatar != null and avatar != ''">#{avatar},</if>
<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
<if test="phonenumber != null">#{phonenumber},</if>
<if test="sex != null and sex != ''">#{sex},</if>
<if test="password != null and password != ''">#{password},</if>
<if test="status != null and status != ''">#{status},</if>
......@@ -152,11 +152,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateUser" parameterType="SysUser">
update sys_user
<set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
<if test="deptId != null and deptId != ''">dept_id = #{deptId},</if>
<if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
<if test="email != null ">email = #{email},</if>
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
<if test="email != null and email != ''">email = #{email},</if>
<if test="phonenumber != null">phonenumber = #{phonenumber},</if>
<if test="sex != null and sex != ''">sex = #{sex},</if>
<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
<if test="password != null and password != ''">password = #{password},</if>
......
zh-baseversion-system/src/main/resources/mapper/system/TDoubleBookMapper.xml
View file @ b8dc6acb
......@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTDoubleBookList" parameterType="TDoubleBook" resultMap="TDoubleBookResult">
<include refid="selectTDoubleBookVo"/>
<where>
<if test="beyondEnterpriseId != null "> and b.beyond_enterprise_id = #{beyondEnterpriseId}</if>
<if test="beyondEnterpriseId != null and beyondEnterpriseId != ''"> and b.beyond_enterprise_id = #{beyondEnterpriseId}</if>
<if test="username != null and username != ''"> and b.username like concat('%', #{username}, '%')</if>
<if test="phone != null and phone != ''"> and b.phone like concat('%', #{phone}, '%')</if>
<if test="type != null and type != ''"> and b.type = #{type}</if>
......@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="exportTDoubleBookList" parameterType="TDoubleBook" resultMap="TDoubleBookResult">
<include refid="exportTDoubleBookVo"/>
<where>
<if test="beyondEnterpriseId != null "> and b.beyond_enterprise_id = #{beyondEnterpriseId}</if>
<if test="beyondEnterpriseId != null and beyondEnterpriseId != ''"> and b.beyond_enterprise_id = #{beyondEnterpriseId}</if>
<if test="username != null and username != ''"> and b.username like concat('%', #{username}, '%')</if>
<if test="phone != null and phone != ''"> and b.phone like concat('%', #{phone}, '%')</if>
<if test="type != null and type != ''"> and b.type = #{type}</if>
......@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateTDoubleBook" parameterType="TDoubleBook">
update t_double_book
<trim prefix="SET" suffixOverrides=",">
<if test="beyondEnterpriseId != null">beyond_enterprise_id = #{beyondEnterpriseId},</if>
<if test="beyondEnterpriseId != null and beyondEnterpriseId != ''">beyond_enterprise_id = #{beyondEnterpriseId},</if>
<if test="username != null">username = #{username},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="type != null">type = #{type},</if>
......
zh-baseversion-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.xml
View file @ b8dc6acb
......@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectTEnterpriseInfoVo"/>
<where>
1=1 and is_del='0'
<if test="enterpriseId != -2 and enterpriseId != null and enterpriseId != ''">
<if test="enterpriseId != '-2' and enterpriseId != null and enterpriseId != ''">
and enterprise_id = #{enterpriseId}
</if>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
......
zh-baseversion-web/src/views/train/trainManage/index.vue
View file @ b8dc6acb
......@@ -171,7 +171,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="培训时长" prop="trainDuration">
<el-input :disabled="isView" style="width: 312px" v-model="form.trainDuration" placeholder="分钟" /> <span>(分钟)</span>
<el-input @input="filterInput" :disabled="isView" style="width: 312px" v-model="form.trainDuration" placeholder="分钟" /> <span>(分钟)</span>
</el-form-item>
</el-col>
</el-row>
......@@ -339,6 +339,9 @@ export default {
this.getList();
},
methods: {
filterInput(value) {
this.form.trainDuration = value.replace(/[^\d.]/g, '').replace(/(\..*)\./g, '$1');
},
/** 查询培训管理列表 */
getList() {
this.loading = true;
......@@ -639,7 +642,12 @@ export default {
};
</script>
<style scoped lang="scss">
.down-load {
color: #0bab0c;
}
.down-load {
color: #0bab0c;
}
/* 自定义输入框样式 */
.left-aligned-input .el-input__inner{
text-align: left;
padding-left: 5px; /* 根据需要调整内边距 */
}
</style>
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