Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/mst/CusFollowController.java

@@ -21,6 +21,7 @@ import com.dk.mdm.service.mst.CusFollowService;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 @Api(tags = "客户跟进API接口")
 @RestController
@@ -110,4 +111,16 @@ public class CusFollowController{
         return cusFollowService.selectById(new CusFollowQuery().setFollowId(id));
     }
 
+
+    /**
+     * @desc   : 查询跟进记录
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    @ApiOperation(value = "条件查询", notes = "条件查询")
+    @PostMapping({"select_cus_follow"})
+    public ResponseResultVO<List<Map>> selectCusFollow(@RequestBody CusFollowQuery customerQuery) {
+        return cusFollowService.selectCusFollow(customerQuery);
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.dk.mdm.mapper.mst;
 
 import com.dk.mdm.model.pojo.mst.CusFollow;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.ivt.InboundItemQuery;
 import com.dk.mdm.model.query.mst.CusFollowQuery;
 import com.dk.mdm.model.query.mst.CustomerQuery;
 import com.dk.mdm.model.response.mst.CusFollowResponse;
@@ -9,6 +10,7 @@ import com.dk.mdm.model.response.mst.CustomerResponse;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户跟进 Mapper
@@ -42,5 +44,6 @@ public interface CusFollowMapper extends BaseMapper<CusFollow> {
 
     int updateMeasure(CusFollow cusFollow);
 
+    List<Map> selectCusFollow(CusFollowQuery cusFollowQuery);
 }
 

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

@@ -294,8 +294,8 @@
         tmo.org_name AS "orgName",
         tms.staff_name AS "staffName",
         tmc.follow_count AS follow_count,
-        <if test="measureStatus != null and measureStatus != ''">
-            tcmr.measure_status AS "measureStatus",
+        <if test="measureSe != null and measureSe != ''">
+--             tcmr.measure_status AS "measureStatus",
             tdk4.kind_name_i18n ->>  #{i18n} AS "measure_status_name",
         </if>
         tdk1.kind_name_i18n ->>  #{i18n} AS "follow_status_name",
@@ -303,9 +303,9 @@
         tdk3.kind_name_i18n ->>  #{i18n} AS stay_time_len_name
 
         FROM dkic_b.t_crm_cus_follow tccf
-        <if test="measureStatus != null and measureStatus != ''">
-            LEFT JOIN dkic_b.t_crm_measure_receipt tcmr ON tcmr.cus_id = tccf.cus_id and tcmr.measure_status = #{measureStatus}
-            LEFT JOIN sys.t_data_kind tdk4 on tdk4.kind_code = tcmr.measure_status
+        <if test="measureSe != null and measureSe != ''">
+            LEFT JOIN dkic_b.t_crm_measure_receipt tcmr ON tcmr.cus_id = tccf.cus_id
+            LEFT JOIN sys.t_data_kind tdk4 on tdk4.kind_code = tccf.measure_status
         </if>
         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
@@ -433,4 +433,77 @@
         </foreach>
     </insert>
 
+
+    <select id="selectCusFollow" resultType="map">
+        (
+            SELECT
+                tccf.follow_id AS "followId",
+                tccf.cus_id AS "cusId",
+                tccf.follow_status AS "followStatus",
+                tccf.follow_type AS "followType",
+                tccf.follow_org AS "followOrg",
+                tccf.follow_staff AS "followStaff",
+                tccf.follow_time AS "followTime",
+                tccf.follow_data AS "followData",
+                tccf.follow_time_len AS "followTimeLen",
+                tccf.stay_time_len AS "stayTimeLen",
+                tccf.intention AS "intention",
+                tccf.invite_result AS "inviteResult",
+                tccf.invite_time AS "inviteTime",
+                tccf.design_staff AS "designStaff",
+                tccf.next_follow_plan AS "nextFollowPlan",
+                tccf.next_follow_time AS "nextFollowTime",
+                tccf.measure_status AS "measureStatus",
+                tmc.follow_count AS "followCount",
+                tms.staff_name AS "followStaffName",
+                tccf.op_create_time AS "createTime",
+                tdk1.kind_name_i18n  ->>  #{i18n} AS "followStatusName",
+                tdk2.kind_name_i18n  ->>  #{i18n} AS "followTypeName"
+            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_staff tms ON tms.staff_id = tccf.follow_staff
+                LEFT JOIN sys.t_data_kind tdk1 ON tdk1.kind_code = tccf.follow_status
+                LEFT JOIN sys.t_data_kind tdk2 ON tdk1.kind_code = tccf.follow_type
+            WHERE
+                tccf.cus_id =  #{cusId}::uuid
+        )
+        UNION ALL
+        (
+            SELECT
+                tcmr.follow_id AS "followId",
+                tcmr.cus_id AS "cusId",
+                tccf1.follow_status AS "followStatus",
+                tccf1.follow_type AS "followType",
+                tccf1.follow_org AS "followOrg",
+                tccf1.follow_staff AS "followStaff",
+                tccf1.follow_time AS "followTime",
+                tccf1.follow_data AS "followData",
+                tccf1.follow_time_len AS "followTimeLen",
+                tccf1.stay_time_len AS "stayTimeLen",
+                tccf1.intention AS "intention",
+                tccf1.invite_result AS "inviteResult",
+                tccf1.invite_time AS "inviteTime",
+                tccf1.design_staff AS "designStaff",
+                tccf1.next_follow_plan AS "nextFollowPlan",
+                tccf1.next_follow_time AS "nextFollowTime",
+                tcmr.measure_status AS "measureStatus",
+                tmc.follow_count AS "followCount",
+                tms.staff_name AS "followStaffName",
+                tcmr.op_create_time AS "createTime",
+                tdk1.kind_name_i18n  ->>  #{i18n} AS "followStatusName",
+                tdk2.kind_name_i18n  ->>  #{i18n} AS "followTypeName"
+            FROM
+                dkic_b.t_crm_measure_receipt tcmr
+                LEFT JOIN sys.t_data_kind tdk1 ON tdk1.kind_code = tcmr.measure_status
+                LEFT JOIN dkic_b.t_crm_cus_follow tccf1 ON tccf1.follow_id = tcmr.follow_id
+                LEFT JOIN dkic_b.t_mst_customer tmc ON tmc.cus_id = tccf1.cus_id
+                LEFT JOIN dkic_b.t_mst_staff tms ON tms.staff_id = tccf1.follow_staff
+                LEFT JOIN sys.t_data_kind tdk2 ON tdk1.kind_code = tccf1.follow_type
+            WHERE
+                tcmr.cus_id =  #{cusId}::uuid
+        )
+        ORDER BY
+            "createTime" DESC;
+    </select>
 </mapper>

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -3374,7 +3374,7 @@
 
     <!-- 销售汇总明细 -->
     <select id="getOrderSummaryItem" resultType="java.util.Map">
-        select dkic_b.f_get_order_summary_item(#{cpId}, #{querys, typeHandler=JsonTypeHandler})
+        select dkic_b.f_get_order_summary_item(#{cpId}, #{querys, typeHandler=JsonTypeHandler}, #{lang})
     </select>
 
     <!--endregion-->

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -111,6 +111,8 @@
         <result column="skuModel" property="skuModel"/>
         <result column="skuName" property="skuName"/>
         <result column="can_out_qty" property="canOutQty"/>
+        <result column="cost_price" property="costPrice"/>
+        <result column="cost_amt" property="costAmt"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -461,6 +463,8 @@
                ,u2.unit_name as "subUnitName"
                ,dkic_b.f_box_piece(u2.unit_name,ul.unit_name,tpobi.outing_box,tpobi.outing_piece) AS "outingBoxPiece"
                ,dkic_b.f_box_piece(u2.unit_name,ul.unit_name,tpobi.out_box,tpobi.out_piece) AS "outBoxPiece"
+               ,tpobi.cost_price
+               ,tpobi.cost_amt
         FROM dkic_b.t_psi_outbound_item as tpobi
                  inner join dkic_b.t_psi_order_item as t on t.item_id = tpobi.from_item_id
                  LEFT join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id

src/main/java/com/dk/mdm/model/query/mst/CusFollowQuery.java

@@ -190,6 +190,8 @@ public class CusFollowQuery extends PageInfo<CusFollowQuery> implements Serializ
     @ApiModelProperty(value = "量尺状态 (【系统字典】)")
     private String measureStatus;
 
+    private String measureSe;
+
 
     /**
      * 备注

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -434,6 +434,18 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
 
     @ApiModelProperty(value = "能出库数量")
     private BigDecimal canOutQty;
+    /**
+     * 成本单价
+     */
+    @ApiModelProperty(value = "成本单价")
+    private BigDecimal costPrice;
+
+
+    /**
+     * 成本金额
+     */
+    @ApiModelProperty(value = "成本金额")
+    private BigDecimal costAmt;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -193,9 +193,9 @@ public class InventoryService extends BaseService<Inventory> {
                 //入库数量
                 inOutRecordVO.setIntoQty(inOutRecordVO.getOutQty());
                 //入库价
-                inOutRecordVO.setPriceInto(inOutRecordVO.getCostPrice());
+                inOutRecordVO.setPriceInto(inOutRecordVO.getCostPrice()!=null ? inOutRecordVO.getCostPrice() : BigDecimal.ZERO );
                 //入库金额
-                inOutRecordVO.setIntoAmt(inOutRecordVO.getCostAmt());
+                inOutRecordVO.setIntoAmt(inOutRecordVO.getCostAmt()!=null ? inOutRecordVO.getCostAmt() : BigDecimal.ZERO);
             }
             //endregion
             //入库日期

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

