diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/bo/XzdSpykpSjsqdBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/bo/XzdSpykpSjsqdBo.java index 57a7189c..3e60e3b9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/bo/XzdSpykpSjsqdBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/bo/XzdSpykpSjsqdBo.java @@ -31,6 +31,11 @@ public class XzdSpykpSjsqdBo extends BaseEntity { // @NotNull(message = "id不能为空", groups = { EditGroup.class }) private Long id; + /** + * 类型id + */ + private Long type; + /** * 部门id */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java index 21d98f1a..3cd571ff 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java @@ -39,6 +39,16 @@ public class XzdSpykpSjsqdVo implements Serializable { @ExcelProperty(value = "id") private Long id; + /** + * 类型 + */ + private Long type; + + /** + * 类型名称 + */ + private String typeName; + /** * 部门id */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java index 9e75e140..1c4aa2d5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java @@ -22,9 +22,11 @@ import org.dromara.system.service.impl.SysUserServiceImpl; import org.dromara.xzd.domain.dto.QuerCorrespondentDto; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdProjectVo; +import org.dromara.xzd.domain.vo.XzdSolutionSelectionVo; import org.dromara.xzd.service.IXzdCorrespondentList; import org.dromara.xzd.service.impl.XzdContractDetailsServiceImpl; import org.dromara.xzd.service.impl.XzdProjectServiceImpl; +import org.dromara.xzd.service.impl.XzdSolutionSelectionServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.xzd.spykp.sjsqd.domain.bo.XzdSpykpSjsqdBo; @@ -61,6 +63,8 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl list(XzdSpykpSpdjBo bo, PageQuery pageQuery) { + return xzdSpykpSpdjService.queryPageList(bo, pageQuery); + } + + /** + * 导出收票登记列表 + */ + @SaCheckPermission("spdj:spdj:export") + @Log(title = "收票登记", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(XzdSpykpSpdjBo bo, HttpServletResponse response) { + List list = xzdSpykpSpdjService.queryList(bo); + ExcelUtil.exportExcel(list, "收票登记", XzdSpykpSpdjVo.class, response); + } + + /** + * 获取收票登记详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("spdj:spdj:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdSpykpSpdjService.queryById(id)); + } + + /** + * 新增收票登记 + */ + @SaCheckPermission("spdj:spdj:add") + @Log(title = "收票登记", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody XzdSpykpSpdjBo bo) { + return toAjax(xzdSpykpSpdjService.insertByBo(bo)); + } + + /** + * 修改收票登记 + */ + @SaCheckPermission("spdj:spdj:edit") + @Log(title = "收票登记", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody XzdSpykpSpdjBo bo) { + return toAjax(xzdSpykpSpdjService.updateByBo(bo)); + } + + /** + * 删除收票登记 + * + * @param ids 主键串 + */ + @SaCheckPermission("spdj:spdj:remove") + @Log(title = "收票登记", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(xzdSpykpSpdjService.deleteWithValidByIds(List.of(ids), true)); + } +}