comit

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import java.util.List;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 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;
 
 /**
  * 维保单位
@@ -15,29 +17,84 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="MaintenanceCompanyDto", description="维保单位")
+@ApiModel(value = "MaintenanceCompanyDto", description = "维保单位")
 public class MaintenanceCompanyDto extends BaseDto {
 
 	private static final long serialVersionUID = 1L;
+	@ApiModelProperty(value = "上级单位Id")
+	 private Long parentId;
 	
-
-    @ApiModelProperty(value = "企业名称")
+	@ApiModelProperty(value = "生产企业名称")
 	private String name;
 	
-    @ApiModelProperty(value = "单位编码")
-    private String code;
+	@ApiModelProperty(value = "企业曾用名")
+	private String formerName;
 	
-    @ApiModelProperty(value = "类型（COMPANY单位，PERSON人员）")
-    private String type;
+	@ApiModelProperty(value = "法人代表")
+	private String legalPerson;
+	
+	@ApiModelProperty(value = "注册资本")
+	private String registeredCapital;
+	
+	
+	@ApiModelProperty(value = "销售电话")
+	private String salesTel;
+	
+	@ApiModelProperty(value = "服务电话")
+	private String serviceTel;
+	
+	@ApiModelProperty(value = "企业性质")
+	private String nature; 
+	
+	
+	@ApiModelProperty(value = "国别")
+	private String nation;
+	
+	
+	@ApiModelProperty(value = "所在省份")
+	private String province;
 	
-    @ApiModelProperty(value = "上级单位")
-    private Long parentId;
 	
-    @ApiModelProperty(value = "业务编码")
-    private String bizCode;
+	@ApiModelProperty(value = "主要产品类型")
+	private String mainProductType;
 	
-    @ApiModelProperty(value = "组织机构代码用于权限过滤")
-    private String orgCode;
+	
+	@ApiModelProperty(value = "固定资产总值")
+	private String totalFixedAssets;
+	
+	
+	@ApiModelProperty(value = "拟制技术标准")
+	private String draftingTechStandards;
+	
+	@ApiModelProperty(value = "总人数")
+	private String totalStaff;
+	
+	
+	@ApiModelProperty(value = "技术人员数量")
+	private String technicianNumber;
+	
+	@ApiModelProperty(value = "生产企业类型")
+	private String enterpriseType;
+	
+	@ApiModelProperty(value = "资质")
+	private String  qualification;
+	
+	@ApiModelProperty(value = "历史沿革")
+	private String history;
+	
+	@ApiModelProperty(value = "主要检测设备")
+	private String mainTestEquipment;
+	
+
+	@ApiModelProperty(value = "重大研制记录")
+	private String majorDevelopRecord;
+	
+	
+	@ApiModelProperty(value = "地址")
+	private String address;
+
+	@ApiModelProperty(value = "类型（COMPANY单位，PERSON人员）")
+	private String type;
 
 	@ApiModelProperty(value = "纬度")
 	private String latitude;
@@ -45,10 +102,13 @@ public class MaintenanceCompanyDto  extends BaseDto {
 	@ApiModelProperty(value = "经度")
 	private String longitude;
 
-    @ApiModelProperty(value = "动态表单实例id")
-    private Long instanceId;
+	@ApiModelProperty(value = "标注/标绘坐标数组")
+	private String coordinate;
+
 	
-    @ApiModelProperty(value = "更新人")
-    private String recUserName;
+	@ApiModelProperty(value = "备注")
+	private String remark;
 	
+	@ApiModelProperty(value = "照片地址")
+	private List<String> photoAddress;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/MaintenancePersonDto.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 lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 维保单位
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "MaintenancePersonDto", description = "维保单位人员")
+public class MaintenancePersonDto extends BaseDto{
+
+}

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

@@ -3,10 +3,10 @@ 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;
 
 /**
 * 维保单位

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/ExceptionEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+public enum ExceptionEnum {
+ 
+    PARAMETER_TYPE_ERROR   ("0001","传入參數异常");
+
+    private String eCode;
+
+    private String eMsg;
+
+    ExceptionEnum(String eCode, String eMsg) {
+        this.eCode = eCode;
+        this.eMsg = eMsg;
+    }
+
+    public String getEcode() {
+        return eCode;
+    }
+
+    public String getEmsg() {
+        return eMsg;
+    }
+
+    public static ExceptionEnum statOf(String eCode) {
+        for (ExceptionEnum state : values())
+            if (state.getEcode().equals(eCode))
+                return state;
+        return null;
+    }
+	
+	
+}

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
+import java.util.List;
+import java.util.Map;
+
+import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
 
 /**
-* 维保单位接口类
-*
-* @author system_generator
-* @date 2021-07-16
-*/
+ * 维保单位接口类
+ *
+ * @author chenhao
+ * @date 2021-07-16
+ */
 public interface IMaintenanceCompanyService {
+	/**
+	 * 添加保存维保公司基本信息
+	 * @param maintenanceCompanyDto
+	 * @return
+	 */
+	public boolean saveCompanyDetail(MaintenanceCompanyDto maintenanceCompanyDto);
+    /**
+     * 添加保存维保单位人员基本信息
+     * @param maintenanceCompany
+     * @return
+     */
+	public boolean savePersonDetail(MaintenanceCompanyDto maintenanceCompany);
+	/**
+	 * 自定义假删除
+	 * @param sequenceNbr
+	 * @return
+	 */
+	public boolean deleteById(Long sequenceNbr);
+	
+	/**
+	 * 获取公司名称的下拉列表
+	 * @return
+	 */
+	List<Map<String, Object>>	getMaintenanceCompanyDropDownList();
 
 }

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
-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.biz.service.impl.MaintenanceCompanyServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,9 +20,16 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
+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.enums.ExceptionEnum;
+import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.utils.MyException;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 维保单位
@@ -39,20 +45,60 @@ public class MaintenanceCompanyController extends BaseController {
 	@Autowired
 	MaintenanceCompanyServiceImpl maintenanceCompanyServiceImpl;
 	
+	@Autowired
+	IMaintenanceCompanyService maintenanceCompanyService;
+	
+	private static final String COMPANY = "COMPANY";
+	private static final String PERSON = "PERSON";
+
 	/**
 	 * 新增维保单位
 	 *
 	 * @return
+	 * @throws MyException
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/company/save")
+	@ApiOperation(httpMethod = "POST", value = "新增维保人员", notes = "新增维保人员")
+	public ResponseModel<Boolean> saveMaintenanceCompany(@RequestBody MaintenanceCompanyDto model) throws MyException {
+		 if( COMPANY.equals(model.getType())) {
+			return ResponseHelper.buildResponse(maintenanceCompanyService.saveCompanyDetail(model));
+		}else {
+			throw new MyException(ExceptionEnum.PARAMETER_TYPE_ERROR);
+		}
+	}
+	
+	/**
+	 * 新增维保单位人员基本信息
+	 *
+	 * @return
+	 * @throws MyException
 	 */
 	@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);
