bug修改

101captain

2022-07-24 123a3e8790751a82276f2da01cbbd480fab996bf

bug修改

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java

@@ -285,7 +285,7 @@
    @GetMapping("agreement")
    @ApiImplicitParam(name = "type", value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策")
    public R agreement(@RequestParam("type") Integer type) {
        return userService.agreement(type);
        return userService.agreement(type,this.getAppId());
    }

    @ApiOperation("发布留言")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerOrgTeamVo.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.common;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,6 +25,7 @@
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 社区id

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

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.easyPhoto;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
@Data
@ApiModel
public class BannerVO {
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("1社区动态、2居民活动、志愿者活动、3党员活动、4问卷调查、5党建动态、6预约登记、7随手拍活动")
    private Integer type;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.property;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,7 +11,8 @@
@Data
@ApiModel
public class ComPropertyRepairVO {
    private Integer id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
     * 报修内容

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -697,7 +697,7 @@
     * @return 协议内容
     */
    @PostMapping("agreement")
    R agreement(@RequestParam("type") Integer type);
    R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId);

    /**
     * 维护用户最后登录时间

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

@@ -57,11 +57,4 @@
     * @return
     */
    int selectVotedPersonNum(@Param("discussId") Long discussId);

    /**
     * 批量插入投票记录
     * @param comActDiscussOptionUserDOList
     * @return
     */
    int batchInsert(@Param("comActDiscussOptionUserDOList") List<ComActDiscussOptionUserDO> comActDiscussOptionUserDOList);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoEvaluate.java

@@ -3,6 +3,9 @@
import java.util.Date;
import java.io.Serializable;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

/**
@@ -12,11 +15,13 @@
 * @since 2022-03-01 13:44:23
 */
@Data
@TableName("com_act_easy_photo_evaluate")
public class ComActEasyPhotoEvaluate implements Serializable {
    private static final long serialVersionUID = -10187231854376444L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 社区id

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

@@ -995,13 +995,9 @@
            comActDiscussOptionUserDO.setUserId(userId);
            comActDiscussOptionUserDO.setDiscussOptionId(optionId);
            comActDiscussOptionUserDO.setDiscussId(discussId);
            comActDiscussOptionUserDOList.add(comActDiscussOptionUserDO);
            comActDiscussOptionUserDAO.insert(comActDiscussOptionUserDO);
        });
        int result = comActDiscussOptionUserDAO.batchInsert(comActDiscussOptionUserDOList);
        if (result > 0) {
            return R.ok();
        }
        return R.fail();
        return R.ok();
    }

    /**

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

@@ -99,7 +99,9 @@
        comActDynVO.setReadNum(count);
        if (nonNull(category) && !category.equals(3)) {
            ComActDO comActDO = comActDAO.selectById(comActDynDO.getCommunityId());
            comActDynVO.setCommunityName(comActDO.getName());
            if(comActDO!=null){
                comActDynVO.setCommunityName(comActDO.getName());
            }
        }
        return R.ok(comActDynVO);
    }

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

@@ -286,5 +286,38 @@
        SELECT t.* FROM `com_act_activity` t left join com_act_act_regist t1 on t.id = t1.activity_id left join sys_user t2 on t1.user_id = t2.user_id
        WHERE t1.end_time is not null and  t.community_id = #{communityId} and t.type = 3 and publish_at between concat(#{date},'-01-01 00:00:00') and concat(#{date},'-12-31 23:59:59') group by t.id
    </select>

    <select id="pageProjectActivity" resultType="com.panzhihua.common.model.vos.community.ComActActivityVO">
        SELECT
            a.id,
            a.activity_name,
            u.`name` sponsorName,
            a.activity_addr,
            a.aattend_people,
            a.`status`,
            a.is_qr_code,
            a.publish_at,
            a.begin_at,
            a.cover,
            a.end_at,
            a.volunteer_max,
            count(
                    IF
                        ( s.is_volunteer = 1, s.id, NULL )) volunteer_now,
            count(
                    IF
                        ( s.is_volunteer = 0, s.id, NULL )) participant_now,
            a.participant_max,
            a.sign_up_begin,
            a.sign_up_end,
            ca.NAME AS communityName,
            a.type,
            a.party_member_max
        FROM
            com_act_activity a
                LEFT JOIN sys_user u ON a.sponsor_id = u.user_id
                LEFT JOIN ( SELECT * FROM com_act_act_sign WHERE `status` = 1 ) s ON a.id = s.activity_id
                LEFT JOIN com_act ca ON a.community_id = ca.community_id
                JOIN (SELECT * FROM com_act_social_project WHERE (street_id = #{comActActivityVO.streetId} OR community_id = #{comActActivityVO.communityId}) AND `status` =3) t ON a.project_id = t.id
        GROUP BY a.id   ORDER BY a.status = 99 desc,a.publish_at DESC
    </select>
</mapper>

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

@@ -15,13 +15,6 @@
    <sql id="Base_Column_List">
        id, discuss_option_id, user_id, create_at, discuss_id
    </sql>
    <insert id="batchInsert" parameterType="java.util.List">
        INSERT INTO `com_act_discuss_option_user`(discuss_option_id,user_id,create_at,discuss_id)
        VALUES
        <foreach collection="comActDiscussOptionUserDOList" item="item" index="index" separator="," >
            (#{item.discussOptionId}, #{item.userId}, now(), #{item.discussId})
        </foreach>
    </insert>
    <select id="selectVotedVotesInToday" resultType="java.lang.Integer">
        SELECT COUNT(1) FROM `com_act_discuss_option_user`
        WHERE discuss_id = #{discussId} AND user_id = #{userId} AND DATE(create_at) &gt;= DATE(now())

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -724,8 +724,8 @@
     * @return 协议内容
     */
    @PostMapping("agreement")
    public R agreement(@RequestParam("type") Integer type) {
        return userService.agreement(type);
    public R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId) {
        return userService.agreement(type,appId);
    }

    /**

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

@@ -5,6 +5,8 @@

import com.baomidou.mybatisplus.annotation.*;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

/**
@@ -21,6 +23,7 @@
     * 角色id
     */
    @TableId(type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;

    /**

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

@@ -3,9 +3,7 @@
import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

@@ -23,6 +21,7 @@
    /**
     * id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -478,7 +478,7 @@
     *            1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
     * @return 协议内容
     */
    R agreement(Integer type);
    R agreement(Integer type,String appId);

    /**
     * 维护用户最后登录时间

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -2036,9 +2036,9 @@
     * @return 协议内容
     */
    @Override
    public R agreement(Integer type) {
    public R agreement(Integer type,String appId) {
        SysUserAgreementDO sysUserAgreementDO = sysUserAgreementDAO
            .selectOne(new QueryWrapper<SysUserAgreementDO>().lambda().eq(SysUserAgreementDO::getType, type));
            .selectOne(new QueryWrapper<SysUserAgreementDO>().lambda().eq(SysUserAgreementDO::getType, type).eq(SysUserAgreementDO::getAppId,appId));
        if (ObjectUtils.isEmpty(sysUserAgreementDO)) {
            return R.fail("协议不存在");
        }