维保单位接口修改

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

+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

 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

 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

@@ -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

@@ -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,7 +310,7 @@ 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,
+	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
@@ -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());
 	}

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

@@ -7,18 +7,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
 import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 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.service.IMaintenanceCompanyService;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,7 +33,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -83,6 +83,9 @@ public class MaintenanceCompanyServiceImpl
 	@Autowired
 	DynamicFormInstanceMapper dynamicFormInstanceMapper;
 
+	@Autowired
+	SourceFileServiceImpl sourceFileService;
+
 	/**
 	 * 分页查询
 	 */
@@ -115,6 +118,8 @@ public class MaintenanceCompanyServiceImpl
 		maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase());
 		try {
 			this.save(maintenanceCompany);
+
+			saveAttachments(maintenanceCompany);
 		} catch (Exception e) {
 			e.printStackTrace();
 			return false;
@@ -124,21 +129,24 @@ public class MaintenanceCompanyServiceImpl
 	}
 
 	@Override
-	public boolean savePersonDetail(MaintenanceCompany maintenanceCompany, long sequenceNbr) {
+	public boolean savePersonDetail(MaintenanceCompany maintenanceCompany) {
 		Long instanceId = saveDynamicFormList(maintenanceCompany);
-		MaintenanceCompany detail = maintenanceCompanyMapper.selectById(sequenceNbr);
+		Long parentId = maintenanceCompany.getParentId();
+		MaintenanceCompany parent = maintenanceCompanyMapper.selectById(parentId);
 		if (StringUtils.isBlank(maintenanceCompany.getCode())) {
-			// 添加人员时，当前的orgcode 为单位code+6位随机数
-			maintenanceCompany.setCode(detail.getCode() + OrgUsrServiceImpl.getOrgCodeStr());
+			// 添加人员时，当前的code 为单位code+6位随机数
+			maintenanceCompany.setCode(parent.getCode() + OrgUsrServiceImpl.getOrgCodeStr());
 		}
-		maintenanceCompany.setSequenceNbr(sequence.nextId());
 		maintenanceCompany.setOrgCode(null);
+		if (ValidationUtil.isEmpty(maintenanceCompany.getBizCode())) {
 			maintenanceCompany.setBizCode(sequence.nextId() + "");
+		}
 		maintenanceCompany.setInstanceId(instanceId);
-		maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase());
-		maintenanceCompany.setParentId(sequenceNbr);
+		maintenanceCompany.setParentId(parentId);
 		try {
 			this.save(maintenanceCompany);
+
+			saveAttachments(maintenanceCompany);
 		} catch (Exception e) {
 			return false;
 		}
@@ -146,6 +154,35 @@ public class MaintenanceCompanyServiceImpl
 	}
 
 	/**
+	 * 保存附件
+ 	 */
+	public void saveAttachments(MaintenanceCompany maintenanceCompany) {
+		if (!ValidationUtil.isEmpty(maintenanceCompany.getAttachments())) {
+			List<SourceFile> sourceFiles = Lists.newArrayList();
+			Map<String, List<AttachmentDto>> attachmentMap = maintenanceCompany.getAttachments();
+			attachmentMap.entrySet().forEach(entry -> {
+				List<AttachmentDto> atts = entry.getValue();
+				sourceFiles.addAll(attachment2SourceFile(entry.getKey(), atts));
+			});
+			sourceFileService.saveSourceFile(maintenanceCompany.getSequenceNbr(), sourceFiles);
+		}
+	}
+
+	private List<SourceFile> attachment2SourceFile(String type, List<AttachmentDto> attachmentDtoList) {
+		List<SourceFile> sourceFiles = Lists.newArrayList();
+		if (!ValidationUtil.isEmpty(attachmentDtoList)) {
+			attachmentDtoList.forEach(a -> {
+				SourceFile s = new SourceFile();
+				s.setFilePath(a.getUrl());
+				s.setFileName(a.getName());
+				s.setFileCategory(type);
+				sourceFiles.add(s);
+			});
+		}
+		return sourceFiles;
+	}
+
+	/**
 	 * 添加维保单位人员信息
 	 * 
 	 * @param maintenanceCompany
@@ -169,23 +206,24 @@ public class MaintenanceCompanyServiceImpl
 			dynamicFormInstanceService.save(dynamicFormInstance);
 		}
 		return instanceId;
-
 	}
 
 	@Override
-	public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany, long sequenceNbr) {
+	public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany) {
 		Long instanceId = saveDynamicFormList(maintenanceCompany);
-		MaintenanceCompany detaliCompany = maintenanceCompanyMapper.selectById(sequenceNbr);
+		Long parentId = maintenanceCompany.getParentId();
+		MaintenanceCompany parent = maintenanceCompanyMapper.selectById(parentId);
 		// 添加人员时，当前的orgcode 为单位code+6位随机数
-		maintenanceCompany.setSequenceNbr(sequence.nextId());
-		maintenanceCompany.setCode(maintenanceCompany.getCode() + OrgUsrServiceImpl.getOrgCodeStr());
+		maintenanceCompany.setCode(parent.getCode() + OrgUsrServiceImpl.getOrgCodeStr());
 		maintenanceCompany.setOrgCode(null);
 		maintenanceCompany.setBizCode(sequence.nextId() + "");
 		maintenanceCompany.setInstanceId(instanceId);
 		maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase());
-		maintenanceCompany.setParentId(sequenceNbr);
+		maintenanceCompany.setParentId(parentId);
 		try {
 			this.save(maintenanceCompany);
+
+			saveAttachments(maintenanceCompany);
 		} catch (Exception e) {
 			return false;
 		}
@@ -311,8 +349,8 @@ public class MaintenanceCompanyServiceImpl
 		String maintenanceType = paramsMap.get("maintenanceType").toString().toUpperCase();
 		Map<String, String> filedParamsMap = null;
 
-		List<MaintenanceCompany> mainTableList = null;
-		String type = null;
+		List<MaintenanceCompany> mainTableList;
+		String type;
 		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(MaintenanceCompany::getIsDelete, false);
 		switch (maintenanceType) {
@@ -344,11 +382,11 @@ public class MaintenanceCompanyServiceImpl
 		}
 		IPage<Map<String, Object>> page = dynamicFormInstanceService.pageList(current, size, type, filedParamsMap);
 
-		Map<Long, MaintenanceCompany> mintenanceCompanyMap = mainTableList.stream()
+		Map<Long, MaintenanceCompany> maintenanceCompanyMap = mainTableList.stream()
 				.collect(Collectors.toMap(MaintenanceCompany::getInstanceId, Function.identity()));
 
 		page.getRecords().forEach(r -> {
-			MaintenanceCompany detail = mintenanceCompanyMap.get(Long.parseLong(r.get("instanceId").toString()));
+			MaintenanceCompany detail = maintenanceCompanyMap.get(Long.parseLong(r.get("instanceId").toString()));
 			if (!ObjectUtils.isEmpty(detail)) {
 				r.putAll(Bean.BeantoMap(detail));
 			}
@@ -362,7 +400,10 @@ public class MaintenanceCompanyServiceImpl
 			wrapper.like(MaintenanceCompany::getName, paramsMap.get("name").toString());
 		}
 		if (paramsMap.containsKey("parentId") && !"-1".equals(paramsMap.get("parentId"))) {
-			wrapper.eq(MaintenanceCompany::getParentId, Long.parseLong(paramsMap.get("parentId").toString()));
+			Long parentId = Long.parseLong(paramsMap.get("parentId").toString());
+			MaintenanceCompany company =
+					getOne(new LambdaQueryWrapper<MaintenanceCompany>().eq(MaintenanceCompany::getSequenceNbr, parentId));
+			wrapper.likeRight(MaintenanceCompany::getCode, company.getCode());
 		}
 		wrapper.eq(MaintenanceCompany::getType, PERSON);
 
@@ -385,44 +426,68 @@ public class MaintenanceCompanyServiceImpl
 		}
 		Map<String, Object> mainMap = Bean.BeantoMap(maintenanceCompany);
 		Map<String, Object> dynamicMap = dynamicFormInstanceService.getOneMap(maintenanceCompany.getInstanceId(), type);
-		mainMap.put("dynamicResult", dynamicMap);
+		mainMap.put("attachments", getAttachments(maintenanceCompany.getSequenceNbr()));
+		mainMap.put("dynamicFormValue", dynamicMap);
 		return mainMap;
 	}
 
+	private Map<String, List<AttachmentDto>> getAttachments(Long sequenceNbr) {
+		Map<String, List<AttachmentDto>> attachmentMap = Maps.newHashMap();
+		List<SourceFile> sourceFileList = sourceFileService.findBySourceId(sequenceNbr);
+		if (!ValidationUtil.isEmpty(sourceFileList)) {
+			List<AttachmentDto> attachmentList = sourceFile2AttachmentList(sourceFileList);
+			attachmentMap = attachmentList.stream().collect(Collectors.groupingBy(AttachmentDto::getType));
+		}
+		return attachmentMap;
+	}
+
+	private List<AttachmentDto> sourceFile2AttachmentList(List<SourceFile> sourceFileList) {
+		List<AttachmentDto> attachmentDtoList = Lists.newArrayList();
+		if (!ValidationUtil.isEmpty(sourceFileList)) {
+			sourceFileList.forEach(s -> {
+				AttachmentDto a = new AttachmentDto();
+				a.setName(s.getFileName());
+				a.setUrl(s.getFilePath());
+				a.setType(s.getFileCategory());
+				attachmentDtoList.add(a);
+			});
+		}
+		return attachmentDtoList;
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean updateMaintenanceCompanyDetail(MaintenanceCompany model, AgencyUserModel userInfo) {
+	public boolean updateMaintenanceCompanyDetail(MaintenanceCompany model) {
 		// 先刪除，后添加
+		return updateMaintenanceDetail(model, COMPANY);
+	}
+
+	public boolean updateMaintenanceDetail(MaintenanceCompany model, String type) {
 		MaintenanceCompanyDto maintenanceCompany = this.queryBySeq(model.getSequenceNbr());
 		try {
+			// 先刪除，后添加
 			if (maintenanceCompany != null) {
 				dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>()
 						.eq(DynamicFormInstance::getInstanceId, maintenanceCompany.getInstanceId()));
-				// this.removeById(maintenanceCompany.getSequenceNbr());
 			}
-		} catch (Exception e) {
-			return false;
-		}
-		try {
-			this.updateDetail(model, userInfo, COMPANY);
+			this.updateDetail(model, type);
 		} catch (Exception e) {
 			return false;
 		}
 		return true;
 	}
 
-	public boolean updateDetail(MaintenanceCompany model, AgencyUserModel userInfo, String type) {
-		// 将数据西安存入扩展表操作service提供的公共保存方法，以便拿到对应的instanceId
+	public boolean updateDetail(MaintenanceCompany model, String type) {
+		// 将数据先存入扩展表操作service提供的公共保存方法，以便拿到对应的instanceId
 		Long instanceId = saveDynamicFormList(model);
 		// 拿到instanceId之后进行往主表中插入数据
 		model.setInstanceId(instanceId);
-		model.setRecUserId(userInfo.getUserId());
-		model.setRecDate(new Date());
-		model.setRecUserName(userInfo.getUserName());
-		model.setIsDelete(false);
 		model.setType(type);
 		try {
 			this.updateById(model);
+
+			// 更新附件
+			saveAttachments(model);
 		} catch (Exception e) {
 			e.printStackTrace();
 			return false;
@@ -432,49 +497,15 @@ public class MaintenanceCompanyServiceImpl
 	}
 
 	@Override
-	@Transactional
-	public boolean updateMaintenancePersonDetail(MaintenanceCompany 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());
-			}
-		} catch (Exception e) {
-			return false;
-		}
-
-		try {
-			this.updateDetail(model, userInfo, PERSON);
-		} catch (Exception e) {
-			return false;
-		}
-		return true;
+	@Transactional(rollbackFor = Exception.class)
+	public boolean updateMaintenancePersonDetail(MaintenanceCompany model) {
+		return updateMaintenanceDetail(model, PERSON);
 	}
 
 	@Override
-	@Transactional
-	public boolean updateMaintenancDepartmentDetail(MaintenanceCompany 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());
-			}
-		} catch (Exception e) {
-			return false;
-		}
-		try {
-			Map<String, Object> bean = Bean.BeantoMap(model);
-			this.updateDetail(model, userInfo, DEPARTMENT);
-		} catch (Exception e) {
-			return false;
-		}
-		return true;
+	@Transactional(rollbackFor = Exception.class)
+	public boolean updateMaintenanceDepartmentDetail(MaintenanceCompany model) {
+		return updateMaintenanceDetail(model, DEPARTMENT);
 	}
 
 	@Override
@@ -534,8 +565,8 @@ public class MaintenanceCompanyServiceImpl
 		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);
+		List<MaintenanceCompany> maintenanceCompanyList = maintenanceCompanyMapper.selectList(wrapper);
+		return maintenanceCompanyList;
 	}
 
 	public List<MaintenanceCompany> getPersonList(long sequenceNbr) {
@@ -582,26 +613,29 @@ public class MaintenanceCompanyServiceImpl
 	 * @param amosUserId
 	 * @return
 	 */
