删除无用vo

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersDto.java

@@ -33,7 +33,7 @@ public class FirefightersDto extends BaseDto {
     private String companyCode;
 
     @ApiModelProperty(value = "队伍id")
-    private Integer fireTeamId;
+    private String fireTeamId;
 
     @ApiModelProperty(value = "姓名")
     private String name;
@@ -103,5 +103,11 @@ public class FirefightersDto extends BaseDto {
 
     @ApiModelProperty(value = "机构名称")
     private String companyName;
+    
+    @ApiModelProperty(value = "岗位资质")	
+    private String postQualification;
+    
+    @ApiModelProperty(value = "专家领域")
+    private String areasExpertise;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/TemplateDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import java.util.Map;
+
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,7 +31,10 @@ public class TemplateDto extends BaseDto {
 
     @ApiModelProperty(value = "格式(0--json      1: 富文本)")
     private Boolean format;
-
+    
+    @ApiModelProperty(value = "模板填充数据")
+    private Map<String, Object> data;
+    
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import java.util.List;
-import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
 
 /**
 * 消防队员 Mapper 接口
@@ -33,7 +34,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 + "<if test='par.jobTitle!=null'>" + "and a.job_title_code =#{par.jobTitle}" + "</if>"
 +" limit #{pageNum},#{pageSize}"
 + "</script>")	 
-List<Firefighters>getFirefighters(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FirefightersListVo par);
+List<Firefighters>getFirefighters(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FirefightersDto par);
 @Select("<script>"
 + "select COUNT(a.sequence_nbr) num from  cb_firefighters a LEFT JOIN cb_firefighters_post b  on a.sequence_nbr=b.firefighters_id where a.is_delete=0 "
 + "<if test='par.postQualification!=null'>" + "and b.post_qualification_code = #{par.postQualification}" + "</if>"
@@ -43,7 +44,7 @@ List<Firefighters>getFirefighters(@Param("pageNum")int pageNum,@Param("pageSize"
 + "<if test='par.fireTeamId!=null'>" + "and a.fire_team_id= #{par.fireTeamId}" + "</if>"
 + "<if test='par.jobTitle!=null'>" + "and a.job_title_code= #{par.jobTitle}" + "</if>"
 + "</script>")	 
-Map<String, Long>getFirefightersCount(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FirefightersListVo par);
+Map<String, Long>getFirefightersCount(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FirefightersDto par);
 
 @Select("<script>"
 + "SELECT IFNULL(a.personnel_photos,'') personnelPhotos,	a.sequence_nbr sequenceNbr,IFNULL(a.`name`,'无')`name`,	IFNULL(a.job_title,'无') jobTitle,	IFNULL(b.administrative_position,'无') administrativePosition,	IFNULL(c.`name`,'无') fireTeamName,	IFNULL(a.state,'无') state,	IFNULL(b.employee_hierarchy,'无') employeeHierarchy,	IFNULL(b.areas_expertise,'无') areasExpertise,	IFNULL(a.gender,'无') gender, IFNULL(b.post_qualification,'无') postQualification,year( from_days( datediff( now( ), a.birthday_time))) age  	"

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
-
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
+
 /**
 * 消防队员 服务类
 *
@@ -14,7 +14,7 @@ import java.util.Map;
 */
 public interface IFirefightersService {
 
-	List<Firefighters>getFirefighters(int pageNum,int pageSize,FirefightersListVo par);
-	Map<String, Long>getFirefightersCount(int pageNum,int pageSize,FirefightersListVo par);
+	List<Firefighters>getFirefighters(int pageNum,int pageSize,FirefightersDto par);
+	Map<String, Long>getFirefightersCount(int pageNum,int pageSize,FirefightersDto par);
 	Map<String, Object> listToSelectById(Long  id);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertFormTypeVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-/**
-* 动态表单类型
-*
-* @author tb
-* @date 2021-06-17
-*/
-@Data
-@Accessors(chain = true)
-@TableName("jc_alert_form_type")
-@ApiModel(value="AlertFormTypeVo", description="动态表单类型")
-public class AlertFormTypeVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "表单类型code")
-    private String alertTypeCode;
-
-    @ApiModelProperty(value = "类型名称")
-    private String alertTypeName;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertSubmittedObjectVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-/**
-* 报送对象
-*
-* @author tb
-* @date 2021-06-17
-*/
-@Data
-@Accessors(chain = true)
-@TableName("jc_alert_submitted_object")
-@ApiModel(value="AlertSubmittedObjectVo", description="报送对象")
-public class AlertSubmittedObjectVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "报送单据id")
-    private Long alertSubmittedId;
-
-    @ApiModelProperty(value = "0人员1队伍")
-    private Boolean type;
-
-    @ApiModelProperty(value = " 单位id")
-    private Long companyId;
-
-    @ApiModelProperty(value = " 单位名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "人员id")
-    private Long userId;
-
-    @ApiModelProperty(value = "人员名称")
-    private String userName;
-
-    @ApiModelProperty(value = "人员电话")
-    private String userPhone;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/DataDictionaryVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-/**
-* 数据字典
-*
-* @author tb
-* @date 2021-06-07
-*/
-@Data
-@Accessors(chain = true)
-@TableName("cb_data_dictionary")
-@ApiModel(value="DataDictionaryVo", description="数据字典")
-public class DataDictionaryVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "code")
-    private String code;
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "类型")
-    private String type;
-
-    @ApiModelProperty(value = "父级")
-    private Long parent;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FireExpertsVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-/**
-* 
-*
-* @author tb
-* @date 2021-06-07
-*/
-@Data
-@Accessors(chain = true)
-@TableName("cb_fire_experts")
-@ApiModel(value="FireExpertsVo", description="")
-public class FireExpertsVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "证件类型")
-    private String documentType;
-
-    @ApiModelProperty(value = "证件号")
-    private Long documentNum;
-
-    @ApiModelProperty(value = "单位")
-    private String unitsName;
-
-    @ApiModelProperty(value = "性别")
-    private String gender;
-
-    @ApiModelProperty(value = "名族")
-    private String national;
-
-    @ApiModelProperty(value = "籍贯")
-    private String nativePlace;
-
-    @ApiModelProperty(value = "现居住地")
-    private String theLatter;
-
-    @ApiModelProperty(value = "政治面貌")
-    private String politicalLandscape;
-
-    @ApiModelProperty(value = "学历")
-    private String educationBackground;
-
-    @ApiModelProperty(value = "岗位名称")
-    private String jobs;
-
-    @ApiModelProperty(value = "领域")
-    private String field;
-
-    @ApiModelProperty(value = "是否内部专家")
-    private Boolean isnoInternal;
-
-    @ApiModelProperty(value = "消防机构id")
-    private Long fireTeamId;
-
-    @ApiModelProperty(value = "公用 电话")
-    private String officePhone;
-
-    @ApiModelProperty(value = "移动电话")
-    private String mobilePhone;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人员")
-    private String operationUesr;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "备注")
-    private String note;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersContactsVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-/**
-* l联系人
-*
-* @author tb
-* @date 2021-06-07
-*/
-@Data
-@Accessors(chain = true)
-@TableName("cb_firefighters_contacts")
-@ApiModel(value="FirefightersContactsVo", description="l联系人")
-public class FirefightersContactsVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "人员id")
-    private Long firefightersId;
-
-    @ApiModelProperty(value = "紧急联系人姓名")
-    private String emergencyContact;
-
-    @ApiModelProperty(value = "紧急联系人与本人所属关系")
-    private String relationship;
-
-    @ApiModelProperty(value = "紧急联系人电话")
-    private String emergencyContactPhone;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersContractVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-/**
-* 消防员合同
-*
-* @author tb
-* @date 2021-06-07
-*/
-@Data
-@Accessors(chain = true)
-@TableName("cb_firefighters_contract")
-@ApiModel(value="FirefightersContractVo", description="消防员合同")
-public class FirefightersContractVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "合同名称")
-    private String name;
-
-    @ApiModelProperty(value = "甲方")
-    private String partyA;
-
-    @ApiModelProperty(value = "乙方")
-    private String partyB;
-
-    @ApiModelProperty(value = "签订日期")
-    private Date signedTime;
-
-    @ApiModelProperty(value = "到期时间")
-    private Date expireTime;
-
-    @ApiModelProperty(value = "服务内容")
-    private String serviceContent;
-
-    @ApiModelProperty(value = "合同附件")
-    private String attachment;
-
-    @ApiModelProperty(value = "合同类型")
-    private String contractType;
-
-    @ApiModelProperty(value = "人员id")
-    private Long firefightersId;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersEducationVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-/**
-* 人员学历
-*
-* @author tb
-* @date 2021-06-07
-*/
-@Data
-@Accessors(chain = true)
-@TableName("cb_firefighters_education")
-@ApiModel(value="FirefightersEducationVo", description="人员学历")
-public class FirefightersEducationVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "人员id")
-    private Long firefightersId;
-
-    @ApiModelProperty(value = "第一学历")
-    private String firstDegree;
-
-    @ApiModelProperty(value = "最高学历")
-    private String highestEducation;
-
-    @ApiModelProperty(value = "学位")
-    private String academicDegree;
-
-    @ApiModelProperty(value = "毕业院校")
-    private String school;
-
-    @ApiModelProperty(value = "毕业专业名称")
-    private String professionalName;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersJacketVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-/**
-* 消防人员配装记录
-*
-* @author tb
-* @date 2021-06-07
-*/
-@Data
-@Accessors(chain = true)
-@TableName("jc_firefighters_jacket")
-@ApiModel(value="FirefightersJacketVo", description="消防人员配装记录")
-public class FirefightersJacketVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "消防队员")
-    private Long firefightersId;
-
-    @ApiModelProperty(value = "装备id")
-    private Long equipmentDetailId;
-
-    @ApiModelProperty(value = "装备数量")
-    private Double amount;
-
-    @ApiModelProperty(value = "装备计量单位")
-    private String unit;
-
-    @ApiModelProperty(value = "装备名称")
-    private String equipmentDetailName;
-
-    @ApiModelProperty(value = "装备分类名称")
-    private String equipmentTypeName;
-
-    @ApiModelProperty(value = "配发日期")
-    private Date allotmentTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersListVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-
-public class FirefightersListVo {
- @ApiModelProperty(value = "岗位资质")	
- private String postQualification;
- @ApiModelProperty(value = "专家领域")
- private String areasExpertise;
- @ApiModelProperty(value = "人员名称")
- private String name;
- @ApiModelProperty(value = "人员状态")
- private String state;
- @ApiModelProperty(value = "队伍id")
- private String fireTeamId;
- @ApiModelProperty(value = "岗位名称")
- private String jobTitle;
- 
- 
-public String getPostQualification() {
-	return postQualification;
-}
-public void setPostQualification(String postQualification) {
-	this.postQualification = postQualification;
-}
-public String getAreasExpertise() {
-	return areasExpertise;
-}
-public void setAreasExpertise(String areasExpertise) {
-	this.areasExpertise = areasExpertise;
-}
-public String getName() {
-	return name;
-}
-public void setName(String name) {
-	this.name = name;
-}
-public String getState() {
-	return state;
-}
-public void setState(String state) {
-	this.state = state;
-}
-public String getFireTeamId() {
-	return fireTeamId;
-}
-public void setFireTeamId(String fireTeamId) {
-	this.fireTeamId = fireTeamId;
-}
-public String getJobTitle() {
-	return jobTitle;
-}
-public void setJobTitle(String jobTitle) {
-	this.jobTitle = jobTitle;
-}
- 
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersPostVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-/**
-* 岗位信息
-*
-* @author tb
-* @date 2021-06-07
-*/
-@Data
-@Accessors(chain = true)
-@TableName("cb_firefighters_post")
-@ApiModel(value="FirefightersPostVo", description="岗位信息")
-public class FirefightersPostVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "人员id")
-    private Long firefightersId;
-
-    @ApiModelProperty(value = "员工层级")
-    private String employeeHierarchy;
-
-    @ApiModelProperty(value = "行政职务")
-    private String administrativePosition;
-
-    @ApiModelProperty(value = "岗位资质")
-    private String postQualification;
-
-    @ApiModelProperty(value = "消防救援人员类别")
-    private String category;
-
-    @ApiModelProperty(value = "消防救援人员状态")
-    private String state;
-
-    @ApiModelProperty(value = "消防救援衔级别代码")
-    private String level;
-
-    @ApiModelProperty(value = "资质证书")
-    private String qualificationCertificate;
-
-    @ApiModelProperty(value = "消防专家领域")
-    private String areasExpertise;
-
-    @ApiModelProperty(value = "是否专家_判断标识")
-    private String isnoExpert;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersThoughtVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-/**
-* 消防员思想谈话记录
-*
-* @author tb
-* @date 2021-06-07
-*/
-@Data
-@Accessors(chain = true)
-@TableName("cb_firefighters_thought")
-@ApiModel(value="FirefightersThoughtVo", description="消防员思想谈话记录")
-public class FirefightersThoughtVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "消防救援人员")
-    private Long firefightersId;
-
-    @ApiModelProperty(value = "填表时间")
-    private Date fillingTime;
-
-    @ApiModelProperty(value = "填表人（谈话人）")
-    private String preparer;
-
-    @ApiModelProperty(value = "政治立场")
-    private String politicalPosition;
-
-    @ApiModelProperty(value = "政治立场")
-    private String politicalPositionNote;
-
-    @ApiModelProperty(value = "思想品德")
-    private String thoughtMorality;
-
-    @ApiModelProperty(value = "使命意识")
-    private String senseMission;
-
-    @ApiModelProperty(value = "入队动机")
-    private String teamMotivation;
-
-    @ApiModelProperty(value = "入队动机")
-    private String teamMotivationNote;
-
-    @ApiModelProperty(value = "法纪意识")
-    private String disciplineConsciousness;
-
-    @ApiModelProperty(value = "法纪意识")
-    private String disciplineConsciousnessNote;
-
-    @ApiModelProperty(value = "服从意识")
-    private String obedienceConsciousness;
-
-    @ApiModelProperty(value = "服从意识")
-    private String obedienceConsciousnessNote;
-
-    @ApiModelProperty(value = "兴趣爱好")
-    private String hobby;
-
-    @ApiModelProperty(value = "兴趣爱好")
-    private String hobbyNote;
-
-    @ApiModelProperty(value = "身体状况")
-    private String physicalCondition;
-
-    @ApiModelProperty(value = "身体状况备注")
-    private String physicalConditionNote;
-
-    @ApiModelProperty(value = "性格特征心理品质")
-    private String psychologicalQuality;
-
-    @ApiModelProperty(value = "性格特征心理品质")
-    private String psychologicalQualityNote;
-
-    @ApiModelProperty(value = "自控能力")
-    private String selfControl;
-
-    @ApiModelProperty(value = "自控能力")
-    private String selfControlNote;
-
-    @ApiModelProperty(value = "反应能力")
-    private String reaction;
-
-    @ApiModelProperty(value = "反应能力")
-    private String reactionNote;
-
-    @ApiModelProperty(value = "社交关系")
-    private String socialRelations;
-
-    @ApiModelProperty(value = "社交关系")
-    private String socialRelationsNote;
-
-    @ApiModelProperty(value = "内部关系")
-    private String internal;
-
-    @ApiModelProperty(value = "内部关系")
-    private String internalNote;
-
-    @ApiModelProperty(value = "群众威信")
-    private String authority;
-
-    @ApiModelProperty(value = "群众威信")
-    private String authorityNote;
-
-    @ApiModelProperty(value = "家庭条件")
-    private String familyConditions;
-
-    @ApiModelProperty(value = "日常花销")
-    private String dailySpending;
-
-    @ApiModelProperty(value = "日常花销")
-    private String dailySpendingNote;
-
-    @ApiModelProperty(value = "抗压能力")
-    private String compressiveAbility;
-
-    @ApiModelProperty(value = "抗压能力")
-    private String compressiveAbilityNote;
-
-    @ApiModelProperty(value = "业余时间主要活动")
-    private String leisureActivities;
-
-    @ApiModelProperty(value = "工资津贴花费去向")
-    private String payTo;
-
-    @ApiModelProperty(value = "备注")
-    private String note;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersWorkexperienceVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-/**
-* 工作经历
-*
-* @author tb
-* @date 2021-06-07
-*/
-@Data
-@Accessors(chain = true)
-@TableName("cb_firefighters_workexperience")
-@ApiModel(value="FirefightersWorkexperienceVo", description="工作经历")
-public class FirefightersWorkexperienceVo{
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "参加工作时间")
-    private Date workingHours;
-
-    @ApiModelProperty(value = "参加消防部门工作时间")
-    private Date fireWorkingHours;
-
-    @ApiModelProperty(value = "人员id")
-    private Long firefightersId;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/TemplateVo.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Map;
-
-/**
- * 模板表
- *
- * @author tb
- * @date 2021-06-17
- */
-@Data
-@Accessors(chain = true)
-@TableName("jc_template")
-@ApiModel(value = "TemplateVo", description = "模板表")
-public class TemplateVo {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "模板类型code")
-    private String typeCode;
-
-    @ApiModelProperty(value = "模板类型")
-    private String type;
-
-    @ApiModelProperty(value = "模板内容")
-    private String content;
-
-    @ApiModelProperty(value = "格式(0--json      1: 富文本)")
-    private Boolean format;
-
-    @ApiModelProperty(value = "模板填充数据")
-    private Map data;
-
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.TemplateVo;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.*;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.TemplateServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-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 java.util.ArrayList;
-import java.util.Arrays;
 
 
 /**
@@ -182,7 +192,7 @@ public class AlertSubmittedController extends BaseController {
     @RequestMapping(value = "/{alertCalledId}/alert_submitted", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取警情续报内容和模板", notes = "获取警情续报内容和模板")
     public ResponseModel<Object> getAlertSubmittedContent(@PathVariable Long alertCalledId) {
-        ArrayList<TemplateVo> templateVos = new ArrayList<>();
+        ArrayList<TemplateDto> templateVos = new ArrayList<>();
         try {
             // 获取警情详情
             String companyName = getSelectedOrgInfo().getCompany().getCompanyName();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+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 com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -9,26 +29,25 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.*;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersVo;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.*;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContractServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersJacketServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersPostServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersThoughtServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-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.Arrays;
-import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -69,7 +88,7 @@ public class FirefightersController extends BaseController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增消防队员", notes = "新增消防队员")
     @Transactional
-    public ResponseModel<Firefighters> saveFirefighters(HttpServletRequest request, @RequestBody FirefightersVo firefighters){
+    public ResponseModel<Firefighters> saveFirefighters(@RequestBody FirefightersVo firefighters){
       
     	try {
     		   Firefighters firefighter= firefighters.getFirefighters();
@@ -239,7 +258,7 @@ public class FirefightersController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getFirefighters", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "新列表分页查询", notes = "新表分页查询")
-    public ResponseModel< Page<Firefighters> > getFirefighters(Integer pageNum,Integer pageSize, FirefightersListVo firefighters){
+    public ResponseModel< Page<Firefighters> > getFirefighters(Integer pageNum,Integer pageSize, FirefightersDto firefighters){
          //条件分页
         if (null == pageNum || null == pageSize) {
             pageNum = 1;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
@@ -9,6 +30,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
@@ -29,32 +51,8 @@ import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.TemplateVo;
 import com.yeejoin.amos.boot.module.jcs.biz.rule.action.AlertCalledAction;
-import com.yeejoin.amos.component.rule.config.ClazzUtils;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
-import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.typroject.tyboot.component.emq.EmqKeeper;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.StringUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 警情报送记录 服务实现类
@@ -350,7 +348,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
     }
 
-    public void getAlertSubmittedContent(Long alertCalledId, ArrayList<TemplateVo> templateVos, String companyName) throws IllegalAccessException {
+    public void getAlertSubmittedContent(Long alertCalledId, ArrayList<TemplateDto> templateDtos, String companyName) throws IllegalAccessException {
         AlertCalled alertCalled = alertCalledService.getById(alertCalledId);
         Map<String, Object> map = objectToMap(alertCalled);
         map.put("companyName", companyName);
@@ -377,10 +375,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 map.put("resourcesInfo", resourcesInfo.deleteCharAt(resourcesInfo.length() - 1).toString());
                 map.put("transferTime", lastPowerTransferCompany.get(0).getRecDate());
             }
-            TemplateVo templateVo = new TemplateVo();
-            BeanUtils.copyProperties(template, templateVo);
-            templateVo.setData(map);
-            templateVos.add(templateVo);
+            TemplateDto templateDto = new TemplateDto();
+            BeanUtils.copyProperties(template, templateDto);
+            templateDto.setData(map);
+            templateDtos.add(templateDto);
         }
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.util.List;
-import java.util.Map;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersService;
 
 /**
 * 消防队员 服务实现类
@@ -25,12 +25,12 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto,Firefig
 	 FirefightersMapper firefightersMapper;
 	
 	@Override
-	public List<Firefighters> getFirefighters(int pageNum, int pageSize, FirefightersListVo par) {		
+	public List<Firefighters> getFirefighters(int pageNum, int pageSize, FirefightersDto par) {		
 		return firefightersMapper.getFirefighters(pageNum, pageSize, par);
 	}
 
 	@Override
-	public Map<String, Long>  getFirefightersCount(int pageNum, int pageSize, FirefightersListVo par) {
+	public Map<String, Long>  getFirefightersCount(int pageNum, int pageSize, FirefightersDto par) {
 		// TODO Auto-generated method stub
 		return firefightersMapper.getFirefightersCount(pageNum, pageSize, par);
 	}