Merge remote-tracking branch 'origin/master'

fs-company/src/main/java/com/fs/company/controller/course/FsUserCourseTrainingCampController.java

@@ -0,0 +1,57 @@
+package com.fs.company.controller.course;
+
+import com.fs.common.annotation.Log;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.SortUtils;
+import com.fs.course.domain.FsUserCourseTrainingCamp;
+import com.fs.course.dto.FsUserCourseTrainingCampDTO;
+import com.fs.course.dto.FsUserCourseTrainingCampUpdateDTO;
+import com.fs.course.service.IFsUserCourseTrainingCampService;
+import com.fs.course.vo.FsUserCourseTrainingCampVO;
+import com.fs.framework.security.LoginUser;
+import com.fs.framework.service.TokenService;
+import com.fs.his.vo.OptionsVO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import lombok.AllArgsConstructor;
+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;
+import java.util.Objects;
+
+@RestController
+@RequestMapping("/course/trainingCamp")
+@AllArgsConstructor
+public class FsUserCourseTrainingCampController {
+
+    private final IFsUserCourseTrainingCampService fsUserCourseTrainingCampService;
+    private final TokenService tokenService;
+    /**
+     * 查询训练营列表
+     */
+    @PreAuthorize("@ss.hasPermi('course:trainingCamp:list')")
+    @GetMapping("/list")
+    public AjaxResult list(@RequestParam(required = false) String trainingCampName,
+                           @RequestParam String scs,
+                           @RequestParam(required = false, defaultValue = "1") Integer pageNum,
+                           @RequestParam(required = false, defaultValue = "10") Integer pageSize)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Map<String, Object> params = new HashMap<>();
+        params.put("trainingCampName", trainingCampName);
+        params.put("scs", SortUtils.parseSort(scs));
+        params.put("companyId", loginUser.getCompany().getCompanyId());
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<FsUserCourseTrainingCampVO> list = fsUserCourseTrainingCampService.selectFsUserCourseTrainingCampVOListByMap(params);
+        return AjaxResult.success(new PageInfo<>(list));
+    }
+
+}

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSON;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.SecurityUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.*;
 import com.fs.company.mapper.*;
 import com.fs.company.param.CompanyParam;
@@ -166,11 +167,16 @@ public class CompanyServiceImpl implements ICompanyService
             salesRole.setStatus("0");
 
             //增加销售角色菜单权限
-            String json = configService.selectConfigByKey("companymenu.config");
-            CompanyMenuConfig config = JSONUtil.toBean(json, CompanyMenuConfig.class);
-            // 注意：此处需要额外处理销售角色的权限，设置为仅"我的"相关权限
-            salesRole.setMenuIds(config.getMenuIds());
-            roleService.insertRole(salesRole);
+            try {
+                String json = configService.selectConfigByKey("companymenu.config");
+                if (StringUtils.isNotEmpty(json)) {
+                    CompanyMenuConfig config = JSONUtil.toBean(json, CompanyMenuConfig.class);
+                    salesRole.setMenuIds(config.getMenuIds());
+                    roleService.insertRole(salesRole);
+                }
+            } catch (Exception e) {
+                logger.error("获取菜单配置失败", e);
+            }
             //添加用户
             CompanyUser user=new CompanyUser();
             user.setCompanyId(company.getCompanyId());

fs-service/src/main/java/com/fs/course/domain/FsUserCoursePeriod.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -70,11 +71,13 @@ public class FsUserCoursePeriod
 
     /** 开营日期-开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "开营日期-开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate periodStartingTime;
 
     /** 开营日期-结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "开营日期-结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate periodEndTime;
 

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

@@ -2,6 +2,7 @@ package com.fs.course.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.course.domain.FsUserCompanyUser;
+import com.fs.qw.dto.FsUserTransferParamDTO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -76,4 +77,6 @@ public interface FsUserCompanyUserMapper extends BaseMapper<FsUserCompanyUser>{
      * @return
      */
     List<FsUserCompanyUser> selectRepeatCompanyUserName(@Param("userIds") List<Long> userIds);
+
+    void transfer(@Param("param") FsUserTransferParamDTO transferParam);
 }

