Merge remote-tracking branch 'origin/dev' into dev

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java

@@ -324,7 +324,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
             String deptId=user.getDeptId();
             if (deptId != null){
                 SysDept dept = sysDeptRepositorys.getDeptById(deptId);
-                if (dept.getDeptName()!=null){
+                if (dept != null && dept.getDeptName()!=null){
                     user.setDeptName(dept.getDeptName());
                 }
             }
@@ -337,7 +337,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
         String deptId=user.getDeptId();
         if (deptId != null){
             SysDept dept = sysDeptRepositorys.getDeptById(deptId);
-            if (dept.getDeptName()!=null){
+            if (dept != null && dept.getDeptName()!=null){
                 user.setDeptName(dept.getDeptName());
             }
         }

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

@@ -8,8 +8,10 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.rcisoft.core.anno.CyEptSm4EnableAnno;
 import org.rcisoft.core.anno.CyOpeLogAnno;
+import org.rcisoft.core.jwt.util.CyJwtUtil;
 import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
 import org.rcisoft.core.util.CyEpExcelUtil;
+import org.rcisoft.core.util.CyUserUtil;
 import org.rcisoft.sys.visit.entity.VisitInfoMation;
 import org.rcisoft.sys.visit.service.VisitInfomationService;
 import org.springframework.validation.BindingResult;
@@ -42,11 +44,21 @@ public class VisitInfomationController extends CyPaginationController<VisitInfoM
     @Autowired
     private VisitInfomationService visitInfomationServiceImpl;
 
+    //添加邀访信息
+    @Autowired
+    private CyJwtUtil cyJwtUtil;
+
     //@PreAuthorize("@cyPerm.hasPerm('sys:itInfomation:add')")
     @CyOpeLogAnno(title = "system-邀访信息管理-新增邀访信息", businessType = CyLogTypeEnum.INSERT)
     @ApiOperation(value = "添加邀访信息", notes = "添加邀访信息")
     @PostMapping(value = "/add")
-    public CyResult add(@RequestBody VisitInfoMation visitInfomation) {
+    public CyResult add(@RequestBody VisitInfoMation visitInfomation,HttpServletRequest request) {
+
+        //todo 添加信息时候同时添加用户id
+        String tempUserId = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_ID);
+        int userId = Integer.parseInt(tempUserId);
+        //添加条件添加用户id
+        visitInfomation.setUserId(userId);
         CyPersistModel data = visitInfomationServiceImpl.persist(visitInfomation);
         return CyResultGenUtil.builder(data,
                 CyMessCons.MESSAGE_ALERT_SUCCESS,
@@ -127,6 +139,15 @@ public class VisitInfomationController extends CyPaginationController<VisitInfoM
         visitInfomationServiceImpl.findAllByPagination(getPaginationUtility(), visitInfomation);
         return getGridModelResponse();
     }
+    //@PreAuthorize("@cyPerm.hasPerm('sys:itInfomation:list')")
+    @CyOpeLogAnno(title = "system-wx小程序邀访信息管理-查询邀访信息", businessType = CyLogTypeEnum.QUERY)
+    @ApiOperation(value = "wx小程序分页查询邀访信息集合", notes = "分页查询邀访信息集合")
+    @GetMapping(value = "/queryVisitInfomationWithUserIdByPagination")
+    public CyGridModel listWithUserIdByPagination(VisitInfoMation visitInfomation, HttpServletRequest request) {
+        visitInfomationServiceImpl.findAllWithUserIdByPagination(getPaginationUtility(), visitInfomation ,request);
+        return getGridModelResponse();
+    }
+
 
     @CyOpeLogAnno(title = "system-邀访信息管理-查询邀访信息", businessType = CyLogTypeEnum.EXPORT)
     @ApiOperation(value = "导出邀访信息信息", notes = "导出邀访信息信息")
@@ -162,14 +183,14 @@ public class VisitInfomationController extends CyPaginationController<VisitInfoM
                 visitInfomationServiceImpl.lastDetail(request));
     }
 
-    @CyOpeLogAnno(title = "system-邀访信息管理-查询两条最近的邀访记录", businessType = CyLogTypeEnum.QUERY)
-    @ApiOperation(value = "查询两条最近的邀访记录", notes = "查询两条最近的邀访记录")
+    @CyOpeLogAnno(title = "system-wx邀访信息管理-查询两条最近的邀访记录", businessType = CyLogTypeEnum.QUERY)
+    @ApiOperation(value = "wx查询两条最近的邀访记录", notes = "查询两条最近的邀访记录")
     @GetMapping("/getPastOrFuture")
-    public CyResult getPastOrFuture() {
+    public CyResult getPastOrFuture(HttpServletRequest request) {
         return CyResultGenUtil.builder(new CyPersistModel(1),
                 CyMessCons.MESSAGE_ALERT_SUCCESS,
                 CyMessCons.MESSAGE_ALERT_ERROR,
-                visitInfomationServiceImpl.getPastOrFutureInfo());
+                visitInfomationServiceImpl.getPastOrFutureInfo(request));
     }
 
     @CyOpeLogAnno(title = "system-邀访信息管理-导出邀访信息", businessType = CyLogTypeEnum.EXPORT)

src/main/java/org/rcisoft/sys/visit/dao/VisitInfomationRepository.java

@@ -24,6 +24,13 @@ public interface VisitInfomationRepository extends CyBaseMapper<VisitInfoMation>
     */
     IPage<VisitInfoMation> queryVisitInfomationsPaged(CyPageInfo cyPageInfo,@Param("entity") VisitInfoMation visitInfomation);
 
+    /**
+     * wx分页查询 visitInfomation
+     *
+     */
+    IPage<VisitInfoMation> queryVisitInfomationsByUserIdPaged(CyPageInfo cyPageInfo,@Param("entity") VisitInfoMation visitInfomation,@Param("userId")int userId);
+
+
     List<VisitInfoMation> queryVisitList(@Param("entity") VisitInfoMation visitInfomation);
 
     VisitInfoMation queryVisitById(@Param("id") int id);
@@ -39,12 +46,12 @@ public interface VisitInfomationRepository extends CyBaseMapper<VisitInfoMation>
     /**
      * 获取过去的邀访信息
      * **/
-    List<VisitInfoMation> queryPast();
+    List<VisitInfoMation> queryPast(int userId);
 
     /**
      * 获取未来的邀访信息
      * **/
-    List<VisitInfoMation> queryFuture();
+    List<VisitInfoMation> queryFuture(int userId);
 
     List<VisitUser> getUserList(@Param("business_id") int business_id);
 }

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

