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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,12 +1,18 @@
package com.panzhihua.service_community.service.impl;

import java.util.Map;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActDAO;
@@ -17,13 +23,8 @@
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordReportDO;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
import com.panzhihua.service_community.service.ComSwSafetyWorkRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther txb
@@ -32,7 +33,8 @@
 */
@Slf4j
@Service
public class ComSwSafetyWorkRecordServiceImpl extends ServiceImpl<ComSwSafetyWorkRecordDAO, ComSwSafetyWorkRecordDO> implements ComSwSafetyWorkRecordService {
public class ComSwSafetyWorkRecordServiceImpl extends ServiceImpl<ComSwSafetyWorkRecordDAO, ComSwSafetyWorkRecordDO>
    implements ComSwSafetyWorkRecordService {

    @Resource
    private ComSwSafetyWorkRecordDAO comSwSafetyWorkRecordDAO;
@@ -60,19 +62,20 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);

        IPage<ComSwSafetyWorkRecordVO> iPage = comSwSafetyWorkRecordDAO.pageSafetyWorkRecord(page, comSwPatrolRecordPageDTO);
        if(!iPage.getRecords().isEmpty()){
        IPage<ComSwSafetyWorkRecordVO> iPage =
            comSwSafetyWorkRecordDAO.pageSafetyWorkRecord(page, comSwPatrolRecordPageDTO);
        if (!iPage.getRecords().isEmpty()) {
            iPage.getRecords().forEach(work -> {
                //查询人员信息
                if(StringUtils.isNotEmpty(work.getPatrolPerson())){
                // 查询人员信息
                if (StringUtils.isNotEmpty(work.getPatrolPerson())) {
                    StringBuilder sb = new StringBuilder();
                    String personIds[] = work.getPatrolPerson().split(",");
                    String[] personIds = work.getPatrolPerson().split(",");
                    for (int i = 0; i < personIds.length; i++) {
                        if(i != 0){
                        if (i != 0) {
                            sb.append(",");
                        }
                        Map<String,String> personMap = comSwPatrolRecordDAO.getPbServiceTeamById(personIds[i]);
                        if(personMap != null){
                        Map<String, String> personMap = comSwPatrolRecordDAO.getPbServiceTeamById(personIds[i]);
                        if (personMap != null) {
                            sb.append(personMap.get("name"));
                        }
                    }
@@ -89,56 +92,60 @@
        if (null == swSafetyWorkRecordDO) {
            return R.fail("该安全工作记录不存在");
        }
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getReportId, safetyWorkRecordId));
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO =
            comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda()
                .eq(ComSwPatrolRecordReportDO::getReportId, safetyWorkRecordId));
        ComSwSafetyWorkRecordVO comSwSafetyWorkRecordVO = new ComSwSafetyWorkRecordVO();
        if (null != comSwPatrolRecordReportDO) {
            ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(comSwPatrolRecordReportDO.getPatrolRecordId());
            ComSwPatrolRecordDO comSwPatrolRecordDO =
                comSwPatrolRecordDAO.selectById(comSwPatrolRecordReportDO.getPatrolRecordId());
            BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
        }

        BeanUtils.copyProperties(swSafetyWorkRecordDO, comSwSafetyWorkRecordVO);

        //组装巡查类型
        if(StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPatrolType())){
        // 组装巡查类型
        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPatrolType())) {
            StringBuilder sb = new StringBuilder();
            String patrolTypes[] = comSwSafetyWorkRecordVO.getPatrolType().split(",");
            String[] patrolTypes = comSwSafetyWorkRecordVO.getPatrolType().split(",");
            for (int i = 0; i < patrolTypes.length; i++) {
                if(i != 0){
                if (i != 0) {
                    sb.append(",");
                }
                if(patrolTypes[i].equals("1")){
                if (patrolTypes[i].equals("1")) {
                    sb.append("防火巡查");
                }else if(patrolTypes[i].equals("2")){
                } else if (patrolTypes[i].equals("2")) {
                    sb.append("防汛巡查");
                }else if(patrolTypes[i].equals("3")){
                } else if (patrolTypes[i].equals("3")) {
                    sb.append("防疫巡查");
                }
            }
            comSwSafetyWorkRecordVO.setPatrolType(sb.toString());
        }

        //查询人员信息
        if(StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPatrolPerson())){
        // 查询人员信息
        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPatrolPerson())) {
            StringBuilder sb = new StringBuilder();
            String personIds[] = comSwSafetyWorkRecordVO.getPatrolPerson().split(",");
            String[] personIds = comSwSafetyWorkRecordVO.getPatrolPerson().split(",");
            for (int i = 0; i < personIds.length; i++) {
                if(i != 0){
                if (i != 0) {
                    sb.append(",");
                }
                Map<String,String> personMap = comSwPatrolRecordDAO.getPbServiceTeamById(personIds[i]);
                if(personMap != null){
                Map<String, String> personMap = comSwPatrolRecordDAO.getPbServiceTeamById(personIds[i]);
                if (personMap != null) {
                    sb.append(personMap.get("name"));
                }
            }
            comSwSafetyWorkRecordVO.setPersonName(sb.toString());
        }

        //查询填报人名称
        if(comSwSafetyWorkRecordVO.getCreateBy() != null){
            comSwSafetyWorkRecordVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwSafetyWorkRecordVO.getCreateBy()));
        // 查询填报人名称
        if (comSwSafetyWorkRecordVO.getCreateBy() != null) {
            comSwSafetyWorkRecordVO
                .setCreateName(comSwPatrolRecordDAO.getCreateName(comSwSafetyWorkRecordVO.getCreateBy()));
        }

        //所属社区名称
        // 所属社区名称
        comSwSafetyWorkRecordVO.setCommunityName(comActDAO.selectById(communityId).getName());
        return R.ok(comSwSafetyWorkRecordVO);
    }
@@ -147,16 +154,19 @@
    public R detailSafetyWorkRecordByPrId(Long patrolRecordId, Long communityId) {
        ComSwSafetyWorkRecordVO comSwSafetyWorkRecordVO = new ComSwSafetyWorkRecordVO();
        ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(patrolRecordId);
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO =
            comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda()
                .eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
        if (null != comSwPatrolRecordReportDO) {
            ComSwSafetyWorkRecordDO comSwSafetyWorkRecordDO = comSwSafetyWorkRecordDAO.selectById(comSwPatrolRecordReportDO.getReportId());
            ComSwSafetyWorkRecordDO comSwSafetyWorkRecordDO =
                comSwSafetyWorkRecordDAO.selectById(comSwPatrolRecordReportDO.getReportId());
            if (null == comSwSafetyWorkRecordDO) {
                return R.fail("该安全工作记录不存在");
            }
            BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
            BeanUtils.copyProperties(comSwSafetyWorkRecordDO, comSwSafetyWorkRecordVO);
        }
        //所属社区名称
        // 所属社区名称
        comSwSafetyWorkRecordVO.setCommunityName(comActDAO.selectById(communityId).getName());
        return R.ok(comSwSafetyWorkRecordVO);
    }