springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -202,11 +202,11 @@ @ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class) @PostMapping("listpartyorganization") public R listPartyOrganization(@RequestBody ComListPartyDTO comListPartyDTO) { Long communityId = this.getCommunityId(); log.info("社区所有党组织社区id【{}】", communityId); if(communityId != null){ comListPartyDTO.setCommunityId(communityId); } // Long communityId = this.getCommunityId(); // log.info("社区所有党组织社区id【{}】", communityId); // if(communityId != null){ // comListPartyDTO.setCommunityId(communityId); // } return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO); } springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.applets.api; import com.alibaba.fastjson.JSONObject; import com.panzhihua.applets.config.WxMaProperties; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.shop.*; @@ -39,6 +40,14 @@ @ApiOperation(value = "分页查询店铺" , response = PageShopStoreVO.class) @PostMapping("pageshopstore") public R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO) { PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO(); R conf = communityService.pageShopSysConf(pageComShopSysConfDTO); if(R.isOk(conf)&& conf.getData()!=null){ ComShopSysConfVO comShopSysConfVO = JSONObject.parseObject(JSONObject.toJSONString(conf.getData()), ComShopSysConfVO.class); if("1".equals(comShopSysConfVO.getVal()) && "1".equals(comShopSysConfVO.getEnabled())){ return R.ok(); } } return communityService.pageShopStore(comShopStoreDTO); } @@ -81,6 +90,14 @@ if(userId == null){ return R.fail("请重新登陆"); } PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO(); R conf = communityService.pageShopSysConf(pageComShopSysConfDTO); if(R.isOk(conf)&& conf.getData()!=null){ ComShopSysConfVO comShopSysConfVO = JSONObject.parseObject(JSONObject.toJSONString(conf.getData()), ComShopSysConfVO.class); if("1".equals(comShopSysConfVO.getVal()) && "1".equals(comShopSysConfVO.getEnabled())){ return R.ok(0); } } return communityService.shopCartUserTotal(userId); } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
@@ -350,11 +350,27 @@ } @ApiOperation(value = "配送完成") @PutMapping("/order/finishDeliver") public R finishDeliver(@RequestBody ComShopOrderDeliverDTO deliverDTO){ deliverDTO.setOperUserAccount(getLoginUserInfo().getPhone()); deliverDTO.setIsAdmin(true); return communityService.finishDeliverOrder(deliverDTO); @ApiOperation(value = "商家配置修改") @PutMapping("/shop/conf") public R editConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO){ return communityService.editShopSysConf(comShopSysConfDTO); } @ApiOperation(value = "商家配置查询", response = ComShopHiddenConfVO.class) @GetMapping("/shop/conf") public R getConf(){ PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO(); R r = communityService.pageShopSysConf(pageComShopSysConfDTO); if(R.isOk(r) && r.getData()!=null){ ComShopSysConfVO comShopSysConfVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComShopSysConfVO.class); if(comShopSysConfVO!=null){ ComShopHiddenConfVO comShopHiddenConfVO = new ComShopHiddenConfVO(); comShopHiddenConfVO.setId(comShopSysConfVO.getId()); comShopHiddenConfVO.setHidden(comShopSysConfVO.getVal()); return R.ok(comShopHiddenConfVO); } } return r; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java
@@ -124,7 +124,7 @@ vo.setUnitNo(Integer.valueOf(oneData.get(9))); } if(oneData.get(10) != null){ vo.setHouseNo(Integer.valueOf(oneData.get(10))); vo.setHouseNo(Integer.valueOf(oneData.get(10).trim())); } if(oneData.get(11) != null){ vo.setPhone(oneData.get(11)); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -157,7 +157,7 @@ vo.setUnitNo(Integer.valueOf(oneData.get(9))); } if(oneData.get(10) != null){ vo.setHouseNo(Integer.valueOf(oneData.get(10))); vo.setHouseNo(Integer.valueOf(oneData.get(10).trim())); } if(oneData.get(11) != null){ vo.setPhone(oneData.get(11)); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopSysConfDTO.java
New file @@ -0,0 +1,21 @@ package com.panzhihua.common.model.dtos.shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @ClasssName ComShopSysConfDTO * @Description 商家配置信息 * @Author cedoo * @Date 2021/05/11 * @Version 1.0 **/ @Data @ApiModel("商家系统配置") public class ComShopSysConfDTO { @ApiModelProperty(value = "id", required = true) private Long id; @ApiModelProperty(value = "是否隐藏所有商家 0 否 1是", required = true) private Integer hidden; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopSysConfDTO.java
New file @@ -0,0 +1,19 @@ package com.panzhihua.common.model.dtos.shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @auther llming * @describe 分页查询商品 */ @ApiModel("分页查询商品") @Data public class PageComShopSysConfDTO { @ApiModelProperty(value = "分页-当前页数", example = "1", required = false) private Long pageNum = 1l; @ApiModelProperty(value = "分页-每页记录数", example = "10", required = false) private Long pageSize = 10l; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
@@ -20,7 +20,7 @@ private String name; @ApiModelProperty(value = "身份证") private String idCard; @JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty(value = "入党时间") private Date joinTime; @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopHiddenConfVO.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.common.model.vos.shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("订单创建返回参数") public class ComShopHiddenConfVO { @ApiModelProperty(value = "id") private Long id; @ApiModelProperty(value = "是否隐藏所有商家 0 否 1是") private String hidden; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopSysConfVO.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.common.model.vos.shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.Date; @Data @ApiModel("订单创建返回参数") public class ComShopSysConfVO { @ApiModelProperty(value = "id") private Long id; @ApiModelProperty(value = "配置名称") private String name; @ApiModelProperty(value = "配置备注") private String note; @ApiModelProperty(value = "配置值") private String val; @ApiModelProperty(value = "是否生效(0 否 1 是)") private String enabled; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
@@ -79,4 +79,7 @@ @ApiModelProperty(value = "商铺Id") private String shopStorePhone; @ApiModelProperty(value = "用户昵称") private String nickName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java
@@ -22,4 +22,7 @@ @ApiModelProperty("户口本照片 逗号隔开") private String familyBook; @ApiModelProperty("职业") private String job; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; /** @@ -2427,4 +2428,28 @@ @PostMapping("/neighbor/neighborCommentReplyByApp") R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO); /** * 实有房屋_编辑 * @param villageId 实有房屋id * @param comMngVillageVO 请求参数 * @return */ @PostMapping("/editvillage/{villageId}") R editvillage(@PathVariable("villageId") Long villageId,@RequestBody ComMngVillageVO comMngVillageVO); /** * 商城系统配置 * @param comShopSysConfDTO * @return */ @PostMapping("/shop/conf/edit") R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO); /** * 商城系统配置查询 * @param pageComShopSysConfDTO * @return */ @PostMapping("/shop/conf/get") R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VillageApi.java
@@ -98,4 +98,14 @@ return R.ok(); } @ApiOperation(value = "编辑实有房屋", response = ComMngVillageVO.class) @PostMapping("editvillage/{villageId}") public R editvillage(@PathVariable("villageId")Long villageId,@Valid @RequestBody ComMngVillageVO comMngVillageVO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); comMngVillageVO.setCommunityId(communityId); return communityService.editvillage(villageId,comMngVillageVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
@@ -2,7 +2,6 @@ import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngCarExcelVO; import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO; import com.panzhihua.common.model.vos.community.ComMngVillageVO; import com.panzhihua.service_community.service.ComMngVillageService; @@ -71,6 +70,7 @@ return R.ok(r); } /** * 社区后台导入实有房屋 * @param list 数据 @@ -83,4 +83,15 @@ return comMngVillageService.listSaveVillage(list,communityId); } /** * 编辑实有房屋 * @param villageId 动态id * @return 删除结果 */ @PostMapping("editvillage/{villageId}") @Transactional(rollbackFor = Exception.class) public R editvillage(@PathVariable("villageId")Long villageId,@Valid @RequestBody ComMngVillageVO comMngVillageVO) { return comMngVillageService.editVillage(villageId,comMngVillageVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -182,6 +182,7 @@ * @param vo 请求参数 */ @PostMapping("changeCommentStatusByAdmin") @Transactional(rollbackFor = Exception.class) public R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo) { return comActNeighborCircleService.changeCommentStatusByAdmin(vo); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -1,5 +1,7 @@ package com.panzhihua.service_community.api; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.*; import com.panzhihua.common.controller.BaseController; @@ -7,15 +9,15 @@ import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.common.model.vos.shop.*; import com.panzhihua.service_community.model.dos.ComShopSysConfDO; import com.panzhihua.service_community.service.*; import com.panzhihua.common.model.vos.shop.ShopOperLogVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.service_community.service.ComShopGoodsService; import com.panzhihua.service_community.service.ComShopOperLogService; import com.panzhihua.service_community.service.ComShopOrderService; import com.panzhihua.service_community.service.ComShopStoreService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -41,6 +43,8 @@ private ComShopCartService comShopCartService; @Resource private ComShopUserAddressService comShopUserAddressService; @Resource private ComShopSysConfService comShopSysConfService; /** * 店铺列表-分页查询 @@ -515,4 +519,51 @@ public R wxPay(@RequestBody OrderPayDTO orderPayDTO){ return comShopOrderService.wxPay(orderPayDTO); } /** * 商城系统配置 * @param comShopSysConfDTO * @return */ @PostMapping("/conf/edit") R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO){ ComShopSysConfDO comShopSysConfDO = comShopSysConfService.getBaseMapper().selectById(comShopSysConfDTO.getId()); switch (comShopSysConfDTO.getHidden()){ case 0: comShopSysConfDO.setVal("0"); comShopSysConfDO.setEnabled("1"); break; case 1: comShopSysConfDO.setVal("1"); comShopSysConfDO.setEnabled("1"); break; default: break; } int updated = comShopSysConfService.getBaseMapper().updateById(comShopSysConfDO); if(updated==1){ return R.ok(); } return R.fail(); } /** * 商城系统配置查询 * @param pageComShopSysConfDTO * @return */ @PostMapping("/conf/get") R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO){ List<ComShopSysConfDO> confList = comShopSysConfService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopSysConfDO>() .eq(ComShopSysConfDO::getName, "SHOP_HIDDEN") .orderByDesc(ComShopSysConfDO::getCreate_at)); ComShopSysConfVO comShopSysConfVO = new ComShopSysConfVO(); if(confList!=null && confList.size()>0){ ComShopSysConfDO firstConf = confList.get(0); BeanUtils.copyProperties(firstConf, comShopSysConfVO); return R.ok(comShopSysConfVO); } return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -106,7 +106,7 @@ " from com_act_neighbor_circle_comment_reply as reply" + " left join sys_user as su on su.user_id = reply.user_id" + " left join sys_user as su1 on su1.user_id = reply.parent_user_id" + " where reply.comment_id = #{commentId}") " where reply.comment_id = #{commentId} and reply.status = 1") IPage<ComActNeighborCommentReplyAppVO> neighborCommentReplyByApp(Page page, @Param("commentId") Long commentId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java
@@ -50,7 +50,7 @@ " and t.name LIKE concat( #{pageComMngRealAssetsDTO.name}, '%' ) " + " </if> " + "<if test='pageComMngRealAssetsDTO.communityId != null and pageComMngRealAssetsDTO.communityId != 0'>" + " and t.community_id = #{pageComMngRealCompanyDTO.communityId} " + " and t.community_id = #{pageComMngRealAssetsDTO.communityId} " + " </if> " + " order by t.create_at desc"+ "</script>") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopSysConfDAO.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComShopCartDO; import com.panzhihua.service_community.model.dos.ComShopSysConfDO; import org.apache.ibatis.annotations.Mapper; /** * @auther lyq * @create 2021-04-14 15:02:14 * @describe 购物车表mapper类 */ @Mapper public interface ComShopSysConfDAO extends BaseMapper<ComShopSysConfDO> { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopSysConfDO.java
New file @@ -0,0 +1,60 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; /** * @auther lyq * @create 2021-04-14 15:03:01 * @describe 订单表实体类 */ @Data @TableName("com_shop_sys_conf") public class ComShopSysConfDO implements Serializable { private static final long serialVersionUID = 1L; /** * 订单id */ @TableId(type = IdType.AUTO) private Long id; /** * 配置名称 */ private String name; /** * 配置备注 */ private String note; /** * 配置值 */ private String val; /** * 是否生效(0 否 1 是) */ private String enabled; /** * 创建人 */ private String create_by; /** * 创建时间 */ private Date create_at; /** * 修改时间 */ private Date update_at; /** * 修改人 */ private String update_by; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
@@ -107,7 +107,7 @@ R detailNeighborCommentReply(Long id); /** * 评论的状态_修改 * 评论的回复状态_修改 * @param changeStatusReplyVO * @return */ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
@@ -47,4 +47,12 @@ * @return */ R listSaveVillage(List<ComMngVillageServeExcelVO> list, Long communityId); /** * 实有房屋编辑 * @param villageId * @param comMngVillageVO * @return */ R editVillage(Long villageId, ComMngVillageVO comMngVillageVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopSysConfService.java
New file @@ -0,0 +1,14 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.service_community.model.dos.ComShopOrderPayDO; import com.panzhihua.service_community.model.dos.ComShopSysConfDO; /** * @author cedoo * @create 2021-5-11 10:47:50 * @describe */ public interface ComShopSysConfService extends IService<ComShopSysConfDO> { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -591,7 +591,8 @@ AdministratorsUserVO user = this.baseMapper.selectUserByUserId(commentDO.getUserId()); ComActNeighborCommentByAdminVO vo = new ComActNeighborCommentByAdminVO(); BeanUtils.copyProperties(commentDO,vo); vo.setUserName(user.getName()); String name = user.getName()==null?user.getNickName():user.getName(); vo.setUserName(name); return R.ok(vo); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -416,36 +416,44 @@ if(populationDO==null){ return R.fail(); } String cardNo = populationDO.getCardNo(); BeanUtils.copyProperties(vo,populationDO); try { //TODO 修改拦截器时候需要维护加密操作 populationDO.setCardNo(AESUtil.encrypt128(populationDO.getCardNo(), aesKey)); populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey)); } catch (NoSuchPaddingException e) { if(!cardNo.equals(vo.getCardNo())){//判断是否修改身份证号码 //判断要修改的身份证号码是否已存在 ComMngPopulationDO cardNoDO = populationDAO.selectOne(new QueryWrapper<ComMngPopulationDO>() .lambda().eq(ComMngPopulationDO::getCardNo,vo.getCardNo())); if(cardNoDO != null){ return R.fail("您输入的身份证已存在,请重新输入"); } populationDO.setCardNo(AESUtil.encrypt128(vo.getCardNo(), aesKey)); }else{ populationDO.setCardNo(AESUtil.encrypt128(cardNo, aesKey)); } populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey)); } catch (Exception e) { e.printStackTrace(); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); } catch (InvalidKeyException e) { e.printStackTrace(); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } catch (BadPaddingException e) { e.printStackTrace(); } catch (IllegalBlockSizeException e) { e.printStackTrace(); return R.fail(); } ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getRoad()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId)); if (comMngVillageDO == null) { throw new ServiceException("街道巷:" + vo.getRoad() + "不存在!"); return R.fail("街道巷:" + vo.getRoad() + vo.getDoorNo() + "不存在!"); // throw new ServiceException("街道巷:" + vo.getRoad() + "不存在!"); } populationDO.setVillageId(comMngVillageDO.getVillageId()); populationDO.setActId(comActDO.getCommunityId()); populationDO.setStreetId(comActDO.getStreetId()); populationDO.setVillageName(comMngVillageDO.getGroupAt()); this.updateById(populationDO); return R.ok(); if(!StringUtils.isEmpty(comMngVillageDO.getGroupAt())){ populationDO.setVillageName(comMngVillageDO.getGroupAt()); } // this.updateById(populationDO); if(populationDAO.updateById(populationDO) > 0){ return R.ok(); }else{ return R.fail("修改失败"); } } @Override springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -14,9 +14,7 @@ import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComActVillageDAO; import com.panzhihua.service_community.dao.ComMngPopulationDAO; import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO; import com.panzhihua.service_community.model.dos.ComActDO; import com.panzhihua.service_community.model.dos.ComActDiscussDO; import com.panzhihua.service_community.model.dos.ComMngPopulationDO; import com.panzhihua.service_community.model.dos.ComMngVillageDO; import com.panzhihua.service_community.service.ComMngVillageService; @@ -25,10 +23,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; /** * @author: llming @@ -160,4 +155,24 @@ this.saveBatch(comMngVillageDOS); return R.ok("共计导入实有房屋数量:" + comMngVillageDOS.size()); } @Override public R editVillage(Long villageId, ComMngVillageVO comMngVillageVO) { ComMngVillageDO comMngVillageDO = this.baseMapper.selectById(villageId); if (comMngVillageDO == null) { return R.fail("id有误!"); } BeanUtils.copyProperties(comMngVillageVO, comMngVillageDO); ComActDO comActDO = comActDAO.selectById(comMngVillageDO.getCommunityId()); if (comActDO == null || comActDO.getStreetId() == null) { return R.fail("社区没有绑定街道,请绑定后操作!"); } comMngVillageDO.setStreetId(comActDO.getStreetId()); int update = this.baseMapper.update(comMngVillageDO, new LambdaQueryWrapper<ComMngVillageDO>() .eq(ComMngVillageDO::getVillageId, villageId)); if(update>0){ return R.ok(comMngVillageVO); } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopSysConfServiceImpl.java
New file @@ -0,0 +1,19 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComShopSysConfService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** * @auther cedoo * @create 2021-5-11 12:20:37 * @describe 商品系统配置 */ @Slf4j @Service public class ComShopSysConfServiceImpl extends ServiceImpl<ComShopSysConfDAO, ComShopSysConfDO> implements ComShopSysConfService { } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -163,7 +163,7 @@ " left join com_act as ca on ca.community_id = cpm.community_id " + " left join com_pb_org as cpo on cpo.id = cpm.org_id " + " LEFT JOIN sys_user u ON cpm.id_card = u.id_card " + " where cpm.community_id = #{organizationVO.communityId} " + " where cpm.community_id = #{organizationVO.communityId} and cpm.audit_result = 1 " + "<if test='organizationVO.orgName != null'>" + " and cpo.name LIKE CONCAT('%',#{organizationVO.orgName},'%') "+ " </if> " + springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -518,6 +518,27 @@ if(partyBuildingMemberVO.getAuditResult()!=null && partyBuildingMemberVO.getAuditResult().equals(1)){ comPbMemberDO.setUpdateAt(new Date()); } //编辑 if(partyBuildingMemberVO.getJoinTime()!=null) { comPbMemberDO.setJoinTime(partyBuildingMemberVO.getJoinTime()); } if(partyBuildingMemberVO.getEmploymentTime()!=null) { comPbMemberDO.setEmploymentTime(partyBuildingMemberVO.getEmploymentTime()); } if(partyBuildingMemberVO.getIdCard()!=null &&!partyBuildingMemberVO.getIdCard().contains("*")){ comPbMemberDO.setIdCard(partyBuildingMemberVO.getIdCard()); } if(partyBuildingMemberVO.getName()!=null ){ comPbMemberDO.setName(partyBuildingMemberVO.getName()); } if(partyBuildingMemberVO.getOrgId()!=null ){ comPbMemberDO.setOrgId(partyBuildingMemberVO.getOrgId()); } if(partyBuildingMemberVO.getPhotoPath()!=null ){ comPbMemberDO.setPhotoPath(partyBuildingMemberVO.getPhotoPath()); } if (comPbMemberDAO.updateById(comPbMemberDO) > 0) { PartyBuildingMemberVO rtVO = new PartyBuildingMemberVO(); BeanUtils.copyProperties(comPbMemberDO, rtVO); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java
@@ -162,7 +162,10 @@ public List<PartyOrganizationVO> listPartyOrganizationByApp(ComListPartyDTO comListPartyDTO){ List<PartyOrganizationVO> partyOrganizationVOS = new ArrayList<>(); QueryWrapper<ComPbOrgDO> queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ComPbOrgDO::getCommunityId, comListPartyDTO.getCommunityId()).eq(ComPbOrgDO::getStatus, 1); queryWrapper.lambda().eq(ComPbOrgDO::getStatus, 1); if(comListPartyDTO.getCommunityId() != null){ queryWrapper.lambda().eq(ComPbOrgDO::getCommunityId, comListPartyDTO.getCommunityId()); } if(!StringUtils.isEmpty(comListPartyDTO.getName())){ queryWrapper.lambda().like(ComPbOrgDO::getName,comListPartyDTO.getName()); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -353,6 +353,7 @@ " card_photo_front = #{userArchivesVO.cardPhotoFront} \n" + ", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" + ",family_book = #{userArchivesVO.familyBook} \n" + ",job = #{userArchivesVO.job} \n" + " where user_id = #{userArchivesVO.userId}") void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);