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

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/KeySiteDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 重点部位
+ *
+ * @author system_generator
+ * @date 2021-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="KeySiteDto", description="重点部位")
+public class KeySiteDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "重点部位名称")
+    private String name;
+
+    @ApiModelProperty(value = "所属单位/部门id")
+    private Long belongId;
+
+    @ApiModelProperty(value = "所属建筑id")
+    private Long buildingId;
+
+    @ApiModelProperty(value = "位置描述")
+    private String addressDesc;
+
+    @ApiModelProperty(value = "建筑面积(㎡)")
+    private String buildingArea;
+
+    @ApiModelProperty(value = "建筑高度(m)")
+    private String buildingHeight;
+
+    @ApiModelProperty(value = "耐火等级")
+    private String fireEnduranceRate;
+
+    @ApiModelProperty(value = "使用性质")
+    private String useNature;
+
+    @ApiModelProperty(value = "责任人")
+    private String chargePerson;
+
+    @ApiModelProperty(value = "责任人身份证")
+    private String chargePersonId;
+
+    @ApiModelProperty(value = "确定重点防火部位的原因")
+    private String keyPreventionReason;
+
+    @ApiModelProperty(value = "消防设施情况")
+    private String fireFacilitiesInfo;
+
+    @ApiModelProperty(value = "防火标志设立情况")
+    private String firePreventionFlag;
+
+    @ApiModelProperty(value = "危险源")
+    private String hazard;
+
+    @ApiModelProperty(value = "消防安全管理措施")
+    private String safetyManagementMeasures;
+
+    @ApiModelProperty(value = "防范手段措施")
+    private String preventiveMeasures;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/KeySite.java

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 重点部位
+ *
+ * @author system_generator
+ * @date 2021-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_key_site")
+public class KeySite extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 重点部位名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 所属单位/部门id
+     */
+	@TableField("belong_id")
+    private Long belongId;
+
+    /**
+     * 所属建筑id
+     */
+	@TableField("building_id")
+    private Long buildingId;
+
+    /**
+     * 位置描述
+     */
+	@TableField("address_desc")
+    private String addressDesc;
+
+    /**
+     * 建筑面积(㎡)
+     */
+	@TableField("building_area")
+    private String buildingArea;
+
+    /**
+     * 建筑高度(m)
+     */
+	@TableField("building_height")
+    private String buildingHeight;
+
+    /**
+     * 耐火等级
+     */
+	@TableField("fire_endurance_rate")
+    private String fireEnduranceRate;
+
+    /**
+     * 使用性质
+     */
+	@TableField("use_nature")
+    private String useNature;
+
+    /**
+     * 责任人
+     */
+	@TableField("charge_person")
+    private String chargePerson;
+
+    /**
+     * 责任人身份证
+     */
+	@TableField("charge_person_id")
+    private String chargePersonId;
+
+    /**
+     * 确定重点防火部位的原因
+     */
+	@TableField("key_prevention_reason")
+    private String keyPreventionReason;
+
+    /**
+     * 消防设施情况
+     */
+	@TableField("fire_facilities_info")
+    private String fireFacilitiesInfo;
+
+    /**
+     * 防火标志设立情况
+     */
+	@TableField("fire_prevention_flag")
+    private String firePreventionFlag;
+
+    /**
+     * 危险源
+     */
+	@TableField("hazard")
+    private String hazard;
+
+    /**
+     * 消防安全管理措施
+     */
+	@TableField("safety_management_measures")
+    private String safetyManagementMeasures;
+
+    /**
+     * 防范手段措施
+     */
+	@TableField("preventive_measures")
+    private String preventiveMeasures;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/KeySiteMapper.java

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 重点部位 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-07-26
+ */
+public interface KeySiteMapper extends BaseMapper<KeySite> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IKeySiteService.java

+package com.yeejoin.amos.boot.module.common.api.service;
+
+
+/**
+ * 重点部位接口类
+ *
+ * @author system_generator
+ * @date 2021-07-26
+ */
+public interface IKeySiteService {
+
+}

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

