客户管家 销售订单

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

@@ -16,6 +16,7 @@ import com.management.platform.util.HttpRespMsg;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -44,8 +45,8 @@ public class OrderController {
     private OrderProductDetailService orderProductDetailService;
 
     @RequestMapping("/list")
-    public HttpRespMsg list(String userId, String orderName,String orderCode, String productCode, Integer pageIndex, Integer pageSize){
-        return orderService.getList(userId,orderName,orderCode,productCode,pageIndex,pageSize);
+    public HttpRespMsg list(String userId, String orderName,String orderCode, String productCode, Integer pageIndex, Integer pageSize,Integer isDelete){
+        return orderService.getList(userId,orderName,orderCode,productCode,pageIndex,pageSize,isDelete);
     }
 
     @RequestMapping("/addOrUpdate")
@@ -80,5 +81,30 @@ public class OrderController {
         }
         return msg;
     }
+
+    @RequestMapping("/delete")
+    public HttpRespMsg delete(Integer id){
+        HttpRespMsg msg=new HttpRespMsg();
+        Order order = orderService.getById(id);
+        order.setIsDelete(1);
+        if(!orderService.updateById(order)){
+            msg.setError("验证失败");
+            return msg;
+        }
+        return msg;
+    }
+
+    @RequestMapping("/recover")
+    public HttpRespMsg recover(Integer id){
+        HttpRespMsg msg=new HttpRespMsg();
+        Order order = orderService.getById(id);
+        order.setIsDelete(0);
+        if(!orderService.updateById(order)){
+            msg.setError("验证失败");
+            return msg;
+        }
+        return msg;
+    }
+
 }
 

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

@@ -153,6 +153,12 @@ public class Order extends Model<Order> {
     @TableField("is_delete")
     private Integer isDelete;
 
+    /**
+     * 0-暂存 默认为1正常数据
+     */
+    @TableField("status")
+    private Integer status;
+
     /**
      * 自定义字段存值
      */

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

@@ -14,5 +14,5 @@ import com.management.platform.util.HttpRespMsg;
  */
 public interface OrderService extends IService<Order> {
 
-    HttpRespMsg getList(String userId, String orderName,String orderCode, String productCode, Integer pageIndex, Integer pageSize);
+    HttpRespMsg getList(String userId, String orderName,String orderCode, String productCode, Integer pageIndex, Integer pageSize,Integer isDelete);
 }

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

@@ -45,7 +45,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     private SysDictMapper sysDictMapper;
 
     @Override
-    public HttpRespMsg getList(String userId, String orderName,String orderCode, String productCode, Integer pageIndex, Integer pageSize) {
+    public HttpRespMsg getList(String userId, String orderName,String orderCode, String productCode, Integer pageIndex, Integer pageSize,Integer isDelete) {
         HttpRespMsg msg=new HttpRespMsg();
         User user = userMapper.selectById(request.getHeader("token"));
         List<Department> departments = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, user.getCompanyId()));
@@ -55,6 +55,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         List<SysDict> sysDictOfOrderType = sysDictMapper.selectList(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCompanyId, user.getCompanyId()).eq(SysDict::getCode, "OrderType"));
         LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
         orderLambdaQueryWrapper.eq(Order::getCompanyId,user.getCompanyId());
+        if(isDelete!=null){
+            orderLambdaQueryWrapper.eq(Order::getIsDelete,isDelete);
+        }else {
+            orderLambdaQueryWrapper.eq(Order::getIsDelete,0);
+        }
+        orderLambdaQueryWrapper.eq(Order::getStatus,1);
         //判断查看全部的权限
         if(!viewAll){
             //判断查看负责部门的权限

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

@@ -25,6 +25,7 @@
         <result column="create_time" property="createTime" />
         <result column="creator_id" property="creatorId" />
         <result column="is_delete" property="isDelete" />
+        <result column="status" property="status" />
         <result column="plate1" property="plate1" />
         <result column="plate2" property="plate2" />
         <result column="plate3" property="plate3" />
@@ -34,7 +35,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, order_name, order_code, custom_id, business_opportunity_id, price, contacts_id, type, place_time, order_start_date, order_end_date, received_payment, un_received_payment, custom_signer, company_signer, incharger_id, remark, create_time, creator_id, is_delete, plate1, plate2, plate3, plate4, plate5
+        id, company_id, order_name, order_code, custom_id, business_opportunity_id, price, contacts_id, type, place_time, order_start_date, order_end_date, received_payment, un_received_payment, custom_signer, company_signer, incharger_id, remark, create_time, creator_id, is_delete, status, plate1, plate2, plate3, plate4, plate5
     </sql>
 
 </mapper>