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

huanghongfa

2021-08-02 2657acbba93405401a18cee8891a03006e995a80

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java

@@ -140,7 +140,7 @@
    * 隐患简述
    */
    @ApiModelProperty("隐患简述")
    private String dagerDescription;
    private String dangerDescription;

    /**
    * 是否立即整改（1是 、0否）

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java

@@ -78,6 +78,44 @@
                }else {
                    comSwDangerReportVO.setIsAssign(ComSwDangerReportVO.isOk.yes);
                }
                StringBuilder patrolNameString = new StringBuilder();
                StringBuilder patrolPhoneString = new StringBuilder();
                //巡查人员id查询巡查人员的名字和电话
                if(StringUtils.isNotEmpty(comSwDangerReportVO.getPatrolPerson())){
                    String[] patrolIds = comSwDangerReportVO.getPatrolPerson().split(",");
                    for (int i = 0; i < patrolIds.length ; i++) {
                        Map<String,String> leader = comSwPatrolRecordDAO.getPbServiceTeamById(patrolIds[i]);
                        if(leader != null){
                            if(i != 0){
                                patrolNameString.append(",");
                                patrolPhoneString.append(",");
                            }
                            patrolNameString.append(leader.get("name"));
                            patrolPhoneString.append(leader.get("phone"));
                        }
                    }
                    comSwDangerReportVO.setPPersonName(patrolNameString.toString());
                    comSwDangerReportVO.setPPersonPhone(patrolPhoneString.toString());
                }
                //整改人员id查询整改人员的名字和电话
                StringBuilder dangerNameString = new StringBuilder();
                StringBuilder dangerPhoneString = new StringBuilder();
                if(StringUtils.isNotEmpty(comSwDangerReportVO.getRectifyPerson())){
                    String[] dangerIds = comSwDangerReportVO.getRectifyPerson().split(",");
                    for (int i = 0; i < dangerIds.length ; i++) {
                        Map<String,String> person = comSwPatrolRecordDAO.getPbServiceTeamById(dangerIds[i]);
                        if(person != null){
                            if(i != 0){
                                dangerNameString.append(",");
                                dangerPhoneString.append(",");
                            }
                            dangerNameString.append(person.get("name"));
                            dangerPhoneString.append(person.get("phone"));
                        }
                    }
                    comSwDangerReportVO.setDPersonName(dangerNameString.toString());
                    comSwDangerReportVO.setDPersonPhone(dangerPhoneString.toString());
                }
            });
        }
        return R.ok(iPage);
@@ -116,7 +154,7 @@
            comSwDangerReportVO.setPatrolType(sb.toString());
        }

        //查询人员信息
        //查询整改人员信息
        if(StringUtils.isNotEmpty(comSwDangerReportVO.getRectifyPerson())){
            StringBuilder sb = new StringBuilder();
            String personIds[] = comSwDangerReportVO.getRectifyPerson().split(",");
@@ -153,10 +191,43 @@
            comSwDangerReportVO.setAssignPersonName(sb.toString());
        }

        //查询巡查人员
        Map<String,String> map = comSwPatrolRecordDAO.getPatrolPersonName(comSwDangerReportVO.getId());
        if(map != null){
            comSwDangerReportVO.setPatrolName(map.get("person_name"));
        StringBuilder patrolNameString = new StringBuilder();
        StringBuilder patrolPhoneString = new StringBuilder();
        //巡查人员id查询巡查人员的名字和电话
        if(StringUtils.isNotEmpty(comSwDangerReportVO.getPatrolPerson())){
            String[] patrolIds = comSwDangerReportVO.getPatrolPerson().split(",");
            for (int i = 0; i < patrolIds.length ; i++) {
                Map<String,String> leader = comSwPatrolRecordDAO.getPbServiceTeamById(patrolIds[i]);
                if(leader != null){
                    if(i != 0){
                        patrolNameString.append(",");
                        patrolPhoneString.append(",");
                    }
                    patrolNameString.append(leader.get("name"));
                    patrolPhoneString.append(leader.get("phone"));
                }
            }
            comSwDangerReportVO.setPPersonName(patrolNameString.toString());
            comSwDangerReportVO.setPPersonPhone(patrolPhoneString.toString());
        }
        //整改人员id查询整改人员的名字和电话
        StringBuilder dangerNameString = new StringBuilder();
        StringBuilder dangerPhoneString = new StringBuilder();
        if(StringUtils.isNotEmpty(comSwDangerReportVO.getRectifyPerson())){
            String[] dangerIds = comSwDangerReportVO.getRectifyPerson().split(",");
            for (int i = 0; i < dangerIds.length ; i++) {
                Map<String,String> person = comSwPatrolRecordDAO.getPbServiceTeamById(dangerIds[i]);
                if(person != null){
                    if(i != 0){
                        dangerNameString.append(",");
                        dangerPhoneString.append(",");
                    }
                    dangerNameString.append(person.get("name"));
                    dangerPhoneString.append(person.get("phone"));
                }
            }
            comSwDangerReportVO.setDPersonName(dangerNameString.toString());
            comSwDangerReportVO.setDPersonPhone(dangerPhoneString.toString());
        }

        return R.ok(comSwDangerReportVO);
@@ -178,6 +249,44 @@
            BeanUtils.copyProperties(comSwDangerReportDO, comSwDangerReportVO);
        }
        BeanUtils.copyProperties(comSwPatrolRecordDO, comSwDangerReportVO);
        StringBuilder patrolNameString = new StringBuilder();
        StringBuilder patrolPhoneString = new StringBuilder();
        //巡查人员id查询巡查人员的名字和电话
        if(StringUtils.isNotEmpty(comSwDangerReportVO.getPatrolPerson())){
            String[] patrolIds = comSwDangerReportVO.getPatrolPerson().split(",");
            for (int i = 0; i < patrolIds.length ; i++) {
                Map<String,String> leader = comSwPatrolRecordDAO.getPbServiceTeamById(patrolIds[i]);
                if(leader != null){
                    if(i != 0){
                        patrolNameString.append(",");
                        patrolPhoneString.append(",");
                    }
                    patrolNameString.append(leader.get("name"));
                    patrolPhoneString.append(leader.get("phone"));
                }
            }
            comSwDangerReportVO.setPPersonName(patrolNameString.toString());
            comSwDangerReportVO.setPPersonPhone(patrolPhoneString.toString());
        }
        //整改人员id查询整改人员的名字和电话
        StringBuilder dangerNameString = new StringBuilder();
        StringBuilder dangerPhoneString = new StringBuilder();
        if(StringUtils.isNotEmpty(comSwDangerReportVO.getRectifyPerson())){
            String[] dangerIds = comSwDangerReportVO.getRectifyPerson().split(",");
            for (int i = 0; i < dangerIds.length ; i++) {
                Map<String,String> person = comSwPatrolRecordDAO.getPbServiceTeamById(dangerIds[i]);
                if(person != null){
                    if(i != 0){
                        dangerNameString.append(",");
                        dangerPhoneString.append(",");
                    }
                    dangerNameString.append(person.get("name"));
                    dangerPhoneString.append(person.get("phone"));
                }
            }
            comSwDangerReportVO.setDPersonName(dangerNameString.toString());
            comSwDangerReportVO.setDPersonPhone(dangerPhoneString.toString());
        }
        return R.ok(comSwDangerReportVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml

@@ -57,7 +57,7 @@
                AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
            </if>
            <if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != ""'>
                AND cspr.patrol_person LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
                AND cspr.person_name LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
            </if>
            <if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != ""'>
                AND cspr.patrol_type LIKE concat('%',#{comSwPatrolRecordDTO.patrolType},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml

@@ -37,8 +37,8 @@
            com_sw_rota csr
        where csr.community_id = #{comSwRotaPageDTO.communityId}
        <if test='comSwRotaPageDTO.rotaPerson != null and comSwRotaPageDTO.rotaPerson != ""'>
            AND (csr.rota_person LIKE concat('%',#{comSwRotaPageDTO.rotaPerson},'%')
                or csr.rota_leader LIKE concat('%',#{comSwRotaPageDTO.rotaPerson},'%')
            AND (csr.leader_name LIKE concat('%',#{comSwRotaPageDTO.rotaPerson},'%')
                or csr.person_name LIKE concat('%',#{comSwRotaPageDTO.rotaPerson},'%')
                )
        </if>
        <if test='comSwRotaPageDTO.phone != null and comSwRotaPageDTO.phone != ""'>