flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
@@ -36,6 +36,7 @@ */ @ApiOperation("查询导办事务详情") @GetMapping("/getData") @Authorization public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser) { Assert.notNull(Id, "Id 不能为空"); flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -5,6 +5,7 @@ import com.dg.core.annotation.Authorization; import com.dg.core.db.gen.entity.SysUser; import com.dg.core.service.ISysUserService; import com.dg.core.util.Snowflake; import com.dg.core.util.TableDataInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -86,7 +87,7 @@ config.setCreateTime(LocalDateTime.now()); config.setUpdateTime(LocalDateTime.now()); config.setUserId(Snowflake.getId()); return toAjax(IUserService.insertConfig(config)); }
@@ -311,7 +311,7 @@ * @param sysUser 当前登录人员信息 * @return */ @ApiOperation("获取个人中心工单数据") @ApiOperation(value = "获取个人中心工单数据",response = GuideRepairOrder.class) @GetMapping("/personalCenter") @Authorization public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){ flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -88,6 +88,11 @@ public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id) { Assert.notNull(Id, "Id 不能为空"); OrganizationChartEntity entity=iOrganizationChartService.selectConfigById(Id); if(!StringUtils.isEmpty(entity.getParentId())) { return ResultData.error("该机构下存在其他部门！请先删除子部门"); } return toAjax(iOrganizationChartService.deleteConfigById(Id)); } @@ -151,7 +156,6 @@ return getDataTable(ids); } //递归取id private List<OrganizationChartEntity> disposestreetId(List<OrganizationChartEntity> lists) { @@ -170,8 +174,5 @@ } return ids; } } flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -36,6 +36,7 @@ */ @ApiOperation("查询导办事务详情") @GetMapping("/getData") @Authorization public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser) { Assert.notNull(Id, "Id 不能为空"); flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -41,8 +41,9 @@ guideRepairOrder.setCreateTime(LocalDateTime.now()); guideRepairOrder.setUpdateTime(LocalDateTime.now()); transactionEvent.setTransactionNum(transactionEvent.getTransactionNum()+1); String[] images = guideRepairOrder.getImages().split(","); for (String image: images) { if (guideRepairOrder.getImages()!=null){ String[] images = guideRepairOrder.getImages().split(","); for (String image: images) { GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage(); guideRepairOrderImage.setId(Snowflake.getId()); guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum()); @@ -50,15 +51,18 @@ guideRepairOrderImage.setCreateTime(LocalDateTime.now()); guideRepairOrderImage.setType(1); guideRepairOrderImageMapper.insert(guideRepairOrderImage); } } if (guideRepairOrder.getOrderNum()!=null){ GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage(); guideRepairOrderImage.setId(Snowflake.getId()); guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum()); guideRepairOrderImage.setUrl(guideRepairOrder.getVideo()); guideRepairOrderImage.setCreateTime(LocalDateTime.now()); guideRepairOrderImage.setType(2); guideRepairOrderImageMapper.insert(guideRepairOrderImage); if (guideRepairOrder.getVideo()!=null){ if (guideRepairOrder.getOrderNum()!=null){ GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage(); guideRepairOrderImage.setId(Snowflake.getId()); guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum()); guideRepairOrderImage.setUrl(guideRepairOrder.getVideo()); guideRepairOrderImage.setCreateTime(LocalDateTime.now()); guideRepairOrderImage.setType(2); guideRepairOrderImageMapper.insert(guideRepairOrderImage); } } int ans= baseMapper.insert(guideRepairOrder); int i = transactionEventMapper.updateById(transactionEvent); springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoApi.java
@@ -29,8 +29,8 @@ @ApiOperation(value = "小程序获取可选择行专家列表",response = ComSanshuoExpertVO.class ) @GetMapping("/expert/appletsList") public R expertAppList(){ return communityService.expertAppList(); public R expertAppList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id){ return communityService.expertAppList(type,id); } @ApiOperation(value = "专家风采",response = ExpertShowVO.class) springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventPageRequestVO.java
@@ -50,4 +50,6 @@ private Long pageNo; private Long pageSize; private String keyword; @ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件") private Integer userType; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -10430,7 +10430,7 @@ * 小程序获取可选择专家列表 * */ @GetMapping("/sanshuo/expert/appletsList") R expertAppList(); R expertAppList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id); /** * 获取专家详情 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
@@ -58,7 +58,7 @@ * 小程序获取可选择专家 * */ @GetMapping("/appletsList") public R appList(@RequestParam ("type")Integer type,@RequestParam("id")Long id){ public R appList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id){ return comSanShuoExpertService.selectExpertList(type, id,this.getLoginUserInfo().getCommunityId()); } @@ -73,6 +73,7 @@ return R.ok(comSanShuoExpertService.updateById(expert)); } /** * 后台获取列表 * */ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
@@ -173,5 +173,6 @@ @TableField(exist = false) private String keyword; @TableField(exist = false) private String userType; private Integer userType; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -75,10 +75,12 @@ @Override public R pageByComEvent(ComEvent comEvent, Page pagination,LoginUserInfoVO loginUserInfoVO) { if (comEvent.getUserType().equals(1)){ comEvent.setRequestUserId(loginUserInfoVO.getUserId()); }else if (comEvent.getUserType().equals(2)){ comEvent.setSpecialistId(loginUserInfoVO.getUserId()); if (nonNull(comEvent.getUserType())){ if (comEvent.getUserType().equals(1)){ comEvent.setRequestUserId(loginUserInfoVO.getUserId()); }else if (comEvent.getUserType().equals(2)){ comEvent.setSpecialistId(loginUserInfoVO.getUserId()); } } IPage<ComEvent> list = baseMapper.pageByComEvent(comEvent, pagination); if (list.getRecords().size() < 1) { @@ -96,7 +98,6 @@ }); return R.ok(list); } @Override public List<ComEvent> listByComEvent(ComEvent comEvent,LoginUserInfoVO loginUserInfoVO) {
