修改邀访新增

src/main/java/org/rcisoft/sys/visit/controller/InvitedPersonController.java

@@ -55,7 +55,10 @@ public class InvitedPersonController extends CyPaginationController<VisitInfoMat
     @ApiOperation(value = "根据id查找受邀记录详情")
     @GetMapping("/getVisitInfoById/{id:\\w+}")
     public CyResult getVisitInfoById(@PathVariable int id) {
-        return null;
+        return CyResultGenUtil.builder(new CyPersistModel(1),
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                invitedPersonService.getVisitUserById(id));
     }
 
     /**

src/main/java/org/rcisoft/sys/visit/entity/VisitInfoMation.java

@@ -60,6 +60,14 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
      */
     private String visitReasonCode;
 
+    @Transient // 查询输入的多选事由
+    @TableField(exist = false)
+    private String[] visitReasonCodes;
+
+    @Transient // 查询输入的多选事由
+    @TableField(exist = false)
+    private String[] visitReasons;
+
     /**
      * @desc 访问事由
      * @column visit_reason
@@ -83,6 +91,17 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
     @Excel(name = "访问区域", orderNum = "5", width = 20)
     private String visitRegion;
 
+    /**
+     * @desc 访问区域code
+     * @column visit_region_code
+     * @default
+     */
+    private String visitRegionCode;
+
+    @Transient // 查询输入的多选事由
+    @TableField(exist = false)
+    private String[] visitRegionCodes;
+
     @Transient
     @TableField(exist = false)
     private String[] visitRegions;
@@ -176,10 +195,6 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
     @TableField(exist = false)
     List<VisitUser> userList;
 
-    @Transient // 查询输入的多选事由
-    @TableField(exist = false)
-    private String[] visitReasons;
-
     @Transient //访客手机号（小程序登录用户手机号）
     @TableField(exist = false)
     private String phone;

src/main/java/org/rcisoft/sys/visit/service/InvitedPersonService.java

@@ -41,4 +41,6 @@ public interface InvitedPersonService {
     IPage<VisitInfoMation> getVisitInfoListByPagination(CyPageInfo<VisitInfoMation> paginationUtility, VisitInfoMation visitInfomation, HttpServletRequest request);
 
     List<VisitUser> getVisitUserByPhone(String visitPhone);
+
+    VisitUser getVisitUserById(int visitId);
 }

src/main/java/org/rcisoft/sys/visit/service/impl/InvitedPersonServiceImpl.java

@@ -112,4 +112,11 @@ public class InvitedPersonServiceImpl extends ServiceImpl<InvitedPersonRepositor
     public List<VisitUser> getVisitUserByPhone(String visitPhone) {
         return invitedPersonRepository.getVisitUserByPhone(visitPhone);
     }
+
+    @Override
+    public VisitUser getVisitUserById(int visitId){
+        VisitUser visitUser = invitedPersonRepository.getVisitUserById(visitId);
+        System.out.println(visitUser);
+        return invitedPersonRepository.getVisitUserById(visitId);
+    }
 }

src/main/java/org/rcisoft/sys/visit/service/impl/VisitInfomationServiceImpl.java

@@ -103,6 +103,16 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
         }
         region = region.substring(0, region.length() - 1);
         visitInfomation.setVisitRegion(region);
+
+        String[] regionCodes = visitInfomation.getVisitRegionCodes();
+        String regionCode = "";
+        for (String code:regionCodes){
+            regionCode = regionCode + code +",";
+        }
+        if (regionCode.length()>0){
+            regionCode = regionCode.substring(0,regionCode.length()-1);
+            visitInfomation.setVisitRegionCode(regionCode);
+        }
         int line = baseMapper.insert(visitInfomation);
         log.debug(CyUserUtil.getAuthenUsername() + "新增了ID为" +
                 visitInfomation.getBusinessId() + "的邀访信息信息");
