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

huanghongfa

2021-08-25 f917fc4d42481ea072bef864ace63d9572b89bb5

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

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

New file
@@ -0,0 +1,41 @@
package com.panzhihua.common.model.vos.community;

import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * title: ComActActEvaluateDO  社区活动评价表
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 记录和展示社区活动评价内容
 *
 * @author txb
 * @date 2021/8/24 10:21
 */

@Data
@ApiModel("社区活动评价表")
public class ComActActEvaluateExcelVO {

    @ExcelProperty(value = "姓名", index = 1)
    private String name;

    @ExcelProperty(value = "身份", index = 2)
    private String identity;

    @ExcelProperty(value = "电话", index = 3)
    private String phone;

    @ExcelProperty(value = "评价时间", index = 0)
    private Date createAt;

    @ExcelProperty(value = "评价星级", index = 4)
    private Integer starLevel;

    @ExcelProperty(value = "评价详情", index = 5)
    private String evaluateContent;
}

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

New file
@@ -0,0 +1,78 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * title: ComActActEvaluateDO  社区活动评价表
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 记录和展示社区活动评价内容
 *
 * @author txb
 * @date 2021/8/24 10:21
 */

@Data
@ApiModel("社区活动评价表")
public class ComActActEvaluateVO{

    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("所属活动id")
    private Long activityId;

    @ApiModelProperty("用户id, 和用户信息表的相关id关联")
    private Long userId;

    @ApiModelProperty("名字")
    private String name;

    @ApiModelProperty("用户昵称")
    private String nickName;

    @ApiModelProperty("身份")
    private String identity;

    @ApiModelProperty("手机号")
    private String phone;

    @ApiModelProperty("人员头像")
    private String imageUrl;

    @ApiModelProperty(value = "列表人员类型 1 普通居民 2 志愿者", hidden = true)
    private Integer type;

    @ApiModelProperty("评价时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("是否是志愿者 0 否 1 是")
    private Integer isVolunteer;

    @ApiModelProperty("评分星级1.差 2.一般 3.还不错 4.很满意 5.强烈推荐")
    private Integer starLevel;

    @ApiModelProperty("评价内容")
    private String evaluateContent;

    @ApiModelProperty("人群标签")
    private String tags;

    @ApiModelProperty("照片（多张以逗号隔开）")
    private String photo;

    @ApiModelProperty("用户openid")
    private String openid;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;
}

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

New file
@@ -0,0 +1,68 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * title: ComActActEvaluateDO  社区活动签到表
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 记录和展示社区活动签到内容
 *
 * @author txb
 * @date 2021/8/24 10:21
 */

@Data
@ApiModel("社区活动签到表")
public class ComActActRegistVO {

    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("所属活动id")
    private Long activityId;

    @ApiModelProperty("用户id, 和用户信息表的相关id关联")
    private Long userId;

    @ApiModelProperty("名字")
    private String name;

    @ApiModelProperty("用户昵称")
    private String nickName;

    @ApiModelProperty("身份")
    private String identity;

    @ApiModelProperty("人群标签")
    private String tags;

    @ApiModelProperty("手机号")
    private String phone;

    @ApiModelProperty("人员头像")
    private String imageUrl;

    @ApiModelProperty(value = "列表人员类型 1 普通居民 2 志愿者", hidden = true)
    private Integer type;

    @ApiModelProperty("签到时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("是否是志愿者 0 否 1 是")
    private Integer isVolunteer;

    @ApiModelProperty("用户openid")
    private String openid;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;
}

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

@@ -34,6 +34,12 @@
    @ApiModelProperty("活动地址")
    private String activityAddr;

    @ApiModelProperty("纬度")
    private String lat;

    @ApiModelProperty("经度")
    private String lng;

    @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
    private Integer status;

@@ -56,10 +62,13 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date signUpEnd;

    @ApiModelProperty("参加人群（多个以逗号隔开）")
    private String aattendPeople;

    @ApiModelProperty("志愿者人数下线")
    private Integer volunteerMin;

    @ApiModelProperty("志愿者人数上限")
    @ApiModelProperty("志愿者人数上限（不需要则不填写）")
    private Integer volunteerMax;

    @ApiModelProperty("当前志愿者数量")
@@ -68,7 +77,7 @@
    @ApiModelProperty("参与者人数下线")
    private Integer participantMin;

    @ApiModelProperty("参与者人数上限")
    @ApiModelProperty("参与者人数上限（不填写则默认不限人数）")
    private Integer participantMax;

    @ApiModelProperty("当前参与者数量")
@@ -79,6 +88,21 @@

    @ApiModelProperty("是否有奖品 1 有 0  无")
    private Integer hasPrize;

    @ApiModelProperty("是否二维码签到 1 是 0否")
    private Integer isQrCode;

