Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionPersonnel.java

@@ -69,5 +69,40 @@ public class PatrolInspectionPersonnel implements Serializable {
      */
     private Integer operateType;
 
+    /**
+     * 证件信息
+     */
+    private String documentInfo;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 文化程序（1、小学 2、初中 3、高中 4、大学 5、其他 ）
+     */
+    private Integer eduLevel;
+
+    /**
+     * 户籍地址
+     */
+    private String registerResidence;
+
+    /**
+     * 居住地址
+     */
+    private String residence;
+
+    /**
+     * 物理卡号
+     */
+    private String physicsCard;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPersonnelServiceImpl.java

@@ -55,11 +55,11 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
     public void addPatrolInspectionPersonnel(PatrolInspectionPersonnel patrolInspectionPersonnel) {
         LambdaQueryWrapper<PatrolInspectionPersonnel> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolInspectionPersonnel::getTenantId, SecurityUtils.getTenantId())
-                .eq(PatrolInspectionPersonnel::getAreaId, patrolInspectionPersonnel.getAreaId())
+//                .eq(PatrolInspectionPersonnel::getAreaId, patrolInspectionPersonnel.getAreaId())
                 .eq(PatrolInspectionPersonnel::getUserId, patrolInspectionPersonnel.getUserId());
         int count = this.count(queryWrapper);
         if (count>0){
-            throw new BusinessException("同区域人员不可重复添加");
+            throw new BusinessException("一个用户只能添加一个巡检人员");
         }
         patrolInspectionPersonnel.setCompanyId(0);
         patrolInspectionPersonnel.setTenantId(SecurityUtils.getTenantId());
@@ -143,6 +143,13 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
                 patrolInspectionPersonnelVo.setTenantId(list.get(i).getTenantId());
                 patrolInspectionPersonnelVo.setAreaId(list.get(i).getAreaId());
                 patrolInspectionPersonnelVo.setUserId(list.get(i).getUserId());
+                patrolInspectionPersonnelVo.setDocumentInfo(list.get(i).getDocumentInfo());
+                patrolInspectionPersonnelVo.setNation(list.get(i).getNation());
+                patrolInspectionPersonnelVo.setEduLevel(list.get(i).getEduLevel());
+                patrolInspectionPersonnelVo.setRegisterResidence(list.get(i).getRegisterResidence());
+                patrolInspectionPersonnelVo.setResidence(list.get(i).getResidence());
+                patrolInspectionPersonnelVo.setPhysicsCard(list.get(i).getPhysicsCard());
+                patrolInspectionPersonnelVo.setIdCard(list.get(i).getIdCard());
                 for (int j = 0; j < userList.size(); j++) {
                     if (list.get(i).getUserId().longValue() == userList.get(j).getUserId()) {
                         patrolInspectionPersonnelVo.setName(userList.get(j).getNickName());

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/PatrolInspectionPersonnelVo.java

@@ -70,5 +70,40 @@ public class PatrolInspectionPersonnelVo implements Serializable {
      */
     private String name;
 
+    /**
+     * 证件信息
+     */
+    private String documentInfo;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 文化程序（1、小学 2、初中 3、高中 4、大学 5、其他 ）
+     */
+    private Integer eduLevel;
+
+    /**
+     * 户籍地址
+     */
+    private String registerResidence;
+
+    /**
+     * 居住地址
+     */
+    private String residence;
+
+    /**
+     * 物理卡号
+     */
+    private String physicsCard;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
 
 }

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionPersonnelMapper.xml

@@ -12,6 +12,14 @@
         <result column="creator" property="creator" />
         <result column="enable" property="enable" />
         <result column="company_id" property="companyId" />
+        <result column="operate_type" property="operateType" />
+        <result column="document_info" property="documentInfo" />
+        <result column="nation" property="nation" />
+        <result column="edu_level" property="eduLevel" />
+        <result column="register_residence" property="registerResidence" />
+        <result column="residence" property="residence" />
+        <result column="physics_card" property="physicsCard" />
+        <result column="id_card" property="idCard" />
     </resultMap>
 
 </mapper>