公益报名+议事

linwe

2023-12-27 c255e37f451939925946b1c2f29a791ddf25efce

公益报名+议事

 src/main/java/org/springblade/modules/article/entity/Article.java

@@ -20,117 +20,98 @@
@TableName("jczz_article")
public class Article implements Serializable {

    /**
     * 主键id,自增
     */
    @TableId(value = "id",type = IdType.AUTO)

    /** 主键 */
    @ApiModelProperty(value = "主键ID", example = "")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 标题
     */
//    @NotNull(message = "标题不能为空")
    /** 标题 */
    @ApiModelProperty(value = "标题", example = "")
    @TableField("title")
    private String title;

    /**
     * 类型
     */
//    @NotNull(message = "类型")
    /** 类型  0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查 */
    @ApiModelProperty(value = "类型  0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查", example = "")
    @TableField("type")
    private Integer type;

    /**
     * 内容
     */
    /** 内容 */
    @ApiModelProperty(value = "内容", example = "")
    @TableField("content")
    private String content;

    /**
     * logo 图片url
     */
    /** logo 图片url */
    @ApiModelProperty(value = "logo 图片url", example = "")
    @TableField("url")
    private String url;

    /**
     * logo 图片url
     */
    /** 视频url */
    @ApiModelProperty(value = "视频url", example = "")
    @TableField("video_url")
    private String videoUrl;


    /**
     * 发布来源id
     */
    /** 发布来源id */
    @ApiModelProperty(value = "发布来源id", example = "")
    @TableField("source_id")
    private String sourceId;

    /**
     * 发布来源名称
     */
    /** 发布来源名称 */
    @ApiModelProperty(value = "发布来源名称", example = "")
    @TableField("source_name")
    private String sourceName;

    /**
     * 资讯类型，对应业务字典数据 articleType
     */
    /** 资讯类型 */
    @ApiModelProperty(value = "资讯类型", example = "")
    @TableField("article_type")
    private String articleType;

    /**
     * 是否推荐  1：推荐  2：不推荐
     */
    private Integer recommend;
    /** 是否推荐 1：推荐   2：不推荐 */
    @ApiModelProperty(value = "是否推荐 1：推荐   2：不推荐", example = "")
    @TableField("recommend")
    private Byte recommend;

    /**
     * 发布状态 0:未发布 1:已发布
     */
    /** 是否发布 0：未发布 1：已发布 */
    @ApiModelProperty(value = "是否发布 0：未发布 1：已发布", example = "")
    @TableField("publish")
    private String publish;

    /**
     * 开启评论区 0:关闭 1:开启
     */
    /** 是否开启评论 0：未开启 1：开启 */
    @ApiModelProperty(value = "是否开启评论 0：未开启 1：开启", example = "")
    @TableField("iscomment")
    private String iscomment;
    /**
     * 查看数量
     */
    @ApiModelProperty(value = "查看数量")

    /** 查看数量 */
    @ApiModelProperty(value = "查看数量", example = "")
    @TableField("view_number")
    private Integer viewNumber;


