张天森
2022-11-03 19ab7a4d71420f55777716a8abbbbee548f33bd5
Merge branch 'huacheng_puda' into huacheng_test
2个文件已修改
9个文件已添加
691 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActProceedingsDTO.java 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 99 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActPorceedingsApi.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActProceedingsApi.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActProceedingsDao.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActProceedingsService.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActProceedingsDao.xml 170 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActProceedingsDTO.java
New file
@@ -0,0 +1,73 @@
package com.panzhihua.common.model.dtos.community;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class ComActProceedingsDTO implements Serializable {
    /**
     * 主键id
     */
    @ApiModelProperty("id")
    private Long id;
    /**
     * 姓名
     */
    @ApiModelProperty("姓名")
    private String name;
    /**
     * 所属单位名
     */
    @ApiModelProperty("所属单位名")
    private String unitName;
    /**
     * 所属单位id
     */
    @ApiModelProperty("所属单位id")
    private Long unitId;
    /**
     * 简介
     */
    @ApiModelProperty("简介")
    private String introduce;
    /**
     * 是否删除0否1是
     */
    @ApiModelProperty("是否删除")
    private Boolean delFlag;
    /**
     * 状态0可用1禁用
     */
    @ApiModelProperty("是否可用")
    private Boolean status;
    /**
     * 创建时间
     */
    private Date createTime;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 修改时间
     */
    private Date updateTime;
    /**
     * 修改人
     */
    private Date updateBy;
    private static final long serialVersionUID = 1L;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java
New file
@@ -0,0 +1,73 @@
package com.panzhihua.common.model.vos.community;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
public class ComActProceedingsVO implements Serializable {
    /**
     * 主键id
     */
    @ApiModelProperty("id")
    private Long id;
    /**
     * 姓名
     */
    @ApiModelProperty("姓名")
    private String name;
    /**
     * 所属单位名
     */
    @ApiModelProperty("所属单位名")
    private String unitName;
    /**
     * 所属单位id
     */
    @ApiModelProperty("所属单位id")
    private Long unitId;
    /**
     * 简介
     */
    @ApiModelProperty("简介")
    private String introduce;
    /**
     * 是否删除0否1是
     */
    @ApiModelProperty("是否删除")
    private Boolean delFlag;
    /**
     * 状态0可用1禁用
     */
    @ApiModelProperty("是否可用")
    private Boolean status;
    /**
     * 创建时间
     */
    private Date createTime;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 修改时间
     */
    private Date updateTime;
    /**
     * 修改人
     */
    private Date updateBy;
    private static final long serialVersionUID = 1L;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3,10 +3,7 @@
import java.util.List;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.acid.*;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
@@ -15,7 +12,6 @@
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.sanshuo.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
@@ -67,85 +63,6 @@
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordEditDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
import com.panzhihua.common.model.dtos.community.ComSwSafetyWorkEditDTO;
import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO;
import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
@@ -10564,4 +10481,18 @@
     */
    @GetMapping("selectAutomessageSysUserById")
    R selectAutomessageSysUserById(@RequestParam("id") Long id);
    /**
     * 分页查询议事委员会列表
     * */
    @GetMapping("/proceedings/list")
    R proceedingsList(@RequestParam(value = "page",required = false) Integer page,
                      @RequestParam(value = "size",required = false) Integer size,
                      @RequestParam(value = "keyWord",required = false) String keyWord);
    /**
     * 添加或修改议事委员会
     * */
    @PostMapping("/proceedings")
    R addOrUpdateProceedings(@RequestBody ComActProceedingsDTO comActProceedingsDTO);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActPorceedingsApi.java
New file
@@ -0,0 +1,35 @@
package com.panzhihua.community_backstage.api;
import com.panzhihua.common.model.dtos.community.ComActProceedingsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActProceedingsVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@RestController
@RequestMapping("/proceedings")
@Api(tags = "议事委员会")
public class ComActPorceedingsApi {
    @Resource
    private CommunityService communityService;
    @ApiOperation(value = "分页查询议事委员会列表",response = ComActProceedingsVO.class)
    public R list(@RequestParam(value = "page",required = false) Integer page,
                  @RequestParam(value = "size",required = false) Integer size,
                  @RequestParam(value = "keyWord",required = false) String keyWord){
        return communityService.proceedingsList(page, size, keyWord);
    }
    @ApiOperation("新增或修改议事委员会")
    public R addOrUpdate(@RequestBody ComActProceedingsDTO comActProceedingsDTO){
        return communityService.addOrUpdateProceedings(comActProceedingsDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActProceedingsApi.java
New file
@@ -0,0 +1,46 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.dtos.community.ComActProceedingsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActProceedingsService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/proceedings")
public class ComActProceedingsApi {
    @Resource
    private ComActProceedingsService comActProceedingsService;
    /**
     * description 分页查询议事委员会列表
     *
     * @param keyWord 搜索关键字
     * @param page 页数
     * @param size 每页大小
     * @return R  查询结果对象
     * @author zts
     * @date 2022-11-02
     */
    @GetMapping("/list")
    public R list(@RequestParam(value = "page",required = false) Integer page,
                  @RequestParam(value = "size",required = false) Integer size,
                  @RequestParam(value = "keyWord",required = false) String keyWord){
        return comActProceedingsService.pageProceedings(page,size,keyWord);
    }
    /**
     * 修改或新增议事委员会
     * @param comActProceedingsDTO 对象
     * @return R 处理结果
     * @author zts
     * @date 2022-11-02
     * */
    @PostMapping
    public R addOrUpdate(@RequestBody ComActProceedingsDTO comActProceedingsDTO){
        return comActProceedingsService.addOrUpdate(comActProceedingsDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActProceedingsDao.java
New file
@@ -0,0 +1,30 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.service_community.entity.ComActProceedings;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface ComActProceedingsDao extends BaseMapper<ComActProceedings> {
    int deleteByPrimaryKey(Long id);
    int insert(ComActProceedings record);
    int insertSelective(ComActProceedings record);
    ComActProceedings selectByPrimaryKey(Long id);
    int updateByPrimaryKeySelective(ComActProceedings record);
    int updateByPrimaryKey(ComActProceedings record);
    /**
     * 分页查询议事委员会
     * @param keyWord 搜索关键字
     * @return 处理结果
     * */
    List<ComActProceedings> pageProceedings(Page page, @Param("keyWord") String keyWord);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java
New file
@@ -0,0 +1,69 @@
package com.panzhihua.service_community.entity;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * com_act_proceedings
 * @author zts
 */
@Data
public class ComActProceedings implements Serializable {
    /**
     * 主键id
     */
    private Long id;
    /**
     * 姓名
     */
    private String name;
    /**
     * 所属单位名
     */
    private String unitName;
    /**
     * 所属单位id
     */
    private Long unitId;
    /**
     * 简介
     */
    private String introduce;
    /**
     * 是否删除0否1是
     */
    private Boolean delFlag;
    /**
     * 状态0可用1禁用
     */
    private Boolean status;
    /**
     * 创建时间
     */
    private Date createTime;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 修改时间
     */
    private Date updateTime;
    /**
     * 修改人
     */
    private Date updateBy;
    private static final long serialVersionUID = 1L;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActProceedingsService.java
New file
@@ -0,0 +1,24 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.ComActProceedingsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActAcidDangerMember;
import com.panzhihua.service_community.entity.ComActProceedings;
public interface ComActProceedingsService extends IService<ComActProceedings> {
    /**
     * 分页查询议事委员会
     * @param keyWord 搜索关键字
     * @return 处理结果
     * */
    R pageProceedings(Integer page, Integer size, String keyWord);
    /**
     * 新增或修改议事委员会
     * @param comActProceedingsDTO
     * @return 处理结果
     * */
    R addOrUpdate(ComActProceedingsDTO comActProceedingsDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java
New file
@@ -0,0 +1,65 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.ComActProceedingsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActProceedingsVO;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.dao.ComActProceedingsDao;
import com.panzhihua.service_community.entity.ComActProceedings;
import com.panzhihua.service_community.service.ComActProceedingsService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import static java.util.Objects.isNull;
@Service
public class ComActProceedingsServiceImpl extends ServiceImpl<ComActProceedingsDao, ComActProceedings> implements ComActProceedingsService {
    @Resource
    private ComActProceedingsDao comActProceedingsDao;
    /**
     * 分页查询议事委员会
     * @param keyWord 搜索关键字
     * @return 处理结果
     * */
    @Override
    public R pageProceedings(Integer page, Integer size, String keyWord) {
        return R.ok(CopyUtil.beanCopyList(comActProceedingsDao.pageProceedings(new Page(page,size),keyWord), ComActProceedingsVO.class));
    }
    /**
     * 新增或修改议事委员会
     * @param comActProceedingsDTO
     * @return 处理结果
     * */
    @Override
    public R addOrUpdate(ComActProceedingsDTO comActProceedingsDTO) {
        if(isNull(comActProceedingsDTO.getId())){
            //新增
            ComActProceedings comActProceedings=new ComActProceedings();
            comActProceedings.setId(Snowflake.getId());
            comActProceedings.setCreateTime(new Date());
            int i = comActProceedingsDao.insertSelective(comActProceedings);
            if (i>0){
                return R.ok();
            }
        }else{
            //修改
            ComActProceedings comActProceedings=new ComActProceedings();
            BeanUtils.copyProperties(comActProceedingsDTO, comActProceedings);
            comActProceedings.setUpdateTime(new Date());
            int i = comActProceedingsDao.updateById(comActProceedings);
            if (i>0){
                return R.ok();
            }
        }
        return R.fail("操作失败");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -107,6 +107,10 @@
                    e.printStackTrace();
                }
                //生成后台账号
                //如果是普达社区专家则不生成后台账号
                if (nonNull(expert.getCommunityId()) && !expert.getCommunityId().equals(10172)){
                   return R.ok();
                }
                AdministratorsUserVO user=new AdministratorsUserVO();
                user.setUserId(Snowflake.getId());
                user.setAccount(comSanshuoExpertDTO.getAccount());
@@ -115,7 +119,8 @@
                user.setType(11);
                user.setImageUrl(comSanshuoExpertDTO.getAvatar());
                user.setPhone(comSanshuoExpertDTO.getPhone());
                return R.ok(userService.sanShuoAddUser(user));
                userService.sanShuoAddUser(user);
                return R.ok();
            }
        }else {
            ComSanshuoExpert expert=new ComSanshuoExpert();
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActProceedingsDao.xml
New file
@@ -0,0 +1,170 @@
<?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.ComActProceedingsDao">
  <resultMap id="BaseResultMap" type="com.panzhihua.service_community.entity.ComActProceedings">
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="name" jdbcType="VARCHAR" property="name" />
    <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
    <result column="unit_id" jdbcType="BIGINT" property="unitId" />
    <result column="introduce" jdbcType="VARCHAR" property="introduce" />
    <result column="del_flag" jdbcType="BIT" property="delFlag" />
    <result column="status" jdbcType="BIT" property="status" />
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
    <result column="update_by" jdbcType="TIMESTAMP" property="updateBy" />
  </resultMap>
  <sql id="Base_Column_List">
    id, `name`, unit_name, unit_id, introduce, del_flag, `status`, create_time, create_by,
    update_time, update_by
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
    select
    <include refid="Base_Column_List" />
    from com_act_proceedings
    where id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    delete from com_act_proceedings
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.panzhihua.service_community.entity.ComActProceedings" useGeneratedKeys="true">
    insert into com_act_proceedings (id,`name`, unit_name, unit_id,
      introduce, del_flag, `status`,
      create_time, create_by, update_time,
      update_by)
    values (#{name,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT},
      #{introduce,jdbcType=VARCHAR}, #{delFlag,jdbcType=BIT}, #{status,jdbcType=BIT},
      #{createTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
      #{updateBy,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.panzhihua.service_community.entity.ComActProceedings" useGeneratedKeys="true">
    insert into com_act_proceedings
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
        `id`,
      </if>
      <if test="name != null">
        `name`,
      </if>
      <if test="unitName != null">
        unit_name,
      </if>
      <if test="unitId != null">
        unit_id,
      </if>
      <if test="introduce != null">
        introduce,
      </if>
      <if test="delFlag != null">
        del_flag,
      </if>
      <if test="status != null">
        `status`,
      </if>
      <if test="createTime != null">
        create_time,
      </if>
      <if test="createBy != null">
        create_by,
      </if>
      <if test="updateTime != null">
        update_time,
      </if>
      <if test="updateBy != null">
        update_by,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="name != null">
        #{name,jdbcType=VARCHAR},
      </if>
      <if test="unitName != null">
        #{unitName,jdbcType=VARCHAR},
      </if>
      <if test="unitId != null">
        #{unitId,jdbcType=BIGINT},
      </if>
      <if test="introduce != null">
        #{introduce,jdbcType=VARCHAR},
      </if>
      <if test="delFlag != null">
        #{delFlag,jdbcType=BIT},
      </if>
      <if test="status != null">
        #{status,jdbcType=BIT},
      </if>
      <if test="createTime != null">
        #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="createBy != null">
        #{createBy,jdbcType=VARCHAR},
      </if>
      <if test="updateTime != null">
        #{updateTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateBy != null">
        #{updateBy,jdbcType=TIMESTAMP},
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.panzhihua.service_community.entity.ComActProceedings">
    update com_act_proceedings
    <set>
      <if test="name != null">
        `name` = #{name,jdbcType=VARCHAR},
      </if>
      <if test="unitName != null">
        unit_name = #{unitName,jdbcType=VARCHAR},
      </if>
      <if test="unitId != null">
        unit_id = #{unitId,jdbcType=BIGINT},
      </if>
      <if test="introduce != null">
        introduce = #{introduce,jdbcType=VARCHAR},
      </if>
      <if test="delFlag != null">
        del_flag = #{delFlag,jdbcType=BIT},
      </if>
      <if test="status != null">
        `status` = #{status,jdbcType=BIT},
      </if>
      <if test="createTime != null">
        create_time = #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="createBy != null">
        create_by = #{createBy,jdbcType=VARCHAR},
      </if>
      <if test="updateTime != null">
        update_time = #{updateTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateBy != null">
        update_by = #{updateBy,jdbcType=TIMESTAMP},
      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.panzhihua.service_community.entity.ComActProceedings">
    update com_act_proceedings
    set `name` = #{name,jdbcType=VARCHAR},
      unit_name = #{unitName,jdbcType=VARCHAR},
      unit_id = #{unitId,jdbcType=BIGINT},
      introduce = #{introduce,jdbcType=VARCHAR},
      del_flag = #{delFlag,jdbcType=BIT},
      `status` = #{status,jdbcType=BIT},
      create_time = #{createTime,jdbcType=TIMESTAMP},
      create_by = #{createBy,jdbcType=VARCHAR},
      update_time = #{updateTime,jdbcType=TIMESTAMP},
      update_by = #{updateBy,jdbcType=TIMESTAMP}
    where id = #{id,jdbcType=BIGINT}
  </update>
  <select id="pageProceedings" resultType="com.panzhihua.service_community.entity.ComActProceedings">
    select * from com_act_proceedings where del_flag=0
    <if test="keyWord != null and keyWord != ''">
      AND name like concat("%",#{keyWord},"%")
    </if>
  </select>
</mapper>