From 16987ed6246afe227de671faa5a6afb7ffa8c2e7 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 09:58:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/controller/BmContractController.java | 9 +++++++++ .../bonus/material/contract/domain/BmContract.java | 12 ++++++++++++ .../material/contract/mapper/BmContractMapper.java | 2 ++ .../material/contract/service/BmContractService.java | 2 ++ .../contract/service/impl/BmContractServiceImpl.java | 5 +++++ .../device/controller/DevInfoController.java | 2 +- .../mapper/material/contract/BmContractMapper.xml | 3 +++ 7 files changed, 34 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java index a62781a..a960c60 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java @@ -74,4 +74,13 @@ public class BmContractController extends BaseController { return AjaxResult.error(); } } + + @ApiOperation(value = "合同模板列表") + @GetMapping("/lisTemplate") + public AjaxResult lisTemplate(BmContract bmContract) { + startPage(); + List list = bmContractService.lisTemplate(bmContract); + return AjaxResult.success(getDataTable(list)); + } + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java index a498d84..32024af 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java @@ -45,4 +45,16 @@ public class BmContract { @ApiModelProperty(value = "文件附件") private List bmFileInfoList; + + @ApiModelProperty(value = "合同模板所属公司") + private Integer companyId; + + @ApiModelProperty(value = "0:系统模版 1:用户模版") + private Integer type; + + @ApiModelProperty(value = "模板内容") + private String content; + + @ApiModelProperty(value = "模板名称") + private String templateName; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java index 9cbd1f4..7fa8d63 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java @@ -25,4 +25,6 @@ public interface BmContractMapper { Integer updateStatus(BmContract bmContract); Integer updateStatusOther(BmContract bmContract); + + List lisTemplate(BmContract bmContract); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java index 195e470..5970dd5 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java @@ -20,4 +20,6 @@ public interface BmContractService { Integer del(BmContract bmContract); Integer updateStatus(BmContract bmContract); + + List lisTemplate(BmContract bmContract); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java index b15a0fd..04376be 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java @@ -115,6 +115,11 @@ public class BmContractServiceImpl implements BmContractService { } } + @Override + public List lisTemplate(BmContract bmContract) { + return bmContractMapper.lisTemplate(bmContract); + } + private String getString() { //根据前台传过来的数据，生成需求编号 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java index b8bb748..718bb52 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java @@ -178,7 +178,7 @@ public class DevInfoController extends BaseController { /** * 设备信息录入--保存草稿--不校验必填 */ - @ApiOperation(value = "设备信息录入--保存草稿--不校验必填") + @ApiOperation(value = "草稿新增（该接口已废弃）") @PostMapping("/insertDraft") public AjaxResult insertDraft(@NotNull @RequestBody DevInfo devInfo) { return devInfoService.insertDraft(devInfo); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml index 536e12e..a46e057 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml @@ -50,4 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE DATE_FORMAT(create_time, '%y%m') = DATE_FORMAT(#{date}, '%y%m') ORDER BY create_time DESC LIMIT 1 + \ No newline at end of file From c01ed443034b84cce73a99309604f23d121d735e Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 10:18:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BmContractServiceImpl.java | 16 ++++++++-------- .../material/contract/BmContractMapper.xml | 7 ++++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java index 04376be..9b1cfcf 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java @@ -32,12 +32,12 @@ public class BmContractServiceImpl implements BmContractService { public List list(BmContract bmContract) { bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); List list = bmContractMapper.list(bmContract); - for (BmContract contract : list) { + /* for (BmContract contract : list) { BmFileInfo bmFileInfo = new BmFileInfo(); bmFileInfo.setModelId(Long.valueOf(contract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L); List bmFileInfos = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); contract.setBmFileInfoList(bmFileInfos); - } + }*/ return list; } @@ -48,7 +48,7 @@ public class BmContractServiceImpl implements BmContractService { bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); bmContract.setStatus(0); Integer add = bmContractMapper.add(bmContract); - if (add > 0) { + /* if (add > 0) { if (bmContract.getBmFileInfoList().size() > 0) { for (BmFileInfo bmFileInfo : bmContract.getBmFileInfoList()) { bmFileInfo.setModelId(Long.valueOf(bmContract.getId())); @@ -59,7 +59,7 @@ public class BmContractServiceImpl implements BmContractService { bmFileInfoMapper.insertBmFileInfo(bmFileInfo); } } - } + }*/ return add; } @@ -68,7 +68,7 @@ public class BmContractServiceImpl implements BmContractService { bmContract.setOwnerId(SecurityUtils.getLoginUser().getUserid()); bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); Integer edit = bmContractMapper.edit(bmContract); - if (edit > 0) { + /* if (edit > 0) { if (bmContract.getBmFileInfoList().size() > 0) { BmFileInfo fileInfo = new BmFileInfo(); fileInfo.setModelId(Long.valueOf(bmContract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L); @@ -82,18 +82,18 @@ public class BmContractServiceImpl implements BmContractService { bmFileInfoMapper.insertBmFileInfo(bmFileInfo); } } - } + }*/ return edit; } @Override public Integer del(BmContract bmContract) { Integer del = bmContractMapper.del(bmContract); - if (del > 0) { + /* if (del > 0) { BmFileInfo fileInfo = new BmFileInfo(); fileInfo.setModelId(Long.valueOf(bmContract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L); bmFileInfoMapper.deleteBmFileInfo(fileInfo); - } + }*/ return del; } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml index a46e057..42dcf73 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml @@ -4,13 +4,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - insert into bm_contract(contract_code, contract_name, status, create_time, owner_id, owner_com) - values(#{contractCode}, #{contractName}, #{status}, now(), #{ownerId}, #{ownerCom}) + insert into bm_contract(contract_code, contract_name, status, create_time, owner_id, owner_com, content) + values(#{contractCode}, #{contractName}, #{status}, now(), #{ownerId}, #{ownerCom}, #{content}) update bm_contract set contract_name = #{contractName}, status = #{status}, + content = #{content}, owner_id = #{ownerId}, owner_com = #{ownerCom}, update_time = now() @@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"