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

101captain

2021-08-30 b73420cd1b79603ba7ab161d67717b792bd7fa07

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

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

@@ -656,8 +656,12 @@
                            dataMap.put("remark", "");
                        }
                        // 巡查时间
                        dataMap.put("patrolTime",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getPatrolTime()));
                        if (comSwSafetyWorkRecordVO.getPatrolTime() != null) {
                            dataMap.put("patrolTime",
                                    new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getPatrolTime()));
                        }else {
                            dataMap.put("patrolTime", "");
                        }
                        // 工作人员
                        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPersonName())) {
                            dataMap.put("personName", comSwSafetyWorkRecordVO.getPersonName());
@@ -792,8 +796,12 @@
                    sftp.download("/mnt/data/web/", "blank.jpg", "d:/patrolRecord/file/blank.jpg");
                    try {
                        // 日期
                        dataMap.put("date",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getPatrolTime()));
                        if (comSwPatrolRecordVO.getPatrolTime() != null) {
                            dataMap.put("date",
                                    new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getPatrolTime()));
                        }else {
                            dataMap.put("date", "");
                        }
                        // 巡查类型
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getPatrolType())) {
                            dataMap.put("patrolType", comSwPatrolRecordVO.getPatrolType());
@@ -944,8 +952,12 @@
                            dataMap.put("personName", "");
                        }
                        // 接班时间
                        dataMap.put("successionTime",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getSuccessionTime()));
                        if (comSwPatrolRecordVO.getSuccessionTime() != null) {
                            dataMap.put("successionTime",
                                    new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getSuccessionTime()));
                        }else {
                            dataMap.put("successionTime", "");
                        }
                        // 接班人员
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getSuccessionPerson())) {
                            dataMap.put("successionPerson", comSwPatrolRecordVO.getSuccessionPerson());
@@ -1080,9 +1092,17 @@
                sftp.download("/mnt/data/web/", "blank.jpg", "d:/dangerReport/file/blank.jpg");
                try {
                    // 日期
                    dataMap.put("date", comSwDangerReportVO.getCheckTime());
                    if (StringUtils.isNotEmpty(comSwDangerReportVO.getCheckTime())) {
                        dataMap.put("date", comSwDangerReportVO.getCheckTime());
                    } else {
                        dataMap.put("date", "");
                    }
                    // 巡查类型
                    dataMap.put("patrolType", comSwDangerReportVO.getPatrolType());
                    if (StringUtils.isNotEmpty(comSwDangerReportVO.getPatrolType())) {
                        dataMap.put("patrolType", comSwDangerReportVO.getPatrolType());
                    }else {
                        dataMap.put("patrolType", "");
                    }
                    // 地址
                    if (StringUtils.isNotEmpty(comSwDangerReportVO.getAddress())) {
                        dataMap.put("address", comSwDangerReportVO.getAddress());