Skip to content

A
amos-boot-biz
Commit cbb1dd45 authored by tianbo's avatar tianbo
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents 6dd60665 8f339b90
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 107 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/MaintenancePersonExcleDto.java
View file @ cbb1dd45
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
...@@ -20,77 +21,81 @@ public class MaintenancePersonExcleDto implements Serializable { ...@@ -20,77 +21,81 @@ public class MaintenancePersonExcleDto implements Serializable {
@ExcelIgnore @ExcelIgnore
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelProperty(value = "序号", index = 0) //@ExcelProperty(value = "序号", index = 0)
@ApiModelProperty(value = "序号") @ApiModelProperty(value = "序号")
@ExcelIgnore
private Integer number; private Integer number;
@ExcelProperty(value = "姓名", index = 1) @ExcelProperty(value = "姓名", index = 0)
@ApiModelProperty(value = "姓名") @ApiModelProperty(value = "姓名")
private String name; private String name;
@ExcelProperty(value = "员工编号", index =2) @ExcelProperty(value = "员工编号", index =1)
@ApiModelProperty(value = "员工编号") @ApiModelProperty(value = "员工编号")
protected String code; protected String code;
@ExplicitConstraint(indexNum = 3, sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容 @ExplicitConstraint(indexNum = 2, sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
@ExcelProperty(value = "所属单位及部门", index =3) @ExcelProperty(value = "所属单位及部门", index =2)
@ApiModelProperty(value = "所属单位及部门") @ApiModelProperty(value = "所属单位及部门")
private String parentId; private String parentName;
@ExcelIgnore
private Long parentId;
@ExplicitConstraint(type = "XB", indexNum = 4, sourceClass = RoleNameExplicitConstraint.class) @ExplicitConstraint(type = "XB", indexNum = 3, sourceClass = RoleNameExplicitConstraint.class)
@ExcelProperty(value = "性别", index =4) @ExcelProperty(value = "性别", index =3)
@ApiModelProperty(value = "性别") @ApiModelProperty(value = "性别")
private String gender; private String gender;
@ExcelProperty(value = "身份证号码", index =5) @ExcelProperty(value = "身份证号码", index =4)
@ApiModelProperty(value = "身份证号码") @ApiModelProperty(value = "身份证号码")
private String idNumber; private String idNumber;
@ExcelProperty(value = "手机号码", index =6) @ExcelProperty(value = "手机号码", index =5)
@ApiModelProperty(value = "手机号码") @ApiModelProperty(value = "手机号码")
private String tel; private String tel;
@ExcelProperty(value = "民族", index =7) @ExcelProperty(value = "民族", index =6)
@ApiModelProperty(value = "民族") @ApiModelProperty(value = "民族")
private String nation; private String nation;
//项目负责人、消防设施操作员 //项目负责人、消防设施操作员
@ExcelProperty(value = "类别", index =8) @ExcelProperty(value = "类别", index =7)
@ApiModelProperty(value = "类别") @ApiModelProperty(value = "类别")
private String category; private String category;
@ExcelProperty(value = "统账号", index = 9) @ExcelProperty(value = "统账号", index = 8)
@ApiModelProperty(value = "系统账户") @ApiModelProperty(value = "系统账户")
private String systemAccount; private String systemAccount;
@ExplicitConstraint(type = "WBRYZT", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "WBRYZT", indexNum =9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "人员状态", index =10) @ExcelProperty(value = "人员状态", index =9)
@ApiModelProperty(value = "人员状态") @ApiModelProperty(value = "人员状态")
private String status; private String status;
@ExplicitConstraint(type = "WBZYZS", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "WBZYZS", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "职业资格证书", index =11) @ExcelProperty(value = "职业资格证书", index =10)
@ApiModelProperty(value = "职业资格证书") @ApiModelProperty(value = "职业资格证书")
private String professionalCertificate; private String professionalCertificate;
@ExplicitConstraint(type = "WBZYZG", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "WBZYZG", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "职业资格", index =12) @ExcelProperty(value = "职业资格", index =11)
@ApiModelProperty(value = "职业资格") @ApiModelProperty(value = "职业资格")
private String qualification; private String qualification;
@ExcelProperty(value = "证书编号", index =13) @ExcelProperty(value = "证书编号", index =12)
@ApiModelProperty(value = "证书编号") @ApiModelProperty(value = "证书编号")
private String certificateNo; private String certificateNo;
@ExcelProperty(value = "注册有效期开始时间", index = 14) @ExcelProperty(value = "注册有效期开始时间", index = 13)
@ApiModelProperty(value = "注册有效期开始时间") @ApiModelProperty(value = "注册有效期开始时间")
private String registrationStartTime; private Date registrationStartTime;
@ExcelProperty(value = "注册有效期结束时间", index = 15) @ExcelProperty(value = "注册有效期结束时间", index = 14)
@ApiModelProperty(value = "注册有效期结束时间") @ApiModelProperty(value = "注册有效期结束时间")
private String registrationEndTime; private Date registrationEndTime;
@ExcelProperty(value = "注册号", index = 16) @ExcelProperty(value = "注册号", index = 15)
@ApiModelProperty(value = "注册号") @ApiModelProperty(value = "注册号")
private String amosAccount; private String amosAccount;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/MaintenanceCompanyController.java
View file @ cbb1dd45
...@@ -112,7 +112,6 @@ public class MaintenanceCompanyController extends BaseController { ...@@ -112,7 +112,6 @@ public class MaintenanceCompanyController extends BaseController {
@GetMapping(value = "/allList") @GetMapping(value = "/allList")
@ApiOperation(httpMethod = "GET", value = "所有维保人员/单位/部门列表，不分页", notes = "所有维保人员列表") @ApiOperation(httpMethod = "GET", value = "所有维保人员/单位/部门列表，不分页", notes = "所有维保人员列表")
public ResponseModel<List<Map<String, Object>>> getAllMaintenanceList(@RequestParam String maintenanceType) { public ResponseModel<List<Map<String, Object>>> getAllMaintenanceList(@RequestParam String maintenanceType) {
AgencyUserModel amosUser = getUserInfo();
return ResponseHelper.buildResponse(maintenanceCompanyService.getAllMaintenanceList(maintenanceType)); return ResponseHelper.buildResponse(maintenanceCompanyService.getAllMaintenanceList(maintenanceType));
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java
View file @ cbb1dd45
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -21,26 +42,6 @@ import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper; ...@@ -21,26 +42,6 @@ import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
import com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper; import com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper;
import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService; import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService; import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.function.Function;
import java.util.stream.Collectors;
/** /**
* 维保单位服务实现类 * 维保单位服务实现类
...@@ -111,6 +112,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -111,6 +112,7 @@ public class MaintenanceCompanyServiceImpl
maintenanceCompany.setBizCode(sequence.nextId() + ""); maintenanceCompany.setBizCode(sequence.nextId() + "");
maintenanceCompany.setInstanceId(instanceId); maintenanceCompany.setInstanceId(instanceId);
maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase()); maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase());
maintenanceCompany.setIsDelete(false);
try { try {
this.save(maintenanceCompany); this.save(maintenanceCompany);
...@@ -138,6 +140,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -138,6 +140,7 @@ public class MaintenanceCompanyServiceImpl
} }
maintenanceCompany.setInstanceId(instanceId); maintenanceCompany.setInstanceId(instanceId);
maintenanceCompany.setParentId(parentId); maintenanceCompany.setParentId(parentId);
maintenanceCompany.setIsDelete(false);
try { try {
this.save(maintenanceCompany); this.save(maintenanceCompany);
...@@ -205,6 +208,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -205,6 +208,7 @@ public class MaintenanceCompanyServiceImpl
maintenanceCompany.setInstanceId(instanceId); maintenanceCompany.setInstanceId(instanceId);
maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase()); maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase());
maintenanceCompany.setParentId(parentId); maintenanceCompany.setParentId(parentId);
maintenanceCompany.setIsDelete(false);
try { try {
this.save(maintenanceCompany); this.save(maintenanceCompany);
...@@ -229,8 +233,9 @@ public class MaintenanceCompanyServiceImpl ...@@ -229,8 +233,9 @@ public class MaintenanceCompanyServiceImpl
int number = maintenanceCompanyMapper.update(maintenanceCompany, wrapper); int number = maintenanceCompanyMapper.update(maintenanceCompany, wrapper);
if (number > 0) { if (number > 0) {
// 更新动态表单字段为删除状态 // 更新动态表单字段为删除状态
List<DynamicFormInstance> dyInstance = List<DynamicFormInstance> dyInstance = dynamicFormInstanceService
dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, maintenanceCompany.getInstanceId())); .list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId,
maintenanceCompany.getInstanceId()));
dyInstance.forEach(i -> i.setIsDelete(true)); dyInstance.forEach(i -> i.setIsDelete(true));
dynamicFormInstanceService.updateBatchById(dyInstance); dynamicFormInstanceService.updateBatchById(dyInstance);
...@@ -245,6 +250,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -245,6 +250,7 @@ public class MaintenanceCompanyServiceImpl
LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
wrapper.select(MaintenanceCompany::getCode, MaintenanceCompany::getName); wrapper.select(MaintenanceCompany::getCode, MaintenanceCompany::getName);
wrapper.eq(MaintenanceCompany::getType, COMPANY); wrapper.eq(MaintenanceCompany::getType, COMPANY);
wrapper.eq(MaintenanceCompany::getIsDelete, false);
return maintenanceCompanyMapper.selectMaps(wrapper); return maintenanceCompanyMapper.selectMaps(wrapper);
} }
...@@ -269,8 +275,8 @@ public class MaintenanceCompanyServiceImpl ...@@ -269,8 +275,8 @@ public class MaintenanceCompanyServiceImpl
case DEPARTMENT: case DEPARTMENT:
type = MAINTENANCE_DEPARTMENT; type = MAINTENANCE_DEPARTMENT;
break; break;
default: default:
type = MAINTENANCE_COMPANY; type = MAINTENANCE_COMPANY;
} }
if (StringUtils.isBlank(type)) { if (StringUtils.isBlank(type)) {
return null; return null;
...@@ -286,16 +292,21 @@ public class MaintenanceCompanyServiceImpl ...@@ -286,16 +292,21 @@ public class MaintenanceCompanyServiceImpl
dynamicFormList.forEach(r -> { dynamicFormList.forEach(r -> {
MaintenanceCompany detail = maintenanceCompanyMap.get(Long.parseLong(r.get("instanceId").toString())); MaintenanceCompany detail = maintenanceCompanyMap.get(Long.parseLong(r.get("instanceId").toString()));
if (!ObjectUtils.isEmpty(detail)) { if (!ObjectUtils.isEmpty(detail)) {
if(detail.getParentId()!=null) {
MaintenanceCompany map = maintenanceCompanyMapper.selectById(detail.getParentId());
r.put("parentName", map.getName());
}
r.putAll(Bean.BeantoMap(detail)); r.putAll(Bean.BeantoMap(detail));
} }
}); });
return dynamicFormList; return dynamicFormList;
} }
@Override @Override
public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel() { public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel() {
List<Map<String, Object>> list = this.getAllMaintenanceList(PERSON); List<Map<String, Object>> list = this.getAllMaintenanceList(PERSON);
return JSONArray.parseArray(list.toString(), MaintenancePersonExcleDto.class); return JSONArray.parseArray(JSONArray.toJSONString(list), MaintenancePersonExcleDto.class);
} }
...@@ -366,8 +377,8 @@ public class MaintenanceCompanyServiceImpl ...@@ -366,8 +377,8 @@ public class MaintenanceCompanyServiceImpl
wrapper.eq(MaintenanceCompany::getType, maintenanceType.toUpperCase()); wrapper.eq(MaintenanceCompany::getType, maintenanceType.toUpperCase());
mainTableList = this.list(wrapper); mainTableList = this.list(wrapper);
break; break;
default: default:
throw new IllegalStateException("Unexpected maintenanceType: " + maintenanceType); throw new IllegalStateException("Unexpected maintenanceType: " + maintenanceType);
} }
if (StringUtils.isBlank(type)) { if (StringUtils.isBlank(type)) {
return null; return null;
...@@ -387,14 +398,14 @@ public class MaintenanceCompanyServiceImpl ...@@ -387,14 +398,14 @@ public class MaintenanceCompanyServiceImpl
} }
public List<MaintenanceCompany> checkMaintenanceCompanyList(LambdaQueryWrapper<MaintenanceCompany> wrapper, public List<MaintenanceCompany> checkMaintenanceCompanyList(LambdaQueryWrapper<MaintenanceCompany> wrapper,
Map<String, Object> paramsMap) { Map<String, Object> paramsMap) {
if (paramsMap.containsKey("name")) { if (paramsMap.containsKey("name")) {
wrapper.like(MaintenanceCompany::getName, paramsMap.get("name").toString()); wrapper.like(MaintenanceCompany::getName, paramsMap.get("name").toString());
} }
if (paramsMap.containsKey("parentId") && !"-1".equals(paramsMap.get("parentId"))) { if (paramsMap.containsKey("parentId") && !"-1".equals(paramsMap.get("parentId"))) {
Long parentId = Long.parseLong(paramsMap.get("parentId").toString()); Long parentId = Long.parseLong(paramsMap.get("parentId").toString());
MaintenanceCompany company = MaintenanceCompany company = getOne(
getOne(new LambdaQueryWrapper<MaintenanceCompany>().eq(MaintenanceCompany::getSequenceNbr, parentId)); new LambdaQueryWrapper<MaintenanceCompany>().eq(MaintenanceCompany::getSequenceNbr, parentId));
wrapper.likeRight(MaintenanceCompany::getCode, company.getCode()); wrapper.likeRight(MaintenanceCompany::getCode, company.getCode());
} }
wrapper.eq(MaintenanceCompany::getType, PERSON); wrapper.eq(MaintenanceCompany::getType, PERSON);
...@@ -407,14 +418,14 @@ public class MaintenanceCompanyServiceImpl ...@@ -407,14 +418,14 @@ public class MaintenanceCompanyServiceImpl
MaintenanceCompany maintenanceCompany = maintenanceCompanyMapper.selectById(sequenceNbr); MaintenanceCompany maintenanceCompany = maintenanceCompanyMapper.selectById(sequenceNbr);
String type; String type;
switch (maintenanceCompany.getType()) { switch (maintenanceCompany.getType()) {
case PERSON: case PERSON:
type = MAINTENANCE_PERSON; type = MAINTENANCE_PERSON;
break; break;
case DEPARTMENT: case DEPARTMENT:
type = MAINTENANCE_DEPARTMENT; type = MAINTENANCE_DEPARTMENT;
break; break;
default: default:
type = MAINTENANCE_COMPANY; type = MAINTENANCE_COMPANY;
} }
Map<String, Object> mainMap = Bean.BeantoMap(maintenanceCompany); Map<String, Object> mainMap = Bean.BeantoMap(maintenanceCompany);
Map<String, Object> dynamicMap = dynamicFormInstanceService.getOneMap(maintenanceCompany.getInstanceId(), type); Map<String, Object> dynamicMap = dynamicFormInstanceService.getOneMap(maintenanceCompany.getInstanceId(), type);
...@@ -612,8 +623,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -612,8 +623,7 @@ public class MaintenanceCompanyServiceImpl
} }
Page page = new Page(pageNum, pageSize); Page page = new Page(pageNum, pageSize);
Page<Map<String, Object>> companys = new Page<>(pageNum, pageSize); Page<Map<String, Object>> companys = new Page<>(pageNum, pageSize);
Page<OrgUsrDto> pageResult = this.baseMapper.selectOrgUsrPageList(page, Page<OrgUsrDto> pageResult = this.baseMapper.selectOrgUsrPageList(page, maintenanceCompany.getSequenceNbr());
maintenanceCompany.getSequenceNbr());
List<Map<String, Object>> finalResultMap = Lists.newArrayList(); List<Map<String, Object>> finalResultMap = Lists.newArrayList();
// 机场组装单位动态表单数据 // 机场组装单位动态表单数据
pageResult.getRecords().forEach(orgUsrDto -> { pageResult.getRecords().forEach(orgUsrDto -> {
...@@ -635,17 +645,16 @@ public class MaintenanceCompanyServiceImpl ...@@ -635,17 +645,16 @@ public class MaintenanceCompanyServiceImpl
*/ */
public MaintenanceCompany getMaintenanceCompany(String amosUserId) { public MaintenanceCompany getMaintenanceCompany(String amosUserId) {
MaintenanceCompany maintenanceCompany; MaintenanceCompany maintenanceCompany;
DynamicFormInstance dyFormInstance = DynamicFormInstance dyFormInstance = dynamicFormInstanceService.getOne(
dynamicFormInstanceService.getOne(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "amosAccount").eq(DynamicFormInstance::getFieldValue, amosUserId)); new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "amosAccount")
.eq(DynamicFormInstance::getFieldValue, amosUserId));
if (ValidationUtil.isEmpty(dyFormInstance)) { if (ValidationUtil.isEmpty(dyFormInstance)) {
throw new BadRequest("维保账号不存在或未关联系统账号."); throw new BadRequest("维保账号不存在或未关联系统账号.");
} }
MaintenanceCompany person = MaintenanceCompany person = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
this.getOne(new LambdaQueryWrapper<MaintenanceCompany>().eq(MaintenanceCompany::getInstanceId, .eq(MaintenanceCompany::getInstanceId, dyFormInstance.getInstanceId()));
dyFormInstance.getInstanceId())); maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
maintenanceCompany = .eq(MaintenanceCompany::getSequenceNbr, person.getParentId()));
this.getOne(new LambdaQueryWrapper<MaintenanceCompany>().eq(MaintenanceCompany::getSequenceNbr,
person.getParentId()));
if (ValidationUtil.isEmpty(maintenanceCompany)) { if (ValidationUtil.isEmpty(maintenanceCompany)) {
throw new BadRequest("维保账号不存在或未关联系统账号."); throw new BadRequest("维保账号不存在或未关联系统账号.");
} }
...@@ -707,33 +716,34 @@ public class MaintenanceCompanyServiceImpl ...@@ -707,33 +716,34 @@ public class MaintenanceCompanyServiceImpl
Map<String, Object> maintenancePersonExcleDtoMap = Bean.BeantoMap(maintenancePersonExcleDto); Map<String, Object> maintenancePersonExcleDtoMap = Bean.BeantoMap(maintenancePersonExcleDto);
// 填充动态表单的属性 // 填充动态表单的属性
for (Entry<String, Object> mapDetail : maintenancePersonExcleDtoMap.entrySet()) {
DynamicFormInstance dynamicFormInstance = new DynamicFormInstance(); columns.stream().forEach(item -> {
if (maintenancePersonExcleDtoMap.containsKey(item.getFieldCode())) {
columns.stream().forEach(item -> { DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
if (mapDetail.getKey().equals(item.getFieldCode())) { String valueString = maintenancePersonExcleDtoMap.get(item.getFieldCode()).toString();
Bean.copyExistPropertis(item, dynamicFormInstance); Bean.copyExistPropertis(item, dynamicFormInstance);
dynamicFormInstance.setAppKey(RequestContext.getAppKey()); dynamicFormInstance.setAppKey(RequestContext.getAppKey());
dynamicFormInstance.setInstanceId(instanceId); dynamicFormInstance.setInstanceId(instanceId);
dynamicFormInstance.setSequenceNbr(sequence.nextId()); dynamicFormInstance.setSequenceNbr(sequence.nextId());
dynamicFormInstance.setFormColumnId(item.getSequenceNbr()); dynamicFormInstance.setFormColumnId(item.getSequenceNbr());
dynamicFormInstance.setFieldValue(maintenancePersonExcleDtoMap.get(item.getFieldCode()) != null dynamicFormInstance.setFieldValue(maintenancePersonExcleDtoMap.get(item.getFieldCode()) != null
? maintenancePersonExcleDtoMap.get(item.getFieldCode()).toString() ? maintenancePersonExcleDtoMap.get(item.getFieldCode()).toString()
: ""); : "");
if (mapDetail.getValue().toString().contains("@")) { if (valueString.contains("@")) {
String[] mapDetailArray = mapDetail.getValue().toString().split("@"); String[] mapDetailArray = valueString.split("@");
dynamicFormInstance.setFieldValue(mapDetailArray[0]); dynamicFormInstance.setFieldValue(mapDetailArray[0]);
if (mapDetailArray.length > 1) { if (mapDetailArray.length > 1) {
dynamicFormInstance.setFieldValueLabel(mapDetailArray[1]); dynamicFormInstance.setFieldValueLabel(mapDetailArray[1]);
}
} }
} }
}); if (dynamicFormInstance != null && dynamicFormInstance.getSequenceNbr().longValue() > 0) {
if (dynamicFormInstance != null && dynamicFormInstance.getSequenceNbr().longValue() > 0) { list.add(dynamicFormInstance);
list.add(dynamicFormInstance); }
} }
}
});
return list; return list;
} }
...@@ -768,16 +778,16 @@ public class MaintenanceCompanyServiceImpl ...@@ -768,16 +778,16 @@ public class MaintenanceCompanyServiceImpl
company = this.getById(companyId); company = this.getById(companyId);
} }
// 查询公司下人列表 // 查询公司下人列表
List<MaintenanceCompany> personList = List<MaintenanceCompany> personList = list(new LambdaQueryWrapper<MaintenanceCompany>()
list(new LambdaQueryWrapper<MaintenanceCompany>().eq(MaintenanceCompany::getIsDelete, false).eq(MaintenanceCompany::getType, PERSON).likeRight(MaintenanceCompany::getCode, company.getCode() .eq(MaintenanceCompany::getIsDelete, false).eq(MaintenanceCompany::getType, PERSON)
)); .likeRight(MaintenanceCompany::getCode, company.getCode()));
List<Long> instanceIdList = Lists.transform(personList, MaintenanceCompany::getInstanceId); List<Long> instanceIdList = Lists.transform(personList, MaintenanceCompany::getInstanceId);
// 查询手机号 // 查询手机号
List<DynamicFormInstance> dynamicFormInstanceList = List<DynamicFormInstance> dynamicFormInstanceList = dynamicFormInstanceService
dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "tel").in(DynamicFormInstance::getInstanceId, .list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "tel")
instanceIdList)); .in(DynamicFormInstance::getInstanceId, instanceIdList));
Map<Long, List<DynamicFormInstance>> dyMap = Map<Long, List<DynamicFormInstance>> dyMap = dynamicFormInstanceList.stream()
dynamicFormInstanceList.stream().collect(Collectors.groupingBy(DynamicFormInstance::getInstanceId)); .collect(Collectors.groupingBy(DynamicFormInstance::getInstanceId));
List<Map<String, Object>> resultList = Lists.newArrayList(); List<Map<String, Object>> resultList = Lists.newArrayList();
personList.forEach(person -> { personList.forEach(person -> {
Map<String, Object> map = Maps.newHashMap(); Map<String, Object> map = Maps.newHashMap();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java
View file @ cbb1dd45
...@@ -208,6 +208,11 @@ public class ExcelController extends BaseController { ...@@ -208,6 +208,11 @@ public class ExcelController extends BaseController {
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
firefightersExcelDtoList, FirefightersExcelDto.class, null, false); firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
break; break;
case ExcelEnums.WBRY:
List<MaintenancePersonExcleDto> maintenancePersonExcleDtoList = maintenanceCompanyService.exportToMaintenancePersonExcel();
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
maintenancePersonExcleDtoList, MaintenancePersonExcleDto.class, null, false);
break;
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -275,7 +280,7 @@ public class ExcelController extends BaseController { ...@@ -275,7 +280,7 @@ public class ExcelController extends BaseController {
maintenanceCompany = Bean.toPo(maintenancePersonExcleDto, maintenanceCompany); maintenanceCompany = Bean.toPo(maintenancePersonExcleDto, maintenanceCompany);
maintenanceCompany.setType(PERSON); maintenanceCompany.setType(PERSON);
if (maintenanceCompany.getParentId() != null) { if (maintenanceCompany.getParentId() != null) {
long getParentId = Long.valueOf(maintenancePersonExcleDto.getParentId().split("@")[1]); long getParentId = Long.valueOf(maintenancePersonExcleDto.getParentName().split("@")[1]);
maintenanceCompany.setParentId(getParentId); maintenanceCompany.setParentId(getParentId);
} }
if (maintenanceCompanyService.checkPersonCodeExists(maintenancePersonExcleDto.getCode())) { if (maintenanceCompanyService.checkPersonCodeExists(maintenancePersonExcleDto.getCode())) {
...@@ -283,6 +288,8 @@ public class ExcelController extends BaseController { ...@@ -283,6 +288,8 @@ public class ExcelController extends BaseController {
} else { } else {
maintenanceCompany.setCode(null); maintenanceCompany.setCode(null);
} }
maintenanceCompany.setOrgCode(null);
maintenanceCompany.setBizCode(sequence.nextId() + "");
maintenanceCompany.setInstanceId(instanceId); maintenanceCompany.setInstanceId(instanceId);
maintenanceCompanyList.add(maintenanceCompany); maintenanceCompanyList.add(maintenanceCompany);
maintenanceCompanyService.maintenancePersonExcleDtoToDynamicFormInstanceList(columns,maintenancePersonExcleDto, instanceId, dynamicFormInstanceList); maintenanceCompanyService.maintenancePersonExcleDtoToDynamicFormInstanceList(columns,maintenancePersonExcleDto, instanceId, dynamicFormInstanceList);
......
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