+	@PostMapping(value = "/person/save")
+	@ApiOperation(httpMethod = "POST", value = "新增维保人员", notes = "新增维保人员")
+	public ResponseModel<Boolean> saveMaintenancePerson(@RequestBody MaintenanceCompanyDto model) throws MyException {
+		if(PERSON.equals(model.getType())) {
+			return ResponseHelper.buildResponse(maintenanceCompanyService.savePersonDetail(model));
+		}else {
+			throw new MyException(ExceptionEnum.PARAMETER_TYPE_ERROR);
+		}
 	}
 	
 	/**
+	 * 获取公司名称的下拉列表
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/getCompanyDropDownList")
+	@ApiOperation(httpMethod = "GET", value = "查询公司名称下拉列表", notes = "查询公司名称下拉列表")
+	public ResponseModel<List<Map<String, Object>>> getMaintenanceCompanyDropDownList() {
+		List<Map<String, Object>> result=	maintenanceCompanyService.getMaintenanceCompanyDropDownList();
+		return ResponseHelper.buildResponse(result);
+	}
+	
+	
+	/**
 	 * 根据sequenceNbr更新
 	 *
 	 * @param sequenceNbr 主键
@@ -61,7 +107,8 @@ public class MaintenanceCompanyController extends BaseController {
 	@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) {
+	public ResponseModel<MaintenanceCompanyDto> updateBySequenceNbrMaintenanceCompany(
+			@RequestBody MaintenanceCompanyDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
 		return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.updateWithModel(model));
 	}
@@ -75,8 +122,9 @@ public class MaintenanceCompanyController extends BaseController {
 	@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));
+	public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
+			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.deleteById(sequenceNbr));
 	}
 
 	/**
@@ -102,7 +150,8 @@ public class MaintenanceCompanyController extends BaseController {
 	@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) {
+	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);

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
 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.dto.MaintenanceCompanyDto;
-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;
 
 /**
  * 维保单位服务实现类
@@ -16,7 +24,27 @@ import java.util.List;
  * @date 2021-07-16
  */
 @Service