@@ -58,6 +58,15 @@ public interface VisitInfomationService {
     */
     IPage<VisitInfoMation> findAllByPagination(CyPageInfo<VisitInfoMation> paginationUtility,
                                                VisitInfoMation visitInfomation);
+      /**
+    * wx小程序分页查询 邀访信息
+    * @param visitInfomation 查询条件
+    * @return
+    */
+    IPage<VisitInfoMation> findAllWithUserIdByPagination(CyPageInfo<VisitInfoMation> paginationUtility,
+                                               VisitInfoMation visitInfomation, HttpServletRequest request);
+
+
 
 
     /**
@@ -80,7 +89,7 @@ public interface VisitInfomationService {
      */
     VisitInfoMation lastDetail(HttpServletRequest request);
 
-    List<VisitInfoMation> getPastOrFutureInfo();
+    List<VisitInfoMation> getPastOrFutureInfo(HttpServletRequest request);
 
     int exportEmptyTemplate(HttpServletResponse response);
 

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

@@ -55,8 +55,7 @@ public class InvitedPersonServiceImpl extends ServiceImpl<InvitedPersonRepositor
         Date date = new Date();
         System.out.println("当前系统时间" + date);
 
-        //todo 获取当前用户手机号
-        //手机号为空
+        //获取当前用户手机号
         String phone = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_PHONE);
         System.out.println("用户手机号" + phone);
 

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