@@ -99,7 +99,7 @@ public interface IMaintenanceCompanyService {
 	 * @param model
 	 * @return
 	 */
-	boolean updateMaintenanceCompanyDetail(MaintenanceCompany model);
+	boolean updateMaintenanceCompanyDetail(MaintenanceCompany model) throws Exception;
 
 	/**
 	 * 修改维保部门
@@ -107,7 +107,7 @@ public interface IMaintenanceCompanyService {
 	 * @param model
 	 * @return
 	 */
-	public boolean updateMaintenanceDepartmentDetail(MaintenanceCompany model);
+	public boolean updateMaintenanceDepartmentDetail(MaintenanceCompany model) throws Exception;
 
 	/**
 	 * 修改维保人员
@@ -115,7 +115,7 @@ public interface IMaintenanceCompanyService {
 	 * @param model
 	 * @return
 	 */
-	public boolean updateMaintenancePersonDetail(MaintenanceCompany model);
+	public boolean updateMaintenancePersonDetail(MaintenanceCompany model) throws Exception;
 
 	/**
 	 * 查询所有的单位-部门树

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -90,10 +90,12 @@ public interface IOrgUsrService {
 
 	/**
 	 * 更新机构/部门/人员基本信息和动态表单数据
-	 * @param alertFromValuelist
+	 *
+	 * @param instanceId 实例id
+	 * @param fromValueList 动态表单数据列表
 	 * @throws Exception
 	 */
-	void updateDynamicFormInstance(OrgUsr orgUsr,Long alertCalledId,List<DynamicFormInstance> alertFromValuelist)throws Exception;
+	void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList)throws Exception;
 
 	/**
 	 *

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.KeySiteMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/KeySiteController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 重点部位
+ *
+ * @author system_generator
+ * @date 2021-07-26
+ */
+@RestController
+@Api(tags = "重点部位Api")
+@RequestMapping(value = "/common/key-site")
+public class KeySiteController extends BaseController {
+
+    @Autowired
+    KeySiteServiceImpl keySiteServiceImpl;
+
+    /**
+     * 新增重点部位
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增重点部位", notes = "新增重点部位")
+	public ResponseModel<KeySiteDto> save(@RequestBody KeySiteDto model) {
+	    model = keySiteServiceImpl.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<KeySiteDto> updateBySequenceNbrKeySite(@RequestBody KeySiteDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(keySiteServiceImpl.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(keySiteServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个重点部位",  notes = "根据sequenceNbr查询单个重点部位")
+	public ResponseModel<KeySiteDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(keySiteServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "重点部位分页查询",  notes = "重点部位分页查询")
+	public ResponseModel<Page<KeySiteDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<KeySiteDto> page = new Page<KeySiteDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(keySiteServiceImpl.queryForKeySitePage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "重点部位列表全部数据查询",   notes = "重点部位列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<KeySiteDto>> selectForList() {
+	    return ResponseHelper.buildResponse(keySiteServiceImpl.queryForKeySiteList());
+	}
+}

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

@@ -178,8 +178,7 @@ public class MaintenanceCompanyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "put/company")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位", notes = "根据sequenceNbr更新维保单位")
-	public ResponseModel<Boolean> updateBySequenceNbrMaintenanceCompany(@RequestBody MaintenanceCompany model
-			) {
+	public ResponseModel<Boolean> updateBySequenceNbrMaintenanceCompany(@RequestBody MaintenanceCompany model) throws Exception {
 		return ResponseHelper
 				.buildResponse(maintenanceCompanyService.updateMaintenanceCompanyDetail(model));
 	}
@@ -193,7 +192,7 @@ public class MaintenanceCompanyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "put/person")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位人员", notes = "根据sequenceNbr更新维保单位")
-	public ResponseModel<Boolean> updateBySequenceNbrMaintenancePerson(@RequestBody MaintenanceCompany model) {
+	public ResponseModel<Boolean> updateBySequenceNbrMaintenancePerson(@RequestBody MaintenanceCompany model) throws Exception {
 		return ResponseHelper
 				.buildResponse(maintenanceCompanyService.updateMaintenancePersonDetail(model));
 	}
@@ -208,7 +207,7 @@ public class MaintenanceCompanyController extends BaseController {
 	@PutMapping(value = "put/department")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位部门", notes = "根据sequenceNbr更新维保单位")
 	public ResponseModel<Boolean> updateBySequenceNbrMaintenanceDepartment(@RequestBody MaintenanceCompany model
-			) {
+			) throws Exception {
 		return ResponseHelper
 				.buildResponse(maintenanceCompanyService.updateMaintenanceDepartmentDetail(model));
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormColumnServiceImpl.java

@@ -67,7 +67,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
     		queryWrapper.eq("group_code", code);
     		queryWrapper.orderByAsc("sort");
     		List<DynamicFormColumn> dynamicFormColumn = this.list(queryWrapper);
-    		List<DynamicFormInitDto> listfrom = new ArrayList<DynamicFormInitDto>();
+    		List<DynamicFormInitDto> listForm = new ArrayList<DynamicFormInitDto>();
     		String appKey = RequestContext.getAppKey();
     		// 组装数据
     		dynamicFormColumn.parallelStream().forEach(dynamicForm -> {
@@ -96,7 +96,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
     				}
     				vo.setFormItemDescr(dynamicFormValue);
     				vo.setSort(dynamicFormValue.getSort());
-    				listfrom.add(vo);
+    				listForm.add(vo);
     			} else {
     				// 查询数据项
     				DynamicFormInitDto vo = null;
@@ -122,7 +122,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 
 	    				vo.setFormItemDescr(dynamicFormValue);
 	    				vo.setSort(dynamicFormValue.getSort());
-	    				listfrom.add(vo);
+	    				listForm.add(vo);
 						break;
 					case "action":
 						vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
@@ -134,7 +134,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				dynamicFormValue.setAppKey(appKey);
 	    				vo.setFormItemDescr(dynamicFormValue);
 	    				vo.setSort(dynamicFormValue.getSort());
-	    				listfrom.add(vo);
+	    				listForm.add(vo);
 						break;
 					case "dict":
 						QueryWrapper<DataDictionary> queryWrappercolumnMap = new QueryWrapper<>();
@@ -152,13 +152,13 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				
 	    				if (dynamicForm.getFieldType().equals("radio")) {
 	    					vo.setDefaultValue(list.get(0).getValue());
-	    					dynamicFormValue.setFieldValue(list.get(0).getLabel());
-	    					dynamicFormValue.setFieldValueLabel(list.get(0).getValue());
+	    					dynamicFormValue.setFieldValue(list.get(0).getValue());
+	    					dynamicFormValue.setFieldValueLabel(list.get(0).getLabel());
 	    				}
 
 	    				vo.setFormItemDescr(dynamicFormValue);
 	    				vo.setSort(dynamicFormValue.getSort());
-	    				listfrom.add(vo);
+	    				listForm.add(vo);
 						break;
 					default:
 						vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
@@ -171,13 +171,13 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				
 	    				vo.setFormItemDescr(dynamicFormValue);
 	    				vo.setSort(dynamicFormValue.getSort());
-	    				listfrom.add(vo);
+	    				listForm.add(vo);
 						break;
 					}
     			}
     		});
 
-    		return listfrom.stream().sorted(Comparator.comparing(DynamicFormInitDto::getSort)).collect(Collectors.toList());
+    		return listForm.stream().sorted(Comparator.comparing(DynamicFormInitDto::getSort)).collect(Collectors.toList());
     	}
     	
     	public List<SelectItem> getdata(Collection<DataDictionary> list) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
+import com.yeejoin.amos.boot.module.common.api.mapper.KeySiteMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
+import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 重点部位服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-26
+ */
+@Service
+public class KeySiteServiceImpl extends BaseService<KeySiteDto,KeySite,KeySiteMapper> implements IKeySiteService {
+    /**
+     * 分页查询
+     */
+    public Page<KeySiteDto> queryForKeySitePage(Page<KeySiteDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<KeySiteDto> queryForKeySiteList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

@@ -111,7 +111,6 @@ public class MaintenanceCompanyServiceImpl
 		maintenanceCompany.setOrgCode(null);
 		maintenanceCompany.setBizCode(sequence.nextId() + "");
 		maintenanceCompany.setInstanceId(instanceId);
-		maintenanceCompany.setSequenceNbr(sequence.nextId());
 		maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase());
 		maintenanceCompany.setIsDelete(false);
 		try {
@@ -182,21 +181,11 @@ public class MaintenanceCompanyServiceImpl
 	}
 
 	/**
-	 * 添加维保单位人员信息
+	 * 添加动态表单信息
 	 * 
 	 * @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);
-//	}
 	public Long saveDynamicFormList(MaintenanceCompany maintenanceCompany) {
 		Long instanceId = sequence.nextId();
 		List<DynamicFormInstance> dynamicFormInstanceList = maintenanceCompany.getDynamicFormValue();
@@ -471,30 +460,28 @@ public class MaintenanceCompanyServiceImpl
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean updateMaintenanceCompanyDetail(MaintenanceCompany model) {
-		// 先刪除，后添加
+	public boolean updateMaintenanceCompanyDetail(MaintenanceCompany model) throws Exception {
 		return updateMaintenanceDetail(model, COMPANY);
 	}
 
-	public boolean updateMaintenanceDetail(MaintenanceCompany model, String type) {
+	public boolean updateMaintenanceDetail(MaintenanceCompany model, String type) throws Exception {
 		MaintenanceCompanyDto maintenanceCompany = this.queryBySeq(model.getSequenceNbr());
-		try {
-			if (maintenanceCompany != null) {
-				dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>()
-						.eq(DynamicFormInstance::getInstanceId, maintenanceCompany.getInstanceId()));
-			}
+//		try {
+////			if (maintenanceCompany != null) {
+////				dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>()
+////						.eq(DynamicFormInstance::getInstanceId, maintenanceCompany.getInstanceId()));
+////			}
+//		} catch (Exception e) {
+//			return false;
+//		}
 		this.updateDetail(model, type);
-		} catch (Exception e) {
-			return false;
-		}
 		return true;
 	}
 
-	public boolean updateDetail(MaintenanceCompany model, String type) {
-		// 将数据先存入扩展表操作service提供的公共保存方法，以便拿到对应的instanceId
-		Long instanceId = saveDynamicFormList(model);
-		// 拿到instanceId之后进行往主表中插入数据
-		model.setInstanceId(instanceId);
+	public boolean updateDetail(MaintenanceCompany model, String type) throws Exception {
+		// 更新动态表单数据
+		iOrgUsrService.updateDynamicFormInstance(model.getInstanceId(), model.getDynamicFormValue());
+		// 更新主表数据
 		model.setType(type);
 		try {
 			this.updateById(model);
@@ -505,19 +492,18 @@ public class MaintenanceCompanyServiceImpl
 			e.printStackTrace();
 			return false;
 		}
-
 		return true;
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean updateMaintenancePersonDetail(MaintenanceCompany model) {
+	public boolean updateMaintenancePersonDetail(MaintenanceCompany model) throws Exception {
 		return updateMaintenanceDetail(model, PERSON);
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean updateMaintenanceDepartmentDetail(MaintenanceCompany model) {
+	public boolean updateMaintenanceDepartmentDetail(MaintenanceCompany model) throws Exception {
 		return updateMaintenanceDetail(model, DEPARTMENT);
 	}
 

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

@@ -419,15 +419,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void updateDynamicFormInstance(OrgUsr orgUsr, Long alertCalledId, List<DynamicFormInstance> alertFromValuelist) throws Exception {
+	public void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList) {
 		// 填充主键
-		alertFromValuelist.stream().forEach(alertFromValue -> {
-			alertFromValue.setInstanceId(orgUsr.getSequenceNbr());
+		fromValueList.forEach(alertFromValue -> {
+			alertFromValue.setInstanceId(instanceId);
 		});
-		List<DynamicFormInstanceDto> formList = alertFormValueServiceImpl.queryByCalledId(orgUsr.getSequenceNbr());
+		List<DynamicFormInstanceDto> formList = alertFormValueServiceImpl.queryByCalledId(instanceId);
 
 		Map<Long, DynamicFormInstanceDto> resourceMap = new HashMap<>();
-		Map<Long, DynamicFormInstance> newResoourceMap = new HashMap<>();
+		Map<Long, DynamicFormInstance> newResourceMap = new HashMap<>();
 		formList.parallelStream().forEach(form -> {
 			resourceMap.put(form.getFormColumnId(), form);
 		});
@@ -436,7 +436,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		List<DynamicFormInstance> addList = new ArrayList<>();
 		List<Long> deleteList = new ArrayList<>();
 		
-		alertFromValuelist.parallelStream().forEach(submitFormItem -> {
+		fromValueList.parallelStream().forEach(submitFormItem -> {
 			if ( resourceMap.containsKey(submitFormItem.getFormColumnId())) {
 				DynamicFormInstanceDto oldForm = resourceMap.get(submitFormItem.getFormColumnId());
 				submitFormItem.setSequenceNbr(oldForm.getSequenceNbr());
@@ -444,11 +444,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			}else {
 				addList.add(submitFormItem);
 			}
-			newResoourceMap.put(submitFormItem.getFormColumnId(), submitFormItem);
+			newResourceMap.put(submitFormItem.getFormColumnId(), submitFormItem);
 		});
 		
 
-		newResoourceMap.keySet().parallelStream().forEach(form -> {
+		newResourceMap.keySet().parallelStream().forEach(form -> {
 			resourceMap.remove(form);
 		});
 		
@@ -547,7 +547,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		BeanUtils.copyProperties(OrgUsrVo, orgUsr);
 		saveOrgUsr(orgUsr, oriOrgUsr);
 		// 保存动态表单数据
-		updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgUsrVo.getDynamicFormValue());
+		updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgUsrVo.getDynamicFormValue());
 	}
 
 	@Override
@@ -567,7 +567,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		saveOrgUsr(orgUsr, oriOrgUsr);
 		// 保存动态表单数据
-		updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgPersonVo.getDynamicFormValue());
+		updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgPersonVo.getDynamicFormValue());
 	}
 
 	@Override
@@ -692,7 +692,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
 		saveOrgUsr(orgUsr, oriOrgUsr);
 		// 保存动态表单数据
-		updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgDepartmentVo.getDynamicFormValue());
+		updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgDepartmentVo.getDynamicFormValue());
 	}
 
 	@Override
@@ -886,7 +886,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	public List<CompanyPerson> returnCompanyPerson(List<Long> ids) {
-		if (ObjectUtils.isEmpty(ids)) return null;
+		if (ObjectUtils.isEmpty(ids)) {
+			return null;
+		}
 		return ids.stream().map(m -> {
 			OrgUsr org = getById(m);
 			if (ObjectUtils.isEmpty(org)) {