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

alien-entity/src/main/java/shop/alien/entity/store/LifeLikeRecord.java

@@ -23,7 +23,7 @@ public class LifeLikeRecord {
 
     private String huifuId;
 
-    @ApiModelProperty(value = "1-评论 2-社区动态 3-活动 4-推荐菜 5-店铺打卡 6-二手商品 7-律师评分 8-点赞员工 9-员工评价点赞")
+    @ApiModelProperty(value = "1-评论 2-社区动态 3-活动 4-推荐菜 5-店铺打卡 6-二手商品 7-律师评分 8-点赞员工 9-员工评价点赞 10-员工评论点赞")
     private String type;
 
     private Integer dianzanCount;

alien-entity/src/main/java/shop/alien/mapper/LawyerUserMapper.java

@@ -133,6 +133,7 @@ Integer updateLawyerUser(LawyerUser user);
 
    List<LawyerUserVo> selectLawyerUserList(@Param("name") String name,
                                           @Param("phone") String phone,
+                                           @Param("practiceStartDate") String practiceStartDate,
                                           @Param("firmId") Integer firmId,
                                           @Param("startTime") String startTime,
                                            @Param("endTime") String endTime);

alien-entity/src/main/resources/mapper/LawyerUserMapper.xml

@@ -128,6 +128,7 @@
         WHERE user.delete_flag = 0
         <if test="name != null and name != ''">AND user.name LIKE CONCAT('%', #{name}, '%')</if>
         <if test="phone != null and phone != ''">AND user.phone LIKE CONCAT('%', #{phone}, '%')</if>
+        <if test="practiceStartDate != null">AND user.practice_start_date = #{practiceStartDate}</if>
         <if test="firmId != null">AND user.firm_id = #{firmId}</if>
         <if test="startTime != null and startTime != ''">AND user.practice_start_date &gt;= #{startTime}</if>
         <if test="endTime != null and endTime != ''">AND user.practice_start_date &lt;= #{endTime}</if>

alien-entity/src/main/resources/mapper/StoreStaffCommentMapper.xml

@@ -30,27 +30,27 @@
             ssc.review_id,
             ssc.send_user_id,
             ssc.receive_user_id,
-            -- 发送用户名称：根据 sendUserType 分别查询普通用户表和员工表
+            -- 发送用户名称：根据 sendUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.send_user_type = 2 THEN sp_send.personnel_name
+                WHEN ssc.send_user_type = 2 THEN ssc_send.name
                 WHEN ssc.send_user_type = 1 OR ssc.send_user_type IS NULL THEN lu_send.user_name
                 ELSE lu_send.user_name
             END AS send_user_name,
-            -- 发送用户头像：根据 sendUserType 分别查询普通用户表和员工表
+            -- 发送用户头像：根据 sendUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.send_user_type = 2 THEN si_send.img_url
+                WHEN ssc.send_user_type = 2 THEN ssc_send.staff_image
                 WHEN ssc.send_user_type = 1 OR ssc.send_user_type IS NULL THEN lu_send.user_image
                 ELSE lu_send.user_image
             END AS send_user_avatar,
-            -- 接收用户名称：根据 receiveUserType 分别查询普通用户表和员工表
+            -- 接收用户名称：根据 receiveUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.receive_user_type = 2 THEN sp_receive.personnel_name
+                WHEN ssc.receive_user_type = 2 THEN ssc_receive.name
                 WHEN ssc.receive_user_type = 1 OR ssc.receive_user_type IS NULL THEN lu_receive.user_name
                 ELSE NULL
             END AS receive_user_name,
-            -- 接收用户头像：根据 receiveUserType 分别查询普通用户表和员工表
+            -- 接收用户头像：根据 receiveUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.receive_user_type = 2 THEN si_receive.img_url
+                WHEN ssc.receive_user_type = 2 THEN ssc_receive.staff_image
                 WHEN ssc.receive_user_type = 1 OR ssc.receive_user_type IS NULL THEN lu_receive.user_image
                 ELSE NULL
             END AS receive_user_avatar,
@@ -70,19 +70,15 @@
         -- 发送用户：普通用户表
         LEFT JOIN life_user lu_send ON lu_send.id = ssc.send_user_id 
             AND lu_send.delete_flag = 0
-        -- 发送用户：员工表
-        LEFT JOIN store_personnel sp_send ON sp_send.id = ssc.send_user_id 
-            AND sp_send.delete_flag = 0
-        LEFT JOIN store_img si_send ON si_send.id = sp_send.img_id 
-            AND si_send.delete_flag = 0
+        -- 发送用户：员工配置表
+        LEFT JOIN store_staff_config ssc_send ON ssc_send.id = ssc.send_user_id 
+            AND ssc_send.delete_flag = 0
         -- 接收用户：普通用户表
         LEFT JOIN life_user lu_receive ON lu_receive.id = ssc.receive_user_id 
             AND lu_receive.delete_flag = 0
-        -- 接收用户：员工表
-        LEFT JOIN store_personnel sp_receive ON sp_receive.id = ssc.receive_user_id 
-            AND sp_receive.delete_flag = 0
-        LEFT JOIN store_img si_receive ON si_receive.id = sp_receive.img_id 
-            AND si_receive.delete_flag = 0
+        -- 接收用户：员工配置表
+        LEFT JOIN store_staff_config ssc_receive ON ssc_receive.id = ssc.receive_user_id 
+            AND ssc_receive.delete_flag = 0
         LEFT JOIN life_like_record llr ON CONVERT(llr.huifu_id, CHAR) = CONVERT(ssc.id, CHAR)
             AND llr.type = '10' 
             AND CONVERT(llr.dianzan_id, CHAR) = CONVERT(#{currentUserId}, CHAR)
@@ -100,27 +96,27 @@
             ssc.review_id,
             ssc.send_user_id,
             ssc.receive_user_id,
-            -- 发送用户名称：根据 sendUserType 分别查询普通用户表和员工表
+            -- 发送用户名称：根据 sendUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.send_user_type = 2 THEN sp_send.personnel_name
+                WHEN ssc.send_user_type = 2 THEN ssc_send.name
                 WHEN ssc.send_user_type = 1 OR ssc.send_user_type IS NULL THEN lu_send.user_name
                 ELSE lu_send.user_name
             END AS send_user_name,
-            -- 发送用户头像：根据 sendUserType 分别查询普通用户表和员工表
+            -- 发送用户头像：根据 sendUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.send_user_type = 2 THEN si_send.img_url
+                WHEN ssc.send_user_type = 2 THEN ssc_send.staff_image
                 WHEN ssc.send_user_type = 1 OR ssc.send_user_type IS NULL THEN lu_send.user_image
                 ELSE lu_send.user_image
             END AS send_user_avatar,
-            -- 接收用户名称：根据 receiveUserType 分别查询普通用户表和员工表
+            -- 接收用户名称：根据 receiveUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.receive_user_type = 2 THEN sp_receive.personnel_name
+                WHEN ssc.receive_user_type = 2 THEN ssc_receive.name
                 WHEN ssc.receive_user_type = 1 OR ssc.receive_user_type IS NULL THEN lu_receive.user_name
                 ELSE NULL
             END AS receive_user_name,
-            -- 接收用户头像：根据 receiveUserType 分别查询普通用户表和员工表
+            -- 接收用户头像：根据 receiveUserType 分别查询普通用户表和员工配置表
             CASE
-                WHEN ssc.receive_user_type = 2 THEN si_receive.img_url
+                WHEN ssc.receive_user_type = 2 THEN ssc_receive.staff_image
                 WHEN ssc.receive_user_type = 1 OR ssc.receive_user_type IS NULL THEN lu_receive.user_image
                 ELSE NULL
             END AS receive_user_avatar,
@@ -140,19 +136,15 @@
         -- 发送用户：普通用户表
         LEFT JOIN life_user lu_send ON lu_send.id = ssc.send_user_id 
             AND lu_send.delete_flag = 0
-        -- 发送用户：员工表
-        LEFT JOIN store_personnel sp_send ON sp_send.id = ssc.send_user_id 
-            AND sp_send.delete_flag = 0
-        LEFT JOIN store_img si_send ON si_send.id = sp_send.img_id 
-            AND si_send.delete_flag = 0
+        -- 发送用户：员工配置表
+        LEFT JOIN store_staff_config ssc_send ON ssc_send.id = ssc.send_user_id 
+            AND ssc_send.delete_flag = 0
         -- 接收用户：普通用户表
         LEFT JOIN life_user lu_receive ON lu_receive.id = ssc.receive_user_id 
             AND lu_receive.delete_flag = 0
-        -- 接收用户：员工表
-        LEFT JOIN store_personnel sp_receive ON sp_receive.id = ssc.receive_user_id 
-            AND sp_receive.delete_flag = 0
-        LEFT JOIN store_img si_receive ON si_receive.id = sp_receive.img_id 
-            AND si_receive.delete_flag = 0
+        -- 接收用户：员工配置表
+        LEFT JOIN store_staff_config ssc_receive ON ssc_receive.id = ssc.receive_user_id 
+            AND ssc_receive.delete_flag = 0
         LEFT JOIN life_like_record llr ON CONVERT(llr.huifu_id, CHAR) = CONVERT(ssc.id, CHAR)
             AND llr.type = '10' 
             AND CONVERT(llr.dianzan_id, CHAR) = CONVERT(#{currentUserId}, CHAR)

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerUserController.java

@@ -241,6 +241,7 @@ public class LawyerUserController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "姓名（支持模糊查询）", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "phone", value = "手机号（支持模糊查询）", dataType = "String", paramType = "query", required = false),
+            @ApiImplicitParam(name = "practiceStartDate", value = "从业时间", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "firmId", value = "律所ID", dataType = "Integer", paramType = "query", required = false),
             @ApiImplicitParam(name = "startTime", value = "开始日期（用于查询执业开始日期practice_start_date，格式：yyyy-MM-dd）", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "endTime", value = "结束日期（用于查询执业开始日期practice_start_date，格式：yyyy-MM-dd）", dataType = "String", paramType = "query", required = false),
@@ -250,14 +251,15 @@ public class LawyerUserController {
     @GetMapping("/getLawyerList")
     public R<IPage<LawyerUserVo>> getLawyerList(@RequestParam(required = false) String name,
                                                 @RequestParam(required = false) String phone,
+                                                @RequestParam(required = false) String practiceStartDate,
                                                 @RequestParam(required = false) Integer firmId,
                                                 @RequestParam(required = false) String startTime,
                                                 @RequestParam(required = false) String endTime,
                                                 @RequestParam int page,
                                                 @RequestParam int size) {
-        log.info("LawyerUserController.getLawyerList?name={},phone={},firmId={},startTime={},endTime={},page={},size={}",
-                name, phone, firmId, startTime, endTime, page, size);
-        return lawyerUserService.getLawyerList(name, phone, firmId, startTime, endTime, page, size);
+        log.info("LawyerUserController.getLawyerList?name={},phone={},practiceStartDate={},firmId={},startTime={},endTime={},page={},size={}",
+                name, phone, practiceStartDate, firmId, startTime, endTime, page, size);
+        return lawyerUserService.getLawyerList(name, phone, practiceStartDate, firmId, startTime, endTime, page, size);
     }
 
     @ApiOperation("导出中台律师列表")
@@ -276,15 +278,16 @@ public class LawyerUserController {
             HttpServletResponse response,
             @RequestParam(required = false) String name,
             @RequestParam(required = false) String phone,
+            @RequestParam(required = false) String practiceStartDate,
             @RequestParam(required = false) Integer firmId,
             @RequestParam(required = false) String startTime,
             @RequestParam(required = false) String endTime,
             @RequestParam(required = false) Integer pageNum,
             @RequestParam(required = false) Integer pageSize) throws Exception {
-        log.info("LawyerUserController.exportLawyerList?name={},phone={},firmId={},startTime={},endTime={},pageNum={},pageSize={}",
-                name, phone, firmId, startTime, endTime, pageNum, pageSize);
+        log.info("LawyerUserController.exportLawyerList?name={},phone={},practiceStartDate={},firmId={},startTime={},endTime={},pageNum={},pageSize={}",
+                name, phone, practiceStartDate, firmId, startTime, endTime, pageNum, pageSize);
         try {
-            lawyerUserService.exportLawyerList(response, name, phone, firmId, startTime, endTime, pageNum, pageSize);
+            lawyerUserService.exportLawyerList(response, name, phone, practiceStartDate, firmId, startTime, endTime, pageNum, pageSize);
         } catch (Exception e) {
             log.error("导出律师列表异常", e);
             if (!response.isCommitted()) {

alien-lawyer/src/main/java/shop/alien/lawyer/service/LawyerUserService.java

@@ -157,6 +157,7 @@ public interface LawyerUserService extends IService<LawyerUser> {
      */
     R<IPage<LawyerUserVo>> getLawyerList(String name,
                                          String phone,
+                                         String practiceStartDate,
                                          Integer firmId,
                                          String startTime,
                                          String endTime,
@@ -188,6 +189,7 @@ public interface LawyerUserService extends IService<LawyerUser> {
     void exportLawyerList(HttpServletResponse response,
                           String name,
                           String phone,
+                          String practiceStartDate,
                           Integer firmId,
                           String startTime,
                           String endTime,

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerUserServiceImpl.java

@@ -766,16 +766,17 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
     @Override
     public R<IPage<LawyerUserVo>> getLawyerList(String name,
                                                 String phone,
+                                                String practiceStartDate,
                                                 Integer firmId,
                                                 String startTime,
                                                 String endTime,
                                                 int page,
                                                 int size) {
-        log.info("LawyerUserServiceImpl.getLawyerList?name={},phone={},firmId={},startTime={},endTime={},page={},pageSize={}",
-                name, phone, firmId, startTime, endTime, page, size);
+        log.info("LawyerUserServiceImpl.getLawyerList?name={},phone={},practiceStartDate={},firmId={},startTime={},endTime={},page={},pageSize={}",
+                name, phone, practiceStartDate, firmId, startTime, endTime, page, size);
 
         // 查询分页数据（在SQL层面使用LIMIT进行分页）
-        List<LawyerUserVo> list = lawyerUserMapper.selectLawyerUserList(name, phone, firmId, startTime, endTime);
+        List<LawyerUserVo> list = lawyerUserMapper.selectLawyerUserList(name, phone, practiceStartDate, firmId, startTime, endTime);
         if (list == null) {
             list = new ArrayList<>();
         }
@@ -821,20 +822,21 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
     public void exportLawyerList(HttpServletResponse response,
                                  String name,
                                  String phone,
+                                 String practiceStartDate,
                                  Integer firmId,
                                  String startTime,
                                  String endTime,
                                  Integer pageNum,
                                  Integer pageSize) throws Exception {
-        log.info("LawyerUserServiceImpl.exportLawyerList?name={},phone={},firmId={},startTime={},endTime={},pageNum={},pageSize={}",
-                name, phone, firmId, startTime, endTime, pageNum, pageSize);
+        log.info("LawyerUserServiceImpl.exportLawyerList?name={},phone={},practiceStartDate={},firmId={},startTime={},endTime={},pageNum={},pageSize={}",
+                name, phone, practiceStartDate, firmId, startTime, endTime, pageNum, pageSize);
 
         // 如果pageNum为null或0，则导出全部数据（设置一个很大的pageSize）
         int page = (pageNum == null || pageNum == 0) ? 1 : pageNum;
         int size = (pageNum == null || pageNum == 0) ? Integer.MAX_VALUE : (pageSize == null ? 10 : pageSize);
 
         // 调用查询接口获取数据
-        R<IPage<LawyerUserVo>> result = getLawyerList(name, phone, firmId, startTime, endTime, page, size);
+        R<IPage<LawyerUserVo>> result = getLawyerList(name, phone, practiceStartDate, firmId, startTime, endTime, page, size);
 
         if (result == null || !result.isSuccess()) {
             log.warn("获取律师列表失败：{}", result != null ? result.getMsg() : "返回结果为空");

alien-store/src/main/java/shop/alien/store/controller/LawyerUserController.java

@@ -212,6 +212,7 @@ public class LawyerUserController {
             @ApiImplicitParam(name = "name", value = "姓名（支持模糊查询）", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "phone", value = "手机号（支持模糊查询）", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "firmId", value = "律所ID", dataType = "Integer", paramType = "query", required = false),
+            @ApiImplicitParam(name = "practiceStartDate", value = "从业时间", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "startTime", value = "开始日期（用于查询执业开始日期practice_start_date，格式：yyyy-MM-dd）", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "endTime", value = "结束日期（用于查询执业开始日期practice_start_date，格式：yyyy-MM-dd）", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "page", value = "页码（默认1）", dataType = "int", paramType = "query"),
@@ -220,14 +221,15 @@ public class LawyerUserController {
     @GetMapping("/getLawyerList")
     public R<IPage<LawyerUserVo>> getLawyerList(@RequestParam(required = false) String name,
                                                 @RequestParam(required = false) String phone,
+                                                @RequestParam(required = false) String practiceStartDate,
                                                 @RequestParam(required = false) Integer firmId,
                                                 @RequestParam(required = false) String startTime,
                                                 @RequestParam(required = false) String endTime,
                                                 @RequestParam int page,
                                                 @RequestParam int size) {
-        log.info("LawyerUserController.getLawyerList?name={},phone={},firmId={},startTime={},endTime={},page={},size={}",
-                name, phone, firmId, startTime, endTime, page, size);
-        return lawyerUserService.getLawyerList(name, phone, firmId, startTime, endTime, page, size);
+        log.info("LawyerUserController.getLawyerList?name={},phone={},practiceStartDate={},firmId={},startTime={},endTime={},page={},size={}",
+                name, phone, practiceStartDate, firmId, startTime, endTime, page, size);
+        return lawyerUserService.getLawyerList(name, phone, practiceStartDate, firmId, startTime, endTime, page, size);
     }
 
     @ApiOperation("导出中台律师列表")
@@ -246,15 +248,16 @@ public class LawyerUserController {
             HttpServletResponse response,
             @RequestParam(required = false) String name,
             @RequestParam(required = false) String phone,
+            @RequestParam(required = false) String practiceStartDate,
             @RequestParam(required = false) Integer firmId,
             @RequestParam(required = false) String startTime,
             @RequestParam(required = false) String endTime,
             @RequestParam(required = false) Integer pageNum,
             @RequestParam(required = false) Integer pageSize) throws Exception {
-        log.info("LawyerUserController.exportLawyerList?name={},phone={},firmId={},startTime={},endTime={},pageNum={},pageSize={}",
+        log.info("LawyerUserController.exportLawyerList?name={},phone={},practiceStartDate={},firmId={},startTime={},endTime={},pageNum={},pageSize={}",
                 name, phone, firmId, startTime, endTime, pageNum, pageSize);
         try {
-            lawyerUserService.exportLawyerList(response, name, phone, firmId, startTime, endTime, pageNum, pageSize);
+            lawyerUserService.exportLawyerList(response, name, phone, practiceStartDate, firmId, startTime, endTime, pageNum, pageSize);
         } catch (Exception e) {
             log.error("导出律师列表异常", e);
             if (!response.isCommitted()) {

alien-store/src/main/java/shop/alien/store/service/LawyerUserService.java

@@ -117,6 +117,7 @@ public interface LawyerUserService extends IService<LawyerUser> {
      */
     R<IPage<LawyerUserVo>> getLawyerList(String name,
                                          String phone,
+                                         String practiceStartDate,
                                          Integer firmId,
                                          String startTime,
                                          String endTime,
@@ -139,6 +140,7 @@ public interface LawyerUserService extends IService<LawyerUser> {
     void exportLawyerList(HttpServletResponse response,
                           String name,
                           String phone,
+                          String practiceStartDate,
                           Integer firmId,
                           String startTime,
                           String endTime,

alien-store/src/main/java/shop/alien/store/service/impl/LawyerUserServiceImpl.java

@@ -425,16 +425,17 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
     @Override
     public R<IPage<LawyerUserVo>> getLawyerList(String name,
                                                 String phone,
+                                                String practiceStartDate,
                                                 Integer firmId,
                                                 String startTime,
                                                 String endTime,
                                                 int page,
                                                 int size) {
-        log.info("LawyerUserServiceImpl.getLawyerList?name={},phone={},firmId={},startTime={},endTime={},page={},pageSize={}",
-                name, phone, firmId, startTime, endTime, page, size);
+        log.info("LawyerUserServiceImpl.getLawyerList?name={},phone={},practiceStartDate={},firmId={},startTime={},endTime={},page={},pageSize={}",
+                name, phone, practiceStartDate, firmId, startTime, endTime, page, size);
 
         // 查询分页数据（在SQL层面使用LIMIT进行分页）
-        List<LawyerUserVo> list = lawyerUserMapper.selectLawyerUserList(name, phone, firmId, startTime, endTime);
+        List<LawyerUserVo> list = lawyerUserMapper.selectLawyerUserList(name, phone, practiceStartDate, firmId, startTime, endTime);
         if (list == null) {
             list = new ArrayList<>();
         }
@@ -446,20 +447,21 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
     public void exportLawyerList(HttpServletResponse response,
                                  String name,
                                  String phone,
+                                 String practiceStartDate,
                                  Integer firmId,
                                  String startTime,
                                  String endTime,
                                  Integer pageNum,
                                  Integer pageSize) throws Exception {
-        log.info("LawyerUserServiceImpl.exportLawyerList?name={},phone={},firmId={},startTime={},endTime={},pageNum={},pageSize={}",
-                name, phone, firmId, startTime, endTime, pageNum, pageSize);
+        log.info("LawyerUserServiceImpl.exportLawyerList?name={},phone={},practiceStartDate={},firmId={},startTime={},endTime={},pageNum={},pageSize={}",
+                name, phone, practiceStartDate, firmId, startTime, endTime, pageNum, pageSize);
 
         // 如果pageNum为null或0，则导出全部数据（设置一个很大的pageSize）
         int page = (pageNum == null || pageNum == 0) ? 1 : pageNum;
         int size = (pageNum == null || pageNum == 0) ? Integer.MAX_VALUE : (pageSize == null ? 10 : pageSize);
 
         // 调用查询接口获取数据
-        R<IPage<LawyerUserVo>> result = getLawyerList(name, phone, firmId, startTime, endTime, page, size);
+        R<IPage<LawyerUserVo>> result = getLawyerList(name, phone, practiceStartDate,firmId, startTime, endTime, page, size);
 
         if (result == null || !result.isSuccess()) {
             log.warn("获取律师列表失败：{}", result != null ? result.getMsg() : "返回结果为空");