Commit eb3255a6 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6

parents 0de61bf1 37b6046f
...@@ -167,6 +167,33 @@ public class SysHouseHoldInfo extends BaseEntity { ...@@ -167,6 +167,33 @@ public class SysHouseHoldInfo extends BaseEntity {
@ExcelProperty("办理人") @ExcelProperty("办理人")
private String handleUserName; private String handleUserName;
/**
* 类型 0 独立户
*/
@ExcelAttribute(name = "类型" )
@Schema(description ="类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("类型")
private String houseType;
/**
* 单位编号
*/
@ExcelAttribute(name = "单位编号" )
@Schema(description ="单位编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位编号")
private String customerNo;
/**
* 单位统一信用代码
*/
@ExcelAttribute(name = "单位统一信用代码" )
@Schema(description ="单位统一信用代码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位统一信用代码")
private String unitCreditCode;
/** /**
* 审核人部门 * 审核人部门
*/ */
......
...@@ -62,6 +62,18 @@ public class SysHouseHoldInfoController { ...@@ -62,6 +62,18 @@ public class SysHouseHoldInfoController {
return new R<>(sysHouseHoldInfoService.getSysHouseHoldInfoPage(page,sysHouseHoldInfo)); return new R<>(sysHouseHoldInfoService.getSysHouseHoldInfoPage(page,sysHouseHoldInfo));
} }
/**
* 获取所有的独立户数据
* @param page 分页对象
* @return
*/
@Operation(description = "获取所有的独立户数据")
@GetMapping("/getAllSingleSocail" )
public R<IPage<SysHouseHoldInfo>> getAllSingleSocailPage(Page page) {
return new R<>(sysHouseHoldInfoService.getAllSingleSocailPage(page));
}
/** /**
* 不分页查询 * 不分页查询
* @param sysHouseHoldInfo 社保户公积金户数据 * @param sysHouseHoldInfo 社保户公积金户数据
......
...@@ -38,4 +38,11 @@ public interface SysHouseHoldInfoMapper extends BaseMapper<SysHouseHoldInfo> { ...@@ -38,4 +38,11 @@ public interface SysHouseHoldInfoMapper extends BaseMapper<SysHouseHoldInfo> {
* @return * @return
*/ */
IPage<SysHouseHoldInfo> getSysHouseHoldInfoPage(Page<SysHouseHoldInfo> page, @Param("sysHouseHoldInfo") SysHouseHoldInfo sysHouseHoldInfo); IPage<SysHouseHoldInfo> getSysHouseHoldInfoPage(Page<SysHouseHoldInfo> page, @Param("sysHouseHoldInfo") SysHouseHoldInfo sysHouseHoldInfo);
/**
* 获取所有的独立户数据
* @param page
* @return
*/
IPage<SysHouseHoldInfo> getAllSingleSocailPage(Page<SysHouseHoldInfo> page);
} }
...@@ -46,4 +46,6 @@ public interface SysHouseHoldInfoService extends IService<SysHouseHoldInfo> { ...@@ -46,4 +46,6 @@ public interface SysHouseHoldInfoService extends IService<SysHouseHoldInfo> {
R<Boolean> saveInfo (SysHouseHoldInfo sysHouseHoldInfo); R<Boolean> saveInfo (SysHouseHoldInfo sysHouseHoldInfo);
R<Boolean> updateByIdAsso(SysHouseHoldInfo sysHouseHoldInfo); R<Boolean> updateByIdAsso(SysHouseHoldInfo sysHouseHoldInfo);
IPage<SysHouseHoldInfo> getAllSingleSocailPage(Page<SysHouseHoldInfo> page);
} }
...@@ -60,6 +60,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -60,6 +60,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
return baseMapper.getSysHouseHoldInfoPage(page,sysHouseHoldInfo); return baseMapper.getSysHouseHoldInfoPage(page,sysHouseHoldInfo);
} }
/**
* 获取所有的独立户数据
* @param page
* @return
*/
@Override
public IPage<SysHouseHoldInfo> getAllSingleSocailPage(Page<SysHouseHoldInfo> page){
return baseMapper.getAllSingleSocailPage(page);
}
/** /**
* 户新增 * 户新增
* @param sysHouseHoldInfo 社保户公积金户数据 * @param sysHouseHoldInfo 社保户公积金户数据
......
...@@ -44,7 +44,16 @@ ...@@ -44,7 +44,16 @@
<result property="createName" column="CREATE_NAME"/> <result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="houseType" column="HOUSE_TYPE"/>
<result property="customerNo" column="CUSTOMER_NO"/>
<result property="unitCreditCode" column="UNIT_CREDIT_CODE"/>
</resultMap> </resultMap>
<resultMap id="sysHouseHoldSingleInfoMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo">
<id property="id" column="ID"/>
<result property="name" column="NAME"/>
</resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
a.ORGAN_ID, a.ORGAN_ID,
...@@ -64,8 +73,12 @@ ...@@ -64,8 +73,12 @@
a.AUDIT_USER, a.AUDIT_USER,
a.AUDIT_USER_NAME, a.AUDIT_USER_NAME,
a.HANDLE_USER, a.HANDLE_USER,
a.HOUSE_TYPE,
a.CUSTOMER_NO,
a.UNIT_CREDIT_CODE,
a.HANDLE_USER_NAME a.HANDLE_USER_NAME
</sql> </sql>
<sql id="sysHouseHoldInfo_where"> <sql id="sysHouseHoldInfo_where">
<if test="sysHouseHoldInfo != null"> <if test="sysHouseHoldInfo != null">
<if test="sysHouseHoldInfo.id != null and sysHouseHoldInfo.id.trim() != ''"> <if test="sysHouseHoldInfo.id != null and sysHouseHoldInfo.id.trim() != ''">
...@@ -126,4 +139,14 @@ ...@@ -126,4 +139,14 @@
</where> </where>
order by a.CREATE_TIME desc order by a.CREATE_TIME desc
</select> </select>
<!--sysHouseHoldInfo简单分页查询-->
<select id="getAllSingleSocailPage" resultMap="sysHouseHoldSingleInfoMap">
SELECT
a.ID,
a.NAME
FROM sys_house_hold_info a
where a.TYPE = '0' and HOUSE_TYPE = '0'
order by a.CREATE_TIME desc
</select>
</mapper> </mapper>
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