    @ApiModelProperty("联系人姓名")
    private String contactName;

    @ApiModelProperty("联系人电话")
    private String contactPhone;

    @ApiModelProperty("是否签到 1 是 0否")
    private Integer isRegist;

    @ApiModelProperty("是否顶部 1 是 0否")
    private Integer isTop;

    @ApiModelProperty("奖品备注")
    private String prizeRemark;
@@ -92,6 +116,15 @@
    @ApiModelProperty("活动奖品集合")
    private List<ComActActPrizeVO> comActActPrizeVOList;

    @ApiModelProperty("活动评价集合")
    private List<ComActActEvaluateVO> comActActEvaluateVOList;

    @ApiModelProperty("活动评价总数")
    private Integer evaluateAmount;

    @ApiModelProperty("评分星级")
    private Double evaluateLevel;

    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -143,6 +143,26 @@
    R listActivitySign(@RequestBody ActivitySignVO activitySignVO);

    /**
     * description  listActivityRegists  分页查询活动评价
     * @param    comActActEvaluateVO  活动评价vo
     * @return    R   分页查询结果
     * @author txb
     * @date 2021/8/24 14:03
     */
    @PostMapping("/activity/evaluate/page")
    R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO);

    /**
     * description  getEvaluateListsByIds  批量查询活动评价
     * @param    ids  ids
     * @return    R   查询结果
     * @author txb
     * @date 2021/8/24 14:03
     */
    @PostMapping("/activity/evaluate/getList")
    R getEvaluateListsByIds(@RequestBody List<Long> ids);

