diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java index 47e6a46..e843481 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java @@ -90,7 +90,7 @@ public class BmsTemplateInfoController extends BaseController { @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(bmsTemplateInfoService.selectBmsTemplateInfoById(id)); + return success(bmsTemplateInfoService.getById(id)); } /** @@ -100,7 +100,7 @@ public class BmsTemplateInfoController extends BaseController { @Log(title = "申报模板信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BmsTemplateInfo bmsTemplateInfo) { - return toAjax(bmsTemplateInfoService.insertBmsTemplateInfo(bmsTemplateInfo)); + return toAjax(bmsTemplateInfoService.save(bmsTemplateInfo)); } /** @@ -110,7 +110,7 @@ public class BmsTemplateInfoController extends BaseController { @Log(title = "申报模板信息", businessType = BusinessType.UPDATE) @PostMapping("/edit") public AjaxResult edit(@RequestBody BmsTemplateInfo bmsTemplateInfo) { - return toAjax(bmsTemplateInfoService.updateBmsTemplateInfo(bmsTemplateInfo)); + return toAjax(bmsTemplateInfoService.updateById(bmsTemplateInfo)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateInfoMapper.java index 639aab1..1a13a5d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateInfoMapper.java @@ -13,21 +13,7 @@ import java.util.List; * @date 2023-08-25 */ public interface BmsTemplateInfoMapper extends BaseMapper { - /** - * 查询申报模板信息 - * - * @param id 申报模板信息主键 - * @return 申报模板信息 - */ - public BmsTemplateInfo selectBmsTemplateInfoById(Long id); - /** - * 查询申报模板信息列表 - * - * @param bmsTemplateInfo 申报模板信息 - * @return 申报模板信息集合 - */ - public List selectBmsTemplateInfoList(BmsTemplateInfo bmsTemplateInfo); /** * 查询申报模板信息列表 * @@ -35,22 +21,6 @@ public interface BmsTemplateInfoMapper extends BaseMapper { * @return 申报模板信息集合 */ public List templateInfoList(BmsTemplateInfo bmsTemplateInfo); - /** - * 新增申报模板信息 - * - * @param bmsTemplateInfo 申报模板信息 - * @return 结果 - */ - public int insertBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo); - - /** - * 修改申报模板信息 - * - * @param bmsTemplateInfo 申报模板信息 - * @return 结果 - */ - public int updateBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo); - /** * 删除申报模板信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateInfoService.java index 43afa79..c11b642 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateInfoService.java @@ -15,13 +15,7 @@ import java.util.List; * @date 2023-08-25 */ public interface IBmsTemplateInfoService extends IService { - /** - * 查询申报模板信息 - * - * @param id 申报模板信息主键 - * @return 申报模板信息 - */ - public BmsTemplateInfo selectBmsTemplateInfoById(Long id); + /** * 查询申报模板信息列表 @@ -43,21 +37,6 @@ public interface IBmsTemplateInfoService extends IService { */ public void exportTemplate(HttpServletRequest request, HttpServletResponse response, Long id); - /** - * 新增申报模板信息 - * - * @param bmsTemplateInfo 申报模板信息 - * @return 结果 - */ - public int insertBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo); - - /** - * 修改申报模板信息 - * - * @param bmsTemplateInfo 申报模板信息 - * @return 结果 - */ - public int updateBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo); /** * 批量删除申报模板信息 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateInfoServiceImpl.java index 9409b00..b287c93 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateInfoServiceImpl.java @@ -33,16 +33,6 @@ public class BmsTemplateInfoServiceImpl extends ServiceImpl enterpriseDirectoryList = bmsTemplateInfo -// .getEnterpriseDirectoryList(); -// if (null != enterpriseDirectoryList && enterpriseDirectoryList.size()>0){ -// enterpriseDirectoryList.forEach(x->{ -// x.setTemplateId(bmsTemplateInfoAddDto.getId()); -// }); -// enterpriseDirectoryService.saveOrUpdateBatch(enterpriseDirectoryList); -// } - } catch (Exception e) { - e.printStackTrace(); - } - return num; - } - /** - * 修改申报模板信息 - * - * @param bmsTemplateInfo 申报模板信息 - * @return 结果 - */ - @Override - public int updateBmsTemplateInfo(BmsTemplateInfo bmsTemplateInfo) { -// bmsTemplateInfo.setUpdateTime(DateUtils.getNowDate()); - return baseMapper.updateById(bmsTemplateInfo); - } /** * 批量删除申报模板信息 diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml index 8c1aaa8..ed99c47 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml @@ -3,62 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - select id, - template_name, - level, - product_area, - type, - notes, - responsibility_unit, - is_deleted, - project_classify, - use_start, - use_end, - status, - create_by, - create_time, - update_by, - update_time, - remark - from bms_template_info - - - - - - - - insert into bms_template_info - - id, - template_name, - level, - product_area, - type, - notes, - responsibility_unit, - is_deleted, - create_by, - create_time, - update_by, - update_time, - remark, - project_classify, - use_start, - use_end, - status, - - - #{id}, - #{templateName}, - #{level}, - #{productArea}, - #{type}, - #{notes}, - #{responsibilityUnit}, - #{isDeleted}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{projectClassify}, - #{useStart}, - #{useEnd}, - #{status}, - - - - - update bms_template_info - - template_name = #{templateName}, - level = #{level}, - product_area = #{productArea}, - type = #{type}, - notes = #{notes}, - responsibility_unit = #{responsibilityUnit}, - is_deleted = #{isDeleted}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - project_classify = #{projectClassify}, - use_start = #{useStart}, - use_end = #{useEnd}, - status = #{status}, - - where id = #{id} - delete