Skip to content

A
amos-boot-biz
Commit c64543ea authored by tangwei's avatar tangwei
Browse files
Options

修改应急组织bug

parent 14b4fe8e
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 55 deletions
.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml deleted 100644 → 0
View file @ 14b4fe8e
<component name="libraryTable">
<library name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml deleted 100644 → 0
View file @ 14b4fe8e
<component name="libraryTable">
<library name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/OrganizationUser.java
View file @ c64543ea
......@@ -43,6 +43,7 @@ public class OrganizationUser extends BaseEntity {
@ApiModelProperty(value = "会商码")
private String consultationNub;
@ApiModelProperty(value = "排序")
private int sort;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/OrganizationMapper.java
View file @ c64543ea
......@@ -26,6 +26,6 @@ public interface OrganizationMapper extends BaseMapper<Organization> {
List<OrganizationUserExportDto> selectOrganizationUserList(@Param("bizOrgCode") String bizOrgCode);
int selectMaxSort();
int selectOrganizationUserMaxSort();
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrganizationMapper.xml
View file @ c64543ea
......@@ -123,4 +123,8 @@
SELECT IFNULL( MAX(sort),0) FROM cb_organization
</select>
<select id="selectOrganizationUserMaxSort" resultType="java.lang.Integer">
SELECT IFNULL( MAX(sort),0) FROM cb_organization
</select>
</mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrganizationController.java
View file @ c64543ea
......@@ -186,7 +186,7 @@ public class OrganizationController extends BaseController {
} catch (IOException e) {
e.printStackTrace();
return CommonResponseUtil.failure();
throw new RuntimeException(e.getMessage());
}
return CommonResponseUtil.success();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrganizationUserController.java
View file @ c64543ea
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jcs.api.entity.Organization;
import com.yeejoin.amos.boot.module.jcs.api.entity.OrganizationUser;
import com.yeejoin.amos.boot.module.jcs.api.mapper.OrganizationMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IOrganizationUserService;
import com.yeejoin.amos.boot.module.jcs.api.service.OrganizationService;
import io.swagger.annotations.Api;
......@@ -22,7 +23,8 @@ public class OrganizationUserController extends BaseController {
@Autowired
private IOrganizationUserService organizationUserService;
@Autowired
private OrganizationMapper organizationMapper;
/**
* 新增应急小组成员
* @return
......@@ -31,6 +33,10 @@ public class OrganizationUserController extends BaseController {
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增应急小组用户", notes = "新增应急小组用户")
public ResponseModel<OrganizationUser> save(@RequestBody OrganizationUser organizationUser) {
int sort = organizationMapper.selectOrganizationUserMaxSort();
organizationUser.setSort(sort+1);
return ResponseHelper.buildResponse(organizationUserService.saveOrganization(organizationUser));
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationImpl.java
View file @ c64543ea
......@@ -72,33 +72,82 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
@Override
@Transactional
public void saveOrganization(List<OrganizationExportDto> data, List<OrganizationUserExportDto> userData, String bizOrgCode) {
int sort = organizationMapper.selectMaxSort();
checkOrganizationData(data);
checkOrganizationUserData(userData);
for (OrganizationExportDto dto : data) {
LambdaQueryWrapper<Organization> lambda = new QueryWrapper<Organization>().lambda();
lambda.eq(Organization::getIsDelete, false);
lambda.eq(Organization::getEmergencyTeamName, dto.getEmergencyTeamName());
List<Organization> organizations = organizationMapper.selectList(lambda);
Organization organization = new Organization();
if (CollectionUtils.isEmpty(organizations)){
BeanUtils.copyProperties(dto, organization);
sort = sort + 1;
organization.setSort(sort);
organization.setBizOrgCode(bizOrgCode);
organizationMapper.insert(organization);
}else {
Organization organization1 = organizations.get(0);
BeanUtils.copyProperties(organization1, organization);
//由于可以单独导入组，或者单独导入人，只做都为空效验
if(data==null&&userData==null){
throw new BadRequest("请填入数据导入！");
}
//对分组数据入库
if(data.size()>0){
int sort = organizationMapper.selectMaxSort();
checkOrganizationData(data);
for (OrganizationExportDto dto : data) {
LambdaQueryWrapper<Organization> lambda = new QueryWrapper<Organization>().lambda();
lambda.eq(Organization::getIsDelete, false);
lambda.eq(Organization::getEmergencyTeamName, dto.getEmergencyTeamName());
List<Organization> organizations = organizationMapper.selectList(lambda);
Organization organization = new Organization();
if (CollectionUtils.isEmpty(organizations)){
BeanUtils.copyProperties(dto, organization);
sort = sort + 1;
organization.setSort(sort);
organization.setBizOrgCode(bizOrgCode);
organizationMapper.insert(organization);
}else{
throw new BadRequest("用户组"+dto.getEmergencyTeamName()+"已存不能重复导入！");
}
}
List<OrganizationUserExportDto> collect = userData.stream().filter(item -> item.getEmergencyTeamName().equals(dto.getEmergencyTeamName())).collect(Collectors.toList());
for (OrganizationUserExportDto userExportDto : collect) {
}
//对人员数据入库
if(userData.size()>0){
checkOrganizationUserData(userData);
int sort = organizationMapper.selectOrganizationUserMaxSort();
for (OrganizationUserExportDto userExportDto : userData) {
OrganizationUser organizationUser = new OrganizationUser();
BeanUtils.copyProperties(userExportDto, organizationUser);
organizationUser.setEmergencyTeamId(String.valueOf(organization.getSequenceNbr()));
organizationUserMapper.insert(organizationUser);
LambdaQueryWrapper<Organization> lambda = new QueryWrapper<Organization>().lambda();
lambda.eq(Organization::getIsDelete, false);
lambda.eq(Organization::getEmergencyTeamName, userExportDto.getEmergencyTeamName());
List<Organization> organizations = organizationMapper.selectList(lambda);
if (CollectionUtils.isEmpty(organizations)){
throw new BadRequest("用户组"+userExportDto.getEmergencyTeamName()+"不存在，请先导入用户组！");
}else{
organizationUser.setEmergencyTeamId(String.valueOf(organizations.get(0).getSequenceNbr()));
sort = sort + 1;
organizationUser.setSort(sort);
organizationUserMapper.insert(organizationUser);
}
}
}
// int sort = organizationMapper.selectMaxSort();
// checkOrganizationData(data);
// checkOrganizationUserData(userData);
// for (OrganizationExportDto dto : data) {
// LambdaQueryWrapper<Organization> lambda = new QueryWrapper<Organization>().lambda();
// lambda.eq(Organization::getIsDelete, false);
// lambda.eq(Organization::getEmergencyTeamName, dto.getEmergencyTeamName());
// List<Organization> organizations = organizationMapper.selectList(lambda);
// Organization organization = new Organization();
// if (CollectionUtils.isEmpty(organizations)){
// BeanUtils.copyProperties(dto, organization);
// sort = sort + 1;
// organization.setSort(sort);
// organization.setBizOrgCode(bizOrgCode);
// organizationMapper.insert(organization);
// }else {
// Organization organization1 = organizations.get(0);
// BeanUtils.copyProperties(organization1, organization);
// }
// List<OrganizationUserExportDto> collect = userData.stream().filter(item -> item.getEmergencyTeamName().equals(dto.getEmergencyTeamName())).collect(Collectors.toList());
// for (OrganizationUserExportDto userExportDto : collect) {
// OrganizationUser organizationUser = new OrganizationUser();
// BeanUtils.copyProperties(userExportDto, organizationUser);
// organizationUser.setEmergencyTeamId(String.valueOf(organization.getSequenceNbr()));
// organizationUserMapper.insert(organizationUser);
// }
// }
}
private void checkOrganizationData(List<OrganizationExportDto> data) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationUserImpl.java
View file @ c64543ea
......@@ -38,7 +38,8 @@ public class OrganizationUserImpl extends BaseService<OrganizationUser,Organizat
if (!ObjectUtils.isEmpty(id) && id != 0) {
wrapper.eq(OrganizationUser::getEmergencyTeamId, id);
}
wrapper.orderByDesc(BaseEntity::getRecDate);
// wrapper.orderByDesc(BaseEntity::getRecDate);
wrapper.orderByDesc(OrganizationUser::getSort);
return this.baseMapper.selectPage(page, wrapper);
}
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ c64543ea
......@@ -3678,5 +3678,18 @@
</sql>
</changeSet>
<changeSet author="tw" id="20221227-tw-01">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_organization_user" columnName="sort"/>
</not>
</preConditions>
<comment>modify table cb_organization_user add columns</comment>
<sql>
ALTER TABLE `cb_organization_user` ADD `sort` int(11) DEFAULT NULL COMMENT '排序'
</sql>
</changeSet>
</databaseChangeLog>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment