Skip to content

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

维保单位接口修改

parent 63026c7a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 43 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/AttachmentDto.java 0 → 100644
View file @ d0e8af57
package com.yeejoin.amos.boot.module.common.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 公共附件
*
* @author system_generator
* @date 2021-07-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="AttachmentDto", description="附件dto")
public class AttachmentDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "文件地址")
private String url;
@ApiModelProperty(value = "文件名称")
private String name;
@ApiModelProperty(value = "文件类型")
private String type;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/MaintenanceCompany.java
View file @ d0e8af57
package com.yeejoin.amos.boot.module.common.api.entity;
import java.util.List;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
import java.util.Map;
/**
* 维保单位
*
......@@ -80,4 +81,8 @@ public class MaintenanceCompany extends BaseEntity {
@ApiModelProperty(value = "动态表单值")
@TableField(exist = false)
private List<DynamicFormInstance> dynamicFormValue;
@ApiModelProperty(value = "附件")
@TableField(exist = false)
private Map<String, List<AttachmentDto>> attachments;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/MaintenanceCompanyMapper.java
View file @ d0e8af57
package com.yeejoin.amos.boot.module.common.api.mapper;
import java.util.List;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 维保单位 Mapper 接口
......@@ -29,5 +28,5 @@ public interface MaintenanceCompanyMapper extends BaseMapper<MaintenanceCompany>
* @param seq
* @return
*/
public List<OrgUsrDto> selectOrgUsrPageList (Page page, @Param("seq") Long seq);
public Page<OrgUsrDto> selectOrgUsrPageList(Page page, @Param("seq") Long seq);
}
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 @ d0e8af57
......@@ -29,10 +29,9 @@ public interface IMaintenanceCompanyService {
* 添加保存维保单位人员基本信息
*
* @param maintenanceCompany
* @param sequenceNbr 主键
* @return
*/
public boolean savePersonDetail(MaintenanceCompany maintenanceCompany, long sequenceNbr);
public boolean savePersonDetail(MaintenanceCompany maintenanceCompany);
/**
* 自定义假删除
......@@ -52,10 +51,10 @@ public interface IMaintenanceCompanyService {
/**
* 添加保存维保单位部门基本信息
*
* @param MaintenanceCompany
* @param maintenanceCompany
* @return
*/
public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany, long sequenceNbr);
public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany);
/**
* 检查当前的员工编号是否已经存在
......@@ -98,26 +97,26 @@ public interface IMaintenanceCompanyService {
/**
* 修改维保单位
*
* @param MaintenanceCompany
* @param model
* @return
*/
boolean updateMaintenanceCompanyDetail(MaintenanceCompany model, AgencyUserModel userInfo);
boolean updateMaintenanceCompanyDetail(MaintenanceCompany model);
/**
* 修改维保部门
*
* @param MaintenanceCompany
* @param model
* @return
*/
public boolean updateMaintenancDepartmentDetail(MaintenanceCompany model, AgencyUserModel userInfo);
public boolean updateMaintenanceDepartmentDetail(MaintenanceCompany model);
/**
* 修改维保人员
*
* @param MaintenanceCompany
* @param model
* @return
*/
public boolean updateMaintenancePersonDetail(MaintenanceCompany model, AgencyUserModel userInfo);
public boolean updateMaintenancePersonDetail(MaintenanceCompany model);
/**
* 查询所有的单位-部门树
......
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 @ d0e8af57
......@@ -5,6 +5,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
......@@ -61,12 +62,11 @@ public class MaintenanceCompanyController extends BaseController {
* 新增维保单位
*
* @return
* @throws MyException
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/company/save")
@ApiOperation(httpMethod = "POST", value = "新增维保单位", notes = "新增维保人员")
public ResponseModel<Boolean> saveMaintenanceCompany(@RequestBody MaintenanceCompany model) throws MyException {
@ApiOperation(httpMethod = "POST", value = "新增维保单位", notes = "新增维保单位")
public ResponseModel<Boolean> saveMaintenanceCompany(@RequestBody MaintenanceCompany model) {
model.setType(COMPANY);
return ResponseHelper.buildResponse(maintenanceCompanyService.saveCompanyDetail(model));
}
......@@ -75,14 +75,13 @@ public class MaintenanceCompanyController extends BaseController {
* 新增维保单位人员基本信息
*
* @return
* @throws MyException
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/person/save")
@ApiOperation(httpMethod = "POST", value = "新增维保人员", notes = "新增维保人员")
public ResponseModel<Boolean> saveMaintenancePerson(@RequestBody MaintenanceCompany model) throws Exception {
public ResponseModel<Boolean> saveMaintenancePerson(@RequestBody MaintenanceCompany model) {
model.setType(PERSON);
return ResponseHelper.buildResponse(maintenanceCompanyService.savePersonDetail(model, model.getParentId()));
return ResponseHelper.buildResponse(maintenanceCompanyService.savePersonDetail(model));
}
/**
......@@ -141,12 +140,7 @@ public class MaintenanceCompanyController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/page/List")
@ApiOperation(httpMethod = "POST", value = "所有维保人员/单位/部门分页列表", notes = "所有维保人员列表")
public ResponseModel<IPage<Map<String, Object>>> getPageMaintenanceList(@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 {
public ResponseModel<IPage<Map<String, Object>>> getPageMaintenanceList(@RequestBody Map<String, Object> paramsMap) {
return ResponseHelper.buildResponse(maintenanceCompanyService.getPageMaintenanceList(paramsMap));
}
......@@ -159,10 +153,9 @@ public class MaintenanceCompanyController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/department/save")
@ApiOperation(httpMethod = "POST", value = "新增维保部门", notes = "新增维保部门")
public ResponseModel<Boolean> saveMaintenanceDepartment(@RequestBody MaintenanceCompany model,
@RequestParam long sequenceNbr) {
public ResponseModel<Boolean> saveMaintenanceDepartment(@RequestBody MaintenanceCompany model) {
model.setType(DEPARTMENT);
return ResponseHelper.buildResponse(maintenanceCompanyService.saveDepartmentDetail(model, sequenceNbr));
return ResponseHelper.buildResponse(maintenanceCompanyService.saveDepartmentDetail(model));
}
/**
......@@ -181,7 +174,7 @@ public class MaintenanceCompanyController extends BaseController {
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @param model 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -190,13 +183,13 @@ public class MaintenanceCompanyController extends BaseController {
public ResponseModel<Boolean> updateBySequenceNbrMaintenanceCompany(@RequestBody MaintenanceCompany model
) {
return ResponseHelper
.buildResponse(maintenanceCompanyService.updateMaintenanceCompanyDetail(model, getUserInfo()));
.buildResponse(maintenanceCompanyService.updateMaintenanceCompanyDetail(model));
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @param model 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -204,13 +197,13 @@ public class MaintenanceCompanyController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位人员", notes = "根据sequenceNbr更新维保单位")
public ResponseModel<Boolean> updateBySequenceNbrMaintenancePerson(@RequestBody MaintenanceCompany model) {
return ResponseHelper
.buildResponse(maintenanceCompanyService.updateMaintenancePersonDetail(model, getUserInfo()));
.buildResponse(maintenanceCompanyService.updateMaintenancePersonDetail(model));
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @param model 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -219,7 +212,7 @@ public class MaintenanceCompanyController extends BaseController {
public ResponseModel<Boolean> updateBySequenceNbrMaintenanceDepartment(@RequestBody MaintenanceCompany model
) {
return ResponseHelper
.buildResponse(maintenanceCompanyService.updateMaintenancDepartmentDetail(model, getUserInfo()));
.buildResponse(maintenanceCompanyService.updateMaintenanceDepartmentDetail(model));
}
/**
......@@ -317,8 +310,8 @@ public class MaintenanceCompanyController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "queryCompanyPages")
@ApiOperation(httpMethod = "GET", value = "根据维保单位查询所有机场单位(带分页)", notes = "根据维保单位查询所有机场单位(带分页)")
public ResponseModel<List<Map<String, Object>>> selectCompanyPages(@RequestParam(value = "pageNum") int pageNum,
@RequestParam(value = "pageSize") int pageSize, @RequestParam(required = false) Long sequenceNbr) {
public ResponseModel<Page<Map<String, Object>>> selectCompanyPages(@RequestParam(value = "pageNum") int pageNum,
@RequestParam(value = "pageSize") int pageSize, @RequestParam(required = false) Long sequenceNbr) {
AgencyUserModel amosUser = getUserInfo();
return ResponseHelper
.buildResponse(maintenanceCompanyServiceImpl.queryOrgUsrMsgPage(pageNum, pageSize, sequenceNbr,
......@@ -333,7 +326,7 @@ public class MaintenanceCompanyController extends BaseController {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "查询维保单位、业主单位信息", notes = "查询维保单位、业主单位信息")
@GetMapping(value = "/companyLlist")
@GetMapping(value = "/companyList")
public ResponseModel<List<Map<String, Object>>> selectCompanyList() {
return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryCompanyMsg());
}
......
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