@@ -527,4 +527,8 @@ public class CusFollowService extends BaseService<CusFollow> {
         return ResponseResultUtil.success();
 
     }
+
+    public ResponseResultVO<List<Map>> selectCusFollow(CusFollowQuery cusFollowQuery) {
+        return ResponseResultUtil.success(cusFollowMapper.selectCusFollow(cusFollowQuery));
+    }
 }

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -852,10 +852,13 @@ public class ReportService {
             // 获取收支额
             Map<String, Object> incomeExpenditure = reportMapper.getIncomeExpenditure(params);
             // 获取欠款额
-            Map<String, Object> debt = reportMapper.getDebt(params);
+//            Map<String, Object> debt = reportMapper.getDebt(params);
+            Map<String, Object> debt = new HashMap<>();
             if (debt != null) {
+//                debt.put("outAmt", Double.valueOf(String.valueOf(sales.get("facAmt")).equals("null") ? "0" : String.valueOf(sales.get("facAmt")))
+//                        + Double.valueOf(String.valueOf(debt.get("outAmt")).equals("null") ? "0" : String.valueOf(debt.get("outAmt")))
+//                        - Double.valueOf(String.valueOf(incomeExpenditure.get("arrears")).equals("null") ? "0" : String.valueOf(incomeExpenditure.get("arrears"))));
                 debt.put("outAmt", Double.valueOf(String.valueOf(sales.get("facAmt")).equals("null") ? "0" : String.valueOf(sales.get("facAmt")))
-                        + Double.valueOf(String.valueOf(debt.get("outAmt")).equals("null") ? "0" : String.valueOf(debt.get("outAmt")))
                         - Double.valueOf(String.valueOf(incomeExpenditure.get("arrears")).equals("null") ? "0" : String.valueOf(incomeExpenditure.get("arrears"))));
             }
             List<Map<String, Object>> overviewList = new ArrayList<>();