获取页面数据源集合 (小程序用)

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -4,6 +4,7 @@ import com.dk.common.controller.BaseController;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.wxapi.basic.WxCommonQuery;
 import com.dk.mdm.service.common.CommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -562,6 +563,22 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<PageList<Map<String, Object>>> getDictionaryDataByPage(@RequestBody Map<String, Object> param) {
         return commonService.getDictionaryDataByPage(param);
     }
+
+
+
+    /**
+     * @desc : 获取页面数据源集合 (小程序用)
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    @ApiOperation(
+            value = "获取页面初始加载数据",
+            notes = "获取页面初始加载数据"
+    )
+    @PostMapping("get_init_data")
+    public ResponseResultVO<?> getInitData(@RequestBody Map<String, Object> param) {
+        return commonService.getInitData(param);
+    }
 }
 
 

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -406,5 +406,13 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      * @date : 2024/3/1 9:21
      */
     Long countDictionaryDataByPage(Map param);
+    /**
+     * @desc : 客户来源
+     * @author : 于继渤
+     * @date : 2024/3/1 9:21
+     */
+    List<Map<String, Object>> getSaleChannel(Map param);
+
+    List<Map<String, Object>> getStaff(Map param);
 
 }

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -927,5 +927,32 @@
         </where>
 
     </select>
+<!--    获取销售渠道-->
+    <select id="getSaleChannel" resultType="java.util.Map">
+        SELECT
+            channel_id AS channelId,
+            channel_code AS channelCode,
+            channel_name AS channelName
+        FROM dkic_b.t_mst_sale_channel
+        <where>
+            <if test="cpId != null">
+                AND cp_id = #{cpId}
+            </if>
+        </where>
+    </select>
+<!--获取员工-->
+    <select id="getStaff" resultType="java.util.Map">
+        SELECT
+        staff_id AS staffId,
+        staff_code AS staffCode,
+        staff_name AS staffName
+        FROM dkic_b.t_mst_staff
+        <where>
+            <if test="cpId != null">
+                AND cp_id = #{cpId}
+            </if>
+        </where>
+    </select>
+
 
 </mapper>

src/main/java/com/dk/mdm/mapper/ivt/IntoReturnItemMapper.xml

@@ -8,6 +8,14 @@
         item_id, return_id, into_id, into_item_id, pur_id, pur_item_id, item_index, sku_id, item_qty, price_std, amt_std, price_return, item_amt, non_std_code, into_status, intoing_qty, intoing_amt, into_qty, into_amt, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
+
+    <sql id="Base_Column_List_Join">
+        tpiri.item_id, tpiri.return_id, tpiri.into_id, tpiri.into_item_id, tpiri.pur_id, tpiri.pur_item_id, tpiri.item_index, tpiri.sku_id, tpiri.item_qty,
+                     tpiri.price_std,tpiri.amt_std, tpiri.price_return,
+               tpiri.item_amt, tpiri.non_std_code, tpiri.into_status, tpiri.intoing_qty, tpiri.intoing_amt, tpiri.into_qty, tpiri.into_amt,
+                     tpiri.remarks, tpiri.flg_valid, tpiri.cp_id
+    </sql>
+
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.ivt.IntoReturnItem">
         <id column="item_id" property="itemId"/>
@@ -41,6 +49,37 @@
                 <result column="op_db_user" property="opDbUser"/>
     </resultMap>
 
+    <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.ivt.IntoReturnItemResponse">
+        <id column="item_id" property="itemId"/>
+        <result column="return_id" property="returnId" typeHandler="UuidTypeHandler"/>
+        <result column="into_id" property="intoId" typeHandler="UuidTypeHandler"/>
+        <result column="into_item_id" property="intoItemId" typeHandler="UuidTypeHandler"/>
+        <result column="pur_id" property="purId" typeHandler="UuidTypeHandler"/>
+        <result column="pur_item_id" property="purItemId" typeHandler="UuidTypeHandler"/>
+        <result column="item_index" property="itemIndex"/>
+        <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
+        <result column="item_qty" property="itemQty"/>
+        <result column="price_std" property="priceStd"/>
+        <result column="amt_std" property="amtStd"/>
+        <result column="price_return" property="priceReturn"/>
+        <result column="item_amt" property="itemAmt"/>
+        <result column="non_std_code" property="nonStdCode"/>
+        <result column="into_status" property="intoStatus"/>
+        <result column="intoing_qty" property="intoingQty"/>
+        <result column="intoing_amt" property="intoingAmt"/>
+        <result column="into_qty" property="intoQty"/>
+        <result column="into_amt" property="intoAmt"/>
+        <result column="remarks" property="remarks"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="sku_code" property="skuCode"/>
+        <result column="sku_name" property="skuName"/>
+        <result column="sku_model" property="skuModel"/>
+        <result column="sku_images" property="skuImages"/>
+
+    </resultMap>
+
+
     <!-- 通用条件列 -->
     <sql id="Condition">
         <where>
