提交维保单位代码 by chenhao

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

@@ -7,7 +7,6 @@ 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;
 
 /**
  * 维保单位
@@ -16,14 +15,21 @@ import lombok.EqualsAndHashCode;
  * @date 2021-07-16
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "MaintenanceCompanyDto", description = "维保单位")
-public class MaintenanceCompanyDto extends BaseDto {
+public class MaintenanceCompanyDto extends BaseDto{
 
 	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "照片地址")
+	private List<String> photoAddress;
+	
+	
 	@ApiModelProperty(value = "上级单位Id")
 	 private Long parentId;
 	
+	@ApiModelProperty(value = "instanceId")
+	private Long instanceId;
+	
 	@ApiModelProperty(value = "生产企业名称")
 	private String name;
 	
@@ -93,7 +99,7 @@ public class MaintenanceCompanyDto extends BaseDto {
 	@ApiModelProperty(value = "地址")
 	private String address;
 
-	@ApiModelProperty(value = "类型（COMPANY单位，PERSON人员）")
+	@ApiModelProperty(value = "类型（COMPANY单位，PERSON人员，DEPARTMENT部门）")
 	private String type;
 
 	@ApiModelProperty(value = "纬度")
@@ -109,6 +115,5 @@ public class MaintenanceCompanyDto extends BaseDto {
 	@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/MaintenanceDepartmentDto.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 chenhao
+ * @date 2021-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "MaintenanceDepartmentDto", description = "维保单位部门")
+public class MaintenanceDepartmentDto extends BaseDto {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "部门名称")
+	private String name;
+	@ApiModelProperty(value = "所在建筑")
+	private String projectCode;
+	@ApiModelProperty(value = "所属单位/部门")
+	private Long parentId;
+	@ApiModelProperty(value = "部门地址")
+	private String adrerss;
+	@ApiModelProperty(value = "部门男员工人数")
+	private String maleStaffNumber;
+	@ApiModelProperty(value = "部门女员工人数")
+	private String femaleStaffNumber;
+	@ApiModelProperty(value = "下属部门电话")
+	private String tel;
+	@ApiModelProperty(value = "类型（COMPANY单位，PERSON人员，DEPARTMENT部门）")
+	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/dto/MaintenancePersonDto.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 lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
  * 维保单位
@@ -15,7 +19,56 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
 @ApiModel(value = "MaintenancePersonDto", description = "维保单位人员")
 public class MaintenancePersonDto extends BaseDto{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	@ApiModelProperty(value = "类型（COMPANY单位，PERSON人员，DEPARTMENT部门）")
+	private String type;
+	@ApiModelProperty(value = "关联系统账号")
+	private String amosAccount;
+	@ApiModelProperty(value = "类别")	
+	private String category;
+	@ApiModelProperty(value = "证书编号")
+	private String certificateNo;
+	@ApiModelProperty(value = "性别")	
+	private String gender;
+	@ApiModelProperty(value = "身份证号码")
+	private String	idNumber;
+	@ApiModelProperty(value = "民族")	
+	private String nation;
+	//消防重点工种资格证书
+	@ApiModelProperty(value = "职业资格证书")	
+	private String professionalCertificate;
+	//人员资质
+	@ApiModelProperty(value = "职业资格")	
+	private String qualification;
+	@ApiModelProperty(value = "注册号")	
+	private String registerId;
+	@ApiModelProperty(value = "状态")	
+	private String status;
+	@ApiModelProperty(value = "手机号码")	
+	private String tel;
+	@ApiModelProperty(value = "部门编号")	
+	private String departmentNumber;
+	
+	@ApiModelProperty(value = "系统账户")	
+	private String systemAccount;
+	
+	@ApiModelProperty(value = "注册有效期开始时间")	
+	private String registrationStartTime;
+	
+	@ApiModelProperty(value = "注册有效期结束时间")	
+	private String registrationEndTime;
+	
+	@ApiModelProperty(value = "员工姓名")	
+    private String name;
+	@ApiModelProperty(value = "员工所在单位单位id")	
+    private Long parentId;
+	@ApiModelProperty(value = "上传资源的地址集合")	
+	private List<String> resourcesAdress;
 
 }

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

@@ -86,4 +86,5 @@ public class DynamicFormColumn extends BaseEntity {
      */
     @TableField("org_code")
     private String orgCode;
