101captain
2021-10-09 ea9a1a381b6b7e0e6cb5d4ba4d6780137da0d87f
基础数据bug处理
3个文件已修改
28 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationNoSecretVO.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyAlarmSettingService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationNoSecretVO.java
@@ -106,6 +106,7 @@
    @ApiModelProperty("联系方式")
    @NotBlank(groups = {AddGroup.class}, message = "联系方式不可为空")
    @EncryptDecryptField
    private String phone;
    @ApiModelProperty("备注")
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyAlarmSettingService.java
@@ -12,7 +12,24 @@
 * @since 2021-09-09 09:46:50
 */
public interface ComPropertyAlarmSettingService extends IService<ComPropertyAlarmSetting> {
    /**
     * 分页查询
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
    /**
     * 根据社区id查询
     * @param communityId
     * @return
     */
    R getByCommunityId(Long communityId);
    /**
     * 新增方法
     * @param comPropertyAlarmSetting
     * @return
     */
    R insert(ComPropertyAlarmSetting comPropertyAlarmSetting);
}
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml
@@ -58,11 +58,11 @@
    <select id="selectById" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        select t.*, t3.address as position, t2.name as solveName
        from com_property_alarm t
                 left join com_property_equipment t1 on t.serial_no = t1.serial_no
                 left join sys_user t2 on t.solve_id = user_id
                 left join com_mng_population_house t3 on t1.village_id=t3.id
        select t.id,t.serial_no,t.type,t.create_time,t.phone,t1.username as name,t.status,t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName,t4.username as receiveName from com_property_alarm t
            left join com_property_equipment t1 on t.serial_no = t1.serial_no
            left join com_mng_population_house t3 on t1.village_id=t3.id
            left join sys_user t2 on t.solve_id = user_id
            left join com_property_equipment t4 on t.receive_no = t4.serial_no
        where t.id=#{id}
    </select>