From dc2fa76fa1c6ca37cc4bb8bba8bd38feeea2261f Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 18 Apr 2025 15:44:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/base/basic/controller/BmProjectController.java | 7 +++++-- .../base/basic/controller/BranchCompanyController.java | 4 ++-- .../main/java/com/bonus/base/basic/domain/BmProject.java | 4 ++++ .../base/basic/service/impl/BranchCompanyServiceImpl.java | 1 + .../mapper/smartsite/basic/BranchCompanyMapper.xml | 7 ++++++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BmProjectController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BmProjectController.java index d80fea9..0bd86f8 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BmProjectController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BmProjectController.java @@ -55,11 +55,14 @@ public class BmProjectController extends BaseController { @PreventRepeatSubmit // @RequiresPermissions("basic:project:export") @SysLog(title = "项目管理", businessType = OperaType.EXPORT, logType = 1,module = "项目管理->导出项目列表") - @GetMapping("/export") + @PostMapping("/export") public void export(HttpServletResponse response, BmProject bmProject) { List list = bmProjectService.selectBmProjectList(bmProject); + for (int i = 0; i < list.size(); i++) { + list.get(i).setSerialNumber(i + 1); + } ExcelUtil util = new ExcelUtil(BmProject.class); - util.exportExcel(response, list, "工程项目管理数据"); + util.exportExcel(response, list, "项目管理数据"); } /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BranchCompanyController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BranchCompanyController.java index ee09de2..1b5f28d 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BranchCompanyController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BranchCompanyController.java @@ -68,7 +68,7 @@ public class BranchCompanyController extends BaseController { @ApiOperation(value = "删除分公司") // @PreventRepeatSubmit @RequiresPermissions("basic:branchCompany:del") - @SysLog(title = "分公司管理", businessType = OperaType.UPDATE, logType = 1,module = "分公司管理->删除分公司") + @SysLog(title = "分公司管理", businessType = OperaType.DELETE, logType = 1,module = "分公司管理->删除分公司") @PostMapping("delBranchCompany") public AjaxResult delBranchCompany(@RequestBody BranchCompanyVo vo) { return service.delBranchCompany(vo); @@ -76,7 +76,7 @@ public class BranchCompanyController extends BaseController { @ApiOperation(value = "修改分公司状态") // @PreventRepeatSubmit - @RequiresPermissions("basic:branchCompany:editStatus") +// @RequiresPermissions("basic:branchCompany:editStatus") @SysLog(title = "分公司管理", businessType = OperaType.UPDATE, logType = 1,module = "分公司管理->修改分公司状态") @PostMapping("editBranchCompanyStatus") public AjaxResult editBranchCompanyStatus(@RequestBody BranchCompanyVo vo) { diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/BmProject.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/BmProject.java index b91e36e..ed43fd8 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/BmProject.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/BmProject.java @@ -28,6 +28,9 @@ import javax.validation.constraints.Pattern; public class BmProject extends BaseEntity { private static final long serialVersionUID = 1L; + @Excel(name = "序号") + private int serialNumber; + /**关键字*/ private String keyWord; @@ -38,6 +41,7 @@ public class BmProject extends BaseEntity { private Long projectId; @ApiModelProperty(value = "分公司名称") + @Excel(name = "分公司名称") private String companyName; /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BranchCompanyServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BranchCompanyServiceImpl.java index 6a3d00d..4aee323 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BranchCompanyServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BranchCompanyServiceImpl.java @@ -106,6 +106,7 @@ public class BranchCompanyServiceImpl implements IBranchCompanyService { } @Override + @Transactional(rollbackFor = Exception.class) public AjaxResult editBranchCompanyStatus(BranchCompanyVo vo) { try { // 校验必填数据 diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/BranchCompanyMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/BranchCompanyMapper.xml index 5a79af4..13e5aa1 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/BranchCompanyMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/BranchCompanyMapper.xml @@ -12,12 +12,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" abbr_name, use_status, remark, + create_user_id, + update_user_id, #{params.companyName}, #{params.abbrName}, #{params.useStatus}, #{params.remark}, + #{params.createUserId}, + #{params.updateUserId}, @@ -27,13 +31,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" abbr_name = #{params.abbrName}, use_status = #{params.useStatus}, remark = #{params.remark}, + update_user_id = #{params.updateUserId}, WHERE id = #{params.id} UPDATE tb_branch_company SET is_active = '0' WHERE id = #{params.id} - + UPDATE tb_branch_company SET use_status = #{params.useStatus} WHERE id = #{params.id}