    /**
     * 活动报名名单
     *
     * @param activitySignVO

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

@@ -499,6 +499,12 @@
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    File file0=new File("d:/safetyWork/file");
                    if(!file0.isDirectory()&&!file0.exists()){
                        file0.mkdirs();
                    }
                    sftp.download("/mnt/data/web/", "安全工作记录.ftl", "d:/safetyWork/file/安全工作记录.ftl");
                    sftp.download("/mnt/data/web/", "blank.jpg", "d:/safetyWork/file/blank.jpg");
                    try {
                        // 日期
                        dataMap.put("date",
@@ -506,13 +512,29 @@
                        // 巡查类型
                        dataMap.put("patrolType", comSwSafetyWorkRecordVO.getPatrolType());
                        // 社区名称
                        dataMap.put("communityName", comSwSafetyWorkRecordVO.getCommunityName());
                        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getCommunityName())) {
                            dataMap.put("communityName", comSwSafetyWorkRecordVO.getCommunityName());
                        }else {
                            dataMap.put("communityName", "");
                        }
                        // 地址
                        dataMap.put("address", comSwSafetyWorkRecordVO.getAddress());
                        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getAddress())) {
                            dataMap.put("address", comSwSafetyWorkRecordVO.getAddress());
                        }else {
                            dataMap.put("address", "");
                        }
                        // 记录内容
                        dataMap.put("recordContent", comSwSafetyWorkRecordVO.getRecordContent());
                        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getRecordContent())) {
                            dataMap.put("recordContent", comSwSafetyWorkRecordVO.getRecordContent());
                        }else {
                            dataMap.put("recordContent", "");
                        }
                        // 发现记录
                        dataMap.put("findRecord", comSwSafetyWorkRecordVO.getFindRecord());
                        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getFindRecord())) {
                            dataMap.put("findRecord", comSwSafetyWorkRecordVO.getFindRecord());
                        }else {
                            dataMap.put("findRecord", "");
                        }
                        // 记录照片
                        List<String> photo = new ArrayList<>();
                        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getRecordPhoto())) {
@@ -522,112 +544,124 @@
                            if (photo.size() == 1) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                            getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 2) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 3) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 4) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 5) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 6) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 7) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 8) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                    downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                            getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                            }
                        }
                        // 备注
                        dataMap.put("remark", comSwSafetyWorkRecordVO.getRemark());
                        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getRemark())) {
                            dataMap.put("remark", comSwSafetyWorkRecordVO.getRemark());
                        }else {
                            dataMap.put("remark", "");
                        }
                        // 巡查时间
                        dataMap.put("patrolTime",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getPatrolTime()));
                        // 工作人员
                        dataMap.put("personName", comSwSafetyWorkRecordVO.getPersonName());
                        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPersonName())) {
                            dataMap.put("personName", comSwSafetyWorkRecordVO.getPersonName());
                        }else {
                            dataMap.put("personName", "");
                        }
                        // 填报人员
                        dataMap.put("createName", comSwSafetyWorkRecordVO.getCreateName());
                        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getCreateName())) {
                            dataMap.put("createName", comSwSafetyWorkRecordVO.getCreateName());
                        }else {
                            dataMap.put("createName", "");
                        }
                        // 填报时间
                        dataMap.put("createAt",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getCreateAt()));
@@ -662,7 +696,7 @@
                        // configuration.setClassForTemplateLoading(this.getClass(), "");

                        // 指定路径的第二种方式，我的路径是C：/a.ftl
                        configuration.setDirectoryForTemplateLoading(new File("c:/"));
                        configuration.setDirectoryForTemplateLoading(new File("d:/safetyWork/file/"));

                        // 输出文档路径及名称
                        // File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() +
@@ -723,20 +757,42 @@
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    File file0=new File("d:/patrolRecord/file");
                    if(!file0.isDirectory()&&!file0.exists()){
                        file0.mkdirs();
                    }
                    sftp.download("/mnt/data/web/", "巡查记录.ftl", "d:/patrolRecord/file/巡查记录.ftl");
                    sftp.download("/mnt/data/web/", "blank.jpg", "d:/patrolRecord/file/blank.jpg");
                    try {
                        // 日期
                        dataMap.put("date",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getPatrolTime()));
                        // 巡查类型
                        dataMap.put("patrolType", comSwPatrolRecordVO.getPatrolType());
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getPatrolType())) {
                            dataMap.put("patrolType", comSwPatrolRecordVO.getPatrolType());
                        }else {
                            dataMap.put("patrolType", "");
                        }
                        // 社区名称
                        // dataMap.put("communityName", comSwPatrolRecordVO.getCommunityName());
                        // 地址
                        dataMap.put("address", comSwPatrolRecordVO.getAddress());
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getAddress())) {
                            dataMap.put("address", comSwPatrolRecordVO.getAddress());
                        }else {
                            dataMap.put("address", "");
                        }
                        // 记录内容
                        dataMap.put("recordContent", comSwPatrolRecordVO.getRecordContent());
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getRecordContent())) {
                            dataMap.put("recordContent", comSwPatrolRecordVO.getRecordContent());
                        }else {
                            dataMap.put("recordContent", "");
                        }
                        // 发现记录
                        dataMap.put("findRecord", comSwPatrolRecordVO.getFindRecord());
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getFindRecord())) {
                            dataMap.put("findRecord", comSwPatrolRecordVO.getFindRecord());
                        }else {
                            dataMap.put("findRecord", "");
                        }
                        // 记录照片
                        List<String> photo = new ArrayList<>();
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getRecordPhoto())) {
@@ -746,119 +802,135 @@
                            if (photo.size() == 1) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                            getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 2) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 3) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 4) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 5) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 6) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 7) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 8) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                    downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                            getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                            }
                        }
                        // 备注
                        dataMap.put("remark", comSwPatrolRecordVO.getRemark());
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getRemark())) {
                            dataMap.put("remark", comSwPatrolRecordVO.getRemark());
                        }else {
                            dataMap.put("remark", "");
                        }
                        // 巡查时间
                        // dataMap.put("patrolTime", new
                        // SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getPatrolTime()));
                        // 工作人员
                        // dataMap.put("personName", comSwPatrolRecordVO.getPersonName());
                        // 巡查人员
                        dataMap.put("personName", comSwPatrolRecordVO.getPersonName());
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getPersonName())) {
                            dataMap.put("personName", comSwPatrolRecordVO.getPersonName());
                        }else {
                            dataMap.put("personName", "");
                        }
                        // 接班时间
                        dataMap.put("successionTime",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getSuccessionTime()));
                        // 接班人员
                        dataMap.put("successionPerson", comSwPatrolRecordVO.getSuccessionPerson());
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getSuccessionPerson())) {
                            dataMap.put("successionPerson", comSwPatrolRecordVO.getSuccessionPerson());
                        }else {
                            dataMap.put("successionPerson", "");
                        }
                        // 填报人员
                        dataMap.put("createName", comSwPatrolRecordVO.getCreateName());
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getCreateName())) {
                            dataMap.put("createName", comSwPatrolRecordVO.getCreateName());
                        }else {
                            dataMap.put("createName", "");
                        }
                        // 填报时间
                        dataMap.put("createAt",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getCreateAt()));
@@ -893,7 +965,7 @@
                        // configuration.setClassForTemplateLoading(this.getClass(), "");

                        // 指定路径的第二种方式，我的路径是C：/a.ftl
                        configuration.setDirectoryForTemplateLoading(new File("c:/"));
                        configuration.setDirectoryForTemplateLoading(new File("d:/patrolRecord/file/"));

                        // 输出文档路径及名称
                        // File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() +
@@ -954,21 +1026,47 @@
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    File file0=new File("d:/dangerReport/file");
                    if(!file0.isDirectory()&&!file0.exists()){
                        file0.mkdirs();
                    }
                    sftp.download("/mnt/data/web/", "隐患报告.ftl", "d:/dangerReport/file/隐患报告.ftl");
                    sftp.download("/mnt/data/web/", "blank.jpg", "d:/dangerReport/file/blank.jpg");
                    try {
                        // 日期
                        dataMap.put("date", comSwDangerReportVO.getCheckTime());
                        // 巡查类型
                        dataMap.put("patrolType", comSwDangerReportVO.getPatrolType());
                        // 地址
                        dataMap.put("address", comSwDangerReportVO.getAddress());
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getAddress())) {
                            dataMap.put("address", comSwDangerReportVO.getAddress());
                        }else {
                            dataMap.put("address", "");
                        }
                        // 隐患名称
                        dataMap.put("dangerName", comSwDangerReportVO.getDangerName());
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getDangerName())) {
                            dataMap.put("dangerName", comSwDangerReportVO.getDangerName());
                        }else {
                            dataMap.put("dangerName", "");
                        }
                        // 排查时间
                        dataMap.put("checkTime", comSwDangerReportVO.getCheckTime());
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getCheckTime())) {
                            dataMap.put("checkTime", comSwDangerReportVO.getCheckTime());
                        }else {
                            dataMap.put("checkTime", "");
                        }
                        // 排查人员
                        dataMap.put("ppersonName", comSwDangerReportVO.getPPersonName());
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getPPersonName())) {
                            dataMap.put("ppersonName", comSwDangerReportVO.getPPersonName());
                        }else {
                            dataMap.put("ppersonName", "");
                        }
                        // 填报人员
                        dataMap.put("createName", comSwDangerReportVO.getCreateName());
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getCreateName())) {
                            dataMap.put("createName", comSwDangerReportVO.getCreateName());
                        }else {
                            dataMap.put("createName", "");
                        }
                        // 填报时间
                        dataMap.put("createAt",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwDangerReportVO.getCreateAt()));
@@ -1001,173 +1099,173 @@
                            if (stepsPhoto.size() == 1) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        dataMap.put("imgStr" + (i + 19),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 2) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        dataMap.put("imgStr" + (i + 19),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 3) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_" + i);
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        dataMap.put("imgStr" + (i + 19),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 4) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        dataMap.put("imgStr" + (i + 19),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 5) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        dataMap.put("imgStr" + (i + 19),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 6) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        dataMap.put("imgStr" + (i + 19),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 7) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        dataMap.put("imgStr" + (i + 19),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 8) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        dataMap.put("imgStr" + (i + 19),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 19),
                                        getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                }
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                            }
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                            }
                        }
                        // 社区处理建议
@@ -1215,101 +1313,101 @@
                            if (photo.size() == 1) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 10),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 2) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 10),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 3) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 10),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 4) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 10),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 5) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 10),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 6) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 10),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 7) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 10),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 8) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                        dataMap.put("imgStr" + (i + 10),
                                            getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                            getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 10),
                                        getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                            }
                        }
                        // 备注
@@ -1362,7 +1460,7 @@
                        // configuration.setClassForTemplateLoading(this.getClass(), "");

                        // 指定路径的第二种方式，我的路径是C：/a.ftl
                        configuration.setDirectoryForTemplateLoading(new File("c:/"));
                        configuration.setDirectoryForTemplateLoading(new File("/mnt/data/web/"));

                        // 输出文档路径及名称
                        // File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() +
@@ -1449,7 +1547,7 @@
        return encoder.encode(data);
    }

    public String downloadPicture(String urlString, String fileName) throws Exception {
    public String downloadPicture(String urlString, String fileName,String dir) throws Exception {
        // 构造URL
        URL url = new URL(urlString);
        // 打开连接
@@ -1461,7 +1559,7 @@
        // 读取到的数据长度
        int len;
        // 输出的文件流
        String filename = "d:/" + fileName + ".jpg"; // 下载路径及下载图片名称
        String filename = dir + fileName + ".jpg"; // 下载路径及下载图片名称
        File file = new File(filename);
        FileOutputStream os = new FileOutputStream(file, true);
        // 开始读取

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

@@ -10,6 +10,8 @@
import javax.annotation.Resource;
import javax.validation.Valid;

import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
@@ -212,6 +214,69 @@
        return communityService.listActivitySign(activitySignVO);
    }

    @ApiOperation(value = "分页查询活动评价")
    @PostMapping("evaluate/page")
    public R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
        if (ObjectUtils.isEmpty(comActActEvaluateVO.getActivityId())) {
            return R.fail("活动id主键不能为空");
        }
        return communityService.pageActivityEvaluates(comActActEvaluateVO);
    }

    @ApiOperation(value = "excel导出-活动评价")
    @PostMapping("evaluate/export")
    public R activityExportEvaluate(@RequestBody List<Long> Ids) {
        String name = "活动评价导出数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        R r = communityService.getEvaluateListsByIds(Ids);
        if (R.isOk(r)) {
            List<ComActActEvaluateExcelVO> excelVOS =
                    JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActActEvaluateExcelVO.class);
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActActEvaluateExcelVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("活动评价导出数据").build();
                        excelWriter.write(excelVOS, writeSheet);
                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(excelUrl + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.fail("未查询到用户");
    }

    @ApiOperation(value = "新增社区动态")
    @PostMapping("dynamic")
    public R addDynamic(@RequestBody ComActDynVO comActDynVO) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java

@@ -805,5 +805,4 @@
    public R villageStatistics(@RequestParam("communityId") Long communityId) {
        return comMngVillageService.villageStatistics(communityId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -90,6 +90,8 @@
    private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;
    @Resource
    private ComActEasyPhotoActivityService comActEasyPhotoActivityService;
    @Resource
    private ComActActEvaluateService comActActEvaluateService;

    /**
     * 新增社区活动
@@ -279,6 +281,7 @@
        if (ObjectUtils.isEmpty(comActActivityVO)) {
            return R.fail("活动不存在");
        }
        //活动奖品
        List<ComActActPrizeDO> comActActPrizeDOS = comActActPrizeService
            .list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id));
        if (!ObjectUtils.isEmpty(comActActPrizeDOS)) {
@@ -290,6 +293,21 @@
            });
            comActActivityVO.setComActActPrizeVOList(comActActPrizeVOS);
        }
        //活动评价
        List<ComActActEvaluateDO> comActActEvaluateDOList = comActActEvaluateService
                .list(new QueryWrapper<ComActActEvaluateDO>().lambda().eq(ComActActEvaluateDO::getActivityId, id));
        if (!ObjectUtils.isEmpty(comActActEvaluateDOList)) {
            List<ComActActEvaluateVO> comActActEvaluateVOList = new ArrayList<>();
            comActActEvaluateDOList.forEach(comActActEvaluateDO -> {
                ComActActEvaluateVO comActActEvaluateVO = new ComActActEvaluateVO();
                BeanUtils.copyProperties(comActActEvaluateDO, comActActEvaluateVO);
                comActActEvaluateVOList.add(comActActEvaluateVO);
            });
            comActActivityVO.setComActActEvaluateVOList(comActActEvaluateVOList);
            //活动评价总数
            comActActivityVO.setEvaluateAmount(comActActEvaluateDOList.size());
        }
        //活动报名名单
        ActivitySignVO activitySignVO = new ActivitySignVO();
        activitySignVO.setActivityId(id);
        R r = comActActivityService.listActivitySigns(activitySignVO);
@@ -354,6 +372,42 @@
    }

    /**
     * description  listActivityRegists  分页查询活动评价
     * @param    comActActEvaluateVO  活动评价vo
     * @return    R   分页查询结果
     * @author txb
     * @date 2021/8/24 14:03
     */
    @PostMapping("activity/evaluate/page")
    public R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
        return comActActivityService.pageActivityEvaluates(comActActEvaluateVO);
    }

    /**
     * description  pageActivityRegists  分页查询活动签到
     * @param    comActActRegistVO  活动签到vo
     * @return    R   分页查询结果
     * @author txb
     * @date 2021/8/24 14:03
     */
    @PostMapping("activity/regist/page")
    public R pageActivityRegists(@RequestBody ComActActRegistVO comActActRegistVO) {
        return comActActivityService.pageActivityRegists(comActActRegistVO);
    }

    /**
     * description  getEvaluateListsByIds  批量查询活动评价
     * @param    ids  ids
     * @return    R   查询结果
     * @author txb
     * @date 2021/8/24 14:03
     */
    @PostMapping("/activity/evaluate/getList")
    public R getEvaluateListsByIds(@RequestBody List<Long> ids){
        return comActActivityService.getEvaluateListsByIds(ids);
    }

    /**
     * 新增社区动态
     *
     * @param comActDynVO

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

New file
@@ -0,0 +1,31 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateExcelVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * title: ComActActEvaluateDAO  社区》活动》活动评价表mapper类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》活动》活动评价表mapper类
 *
 * @author txb
 * @date 2021/8/24 10:21
 */
