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)); } flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -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);