Skip to content

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

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

parents 209b0386 a9ecb809
Show whitespace changes
Inline Side-by-side
Showing with 197 additions and 206 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IMaintenanceCompanyService.java
View file @ 8bf51a2e
......@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceDepartmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonDto;
import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
/**
* 维保单位接口类
......@@ -30,7 +31,7 @@ public interface IMaintenanceCompanyService {
* @param maintenanceCompany
* @return
*/
public boolean savePersonDetail(MaintenancePersonDto maintenancePerson, String Companycode);
public boolean savePersonDetail(MaintenancePersonDto maintenancePerson, Map<String, Long> params);
/**
* 自定义假删除
......@@ -53,7 +54,7 @@ public interface IMaintenanceCompanyService {
* @param maintenanceDepartment
* @return
*/
public boolean saveDepartmentDetail(MaintenanceDepartmentDto maintenanceDepartment ,String Companycode);
public boolean saveDepartmentDetail(MaintenanceDepartmentDto maintenanceDepartment, long sequenceNbr) ;
/**
* 检查当前的员工编号是否已经存在
......@@ -81,20 +82,20 @@ public interface IMaintenanceCompanyService {
* @param maintenanceType 类型（COMPANY单位，PERSON人员，DEPARTMENT部门）
* @return
*/
IPage<Map<String, Object>> getPageMaintenanceList(int current, int size, String maintenanceType,String name,long parentId,String isWork);
IPage<Map<String, Object>> getPageMaintenanceList( Map<String, Object> paramsMap);
/**根据主键查询对应的信息
* @param sequenceNbr 主键
* @return
*/
Map<String, Object> findByInstanceId(Long instanceId,String maintenanceType );
Map<String, Object> findBySequenceNbr(Long sequenceNbr,String maintenanceType );
/**
* 修改维保单位
* @param model
* @return
*/
boolean updateMaintenanceCompanyDetail(MaintenanceCompanyDto model);
boolean updateMaintenanceCompanyDetail(MaintenanceCompanyDto model,AgencyUserModel userInfo);
/**
......@@ -102,17 +103,16 @@ public interface IMaintenanceCompanyService {
* @param MaintenanceDepartmentDto
* @return
*/
public boolean updateMaintenancDepartmentDetail(MaintenanceDepartmentDto model, String Companycode);
public boolean updateMaintenancDepartmentDetail(MaintenanceDepartmentDto model,AgencyUserModel userInfo);
/**
* 修改维保人员
* @param MaintenancePersonDto
* @param Companycode
* @return
*/
public boolean updateMaintenancePersonDetail(MaintenancePersonDto model, String Companycode);
public boolean updateMaintenancePersonDetail(MaintenancePersonDto model,AgencyUserModel userInfo);
/**
* 查询所有的单位-部门树
* @return
......
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 @ 8bf51a2e
......@@ -21,7 +21,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceDepartmentDto;
......@@ -84,9 +83,9 @@ public class MaintenanceCompanyController extends BaseController {
@PostMapping(value = "/person/save")
@ApiOperation(httpMethod = "POST", value = "新增维保人员", notes = "新增维保人员")
public ResponseModel<Boolean> saveMaintenancePerson(@RequestBody MaintenancePersonDto model,
@RequestParam String Companycode) throws Exception {
@RequestBody Map<String, Long> params) throws Exception {
model.setType(PERSON);
return ResponseHelper.buildResponse(maintenanceCompanyService.savePersonDetail(model, Companycode));
return ResponseHelper.buildResponse(maintenanceCompanyService.savePersonDetail(model, params));
}
/**
......@@ -126,14 +125,17 @@ public class MaintenanceCompanyController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page/List")
@ApiOperation(httpMethod = "GET", value = "所有维保人员/单位/部门分页列表", notes = "所有维保人员列表")
@PostMapping(value = "/page/List")
@ApiOperation(httpMethod = "POST", value = "所有维保人员/单位/部门分页列表", notes = "所有维保人员列表")
public ResponseModel<IPage<Map<String, Object>>> getPageMaintenanceList(
@RequestParam(value = "current") int current, @RequestParam(value = "size") int size,
@RequestParam String maintenanceType, @RequestParam String name, @RequestParam long parentId,
@RequestParam String isWork) throws Exception {
@RequestBody Map<String, Object> paramsMap
// @RequestParam(value = "current") int current, @RequestParam(value = "size") int size,
//
// @RequestParam String maintenanceType, @RequestParam String name, @RequestParam long parentId,
// @RequestParam String isWork
) throws Exception {
return ResponseHelper
.buildResponse(maintenanceCompanyService.getPageMaintenanceList(current, size, maintenanceType,name,parentId,isWork));
.buildResponse(maintenanceCompanyService.getPageMaintenanceList(paramsMap));
}
/**
......@@ -146,9 +148,9 @@ public class MaintenanceCompanyController extends BaseController {
@PostMapping(value = "/department/save")
@ApiOperation(httpMethod = "POST", value = "新增维保部门", notes = "新增维保部门")
public ResponseModel<Boolean> saveMaintenanceDepartment(@RequestBody MaintenanceDepartmentDto model,
@RequestParam String Companycode) {
@RequestParam long sequenceNbr) {
model.setType(DEPARTMENT);
return ResponseHelper.buildResponse(maintenanceCompanyService.saveDepartmentDetail(model, Companycode));
return ResponseHelper.buildResponse(maintenanceCompanyService.saveDepartmentDetail(model, sequenceNbr));
}
/**
......@@ -170,14 +172,14 @@ public class MaintenanceCompanyController extends BaseController {
* @param sequenceNbr 主键
* @return
*/
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @PutMapping(value = "put/company/{sequenceNbr}")
// @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位", notes = "根据sequenceNbr更新维保单位")
// public ResponseModel<Boolean> updateBySequenceNbrMaintenanceCompany(@RequestBody MaintenanceCompanyDto model,
// @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
// model.setSequenceNbr(sequenceNbr);
// return ResponseHelper.buildResponse(maintenanceCompanyService.updateMaintenanceCompanyDetail(model));
// }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "put/company/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位", notes = "根据sequenceNbr更新维保单位")
public ResponseModel<Boolean> updateBySequenceNbrMaintenanceCompany(@RequestBody MaintenanceCompanyDto model,
@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(maintenanceCompanyService.updateMaintenanceCompanyDetail(model,getUserInfo()));
}
/**
* 根据sequenceNbr更新
......@@ -189,10 +191,10 @@ public class MaintenanceCompanyController extends BaseController {
@PutMapping(value = "put/person/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位人员", notes = "根据sequenceNbr更新维保单位")
public ResponseModel<Boolean> updateBySequenceNbrMaintenancePerson(@RequestBody MaintenancePersonDto model,
@PathVariable(value = "sequenceNbr") Long sequenceNbr, @RequestParam String Companycode) {
@PathVariable(value = "sequenceNbr") Long sequenceNbr){
model.setSequenceNbr(sequenceNbr);
return ResponseHelper
.buildResponse(maintenanceCompanyService.updateMaintenancePersonDetail(model, Companycode));
.buildResponse(maintenanceCompanyService.updateMaintenancePersonDetail(model,getUserInfo()));
}
/**
......@@ -205,10 +207,10 @@ public class MaintenanceCompanyController extends BaseController {
@PutMapping(value = "put/department/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位部门", notes = "根据sequenceNbr更新维保单位")
public ResponseModel<Boolean> updateBySequenceNbrMaintenanceDepartment(@RequestBody MaintenanceDepartmentDto model,
@PathVariable(value = "sequenceNbr") Long sequenceNbr, @RequestParam String Companycode) {
@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper
.buildResponse(maintenanceCompanyService.updateMaintenancDepartmentDetail(model, Companycode));
.buildResponse(maintenanceCompanyService.updateMaintenancDepartmentDetail(model,getUserInfo()));
}
/**
......@@ -232,11 +234,14 @@ public class MaintenanceCompanyController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "find/{instanceId}/{maintenanceType}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维保单位/人员/部门", notes = "根据sequenceNbr查询单个维保单位/人员/部门")
public ResponseModel<Map<String, Object>> seleteOne(@PathVariable Long instanceId,
@PathVariable String maintenanceType) {
return ResponseHelper.buildResponse(maintenanceCompanyService.findByInstanceId(instanceId, maintenanceType));
@GetMapping(value = "find")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维保单位-人员-部门", notes = "根据sequenceNbr查询单个维保单位-人员-部门")
public ResponseModel<Map<String, Object>> seleteOne( @RequestParam long sequenceNbr,
@RequestParam String maintenanceType) {
if(COMPANY.equals(maintenanceType) || PERSON.equals(maintenanceType) || PERSON.equals(maintenanceType)) {
return ResponseHelper.buildResponse(maintenanceCompanyService.findBySequenceNbr(sequenceNbr, maintenanceType));
}
return ResponseHelper.buildResponse(null);
}
/**
......@@ -249,7 +254,7 @@ public class MaintenanceCompanyController extends BaseController {
@GetMapping(value = "companyAndDepartment/getTree")
@ApiOperation(httpMethod = "GET", value = "查询单位-部门树结构数据", notes = "查询单位-部门树结构数据")
public ResponseModel<List<OrgMenuDto>> getCompanyAndDepartmentTree() throws Exception {
List<OrgMenuDto> menus = iOrgUsrService.getTree(null, maintenanceCompanyService.getCompanyAndDepartmentTree(),
List<OrgMenuDto> menus = iOrgUsrService.getTree((long)-1, maintenanceCompanyService.getCompanyAndDepartmentTree(),
MaintenanceCompany.class.getName(), "getSequenceNbr", 2, "getName", "getParentId", "getType");
return ResponseHelper.buildResponse(menus);
}
......@@ -264,7 +269,7 @@ public class MaintenanceCompanyController extends BaseController {
@GetMapping(value = "departmentAndPerson/getTree")
@ApiOperation(httpMethod = "GET", value = "查询部门-人树结构数据", notes = "查询部门-人树结构数据")
public ResponseModel<List<OrgMenuDto>> getDepartmentTree(@RequestParam long sequenceNbr) throws Exception {
List<OrgMenuDto> menus = iOrgUsrService.getTree(null,
List<OrgMenuDto> menus = iOrgUsrService.getTree(sequenceNbr,
maintenanceCompanyService.getDepartmentAndPersonTree(sequenceNbr), MaintenanceCompany.class.getName(),
"getSequenceNbr", 2, "getName", "getParentId", "getType");
return ResponseHelper.buildResponse(menus);
......@@ -280,95 +285,10 @@ public class MaintenanceCompanyController extends BaseController {
@GetMapping(value = "/getDepartmentList")
@ApiOperation(httpMethod = "GET", value = "查询部门下拉列表数据", notes = "查询部门下拉列表数据")
public ResponseModel<List<OrgMenuDto>> getDepartmentList(@RequestParam long sequenceNbr) throws Exception {
List<OrgMenuDto> menus = iOrgUsrService.getTree(null, maintenanceCompanyService.getDepartmentList(sequenceNbr),
List<OrgMenuDto> menus = iOrgUsrService.getTree(sequenceNbr, maintenanceCompanyService.getDepartmentList(sequenceNbr),
MaintenanceCompany.class.getName(), "getSequenceNbr", 2, "getName", "getParentId", "getType");
return ResponseHelper.buildResponse(menus);
}
/**
* 新增维保单位
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增维保单位", notes = "新增维保单位")
public ResponseModel<MaintenanceCompanyDto> save(@RequestBody MaintenanceCompanyDto model) {
model = maintenanceCompanyServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位", notes = "根据sequenceNbr更新维保单位")
public ResponseModel<MaintenanceCompanyDto> updateBySequenceNbrMaintenanceCompany(@RequestBody MaintenanceCompanyDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.updateWithModel(model));
}
// /**
// * 根据sequenceNbr删除
// *
// * @param sequenceNbr 主键
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @DeleteMapping(value = "/{sequenceNbr}")
// @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维保单位", notes = "根据sequenceNbr删除维保单位")
// public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
// return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.removeById(sequenceNbr));
// }
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维保单位", notes = "根据sequenceNbr查询单个维保单位")
public ResponseModel<MaintenanceCompanyDto> seleteOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "维保单位分页查询", notes = "维保单位分页查询")
public ResponseModel<Page<MaintenanceCompanyDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
Page<MaintenanceCompanyDto> page = new Page<MaintenanceCompanyDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryForMaintenanceCompanyPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "维保单位列表全部数据查询", notes = "维保单位列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<MaintenanceCompanyDto>> selectForList() {
return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryForMaintenanceCompanyList());
}
/**
* 根据维保单位查询所有机场单位(不带分页)
*
......@@ -404,4 +324,5 @@ public class MaintenanceCompanyController extends BaseController {
public ResponseModel<List<Map<String,Object>>> selectCompanyList() {
return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryCompanyMsg());
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java
View file @ 8bf51a2e
......@@ -124,7 +124,12 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
Page page = new Page(current, size);
return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
}
public IPage<Map<String, Object>> pageList(int current, int size ,String groupCode,Map<String, String> params ){
List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
Page page = new Page(current, size);
return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
}
public List<Map<String, Object>> listAll(String groupCode){
Map<String, String> params = this.getRequestParamMap();
List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
......@@ -149,7 +154,4 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
}
return params;
}
}
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 @ 8bf51a2e
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
......@@ -10,7 +11,13 @@ import java.util.Map.Entry;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.s;
import org.elasticsearch.cluster.metadata.AliasAction.NewAliasValidator;
import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -20,10 +27,12 @@ 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.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceDepartmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonDto;
......@@ -33,6 +42,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
import com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper;
import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
/**
* 维保单位服务实现类
......@@ -111,14 +121,8 @@ public class MaintenanceCompanyServiceImpl
return true;
}
/**
* 添加维保单位人员信息
*
* @param maintenanceCompany
* @return
*/
public boolean savePersonDetail(MaintenancePersonDto maintenancePerson, String Companycode) {
public boolean savePersonDetail(MaintenancePersonDto maintenancePerson, long sequenceNbr) {
MaintenanceCompany detail = maintenanceCompanyMapper.selectById(sequenceNbr);
Map<String, Object> model = Bean.BeantoMap(maintenancePerson);
// 将数据西安存入扩展表操作service提供的公共保存方法，以便拿到对应的instanceId
Long instanceId = dynamicFormInstanceService.commonSave(MAINTENANCE_PERSON, model);
......@@ -127,12 +131,14 @@ public class MaintenanceCompanyServiceImpl
// 前台页面没有传入员工编号时系统自动赋值
if (StringUtils.isBlank(entity.getCode())) {
// 添加人员时，当前的orgcode 为单位code+6位随机数
entity.setCode(Companycode + OrgUsrServiceImpl.getOrgCodeStr());
entity.setCode(detail.getCode() + OrgUsrServiceImpl.getOrgCodeStr());
}
entity.setOrgCode(null);
entity.setBizCode(sequence.nextId() + "");
entity.setInstanceId(instanceId);
entity.setType(maintenancePerson.getType().toUpperCase());
entity.setParentId(sequenceNbr);
try {
this.save(entity);
} catch (Exception e) {
......@@ -140,20 +146,38 @@ public class MaintenanceCompanyServiceImpl
}
return true;
}
/**
* 添加维保单位人员信息
*
* @param maintenanceCompany
* @return
*/
public boolean savePersonDetail(MaintenancePersonDto maintenancePerson, Map<String, Long> params) {
long sequenceNbr =0;
if(params.containsKey("companyId")) {
sequenceNbr=params.get("companyId");
}
if(params.containsKey("departmentId")) {
sequenceNbr=params.get("departmentId");
}
return savePersonDetail(maintenancePerson,sequenceNbr);
}
@Override
public boolean saveDepartmentDetail(MaintenanceDepartmentDto maintenanceDepartment, String Companycode) {
public boolean saveDepartmentDetail(MaintenanceDepartmentDto maintenanceDepartment, long sequenceNbr) {
MaintenanceCompany maintenanceCompany =maintenanceCompanyMapper.selectById(sequenceNbr);
Map<String, Object> model = Bean.BeantoMap(maintenanceDepartment);
// 将数据西安存入扩展表操作service提供的公共保存方法，以便拿到对应的instanceId
Long instanceId = dynamicFormInstanceService.commonSave(MAINTENANCE_DEPARTMENT, model);
// 拿到instanceId之后进行往主表中插入数据
MaintenanceCompany entity = (MaintenanceCompany) Bean.mapToBean(model, MaintenanceCompany.class);
// 添加人员时，当前的orgcode 为单位code+6位随机数
entity.setCode(Companycode + OrgUsrServiceImpl.getOrgCodeStr());
entity.setCode(maintenanceCompany.getCode() + OrgUsrServiceImpl.getOrgCodeStr());
entity.setOrgCode(null);
entity.setBizCode(sequence.nextId() + "");
entity.setInstanceId(instanceId);
entity.setType(maintenanceDepartment.getType().toUpperCase());
entity.setParentId(sequenceNbr);
try {
this.save(entity);
} catch (Exception e) {
......@@ -183,6 +207,7 @@ public class MaintenanceCompanyServiceImpl
public List<Map<String, Object>> getMaintenanceCompanyDropDownList() {
LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
wrapper.select(MaintenanceCompany::getCode, MaintenanceCompany::getName);
wrapper.eq(MaintenanceCompany::getType, COMPANY);
return maintenanceCompanyMapper.selectMaps(wrapper);
}
......@@ -192,10 +217,10 @@ public class MaintenanceCompanyServiceImpl
wrapper.eq(MaintenanceCompany::getCode, code);
MaintenanceCompany detail = maintenanceCompanyMapper.selectOne(wrapper);
if (ObjectUtils.isEmpty(detail)) {
return false;
}
return true;
}
return false;
}
@Override
public List<Map<String, Object>> getAllMaintenanceList(String maintenanceType) {
......@@ -258,14 +283,30 @@ public class MaintenanceCompanyServiceImpl
}
@Override
public IPage<Map<String, Object>> getPageMaintenanceList(int current, int size, String maintenanceType,String name,long parentId,String isWork) {
List<MaintenanceCompany> mainTableList=null;
public IPage<Map<String, Object>> getPageMaintenanceList(
Map<String, Object> paramsMap
) {
if(!paramsMap.containsKey("current") && !paramsMap.containsKey("size")) {
return null;
}
if( !paramsMap.containsKey("maintenanceType")) {
return null;
}
int current = Integer.parseInt(paramsMap.get("current").toString());
int size = Integer.parseInt(paramsMap.get("size").toString());
String maintenanceType = paramsMap.get("maintenanceType").toString().toUpperCase();
Map<String,String> filedParamsMap = null;
List<MaintenanceCompany> mainTableList=null;
String type = null;
switch (maintenanceType) {
case PERSON:
type = MAINTENANCE_PERSON;
mainTableList = this.checkMaintenanceCompanyList(name,parentId);
if(paramsMap.containsKey("isWork")) {
filedParamsMap =new HashMap<String,String>();
filedParamsMap.put("isWork", paramsMap.get("isWork").toString());
}
mainTableList = this.checkMaintenanceCompanyList(paramsMap);
break;
case COMPANY:
type = MAINTENANCE_COMPANY;
......@@ -279,7 +320,7 @@ public class MaintenanceCompanyServiceImpl
if (StringUtils.isBlank(type)) {
return null;
}
IPage<Map<String, Object>> page = dynamicFormInstanceService.pageList(current, size, type);
IPage<Map<String, Object>> page = dynamicFormInstanceService.pageList(current, size, type,filedParamsMap);
Map<Long, MaintenanceCompany> mintenanceCompanyMap = mainTableList.stream()
.collect(Collectors.toMap(MaintenanceCompany::getInstanceId, Function.identity()));
......@@ -290,31 +331,26 @@ public class MaintenanceCompanyServiceImpl
r.putAll(Bean.BeantoMap(detail));
}
});
if(PERSON.equals(type)) {
}
return page;
}
public List<MaintenanceCompany> checkMaintenanceCompanyList(String name,long parentId){
public List<MaintenanceCompany> checkMaintenanceCompanyList(Map<String, Object> paramsMap){
LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
if(StringUtils.isNotBlank(name)) {
wrapper.likeRight(MaintenanceCompany::getName, name);
if(paramsMap.containsKey("name")) {
wrapper.likeRight(MaintenanceCompany::getName, paramsMap.get("name").toString());
}
if(parentId!=0) {
wrapper.eq(MaintenanceCompany::getParentId, parentId);
if(paramsMap.containsKey("parentId")) {
wrapper.eq(MaintenanceCompany::getParentId, Long.parseLong(paramsMap.get("parentId").toString()));
}
wrapper.eq(MaintenanceCompany::getType, PERSON);
return maintenanceCompanyMapper.selectList(wrapper);
}
@Override
public Map<String, Object> findByInstanceId(Long instanceId, String maintenanceType) {
public Map<String, Object> findBySequenceNbr(Long sequenceNbr, String maintenanceType) {
String type = null;
switch (maintenanceType) {
switch (maintenanceType.toUpperCase()) {
case PERSON:
type = MAINTENANCE_PERSON;
break;
......@@ -328,35 +364,58 @@ public class MaintenanceCompanyServiceImpl
if (StringUtils.isBlank(type)) {
return null;
}
return dynamicFormInstanceService.getOneMap(instanceId, type);
MaintenanceCompany maintenanceCompany =maintenanceCompanyMapper.selectById(sequenceNbr);
Map<String, Object> mianmMap =Bean.BeantoMap(maintenanceCompany);
Map<String, Object> dynamicMap = dynamicFormInstanceService.getOneMap(maintenanceCompany.getInstanceId(), type);
mianmMap.put("dynamicResult", dynamicMap);
return mianmMap;
}
@Override
@Transactional
public boolean updateMaintenanceCompanyDetail(MaintenanceCompanyDto model) {
public boolean updateMaintenanceCompanyDetail(MaintenanceCompanyDto model,AgencyUserModel userInfo) {
// 先刪除，后添加
MaintenanceCompanyDto maintenanceCompany = this.queryBySeq(model.getSequenceNbr());
try {
if (maintenanceCompany != null) {
dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>()
.eq(DynamicFormInstance::getInstanceId, maintenanceCompany.getInstanceId()));
this.removeById(maintenanceCompany.getSequenceNbr());
//this.removeById(maintenanceCompany.getSequenceNbr());
}
} catch (Exception e) {
return false;
}
try {
this.saveCompanyDetail(model);
Map<String, Object> bean = Bean.BeantoMap(model);
this.updateDetail(bean,userInfo);
} catch (Exception e) {
return false;
}
return true;
}
public boolean updateDetail(Map<String, Object> model ,AgencyUserModel userInfo) {
// 将数据西安存入扩展表操作service提供的公共保存方法，以便拿到对应的instanceId
Long instanceId = dynamicFormInstanceService.commonSave(MAINTENANCE_COMPANY, model);
// 拿到instanceId之后进行往主表中插入数据
MaintenanceCompany maintenanceCompany = (MaintenanceCompany) Bean.mapToBean(model, MaintenanceCompany.class);
maintenanceCompany.setInstanceId(instanceId);
maintenanceCompany.setRecUserId(userInfo.getUserId());
maintenanceCompany.setRecDate(new Date());
maintenanceCompany.setRecUserName(userInfo.getUserName());
try {
this.updateById(maintenanceCompany);
} catch (Exception e) {
e.printStackTrace();
return false;
}
return true;
}
@Override
@Transactional
public boolean updateMaintenancePersonDetail(MaintenancePersonDto model, String Companycode) {
public boolean updateMaintenancePersonDetail(MaintenancePersonDto model,AgencyUserModel userInfo) {
// 先刪除，后添加
MaintenanceCompanyDto maintenanceCompany = this.queryBySeq(model.getSequenceNbr());
try {
......@@ -368,8 +427,10 @@ public class MaintenanceCompanyServiceImpl
} catch (Exception e) {
return false;
}
try {
this.savePersonDetail(model,Companycode);
Map<String, Object> bean = Bean.BeantoMap(model);
this.updateDetail(bean,userInfo);
} catch (Exception e) {
return false;
}
......@@ -379,7 +440,7 @@ public class MaintenanceCompanyServiceImpl
@Override
@Transactional
public boolean updateMaintenancDepartmentDetail(MaintenanceDepartmentDto model, String Companycode) {
public boolean updateMaintenancDepartmentDetail(MaintenanceDepartmentDto model,AgencyUserModel userInfo) {
// 先刪除，后添加
MaintenanceCompanyDto maintenanceCompany = this.queryBySeq(model.getSequenceNbr());
try {
......@@ -392,7 +453,8 @@ public class MaintenanceCompanyServiceImpl
return false;
}
try {
this.saveDepartmentDetail(model,Companycode);
Map<String, Object> bean = Bean.BeantoMap(model);
this.updateDetail(bean,userInfo);
} catch (Exception e) {
return false;
}
......@@ -415,64 +477,56 @@ public class MaintenanceCompanyServiceImpl
@Override
public List<MaintenanceCompany> getDepartmentAndPersonTree(long sequenceNbr) {
List<MaintenanceCompany> departmentAllList =new ArrayList<MaintenanceCompany>();
// List<MaintenanceCompany> departmentAllList =new ArrayList<MaintenanceCompany>();
List<MaintenanceCompany> departmentList= getDepartmentList(sequenceNbr);
departmentAllList.addAll(departmentList);
departmentAllList = getDepartmentAllList(departmentAllList,departmentList);
for (MaintenanceCompany map : departmentList) {
Long departmentSequenceNbr=map.getSequenceNbr();
departmentAllList.addAll(getPersonList(departmentSequenceNbr));
}
if (departmentAllList == null) {
//departmentAllList.addAll(departmentList);
// departmentAllList = getDepartmentAllList(departmentAllList,departmentList);
// for (MaintenanceCompany map : departmentList) {
// Long departmentSequenceNbr=map.getSequenceNbr();
// departmentAllList.addAll(getPersonList(departmentSequenceNbr));
// }
// if (departmentAllList == null) {
// return new ArrayList<>();
// }
// departmentAllList = departmentAllList.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
// return departmentAllList;
if (departmentList == null) {
return new ArrayList<>();
}
departmentAllList = departmentAllList.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
return departmentAllList;
}
public List<MaintenanceCompany> getDepartmentAllList(List<MaintenanceCompany> departmentAllList,List<MaintenanceCompany> departmentList){
for (MaintenanceCompany map : departmentList) {
long chrildSequenceNbr=map.getSequenceNbr();
List<MaintenanceCompany> chrlidList= getDepartmentList(chrildSequenceNbr);
if(chrlidList.size()>0) {
departmentAllList.addAll(chrlidList);
getDepartmentAllList(departmentAllList,chrlidList);
}
}
return departmentAllList;
return departmentList.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
}
// public List<MaintenanceCompany> getDepartmentAllList(List<MaintenanceCompany> departmentAllList,List<MaintenanceCompany> departmentList){
// for (MaintenanceCompany map : departmentList) {
// long chrildSequenceNbr=map.getSequenceNbr();
// List<MaintenanceCompany> chrlidList= getDepartmentList(chrildSequenceNbr);
// if(chrlidList.size()>0) {
// departmentAllList.addAll(chrlidList);
// getDepartmentAllList(departmentAllList,chrlidList);
// }
// }
// return departmentAllList;
// }
@Override
public List<MaintenanceCompany> getDepartmentList(long sequenceNbr) {
MaintenanceCompany companyDetail= maintenanceCompanyMapper.selectById(sequenceNbr);
LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
wrapper.select(MaintenanceCompany::getSequenceNbr,MaintenanceCompany::getName,MaintenanceCompany::getCode,MaintenanceCompany::getType,MaintenanceCompany::getBizCode,MaintenanceCompany::getParentId);
wrapper.eq(MaintenanceCompany::getIsDelete, 0);
wrapper.eq(MaintenanceCompany::getType, DEPARTMENT);
wrapper.eq(MaintenanceCompany::getParentId, sequenceNbr);
wrapper.eq(MaintenanceCompany::getIsDelete, false);
wrapper.in(MaintenanceCompany::getType, Arrays.asList(PERSON,DEPARTMENT));
wrapper.likeRight(MaintenanceCompany::getCode, companyDetail.getCode());
List<MaintenanceCompany> ss= maintenanceCompanyMapper.selectList(wrapper);
return maintenanceCompanyMapper.selectList(wrapper);
}
public List<MaintenanceCompany> getPersonList(long sequenceNbr) {
LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
wrapper.select(MaintenanceCompany::getSequenceNbr,MaintenanceCompany::getName,MaintenanceCompany::getCode,MaintenanceCompany::getType,MaintenanceCompany::getBizCode,MaintenanceCompany::getParentId);
wrapper.eq(MaintenanceCompany::getIsDelete, 0);
wrapper.eq(MaintenanceCompany::getIsDelete, false);
wrapper.eq(MaintenanceCompany::getType, PERSON);
wrapper.eq(MaintenanceCompany::getParentId, sequenceNbr);
return maintenanceCompanyMapper.selectList(wrapper);
}
// /**
// * 分页查询
// */
// public Page<MaintenanceCompanyDto> queryForMaintenanceCompanyPage(Page<MaintenanceCompanyDto> page) {
// return this.queryForPage(page, null, false);
// }
//
// /**en
// * 列表查询 示例
// */
// public List<MaintenanceCompanyDto> queryForMaintenanceCompanyList() {
// return this.queryForList("" , false);
// }
/**
* 根据维保单位查询所有机场单位(返回List<Map>类型) 不带分页
* @param seq
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 8bf51a2e
......@@ -123,13 +123,27 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
parentId = !ObjectUtils.isEmpty(PARENTIDMethodNameme.invoke(entity))
? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity)))
: null;
if (parentId == null || topId == parentId) {
// if (parentId == null || topId ==parentId ) {
// OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
// String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
// String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
// resultList.add(menu);
// }
/* *******************topId与parentId的等值判断，修改人陈浩 on 2021/07/21---start******************************/
if (parentId == null ) {//topId与parentId的等值判断，修改人陈浩 on 2021/07/21
OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
resultList.add(menu);
} else {
if(topId !=null && topId.longValue() ==parentId.longValue()) {
OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
resultList.add(menu);
}
}
/* *******************topId与parentId的等值判断，修改人陈浩 on 2021/07/21---end******************************/
}
// 获取每个顶层元素的子数据集合
for (OrgMenuDto entity : resultList) {
......
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