优化 访客审核

java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java

@@ -26,7 +26,7 @@ public class VisitDto extends PageDto implements Serializable {
     private String visitGender;
     private String ownerId;
     private String ownerName;
-    private String userId;
+    private String createUserId;
     private String vId;
     private String[] vIds;
 
@@ -83,12 +83,12 @@ public class VisitDto extends PageDto implements Serializable {
         this.ownerId = ownerId;
     }
 
-    public String getUserId() {
-        return userId;
+    public String getCreateUserId() {
+        return createUserId;
     }
 
-    public void setUserId(String userId) {
-        this.userId = userId;
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
     }
 
     public String getvId() {

java110-bean/src/main/java/com/java110/vo/api/visit/ApiVisitDataVo.java

@@ -7,7 +7,7 @@ public class ApiVisitDataVo implements Serializable {
     private String vName;
     private String visitGender;
     private String phoneNumber;
-    private String userId;
+    private String createUserId;
     private String communityId;
     private String ownerId;
     private String ownerName;
@@ -65,13 +65,6 @@ public class ApiVisitDataVo implements Serializable {
         this.phoneNumber = phoneNumber;
     }
 
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
 
     public String getCommunityId() {
         return communityId;
@@ -256,4 +249,12 @@ public class ApiVisitDataVo implements Serializable {
     public void setFlowId(String flowId) {
         this.flowId = flowId;
     }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
 }

java110-db/src/main/resources/mapper/community/VisitV1ServiceDaoImplMapper.xml

@@ -19,7 +19,7 @@
     <select id="getVisitInfo" parameterType="Map" resultType="Map">
         select t.departure_time,t.departure_time departureTime,t.v_name,t.v_name vName,t.status_cd,t.status_cd
         statusCd,t.ps_id,t.ps_id psId,t.visit_gender,t.visit_gender visitGender,t.owner_id,t.owner_id
-        ownerId,t.reason_type,t.reason_type reasonType,t.user_id,t.user_id userId,t.state_remark,t.state_remark
+        ownerId,t.reason_type,t.reason_type reasonType,t.user_id,t.user_id createUserId,t.state_remark,t.state_remark
         stateRemark,t.v_id,t.v_id vId,t.visit_time,t.visit_time visitTime,t.phone_number,t.phone_number
         phoneNumber,t.free_time,t.free_time freeTime,t.visit_case,t.visit_case
         visitCase,t.state,t.community_id,t.community_id communityId,t.entourage,t.record_state,t.record_state
@@ -48,8 +48,8 @@
         <if test="reasonType !=null and reasonType != ''">
             and t.reason_type= #{reasonType}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
+        <if test="createUserId !=null and createUserId != ''">
+            and t.user_id= #{createUserId}
         </if>
         <if test="stateRemark !=null and stateRemark != ''">
             and t.state_remark= #{stateRemark}
@@ -183,8 +183,8 @@
         <if test="reasonType !=null and reasonType != ''">
             and t.reason_type= #{reasonType}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
+        <if test="createUserId !=null and createUserId != ''">
+            and t.user_id= #{createUserId}
         </if>
         <if test="stateRemark !=null and stateRemark != ''">
             and t.state_remark= #{stateRemark}

service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java

@@ -119,7 +119,7 @@ public class ListVisitsCmd extends Cmd {
             VisitDto visitDto = BeanConvertUtil.covertBean(reqJson, VisitDto.class);
             if (reqJson.containsKey("channel") && !StringUtil.isEmpty(reqJson.getString("channel"))
                     && "PC".equals(reqJson.getString("channel"))) {
-                visitDto.setUserId("");
+                visitDto.setCreateUserId("");
             }
             int count = visitV1InnerServiceSMO.queryVisitsCount(visitDto);
             List<ApiVisitDataVo> visits = new ArrayList<>();

service-community/src/main/java/com/java110/community/smo/impl/VisitInnerServiceSMOImpl.java

@@ -69,7 +69,7 @@ public class VisitInnerServiceSMOImpl extends BaseServiceSMO implements IVisitIn
      */
     private void refreshVisit(VisitDto visit, List<UserDto> users) {
         for (UserDto user : users) {
-            if (!StringUtil.isEmpty(visit.getUserId()) && visit.getUserId().equals(user.getUserId())) {
+            if (!StringUtil.isEmpty(visit.getCreateUserId()) && visit.getCreateUserId().equals(user.getUserId())) {
                 BeanConvertUtil.covertBean(user, visit);
             }
         }
@@ -84,7 +84,7 @@ public class VisitInnerServiceSMOImpl extends BaseServiceSMO implements IVisitIn
     private String[] getUserIds(List<VisitDto> visits) {
         List<String> userIds = new ArrayList<String>();
         for (VisitDto visit : visits) {
-            userIds.add(visit.getUserId());
+            userIds.add(visit.getCreateUserId());
         }
 
         return userIds.toArray(new String[userIds.size()]);

service-job/src/main/java/com/java110/job/adapt/hcGov/visit/AddVisitAdapt.java

@@ -261,7 +261,7 @@ public class AddVisitAdapt extends DatabusAdaptImpl {
                 body.put("vName", visits.get(0).getvName());
                 body.put("visitGender", visits.get(0).getVisitGender());
                 body.put("phoneNumber", visits.get(0).getPhoneNumber());
-                body.put("userId", visits.get(0).getUserId());
+                body.put("userId", visits.get(0).getCreateUserId());
                 body.put("communityId", visits.get(0).getCommunityId());
                 body.put("ownerId", visits.get(0).getOwnerId());
                 body.put("visitCase", visits.get(0).getVisitCase());

service-job/src/main/java/com/java110/job/adapt/hcGov/visit/ExamineVisitAdapt.java

@@ -277,7 +277,7 @@ public class ExamineVisitAdapt extends DatabusAdaptImpl {
         body.put("vName", visits.get(0).getvName());
         body.put("visitGender", visits.get(0).getVisitGender());
         body.put("phoneNumber", visits.get(0).getPhoneNumber());
-        body.put("userId", visits.get(0).getUserId());
+        body.put("userId", visits.get(0).getCreateUserId());
         body.put("communityId", visits.get(0).getCommunityId());
         body.put("ownerId", visits.get(0).getOwnerId());
         body.put("visitCase", visits.get(0).getVisitCase());