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

tangxiaobao

2021-07-31 cc0569d48030733d420a4cd77f3f4da405d34372

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

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwRotaDAO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml

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

@@ -214,6 +214,9 @@
    @ApiModelProperty("安全记录/隐患报告显示按钮（1.查看安全工作记录 2.隐患报告待填写 3.查看隐患报告）")
    private Integer displayButton;

    @ApiModelProperty("隐患/安全记录id")
    private Long serviceId;

    /**
     * 巡查类型
     */

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

@@ -39,5 +39,8 @@
     * 联系电话
     */
    @ApiModelProperty("联系电话")
    private Long phone;
    private String phone;

    @ApiModelProperty("头像url")
    private String imageUrl;
}

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

@@ -14,6 +14,8 @@

import java.util.List;

import java.util.Map;

/**
 * @auther txb
 * @create 2021-07-30 09:48:54
@@ -35,4 +37,6 @@
     * @return teamId
     */
    String getTeamIdsByTeamPhone(@Param("teamPhone") String teamPhone);
    Map<String,String> getImageUrl(@Param("userId") Long userId);

}

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

@@ -52,6 +52,15 @@
    @Override
    public R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
        IPage<ComSwPatrolRecordVO> iPage = comSwPatrolRecordDAO.pagePatrolRecord(new Page(comSwPatrolRecordPageDTO.getPageNum(),comSwPatrolRecordPageDTO.getPageSize()), comSwPatrolRecordPageDTO);
        if(!iPage.getRecords().isEmpty()){
            iPage.getRecords().forEach(patrol -> {
                ComSwPatrolRecordReportDO recordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>()
                        .lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId,patrol.getId()));
                if(recordReportDO != null){
                    patrol.setServiceId(recordReportDO.getReportId());
                }
            });
        }
        return R.ok(iPage);
    }


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

@@ -220,6 +220,11 @@
                comSwRotaPersonVO.setId(Long.valueOf(rotaPersonArray[i]));
                comSwRotaPersonVO.setName(person.get("name"));
                comSwRotaPersonVO.setPhone(Long.valueOf(person.get("phone")));
                Map<String,String> userMap = this.comSwRotaDAO.getImageUrl(Long.valueOf(rotaPersonArray[i]));
                if(userMap != null){
                    comSwRotaPersonVO.setPhone(userMap.get("phone"));
                    comSwRotaPersonVO.setImageUrl(userMap.get("url"));
                }
                rotaPersons.add(comSwRotaPersonVO);
            }
        }
@@ -244,6 +249,11 @@
                comSwRotaPersonVO.setId(Long.valueOf(rotaPersonArray[i]));
                comSwRotaPersonVO.setName(leader.get("name"));
                comSwRotaPersonVO.setPhone(Long.valueOf(leader.get("phone")));
                Map<String,String> userMap = this.comSwRotaDAO.getImageUrl(Long.valueOf(rotaPersonArray[i]));
                if(userMap != null){
                    comSwRotaPersonVO.setPhone(userMap.get("phone"));
                    comSwRotaPersonVO.setImageUrl(userMap.get("url"));
                }
                rotaLeaders.add(comSwRotaPersonVO);
            }
        }

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

@@ -53,4 +53,8 @@
        from com_pb_service_team
        where phone = #{teamPhone}
    </select>

    <select id="getImageUrl" resultType="Map">
        select phone,url from com_pb_service_team where id = #{userId}
    </select>
</mapper>