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

101captain

2021-08-30 209b0535c1faeb3a260c728d154b7b5b38a4c5e2

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", "");
                        }
                        // 巡查时间
                        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());

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

@@ -95,6 +95,9 @@
        comSwPatrolRecordDO.setId(patrolRecordId);
        if(StringUtils.isEmpty(comSwPatrolRecordAddDTO.getPatrolTime())){
            comSwPatrolRecordDO.setPatrolTime(new Date());
        }else {
            comSwPatrolRecordDO.setPatrolTime(
                    DateUtils.stringToDate(comSwPatrolRecordAddDTO.getPatrolTime(), DateUtils.yyyyMMdd_format));
        }
//        comSwPatrolRecordDO.setPatrolTime(new Date());
        comSwPatrolRecordDO.setSuccessionTime(