Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

LuoTong

2024-07-30 555f762284195c021783e496d2fcf9303533cd88

Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -807,11 +807,10 @@
     */
    @PostMapping("detailusercomunity")
    public R detailUserComunity(@RequestParam("userId") Long userId) {
        CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
        if (userId < 100000000l) {
        CommunityUserInfoVO communityUserInfoVO;
        communityUserInfoVO = sysUserInputService.detailUserComunity(userId);
        if (communityUserInfoVO==null) {
            communityUserInfoVO = userService.detailUserComunity(userId);
        } else {
            communityUserInfoVO = sysUserInputService.detailUserComunity(userId);
        }
        return R.ok(communityUserInfoVO);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserInputDO.java

@@ -108,12 +108,12 @@
    /**
     * 是否低保户 0 否 1是
     */
    private Integer lowincomeHouseholds;
    private Integer lowIncomeHouseholds;

    /**
     * 是否低收入人员 0否 1是
     */
    private Integer lowincomePeople;
    private Integer lowIncomePeople;

    /**
     * 是否高龄老人 0否 1是

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java

@@ -109,8 +109,8 @@
                    sysUserInputDO.setIsPanzhihua(eexcelUserDTO.getIsPanZhiHua().equals("是") ? 1 : 0);
                    sysUserInputDO.setIsRent(eexcelUserDTO.getIsRent().equals("是") ? 1 : 0);
                    sysUserInputDO.setKeyPersonnel(eexcelUserDTO.getKeyPersonnel().equals("是") ? 1 : 0);
                    sysUserInputDO.setLowincomeHouseholds(eexcelUserDTO.getLowIncomeHouseholds().equals("是") ? 1 : 0);
                    sysUserInputDO.setLowincomePeople(eexcelUserDTO.getLowIncomePeople().equals("是") ? 1 : 0);
                    sysUserInputDO.setLowIncomeHouseholds(eexcelUserDTO.getLowIncomeHouseholds().equals("是") ? 1 : 0);
                    sysUserInputDO.setLowIncomePeople(eexcelUserDTO.getLowIncomePeople().equals("是") ? 1 : 0);
                    sysUserInputDO.setMajor(eexcelUserDTO.getMajor().equals("是") ? 1 : 0);
                    sysUserInputDO.setMaritalStatus(eexcelUserDTO.getMaritalStatus().equals("是") ? 1 : 0);
                    sysUserInputDO.setName(eexcelUserDTO.getName());
@@ -147,10 +147,11 @@
     */
    @Override
    public CommunityUserInfoVO detailUserComunity(Long userId) {
        CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
        userId = userId - 100000000l;
        CommunityUserInfoVO communityUserInfoVO=null;
//        userId = userId - 100000000l;
        SysUserInputDO sysUserInputDO = sysUserInputDAO.selectById(userId);
        if (!org.springframework.util.ObjectUtils.isEmpty(sysUserInputDO)) {
            communityUserInfoVO = new CommunityUserInfoVO();
            BeanUtils.copyProperties(sysUserInputDO, communityUserInfoVO);
            String idCard = sysUserInputDO.getIdCard();
            if (!org.springframework.util.ObjectUtils.isEmpty(idCard)) {
@@ -164,8 +165,8 @@
            Integer keyPersonnel = sysUserInputDO.getKeyPersonnel();
            Integer specialServiceFamily = sysUserInputDO.getSpecialServiceFamily();
            Integer soldier = sysUserInputDO.getSoldier();
            Integer lowincomeHouseholds = sysUserInputDO.getLowincomeHouseholds();
            Integer lowincomePeople = sysUserInputDO.getLowincomePeople();
            Integer lowincomeHouseholds = sysUserInputDO.getLowIncomeHouseholds();
            Integer lowincomePeople = sysUserInputDO.getLowIncomePeople();
            Integer oldPeople = sysUserInputDO.getOldPeople();
            Integer disability = sysUserInputDO.getDisability();

@@ -266,8 +267,8 @@
            Integer keyPersonnel = sysUserInputDO.getKeyPersonnel();
            Integer specialServiceFamily = sysUserInputDO.getSpecialServiceFamily();
            Integer soldier = sysUserInputDO.getSoldier();
            Integer lowincomeHouseholds = sysUserInputDO.getLowincomeHouseholds();
            Integer lowincomePeople = sysUserInputDO.getLowincomePeople();
            Integer lowincomeHouseholds = sysUserInputDO.getLowIncomeHouseholds();
            Integer lowincomePeople = sysUserInputDO.getLowIncomePeople();
            Integer oldPeople = sysUserInputDO.getOldPeople();
            Integer disability = sysUserInputDO.getDisability();

@@ -403,8 +404,8 @@
            sysUserInput.setKeyPersonnel(0);
            sysUserInput.setSpecialServiceFamily(0);
            sysUserInput.setSoldier(0);
            sysUserInput.setLowincomeHouseholds(0);
            sysUserInput.setLowincomePeople(0);
            sysUserInput.setLowIncomeHouseholds(0);
            sysUserInput.setLowIncomePeople(0);
            sysUserInput.setOldPeople(0);
            sysUserInput.setDisability(0);
        });

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -2297,9 +2297,10 @@
     */
    @Override
    public CommunityUserInfoVO detailUserComunity(Long userId) {
        CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
        CommunityUserInfoVO communityUserInfoVO = null;
        SysUserDO sysUserDO = userDao.selectById(userId);
        if (!ObjectUtils.isEmpty(sysUserDO)) {
            communityUserInfoVO = new CommunityUserInfoVO();
            String idCard = sysUserDO.getIdCard();
            if (!ObjectUtils.isEmpty(idCard)) {
                communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard));

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserInputDAO.xml

@@ -19,8 +19,8 @@
        <result property="isContact" column="is_contact"/>
        <result property="major" column="major"/>
        <result property="soldier" column="soldier"/>
        <result property="lowincomeHouseholds" column="low_income_households"/>
        <result property="lowincomePeople" column="low_income_people"/>
        <result property="lowIncomeHouseholds" column="low_income_households"/>
        <result property="lowIncomePeople" column="low_income_people"/>
        <result property="oldPeople" column="old_people"/>
        <result property="specialServiceFamily" column="special_service_family"/>
        <result property="keyPersonnel" column="key_personnel"/>