From a51291a48042de026dcce00cec37e735529d496f Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 19 六月 2024 09:48:48 +0800
Subject: [PATCH] 企业状态开关添加
---
project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 1 +
project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java | 35 +++++++++++++++++++++++++++++++----
project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java | 11 +++++++++++
project-system/src/main/java/com/project/system/service/ISysCompanyService.java | 9 +++++++++
4 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
index 9d84510..cbf117c 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
@@ -91,6 +91,17 @@
}
+ @ApiOperation("浼佷笟淇℃伅鐘舵�佸紑鍏�")
+ //@PreAuthorize("@ss.hasPermi('system:company:edit')")
+ @Log(title = "浼佷笟淇℃伅鐘舵�佸紑鍏�", businessType = BusinessType.UPDATE)
+ @PostMapping("/updStatus")
+ @RepeatSubmit
+ public AjaxResult updStatus(@RequestBody SysCompanyBo bo)
+ {
+ return toAjax(iSysCompanyService.updStatus(bo) ? 1 : 0);
+ }
+
+
@ApiOperation("鍒犻櫎浼佷笟淇℃伅")
//@PreAuthorize("@ss.hasPermi('system:company:remove')")
@Log(title = "浼佷笟淇℃伅" , businessType = BusinessType.DELETE)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
index e3cc10c..b3cb883 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
@@ -72,6 +72,7 @@
order.setCheckStatus(1);
} else {
order.setCheckStatus(2);
+ order.setOrderStatus(2);
}
//瀹℃壒鐧昏鍔�1
order.setCheckLevel(order.getCheckLevel()+1);
diff --git a/project-system/src/main/java/com/project/system/service/ISysCompanyService.java b/project-system/src/main/java/com/project/system/service/ISysCompanyService.java
index c662d21..1334b83 100644
--- a/project-system/src/main/java/com/project/system/service/ISysCompanyService.java
+++ b/project-system/src/main/java/com/project/system/service/ISysCompanyService.java
@@ -44,6 +44,13 @@
Boolean updateByBo(SysCompanyBo bo);
/**
+ * 鐘舵�佸紑鍏�
+ * @param bo 鍙傛暟
+ * @return 缁撴灉
+ */
+ Boolean updStatus(SysCompanyBo bo);
+
+ /**
* 鏍￠獙骞跺垹闄ゆ暟鎹�
* @param ids 涓婚敭闆嗗悎
* @return true鎴愬姛 false澶辫触
@@ -70,4 +77,6 @@
* @return 缁撴灉
*/
Boolean saveImport(SysCompanyResultVo resultVo);
+
+
}
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
index e43b05a..8b65360 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
@@ -62,7 +62,7 @@
SysCompany add = Convert.convert(SysCompany.class, bo);
validEntityBeforeSave(add);
boolean save = this.save(add);
- addCompanyUser(add);
+ addCompanyUser(add, 0);
return save;
}
@@ -77,10 +77,23 @@
if (!delUser) {
throw new BaseException("鍘熶紒涓氱敤鎴锋竻闄ゅけ璐ワ紝璇疯仈绯荤鐞嗗憳锛�");
}
- this.addCompanyUser(update);
+ this.addCompanyUser(update, 0);
}
validEntityBeforeSave(update);
return this.updateById(update);
+ }
+
+ @Override//鐘舵�佸紑鍏�
+ @Transactional
+ public Boolean updStatus(SysCompanyBo bo)
+ {
+ if (bo.getCompanyId()==null || bo.getCompanyStatus()==null) {
+ throw new BaseException("鍙傛暟鏈夎锛岀姸鎬佷慨鏀瑰け璐ワ紒");
+ }
+ SysCompany company = this.getById(bo.getCompanyId());
+ company.setCompanyStatus(bo.getCompanyStatus());
+ updCompanyUserStatus(company.getCompanyPhone(), bo.getCompanyStatus());
+ return this.updateById(company);
}
@Override//鍒犻櫎
@@ -137,7 +150,9 @@
});
List<SysCompany> companies = Convert.toList(SysCompany.class, resultVo.getVoList());
boolean b = this.saveOrUpdateBatch(companies);
- companies.forEach(this::addCompanyUser);
+ for (SysCompany company : companies) {
+ addCompanyUser(company,1);
+ }
return b;
}
@@ -237,9 +252,15 @@
* @param entity 浼佷笟淇℃伅
*/
@Async
- protected void addCompanyUser(SysCompany entity)
+ protected void addCompanyUser(SysCompany entity, Integer isImport)
{
+
SysUser user = new SysUser();
+ if (isImport==1){
+ user.setStatus("0");
+ } else {
+ user.setStatus("1");
+ }
SysCompany one = this.getOne(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()));
String phone = entity.getCompanyPhone();
user.setPhonenumber(phone);
@@ -268,6 +289,12 @@
userService.insertUser(user);
}
+ @Async
+ protected void updCompanyUserStatus(String phone, Integer status)
+ {
+ userService.update(userService.lu().set(SysUser::getStatus,status).eq(SysUser::getPhonenumber, phone));
+ }
+
/**
* 鍒犻櫎浼佷笟鐢ㄦ埛
* @param companyId 浼佷笟id
--
Gitblit v1.9.1