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