lidongdong
2023-10-24 6d283202ce723f87857ac730776a5d9138ec4c5b
新增办事指南处理接口   我的办事指南接口
6个文件已添加
4个文件已修改
684 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiQuestnaireUserAnswerVO.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiWorkGuideApi.java 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiQuestnaireUserAnswerDao.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiQuestnaireUserAnswer.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiQuestnaireUserAnswerService.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiQuestnaireUserAnswerServiceImpl.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActQuestnaireUserAnswerMapper.xml 150 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -784,4 +784,72 @@
        return jinhuiCommunityService.articleGetDetails(id);
    }
    /************************************************************************************************************
     *
     *
     *                         用户提交办理 /JinhuiWorkGuide/
     *
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/answer/getList")
    public R answerGetList(@RequestParam("pageNum") int pageNum,
                           @RequestParam("pageSize") int pageSize)
    {
        return jinhuiCommunityService.answerGetList(pageNum,pageSize,getUserId()+"");
    }
    /**
     * 获取详情
     * @param id
     * @return
     */
    @GetMapping("/answer/getDetails")
    public R answerGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.answerGetDetails(id);
    }
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/answer/addData")
    public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
    {
        item.setUserId(getUserId()+"");
        return jinhuiCommunityService.answerAddData(item);
    }
    /**
     * 编辑
     * @param item
     * @return
     */
    @PostMapping("/answer/editData")
    public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
    {
        return jinhuiCommunityService.answerEditData(item);
    }
    /**
     * 删除
     * @param id
     * @return
     */
    @DeleteMapping("/answer/expurgateData")
    public R answerExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.answerExpurgateData(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiQuestnaireUserAnswerVO.java
New file
@@ -0,0 +1,57 @@
package com.panzhihua.common.model.vos.jinhui;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("金汇办事记录用户答题记录")
public class JinhuiQuestnaireUserAnswerVO implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "办事指南id")
    private String questnaireId;
    @ApiModelProperty(value = "用户id")
    private String userId;
    @ApiModelProperty(value = "用户答题json数据")
    private String jsonObject;
    @ApiModelProperty(value = "办理状态(0待处理  1已通过 2未通过 )")
    private String transactType;
    @ApiModelProperty(value = "回复")
    private String reply;
    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processingTime;
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -12,6 +12,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
/**
@@ -910,4 +911,55 @@
    /************************************************************************************************************
     *
     *
     *                         用户提交办理 /JinhuiWorkGuide/
     *
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/JinhuiWorkGuide/answer/getList")
    public R answerGetList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize") int pageSize,
                     @RequestParam(value = "userId", required = false) String userId);
    /**
     * 获取详情
     * @param id
     * @return
     */
    @GetMapping("/JinhuiWorkGuide/answer/getDetails")
    public R answerGetDetails(@RequestParam("id") String id);
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/JinhuiWorkGuide/answer/addData")
    public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item);
    /**
     * 编辑
     * @param item
     * @return
     */
    @PostMapping("/JinhuiWorkGuide/answer/editData")
    public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item);
    /**
     * 删除
     * @param id
     * @return
     */
    @DeleteMapping("/JinhuiWorkGuide/answer/expurgateData")
    public R answerExpurgateData(@RequestParam("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -1205,6 +1205,64 @@
/************************************************************************************************************
 *
 *
 *                         用户提交办理 /JinhuiWorkGuide/
 *
 *
 *******************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/answer/getList")
    public R answerGetList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize") int pageSize,
                     @RequestParam(value = "userId", required = false) String userId)
    {
        return jinhuiCommunityService.answerGetList(pageNum,pageSize,userId);
    }
    /**
     * 获取详情
     * @param id
     * @return
     */
    @GetMapping("/answer/getDetails")
    public R answerGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.answerGetDetails(id);
    }
    /**
     * 处理
     * @return
     */
    @GetMapping("/answer/audit")
    public R answerEditData(@RequestParam("id") String id,
                            @RequestParam("reply") String reply,
                            @RequestParam("transactType") String transactType)
    {
        JinhuiQuestnaireUserAnswerVO item=new JinhuiQuestnaireUserAnswerVO();
        item.setId(id);
        item.setReply(reply);
        item.setTransactType(transactType);
        item.setProcessingTime(new Date());
        return jinhuiCommunityService.answerEditData(item);
    }
    /**
     * 删除
     * @param id
     * @return
     */
    @DeleteMapping("/answer/expurgateData")
    public R answerExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.answerExpurgateData(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiWorkGuideApi.java
@@ -5,8 +5,11 @@
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiQuestnaireUserAnswerVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiQuestnaireUserAnswer;
import com.panzhihua.service_jinhui_community.service.JinhuiComActWorkGuideClassifyService;
import com.panzhihua.service_jinhui_community.service.JinhuiComActWorkGuideService;
import com.panzhihua.service_jinhui_community.service.JinhuiQuestnaireUserAnswerService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -154,4 +157,76 @@
        return workGuideService.listWorkGuideByClassifyId(classifyId);
    }
    /************************************************************************************************************
     *
     *
     *                         用户提交办理 /JinhuiWorkGuide
     *
     *
     *******************************************************************************************************/
    @Resource
    private JinhuiQuestnaireUserAnswerService answerService;
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("answer/getList")
    public R answerGetList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize") int pageSize,
                     @RequestParam(value = "userId", required = false) String userId)
    {
        return answerService.getList(pageNum,pageSize,userId);
    }
    /**
     * 获取详情
     * @param id
     * @return
     */
    @GetMapping("answer/getDetails")
    public R answerGetDetails(@RequestParam("id") String id)
    {
        return R.ok(answerService.getDetails(id,null,null,null));
    }
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("answer/addData")
    public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
    {
        return answerService.addData(item);
    }
    /**
     * 编辑
     * @param item
     * @return
     */
    @PostMapping("answer/editData")
    public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
    {
        return answerService.editData(item);
    }
    /**
     * 删除
     * @param id
     * @return
     */
    @DeleteMapping("answer/expurgateData")
    public R answerExpurgateData(@RequestParam("id") String id)
    {
        return answerService.expurgateData(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiQuestnaireUserAnswerDao.java
New file
@@ -0,0 +1,55 @@
package com.panzhihua.service_jinhui_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.jinhui.JinhuiQuestnaireUserAnswerVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiQuestnaireUserAnswer;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface JinhuiQuestnaireUserAnswerDao extends BaseMapper<JinhuiQuestnaireUserAnswer>
{
    /**
     * 列表
     * @param
     * @return
     */
    IPage<JinhuiQuestnaireUserAnswer> getList(Page page,
                                           @Param("userId") String userId);
    /**
     * 详情
     * @param id
     * @return
     */
    JinhuiQuestnaireUserAnswer getDetails(@Param("id") String id,
                                          @Param("questnaireId") String questnaireId,
                                          @Param("userId") String userId,
                                          @Param("transactType") String transactType);
    /**
     * 新增
     * @param
     * @return
     */
    int addData(@Param("item") JinhuiQuestnaireUserAnswerVO item);
    /**
     * 编辑
     * @param item
     * @return
     */
    int editData(@Param("item") JinhuiQuestnaireUserAnswerVO item);
    /**
     * 删除
     * @param id
     * @return
     */
    int expurgateData(@Param("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiQuestnaireUserAnswer.java
New file
@@ -0,0 +1,57 @@
package com.panzhihua.service_jinhui_community.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("金汇办事记录用户答题记录")
public class JinhuiQuestnaireUserAnswer implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "办事指南id")
    private String questnaireId;
    @ApiModelProperty(value = "用户id")
    private String userId;
    @ApiModelProperty(value = "用户答题json数据")
    private String jsonObject;
    @ApiModelProperty(value = "办理状态(0待处理  1已通过 2未通过 )")
    private String transactType;
    @ApiModelProperty(value = "回复")
    private String reply;
    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processingTime;
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiQuestnaireUserAnswerService.java
New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_jinhui_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiQuestnaireUserAnswerVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiQuestnaireUserAnswer;
public interface JinhuiQuestnaireUserAnswerService extends IService<JinhuiQuestnaireUserAnswer>
{
    /**
     * 分页查询
     * @param
     * @return
     */
    R getList(int pageNum,int pageSize,String userId);
    JinhuiQuestnaireUserAnswer getDetails(String id,String questnaireId,String userId,String transactType);
    /**
     * 新增
     * @param
     * @return
     */
    R addData(JinhuiQuestnaireUserAnswerVO item);
    R editData(JinhuiQuestnaireUserAnswerVO item);
    R expurgateData(String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiQuestnaireUserAnswerServiceImpl.java
New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_jinhui_community.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiQuestnaireUserAnswerVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_jinhui_community.dao.JinhuiQuestnaireUserAnswerDao;
import com.panzhihua.service_jinhui_community.entity.JinhuiQuestnaireUserAnswer;
import com.panzhihua.service_jinhui_community.service.JinhuiQuestnaireUserAnswerService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Service
public class JinhuiQuestnaireUserAnswerServiceImpl extends ServiceImpl<JinhuiQuestnaireUserAnswerDao,
        JinhuiQuestnaireUserAnswer> implements JinhuiQuestnaireUserAnswerService
{
    @Override
    public R getList(int pageNum,int pageSize,String userId)
    {
        Page page = new Page<JinhuiQuestnaireUserAnswer>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,userId));
    }
    @Override
    public JinhuiQuestnaireUserAnswer getDetails(String id,String questnaireId,String userId,String transactType) {
        return baseMapper.getDetails(id,questnaireId,userId,transactType);
    }
    @Override
    public R addData(JinhuiQuestnaireUserAnswerVO item)
    {
        if (StringUtils.isEmpty(item.getQuestnaireId()))
        {
            return R.fail("办事指南id不能为空");
        }
        if(StringUtils.isEmpty(item.getJsonObject()))
        {
            return R.fail("用户解答数据不能为空");
        }
        JinhuiQuestnaireUserAnswer answer=baseMapper.getDetails(null,item.getQuestnaireId(),item.getUserId(),"0");
        if(answer!=null)
        {
            return R.fail("该事件已提交过!");
        }
        int num= baseMapper.addData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    @Override
    public R editData(JinhuiQuestnaireUserAnswerVO item) {
        int num= baseMapper.editData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    @Override
    public R expurgateData(String id) {
        int num= baseMapper.expurgateData(id);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActQuestnaireUserAnswerMapper.xml
New file
@@ -0,0 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_jinhui_community.dao.JinhuiQuestnaireUserAnswerDao">
    <resultMap type="com.panzhihua.service_jinhui_community.entity.JinhuiQuestnaireUserAnswer" id="itemMap">
        <result property="id" column="id" />
        <result property="questnaireId" column="questnaire_id" />
        <result property="userId" column="user_id" />
        <result property="jsonObject" column="json_object" />
        <result property="transactType" column="transact_type" />
        <result property="reply" column="reply" />
        <result property="processingTime" column="processing_time" />
        <result property="creationTime" column="creation_time" />
        <result property="updateTime" column="update_time" />
    </resultMap>
    <!-- 分页查询 -->
    <select id="getList" resultMap="itemMap">
        select
            id,
            questnaire_id,
            user_id,
            creation_time,
            json_object,
            update_time,
            processing_time,
            transact_type,
            reply
        from jinhui_com_act_questnaire_user_answer
        where user_id=#{userId}
        order by creation_time desc
    </select>
    <select id="getDetails" resultMap="itemMap">
        select
            id,
            questnaire_id,
            user_id,
            creation_time,
            json_object,
            update_time,
            processing_time,
            transact_type,
            reply
        from jinhui_com_act_questnaire_user_answer
        <where>
            1=1
            <if test=" id!=null and id!='' ">
                and id=#{id}
            </if>
            <if test=" questnaireId!=null and questnaireId!='' ">
                and questnaire_id=#{questnaireId}
            </if>
            <if test=" userId!=null and userId!='' ">
                and user_id=#{userId}
            </if>
            <if test=" transactType!=null and transactType!='' ">
                and transact_type=#{transactType}
            </if>
        </where>
    </select>
    <insert id="addData">
        insert into jinhui_com_act_questnaire_user_answer
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                id,
            </if>
            <if test="item.questnaireId != null and item.questnaireId != '' ">
                questnaire_id,
            </if>
            <if test="item.userId != null and item.userId != '' ">
                user_id,
            </if>
            <if test="item.jsonObject != null and item.jsonObject != '' ">
                json_object,
            </if>
            <if test="item.processingTime != null and item.processingTime != '' ">
                processing_time,
            </if>
            <if test="item.transactType != null and item.transactType != '' ">
                transact_type,
            </if>
            <if test="item.reply != null and item.reply != '' ">
                reply,
            </if>
            creation_time
        </trim>
        values
        <trim prefix="("  suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                #{item.id},
            </if>
            <if test="item.questnaireId != null and item.questnaireId != '' ">
                #{item.questnaireId},
            </if>
            <if test="item.userId != null and item.userId != '' ">
                #{item.userId},
            </if>
            <if test="item.jsonObject != null and item.jsonObject != '' ">
                #{item.jsonObject},
            </if>
            <if test="item.processingTime != null and item.processingTime != '' ">
                #{item.processingTime},
            </if>
            <if test="item.transactType != null and item.transactType != '' ">
                #{item.transactType},
            </if>
            <if test="item.reply != null and item.reply != '' ">
                #{item.reply},
            </if>
            sysdate()
        </trim>
    </insert>
    <update id="editData">
        update jinhui_com_act_questnaire_user_answer
        <set>
            <if test="item.id != null and item.id != '' ">
                id=#{item.id},
            </if>
            <if test="item.questnaireId != null and item.questnaireId != '' ">
                questnaire_id=#{item.questnaireId},
            </if>
            <if test="item.userId != null and item.userId != '' ">
                user_id=#{item.userId},
            </if>
            <if test="item.jsonObject != null and item.jsonObject != '' ">
                json_object=#{item.jsonObject},
            </if>
            <if test="item.processingTime != null and item.processingTime != '' ">
                processing_time=#{item.processingTime},
            </if>
            <if test="item.transactType != null and item.transactType != '' ">
                transact_type=#{item.transactType},
            </if>
            <if test="item.reply != null and item.reply != '' ">
                reply=#{item.reply},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}
    </update>
    <delete id="expurgateData" parameterType="String">
        delete from jinhui_com_act_questnaire_user_answer where id=#{id}
    </delete>
</mapper>