diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceParamConfigController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceParamConfigController.java
index c4c6a43..08347b4 100644
--- a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceParamConfigController.java
+++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceParamConfigController.java
@@ -28,7 +28,7 @@ import com.jianshui.common.core.page.TableDataInfo;
* @date 2023-06-28
*/
@RestController
-@RequestMapping("/platform/config")
+@RequestMapping("/platform/exportmanage")
public class InvoiceParamConfigController extends BaseController
{
@Autowired
@@ -37,7 +37,7 @@ public class InvoiceParamConfigController extends BaseController
/**
* 查询导入设置列表
*/
- @PreAuthorize("@ss.hasPermi('platform:config:list')")
+ @PreAuthorize("@ss.hasPermi('platform:exportmanage:list')")
@GetMapping("/list")
public TableDataInfo list(InvoiceParamConfig invoiceParamConfig)
{
@@ -46,10 +46,21 @@ public class InvoiceParamConfigController extends BaseController
return getDataTable(list);
}
+ /**
+ * 查询单个导入设置列表
+ */
+ @PreAuthorize("@ss.hasPermi('platform:exportmanage:list')")
+ @GetMapping("/findByName")
+ public AjaxResult findByName()
+ {
+ return invoiceParamConfigService.findByName();
+ }
+
+
/**
* 导出导入设置列表
*/
- @PreAuthorize("@ss.hasPermi('platform:config:export')")
+ @PreAuthorize("@ss.hasPermi('platform:exportmanage:export')")
@Log(title = "导入设置", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, InvoiceParamConfig invoiceParamConfig)
@@ -62,7 +73,7 @@ public class InvoiceParamConfigController extends BaseController
/**
* 获取导入设置详细信息
*/
- @PreAuthorize("@ss.hasPermi('platform:config:query')")
+ @PreAuthorize("@ss.hasPermi('platform:exportmanage:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +83,7 @@ public class InvoiceParamConfigController extends BaseController
/**
* 新增导入设置
*/
- @PreAuthorize("@ss.hasPermi('platform:config:add')")
+ @PreAuthorize("@ss.hasPermi('platform:exportmanage:add')")
@Log(title = "导入设置", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody InvoiceParamConfig invoiceParamConfig)
@@ -83,7 +94,7 @@ public class InvoiceParamConfigController extends BaseController
/**
* 修改导入设置
*/
- @PreAuthorize("@ss.hasPermi('platform:config:edit')")
+ @PreAuthorize("@ss.hasPermi('platform:exportmanage:edit')")
@Log(title = "导入设置", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody InvoiceParamConfig invoiceParamConfig)
@@ -94,7 +105,7 @@ public class InvoiceParamConfigController extends BaseController
/**
* 删除导入设置
*/
- @PreAuthorize("@ss.hasPermi('platform:config:remove')")
+ @PreAuthorize("@ss.hasPermi('platform:exportmanage:remove')")
@Log(title = "导入设置", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/domain/InvoiceParamConfig.java b/jianshui-platform/src/main/java/com/jianshui/platform/domain/InvoiceParamConfig.java
index bb4f81d..495c10d 100644
--- a/jianshui-platform/src/main/java/com/jianshui/platform/domain/InvoiceParamConfig.java
+++ b/jianshui-platform/src/main/java/com/jianshui/platform/domain/InvoiceParamConfig.java
@@ -1,6 +1,5 @@
package com.jianshui.platform.domain;
-import java.math.BigDecimal;
import com.jianshui.common.annotation.Excel;
import com.jianshui.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -256,66 +255,66 @@ public class InvoiceParamConfig extends BaseEntity
{
return unit;
}
- public void setPrice(String price)
+ public void setPrice(String price)
{
this.price = price;
}
- public String getPrice()
+ public String getPrice()
{
return price;
}
- public void setNum(String num)
+ public void setNum(String num)
{
this.num = num;
}
- public String getNum()
+ public String getNum()
{
return num;
}
- public void setTaxamt(String taxamt)
+ public void setTaxamt(String taxamt)
{
this.taxamt = taxamt;
}
- public String getTaxamt()
+ public String getTaxamt()
{
return taxamt;
}
- public void setTaxrate(String taxrate)
+ public void setTaxrate(String taxrate)
{
this.taxrate = taxrate;
}
- public String getTaxrate()
+ public String getTaxrate()
{
return taxrate;
}
- public void setTax(String tax)
+ public void setTax(String tax)
{
this.tax = tax;
}
- public String getTax()
+ public String getTax()
{
return tax;
}
- public void setDiscount(String discount)
+ public void setDiscount(String discount)
{
this.discount = discount;
}
- public String getDiscount()
+ public String getDiscount()
{
return discount;
}
- public void setDeduction(String deduction)
+ public void setDeduction(String deduction)
{
this.deduction = deduction;
}
- public String getDeduction()
+ public String getDeduction()
{
return deduction;
}
diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/mapper/InvoiceParamConfigMapper.java b/jianshui-platform/src/main/java/com/jianshui/platform/mapper/InvoiceParamConfigMapper.java
index da8b47c..7bab1e2 100644
--- a/jianshui-platform/src/main/java/com/jianshui/platform/mapper/InvoiceParamConfigMapper.java
+++ b/jianshui-platform/src/main/java/com/jianshui/platform/mapper/InvoiceParamConfigMapper.java
@@ -2,6 +2,7 @@ package com.jianshui.platform.mapper;
import java.util.List;
import com.jianshui.platform.domain.InvoiceParamConfig;
+import org.apache.ibatis.annotations.Param;
/**
* 导入设置Mapper接口
@@ -58,4 +59,11 @@ public interface InvoiceParamConfigMapper
* @return 结果
*/
public int deleteInvoiceParamConfigByIds(Long[] ids);
+
+ /**
+ * 功能描述: 根据企业名称查询配置参数
+ * @param sellername
+ * @return : com.jianshui.platform.domain.InvoiceParamConfig
+ */
+ InvoiceParamConfig findByCompanyServiceName(@Param("sellername") String sellername);
}
diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/service/IInvoiceParamConfigService.java b/jianshui-platform/src/main/java/com/jianshui/platform/service/IInvoiceParamConfigService.java
index a5f3899..792dbb4 100644
--- a/jianshui-platform/src/main/java/com/jianshui/platform/service/IInvoiceParamConfigService.java
+++ b/jianshui-platform/src/main/java/com/jianshui/platform/service/IInvoiceParamConfigService.java
@@ -1,6 +1,8 @@
package com.jianshui.platform.service;
import java.util.List;
+
+import com.jianshui.common.core.domain.AjaxResult;
import com.jianshui.platform.domain.InvoiceParamConfig;
/**
@@ -58,4 +60,11 @@ public interface IInvoiceParamConfigService
* @return 结果
*/
public int deleteInvoiceParamConfigById(Long id);
+
+ /**
+ * 功能描述: 获取企业配置
+ * @return : com.jianshui.common.core.domain.AjaxResult
+ */
+ AjaxResult findByName();
+
}
diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/InvoiceParamConfigServiceImpl.java b/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/InvoiceParamConfigServiceImpl.java
index 7e59105..4d360fb 100644
--- a/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/InvoiceParamConfigServiceImpl.java
+++ b/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/InvoiceParamConfigServiceImpl.java
@@ -1,8 +1,8 @@
package com.jianshui.platform.service.impl;
-import java.math.BigDecimal;
import java.util.List;
+import com.jianshui.common.core.domain.AjaxResult;
import com.jianshui.common.core.domain.entity.Companyservice;
import com.jianshui.common.core.domain.entity.SysUser;
import com.jianshui.common.utils.DateUtils;
@@ -26,7 +26,6 @@ public class InvoiceParamConfigServiceImpl implements IInvoiceParamConfigService
{
@Autowired
private InvoiceParamConfigMapper invoiceParamConfigMapper;
-
@Autowired
private SysUserMapper sysUserMapper;
@@ -70,11 +69,27 @@ public class InvoiceParamConfigServiceImpl implements IInvoiceParamConfigService
Long userId = SecurityUtils.getUserId();
SysUser sysUser = sysUserMapper.selectUserById(userId);
Companyservice companyservice = companyserviceMapper.selectCompanyserviceByCompanyid(sysUser.getCompanyId());
- //封装参数
- invoiceParamConfig.setCreateTime(DateUtils.getNowDate());
- invoiceParamConfig.setCompanyName(companyservice.getSellername());
- invoiceParamConfig.setCreateBy(sysUser.getCreateBy());
- return invoiceParamConfigMapper.insertInvoiceParamConfig(invoiceParamConfig);
+ InvoiceParamConfig byCompanyServiceName = invoiceParamConfigMapper.findByCompanyServiceName(companyservice.getSellername());
+ if (byCompanyServiceName != null){
+ // 删除对应数据
+ invoiceParamConfigMapper.deleteInvoiceParamConfigById(byCompanyServiceName.getId());
+ // 封装参数
+ invoiceParamConfig.setCreateTime(DateUtils.getNowDate());
+ invoiceParamConfig.setCompanyName(companyservice.getSellername());
+ invoiceParamConfig.setCreateBy(sysUser.getCreateBy());
+ //存入对应数据
+ return invoiceParamConfigMapper.insertInvoiceParamConfig(invoiceParamConfig);
+ }else {
+ // 封装参数
+ invoiceParamConfig.setCreateTime(DateUtils.getNowDate());
+ invoiceParamConfig.setCompanyName(companyservice.getSellername());
+ invoiceParamConfig.setCreateBy(sysUser.getCreateBy());
+ //存入对应数据
+ return invoiceParamConfigMapper.insertInvoiceParamConfig(invoiceParamConfig);
+ }
+
+
+
}
/**
@@ -113,4 +128,17 @@ public class InvoiceParamConfigServiceImpl implements IInvoiceParamConfigService
{
return invoiceParamConfigMapper.deleteInvoiceParamConfigById(id);
}
+
+ /**
+ * 功能描述: 获取企业配置
+ * @return : com.jianshui.common.core.domain.AjaxResult
+ */
+ @Override
+ public AjaxResult findByName() {
+ Long userId = SecurityUtils.getUserId();
+ SysUser sysUser = sysUserMapper.selectUserById(userId);
+ Companyservice companyservice = companyserviceMapper.selectCompanyserviceByCompanyid(sysUser.getCompanyId());
+ InvoiceParamConfig invoiceParamConfig = invoiceParamConfigMapper.findByCompanyServiceName(companyservice.getSellername());
+ return AjaxResult.success(invoiceParamConfig);
+ }
}
diff --git a/jianshui-platform/src/main/resources/com/jianshui/platform/mapper/InvoiceParamConfigMapper.xml b/jianshui-platform/src/main/resources/com/jianshui/platform/mapper/InvoiceParamConfigMapper.xml
index f3cff77..a393658 100644
--- a/jianshui-platform/src/main/resources/com/jianshui/platform/mapper/InvoiceParamConfigMapper.xml
+++ b/jianshui-platform/src/main/resources/com/jianshui/platform/mapper/InvoiceParamConfigMapper.xml
@@ -57,7 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
-
+
+
insert into invoice_param_config
@@ -75,10 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
product_name,
specification,
unit,
- price,
- num,
- taxamt,
- taxrate,
+ price,
+ num,
+ taxamt,
+ taxrate,
tax,
discount,
deduction,
@@ -110,10 +113,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{productName},
#{specification},
#{unit},
- #{price},
- #{num},
- #{taxamt},
- #{taxrate},
+ #{price},
+ #{num},
+ #{taxamt},
+ #{taxrate},
#{tax},
#{discount},
#{deduction},
@@ -149,10 +152,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
product_name = #{productName},
specification = #{specification},
unit = #{unit},
- price = #{price},
- num = #{num},
- taxamt = #{taxamt},
- taxrate = #{taxrate},
+ price = #{price},
+ num = #{num},
+ taxamt = #{taxamt},
+ taxrate = #{taxrate},
tax = #{tax},
discount = #{discount},
deduction = #{deduction},
diff --git a/jianshui-ui/src/api/platform/config.js b/jianshui-ui/src/api/platform/exportmanage.js
similarity index 52%
rename from jianshui-ui/src/api/platform/config.js
rename to jianshui-ui/src/api/platform/exportmanage.js
index a2db80a..386da24 100644
--- a/jianshui-ui/src/api/platform/config.js
+++ b/jianshui-ui/src/api/platform/exportmanage.js
@@ -1,44 +1,44 @@
import request from '@/utils/request'
// 查询导入设置列表
-export function listConfig(query) {
+export function listExportmanage(query) {
return request({
- url: '/platform/config/list',
+ url: '/platform/exportmanage/list',
method: 'get',
params: query
})
}
// 查询导入设置详细
-export function getConfig(id) {
+export function getExportmanage(id) {
return request({
- url: '/platform/config/' + id,
+ url: '/platform/exportmanage/' + id,
method: 'get'
})
}
// 新增导入设置
-export function addConfig(data) {
+export function addExportmanage(data) {
return request({
- url: '/platform/config',
+ url: '/platform/exportmanage',
method: 'post',
data: data
})
}
// 修改导入设置
-export function updateConfig(data) {
+export function updateExportmanage(data) {
return request({
- url: '/platform/config',
+ url: '/platform/exportmanage',
method: 'put',
data: data
})
}
// 删除导入设置
-export function delConfig(id) {
+export function delExportmanage(id) {
return request({
- url: '/platform/config/' + id,
+ url: '/platform/exportmanage/' + id,
method: 'delete'
})
}
diff --git a/jianshui-ui/src/api/platform/exportsetting.js b/jianshui-ui/src/api/platform/exportsetting.js
new file mode 100644
index 0000000..7444c02
--- /dev/null
+++ b/jianshui-ui/src/api/platform/exportsetting.js
@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+//查询单个记录
+export function oneExportmanage() {
+ return request({
+ url: '/platform/exportmanage/findByName',
+ method: 'get'
+ })
+}
+
+
+// 新增导入设置
+export function addExportmanage(data) {
+ return request({
+ url: '/platform/exportmanage',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改导入设置
+export function updateExportmanage(data) {
+ return request({
+ url: '/platform/exportmanage',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除导入设置
+export function delExportmanage(id) {
+ return request({
+ url: '/platform/exportmanage/' + id,
+ method: 'delete'
+ })
+}
diff --git a/jianshui-ui/src/views/platform/config/index.vue b/jianshui-ui/src/views/platform/exportmanage/index.vue
similarity index 92%
rename from jianshui-ui/src/views/platform/config/index.vue
rename to jianshui-ui/src/views/platform/exportmanage/index.vue
index 57bbfe7..86b66b9 100644
--- a/jianshui-ui/src/views/platform/config/index.vue
+++ b/jianshui-ui/src/views/platform/exportmanage/index.vue
@@ -34,7 +34,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['platform:config:add']"
+ v-hasPermi="['platform:exportmanage:add']"
>新增
@@ -45,7 +45,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['platform:config:edit']"
+ v-hasPermi="['platform:exportmanage:edit']"
>修改
@@ -56,7 +56,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['platform:config:remove']"
+ v-hasPermi="['platform:exportmanage:remove']"
>删除
@@ -66,16 +66,16 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['platform:config:export']"
+ v-hasPermi="['platform:exportmanage:export']"
>导出
-
+
-
-
+
+
@@ -114,14 +114,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['platform:config:edit']"
+ v-hasPermi="['platform:exportmanage:edit']"
>修改
删除
@@ -239,10 +239,10 @@
+