-	public List<Map<String, Object>> queryOrgUsrMsgPage(int pageNum, int pageSize, Long seq, String amosUserId) {
+	public Page<Map<String, Object>> queryOrgUsrMsgPage(int pageNum, int pageSize, Long seq, String amosUserId) {
 		MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
 		if (ValidationUtil.isEmpty(seq)) {
 			maintenanceCompany = getMaintenanceCompany(amosUserId);
 		}
-		List<Map<String, Object>> companys = new ArrayList<>();
 		// 机场单位列表基本信息
 		if (pageNum == -1 || pageSize == -1) {
 			pageSize = Integer.MAX_VALUE;
 		}
 		Page page = new Page(pageNum, pageSize);
-		List<OrgUsrDto> orgUsrDtos = this.baseMapper.selectOrgUsrPageList(page,
+		Page<Map<String, Object>> companys = new Page<>(pageNum, pageSize);
+		Page<OrgUsrDto> pageResult = this.baseMapper.selectOrgUsrPageList(page,
 				maintenanceCompany.getSequenceNbr());
+		List<Map<String, Object>> finalResultMap = Lists.newArrayList();
 		// 机场组装单位动态表单数据
-		orgUsrDtos.forEach(orgUsrDto -> {
+		pageResult.getRecords().forEach(orgUsrDto -> {
 			Map<String, Object> map = Bean.BeantoMap(orgUsrDto);
-			mapCopy(dynamicFormInstanceService.getOneMap(orgUsrDto.getSequenceNbr(), OrgPersonEnum.公司.getKey()),
-					map);
-			companys.add(map);
+			mapCopy(dynamicFormInstanceService.getOneMap(orgUsrDto.getSequenceNbr(), OrgPersonEnum.公司.getKey()), map);
+			finalResultMap.add(map);
 		});
+		companys.setRecords(finalResultMap);
+		companys.setTotal(pageResult.getTotal());
+		companys.setPages(pageResult.getPages());
 		return companys;
 	}