springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSanShuoEventController.java
@@ -21,6 +21,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.HashMap; import java.util.List; /** * ClassName ComEventController @@ -85,7 +86,7 @@ */ @ApiOperation(value = "三说会堂事件表分页列表数据", notes = "三说会堂事件表分页列表数据") @PostMapping("/page") public R page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) { public R<List<ComEventVO>> page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) { ComEventVO comEventVO = CopyUtil.copyProperties(comEventPageRequestVO, ComEventVO.class); return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize()); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
File was renamed from springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComEventController.java @@ -38,7 +38,7 @@ @Api(tags = {"三说会堂事件表控制层"}) @RestController @RequestMapping("/sanshuo/comEvent") public class ComEventController extends BaseController { public class ComSanShuoEventController extends BaseController { @Resource private IComEventService comEventService; @@ -227,7 +227,7 @@ @ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"), }) @PutMapping("/accept/Request") public R acceptRequest(@RequestParam("id") Long id, Long specterId) { public R acceptRequest(@RequestParam("id") Long id,@RequestParam("specterId") Long specterId) { return comEventService.acceptRequest(id, specterId); } @@ -309,7 +309,7 @@ * @date 2022-09-07 11:23:51 */ @ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计") @PutMapping("/status/calculate") @GetMapping("/status/calculate") public R calculate() { return comEventService.calculate(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventResourceController.java
File was renamed from springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComEventResourceController.java @@ -31,7 +31,7 @@ @Api(tags = {"三说会堂事件关联图片资源表控制层"}) @RestController @RequestMapping("/comEventResource") public class ComEventResourceController extends BaseController { public class ComSanShuoEventResourceController extends BaseController { @Resource private IComEventResourceService comEventResourceService; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventTransferRecordController.java
File was renamed from springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComEventTransferRecordController.java @@ -32,7 +32,7 @@ @Api(tags = {"三说会堂事件流转表控制层"}) @RestController @RequestMapping("/comEventTransferRecord") public class ComEventTransferRecordController extends BaseController { public class ComSanShuoEventTransferRecordController extends BaseController { @Resource private IComEventTransferRecordService comEventTransferRecordService; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
@@ -111,7 +111,7 @@ @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果") private String currentEventProcessResult; /**调解是否成果1未成果2已成果*/ @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果") @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成功2已成功") private Integer eventSucceed; /**事件结果（1、调解失败2、调解成功）*/ @ApiModelProperty(name = "eventResult", value = "事件结果（1、调解失败2、调解成功）") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java
@@ -51,7 +51,7 @@ * @author manailin * @date 2022-09-07 11:23:51 */ R pageByComEvent(ComEvent comEvent, Page pagination); R<List<ComEvent>> pageByComEvent(ComEvent comEvent, Page pagination); /** * description 三说会堂事件表列表数据 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -111,7 +111,8 @@ return R.ok(ReturnMsgConstants.SAVE_SUCCESS); } private Boolean saveEventImageList(List<ComEventRequestImageVO> images, Long id) { @Transactional(rollbackFor = Exception.class) public Boolean saveEventImageList(List<ComEventRequestImageVO> images, Long id) { List<ComEventResource> comEventResourceList = new ArrayList<>(); if (!StringUtils.isEmpty(images)) { List<ComEventRequestImageVO> imagesList = images; @@ -180,8 +181,8 @@ } } } baseMapper.updateById(comEvent); return R.ok(); int flag = baseMapper.updateById(comEvent); return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE); } @Override @@ -194,8 +195,8 @@ comEvent.setUserEventStatus(4); comEvent.setEventProcessStatus(SanShuoEventStatusEnum.CANCEL.getCode()); comEvent.setRevokeDes("用户手动取消"); baseMapper.updateById(comEvent); return R.ok(); int flag = baseMapper.updateById(comEvent); return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE); } else { return R.fail("当前申请已经受理，不能取消！"); } @@ -231,8 +232,8 @@ comEvent.setSpecialistAcceptTime(new Date()); comEvent.setSpecialistName(specter.getName()); comEvent.setEventProcessStatus(SanShuoEventStatusEnum.ACCEPT.getCode()); baseMapper.updateById(comEvent); return R.ok(); int flag = baseMapper.updateById(comEvent); return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE); } @Override @@ -245,8 +246,8 @@ comEvent.setSpecialistAcceptTime(new Date()); comEvent.setSpecialistName(specter.getName()); comEvent.setEventProcessStatus(SanShuoEventStatusEnum.ACCEPT.getCode()); baseMapper.updateById(comEvent); return R.ok(); int flag = baseMapper.updateById(comEvent); return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE); } @Override @@ -256,9 +257,14 @@ } @Override @Transactional(rollbackFor = Exception.class) public R archiveRequest(ComEventArchiveVO comEventArchiveVO, LoginUserInfoVO sysUser) { ComEvent comEvent = baseMapper.selectById(comEventArchiveVO.getId()); comEvent.setEventProcessStatus(6); if (comEvent.getEventSucceed() == 2) { comEvent.setEventProcessStatus(6); } else { comEvent.setEventProcessStatus(5); } comEvent.setResult(comEventArchiveVO.getResult()); baseMapper.updateById(comEvent); ComEventTransferRecord comEventTransferRecord = new ComEventTransferRecord(); @@ -277,8 +283,7 @@ comEventTransferRecord.setSpecialistName(comEvent.getSpecialistName()); comEventTransferRecord.setEventResult(comEvent.getEventSucceed()); comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus()); comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord); return R.ok(); return comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord); } private Boolean checkExist(String sn, Long id) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java
@@ -2,7 +2,9 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO; import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO; import com.panzhihua.common.model.vos.sanshuo.ComEventDetailVO; import com.panzhihua.common.model.vos.sanshuo.ComEventRequestImageVO; @@ -99,7 +101,13 @@ @Test void archiveRequest() { // R data = comEventService.archiveRequest(); // log.info(JSONObject.toJSONString(data)); ComEventArchiveVO comEventArchiveVO =new ComEventArchiveVO(); comEventArchiveVO.setId(1L); comEventArchiveVO.setResult("测试数据"); comEventArchiveVO.setImages(null); LoginUserInfoVO sysUser =new LoginUserInfoVO(); sysUser.setUserId(1L); R data = comEventService.archiveRequest(comEventArchiveVO,sysUser); log.info(JSONObject.toJSONString(data)); } }
