移动端第一次登录跳过流程 导出文件类型修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -228,5 +228,10 @@ public class UserController {
         return userService.skipGuidance(request);
     }
 
+    @RequestMapping("/mobSkipGuidance")
+    public HttpRespMsg mobSkipGuidance(HttpServletRequest request){
+        return userService.mobSkipGuidance(request);
+    }
+
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/User.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-01-05
+ * @since 2023-01-16
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -264,6 +264,12 @@ public class User extends Model<User> {
     @TableField("is_first_login")
     private Integer isFirstLogin;
 
+    /**
+     * 0-否 1-是
+     */
+    @TableField("is_mob_first_login")
+    private Integer isMobFirstLogin;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java

@@ -79,4 +79,6 @@ public interface UserService extends IService<User> {
     HttpRespMsg isManager(HttpServletRequest request) throws Exception;
 
     HttpRespMsg skipGuidance(HttpServletRequest request);
+
+    HttpRespMsg mobSkipGuidance(HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1828,7 +1828,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         } catch (Exception e) {
             e.printStackTrace();
         }
-        httpRespMsg.data =  pathPrefix + fileName+".xls";
+        httpRespMsg.data =  pathPrefix + fileName+".xlsx";
         return httpRespMsg;
     }
 
@@ -1939,7 +1939,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         } catch (Exception e) {
             e.printStackTrace();
         }
-        httpRespMsg.data =  pathPrefix + fileName+".xls";
+        httpRespMsg.data =  pathPrefix + fileName+".xlsx";
         return httpRespMsg;
     }
 
@@ -2031,7 +2031,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         } catch (Exception e) {
             e.printStackTrace();
         }
-        httpRespMsg.data =  pathPrefix + fileName+".xls";
+        httpRespMsg.data =  pathPrefix + fileName+".xlsx";
         return httpRespMsg;
     }
 
@@ -2152,7 +2152,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         } catch (Exception e) {
             e.printStackTrace();
         }
-        httpRespMsg.data =  pathPrefix + fileName+".xls";
+        httpRespMsg.data =  pathPrefix + fileName+".xlsx";
         return httpRespMsg;
     }
 
@@ -2225,7 +2225,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         } catch (Exception e) {
             e.printStackTrace();
         }
-        httpRespMsg.data =  pathPrefix + fileName+".xls";
+        httpRespMsg.data =  pathPrefix + fileName+".xlsx";
         return httpRespMsg;
     }
 
@@ -5610,7 +5610,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         } catch (Exception e) {
             e.printStackTrace();
         }
-        httpRespMsg.data =  pathPrefix + fileName+".xls";
+        httpRespMsg.data =  pathPrefix + fileName+".xlsx";
         return httpRespMsg;
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -465,6 +465,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return msg;
     }
 
+    @Override
+    public HttpRespMsg mobSkipGuidance(HttpServletRequest request) {
+        HttpRespMsg msg=new HttpRespMsg();
+        User user= userMapper.selectById(request.getHeader("token"));
+        user.setIsMobFirstLogin(0);
+        if(userMapper.updateById(user)>0){
+            return msg;
+        }
+        msg.setError("验证失败");
+        return msg;
+    }
+
 
     public void setUserRoleMenu(UserVO user) {
         Integer roleId = user.getRoleId();

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserMapper.xml

@@ -42,6 +42,7 @@
         <result column="corpwx_deptid" property="corpwxDeptid" />
         <result column="corpwx_real_userid" property="corpwxRealUserid" />
         <result column="is_first_login" property="isFirstLogin" />
+        <result column="is_mob_first_login" property="isMobFirstLogin" />
     </resultMap>
     <resultMap id="BaseResultMap2" type="com.management.platform.entity.User">
         <id column="id" property="id" />
@@ -51,7 +52,7 @@
     </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, phone, password, portrait_url, create_time, role, company_id, department_id, department_cascade, cost, month_cost, salary_type, manage_dept_id, color, is_active, wx_openid, role_id, role_name, cost_apply_date, dingding_userid, dingding_unionid, corpwx_userid, induction_date, inactive_date, position, report_status, superior_id, plate1, plate2, plate3, plate4, plate5, is_ops, job_number, corpwx_deptid, corpwx_real_userid, is_first_login
+        id, name, phone, password, portrait_url, create_time, role, company_id, department_id, department_cascade, cost, month_cost, salary_type, manage_dept_id, color, is_active, wx_openid, role_id, role_name, cost_apply_date, dingding_userid, dingding_unionid, corpwx_userid, induction_date, inactive_date, position, report_status, superior_id, plate1, plate2, plate3, plate4, plate5, is_ops, job_number, corpwx_deptid, corpwx_real_userid, is_first_login, is_mob_first_login
     </sql>
     <!--单独分页获取人员-->
     <select id="getUserByDepartment" resultType="java.util.Map">