fs-service/src/main/java/com/fs/course/param/FsCourseWatchLogListParam.java

@@ -17,7 +17,6 @@ public class FsCourseWatchLogListParam implements Serializable {
 
     private Long qwUserId;
 
-
     private Long companyId;
 
     private Long companyUserId;

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

@@ -270,7 +270,7 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
                 "and (cu.nick_name like concat('%', #{companyUser}, '%') or cu.phonenumber= #{companyUser})"+
             "</if> " +
             "        </where>"+
-            "order by ec.id desc"+
+            "order by ec.create_time desc,ec.id desc"+
             "</script>"})
     List<QwExternalContactVO> selectQwExternalContactListVO(QwExternalContactParam qwExternalContact);
 

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

@@ -8,6 +8,7 @@ import com.fs.company.cache.ICompanyCacheService;
 import com.fs.company.cache.ICompanyUserCacheService;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyUser;
+import com.fs.course.mapper.FsUserCompanyUserMapper;
 import com.fs.his.domain.FsUser;
 import com.fs.his.service.IFsUserService;
 import com.fs.qw.domain.CustomerTransferApproval;
@@ -17,6 +18,7 @@ import com.fs.qw.service.ICustomerTransferApprovalService;
 import com.fs.qw.vo.TransferCustomDTO;
 import com.fs.store.service.cache.IFsUserCacheService;
 import com.hc.openapi.tool.util.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.http.util.Asserts;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +55,8 @@ public class CustomerTransferApprovalServiceImpl implements ICustomerTransferApp
 
     @Autowired
     private IFsUserService fsUserService;
-
+    @Autowired
+    private FsUserCompanyUserMapper fsUserCompanyUserMapper;
     /**
      * 查询客户转移审批
      *
@@ -233,7 +236,13 @@ public class CustomerTransferApprovalServiceImpl implements ICustomerTransferApp
             transferParam.setUserIds(customerIds);
             transferParam.setSourceCompanyUserId(item.getOriginalUserId());
 
-            fsUserService.transfer(transferParam);
+            if(CollectionUtils.isNotEmpty(transferParam.getUserIds())) {
+                fsUserService.transfer(transferParam);
+            }
+
+            if(CollectionUtils.isNotEmpty(transferParam.getUserIds())) {
+                fsUserCompanyUserMapper.transfer(transferParam);
+            }
         }
         List<Long> customerIds = JSON.parseArray(item.getCustomerIds(), Long.class);
         List<TransferCustomDTO> customerList = getCustomerList(customerIds, item);

fs-service/src/main/resources/application-config-druid-jzzx.yml

@@ -60,8 +60,8 @@ watch:
   password3: v9xsKuqn_$d2y
 
 fs :
-  commonApi: http://127.0.0.1:8010
-  h5CommonApi: http://127.0.0.1:8010
+  commonApi: http://192.168.0.238:8010
+  h5CommonApi: http://192.168.0.238:8010
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
-         order by l.finish_time asc,l.update_time desc
+         order by l.finish_time asc,l.update_time desc,l.create_time desc
     </select>
 
     <select id="selectFsCourseWatchLogListByParam" resultType="com.fs.course.vo.FsCourseWatchLogListVO">

fs-service/src/main/resources/mapper/course/FsUserCompanyUserMapper.xml

@@ -87,4 +87,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
             fs_user_company_user.user_id
     </select>
+
+    <update id="transfer">
+        update fs_user_company_user set company_user_id=#{targetCompanyUserId}
+        <where>
+            <if test="param.userIds != null and param.userIds.size() > 0">
+                user_id in
+                <foreach collection="param.userIds" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </update>
 </mapper>

fs-service/src/main/resources/mapper/course/FsUserCourseTrainingCampMapper.xml

@@ -21,6 +21,9 @@
             <if test="params.trainingCampName != null and params.trainingCampName != ''">
                 and ctc.training_camp_name like concat('%',#{params.trainingCampName},'%')
             </if>
+            <if test="params.companyId != null and params.companyId != ''">
+                and ctp.company_id like concat('%',#{params.companyId},'%')
+            </if>
         </where>
         group by ctc.training_camp_id, ctc.training_camp_name, ctc.order_number
         order by