实体

src/main/java/com/dk/mdm/mapper/mst/CusFollowMapper.xml

@@ -71,6 +71,7 @@
         <result column="staffName" property="staffName"/>
         <result column="cusPhone" property="cusPhone"/>
         <result column="addressFull" property="addressFull"/>
+        <result column="follow_count" property="followCount"/>
 
 
 
@@ -245,7 +246,8 @@
         tmc.cus_phone AS "cusPhone",
         tmc.address_full AS "addressFull",
         tmo.org_name  AS  "orgName",
-        tms.staff_name  AS  "staffName"
+        tms.staff_name  AS  "staffName",
+        tmc.follow_count AS follow_count
         FROM dkic_b.t_crm_cus_follow tccf
         LEFT JOIN dkic_b.t_mst_customer tmc ON tmc.cus_id = tccf.cus_id
         LEFT JOIN dkic_b.t_mst_org tmo on tmo.org_id = tccf.follow_org

src/main/java/com/dk/mdm/model/pojo/ivt/IntoReturnItem.java

@@ -159,41 +159,42 @@ public class IntoReturnItem extends PageInfo<IntoReturnItem> implements Serializ
     /**
      * 入库状态
      */
-    @Excel(name = "入库状态")
+    @Excel(name = "出库状态")
     @ApiModelProperty(value = "入库状态")
-    private String intoStatus;
+    private String outStatus;
+
 
 
     /**
-     * 入库中数量
+     * 出库中数量
      */
-    @Excel(name = "入库中数量")
-    @ApiModelProperty(value = "入库中数量")
-    private BigDecimal intoingQty;
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
 
 
     /**
-     * 入库中金额
+     * 出库中金额
      */
-    @Excel(name = "入库中金额")
-    @ApiModelProperty(value = "入库中金额")
-    private BigDecimal intoingAmt;
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
 
 
     /**
-     * 已入库数量
+     * 已出库数量
      */
-    @Excel(name = "已入库数量")
-    @ApiModelProperty(value = "已入库数量")
-    private BigDecimal intoQty;
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
 
 
     /**
-     * 已入库金额
+     * 已出库金额
      */
-    @Excel(name = "已入库金额")
-    @ApiModelProperty(value = "已入库金额")
-    private BigDecimal intoAmt;
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
 
 
     /**

src/main/java/com/dk/mdm/model/query/ivt/IntoReturnItemQuery.java

@@ -158,41 +158,42 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 入库状态
      */
-    @Excel(name = "入库状态")
+    @Excel(name = "出库状态")
     @ApiModelProperty(value = "入库状态")
-    private String intoStatus;
+    private String outStatus;
+
 
 
     /**
-     * 入库中数量
+     * 出库中数量
      */
-    @Excel(name = "入库中数量")
-    @ApiModelProperty(value = "入库中数量")
-    private BigDecimal intoingQty;
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
 
 
     /**
-     * 入库中金额
+     * 出库中金额
      */
-    @Excel(name = "入库中金额")
-    @ApiModelProperty(value = "入库中金额")
-    private BigDecimal intoingAmt;
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
 
 
     /**
-     * 已入库数量
+     * 已出库数量
      */
-    @Excel(name = "已入库数量")
-    @ApiModelProperty(value = "已入库数量")
-    private BigDecimal intoQty;
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
 
 
     /**
-     * 已入库金额
+     * 已出库金额
      */
-    @Excel(name = "已入库金额")
-    @ApiModelProperty(value = "已入库金额")
-    private BigDecimal intoAmt;
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
 
 
     /**

src/main/java/com/dk/mdm/model/response/ivt/IntoReturnItemResponse.java

@@ -163,41 +163,42 @@ public class IntoReturnItemResponse  implements Serializable {
     /**
      * 入库状态
      */
-    @Excel(name = "入库状态")
+    @Excel(name = "出库状态")
     @ApiModelProperty(value = "入库状态")
-    private String intoStatus;
+    private String outStatus;
+
 
 
     /**
-     * 入库中数量
+     * 出库中数量
      */
-    @Excel(name = "入库中数量")
-    @ApiModelProperty(value = "入库中数量")
-    private BigDecimal intoingQty;
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
 
 
     /**
-     * 入库中金额
+     * 出库中金额
      */
-    @Excel(name = "入库中金额")
-    @ApiModelProperty(value = "入库中金额")
-    private BigDecimal intoingAmt;
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
 
 
     /**
-     * 已入库数量
+     * 已出库数量
      */