@@ -97,25 +97,25 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
         if (CollectionUtils.isEmpty(visitInfomation.getUserList()))
             throw new CyServiceException(500, "请至少新增一名访客");
         visitInfomation.setNormal();
-        String[] regions=visitInfomation.getVisitRegions();
+        String[] regions = visitInfomation.getVisitRegions();
         String region = "";
-        if (regions != null){
-            for (String r:regions) {
-                region = region +r +',';
+        if (regions != null) {
+            for (String r : regions) {
+                region = region + r + ',';
             }
-            if (region.length()>0){
+            if (region.length() > 0) {
                 region = region.substring(0, region.length() - 1);
                 visitInfomation.setVisitRegion(region);
             }
         }
         String[] regionCodes = visitInfomation.getVisitRegionCodes();
         String regionCode = "";
-        if (regionCodes != null){
-            for (String code:regionCodes){
-                regionCode = regionCode + code +",";
+        if (regionCodes != null) {
+            for (String code : regionCodes) {
+                regionCode = regionCode + code + ",";
             }
-            if (regionCode.length()>0){
-                regionCode = regionCode.substring(0,regionCode.length()-1);
+            if (regionCode.length() > 0) {
+                regionCode = regionCode.substring(0, regionCode.length() - 1);
                 visitInfomation.setVisitRegionCode(regionCode);
             }
         }
@@ -231,7 +231,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
     @Override
     public VisitInfoMation findById(int id) {
         VisitInfoMation v = baseMapper.queryVisitById(id);
-        if (v.getVisitRegionCode() !=null){
+        if (v.getVisitRegionCode() != null) {
             String[] regionCodes = v.getVisitRegionCode().split(",");
             v.setVisitRegionCodes(regionCodes);
         }
@@ -243,7 +243,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
         for (VisitUser vu : v.getUserList()) {
             vuList = vuList + vu.getUserName() + ',';
         }
-        if (vuList.length()>0){
+        if (vuList.length() > 0) {
             vuList = vuList.substring(0, vuList.length() - 1);
         }
         v.setUserArry(vuList);
@@ -259,23 +259,23 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
     @Override
     public IPage<VisitInfoMation> findAllByPagination(CyPageInfo<VisitInfoMation> paginationUtility,
                                                       VisitInfoMation visitInfomation) {
-        if (visitInfomation.getVisitReasonCode()!= null && visitInfomation.getVisitReasonCode().length()>0){
+        if (visitInfomation.getVisitReasonCode() != null && visitInfomation.getVisitReasonCode().length() > 0) {
             String[] reasonCodes = visitInfomation.getVisitReasonCode().split(",");
-            for (String r: reasonCodes) {
-                if (r.equals("other")){
+            for (String r : reasonCodes) {
+                if (r.equals("other")) {
                     visitInfomation.setBoolExistOtherReason("YES");
                 }
             }
             visitInfomation.setVisitReasonCodes(reasonCodes);
         }
-        if (visitInfomation.getVisitRegionCode()!= null && visitInfomation.getVisitRegionCode().length()>0){
+        if (visitInfomation.getVisitRegionCode() != null && visitInfomation.getVisitRegionCode().length() > 0) {
             String[] regionCodes = visitInfomation.getVisitRegionCode().split(",");
             visitInfomation.setVisitRegionCodes(regionCodes);
         }
         IPage<VisitInfoMation> list = baseMapper.queryVisitInfomationsPaged(paginationUtility, visitInfomation);
         List<VisitInfoMation> mationList = list.getRecords();
         for (VisitInfoMation v : mationList) {
-            if (v.getVisitRegionCode() !=null){
+            if (v.getVisitRegionCode() != null) {
                 String[] regionCodes = v.getVisitRegionCode().split(",");
                 v.setVisitRegionCodes(regionCodes);
             }
@@ -289,7 +289,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
                 vuList = vuList + vu.getUserName() + ',';
                 phoneList = phoneList + vu.getVisitPhone()+ ',';
             }
-            if (vuList.length()>0){
+            if (vuList.length() > 0) {
                 vuList = vuList.substring(0, vuList.length() - 1);
                 phoneList = phoneList.substring(0,phoneList.length()-1);
             }
@@ -302,6 +302,66 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
 
     }
 
+    /**
+     * 分页查询 邀访信息
+     *
+     * @param visitInfomation
+     * @return
+     */
+    @Override
+    public IPage<VisitInfoMation> findAllWithUserIdByPagination(CyPageInfo<VisitInfoMation> paginationUtility, VisitInfoMation visitInfomation ,HttpServletRequest request) {
+        //todo 获取用户id
+        String tempUserId = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_ID);
+        //判断是否获取到当前用户id
+        //如果没有当前用户id 返回空列表
+        if (StringUtils.isEmpty(tempUserId)) {
+            return null;
+        }
+        //userId 类型转换
+        int userId = Integer.parseInt(tempUserId);
+        /*
+            根据id进行数据查询 然后处理进行放回 //新增接口,同时前端更换接口
+         */
+        if (visitInfomation.getVisitReasonCode() != null && visitInfomation.getVisitReasonCode().length() > 0) {
+            String[] reasonCodes = visitInfomation.getVisitReasonCode().split(",");
+            for (String r : reasonCodes) {
+                if (r.equals("other")) {
+                    visitInfomation.setBoolExistOtherReason("YES");
+                }
+            }
+            visitInfomation.setVisitReasonCodes(reasonCodes);
+        }
+        if (visitInfomation.getVisitRegionCode() != null && visitInfomation.getVisitRegionCode().length() > 0) {
+            String[] regionCodes = visitInfomation.getVisitRegionCode().split(",");
+            visitInfomation.setVisitRegionCodes(regionCodes);
+        }
+        //调用mapper层方法进行查询
+        IPage<VisitInfoMation> list = baseMapper.queryVisitInfomationsByUserIdPaged(paginationUtility, visitInfomation,userId);
+        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);
+            }
+            String vuList = "";
+            for (VisitUser vu : v.getUserList()) {
+                vuList = vuList + vu.getUserName() + ',';
+            }
+            if (vuList.length() > 0) {
+                vuList = vuList.substring(0, vuList.length() - 1);
+            }
+            v.setUserArry(vuList);
+        }
+        list.setRecords(mationList);
+//        System.out.println(list);
+        return list;
+
+    }
+
     /**
      * 查询list 邀访信息
      *
@@ -335,7 +395,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
             for (VisitUser vu : v.getUserList()) {
                 vuList = vuList + vu.getUserName() + ',';
             }
-            if (vuList.length()>0){
+            if (vuList.length() > 0) {
                 vuList = vuList.substring(0, vuList.length() - 1);
             }
             v.setUserArry(vuList);
@@ -362,14 +422,34 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
             return visitInfList.get(0);
     }
 
+    /**
+     * 获取最近两条邀请记录
+     *
+     * @param request
+     * @return
+     */
     @Override
-    public List<VisitInfoMation> getPastOrFutureInfo() {
+    public List<VisitInfoMation> getPastOrFutureInfo(HttpServletRequest request) {
+
+        //获取用户id
+        String tempUserId = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_ID);
+//        System.out.println("用户id" + tempUserId);
 
+        //判断是否获取到当前用户id
+        //如果没有当前用户id 返回空列表
+        if (StringUtils.isEmpty(tempUserId)) {
+            return new ArrayList<>();
+        }
+        //userId 类型转换
+        int userId = Integer.parseInt(tempUserId);
         List<VisitInfoMation> resList = new ArrayList<>();
 
-        List<VisitInfoMation> pastList = baseMapper.queryPast();
+        //根据当前用户id查找过去的邀请记录
+        List<VisitInfoMation> pastList = baseMapper.queryPast(userId);
         int pastListLength = pastList.size();
-        List<VisitInfoMation> futureList = baseMapper.queryFuture();
+
+        //根据当前用户id查找未来的邀请记录
+        List<VisitInfoMation> futureList = baseMapper.queryFuture(userId);
         int futureListLength = futureList.size();
 
         if (pastListLength > 0 && futureListLength > 0) {

src/main/resources/mapper/VisitInfomationMapper.xml

@@ -282,6 +282,7 @@
                vi.visit_date,vi.visit_time,vi.visit_status
         from visit_infomation vi
         where 1=1
+          and vi.user_id = #{userId}
         and visit_real_time <= current_timestamp
         ORDER BY visit_real_time DESC
     </select>
@@ -291,7 +292,86 @@
                vi.visit_date,vi.visit_time,vi.visit_status
         from visit_infomation vi
         where 1=1
+          and vi.user_id = #{userId}
           and visit_real_time >= current_timestamp
         ORDER BY visit_real_time
     </select>
+
+    <select id="queryVisitInfomationsByUserIdPaged" 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_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
+                  and vi.user_id = #{userId}
+        <if test="entity.createDateBegin !=null">
+            and vi.create_date >= #{entity.createDateBegin}
+        </if>
+        <if test="entity.createDateEnd !=null">
+            and vi.create_date &lt;= #{entity.createDateEnd}
+        </if>
+        <if test="entity.visitDateBegin !=null">
+            and vi.visit_date >= #{entity.visitDateBegin}
+        </if>
+        <if test="entity.visitDateEnd !=null">
+            and vi.visit_date &lt;= #{entity.visitDateEnd}
+        </if>
+        <if test="entity.visitReasonCodes !=null and entity.visitReasonCodes != '' ">
+            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
+            </if>
+        </if>
+        <if test="entity.visitRegionCodes !=null and entity.visitRegionCodes.length > 0">
+            and
+            (
+            <foreach collection="entity.visitRegionCodes" item="Region" index="index">
+                visit_region_code like concat('%',#{Region},'%') or
+            </foreach>
+            false
+            )
+        </if>
+        <if test="entity.visitStatus !=null and entity.visitStatus != ''">
+            and vi.visit_status = #{entity.visitStatus}
+        </if>
+        <if test="entity.selectTime !=null and entity.selectTime != ''">
+            <if test="entity.selectTime == '0'.toString()">
+                and vi.visit_real_time between current_timestamp and current_timestamp + interval '7' day
+            </if>
+            <if test="entity.selectTime == '1'.toString()">
+                and vi.visit_real_time between current_timestamp and current_timestamp + interval '3' day
+            </if>
+            <if test="entity.selectTime == '2'.toString()">
+                and vi.visit_real_time between current_timestamp - interval '3' day and current_timestamp
+            </if>
+            <if test="entity.selectTime == '3'.toString()">
+                and vi.visit_real_time between current_timestamp - interval '7' day and current_timestamp
+            </if>
+            <if test="entity.selectTime == '4'.toString()">
+                and vi.visit_real_time between current_timestamp - interval '30' day and current_timestamp
+            </if>
+        </if>
+        <if test="entity.boolVisit !=null and entity.boolVisit != ''">
+            <if test="entity.boolVisit == '0'.toString()">
+                and vi.visit_real_time >= now()
+            </if>
+            <if test="entity.boolVisit == '1'.toString()">
+                and vi.visit_real_time &lt;= now()
+            </if>
+        </if>
+        <if test="entity.sort !=null and entity.sort != ''">
+            order by
+            <if test="entity.sort == '0'.toString()">
+                vi.create_date desc
+            </if>
+            <if test="entity.sort == '1'.toString()">
+                vi.create_date
+            </if>
+            <if test="entity.sort == '2'.toString()">
+                vi.visit_real_time
+            </if>
+        </if>
+    </select>
+
 </mapper>