@Mapper
public interface ComActActEvaluateDAO extends BaseMapper<ComActActEvaluateDO> {

    IPage<ComActActEvaluateVO> pageActivityEvaluates(Page page, @Param("comActActEvaluateVO") ComActActEvaluateVO comActActEvaluateVO);

    List<ComActActEvaluateExcelVO> getEvaluateListsByIds(@Param("ids") List<Long> ids);

}

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

New file
@@ -0,0 +1,24 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.service_community.model.dos.ComActActRegistDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * title: ComActActRegistDAO  社区》活动》活动签到表mapper类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》活动》活动签到表mapper类
 *
 * @author txb
 * @date 2021/8/24 10:21
 */
@Mapper
public interface ComActActRegistDAO extends BaseMapper<ComActActRegistDO> {


    IPage<ComActActRegistVO> pageActivityRegists(Page page, @Param("comActActRegistVO") ComActActRegistVO comActActRegistVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActEvaluateDO.java

New file
@@ -0,0 +1,80 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * title: ComActActEvaluateDO  社区活动评价表
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 记录和展示社区活动评价内容
 *
 * @author txb
 * @date 2021/8/24 10:21
 */

@Data
@TableName("com_act_act_evaluate")
public class ComActActEvaluateDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 自增id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 所属活动id
    */
    private Long activityId;

    /**
    * 用户id, 和用户信息表的相关id关联
    */
    private Long userId;

    /**
    * 评价时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 是否是志愿者 0 否 1 是
    */
    private Integer isVolunteer;

    /**
    * 评分星级1.差 2.一般 3.还不错 4.很满意 5.强烈推荐
    */
    private Integer starLevel;

    /**
    * 评价内容
    */
    private String evaluateContent;

    /**
    * 照片（多张以逗号隔开）
    */
    private String photo;

@Override
public String toString() {
        return "ComActActEvaluateDO{" +
                "id=" + id +
                ", activityId=" + activityId +
                ", userId=" + userId +
                ", createAt=" + createAt +
                ", isVolunteer=" + isVolunteer +
                ", starLevel=" + starLevel +
                ", evaluateContent=" + evaluateContent +
                ", photo=" + photo +
        "}";
        }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActRegistDO.java

New file
@@ -0,0 +1,61 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * title: ComActActRegistDO  社区》活动》活动签到表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》活动》活动签到表实体类
 *
 * @author txb
 * @date 2021/8/24 10:21
 */

@Data
@TableName("com_act_act_regist")
public class ComActActRegistDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 自增id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 所属活动id
    */
    private Long activityId;

    /**
    * 用户id, 和用户信息表的相关id关联
    */
    private Long userId;

    /**
    * 签到时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 是否是志愿者 0 否 1 是
    */
    private Integer isVolunteer;

@Override
public String toString() {
        return "ComActActRegistDO{" +
                "id=" + id +
                ", activityId=" + activityId +
                ", userId=" + userId +
                ", createAt=" + createAt +
                ", isVolunteer=" + isVolunteer +
        "}";
        }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java

@@ -5,6 +5,7 @@

import com.baomidou.mybatisplus.annotation.*;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
@@ -40,6 +41,16 @@
    private String activityAddr;

    /**
     * 纬度
     */
    private String lat;

    /**
     * 经度
     */
    private String lng;

    /**
     * 活动状态
     */
    private Integer status;
@@ -70,6 +81,12 @@
    private Date signUpEnd;

    /**
     * 参加人群
     */
    private String aattendPeople;


    /**
     * 志愿者人数下线
     */
    private Integer volunteerMin;
@@ -100,6 +117,31 @@
    private Integer hasPrize;

    /**
     * 是否二维码签到 1 是 0否
     */
    private Integer isQrCode;

    /**
     * 联系人姓名
     */
    private String contactName;

    /**
     * 联系人电话
     */
    private String contactPhone;

    /**
     * 是否签到 1 是 0否
     */
    private Integer isRegist;

    /**
     * 是否顶部 1 是 0否
     */
    private Integer isTop;

    /**
     * 奖品备注
     */
    private String prizeRemark;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActEvaluateService.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
/**
 * title: ComActActEvaluateService  社区》活动》活动评价表服务类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》活动》活动评价表服务类
 *
 * @author txb
 * @date 2021/8/24 10:21
 */
public interface ComActActEvaluateService extends IService<ComActActEvaluateDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActRegistService.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComActActRegistDO;

/**
 * title: ComActActRegistService  社区》活动》活动签到表服务类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》活动》活动签到表服务类
 *
 * @author txb
 * @date 2021/8/24 10:21
 */
public interface ComActActRegistService extends IService<ComActActRegistDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java

@@ -6,10 +6,10 @@
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -93,6 +93,33 @@
    R listActivitySigns(ActivitySignVO activitySignVO);

    /**
     * description  listActivityRegists  分页查询活动评价
     * @param    comActActEvaluateVO  活动评价vo
     * @return    R   分页查询结果
     * @author txb
     * @date 2021/8/24 14:03
     */
    R pageActivityEvaluates(ComActActEvaluateVO comActActEvaluateVO);

    /**
     * description  pageActivityRegists  分页查询活动签到
     * @param    comActActRegistVO  活动签到vo
     * @return    R   分页查询结果
     * @author txb
     * @date 2021/8/24 14:03
     */
    R pageActivityRegists(ComActActRegistVO comActActRegistVO);

    /**
     * description  getEvaluateListsByIds  批量查询活动评价
     * @param    ids  ids
     * @return    R   查询结果
     * @author txb
     * @date 2021/8/24 14:03
     */
    R getEvaluateListsByIds(List<Long> ids);

    /**
     * 分页展示我的所有活动 时间倒序排列
     * 
     * @param comActActivityVO

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

New file
@@ -0,0 +1,21 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
import com.panzhihua.service_community.service.ComActActEvaluateService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
 * title: ComActActEvaluateServiceImpl  社区》活动》活动评价表服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》活动》活动评价表服务实现类
 *
 * @author txb
 * @date 2021/8/24 10:21
 */
@Slf4j
@Service
public class ComActActEvaluateServiceImpl extends ServiceImpl<ComActActEvaluateDAO, ComActActEvaluateDO> implements ComActActEvaluateService {

}

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

New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComActActRegistDAO;
import com.panzhihua.service_community.model.dos.ComActActRegistDO;
import com.panzhihua.service_community.service.ComActActRegistService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * title: ComActActRegistServiceImpl  社区》活动》活动签到表服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》活动》活动签到表服务实现类
 *
 * @author txb
 * @date 2021/8/24 10:21
 */
@Slf4j
@Service
public class ComActActRegistServiceImpl extends ServiceImpl<ComActActRegistDAO, ComActActRegistDO> implements ComActActRegistService {

}

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

@@ -5,6 +5,9 @@

import javax.annotation.Resource;

import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.dao.ComActActRegistDAO;
import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -50,6 +53,10 @@
    private ComActActSignDAO comActActSignDAO;
    @Resource
    private UserService userService;
    @Resource
    private ComActActEvaluateDAO comActActEvaluateDAO;
    @Resource
    private ComActActRegistDAO comActActRegistDAO;

    /**
     * 新增社区活动
@@ -263,6 +270,24 @@
    public R listActivitySigns(ActivitySignVO activitySignVO) {
        List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySigns(activitySignVO);
        return R.ok(activitySignVOS);
    }

    @Override
    public R pageActivityEvaluates(ComActActEvaluateVO comActActEvaluateVO) {
        IPage<ComActActEvaluateVO> comActActEvaluateVOIPage = comActActEvaluateDAO
                .pageActivityEvaluates(new Page(comActActEvaluateVO.getPageNum(), comActActEvaluateVO.getPageSize()), comActActEvaluateVO);
        return R.ok(comActActEvaluateVOIPage);
    }

    @Override
    public R pageActivityRegists(ComActActRegistVO comActActRegistVO) {
        IPage<ComActActRegistVO> comActActRegistVOIPage = comActActRegistDAO.pageActivityRegists(new Page(comActActRegistVO.getPageNum(), comActActRegistVO.getPageSize()), comActActRegistVO);
        return R.ok(comActActRegistVOIPage);
    }

    @Override
    public R getEvaluateListsByIds(List<Long> ids) {
        return R.ok(comActActEvaluateDAO.getEvaluateListsByIds(ids));
    }

    /**
@@ -489,6 +514,16 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivityCommunityBack(page, comActActivityVO);
        iPage.getRecords().forEach(vo ->{
            List<ComActActEvaluateDO> comActActEvaluateDOList = comActActEvaluateDAO
                    .selectList(new QueryWrapper<ComActActEvaluateDO>().lambda().eq(ComActActEvaluateDO::getActivityId, vo.getId()));
            if (comActActEvaluateDOList != null && comActActEvaluateDOList.size() != 0) {
                //总星级
                int starNum = comActActEvaluateDOList.stream().mapToInt(ComActActEvaluateDO::getStarLevel).sum();
                //评分星级=总星级/总评价人数
                vo.setEvaluateLevel(Double.valueOf(starNum/comActActEvaluateDOList.size()));
            }
        });
        return R.ok(iPage);
    }


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

@@ -67,8 +67,7 @@
 */
@Slf4j
@Service
public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO>
    implements ComMngPopulationService {
public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO> implements ComMngPopulationService {
    @Resource
    private ComMngPopulationDAO populationDAO;
    @Resource

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

New file
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComActActEvaluateDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActActEvaluateDO">
                <id column="id" property="id" />
                <result column="activity_id" property="activityId" />
                <result column="user_id" property="userId" />
                <result column="create_at" property="createAt" />
                <result column="is_volunteer" property="isVolunteer" />
                <result column="star_level" property="starLevel" />
                <result column="evaluate_content" property="evaluateContent" />
                <result column="photo" property="photo" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, activity_id, user_id, create_at, is_volunteer, star_level, evaluate_content, photo
    </sql>

    <select id="pageActivityEvaluates" resultType="com.panzhihua.common.model.vos.community.ComActActEvaluateVO">
        SELECT
            caae.id,
            caae.activity_id,
            caae.create_at,
            caae.photo,
            caae.star_level,
            caae.evaluate_content,
            su.user_id,
            su.`name`,
            su.nick_name,
            su.phone,
            su.image_url,
            su.tags,
            caae.is_volunteer,
            CASE

                WHEN su.is_partymember = 1 THEN
                    '党员'
                WHEN caas.is_volunteer = 1 THEN
                    '志愿者' ELSE '居民'
                END identity

        FROM
            com_act_act_evaluate caae
            LEFT JOIN com_act_act_sign caas ON caae.activity_id = caas.activity_id
            LEFT JOIN sys_user su ON caae.user_id = su.user_id
        where caae.activity_id = #{comActActEvaluateVO.activityId}
        <if test="comActActEvaluateVO.phone != null and comActActEvaluateVO.phone !=''">
            AND su.phone = #{comActActEvaluateVO.phone}
        </if>
        <if test="comActActEvaluateVO.name != null and comActActEvaluateVO.name !=''">
            AND su.`name` = #{comActActEvaluateVO.name}
        </if>
        <if test="comActActEvaluateVO.starLevel != null">
            AND caae.star_level = #{comActActEvaluateVO.starLevel}
        </if>
        <if test="comActActEvaluateVO.createAt != null">
            AND caae.create_at = #{comActActEvaluateVO.createAt}
        </if>
        order by caae.create_at desc
    </select>

    <select id="getEvaluateListsByIds" resultType="com.panzhihua.common.model.vos.community.ComActActEvaluateExcelVO">
        SELECT
        caae.create_at,
        caae.star_level,
        caae.evaluate_content,
        su.`name`,
        su.phone,
        CASE

        WHEN su.is_partymember = 1 THEN
        '党员'
        WHEN caas.is_volunteer = 1 THEN
        '志愿者' ELSE '居民'
        END identity

        FROM
        com_act_act_evaluate caae
        LEFT JOIN com_act_act_sign caas ON caae.activity_id = caas.activity_id
        LEFT JOIN sys_user su ON caae.user_id = su.user_id
        where caae.id in
          <foreach collection="ids" item="id" open="(" close=")" separator=",">
              #{id}
          </foreach>
        order by caae.create_at desc
    </select>
</mapper>

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

New file
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComActActRegistDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActActRegistDO">
                <id column="id" property="id" />
                <result column="activity_id" property="activityId" />
                <result column="user_id" property="userId" />
                <result column="create_at" property="createAt" />
                <result column="is_volunteer" property="isVolunteer" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, activity_id, user_id, create_at, is_volunteer
    </sql>

    <select id="pageActivityRegists" resultType="com.panzhihua.common.model.vos.community.ComActActRegistVO">
        SELECT
        caae.id,
        caae.activity_id,
        caae.create_at,
        caae.photo,
        caae.star_level,
        caae.evaluate_content,
        su.user_id,
        su.`name`,
        su.nick_name,
        su.phone,
        su.image_url,
        su.tags,
        caae.is_volunteer,
        CASE

        WHEN su.is_partymember = 1 THEN
        '党员'
        WHEN caas.is_volunteer = 1 THEN
        '志愿者' ELSE '居民'
        END identity

        FROM
        com_act_act_evaluate caae
        LEFT JOIN com_act_act_sign caas ON caae.activity_id = caas.activity_id
        LEFT JOIN sys_user su ON caae.user_id = su.user_id
        where caae.activity_id = #{comActActEvaluateVO.activityId}
        <if test="comActActEvaluateVO.phone != null and comActActEvaluateVO.phone !=''">
            AND su.phone = #{comActActEvaluateVO.phone}
        </if>
        <if test="comActActEvaluateVO.name != null and comActActEvaluateVO.name !=''">
            AND su.`name` = #{comActActEvaluateVO.name}
        </if>
        <if test="comActActEvaluateVO.starLevel != null">
            AND caae.star_level = #{comActActEvaluateVO.starLevel}
        </if>
        <if test="comActActEvaluateVO.createAt != null">
            AND caae.create_at = #{comActActEvaluateVO.createAt}
        </if>
        order by caae.create_at desc
    </select>
</mapper>

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

@@ -142,8 +142,19 @@
            cspr.address,
            csdr.remark,
            csdr.dager_description AS dagerDescription,
            csdr.danger_type AS dangerType,
            csdr.danger_level AS dangerLevel
            case csdr.danger_type
                when '1' then '火灾隐患'
                when '2' then '汛情隐患'
                when '3' then '疫情隐患'
            end
            AS dangerType,
            case csdr.danger_level
                when '1' then '红色预警'
                when '2' then '橙色预警'
                when '3' then '黄色预警'
                when '4' then '蓝色预警'
            end
            AS dangerLevel
        FROM
            com_sw_danger_report as csdr
                left join com_sw_patrol_record_report as csprr on csprr.report_id = csdr.id