diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java index c0bf0ba..0ca7f03 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java @@ -119,7 +119,7 @@ public class CompanyStore extends BaseEntity private BigDecimal daishouRatio; /** 标签 1.可租车 2.可换电 3.二手车,多个用,号隔开,例如1,2,3 */ - @Excel(name = "标签 1.可租车 2.可换电 3.二手车,多个用,号隔开,例如1,2,3") + @Excel(name = "标签") private String label; /** 运营公司id */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java index 4632296..bc46374 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java @@ -56,6 +56,11 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService { companyStore.setCreateTime(DateUtils.getNowDate()); companyStore.setUpdateTime(DateUtils.getNowDate()); + if(companyStore.getAuditStatus().equals("1")){ + companyStore.setStatus("0"); + }else{ + companyStore.setStatus("0"); + } return companyStoreMapper.insertCompanyStore(companyStore); } @@ -69,6 +74,11 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService public int updateCompanyStore(CompanyStore companyStore) { companyStore.setUpdateTime(DateUtils.getNowDate()); + if(companyStore.getAuditStatus().equals("1")){ + companyStore.setStatus("0"); + }else{ + companyStore.setStatus("0"); + } return companyStoreMapper.updateCompanyStore(companyStore); } diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/distribute.html b/ruoyi-admin/src/main/resources/templates/operation/car/distribute.html index 7fdaa77..9900313 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/car/distribute.html +++ b/ruoyi-admin/src/main/resources/templates/operation/car/distribute.html @@ -34,7 +34,7 @@
提示:可以拖动地图中的标记来精确定位