+    
 }

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

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("cb_maintenance_company")
+@TableName(value = "cb_maintenance_company",autoResultMap = true)
 public class MaintenanceCompany extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -33,7 +33,7 @@ public class MaintenanceCompany extends BaseEntity {
      */
 	@TableField("code")
     private String code;
-
+    
     /**
      * 类型（COMPANY单位，PERSON人员）
      */
@@ -75,4 +75,10 @@ public class MaintenanceCompany extends BaseEntity {
      */
 	@TableField("instance_id")
     private Long instanceId;
+	
+	
+	
+	
+	
+	
 }

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 com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
 
 /**
 * 维保单位 Mapper 接口
@@ -10,5 +10,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @date 2021-07-16
 */
 public interface MaintenanceCompanyMapper extends BaseMapper<MaintenanceCompany> {
-
 }

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

@@ -3,7 +3,11 @@ package com.yeejoin.amos.boot.module.common.api.service;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 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;
 
 /**
  * 维保单位接口类
@@ -14,27 +18,117 @@ import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
 public interface IMaintenanceCompanyService {
 	/**
 	 * 添加保存维保公司基本信息
+	 * 
 	 * @param maintenanceCompanyDto
 	 * @return
 	 */
 	public boolean saveCompanyDetail(MaintenanceCompanyDto maintenanceCompanyDto);
-    /**
-     * 添加保存维保单位人员基本信息
-     * @param maintenanceCompany
-     * @return
-     */
-	public boolean savePersonDetail(MaintenanceCompanyDto maintenanceCompany);
+
+	/**
+	 * 添加保存维保单位人员基本信息
+	 * 
+	 * @param maintenanceCompany
+	 * @return
+	 */
+	public boolean savePersonDetail(MaintenancePersonDto maintenancePerson, String Companycode);
+
 	/**
 	 * 自定义假删除
+	 * 
 	 * @param sequenceNbr
 	 * @return
 	 */
 	public boolean deleteById(Long sequenceNbr);
-	
+
 	/**
 	 * 获取公司名称的下拉列表
+	 * 
+	 * @return
+	 */
+	List<Map<String, Object>> getMaintenanceCompanyDropDownList();
+
+	/**
+	 * 添加保存维保单位部门基本信息
+	 * 
+	 * @param maintenanceDepartment
 	 * @return
 	 */
-	List<Map<String, Object>>	getMaintenanceCompanyDropDownList();
+	public boolean saveDepartmentDetail(MaintenanceDepartmentDto maintenanceDepartment ,String Companycode);
 
+	/**
+	 * 检查当前的员工编号是否已经存在
+	 * 
+	 * @param code
+	 * @return
+	 */
+	public boolean checkPersonCodeExists(String code);
+
+	/**
+	 * 查询所有的维保人员/单位/部门列表信息，无分页
+	 * 
+	 * @param maintenanceType 类型（COMPANY单位，PERSON人员，DEPARTMENT部门）
+	 * @return
+	 */
+	List<Map<String, Object>> getAllMaintenanceList(String maintenanceType);
+
+	/**
+	 * 查询分页展示的维保人员/单位/部门列表信息
+	 * 
+	 * @param current         页码起始值
+	 * @param size            行数
+	 * @param informationCard 是否显示维保单位人员信息卡数据项
+	 * @param dataItem        是否显示人员概要信息数据项
+	 * @param maintenanceType 类型（COMPANY单位，PERSON人员，DEPARTMENT部门）
+	 * @return
+	 */
+	IPage<Map<String, Object>> getPageMaintenanceList(int current, int size, String maintenanceType,String name,long parentId,String isWork);
+	
+	/**根据主键查询对应的信息
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
+	Map<String, Object>	findByInstanceId(Long instanceId,String maintenanceType );
+	
+	/**
+	 * 修改维保单位
+	 * @param model
+	 * @return
+	 */
+	boolean updateMaintenanceCompanyDetail(MaintenanceCompanyDto model);
+	
+	
+	/**
+	 * 修改维保部门
+	 * @param MaintenanceDepartmentDto
+	 * @return
+	 */
+	public boolean updateMaintenancDepartmentDetail(MaintenanceDepartmentDto model, String Companycode);
+	
+	
+	
+	/**
+	 * 修改维保人员
+	 * @param MaintenancePersonDto
+	 * @param  Companycode
+	 * @return
+	 */
+	public boolean updateMaintenancePersonDetail(MaintenancePersonDto model, String Companycode);
+    /**
+     * 查询所有的单位-部门树
+     * @return
+     */
+	public List<MaintenanceCompany> getCompanyAndDepartmentTree();
+    /**
+     * 查询制定公司的部门-人树
+     * @param sequenceNbr
+     * @return
+     */
+	public List<MaintenanceCompany> getDepartmentAndPersonTree(long sequenceNbr);
+    /**
+     * 查询当前单位下所有的部门基本信息--下拉列表
+     * @param sequenceNbr
+     * @return
+     */
+	public List<MaintenanceCompany> getDepartmentList(long sequenceNbr);
+	
 }