95:红德堂APP调试 会员关联项目代码同步

fs-company/src/main/java/com/fs/company/controller/company/CompanyUserChangeApplyController.java

@@ -0,0 +1,76 @@
+package com.fs.company.controller.company;
+
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.exception.ServiceException;
+import com.fs.common.utils.StringUtils;
+import com.fs.company.controller.param.CompanyUserChangeApplyAuditParam;
+import com.fs.company.service.ICompanyUserChangeApplyService;
+import com.fs.company.vo.CompanyUserChangeApplyVO;
+import com.fs.framework.security.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 更换会员归属申请Controller
+ */
+@RestController
+@RequestMapping("/company/apply")
+public class CompanyUserChangeApplyController extends BaseController
+{
+    @Autowired
+    private ICompanyUserChangeApplyService companyUserChangeApplyService;
+
+    /**
+     * 查询更换会员归属申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('company:apply:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(@RequestParam(required = false) Integer status)
+    {
+        Map<String, Object> map = new HashMap<>();
+        map.put("status", status);
+        map.put("companyId", SecurityUtils.getLoginUser().getCompany().getCompanyId());
+
+        startPage();
+        List<CompanyUserChangeApplyVO> list = companyUserChangeApplyService.selectApplyListByMap(map);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取更换会员归属申请详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('company:apply:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(companyUserChangeApplyService.selectApplyDetailById(id));
+    }
+
+    /**
+     * 获取更换会员归属申请详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('company:apply:audit')")
+    @PostMapping(value = "/audit")
+    public AjaxResult audit(@Valid @RequestBody CompanyUserChangeApplyAuditParam param)
+    {
+        if (param.getStatus() != 1 && param.getStatus() != 2) {
+            throw new ServiceException("审核类型不正确");
+        }
+
+        if (param.getStatus() == 2 && StringUtils.isBlank(param.getReason())) {
+            throw new ServiceException("拒绝理由不能为空");
+        }
+
+        companyUserChangeApplyService.audit(param.getId(), param.getStatus(), param.getReason(), SecurityUtils.getUsername());
+        return AjaxResult.success();
+    }
+
+}

fs-company/src/main/java/com/fs/company/controller/param/CompanyUserChangeApplyAuditParam.java

@@ -0,0 +1,23 @@
+package com.fs.company.controller.param;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class CompanyUserChangeApplyAuditParam {
+    /**
+     * 申请记录ID
+     */
+    @NotNull(message = "申请记录ID不能为空")
+    private Long id;
+    /**
+     * 状态 0通过 1拒绝
+     */
+    @NotNull(message = "审核状态不能为空")
+    private Integer status;
+    /**
+     * 原因
+     */
+    private String reason;
+}

fs-service/src/main/java/com/fs/course/mapper/FsUserTalentMapper.java

@@ -60,7 +60,7 @@ public interface FsUserTalentMapper
      */
     public int deleteFsUserTalentByTalentIds(Long[] talentIds);
 
-    @Update("update fs_user_talent set fans=fans+1 where talent_id=#{talentId}")
+    @Update("update fs_user_talent set fans=ifnull(fans,0)+1 where talent_id=#{talentId}")
     int addFans(Long talentId);
 
 

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

@@ -1,5 +1,6 @@
 package com.fs.his.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
@@ -169,4 +170,17 @@ public class FsUser extends BaseEntity
             return nickName;
         }
     }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date startCreateTime;
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endCreateTime;
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
 }

fs-service/src/main/java/com/fs/his/mapper/FsUserMapper.java

@@ -16,9 +16,7 @@ import com.fs.qw.vo.QwFsUserVO;
 import com.fs.store.param.h5.FsUserPageListParam;
 import com.fs.store.param.h5.UserStatisticsCommonParam;
 import com.fs.store.vo.h5.*;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 
 /**
  * 用户Mapper接口
@@ -98,6 +96,9 @@ public interface FsUserMapper
             "            <if test=\"companyUserId != null \">and f1.company_user_id = #{companyUserId}</if>\n" +
             "order by f1.user_id desc"+
             "</script>"})
+    @Results({
+            @Result(property = "nickName", column = "nick_name")
+    })
     List<FsUserVO> selectFsUserListVO(FsUserParam fsUser);
 
     @Update("update fs_user set is_del=1 where user_id=#{userId}")

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

@@ -342,6 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ucu.project_id
         FROM
         fs_user
+        left join fs_user_company_user ucu on ucu.user_id = fs_user.user_id
         <where>
             fs_user.is_del = 0
             <if test="userId != null">
@@ -1584,21 +1585,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test = "maps.status != null" >
                 AND u.STATUS = #{maps.status}
             </if >
-            <if test = "maps.companyUserNickName != null and maps.companyUserNickName != '' " >
-                AND company_user.nick_name like CONCAT ("%",#{maps.companyUserNickName},"%")
-            </if >
-            <if test = "maps.companyName != null and maps.companyName != '' " >
-                AND company.company_name like CONCAT ("%",#{maps.companyName},"%")
-            </if >
             <if test = "maps.companyId != null and maps.companyId != '' " >
                 AND company.company_id = #{maps.companyId}
             </if >
-            <if test = "maps.level != null  and  maps.level !=''" >
-                AND u.LEVEL = #{maps.level}
-            </if >
-            <if test = "maps.isPromoter != null  and  maps.isPromoter !=''" >
-                AND u.is_promoter = #{maps.isPromoter}
-            </if >
             <if test = "maps.projectId != null" >
                 AND ucu.project_id = #{maps.projectId}
             </if >

fs-user-app/src/main/java/com/fs/app/controller/TalentController.java

@@ -67,7 +67,7 @@ public class TalentController extends  AppBaseController{
         if(r.get("code").equals(200)){
             //取消关注
             userTalentFollowService.deleteFollow(param.getTalentId(),Long.parseLong(getUserId()));
-            userTalentService.updateFans(param.getTalentId(),1);
+            userTalentService.updateFans(param.getTalentId(),2);
             return R.ok("已取消关注");
         }
         else{
@@ -77,7 +77,7 @@ public class TalentController extends  AppBaseController{
             map.setUserId(Long.parseLong(getUserId()));
             map.setCreateTime(new Date());
             userTalentFollowService.insertFsUserTalentFollow(map);
-            userTalentService.updateFans(param.getTalentId(),-1);
+            userTalentService.updateFans(param.getTalentId(),1);
             return R.ok("已关注");
         }
     }