hansha
/
szxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

户口变更记录添加接口编写

Browse Source
main
hansha 2 years ago
parent 737c3d9fce
commit 67ba4953ad
4 changed files with 163 additions and 41 deletions
Show Stats Download Patch File Download Diff File

70
ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java
Unescape View File

@ -12,7 +12,7 @@ import java.util.Date;
* 户口变更记录对象 szxc_hkbg_recard * 户口变更记录对象 szxc_hkbg_recard
* *
* @author hs * @author hs
* @date 2024-03-26 * @date 2024-03-27
*/ */
public class SzxcHkbgRecard extends BaseEntity public class SzxcHkbgRecard extends BaseEntity
{ {
@ -69,15 +69,23 @@ public class SzxcHkbgRecard extends BaseEntity
@Excel(name = "与户主关系") @Excel(name = "与户主关系")
private String relation; private String relation;
/** 变更编号 */
@Excel(name = "变更编号")
private String number;
/** 变更时间 */ /** 变更时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "变更时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "变更时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date bgTime; private Date bgTime;
/** 户籍地址 */
@Excel(name = "户籍地址")
private String hjAddress;
/** 户籍性质 */
@Excel(name = "户籍性质")
private String jgNature;
/** 是否常住（0是 1否） */
@Excel(name = "是否常住", readConverterExp = "0=是,1=否")
private String longLive;
/** 部门id */ /** 部门id */
@Excel(name = "部门id") @Excel(name = "部门id")
private Long deptId; private Long deptId;
@ -86,6 +94,10 @@ public class SzxcHkbgRecard extends BaseEntity
@Excel(name = "创建者ID") @Excel(name = "创建者ID")
private Long userId; private Long userId;
/** 所属网格 */
@Excel(name = "所属网格")
private String deptName;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
@ -203,23 +215,41 @@ public class SzxcHkbgRecard extends BaseEntity
{ {
return relation; return relation;
} }
public void setNumber(String number) public void setBgTime(Date bgTime)
{ {
this.number = number; this.bgTime = bgTime;
} }
public String getNumber() public Date getBgTime()
{ {
return number; return bgTime;
} }
public void setBgTime(Date bgTime) public void setHjAddress(String hjAddress)
{ {
this.bgTime = bgTime; this.hjAddress = hjAddress;
} }
public Date getBgTime() public String getHjAddress()
{ {
return bgTime; return hjAddress;
}
public void setJgNature(String jgNature)
{
this.jgNature = jgNature;
}
public String getJgNature()
{
return jgNature;
}
public void setLongLive(String longLive)
{
this.longLive = longLive;
}
public String getLongLive()
{
return longLive;
} }
public void setDeptId(Long deptId) public void setDeptId(Long deptId)
{ {
@ -239,6 +269,15 @@ public class SzxcHkbgRecard extends BaseEntity
{ {
return userId; return userId;
} }
public void setDeptName(String deptName)
{
this.deptName = deptName;
}
public String getDeptName()
{
return deptName;
}
@Override @Override
public String toString() { public String toString() {
@ -256,8 +295,10 @@ public class SzxcHkbgRecard extends BaseEntity
.append("xName", getxName()) .append("xName", getxName())
.append("xIdCard", getxIdCard()) .append("xIdCard", getxIdCard())
.append("relation", getRelation()) .append("relation", getRelation())
.append("number", getNumber())
.append("bgTime", getBgTime()) .append("bgTime", getBgTime())
.append("hjAddress", getHjAddress())
.append("jgNature", getJgNature())
.append("longLive", getLongLive())
.append("remark", getRemark()) .append("remark", getRemark())
.append("createBy", getCreateBy()) .append("createBy", getCreateBy())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())
@ -265,6 +306,7 @@ public class SzxcHkbgRecard extends BaseEntity
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())
.append("deptId", getDeptId()) .append("deptId", getDeptId())
.append("userId", getUserId()) .append("userId", getUserId())
.append("deptName", getDeptName())
.toString(); .toString();
} }
} }

33
ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHkbgRecardServiceImpl.java
Unescape View File