@@ -131,6 +170,75 @@
         </where>
     </sql>
 
+    <sql id="Condition_Join">
+        <where>
+            <if test="returnId != null and returnId != ''">
+                AND tpiri.return_id = #{returnId}
+            </if>
+            <if test="intoId != null and intoId != ''">
+                AND tpiri.into_id = #{intoId}
+            </if>
+            <if test="intoItemId != null and intoItemId != ''">
+                AND tpiri.into_item_id = #{intoItemId}
+            </if>
+            <if test="purId != null and purId != ''">
+                AND tpiri.pur_id = #{purId}
+            </if>
+            <if test="purItemId != null and purItemId != ''">
+                AND tpiri.pur_item_id = #{purItemId}
+            </if>
+            <if test="itemIndex != null">
+                AND tpiri.item_index = #{itemIndex}
+            </if>
+            <if test="skuId != null and skuId != ''">
+                AND tpiri.sku_id = #{skuId}
+            </if>
+            <if test="itemQty != null">
+                AND tpiri.item_qty = #{itemQty}
+            </if>
+            <if test="priceStd != null">
+                AND tpiri.price_std = #{priceStd}
+            </if>
+            <if test="amtStd != null">
+                AND tpiri.amt_std = #{amtStd}
+            </if>
+            <if test="priceReturn != null">
+                AND tpiri.price_return = #{priceReturn}
+            </if>
+            <if test="itemAmt != null">
+                AND tpiri.item_amt = #{itemAmt}
+            </if>
+            <if test="nonStdCode != null and nonStdCode != ''">
+                AND tpiri.non_std_code = #{nonStdCode}
+            </if>
+            <if test="intoStatus != null and intoStatus != ''">
+                AND tpiri.into_status = #{intoStatus}
+            </if>
+            <if test="intoingQty != null">
+                AND tpiri.intoing_qty = #{intoingQty}
+            </if>
+            <if test="intoingAmt != null">
+                AND tpiri.intoing_amt = #{intoingAmt}
+            </if>
+            <if test="intoQty != null">
+                AND tpiri.into_qty = #{intoQty}
+            </if>
+            <if test="intoAmt != null">
+                AND tpiri.into_amt = #{intoAmt}
+            </if>
+            <if test="remarks != null and remarks != ''">
+                AND tpiri.remarks = #{remarks}
+            </if>
+            <if test="flgValid != null">
+                AND tpiri.flg_valid = #{flgValid}
+            </if>
+            <if test="cpId != null">
+                AND tpiri.cp_id = #{cpId}
+            </if>
+
+        </where>
+    </sql>
+
     <sql id="idsForeach">
         <!-- 根据主键itemId批量操作 -->
         WHERE item_id in
@@ -140,11 +248,16 @@
     </sql>
 
     <!-- 查询表t_psi_into_return_item，（条件查询+分页）列表 -->