    /**
     * 创建人
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty("创建人")
    private Long createUser;

    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty("创建时间")
    /** 创建时间 */
    @ApiModelProperty(value = "创建时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField(value = "create_time",fill = FieldFill.INSERT)
    private Date createTime;

    /**
     * 更新人
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty("更新人")
    private Long updateUser;

    /**
     * 更新时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("更新时间")
    /** 更新时间 */
    @ApiModelProperty(value = "更新时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("update_time")
    private Date updateTime;

    /**
     * 是否删除
     */
    @TableLogic
    @ApiModelProperty("是否已删除 0:否  1:是")
    private Integer isDeleted;
    /** 更新人 */
    @ApiModelProperty(value = "更新人", example = "")
    @TableField("update_user")
    private Long updateUser;

    /** 创建人 */
    @ApiModelProperty(value = "创建人", example = "")
    @TableField("create_user")
    private Long createUser;

    /** 是否删除 0：否  1：是 */
    @ApiModelProperty(value = "是否删除 0：否  1：是", example = "")
    @TableField("is_deleted")
    private Integer isDeleted;

    /** 资讯范围 */
    @ApiModelProperty(value = "资讯范围", example = "")

 src/main/java/org/springblade/modules/discuss/entity/UserTopicsEntity.java

@@ -95,5 +95,12 @@
    @TableField("signature_path")
    private String  signaturePath;

    /**
     * 门牌地址编码
     */
    @ApiModelProperty(value = "门牌地址编码")
    @TableField("house_code")
    private String houseCode;


}

 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml

@@ -299,23 +299,26 @@
        FROM
        jczz_house_rental jhr
        LEFT JOIN jczz_doorplate_address jda ON jhr.house_code = jda.address_code
        WHERE
        jhr.is_deleted = 0
        <if test="neiCode != null and neiCode != ''">
            and jda.nei_code = #{neiCode}
        </if>
        <if test="userId != null">
            AND jhr.house_code IN (
            SELECT
            jgr.house_code
            FROM
            jczz_grid_range jgr
            LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
            LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
            WHERE
            jg.is_deleted = 0
            AND jgm.user_id = #{userId} )
        </if>
        <where>
            <if test="neiCode != null and neiCode != ''">
                and jda.nei_code = #{neiCode}
            </if>
            <if test="userId != null">
                AND jhr.house_code IN (
                SELECT
                jgr.house_code
                FROM
                jczz_grid_range jgr
                LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
                LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
                WHERE
                jg.is_deleted = 0
                AND jgm.user_id = #{userId} )
            </if>
            and jhr.is_deleted = 0
            and jhr.audit_status = 0
        </where>

    </select>



 src/main/java/org/springblade/modules/system/controller/MenuController.java

@@ -138,7 +138,7 @@
     */
    @GetMapping("/dynamicMenu")
    @ApiOperation(value = "菜单列表", notes = "传入menu")
    public R<List<MenuVO>> dynamicMenu(String roleId, Long topMenuId, @RequestParam(value = "labelType", required = false,defaultValue = "1") Integer labelType) {
    public R<List<MenuVO>> dynamicMenu(String roleId, Long topMenuId, @RequestParam(value = "labelType", required = false,defaultValue = "0") Integer labelType) {
        List<MenuVO> list = menuService.routes(roleId, topMenuId,labelType,1);
        return R.data(list);
    }

 src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -125,6 +125,7 @@
        // 非超级管理员并且不是顶部菜单请求则返回对应角色权限菜单
        else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
            roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType));
            // 1:居民，居民需要通过人的标签来显示取保候审
            if(CommonConstant.NUMBER_ONE.equals(labelType)){
                extracted(labelType, roleMenus);
            }

 src/main/java/org/springblade/modules/task/controller/TaskRepairStepController.java

@@ -83,13 +83,13 @@
    }

    /**
     * 报事报修事件步骤表 新增
     * 回复事件/移交时间接口
     */
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入task")
    public R save(@Valid @RequestBody TaskRepairStepEntity task) {
        return R.status(taskService.save(task));
    @ApiOperation(value = "回复事件/移交时间接口", notes = "传入task")
    public R save(@Valid @RequestBody TaskRepairStepVO task) {
        return R.status(taskService.saveTaskRepairStep(task));
    }

    /**

 src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java

@@ -187,15 +187,4 @@
        return R.status(taskReportForRepairsService.updateView(gridman));
    }

    /**
     * 事件移交
     */
    @PostMapping("/transfer")
    @ApiOperation(value = "事件移交", notes = "传入taskReportForRepairs")
    public R transfer(@Valid @RequestBody TaskReportForRepairsVO taskReportForRepairsVO) {
        return R.status(taskReportForRepairsService.transfer(taskReportForRepairsVO));
    }



}

 src/main/java/org/springblade/modules/task/entity/TaskRepairStepEntity.java

@@ -83,7 +83,7 @@
    /** 创建时间 */
    @ApiModelProperty(value = "创建时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("create_time")
    @TableField(value = "create_time",fill = FieldFill.INSERT)
    private Date createTime;

    /** 更新时间 */

 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml

@@ -17,10 +17,141 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>

    <!--自定义分页查询-->
    <select id="selectTaskReportForRepairsPage" resultType="org.springblade.modules.task.vo.TaskReportForRepairsVO">
    <resultMap id="taskReportForRepairsResult" type="org.springblade.modules.task.vo.TaskReportForRepairsVO">
        <result property="id" column="id"/>
        <result property="taskId" column="task_id"/>
        <result property="addressCode" column="address_code"/>
        <result property="type" column="type"/>
        <result property="realName" column="real_name"/>
        <result property="phone" column="phone"/>
        <result property="remark" column="remark"/>
        <result property="imageUrls" column="image_urls"/>
        <result property="confirmUserId" column="confirm_user_id"/>
        <result property="confirmTime" column="confirm_time"/>
        <result property="confirmFlag" column="confirm_flag"/>
        <result property="confirmNotion" column="confirm_notion"/>
        <result property="createTime" column="create_time"/>
        <result property="createUser" column="create_user"/>
        <result property="createDept" column="create_dept"/>
        <result property="updateTime" column="update_time"/>
        <result property="updateUser" column="update_user"/>
        <result property="isDeleted" column="is_deleted"/>
        <result property="status" column="status"/>
        <result property="lng" column="lng"/>
        <result property="lat" column="lat"/>
        <result property="address" column="address"/>
        <result property="viewType" column="view_type"/>


        <collection property="taskRepairStepList" column="id" select="selectTaskRepairStepList"
                    javaType="java.util.List" ofType="org.springblade.modules.task.entity.TaskRepairStepEntity"
                    autoMapping="true">
            <id property="repairId" column="id"/>
        </collection>

        <collection property="taskRepairAppraiseList" column="id" select="selectTaskRepairAppraiseList"
                    javaType="java.util.List" ofType="org.springblade.modules.task.entity.TaskRepairAppraiseEntity"
                    autoMapping="true">
            <id property="repairId" column="id"/>
        </collection>


    </resultMap>


    <select id="selectTaskRepairStepList" parameterType="java.lang.Long"
            resultType="org.springblade.modules.task.entity.TaskRepairStepEntity">
        select
        jtrfr.*,
        id,
        repair_id,
        content,
        video_list,
        name,
        mobile,
        user_id,
        people_type,
        create_time,
        update_time,
        image_list
        from
        jczz_task_repair_step
        <where>
            <if test="id != null and id != '' ">repair_id = #{id}</if>
        </where>
    </select>


    <select id="selectTaskRepairAppraiseList" parameterType="java.lang.Long"
            resultType="org.springblade.modules.task.entity.TaskRepairAppraiseEntity">
        select
        id,
        content,
        create_time,
        image_list,
        point,
        repair_id,
        video_list
        from
        jczz_task_repair_appraise
        <where>
            <if test="id != null and id != ''">repair_id = #{id}</if>
        </where>
    </select>


    <sql id="selectTaskReportForRepairs">
        select id,
               task_id,
               address_code,
               type,
               real_name,
               phone,
               remark,
               image_urls,
               confirm_user_id,
               confirm_time,
               confirm_flag,
               confirm_notion,
               create_time,
               create_user,
               create_dept,
               update_time,
               update_user,
               is_deleted,
               status,
               lng,
               lat,
               address,
               view_type
        from jczz_task_report_for_repairs
    </sql>

    <!--自定义分页查询-->
    <select id="selectTaskReportForRepairsPage" resultMap="taskReportForRepairsResult">
        select
        jtrfr.id id,
        jtrfr.task_id,
        jtrfr.address_code,
        jtrfr.type,
        jtrfr.real_name,
        jtrfr.phone,
        jtrfr.remark,
        jtrfr.image_urls,
        jtrfr.confirm_user_id,
        jtrfr.confirm_time,
        jtrfr.confirm_flag,
        jtrfr.confirm_notion,
        jtrfr.create_time,
        jtrfr.create_user,
        jtrfr.create_dept,
        jtrfr.update_time,
        jtrfr.update_user,
        jtrfr.is_deleted,
        jtrfr.status,
        jtrfr.lng,
        jtrfr.lat,
        jtrfr.address,
        jtrfr.view_type,
        jda.address_name as addressName
        from jczz_task_report_for_repairs jtrfr
        left join jczz_doorplate_address jda on jda.address_code = jtrfr.address_code

 src/main/java/org/springblade/modules/task/service/ITaskRepairStepService.java

@@ -57,4 +57,6 @@
     * @return 报事报修事件步骤表集合
     */
    public List<TaskRepairStepDTO> selectTaskRepairStepList(TaskRepairStepDTO taskRepairStepDTO);

    Boolean saveTaskRepairStep(TaskRepairStepVO task);
}

 src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java

@@ -78,5 +78,4 @@

    Object getReportForStatistics(String code, String roleType);

    Boolean transfer(TaskReportForRepairsVO taskReportForRepairsVO);
}

