修改1

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

@@ -100,5 +100,26 @@ public class ContactsController {
         return contactsService.getDeletedContacts(pageIndex,pageSize,request);
     }
 
+    /**
+     * 批量删除回收站中的联系人
+     */
+    @RequestMapping("confirmDeleteContacts")
+    public HttpRespMsg confirmDeleteContacts(@RequestBody List<Integer> ids){
+        return contactsService.confirmDeleteContacts(ids);
+    }
+
+    /**
+     * 恢复联系人
+     * @param ids
+     * @return
+     */
+    @RequestMapping("returnContacts")
+    public HttpRespMsg returnContacts(@RequestBody List<Integer> ids){
+        return contactsService.returnContacts(ids);
+    }
+
+
+
+
 }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Contacts.java

@@ -105,8 +105,8 @@ public class Contacts extends Model<Contacts> {
     /**
      * 职务
      */
-    @TableField("range")
-    private String range;
+    @TableField("position")
+    private String position;
 
     /**
      * 自定义字段存值

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

@@ -29,4 +29,8 @@ public interface ContactsService extends IService<Contacts> {
     HttpRespMsg deleteContacts(List<Integer> ids, HttpServletRequest request);
 
     HttpRespMsg getDeletedContacts(Integer pageIndex, Integer pageSize, HttpServletRequest request);
+
+    HttpRespMsg confirmDeleteContacts(List<Integer> ids);
+
+    HttpRespMsg returnContacts(List<Integer> ids);
 }

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

@@ -138,6 +138,7 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
     public HttpRespMsg deleteContacts(List<Integer> ids, HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         UpdateWrapper<Contacts> contactsUpdateWrapper = new UpdateWrapper<>();
+        //todo 删除联系人的时候要检查是否有关联的商机和任务
         contactsUpdateWrapper.in("id", ids);
         contactsUpdateWrapper.set("is_delete",1);
         contactsMapper.update(null,contactsUpdateWrapper);
@@ -166,5 +167,21 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
         return msg;
     }
 
+    @Override
+    public HttpRespMsg confirmDeleteContacts(List<Integer> ids) {
+        contactsMapper.deleteBatchIds(ids);
+        return new HttpRespMsg();
+    }
+
+    @Override
+    public HttpRespMsg returnContacts(List<Integer> ids) {
+        HttpRespMsg msg = new HttpRespMsg();
+        UpdateWrapper<Contacts> contactsUpdateWrapper = new UpdateWrapper<>();
+        contactsUpdateWrapper.in("id", ids);
+        contactsUpdateWrapper.set("is_delete",0);
+        contactsMapper.update(null,contactsUpdateWrapper);
+        return msg;
+    }
+
 
 }

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

@@ -17,7 +17,7 @@
         <result column="remark" property="remark" />
         <result column="is_delete" property="isDelete" />
         <result column="create_time" property="createTime" />
-        <result column="range" property="range" />
+        <result column="position" property="position" />
         <result column="plate1" property="plate1" />
         <result column="plate2" property="plate2" />
         <result column="plate3" property="plate3" />
@@ -27,7 +27,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, sex, name, custom_id, email, phone, owner_id, creator_id, address, remark, is_delete, create_time, range, plate1, plate2, plate3, plate4, plate5
+        id, company_id, sex, name, custom_id, email, phone, owner_id, creator_id, address, remark, is_delete, create_time, position, plate1, plate2, plate3, plate4, plate5
     </sql>
     <select id="pageContacts" parameterType="java.util.Map"  resultType="com.management.platform.entity.vo.ContactsVo">
         SELECT c.*, cust.custom_name as customName, own.name as ownerName