-    <select id="selectByCond" resultMap="BaseResultMap">
+    <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_psi_into_return_item
-        <include refid="Condition"/>
+        <include refid="Base_Column_List_Join"/>,
+        tmgs.sku_code AS sku_code,
+        tmgs.sku_name AS sku_name,
+        tmgs.sku_model AS sku_model,
+        tmgs.sku_images AS sku_images
+        FROM dkic_b.t_psi_into_return_item  tpiri
+        left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpiri.sku_id
+        <include refid="Condition_Join"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>
@@ -154,8 +267,8 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_psi_into_return_item
-        <include refid="Condition"/>
+        FROM t_psi_into_return_item tpiri
+        <include refid="Condition_Join"/>
     </select>
 
     <!-- 根据主键查询表t_psi_into_return_item的一行数据 -->

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

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
@@ -63,6 +64,10 @@ public class IntoReturnItemResponse  implements Serializable {
     private String intoId;
 
 
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String returnId;
+
+
     /**
      * 入库单明细ID
      */
@@ -283,15 +288,23 @@ public class IntoReturnItemResponse  implements Serializable {
     private String opDbUser;
 
 
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
 
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
+    @Excel(name = "商品编码")
+    @ApiModelProperty(value = "商品编码")
+    private String skuCode;
+
+    @Excel(name = "商品名称")
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
+
+
+
+    private String skuModel;
+
+    @Excel(name = "商品图")
+    @ApiModelProperty(value = "商品图")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private String skuImages;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -3,10 +3,12 @@ package com.dk.mdm.service.common;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dk.common.infrastructure.constant.Constant;
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.model.vo.core.StaffEntity;
 import com.dk.common.model.vo.core.UserVO;
+import com.dk.common.model.wxapi.wxResponse.WxCommonResponse;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
@@ -14,6 +16,7 @@ import com.dk.common.service.BaseService;
 import com.dk.mdm.mapper.common.CommonMapper;
 import com.dk.mdm.infrastructure.util.AuthUtils;
 import com.dk.mdm.mapper.mst.StaffMapper;
+import com.dk.mdm.model.query.wxapi.basic.WxCommonQuery;
 import com.dk.mdm.model.response.mst.StaffResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.postgresql.util.PGobject;
@@ -401,9 +404,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（销售订单开单用）
+     * @desc : 获取商品（销售订单开单用）
      * @author : 付斌
-     * @date   : 2024-03-09 9:57
+     * @date : 2024-03-09 9:57
      */
     public ResponseResultVO<List<Map<String, Object>>> getGoodsForOrder(Map<String, Object> param) {
         // 获取系统基础数据
@@ -412,9 +415,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（销售订单开单用）（分页）
+     * @desc : 获取商品（销售订单开单用）（分页）
      * @author : 付斌
-     * @date   : 2024-03-09 9:57
+     * @date : 2024-03-09 9:57
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForOrderByPage(Map<String, Object> param) {
         // 校验分页参数
@@ -429,9 +432,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取商品（采购订单开单用）
+     * @desc : 获取商品（采购订单开单用）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchase(Map<String, Object> param) {
         // 获取系统基础数据
@@ -440,9 +443,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（采购订单开单用）（分页）
+     * @desc : 获取商品（采购订单开单用）（分页）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseByPage(Map<String, Object> param) {
         // 校验分页参数
@@ -670,9 +673,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 供应商类别
+     * @desc : 供应商类别
      * @author : 宋扬
-     * @date   : 2024/3/6 10:41
+     * @date : 2024/3/6 10:41
      */
     public ResponseResultVO<List<Map<String, Object>>> getSupType(Map<String, Object> param) {
         // 获取系统基础数据
@@ -681,9 +684,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 供应商服务类别
+     * @desc : 供应商服务类别
      * @author : 宋扬
-     * @date   : 2024/3/6 10:43
+     * @date : 2024/3/6 10:43
      */
     public ResponseResultVO<List<Map<String, Object>>> getServiceCategories(Map<String, Object> param) {
         // 获取系统基础数据
@@ -701,4 +704,41 @@ public class CommonService extends BaseService<Map<String, Object>> {
         return super.mergeListWithCount(param, commonMapper.getDictionaryDataByPage(param),
                 commonMapper.countDictionaryDataByPage(param));
     }
+
+
+    /**
+     * @desc : 获取页面数据源集合 (小程序用)
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getInitData(Map<String, Object> param) {
+        //判断前台是否传 dataSourceCode
+        if (!param.containsKey("dataSourceCode") &&  param.get("dataSourceCode") == null) {
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.DATASOURCECODE_NOT.getMessage());
+        }
+        String dataSourceCode = param.get("dataSourceCode").toString();
+        //查询到的结果集
+        List<Map<String, Object>> list = null;
+        Integer cpId = authUtils.getStaff().getCpId();
+        Map<String, Object> map = new HashMap<>();
+        map.put("cpId",cpId);
+        //客户来源
+        if (dataSourceCode.equals("customerFrom")) {
+            map.put("dictCode","客户来源");
+            list = commonMapper.getDictionaryData(map);
+        }
+        //销售渠道
+        if (dataSourceCode.equals("saleChannel")) {
+            list = commonMapper.getSaleChannel(map);
+        }
+        //部门
+        if (dataSourceCode.equals("org")) {
+            list = commonMapper.getOrg(map);
+        }
+        //员工
+        if (dataSourceCode.equals("staff")) {
+            list = commonMapper.getStaff(map);
+        }
+        return ResponseResultUtil.success(list);
+    }
 }