 src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java

@@ -16,15 +16,19 @@
 */
package org.springblade.modules.task.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.task.dto.TaskRepairStepDTO;
import org.springblade.modules.task.entity.TaskRepairStepEntity;
import org.springblade.modules.task.vo.TaskRepairStepVO;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.mapper.TaskRepairStepMapper;
import org.springblade.modules.task.service.ITaskRepairStepService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.vo.TaskRepairStepVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

@@ -61,8 +65,18 @@
     * @return 报事报修事件步骤表集合
     */
    @Override
    public List<TaskRepairStepDTO> selectTaskRepairStepList(TaskRepairStepDTO taskRepairStepDTO)
    {
    public List<TaskRepairStepDTO> selectTaskRepairStepList(TaskRepairStepDTO taskRepairStepDTO) {
        return this.baseMapper.selectTaskRepairStepList(taskRepairStepDTO);
    }

    @Override
    public Boolean saveTaskRepairStep(TaskRepairStepVO task) {
        task.setUserId(AuthUtil.getUserId());
        TaskReportForRepairsEntity taskReportForRepairsEntity = new TaskReportForRepairsEntity();
        taskReportForRepairsEntity.setTaskId(task.getRepairId());
        taskReportForRepairsEntity.setConfirmFlag(task.getConfirmFlag());
        taskReportForRepairsEntity.setConfirmUserId(task.getTransferUserId());
        boolean update = SpringUtils.getBean(ITaskReportForRepairsService.class).save(taskReportForRepairsEntity);
        return update ? save(task) : false;
    }
}

 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -209,21 +209,4 @@
        return objectObjectHashMap;
    }

    /**
     * 移交
     *
     * @param taskReportForRepairsVO
     * @return
     */
    @Override
    public Boolean transfer(TaskReportForRepairsVO taskReportForRepairsVO) {
        // 记录移交记录
        boolean save = SpringUtils.getBean(ITaskRepairStepService.class).save(taskReportForRepairsVO.getTaskRepairStepEntity());
        if (save) {
            taskReportForRepairsVO.setConfirmFlag(2);
            boolean save1 = save(taskReportForRepairsVO);
            return save1;
        }
        return false;
    }
}

 src/main/java/org/springblade/modules/task/vo/TaskRepairStepVO.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.task.vo;

import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.task.entity.TaskRepairStepEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
@@ -32,4 +33,10 @@
public class TaskRepairStepVO extends TaskRepairStepEntity {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "确认标记  1：待处理  2：处理中  3：已处理")
    private Integer confirmFlag;

    @ApiModelProperty(value = "移交人id")
    private Long transferUserId;

}

 src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java

@@ -17,11 +17,14 @@
package org.springblade.modules.task.vo;

import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.task.entity.TaskRepairAppraiseEntity;
import org.springblade.modules.task.entity.TaskRepairStepEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.List;

/**
 * 报事报修任务表 视图实体类
@@ -59,6 +62,9 @@
     * 事件步骤
     */
    @ApiModelProperty("事件步骤")
    private TaskRepairStepEntity taskRepairStepEntity;
    private List<TaskRepairStepEntity> taskRepairStepList;

    @ApiModelProperty("评分")
    private List<TaskRepairAppraiseEntity> taskRepairAppraiseList;

}