Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 2384c489bc788ee60d49a1a07bb8059f4a15352a

Merge branch 'test_screen' into 'master'

Test screen

See merge request root/zhihuishequ!58

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

@@ -252,7 +252,7 @@
    List<EastPhotoTypeVO> countPub(@Param("communityId")Long communityId);

    @Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON  t.id = r.easy_type_id " +
            "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.status = 4 where p.community_id = #{communityId} " +
            "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.status = 4 and p.community_id = #{communityId} " +
            "GROUP BY t.name ")
    List<EastPhotoTypeVO> countApproved(@Param("communityId")Long communityId);


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

@@ -164,10 +164,6 @@
            DateTime endDay = DateUtil.endOfMonth(date);

            int m = DateUtil.month(endDay);
            if(m == 0){
                m = 12;
            }
            m--;
            int day = DateUtil.dayOfMonth(endDay);
            int half = day/2;
            String month = DateUtil.format(date,moth_format_str);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java

@@ -31,71 +31,61 @@
    /**
     * 与本人关系
     */
    @TableField(exist = false)
    private String relationship;

    /**
     * 名字
     */
    @TableField(exist = false)
    private String name;

    /**
     * 身份证号
     */
    @TableField(exist = false)
    private String idCard;

    /**
     * 手机号
     */
    @TableField(exist = false)
    private String phone;

    /**
     * 年龄
     */
    @TableField(exist = false)
    private Integer age;

    /**
     * 健康状况
     */
    @TableField(exist = false)
    private String health;

    /**
     * 工作
     */
    @TableField(exist = false)
    private String job;

    /**
     * 证件照（人像面）照片
     */
    @TableField(exist = false)
    private String cardPhotoFront;
    /**
     * 证件照（国徽面）照片
     */
    @TableField(exist = false)
    private String cardPhotoBack;
    /**
     * 户口本照片 逗号隔开
     */
    @TableField(exist = false)
    private String familyBook;

    /**
     * create_at
     */

    @TableField(fill = FieldFill.INSERT,exist = false)
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * update_at
     */
    @TableField(fill = FieldFill.UPDATE,exist = false)
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;
}