tangxiaobao
2021-09-03 dbe455642a20055f5873a4ee8d757ed86431e457
办事指南改版
6个文件已添加
4个文件已修改
357 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideClassifyVO.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideClassifyDAO.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideDAO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideClassifyDO.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideDO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActWorkGuideClassifyService.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java 128 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideClassifyMapper.xml 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java
@@ -34,6 +34,9 @@
    @Length(groups = {AddGroup.class}, max = 5000)
    private String content;
    @ApiModelProperty("所属分类")
    private Integer classify;
    @ApiModelProperty("办理时间")
    private String timeAt;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideClassifyVO.java
New file
@@ -0,0 +1,42 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * title: ComActWorkGuideClassifyVO  社区》办事指南》分类管理展示类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》办事指南》分类管理展示类
 *
 * @author txb
 * @date 2021/8/31 14:21
 */
@Data
@ApiModel("办事指南-分类管理")
public class ComActWorkGuideClassifyVO {
    @ApiModelProperty("自增id")
    private Long id;
    @ApiModelProperty("分类名称")
    private String classifyName;
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
    @ApiModelProperty("系统预置:1-是 0-否")
    private Integer sysFlag;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
@@ -33,6 +33,9 @@
    @Length(groups = {AddGroup.class}, max = 5000)
    private String content;
    @ApiModelProperty("所属分类")
    private Integer classify;
    @ApiModelProperty("办理时间")
    private String timeAt;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideClassifyDAO.java
New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_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.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.service_community.model.dos.ComActWorkGuideClassifyDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
 * title: ComActWorkGuideClassifyDAO  社区》办事指南》分类管理mapper类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》办事指南》分类管理mapper类
 *
 * @author txb
 * @date 2021/8/31 14:21
 */
@Mapper
public interface ComActWorkGuideClassifyDAO extends BaseMapper<ComActWorkGuideClassifyDO> {
    IPage<ComActWorkGuideClassifyVO> pageWorkGuideClassify(Page page,
                                                           @Param("comActWorkGuideClassifyVO") ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideDAO.java
@@ -16,10 +16,12 @@
 **/
@Mapper
public interface ComActWorkGuideDAO extends BaseMapper<ComActWorkGuideDO> {
    @Select("<script> " + "select id ,title,content,time_at,address,phone,create_at from com_act_work_guide "
    @Select("<script> " + "select id ,title,content,classify,time_at,address,phone,create_at from com_act_work_guide "
        + " <where>"
        + "<if test='pageActWorkGuideDTO.classify != null'>"
        + "and classify = #{pageActWorkGuideDTO.classify} " + " </if> "
        + "<if test='pageActWorkGuideDTO.title != null and pageActWorkGuideDTO.title.trim() != &quot;&quot;'>"
        + "title like concat('%',#{pageActWorkGuideDTO.title},'%')" + " </if> " + " </where>" + "order by update_at asc"
        + "and title like concat('%',#{pageActWorkGuideDTO.title},'%')" + " </if> " + " </where>" + "order by update_at asc"
        + "</script>")
    IPage<ComActWorkGuideVO> pageWorkGuide(Page page,
        @Param("pageActWorkGuideDTO") PageActWorkGuideDTO pageActWorkGuideDTO);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideClassifyDO.java
New file
@@ -0,0 +1,55 @@
package com.panzhihua.service_community.model.dos;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * title: ComActWorkGuideClassifyDO  社区》办事指南》分类管理实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》办事指南》分类管理实体类
 *
 * @author txb
 * @date 2021/8/31 14:21
 */
@Data
@TableName("com_act_work_guide_classify")
public class ComActWorkGuideClassifyDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
    * 自增id
    */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
    * 分类名称
    */
    private String classifyName;
    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
    * 系统预置:1-是 0-否
    */
    private Integer sysFlag;
@Override
public String toString() {
        return "ComActWorkGuideClassifyDO{" +
                "id=" + id +
                ", classifyName=" + classifyName +
                ", createAt=" + createAt +
                ", sysFlag=" + sysFlag +
        "}";
        }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideDO.java
@@ -28,6 +28,10 @@
     */
    private String content;
    /**
     * 办事指南分类
     */
    private Integer classify;
    /**
     * 办理时间
     */
    private String timeAt;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActWorkGuideClassifyService.java
New file
@@ -0,0 +1,57 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.service_community.model.dos.ComActWorkGuideClassifyDO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
 * title: ComActWorkGuideClassifyService  社区》办事指南》分类管理服务类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》办事指南》分类管理服务类
 *
 * @author txb
 * @date 2021/8/31 14:21
 */
public interface ComActWorkGuideClassifyService extends IService<ComActWorkGuideClassifyDO> {
    /**
     * 分页查询办事执念-分类管理 addWorkGuideClassify  分页查询办事执念-分类管理
     * @param    comActWorkGuideClassifyVO   查询参数
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    R pageWorkGuideClassify(ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);
    /**
     * 办事执念-分类管理新增或修改  addWorkGuideClassify  办事执念-分类管理新增或修改
     * @param    comActWorkGuideClassifyVO   新增或修改参数
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    R addWorkGuideClassify(ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);
    /**
     * 办事执念-分类管理删除  addWorkGuideClassify  办事执念-分类管理删除
     * @param    workGuideClassifyId    办事执念-分类管理id
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    R deleteWorkGuideClassify(Long workGuideClassifyId);
    /**
     * 办事指南-分类管理列表查询  getWorkGuideClassifyList  办事指南-分类管理列表查询
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    R getWorkGuideClassifyList();
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java
New file
@@ -0,0 +1,128 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.enums.PopulCultureLevelEnum;
import com.panzhihua.common.enums.PopulMarriageEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.enums.PopulRelationEnum;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActWorkGuideClassifyDAO;
import com.panzhihua.service_community.model.dos.ComActWorkGuideClassifyDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
import com.panzhihua.service_community.model.dos.ComMngUserTagDO;
import com.panzhihua.service_community.service.ComActWorkGuideClassifyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
 * title: ComActWorkGuideClassifyServiceImpl  社区》办事指南》分类管理服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》办事指南》分类管理服务实现类
 *
 * @author txb
 * @date 2021/8/31 14:21
 */
@Slf4j
@Service
public class ComActWorkGuideClassifyServiceImpl extends ServiceImpl<ComActWorkGuideClassifyDAO, ComActWorkGuideClassifyDO> implements ComActWorkGuideClassifyService {
    @Resource
    private ComActWorkGuideClassifyDAO comActWorkGuideClassifyDAO;
    @Override
    public R pageWorkGuideClassify(ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
        Page page = new Page<>();
        Long pageNum = comActWorkGuideClassifyVO.getPageNum();
        Long pageSize = comActWorkGuideClassifyVO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1L;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10L;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActWorkGuideClassifyVO> iPage = comActWorkGuideClassifyDAO.pageWorkGuideClassify(page, comActWorkGuideClassifyVO);
        return R.ok(iPage);
    }
    @Override
    public R addWorkGuideClassify(ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
        if (null != comActWorkGuideClassifyVO.getId() && comActWorkGuideClassifyVO.getId() != 0) {
            // 修改
            ComActWorkGuideClassifyDO comActWorkGuideClassifyDO = comActWorkGuideClassifyDAO.selectById(comActWorkGuideClassifyVO.getId());
            if (null == comActWorkGuideClassifyDO) {
                return R.fail("该办事指南分类不存在");
            }
            ComActWorkGuideClassifyDO checkCreditCode = comActWorkGuideClassifyDAO.selectOne(
                    new QueryWrapper<ComActWorkGuideClassifyDO>().lambda().eq(ComActWorkGuideClassifyDO::getClassifyName, comActWorkGuideClassifyVO.getClassifyName()));
            if (null != checkCreditCode && !comActWorkGuideClassifyDO.getId().equals(checkCreditCode.getId())) {
                return R.fail("该办事指南分类已存在,办事指南分类名称重复");
            }
            BeanUtils.copyProperties(comActWorkGuideClassifyVO, comActWorkGuideClassifyDO);
            int update = comActWorkGuideClassifyDAO.updateById(comActWorkGuideClassifyDO);
            if (update > 0) {
                return R.ok();
            }
        } else {
            // 新增
            Integer count = comActWorkGuideClassifyDAO.selectCount(
                    new QueryWrapper<ComActWorkGuideClassifyDO>().lambda().eq(ComActWorkGuideClassifyDO::getClassifyName, comActWorkGuideClassifyVO.getClassifyName()));
            if (count > 0) {
                return R.fail("该办事指南分类已存在,办事指南分类名称重复");
            }
            ComActWorkGuideClassifyDO comActWorkGuideClassifyDO = new ComActWorkGuideClassifyDO();
            BeanUtils.copyProperties(comActWorkGuideClassifyVO, comActWorkGuideClassifyDO);
            int insert = comActWorkGuideClassifyDAO.insert(comActWorkGuideClassifyDO);
            if (insert > 0) {
                return R.ok();
            }
        }
        return R.fail("添加失败");
    }
    @Override
    public R deleteWorkGuideClassify(Long workGuideClassifyId) {
        // 查询特殊群体人员
        ComActWorkGuideClassifyDO comActWorkGuideClassifyDO = comActWorkGuideClassifyDAO.selectById(workGuideClassifyId);
        if (comActWorkGuideClassifyDO == null) {
            return R.fail("办事指南分类不存在");
        }
        int delete = comActWorkGuideClassifyDAO.deleteById(workGuideClassifyId);
        if (delete > 0) {
            return R.ok();
        }
        return R.fail("删除失败");
    }
    @Override
    public R getWorkGuideClassifyList() {
        List<ComActWorkGuideClassifyDO> comActWorkGuideClassifyDOS = comActWorkGuideClassifyDAO.selectList(null);
        List<ComActWorkGuideClassifyVO> comActWorkGuideClassifyVOList = new ArrayList<>();
        if (comActWorkGuideClassifyDOS != null && comActWorkGuideClassifyDOS.size() > 0) {
            comActWorkGuideClassifyDOS.forEach(comActWorkGuideClassifyDO -> {
                ComActWorkGuideClassifyVO comActWorkGuideClassifyVO = new ComActWorkGuideClassifyVO();
                BeanUtils.copyProperties(comActWorkGuideClassifyDO, comActWorkGuideClassifyVO);
                comActWorkGuideClassifyVOList.add(comActWorkGuideClassifyVO);
            });
        }
        return R.ok(comActWorkGuideClassifyVOList);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideClassifyMapper.xml
New file
@@ -0,0 +1,33 @@
<?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_community.dao.ComActWorkGuideClassifyDAO">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActWorkGuideClassifyDO">
                <id column="id" property="id" />
                <result column="classify_name" property="classifyName" />
                <result column="create_at" property="createAt" />
                <result column="sys_flag" property="sysFlag" />
    </resultMap>
    <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, classify_name, create_at, sys_flag
    </sql>
    <select id="pageWorkGuideClassify" resultType="com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO">
        select
        id,
        classify_name,
        create_at,
        sys_flag
        from com_act_work_guide_classify
        <where>
            <if test="comActWorkGuideClassifyVO.classifyName != null and comActWorkGuideClassifyVO.classifyName !=''">
                AND classify_name like concat ('%', #{comActWorkGuideClassifyVO.classifyName}, '%')
            </if>
        </where>
        order by create_at desc
    </select>
</mapper>