社区后台基础数据库bug修改

tangxiaobao

2021-07-20 a582839c97b0b5ed9af0399560a82d3aab6e74ea

社区后台基础数据库bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java

@@ -59,6 +59,21 @@
    }

    /**
     * 获取登录对象所在社区名称
     *
     * @return 社区名称
     */
    public String getCommunityName() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        if (null == communityId || 0 == communityId) {
            throw new ServiceException("用户未绑定社区");
        }
        String communityName = loginUserInfo.getCommunityName();
        return communityName;
    }

    /**
     * 获取登录对象所在小区
     *
     * @return 小区id

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java

@@ -196,12 +196,13 @@
                    Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
                    if (isOk.equals(-1)) {
//                        vo.setMarriageStr(ma);
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第6列");
                        importErrorVO.setErrorMsg("您填写的与户主关系有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                        importErrorVO.setErrorPosition("第" + index + "行，第6列");
//                        importErrorVO.setErrorMsg("您填写的与户主关系有误");
//                        populationImportErrorVOList.add(importErrorVO);
//                        index++;
//                        continue;
                        vo.setRelation(6);
                    } else {
                        vo.setRelation(isOk);
                    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarVO.java

@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -33,6 +34,7 @@
    private String areaName;

    @ApiModelProperty("小区ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long areaId;

    @ApiModelProperty("详细住址")
@@ -42,6 +44,7 @@
    private String userName;

    @ApiModelProperty("车主身份证号码")
    @EncryptDecryptField
    private String cardNo;

    @ApiModelProperty("车主用户ID")

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java

@@ -684,6 +684,8 @@
    @ApiOperation(value = "实有单位归属地", response = ComMngRealCompanyVO.class)
    @PostMapping("/company/belongs")
    public R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) {
        String communityName = this.getCommunityName();
        comMngRealCompanyBelongsDTO.setActName(communityName);
        return communityService.belongsComMngRealCompany(comMngRealCompanyBelongsDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java

@@ -33,7 +33,7 @@
            " t1.`name` AS communityName, " +
            " t.card_no AS cardNo, " +
            " t.area_id AS areaId, " +
            " t2.area_name AS areaName, " +
            " t.area_name AS areaName, " +
            " t.user_id userId, " +
            " t.user_name AS userName, " +
            " t.address, " +
@@ -46,19 +46,18 @@
            "FROM " +
            " com_mng_car t " +
            " LEFT JOIN com_act t1 ON t.community_id = t1.community_id " +
            " LEFT JOIN com_mng_struct_area t2 ON t2.id = t.area_id " +
            " LEFT JOIN sys_user t3 ON t.create_by = t3.user_id " +
            " WHERE 1=1" +
            "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name != &quot;&quot;'>" +
            " and t.user_name LIKE concat( '%',#{pageComMngCarDTO.name}, '%' )  " +
            " </if> " +
            "<if test='pageComMngCarDTO.villageId != null'>" +
            "<if test='pageComMngCarDTO.villageId != null and pageComMngCarDTO.villageId != &quot;&quot;'>" +
            " and t.area_id = #{pageComMngCarDTO.villageId} " +
            " </if> " +
            "<if test='pageComMngCarDTO.communityId != null and pageComMngCarDTO.communityId != 0'>" +
            " and t.community_id = #{pageComMngCarDTO.communityId} " +
            " </if> " +
            "<if test='pageComMngCarDTO.areaName != null'>" +
            "<if test='pageComMngCarDTO.areaName != null and pageComMngCarDTO.areaName != &quot;&quot;'>" +
            " and t2.area_name LIKE concat( '%',#{pageComMngCarDTO.areaName}, '%' )  " +
            " </if> " +
            " order by t.create_at desc" +