全局拉黑备注显示

fs-admin/src/main/java/com/fs/his/controller/FsUserController.java

@@ -118,7 +118,7 @@ public class FsUserController extends BaseController
                     }
                 }
             }
-
+            fsUserVO.setManageStatusName(getManageStatusName(fsUserVO.getManageStatus()));
         }
         return getDataTable(list);
     }
@@ -299,6 +299,14 @@ public class FsUserController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FsUser fsUser)
     {
+        if (fsUser.getUserId() == null) {
+            return AjaxResult.error("用户ID不能为空");
+        }
+        if (fsUser.getManageStatus() != null
+                && fsUser.getManageStatus() != 1
+                && fsUser.getManageStatus() != 2) {
+            return AjaxResult.error("管理状态无效，仅支持：1正常 2已被总部拉黑");
+        }
         return toAjax(fsUserService.updateFsUser(fsUser));
     }
 
@@ -423,4 +431,11 @@ public class FsUserController extends BaseController
         }
     }
 
+    private String getManageStatusName(Integer manageStatus) {
+        if (manageStatus != null && manageStatus == 2) {
+            return "已被总部拉黑";
+        }
+        return "正常";
+    }
+
 }

fs-service/src/main/java/com/fs/his/domain/FsUser.java

@@ -66,6 +66,15 @@ public class FsUser extends BaseEntity
     @Excel(name = "1为正常，0为禁止")
     private Integer status;
 
+    /** 管理状态：1正常 2已被总部拉黑 */
+    @ApiModelProperty("管理状态：1正常 2已被总部拉黑")
+    private Integer manageStatus;
+
+    /** 管理备注 */
+    @ApiModelProperty("管理备注")
+    @Excel(name = "管理备注")
+    private String manageRemark;
+
     /** 红包领取开关：1 可领取（默认），0 关闭后不允许领取红包 */
     @ApiModelProperty("红包领取：1开启 0关闭")
     private Integer redStatus;

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -266,10 +266,12 @@ public class FsUserServiceImpl implements IFsUserService {
         } else {
             fsUser.setPhone(null);
         }
-        if (ObjectUtils.isNotEmpty(fsUser.getLevel())&&fsUser.getLevel().equals(1)){
-            fsUser.setIsShow(1);
-        }else {
-            fsUser.setIsShow(0);
+        if (fsUser.getLevel() != null) {
+            if (fsUser.getLevel().equals(1)) {
+                fsUser.setIsShow(1);
+            } else {
+                fsUser.setIsShow(0);
+            }
         }
         return fsUserMapper.updateFsUser(fsUser);
     }

fs-service/src/main/java/com/fs/his/vo/FsUserVO.java

@@ -156,6 +156,10 @@ public class FsUserVO extends FsUser implements Serializable
     @Excel(name = "状态", sort = 7)
     private String statusName;
 
+    @ApiModelProperty(value = "管理状态名称")
+    @Excel(name = "管理状态", sort = 13)
+    private String manageStatusName;
+
     @ApiModelProperty(value = "项目ID")
     private Long projectId;
 

fs-service/src/main/java/com/fs/qw/mapper/QwExternalContactMapper.java

@@ -237,7 +237,8 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
 
     @Select({"<script> " +
             "select ec.*,qu.qw_user_name,qd.dept_name as departmentName,cw.name way_name,wg.group_name way_group_name," +
-            "fu.first_login_app_time as firstLoginAppTime,fu.first_login_reward_address as firstLoginRewardAddress,fu.red_status as redStatus from qw_external_contact ec " +
+            "fu.first_login_app_time as firstLoginAppTime,fu.first_login_reward_address as firstLoginRewardAddress,fu.red_status as redStatus," +
+            "fu.manage_status as manageStatus,fu.manage_remark as manageRemark from qw_external_contact ec " +
             "left join qw_user qu on ec.user_id=qu.qw_user_id and qu.corp_id=ec.corp_id " +
             "left join qw_dept qd on qd.dept_id=qu.department and qd.corp_id=qu.corp_id " +
             "left join company_user cu on ec.company_user_id=cu.user_id " +

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -881,7 +881,20 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
     @Override
     public List<QwExternalContactVO> selectQwExternalContactListVO(QwExternalContactParam qwExternalContact) {
         prepareProjectRepeatFilter(qwExternalContact);
-        return qwExternalContactMapper.selectQwExternalContactListVO(qwExternalContact);
+        List<QwExternalContactVO> list = qwExternalContactMapper.selectQwExternalContactListVO(qwExternalContact);
+        list.forEach(this::fillManageInfo);
+        return list;
+    }
+
+    private void fillManageInfo(QwExternalContactVO item) {
+        if (item.getFsUserId() == null) {
+            return;
+        }
+        if (item.getManageStatus() != null && item.getManageStatus() == 2) {
+            item.setManageStatusName("已被总部拉黑");
+        } else {
+            item.setManageStatusName("正常");
+        }
     }
 
     @Override

fs-service/src/main/java/com/fs/qw/vo/QwExternalContactVO.java

@@ -126,6 +126,17 @@ public class QwExternalContactVO {
     /** 关联 fs_user 红包领取开关：1开启 0关闭；未绑定会员时为 null */
     private Integer redStatus;
 
+    /** 关联会员管理状态：1正常 2已被总部拉黑；未绑定会员时为 null */
+    private Integer manageStatus;
+
+    /** 管理状态名称 */
+    @Excel(name = "管理状态")
+    private String manageStatusName;
+
+    /** 管理备注 */
+    @Excel(name = "管理备注")
+    private String manageRemark;
+
     /** 关联小程序用户首次登录 app 时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date firstLoginAppTime;

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="firstLoginAppTime"    column="first_login_app_time"    />
         <result property="firstLoginRewardAddress"    column="first_login_reward_address"    />
         <result property="status"    column="status"    />
+        <result property="manageStatus"    column="manage_status"    />
+        <result property="manageRemark"    column="manage_remark"    />
         <result property="redStatus"    column="red_status"    />
         <result property="tuiUserId"    column="tui_user_id"    />
         <result property="tuiTime"    column="tui_time"    />
@@ -578,6 +580,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="integral != null">integral,</if>
             <if test="signNum != null">sign_num,</if>
             <if test="status != null">status,</if>
+            <if test="manageStatus != null">manage_status,</if>
+            <if test="manageRemark != null">manage_remark,</if>
             <if test="redStatus != null">red_status,</if>
             <if test="tuiUserId != null">tui_user_id,</if>
             <if test="tuiTime != null">tui_time,</if>
@@ -631,6 +635,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="integral != null">#{integral},</if>
             <if test="signNum != null">#{signNum},</if>
             <if test="status != null">#{status},</if>
+            <if test="manageStatus != null">#{manageStatus},</if>
+            <if test="manageRemark != null">#{manageRemark},</if>
             <if test="redStatus != null">#{redStatus},</if>
             <if test="tuiUserId != null">#{tuiUserId},</if>
             <if test="tuiTime != null">#{tuiTime},</if>
@@ -690,6 +696,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="firstLoginRewardAddress != null">first_login_reward_address = #{firstLoginRewardAddress},</if>
             <if test="signNum != null">sign_num = #{signNum},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="manageStatus != null">manage_status = #{manageStatus},</if>
+            <if test="manageRemark != null">manage_remark = #{manageRemark},</if>
             <if test="redStatus != null">red_status = #{redStatus},</if>
             <if test="tuiUserId != null">tui_user_id = #{tuiUserId},</if>
             <if test="tuiTime != null">tui_time = #{tuiTime},</if>