@@ -192,14 +202,24 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
      */
     @Override
     public VisitInfoMation findById(int id) {
-        VisitInfoMation visitInfoMation = baseMapper.queryVisitById(id);
+        VisitInfoMation v = baseMapper.queryVisitById(id);
+        if (v.getVisitRegionCode() !=null){
+            String[] regionCodes = v.getVisitRegionCode().split(",");
+            v.setVisitRegionCodes(regionCodes);
+        }
+        if (v.getVisitRegion() != null) {
+            String[] regions = v.getVisitRegion().split(",");
+            v.setVisitRegions(regions);
+        }
         String vuList = "";
-        for (VisitUser vu : visitInfoMation.getUserList()) {
+        for (VisitUser vu : v.getUserList()) {
             vuList = vuList + vu.getUserName() + ',';
         }
-        vuList = vuList.substring(0, vuList.length() - 1);
-        visitInfoMation.setUserArry(vuList);
-        return visitInfoMation;
+        if (vuList.length()>0){
+            vuList = vuList.substring(0, vuList.length() - 1);
+        }
+        v.setUserArry(vuList);
+        return v;
     }
 
     /**
@@ -213,20 +233,28 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
                                                       VisitInfoMation visitInfomation) {
         if (visitInfomation.getVisitReason()!= null && visitInfomation.getVisitReason().length()>0){
             String[] reasons = visitInfomation.getVisitReason().split(",");
+            String[] reasonCodes = visitInfomation.getVisitReasonCode().split(",");
             for (String r: reasons) {
                 if (r.equals("other")){
                     visitInfomation.setBoolExistOtherReason("YES");
                 }
             }
+            visitInfomation.setVisitReasonCodes(reasonCodes);
             visitInfomation.setVisitReasons(reasons);
         }
         if (visitInfomation.getVisitRegion()!= null && visitInfomation.getVisitRegion().length()>0){
             String[] regions = visitInfomation.getVisitRegion().split(",");
+            String[] regionCodes = visitInfomation.getVisitRegionCode().split(",");
+            visitInfomation.setVisitRegionCodes(regionCodes);
             visitInfomation.setVisitRegions(regions);
         }
         IPage<VisitInfoMation> list = baseMapper.queryVisitInfomationsPaged(paginationUtility, visitInfomation);
         List<VisitInfoMation> mationList = list.getRecords();
         for (VisitInfoMation v : mationList) {
+            if (v.getVisitRegionCode() !=null){
+                String[] regionCodes = v.getVisitRegionCode().split(",");
+                v.setVisitRegionCodes(regionCodes);
+            }
             if (v.getVisitRegion() != null) {
                 String[] regions = v.getVisitRegion().split(",");
                 v.setVisitRegions(regions);

src/main/resources/mapper/InvitedPersonMapper.xml

@@ -17,7 +17,7 @@
     </resultMap>
 
     <select id="getVisitInfo" resultType="org.rcisoft.sys.visit.entity.VisitInfoMation">
-        select user_id,user_name,dept_name,post_name,visit_reason_code,visit_reason,visit_region,visit_date,visit_real_time,visit_time,visit_status,create_date info_create_date
+        select business_id,user_id,user_name,dept_name,post_name,visit_reason_code,visit_reason,visit_region,visit_date,visit_real_time,visit_time,visit_status,create_date info_create_date
         from visit_infomation
         where del_flag = 0
         and business_id = #{visit_id}
@@ -85,6 +85,6 @@
     <select id="getVisitUserById" resultMap="BaseResultMap">
         select * from visit_user
         where del_flag = 0
-          and businessId = #{businessId}
+          and business_id = #{businessId}
     </select>
 </mapper>

src/main/resources/mapper/VisitInfomationMapper.xml

@@ -101,7 +101,7 @@
 
     <select id="queryVisitInfomationsPaged" resultMap="BaseResultMap">
         select
-        vi.business_id,vi.user_name,vi.dept_name,vi.post_name,vi.visit_reason_other,vi.create_date,vi.visit_reason,vi.visit_region,vi.visit_date,vi.visit_time,vi.visit_status,vi.visit_real_time from visit_infomation vi
+        vi.business_id,vi.user_name,vi.dept_name,vi.post_name,vi.visit_reason_other,vi.create_date,vi.visit_reason_code,vi.visit_reason,vi.visit_region_code,vi.visit_region,vi.visit_date,vi.visit_time,vi.visit_status,vi.visit_real_time from visit_infomation vi
         where 1=1 and del_flag = 0
         <if test="entity.createDateBegin !=null">
             and vi.create_date >= #{entity.createDateBegin}
@@ -116,9 +116,9 @@
             and vi.visit_date &lt;= #{entity.visitDateEnd}
         </if>
         <if test="entity.visitReasons !=null and entity.visitReasons != '' ">
-            and vi.visit_reason in
-            <foreach collection="entity.visitReasons" item="reason" open="(" separator="," close=")">
-                #{reason}
+            and vi.visit_reason_code in
+            <foreach collection="entity.visitReasonCodes" item="code" open="(" separator="," close=")">
+                #{code}
             </foreach>
             <if test="entity.boolExistOtherReason !=null">
             or LENGTH(vi.visit_reason_other) > 0
@@ -246,7 +246,7 @@
     </select>
 
     <select id="queryVisitById" resultMap="BaseResultMap">
-        select vi.business_id,vi.user_name,vi.dept_name,vi.post_name,vi.create_date,vi.visit_reason,vi.visit_region,vi.visit_real_time,
+        select vi.business_id,vi.user_name,vi.user_id,vi.visit_reason_code,vi.visit_region_code,vi.dept_name,vi.post_name,vi.create_date,vi.visit_reason,vi.visit_region,vi.visit_real_time,vi.del_flag,
         vi.visit_date,vi.visit_time,vi.visit_status
         from visit_infomation vi
         where vi.del_flag='0'