lidongdong
2023-04-08 7becc2a3931f9690604bc61f01ce6a2b1a607ea1
修改  微服务新增报错
2个文件已修改
152 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml 120 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java
@@ -133,22 +133,22 @@
    @Select("select user_id,id_card,name from sys_user where user_id = #{userId}")
    SysUserVO getSysUserByUserId(@Param("userId") Long userId);
    @Select("<script> "
        + " SELECT e.id,e.CREATE_BY,e.create_at, e.update_by, e.update_at, e.id_card, e.auth_user_name, e.video_url,"
        + " e.submit_user_id, e.domicile, e.STATUS, e.birth_day, e.type, e.age, e.verification_result, u.name as sumitUserName, u.phone as sumitUserAccount  "
        + " FROM ( " + "       SELECT MAX(id) AS id , DATE_FORMAT(create_at, '%Y-%m') AS yearMonth "
        + "        FROM com_elders_auth " + "        GROUP BY id_card, yearMonth " + "       ) t "
        + " left join com_elders_auth e on t.id = e.id " + " LEFT JOIN sys_user u ON e.submit_user_id = u.user_id  "
        + "<where>" + " <if test='pageEldersAuthRecordDTO.name!=null'>\n"
        + " AND e.auth_user_name like concat('%', #{pageEldersAuthRecordDTO.name}, '%')" + "</if>"
        + " <if test='pageEldersAuthRecordDTO.idCard!=null and pageEldersAuthRecordDTO.idCard!=&quot;&quot;'>\n"
        + " AND e.id_card = #{pageEldersAuthRecordDTO.idCard}\n" + "</if>"
        + " <if test='pageEldersAuthRecordDTO.type!=null'>\n" + " AND e.type = #{pageEldersAuthRecordDTO.type}\n"
        + "</if>" + " <if test='pageEldersAuthRecordDTO.month!=null'>\n"
        + " AND month(e.create_at) = #{pageEldersAuthRecordDTO.month}\n" + "</if>\n" + "</where>\n"
        + "<if test='pageEldersAuthRecordDTO.sortColumns!=null'>\n"
        + "ORDER BY e.${pageEldersAuthRecordDTO.sortColumns} ${pageEldersAuthRecordDTO.sortType}\n" + "</if> "
        + "</script>")
//    @Select("<script> "
//        + " SELECT e.id,e.CREATE_BY,e.create_at, e.update_by, e.update_at, e.id_card, e.auth_user_name, e.video_url,"
//        + " e.submit_user_id, e.domicile, e.STATUS, e.birth_day, e.type, e.age, e.verification_result, u.name as sumitUserName, u.phone as sumitUserAccount  "
//        + " FROM ( " + "       SELECT MAX(id) AS id , DATE_FORMAT(create_at, '%Y-%m') AS yearMonth "
//        + "        FROM com_elders_auth " + "        GROUP BY id_card, yearMonth " + "       ) t "
//        + " left join com_elders_auth e on t.id = e.id " + " LEFT JOIN sys_user u ON e.submit_user_id = u.user_id  "
//        + "<where>" + " <if test='pageEldersAuthRecordDTO.name!=null'>\n"
//        + " AND e.auth_user_name like concat('%', #{pageEldersAuthRecordDTO.name}, '%')" + "</if>"
//        + " <if test='pageEldersAuthRecordDTO.idCard!=null and pageEldersAuthRecordDTO.idCard!=&quot;&quot;'>\n"
//        + " AND e.id_card = #{pageEldersAuthRecordDTO.idCard}\n" + "</if>"
//        + " <if test='pageEldersAuthRecordDTO.type!=null'>\n" + " AND e.type = #{pageEldersAuthRecordDTO.type}\n"
//        + "</if>" + " <if test='pageEldersAuthRecordDTO.month!=null'>\n"
//        + " AND month(e.create_at) = #{pageEldersAuthRecordDTO.month}\n" + "</if>\n" + "</where>\n"
//        + "<if test='pageEldersAuthRecordDTO.sortColumns!=null'>\n"
//        + "ORDER BY e.${pageEldersAuthRecordDTO.sortColumns} ${pageEldersAuthRecordDTO.sortType}\n" + "</if> "
//        + "</script>")
    IPage<ComEldersAuthRecordForCommunityVO> selectCommunityEldersRecordByPage(Page page,
        @Param("pageEldersAuthRecordDTO") PageEldersAuthRecordDTO pageEldersAuthRecordDTO);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml
