springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceApplyForVO.java
New file @@ -0,0 +1,59 @@ 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 JinhuiInterspaceApplyForVO implements Serializable { private static final long serialVersionUID = -70884515430727555L; @ApiModelProperty(value = "主键") private String id; @ApiModelProperty(value = "空间场地id") private String interspaceId; @ApiModelProperty(value = "空间场地名称") private String interspaceName; @ApiModelProperty(value = "预约时间（哪一天）") private String interspaceTime; @ApiModelProperty(value = "预约时段") private String subscribeTimeFrame; @ApiModelProperty(value = "预约人姓名") private String userName; @ApiModelProperty(value = "预约人电话") private String userPhone; @ApiModelProperty(value = "状态（1待处理 2未通过 3已通过）") private String state; @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/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -52,10 +52,9 @@ @ApiOperation(value = "办事指南_编辑") @PostMapping("/editworkguide") @Transactional(rollbackFor = Exception.class) public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") String userId) public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO) { return jinhuiCommunityService.putWorkGuide(workGuideDTO,userId); return jinhuiCommunityService.putWorkGuide(workGuideDTO,getUserId()+""); } /** springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiInterspaceApi.java
@@ -1,8 +1,11 @@ package com.panzhihua.service_jinhui_community.api; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceApplyForVO; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceTypeVO; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceVO; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspaceApplyFor; import com.panzhihua.service_jinhui_community.service.JinhuiInterspaceApplyForService; import com.panzhihua.service_jinhui_community.service.JinhuiInterspaceService; import com.panzhihua.service_jinhui_community.service.JinhuiInterspaceTypeService; import lombok.extern.slf4j.Slf4j; @@ -24,6 +27,9 @@ @Resource private JinhuiInterspaceTypeService interspaceTypeService; @Resource private JinhuiInterspaceApplyForService applyForService; /** * 金汇空间预约模块分页查询 @@ -151,8 +157,70 @@ } /*************************************************************************************************************** * * * 空间预约申请 * * **************************************************************************************************************/ /** * 空间预约申请分页查询 * @param * @return */ @GetMapping("/applyFor/getList") public R applyForGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize, @RequestParam(value = "intendantType",required = false) String intendantType, @RequestParam(value = "state",required = false) String state) { return applyForService.getList(pageNum,pageSize,intendantType,state); } /** * 空间预约申请详情 * @param * @return */ @GetMapping("/applyFor/getDetails") public R applyForGetDetails(@RequestParam("id") String id) { return R.ok(applyForService.getDetails(id)); } /** * 空间预约申请新增 * @param * @return */ @PostMapping("/applyFor/addData") public R applyForAddData(@RequestBody JinhuiInterspaceApplyForVO item) { return applyForService.addData(item); } /** * 空间预约申请编辑 * @param * @return */ @PostMapping("/applyFor/editData") public R applyForEditData(@RequestBody JinhuiInterspaceApplyForVO item) { return applyForService.editData(item); } /** * 空间预约申请删除 * @param * @return */ @DeleteMapping("/applyFor/expurgateData") public R applyForExpurgateData(@RequestParam("id") String id) { return applyForService.expurgateData(id); }
@@ -31,4 +31,8 @@ @Param("pageSize") String pageSize); void deleteQuesSubAll(@Param("queId") String queId); void deleteQuesSubAll2(@Param("queId") String queId); } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiInterspaceApplyForDao.java
New file @@ -0,0 +1,43 @@ 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.JinhuiInterspaceApplyForVO; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceVO; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspace; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspaceApplyFor; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @Mapper public interface JinhuiInterspaceApplyForDao extends BaseMapper<JinhuiInterspaceApplyFor> { /** * 分页查询 * @param * @return */ IPage<JinhuiInterspaceApplyFor> getList(Page page, @Param("intendantType") String intendantType, @Param("state") String state); JinhuiInterspaceApplyFor getDetails(@Param("id") String id); /** * 新增 * @param * @return */ int addData(@Param("item") JinhuiInterspaceApplyForVO item); int editData(@Param("item") JinhuiInterspaceApplyForVO item); int expurgateData(@Param("id") String id); } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiInterspaceApplyFor.java
New file @@ -0,0 +1,61 @@ package com.panzhihua.service_jinhui_community.entity; import com.baomidou.mybatisplus.annotation.TableField; 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 JinhuiInterspaceApplyFor implements Serializable { private static final long serialVersionUID = -70884515430727555L; @ApiModelProperty(value = "主键") private String id; @ApiModelProperty(value = "空间场地id") private String interspaceId; @TableField(exist = false) @ApiModelProperty(value = "空间场地名称") private String interspaceName; @ApiModelProperty(value = "预约时间（哪一天）") private String interspaceTime; @ApiModelProperty(value = "预约时段") private String subscribeTimeFrame; @ApiModelProperty(value = "预约人姓名") private String userName; @ApiModelProperty(value = "预约人电话") private String userPhone; @ApiModelProperty(value = "状态（1待处理 2未通过 3已通过）") private String state; @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/JinhuiInterspaceApplyForService.java
New file @@ -0,0 +1,28 @@ 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.JinhuiInterspaceApplyForVO; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspaceApplyFor; public interface JinhuiInterspaceApplyForService extends IService<JinhuiInterspaceApplyFor> { /** * 分页查询 * @param * @return */ R getList(int pageNum,int pageSize,String intendantType,String state); JinhuiInterspaceApplyFor getDetails(String id); /** * 新增 * @param * @return */ R addData(JinhuiInterspaceApplyForVO item); R editData(JinhuiInterspaceApplyForVO item); R expurgateData(String id); } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActWorkGuideServiceImpl.java
@@ -133,7 +133,7 @@ BeanUtils.copyProperties(workGuideDTO, workGuideDO); workGuideDO.setUpdateBy(userId+""); workGuideDO.setUpdateAt(new Date()); this.baseMapper.updateById(workGuideDO); if (workGuideDTO.getMaterials().size() == 0) {// 若编辑材料为null,执行删除操作 workGuideMaterialDAO.delete(new LambdaQueryWrapper<JinhuiComActWorkGuideMaterial>() .eq(JinhuiComActWorkGuideMaterial::getWorkGuideId, workGuideDTO.getId())); @@ -168,6 +168,58 @@ } }); } // 统计该调查问卷填报题目数量 int count = 0; List<QuestnaiteSubVO> questnaiteSubVOS = JSON.parseArray(workGuideDO.getJsonObject(), QuestnaiteSubVO.class); if (!questnaiteSubVOS.isEmpty()) { count = questnaiteSubVOS.size(); } workGuideDO.setCount(count); workGuideDO.setJsonObject(workGuideDO.getJsonObject()); this.baseMapper.updateById(workGuideDO); // 删除原调查问卷题目以及选项，重新进行新增 baseMapper.deleteQuesSubAll(workGuideDO.getId()); baseMapper.deleteQuesSubAll2(workGuideDO.getId()); // 重新新增题目以及题目选项 if (!questnaiteSubVOS.isEmpty()) { questnaiteSubVOS.forEach(sub -> { JinhuiComActQuestnaireSub comActQuestnaireSubDO = new JinhuiComActQuestnaireSub(); comActQuestnaireSubDO.setType(sub.getType()+""); comActQuestnaireSubDO.setContent(sub.getLabel()); comActQuestnaireSubDO.setSort(sub.getSort()+""); comActQuestnaireSubDO.setKey(sub.getKey()); comActQuestnaireSubDO.setQueId(workGuideDO.getId()); comActQuestnaireSubDO.setCreateBy(userId); questnaireSubDao.insert(comActQuestnaireSubDO); ArrayList<JinhuiComActQuestnaireSubSelection> subSelectionList = Lists.newArrayList(); if (sub.getOptions() != null && !sub.getOptions().isEmpty()) { List<QuestnaiteSubSelectionVO> subOptions = sub.getOptions(); for (int i = 0; i < subOptions.size(); i++) { QuestnaiteSubSelectionVO subSelect = subOptions.get(i); JinhuiComActQuestnaireSubSelection subSelectionDO = new JinhuiComActQuestnaireSubSelection(); subSelectionDO.setQueSubId(comActQuestnaireSubDO.getId()+""); if (subSelect.getType().equals(1)) { // 添加选项名称 subSelectionDO.setOptionName(subSelect.getOptionName()); } else { subSelectionDO.setOptionName(String.valueOf(Character.toChars('A' + i))); } subSelectionDO.setKey(subSelect.getKey()); subSelectionDO.setContent(subSelect.getLabel()); subSelectionDO.setQueId(workGuideDO.getId()); subSelectionDO.setCreateBy(userId); subSelectionDO.setType(subSelect.getType()+""); subSelectionList.add(subSelectionDO); } } questnaireSubSelectionService.saveBatch(subSelectionList); }); } return R.ok(); }
New file @@ -0,0 +1,67 @@ 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.JinhuiInterspaceApplyForVO; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceVO; import com.panzhihua.service_jinhui_community.dao.JinhuiInterspaceApplyForDao; import com.panzhihua.service_jinhui_community.dao.JinhuiInterspaceDao; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspace; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspaceApplyFor; import com.panzhihua.service_jinhui_community.service.JinhuiInterspaceApplyForService; import com.panzhihua.service_jinhui_community.service.JinhuiInterspaceService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j @Service public class JinhuiInterspaceApplyForServiceImpl extends ServiceImpl<JinhuiInterspaceApplyForDao, JinhuiInterspaceApplyFor> implements JinhuiInterspaceApplyForService { @Override public R getList(int pageNum,int pageSize,String intendantType,String state) { Page page = new Page<JinhuiInterspaceApplyFor>(pageNum,pageSize); return R.ok(baseMapper.getList(page,intendantType,state)); } @Override public JinhuiInterspaceApplyFor getDetails(String id) { return baseMapper.getDetails(id); } @Override public R addData(JinhuiInterspaceApplyForVO item) { int num= baseMapper.addData(item); if(num>0) { return R.ok(); } return R.fail("添加失败"); } @Override public R editData(JinhuiInterspaceApplyForVO 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/JinhuiComActWorkGuideMapper.xml
@@ -84,4 +84,14 @@ </if> </select> <delete id="deleteQuesSubAll"> delete from jinhui_com_act_questnaire_sub where que_id = #{queId} </delete> <delete id="deleteQuesSubAll2"> delete from jinhui_com_act_questnaire_sub_selection where que_id = #{queId} </delete> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiInterspaceApplyForMapper.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.JinhuiInterspaceApplyForDao"> <resultMap type="com.panzhihua.service_jinhui_community.entity.JinhuiInterspaceApplyFor" id="itemMap"> <result property="id" column="id" /> <result property="interspaceId" column="interspace_id" /> <result property="interspaceTime" column="interspace_time" /> <result property="subscribeTimeFrame" column="subscribe_time_frame" /> <result property="userName" column="user_name" /> <result property="userPhone" column="user_phone" /> <result property="state" column="state" /> <result property="creationTime" column="creation_time" /> <result property="updateTime" column="update_time" /> </resultMap> <!-- 分页查询 --> <select id="getList" resultMap="itemMap"> select jiaf.id, jiaf.interspace_id, ji.title as interspaceName, jiaf.interspace_time, jiaf.subscribe_time_frame, jiaf.user_name, jiaf.user_phone, jiaf.state, jiaf.creation_time, jiaf.updateTime from jinhui_interspace_apply_for as jiaf LEFT JOIN jinhui_interspace as ji ON ji.id = jiaf.interspace_id <where> 1=1 <if test="state !=null and state !='' "> and jiaf.state=#{state} </if> <if test="intendantType !=null and intendantType !='' "> and ji.intendant_type=#{intendantType} </if> </where> order by creation_time desc </select> <select id="getDetails" resultMap="itemMap"> select jiaf.id, jiaf.interspace_id, ji.title as interspaceName, jiaf.interspace_time, jiaf.subscribe_time_frame, jiaf.user_name, jiaf.user_phone, jiaf.state, jiaf.creation_time, jiaf.updateTime from jinhui_interspace_apply_for as jiaf LEFT JOIN jinhui_interspace as ji ON ji.id = jiaf.interspace_id where id=#{id} </select> <insert id="addData"> insert into jinhui_interspace_apply_for <trim prefix="(" suffix=")" suffixOverrides=","> <if test="item.id != null and item.id != '' "> id, </if> <if test="item.interspaceId != null and item.interspaceId != '' "> interspace_id, </if> <if test="item.interspaceTime != null and item.interspaceTime != '' "> interspace_time, </if> <if test="item.subscribeTimeFrame != null and item.subscribeTimeFrame != '' "> subscribe_time_frame, </if> <if test="item.userName != null and item.userName != '' "> user_name, </if> <if test="item.userPhone != null and item.userPhone != '' "> user_phone, </if> <if test="item.state != null and item.state != '' "> `state`, </if> creation_time </trim> values <trim prefix="(" suffix=")" suffixOverrides=","> <if test="item.id != null and item.id != '' "> #{item.id}, </if> <if test="item.interspaceId != null and item.interspaceId != '' "> #{item.interspaceId}, </if> <if test="item.interspaceTime != null and item.interspaceTime != '' "> #{item.interspaceId}, </if> <if test="item.subscribeTimeFrame != null and item.subscribeTimeFrame != '' "> #{item.subscribeTimeFrame}, </if> <if test="item.userName != null and item.userName != '' "> #{item.userName}, </if> <if test="item.userPhone != null and item.userPhone != '' "> #{item.userPhone}, </if> <if test="item.state != null and item.state != '' "> #{item.state}, </if> sysdate() </trim> </insert> <update id="editData"> update jinhui_interspace_apply_for <set> <if test="item.id != null and item.id != '' "> id=#{item.id}, </if> <if test="item.interspaceId != null and item.interspaceId != '' "> interspace_id=#{item.interspaceId}, </if> <if test="item.interspaceTime != null and item.interspaceTime != '' "> interspace_time=#{item.interspaceId}, </if> <if test="item.subscribeTimeFrame != null and item.subscribeTimeFrame != '' "> subscribe_time_frame=#{item.subscribeTimeFrame}, </if> <if test="item.userName != null and item.userName != '' "> user_name=#{item.userName}, </if> <if test="item.userPhone != null and item.userPhone != '' "> user_phone=#{item.userPhone}, </if> <if test="item.state != null and item.state != '' "> `state`=#{item.state}, </if> update_time=sysdate() </set> where id = #{item.id} </update> <delete id="expurgateData" parameterType="String"> delete from jinhui_interspace_apply_for where id=#{id} </delete> </mapper>
