修改安全工作记录下载报告

tangxiaobao

2021-08-30 895ab122d08abd06a45f494bb2393f0d7ec79828

修改安全工作记录下载报告

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

@@ -28,7 +28,7 @@
    @ExcelProperty(value = "电话", index = 4)
    private String phone;

    @ExcelProperty(value = "签到时间", index = 0)
    @ExcelProperty(value = "签到时间（未签到就是报名时间）", index = 0)
    private Date createAt;

    @ExcelProperty(value = "人群标签", index = 3)

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

@@ -496,7 +496,6 @@
                String name = "安全工作记录_" + comSwSafetyWorkRecordVO.getId() + ".doc";
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
@@ -512,8 +511,12 @@
                    sftp.download("/mnt/data/web/", "blank.jpg", "d:/safetyWork/file/blank.jpg");
                    try {
                        // 日期
                        dataMap.put("date",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getPatrolTime()));
                        if (comSwSafetyWorkRecordVO.getPatrolTime() != null) {
                            dataMap.put("date",
                                    new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getPatrolTime()));
                        }else {
                            dataMap.put("date", "");
                        }
                        // 巡查类型
                        dataMap.put("patrolType", comSwSafetyWorkRecordVO.getPatrolType());
                        // 社区名称
@@ -669,7 +672,7 @@
                        }
                        // 填报时间
                        dataMap.put("createAt",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getCreateAt()));
                            new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(comSwSafetyWorkRecordVO.getCreateAt()));
                        // 获取请求url
                        String url = Constants.G_D_WEATHER_URL;
                        // 获取请求参数
@@ -957,7 +960,7 @@
                        }
                        // 填报时间
                        dataMap.put("createAt",
                            new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getCreateAt()));
                            new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(comSwPatrolRecordVO.getCreateAt()));
                        // 获取请求url
                        String url = Constants.G_D_WEATHER_URL;
                        // 获取请求参数
@@ -1112,7 +1115,7 @@
                    }
                    // 填报时间
                    dataMap.put("createAt",
                        new SimpleDateFormat("yyyy-MM-dd").format(comSwDangerReportVO.getCreateAt()));
                        new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(comSwDangerReportVO.getCreateAt()));
                    // 隐患编号
                    dataMap.put("dangerNo", comSwDangerReportVO.getDangerNo());
                    // 主体部门、单位或个人全称

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

@@ -27,4 +27,6 @@
    IPage<ComActActRegistVO> pageActivityRegists(Page page, @Param("comActActRegistVO") ComActActRegistVO comActActRegistVO);

    List<ComActActRegistExcelVO> getRegistLists(@Param("comActActRegistVO") ComActActRegistVO comActActRegistVO);

    List<ComActActRegistExcelVO> getNoRegistLists(@Param("comActActRegistVO") ComActActRegistVO comActActRegistVO);
}

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

@@ -324,7 +324,7 @@

    @Override
    public R getNoRegistLists(ComActActRegistVO comActActRegistVO) {
        return null;
        return R.ok(comActActRegistDAO.getNoRegistLists(comActActRegistVO));
    }

    @Override

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

@@ -89,4 +89,36 @@
        </if>
        order by caar.create_at desc
    </select>

    <select id="getNoRegistLists" resultType="com.panzhihua.common.model.vos.community.ComActActRegistExcelVO">
        SELECT
            caas.create_at,
            su.`name`
            su.phone,
            su.tags,
            CASE

                WHEN su.is_partymember = 1 THEN
                '党员'
                WHEN caas.is_volunteer = 1 THEN
                '志愿者' ELSE '居民'
            END identity
        FROM
        `com_act_act_sign` caas
        LEFT JOIN sys_user su ON caas.user_id = su.user_id
        WHERE NOT EXISTS ( SELECT 1 FROM com_act_act_regist caar WHERE caas.user_id = caar.user_id )
        AND caas.activity_id = #{comActActRegistVO.activityId}
        <if test="comActActRegistVO.phone != null and comActActRegistVO.phone !=''">
            AND su.phone = #{comActActRegistVO.phone}
        </if>
        <if test="comActActRegistVO.name != null and comActActRegistVO.name !=''">
            AND su.`name` = #{comActActRegistVO.name}
        </if>
        <if test="comActActRegistVO.tags != null and comActActRegistVO.tags !=''">
            AND su.tags like ('%', #{comActActRegistVO.tags}, '%')
        </if>
        <if test="comActActRegistVO.createAt != null">
            AND caar.create_at = #{comActActRegistVO.createAt}
        </if>
    </select>
</mapper>