@ -1,12 +1,16 @@
package com.ruoyi.szxc.service.impl; package com.ruoyi.szxc.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.szxc.mapper.SzxcHkbgRecardMapper;
import com.ruoyi.szxc.domain.SzxcHkbgRecard; import com.ruoyi.szxc.domain.SzxcHkbgRecard;
import com.ruoyi.szxc.domain.SzxcJmInfo;
import com.ruoyi.szxc.mapper.SzxcHkbgRecardMapper;
import com.ruoyi.szxc.mapper.SzxcJmInfoMapper;
import com.ruoyi.szxc.service.ISzxcHkbgRecardService; import com.ruoyi.szxc.service.ISzxcHkbgRecardService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/** /**
* 户口变更记录Service业务层处理 * 户口变更记录Service业务层处理
@ -17,8 +21,10 @@ import com.ruoyi.szxc.service.ISzxcHkbgRecardService;
@Service @Service
public class SzxcHkbgRecardServiceImpl implements ISzxcHkbgRecardService public class SzxcHkbgRecardServiceImpl implements ISzxcHkbgRecardService
{ {
@Autowired @Resource
private SzxcHkbgRecardMapper szxcHkbgRecardMapper; private SzxcHkbgRecardMapper szxcHkbgRecardMapper;
@Resource
private SzxcJmInfoMapper szxcJmInfoMapper;
/** /**
* 查询户口变更记录 * 查询户口变更记录
@ -51,8 +57,25 @@ public class SzxcHkbgRecardServiceImpl implements ISzxcHkbgRecardService
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional
public int insertSzxcHkbgRecard(SzxcHkbgRecard szxcHkbgRecard) public int insertSzxcHkbgRecard(SzxcHkbgRecard szxcHkbgRecard)
{ {
//先修改居民所属户主信息
SzxcJmInfo jmInfo = new SzxcJmInfo();
jmInfo.setAcountNo(szxcHkbgRecard.getAcountNo());
jmInfo.setDeptId(szxcHkbgRecard.getDeptId());
jmInfo.setDeptName(szxcHkbgRecard.getDeptName());
jmInfo.setHjAddress(szxcHkbgRecard.getHjAddress());
jmInfo.setRelation(szxcHkbgRecard.getRelation());
jmInfo.setLongLive(szxcHkbgRecard.getLongLive());
jmInfo.setJgNature(szxcHkbgRecard.getJgNature());
try {
szxcJmInfoMapper.updateSzxcJmInfo(jmInfo);
} catch (Exception e) {
e.printStackTrace();
return 0;
}
//添加户口变更记录
szxcHkbgRecard.setCreateTime(DateUtils.getNowDate()); szxcHkbgRecard.setCreateTime(DateUtils.getNowDate());
return szxcHkbgRecardMapper.insertSzxcHkbgRecard(szxcHkbgRecard); return szxcHkbgRecardMapper.insertSzxcHkbgRecard(szxcHkbgRecard);
} }

27
ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml
Unescape View File

@ -18,8 +18,10 @@
<result property="xName" column="x_name" /> <result property="xName" column="x_name" />
<result property="xIdCard" column="x_id_card" /> <result property="xIdCard" column="x_id_card" />
<result property="relation" column="relation" /> <result property="relation" column="relation" />
<result property="number" column="number" />
<result property="bgTime" column="bg_time" /> <result property="bgTime" column="bg_time" />
<result property="hjAddress" column="hj_address" />
<result property="jgNature" column="jg_nature" />
<result property="longLive" column="long_live" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -27,10 +29,11 @@
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="deptId" column="dept_id" /> <result property="deptId" column="dept_id" />
<result property="userId" column="user_id" /> <result property="userId" column="user_id" />
<result property="deptName" column="dept_name" />
</resultMap> </resultMap>
<sql id="selectSzxcHkbgRecardVo"> <sql id="selectSzxcHkbgRecardVo">
select id, acount_no, jm_id, name, id_card, y_jm_id, y_name, y_id_card, bg_reason, x_jm_id, x_name, x_id_card, relation, number, bg_time, remark, create_by, create_time, update_by, update_time, dept_id, user_id from szxc_hkbg_recard select id, acount_no, jm_id, name, id_card, y_jm_id, y_name, y_id_card, bg_reason, x_jm_id, x_name, x_id_card, relation, bg_time, hj_address, jg_nature, long_live, remark, create_by, create_time, update_by, update_time, dept_id, user_id, dept_name from szxc_hkbg_recard
</sql> </sql>
<select id="selectSzxcHkbgRecardList" parameterType="SzxcHkbgRecard" resultMap="SzxcHkbgRecardResult"> <select id="selectSzxcHkbgRecardList" parameterType="SzxcHkbgRecard" resultMap="SzxcHkbgRecardResult">
@ -48,10 +51,13 @@
<if test="xName != null and xName != ''"> and x_name like concat('%', #{xName}, '%')</if> <if test="xName != null and xName != ''"> and x_name like concat('%', #{xName}, '%')</if>
<if test="xIdCard != null and xIdCard != ''"> and x_id_card = #{xIdCard}</if> <if test="xIdCard != null and xIdCard != ''"> and x_id_card = #{xIdCard}</if>
<if test="relation != null and relation != ''"> and relation = #{relation}</if> <if test="relation != null and relation != ''"> and relation = #{relation}</if>
<if test="number != null and number != ''"> and number = #{number}</if>
<if test="bgTime != null "> and bg_time = #{bgTime}</if> <if test="bgTime != null "> and bg_time = #{bgTime}</if>
<if test="hjAddress != null and hjAddress != ''"> and hj_address = #{hjAddress}</if>
<if test="jgNature != null and jgNature != ''"> and jg_nature = #{jgNature}</if>
<if test="longLive != null and longLive != ''"> and long_live = #{longLive}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if> <if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and user_id = #{userId}</if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
</where> </where>
</select> </select>
@ -75,8 +81,10 @@
<if test="xName != null">x_name,</if> <if test="xName != null">x_name,</if>
<if test="xIdCard != null">x_id_card,</if> <if test="xIdCard != null">x_id_card,</if>
<if test="relation != null">relation,</if> <if test="relation != null">relation,</if>
<if test="number != null">number,</if>
<if test="bgTime != null">bg_time,</if> <if test="bgTime != null">bg_time,</if>
<if test="hjAddress != null">hj_address,</if>
<if test="jgNature != null">jg_nature,</if>
<if test="longLive != null">long_live,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -84,6 +92,7 @@
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="userId != null">user_id,</if> <if test="userId != null">user_id,</if>
<if test="deptName != null">dept_name,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="acountNo != null">#{acountNo},</if> <if test="acountNo != null">#{acountNo},</if>
@ -98,8 +107,10 @@
<if test="xName != null">#{xName},</if> <if test="xName != null">#{xName},</if>
<if test="xIdCard != null">#{xIdCard},</if> <if test="xIdCard != null">#{xIdCard},</if>
<if test="relation != null">#{relation},</if> <if test="relation != null">#{relation},</if>
<if test="number != null">#{number},</if>
<if test="bgTime != null">#{bgTime},</if> <if test="bgTime != null">#{bgTime},</if>
<if test="hjAddress != null">#{hjAddress},</if>
<if test="jgNature != null">#{jgNature},</if>
<if test="longLive != null">#{longLive},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -107,6 +118,7 @@
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="userId != null">#{userId},</if> <if test="userId != null">#{userId},</if>
<if test="deptName != null">#{deptName},</if>
</trim> </trim>
</insert> </insert>
@ -125,8 +137,10 @@
<if test="xName != null">x_name = #{xName},</if> <if test="xName != null">x_name = #{xName},</if>
<if test="xIdCard != null">x_id_card = #{xIdCard},</if> <if test="xIdCard != null">x_id_card = #{xIdCard},</if>
<if test="relation != null">relation = #{relation},</if> <if test="relation != null">relation = #{relation},</if>
<if test="number != null">number = #{number},</if>
<if test="bgTime != null">bg_time = #{bgTime},</if> <if test="bgTime != null">bg_time = #{bgTime},</if>
<if test="hjAddress != null">hj_address = #{hjAddress},</if>
<if test="jgNature != null">jg_nature = #{jgNature},</if>
<if test="longLive != null">long_live = #{longLive},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
@ -134,6 +148,7 @@
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="deptId != null">dept_id = #{deptId},</if> <if test="deptId != null">dept_id = #{deptId},</if>
<if test="userId != null">user_id = #{userId},</if> <if test="userId != null">user_id = #{userId},</if>
<if test="deptName != null">dept_name = #{deptName},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>

74
ruoyi-ui/src/views/szxc/recard/index.vue
Unescape View File

@ -97,14 +97,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="变更编号" prop="number">
<el-input
v-model="queryParams.number"
placeholder="请输入变更编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="变更时间" prop="bgTime"> <el-form-item label="变更时间" prop="bgTime">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.bgTime" v-model="queryParams.bgTime"
@ -113,6 +105,30 @@
placeholder="请选择变更时间"> placeholder="请选择变更时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="户籍地址" prop="hjAddress">
<el-input
v-model="queryParams.hjAddress"
placeholder="请输入户籍地址"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="户籍性质" prop="jgNature">
<el-input
v-model="queryParams.jgNature"
placeholder="请输入户籍性质"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否常住" prop="longLive">
<el-input
v-model="queryParams.longLive"
placeholder="请输入是否常住"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="部门id" prop="deptId"> <el-form-item label="部门id" prop="deptId">
<el-input <el-input
v-model="queryParams.deptId" v-model="queryParams.deptId"
@ -129,6 +145,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="所属网格" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入所属网格"
clearable
@keyup.enter.native="handleQuery"
/>
</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 type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -196,15 +220,18 @@
<el-table-column label="新户主姓名" align="center" prop="xName" /> <el-table-column label="新户主姓名" align="center" prop="xName" />
<el-table-column label="新户主身份证号" align="center" prop="xIdCard" /> <el-table-column label="新户主身份证号" align="center" prop="xIdCard" />
<el-table-column label="与户主关系" align="center" prop="relation" /> <el-table-column label="与户主关系" align="center" prop="relation" />
<el-table-column label="变更编号" align="center" prop="number" />
<el-table-column label="变更时间" align="center" prop="bgTime" width="180"> <el-table-column label="变更时间" align="center" prop="bgTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.bgTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.bgTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="户籍地址" align="center" prop="hjAddress" />
<el-table-column label="户籍性质" align="center" prop="jgNature" />
<el-table-column label="是否常住" align="center" prop="longLive" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="部门id" align="center" prop="deptId" /> <el-table-column label="部门id" align="center" prop="deptId" />
<el-table-column label="创建者ID" align="center" prop="userId" /> <el-table-column label="创建者ID" align="center" prop="userId" />
<el-table-column label="所属网格" align="center" prop="deptName" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -272,9 +299,6 @@
<el-form-item label="与户主关系" prop="relation"> <el-form-item label="与户主关系" prop="relation">
<el-input v-model="form.relation" placeholder="请输入与户主关系" /> <el-input v-model="form.relation" placeholder="请输入与户主关系" />
</el-form-item> </el-form-item>
<el-form-item label="变更编号" prop="number">
<el-input v-model="form.number" placeholder="请输入变更编号" />
</el-form-item>
<el-form-item label="变更时间" prop="bgTime"> <el-form-item label="变更时间" prop="bgTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.bgTime" v-model="form.bgTime"
@ -283,6 +307,15 @@
placeholder="请选择变更时间"> placeholder="请选择变更时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="户籍地址" prop="hjAddress">
<el-input v-model="form.hjAddress" placeholder="请输入户籍地址" />
</el-form-item>
<el-form-item label="户籍性质" prop="jgNature">
<el-input v-model="form.jgNature" placeholder="请输入户籍性质" />
</el-form-item>
<el-form-item label="是否常住" prop="longLive">
<el-input v-model="form.longLive" placeholder="请输入是否常住" />
</el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
@ -292,6 +325,9 @@
<el-form-item label="创建者ID" prop="userId"> <el-form-item label="创建者ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入创建者ID" /> <el-input v-model="form.userId" placeholder="请输入创建者ID" />
</el-form-item> </el-form-item>
<el-form-item label="所属网格" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入所属网格" />
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -342,10 +378,13 @@
xName: null, xName: null,
xIdCard: null, xIdCard: null,
relation: null, relation: null,
number: null,
bgTime: null, bgTime: null,
hjAddress: null,
jgNature: null,
longLive: null,
deptId: null, deptId: null,
userId: null userId: null,
deptName: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -394,15 +433,18 @@
xName: null, xName: null,
xIdCard: null, xIdCard: null,
relation: null, relation: null,
number: null,
bgTime: null, bgTime: null,
hjAddress: null,
jgNature: null,
longLive: null,
remark: null, remark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
deptId: null, deptId: null,
userId: null userId: null,
deptName: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },

Write Preview
Loading…
Cancel
Save