-public class MaintenanceCompanyServiceImpl extends BaseService<MaintenanceCompanyDto,MaintenanceCompany,MaintenanceCompanyMapper> implements IMaintenanceCompanyService {
+public class MaintenanceCompanyServiceImpl
+		extends BaseService<MaintenanceCompanyDto, MaintenanceCompany, MaintenanceCompanyMapper>
+		implements IMaintenanceCompanyService {
+
+	private static final String MAINTENANC_ECOMPANY = "maintenanceCompany";
+	private static final String MAINTENANCE_PERSON = "maintenancePerson";
+	private static final String PERSON = "Person";
+	private static final String COMPANY = "Company";
+
+	@Autowired
+	DynamicFormInstanceServiceImpl dynamicFormInstanceService;
+
+	@Autowired
+	DynamicFormColumnServiceImpl dynamicFormColumnServiceImpl;
+
+	@Autowired
+	Sequence sequence;
+
+	@Autowired
+	MaintenanceCompanyMapper maintenanceCompanyMapper;
+
 	/**
 	 * 分页查询
 	 */
@@ -28,6 +56,83 @@ public class MaintenanceCompanyServiceImpl extends BaseService<MaintenanceCompan
 	 * 列表查询 示例
 	 */
 	public List<MaintenanceCompanyDto> queryForMaintenanceCompanyList() {
-        return this.queryForList("" , false);
+		return this.queryForList("", false);
+	}
+
+	/**
+	 * 添加维保单位基本信息
+	 * 
+	 * @param maintenanceCompany
+	 * @return
+	 */
+	public boolean saveCompanyDetail(MaintenanceCompanyDto maintenanceCompanyDto) {
+		Map<String, Object> model = Bean.BeantoMap(maintenanceCompanyDto);
+		// 将数据西安存入扩展表操作service提供的公共保存方法，以便拿到对应的instanceId
+		Long instanceId = dynamicFormInstanceService.commonSave(MAINTENANC_ECOMPANY, model);
+		// 拿到instanceId之后进行往主表中插入数据
+		MaintenanceCompany maintenanceCompany = (MaintenanceCompany) Bean.mapToBean(model, MaintenanceCompany.class);
+		maintenanceCompany.setCode(OrgUsrServiceImpl.getOrgCodeStr());
+		maintenanceCompany.setOrgCode(null);
+		maintenanceCompany.setType(COMPANY);
+		maintenanceCompany.setBizCode(sequence.nextId() + "");
+		maintenanceCompany.setInstanceId(instanceId);
+		try {
+			this.save(maintenanceCompany);
+		} catch (Exception e) {
+			return false;
+		}
+
+		return false;
+	}
+
+	/**
+	 * 添加维保单位人员信息
+	 * 
+	 * @param maintenanceCompany
+	 * @return
+	 */
+	public boolean savePersonDetail(MaintenanceCompanyDto maintenanceCompany) {
+		Map<String, Object> model = Bean.BeantoMap(maintenanceCompany);
+		// 将数据西安存入扩展表操作service提供的公共保存方法，以便拿到对应的instanceId
+		Long instanceId = dynamicFormInstanceService.commonSave(MAINTENANCE_PERSON, model);
+		// 拿到instanceId之后进行往主表中插入数据
+		MaintenanceCompany entity = (MaintenanceCompany) Bean.mapToBean(model, MaintenanceCompany.class);
+		// 添加人员时，当前的orgcode 为单位code+6位随机数
+		entity.setCode(entity.getCode() + OrgUsrServiceImpl.getOrgCodeStr());
+		entity.setOrgCode(null);
+		entity.setType(PERSON);
+		entity.setBizCode(sequence.nextId() + "");
+		entity.setInstanceId(instanceId);
+		try {
+			this.save(entity);
+		} catch (Exception e) {
+			return false;
 		}
+		return false;
+	}
+
+	public boolean deleteById( Long sequenceNbr) {
+		
+		MaintenanceCompany maintenanceCompany = maintenanceCompanyMapper.selectById(sequenceNbr);
+		if(ObjectUtils.isEmpty(maintenanceCompany)) {
+			return false;
+		}
+		maintenanceCompany.setIsDelete(true);
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(MaintenanceCompany::getSequenceNbr, sequenceNbr);
+
+		int number = maintenanceCompanyMapper.update(maintenanceCompany, wrapper);
+		if (number > 0) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public List<Map<String, Object>> getMaintenanceCompanyDropDownList() {
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.select(MaintenanceCompany::getCode,MaintenanceCompany::getName);
+		return	maintenanceCompanyMapper.selectMaps(wrapper);
+	}
+
 }
\ 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/utils/MyException.java

+package com.yeejoin.amos.boot.module.common.biz.utils;
+
+
+import java.io.Serializable;
+
+import com.yeejoin.amos.boot.module.common.api.enums.ExceptionEnum;
+/**
+ * 自定义异常处理类
+ * @author chenhao
+ *
+ */
+public class MyException extends Exception implements Serializable{
+     
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private ExceptionEnum exceptionEnum;
+	
+	private String detail;
+	
+	protected String devMessage;
+	
+	public MyException(ExceptionEnum exceptionEnum, String detail) {
+		this.exceptionEnum =exceptionEnum;
+		this.detail= detail;
+		this.devMessage=getDevMessage();
+	}
+	
+	public MyException(ExceptionEnum exceptionEnum) {
+		this.exceptionEnum =exceptionEnum;
+		this.devMessage=getDevMessage();
+	}
+	
+	public ExceptionEnum getExceptionEnum() {
+		return exceptionEnum;
+	}
+	
+	public void setExceptionEnum(ExceptionEnum exceptionEnum) {
+		this.exceptionEnum = exceptionEnum;
+	}
+	
+	public String getDetail() {
+		return detail;
+	}
+	
+	public void setDetail(String detail) {
+		this.detail = detail;
+	}
+	
+	public String getDevMessage() {
+		return "error";
+	}
+	
+	public void setDevMessage(String devMessage) {
+		this.devMessage = devMessage;
+	}
+	
+}