-    @Excel(name = "已入库数量")
-    @ApiModelProperty(value = "已入库数量")
-    private BigDecimal intoQty;
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
 
 
     /**
-     * 已入库金额
+     * 已出库金额
      */
-    @Excel(name = "已入库金额")
-    @ApiModelProperty(value = "已入库金额")
-    private BigDecimal intoAmt;
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
 
 
     /**

src/main/java/com/dk/mdm/model/response/mst/CusFollowResponse.java

@@ -12,6 +12,7 @@ import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -221,6 +222,7 @@ public class CusFollowResponse implements Serializable {
     private String orgName;
     private String staffName;
     private String addressFull;
+    private Integer followCount;
 
 
 

src/main/java/com/dk/mdm/model/vo/ivt/IntoReturnItemVO.java

@@ -157,41 +157,42 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 入库状态
      */
-    @Excel(name = "入库状态")
+    @Excel(name = "出库状态")
     @ApiModelProperty(value = "入库状态")
-    private String intoStatus;
+    private String outStatus;
+
 
 
     /**
-     * 入库中数量
+     * 出库中数量
      */
-    @Excel(name = "入库中数量")
-    @ApiModelProperty(value = "入库中数量")
-    private BigDecimal intoingQty;
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
 
 
     /**
-     * 入库中金额
+     * 出库中金额
      */
-    @Excel(name = "入库中金额")
-    @ApiModelProperty(value = "入库中金额")
-    private BigDecimal intoingAmt;
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
 
 
     /**
-     * 已入库数量
+     * 已出库数量
      */
-    @Excel(name = "已入库数量")
-    @ApiModelProperty(value = "已入库数量")
-    private BigDecimal intoQty;
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
 
 
     /**
-     * 已入库金额
+     * 已出库金额
      */
-    @Excel(name = "已入库金额")
-    @ApiModelProperty(value = "已入库金额")
-    private BigDecimal intoAmt;
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
 
 
     /**

src/main/java/com/dk/mdm/service/ivt/IntoReturnService.java

@@ -270,9 +270,9 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             //自动]出库赋值  已入库数量、已入库金额
             if (intoReturnVO.getFlgAutoIvt()) {
 
-                intoReturnItemVO.setIntoQty(intoReturnItemVO.getItemQty().abs());
-
-                intoReturnItemVO.setIntoAmt(intoReturnItemVO.getItemAmt().abs());
+//                intoReturnItemVO.setIntoQty(intoReturnItemVO.getItemQty().abs());
+//
+//                intoReturnItemVO.setIntoAmt(intoReturnItemVO.getItemAmt().abs());
 
             }
             //新建明细

src/main/java/com/dk/mdm/service/mst/CusFollowService.java

@@ -103,7 +103,7 @@ public class CusFollowService extends BaseService<CusFollow> {
             Customer customer = customerMapper.selectById(cusFollowVO.getCusId());
 
             // 查询跟进人是否存在
-            CusFollowStaff followStaff = cusFollowStaffMapper.selectByCusFollowStaffId(cusFollowVO.getCusId(), cusFollowVO.getFollowStaff());
+            CusFollowStaff followStaff = cusFollowStaffMapper.selectByCusFollowStaffId(cusFollowVO.getCusId(), authUtils.getStaff().getStaffId());
             //追加跟进人表
             if (followStaff == null) {
                 cusFollowStaffMapper.insert(new CusFollowStaff()
@@ -126,6 +126,8 @@ public class CusFollowService extends BaseService<CusFollow> {
             if (users == null || users.size() == 0 || (users != null && users.stream().allMatch(Objects::isNull))) {
                 users = new ArrayList<>();
             }
+
+
             //公海客户跟进后 变成潜客状态
             if (Constant.saleCustomerStatusConstant.SALE_STATUS_INTE.getName().equals(customer.getSaleStatus())) {
                 customer.setSaleStatus(Constant.saleCustomerStatusConstant.SALE_STATUS_POTE.getName());
@@ -260,11 +262,11 @@ public class CusFollowService extends BaseService<CusFollow> {
     }
 
 
-    /**
-     * @desc : 保存跟进信息到xxl job
-     * @author : 于继渤海
-     * @date : 2022-05-27 09:53
-     */
+/**
+ * @desc : 保存跟进信息到xxl job
+ * @author : 于继渤海
+ * @date : 2022-05-27 09:53
+ */
 //    @Transactional(rollbackFor = {Exception.class})
 //    public void saveToXxlJob(CusFollow cusFollow) {
 //