@@ -156,66 +156,66 @@
        order by cear.create_at desc
    </select>
    <select id="export" resultType="com.panzhihua.common.model.vos.community.ComElderAuthRecordVO">
        SELECT
        cear.id,
        su.`name` submitUserName,
        ceae.phone,
        ceae.`name`,
        ceae.id_card,
        ceae.sex,
        ceae.birthday,
        ceae.personnel_category,
        cear.address,
        ceae.is_alive,
        cear.auth_method,
        cear.auth_period,
        cear.auth_video,
        cear.auth_date,
        cear.mark,
        cear.approval_status,
        cear.approver_id,
        su1.`name` as approverName,
        cear.approval_date,
        cear.auth_status
        FROM
        com_elder_auth_records cear
        LEFT JOIN com_elder_auth_elderlies ceae ON cear.elderlies_id = ceae.id
        LEFT JOIN sys_user su ON cear.submit_user_id = su.user_id
        LEFT JOIN sys_user su1 ON cear.approver_id = su1.user_id
        WHERE
        ceae.community_id = ${pageElderAuthRecordsDTO.communityId}
        <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''">
            and cear.auth_period = #{pageElderAuthRecordsDTO.authPeriod}
        </if>
        <if test="pageElderAuthRecordsDTO.authMethod != null and pageElderAuthRecordsDTO.authMethod != 0">
            and cear.auth_method = #{pageElderAuthRecordsDTO.authMethod}
        </if>
        <if test="pageElderAuthRecordsDTO.authDateBegin != null and pageElderAuthRecordsDTO.authDateBegin != ''">
            and cear.auth_date <![CDATA[ >= ]]> #{pageElderAuthRecordsDTO.authDateBegin}
        </if>
        <if test="pageElderAuthRecordsDTO.authDateEnd != null and pageElderAuthRecordsDTO.authDateEnd != ''">
            and cear.auth_date <![CDATA[ <= ]]> #{pageElderAuthRecordsDTO.authDateEnd}
        </if>
        <if test="pageElderAuthRecordsDTO.approvalStatus != null and pageElderAuthRecordsDTO.approvalStatus != 0">
            and cear.approval_status = #{pageElderAuthRecordsDTO.approvalStatus}
        </if>
        <if test="pageElderAuthRecordsDTO.authStatus != null and pageElderAuthRecordsDTO.authStatus != 0">
            and cear.auth_status = #{pageElderAuthRecordsDTO.authStatus}
        </if>
        <if test="pageElderAuthRecordsDTO.personnelCategory != null and pageElderAuthRecordsDTO.personnelCategory != 0">
            and ceae.personnel_category = #{pageElderAuthRecordsDTO.personnelCategory}
        </if>
        <if test="pageElderAuthRecordsDTO.isAlive != null and pageElderAuthRecordsDTO.isAlive != 0">
            and ceae.is_alive = #{pageElderAuthRecordsDTO.isAlive}
        </if>
        <if test="pageElderAuthRecordsDTO.searchKey != null and pageElderAuthRecordsDTO.searchKey != ''">
            and (ceae.`name` like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%')
            or cear.mark like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%')
            or ceae.id_card = #{pageElderAuthRecordsDTO.idCard})
        </if>
        order by cear.create_at desc
    </select>
<!--    <select id="export" resultType="com.panzhihua.common.model.vos.community.ComElderAuthRecordVO">-->
<!--        SELECT-->
<!--        cear.id,-->
<!--        su.`name` submitUserName,-->
<!--        ceae.phone,-->
<!--        ceae.`name`,-->
<!--        ceae.id_card,-->
<!--        ceae.sex,-->
<!--        ceae.birthday,-->
<!--        ceae.personnel_category,-->
<!--        cear.address,-->
<!--        ceae.is_alive,-->
<!--        cear.auth_method,-->
<!--        cear.auth_period,-->
<!--        cear.auth_video,-->
<!--        cear.auth_date,-->
<!--        cear.mark,-->
<!--        cear.approval_status,-->
<!--        cear.approver_id,-->
<!--        su1.`name` as approverName,-->
<!--        cear.approval_date,-->
<!--        cear.auth_status-->
<!--        FROM-->
<!--        com_elder_auth_records cear-->
<!--        LEFT JOIN com_elder_auth_elderlies ceae ON cear.elderlies_id = ceae.id-->
<!--        LEFT JOIN sys_user su ON cear.submit_user_id = su.user_id-->
<!--        LEFT JOIN sys_user su1 ON cear.approver_id = su1.user_id-->
<!--        WHERE-->
<!--        ceae.community_id = ${pageElderAuthRecordsDTO.communityId}-->
<!--        <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''">-->
<!--            and cear.auth_period = #{pageElderAuthRecordsDTO.authPeriod}-->
<!--        </if>-->
<!--        <if test="pageElderAuthRecordsDTO.authMethod != null and pageElderAuthRecordsDTO.authMethod != 0">-->
<!--            and cear.auth_method = #{pageElderAuthRecordsDTO.authMethod}-->
<!--        </if>-->
<!--        <if test="pageElderAuthRecordsDTO.authDateBegin != null and pageElderAuthRecordsDTO.authDateBegin != ''">-->
<!--            and cear.auth_date <![CDATA[ >= ]]> #{pageElderAuthRecordsDTO.authDateBegin}-->
<!--        </if>-->
<!--        <if test="pageElderAuthRecordsDTO.authDateEnd != null and pageElderAuthRecordsDTO.authDateEnd != ''">-->
<!--            and cear.auth_date <![CDATA[ <= ]]> #{pageElderAuthRecordsDTO.authDateEnd}-->
<!--        </if>-->
<!--        <if test="pageElderAuthRecordsDTO.approvalStatus != null and pageElderAuthRecordsDTO.approvalStatus != 0">-->
<!--            and cear.approval_status = #{pageElderAuthRecordsDTO.approvalStatus}-->
<!--        </if>-->
<!--        <if test="pageElderAuthRecordsDTO.authStatus != null and pageElderAuthRecordsDTO.authStatus != 0">-->
<!--            and cear.auth_status = #{pageElderAuthRecordsDTO.authStatus}-->
<!--        </if>-->
<!--        <if test="pageElderAuthRecordsDTO.personnelCategory != null and pageElderAuthRecordsDTO.personnelCategory != 0">-->
<!--            and ceae.personnel_category = #{pageElderAuthRecordsDTO.personnelCategory}-->
<!--        </if>-->
<!--        <if test="pageElderAuthRecordsDTO.isAlive != null and pageElderAuthRecordsDTO.isAlive != 0">-->
<!--            and ceae.is_alive = #{pageElderAuthRecordsDTO.isAlive}-->
<!--        </if>-->
<!--        <if test="pageElderAuthRecordsDTO.searchKey != null and pageElderAuthRecordsDTO.searchKey != ''">-->
<!--            and (ceae.`name` like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%')-->
<!--            or cear.mark like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%')-->
<!--            or ceae.id_card = #{pageElderAuthRecordsDTO.idCard})-->
<!--        </if>-->
<!--        order by cear.create_at desc-->
<!--    </select>-->
    <select id="detailElderAuthRecords" resultType="com.panzhihua.common.model.vos.community.ComElderAuthRecordVO">
        SELECT