Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao
# Conflicts: # couplet-auth/src/main/resources/bootstrap.yml # couplet-gateway/src/main/resources/bootstrap.yml # couplet-modules/couplet-file/src/main/resources/bootstrap.yml # couplet-modules/couplet-gen/src/main/resources/bootstrap.yml # couplet-modules/couplet-job/src/main/resources/bootstrap.yml # couplet-modules/couplet-system/src/main/resources/bootstrap.yml # couplet-modules/pom.xml # couplet-visual/couplet-monitor/src/main/resources/bootstrap.ymlserver_five_liuyunhu
lijiayao
commit
089068a745
|
|
@ -15,9 +15,11 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
|
|
@ -13,13 +13,30 @@ public class SysFirm {
|
|||
/**
|
||||
* 企业id
|
||||
**/
|
||||
private Integer firmId;
|
||||
private Integer deptId;
|
||||
/**
|
||||
* 企业名称
|
||||
**/
|
||||
private String firmName;
|
||||
private String deptName;
|
||||
/**
|
||||
* 企业认证
|
||||
**/
|
||||
private Integer approveId;
|
||||
* 企业负责人
|
||||
**/
|
||||
private String leader;
|
||||
/**
|
||||
* 企业联系电话
|
||||
**/
|
||||
private String phone;
|
||||
/**
|
||||
* 企业删除
|
||||
**/
|
||||
private Integer delFlag;
|
||||
/**
|
||||
* 企业状态
|
||||
**/
|
||||
private String status;
|
||||
/**
|
||||
* 企业创建人
|
||||
**/
|
||||
private String createBy;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,9 +15,11 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
|
|
@ -3,11 +3,9 @@ package com.couplet.system.controller;
|
|||
import com.couplet.common.core.domain.Result;
|
||||
import com.couplet.common.system.domain.SysFirm;
|
||||
import com.couplet.system.service.SysFirmService;
|
||||
import io.swagger.models.auth.In;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -61,4 +59,17 @@ public class SysFirmController {
|
|||
Result<Integer> result = Result.success(i);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description // 删除企业 附属的员工一并删除
|
||||
* @Date 2024/3/29
|
||||
* @param deptId
|
||||
* @return com.couplet.common.core.domain.Result
|
||||
**/
|
||||
@DeleteMapping("delFirm/{deptId}")
|
||||
public Result delFirm(@PathVariable Integer deptId){
|
||||
int i = sysFirmService.delFirm(deptId);
|
||||
Result<Integer> success = Result.success(i);
|
||||
return success;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,4 +19,6 @@ public interface SysFirmMapper {
|
|||
|
||||
int updateFirm(SysFirm sysFirm);
|
||||
|
||||
int delFirm(Integer deptId);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,4 +16,6 @@ public interface SysFirmService {
|
|||
int addFirm(SysFirm sysFirm);
|
||||
|
||||
int updateFirm(SysFirm sysFirm);
|
||||
|
||||
int delFirm(Integer deptId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,4 +32,9 @@ public class SysFirmServiceImpl implements SysFirmService {
|
|||
public int updateFirm(SysFirm sysFirm) {
|
||||
return sysFirmMapper.updateFirm(sysFirm);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int delFirm(Integer deptId) {
|
||||
return sysFirmMapper.delFirm(deptId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,9 +15,11 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
|
|
@ -4,19 +4,27 @@
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.couplet.system.mapper.SysFirmMapper">
|
||||
<insert id="addFirm">
|
||||
INSERT INTO `ry-cloud`.`yyh_firm` ( `firm_name`)
|
||||
VALUES ( #{firmName});
|
||||
INSERT INTO `ry-cloud`.`sys_dept`
|
||||
( `dept_name`, `leader`, `phone`, `status`, `del_flag`, `create_by` )
|
||||
VALUES ( #{deptName}, #{leader}, #{phone}, #{status}, #{delFlag}, #{createBy});
|
||||
|
||||
|
||||
</insert>
|
||||
<update id="updateFirm">
|
||||
|
||||
UPDATE `ry-cloud`.`yyh_firm`
|
||||
SET `firm_name` = #{firmName}, `approve_id` = #{approveId}
|
||||
WHERE `firm_id` = #{firmId};
|
||||
UPDATE `ry-cloud`.`sys_dept`
|
||||
SET `dept_name` = #{deptName}, `leader` = #{leader}, `phone` = #{phone}, `status` = #{status}, `del_flag` = 0, `create_by` = #{createBy}
|
||||
WHERE `dept_id` = #{deptId};
|
||||
|
||||
|
||||
</update>
|
||||
<delete id="delFirm">
|
||||
update `sys_dept`
|
||||
set del_flag = '2'
|
||||
where dept_id = #{deptId}
|
||||
</delete>
|
||||
|
||||
<select id="firmList" resultType="com.couplet.common.system.domain.SysFirm">
|
||||
select * from yyh_firm;
|
||||
select * from sys_dept where del_flag = 0
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
Loading…
Reference in New Issue