拜访计划、商机、客户、联系人相关接口

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

@@ -22,11 +22,12 @@ public class UserCommonModuleController {
         return userCommonModuleService.getCommonModules(request);
     }
 
-    @PostMapping("/addCommonModules")
-    private HttpRespMsg addCommonModules(@RequestParam("moduleIds")String moduleIds,HttpServletRequest request) {
-        return userCommonModuleService.addCommonModules(moduleIds,request);
+    @PostMapping("/addOrUpdateCommonModules")
+    private HttpRespMsg addOrUpdateCommonModules(@RequestParam("moduleIds")String moduleIds,HttpServletRequest request) {
+        return userCommonModuleService.addOrUpdateCommonModules(moduleIds,request);
     }
 
+    //已废弃
     @PostMapping("/delCommonModules")
     private HttpRespMsg delCommonModules(@RequestParam("moduleIds")String moduleIds,HttpServletRequest request) {
         return userCommonModuleService.delCommonModules(moduleIds,request);

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

@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 public interface UserCommonModuleService extends IService<UserCommonModule> {
     HttpRespMsg getCommonModules(HttpServletRequest request);
 
-    HttpRespMsg addCommonModules(String moduleIds,HttpServletRequest request);
+    HttpRespMsg addOrUpdateCommonModules(String moduleIds,HttpServletRequest request);
 
     HttpRespMsg delCommonModules(String moduleIds, HttpServletRequest request);
 }

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

@@ -93,7 +93,7 @@ public class UserCommonModuleServiceImpl extends ServiceImpl<UserCommonModuleMap
 
     @Override
     @Transactional
-    public HttpRespMsg addCommonModules(String moduleIds,HttpServletRequest request) {
+    public HttpRespMsg addOrUpdateCommonModules(String moduleIds,HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         User user= userMapper.selectById(request.getHeader("token"));
         if(null == user){
@@ -106,30 +106,32 @@ public class UserCommonModuleServiceImpl extends ServiceImpl<UserCommonModuleMap
         }
         List<Integer> moduleIdList = Arrays.stream(moduleIds.split(",")).map(Integer::parseInt).collect(Collectors.toList());
         //是否已存在
-        Integer count = userCommonModuleMapper.selectCount(new LambdaQueryWrapper<UserCommonModule>()
-                .in(UserCommonModule::getModuleId, moduleIdList)
-                .eq(UserCommonModule::getUserId, user.getId())
-        );
-        if(count > 0){
-            httpRespMsg.setError("已存在选中的常用模块");
-            return httpRespMsg;
-        }
+//        Integer count = userCommonModuleMapper.selectCount(new LambdaQueryWrapper<UserCommonModule>()
+//                .in(UserCommonModule::getModuleId, moduleIdList)
+//                .eq(UserCommonModule::getUserId, user.getId())
+//        );
+//        if(count > 0){
+//            httpRespMsg.setError("已存在选中的常用模块");
+//            return httpRespMsg;
+//        }
         //是否有权限
         Integer roleModuleCount = sysRoleModuleMapper.selectCount(new LambdaQueryWrapper<SysRoleModule>()
                 .in(SysRoleModule::getModuleId, moduleIdList)
                 .eq(SysRoleModule::getRoleId, user.getRoleId())
         );
-        if(roleModuleCount <= moduleIdList.size()){
+        if(roleModuleCount < moduleIdList.size()){
             httpRespMsg.setError("无模块权限");
             return httpRespMsg;
         }
+        //12-20 修改为删除覆盖逻辑
         //计算seq
-        UserCommonModule lastModule = userCommonModuleMapper.selectOne(new LambdaQueryWrapper<UserCommonModule>()
-                .eq(UserCommonModule::getUserId, user.getId())
-                .orderByDesc(UserCommonModule::getSeq)
-                .last("limit 1")
-        );
-        int index = null==lastModule?1:lastModule.getSeq()+1;
+//        UserCommonModule lastModule = userCommonModuleMapper.selectOne(new LambdaQueryWrapper<UserCommonModule>()
+//                .eq(UserCommonModule::getUserId, user.getId())
+//                .orderByDesc(UserCommonModule::getSeq)
+//                .last("limit 1")
+//        );
+//        int index = null==lastModule?1:lastModule.getSeq()+1;
+        int index = 1;
         List<UserCommonModule> toAddList = new ArrayList<>();
         for (Integer moduleId : moduleIdList) {
             UserCommonModule entity = new UserCommonModule();
@@ -140,6 +142,9 @@ public class UserCommonModuleServiceImpl extends ServiceImpl<UserCommonModuleMap
             toAddList.add(entity);
             index++;
         }
+        userCommonModuleMapper.delete(new LambdaQueryWrapper<UserCommonModule>()
+                .eq(UserCommonModule::getUserId, user.getId())
+        );
         userCommonModuleMapper.insertBatch(toAddList);
         return httpRespMsg;
     }

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/VisitPlanMapper.xml

@@ -36,7 +36,7 @@
                  left join (select * from sys_dict where code = 'RemindType') sd2 on vs.remind_type = sd2.id
                  left join custom c on vs.custom_id = c.id
         where vs.create_by = #{query.userId} and date_format(vs.visit_time,'%Y-%m-%d') = #{query.calenderDate}
-        order by vs.visit_time asc
+        order by vs.finish_state asc,vs.visit_time asc
     </select>
     <select id="getDetail" resultType="com.management.platform.entity.vo.VisitPlanDetailVO">
         select vs.id, vs.plan_name, vs.custom_id, vs.custom_name