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

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

@@ -4,6 +4,7 @@ import com.dk.mdm.model.pojo.mst.ComMenu;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.pojo.mst.MenuFrequency;
 import com.dk.mdm.model.query.mst.ComMenuQuery;
+import com.dk.mdm.model.query.mst.StaffQuery;
 import com.dk.mdm.model.response.mst.ComMenuResponse;
 import com.dk.mdm.model.vo.mst.ComMenuVO;
 import org.apache.ibatis.annotations.Param;
@@ -44,6 +45,18 @@ public interface ComMenuMapper extends BaseMapper<ComMenu>{
      */
     int deleteMenuByStaff(@Param("staffId") String staffId);
 
+    /**
+     * @desc   : 删除该公司的常用功能
+     * @author : 周兴
+     * @date   : 2024-03-29 10:30
+     */
+    int deleteMenuByCpId(Integer cpId);
 
+    /**
+     * @desc   : 插入常用菜单
+     * @author : 周兴
+     * @date   : 2024/6/14 10:42
+     */
+    void insertComMenu(ComMenuVO comMenuVO);
 }
 

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

@@ -64,11 +64,27 @@
         WHERE
             tmcm.staff_id = #{staffId} ::uuid
           AND tmcm.app_code = #{appCode}
+          AND tmcm.cp_id = #{cpId}
         <if test="gradeCode != null and gradeCode != ''">
             AND (tam.grade_codes is null or #{gradeCode} = any(tam.grade_codes))
         </if>
     </select>
 
+    <!--插入常用菜单-->
+    <insert id="insertComMenu" >
+        insert into dkic_b.t_mst_com_menu
+        (
+            menu_uuid,
+            cp_id,
+            staff_id,
+            app_code,
+            display_no
+        )
+        select menu_uuid,#{cpId},#{staffId},app_code,display_no
+        from dkic_b.t_mst_com_menu
+        where cp_id = 0
+    </insert>
+
     <!-- 查询表t_mst_com_menu，（条件查询）个数 -->
     <select id="countByCond" resultType="Long">
         SELECT
@@ -108,6 +124,11 @@
         delete from dkic_b.t_mst_com_menu where staff_id = #{staffId} ::uuid
     </delete>
 
+    <!--删除常用功能-->
+    <delete id="deleteMenuByCpId">
+        delete from dkic_b.t_mst_com_menu where cp_id = #{cpId}
+    </delete>
+
     <!--新建编辑常用功能-->
     <insert id="save">
         insert into dkic_b.t_mst_com_menu

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

@@ -52,5 +52,6 @@ public interface StaffMapper extends BaseMapper<Staff>{
      */
     StaffResponse selectById(@Param("id") String id);
 
+
 }
 

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.java

@@ -23,6 +23,13 @@ public interface OrderMapper extends BaseMapper<Order>{
     List<OrderResponse> selectByCond(OrderQuery orderQuery);
 
     /**
+     * @desc   : countByCond被改了，重写一个
+     * @author : 付斌
+     * @date   : 2024-02-28 10:19
+     */
+    Long countByCondForSelectByCond(OrderQuery orderQuery);
+
+    /**
      * @desc : 以销定采 查询
      * @author : 王英杰
      * @date : 2023/3/14 10:36

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

@@ -553,6 +553,16 @@
             limit #{end} offset #{start}
         </if>
     </select>
+
+    <!-- countByCond被改了，重写一个 -->
+    <select id="countByCondForSelectByCond" resultType="Long">
+        SELECT
+        count(1)
+        FROM dkic_b.t_psi_order as t
+                left join dkic_b.t_mst_customer tmc on t.cus_id = tmc.cus_id
+        <include refid="Condition"/>
+    </select>
+
     <sql id="Base_Column_List_Item_Response_Join">
         toi.item_id AS toi_item_id,
         t.order_id AS toi_order_id,

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

@@ -120,7 +120,6 @@ public class StaffService extends BaseService<Staff> {
     @Autowired
     PrintLayoutMapper printLayoutMapper;
 
-
     /**
      * @desc : 条件查询
      * @author : 姜永辉
@@ -215,6 +214,10 @@ public class StaffService extends BaseService<Staff> {
         staff.setStaffId(codeMap.get("outId").toString());
 //        staff.setStaffCode(codeMap.get("outNote").toString());
         super.insert(staff);
+
+        // 常用菜单的插入
+        comMenuMapper.insertComMenu(new ComMenuVO().setStaffId(staff.getStaffId()));
+
         // 讲电话和名称插入微信用户表里
         Map<String, Object> collectQuery = new HashMap<>();
         collectQuery.put("currentCp", staff.getCpId());
@@ -292,24 +295,44 @@ public class StaffService extends BaseService<Staff> {
         Integer cpId = Integer.parseInt(listCom.get(0).get("cpId").toString());
         String staffId = listCom.get(0).get("staffId").toString();
 
+        List<Map<String, Object>> listComMenu = map.get("listComMenu");
+        List<ComMenu> listC = new ArrayList<>();
+        if (listComMenu != null && listComMenu.size() > 0) {
+            for (int i = 0; i < listComMenu.size(); i++) {
+                Map<String, Object> m = listComMenu.get(i);
+                ComMenu comMenu = new ComMenu();
+                comMenu.setMenuUuid(m.get("menuUuid").toString());
+                comMenu.setAppCode(m.get("appCode").toString());
+                comMenu.setDisplayNo((Integer) m.get("displayNo"));
+                comMenu.setCpId(cpId);
+                comMenu.setStaffId(staffId);
+                listC.add(comMenu);
+            }
+            comMenuMapper.insertBatch(listC);
+            // 插入到常用功能做共通
+            // 先删除
+            comMenuMapper.deleteMenuByCpId(0);
+            listC = listC.stream().map(it -> it.setCpId(0)).collect(Collectors.toList());
+            comMenuMapper.insertBatch(listC);
+        }
         // 插入常用功能 标准版 插入 销售出库 库存查询 商品档案
         if (Constant.STD.equals(gradeCode)) {
-            List<String> objectCodeList = new ArrayList<>();
-            // 商品属性
-            objectCodeList.add("goods-attr");
-            // 商品档案
-            objectCodeList.add("goods");
-            // 销售订单
-            objectCodeList.add("order");
-            // 销售出库
-            objectCodeList.add("order-out");
-            // 库存查询
-            objectCodeList.add("ivt-detail-report");
-
-            ComMenuVO comMenuVO = new ComMenuVO();
-            comMenuVO.setCpId(cpId).setStaffId(staffId).setAppCode(Constant.AppCode.WEIXIN.getCode())
-                    .setObjectCodeList(objectCodeList);
-            comMenuMapper.saveByCompany(comMenuVO);
+//            List<String> objectCodeList = new ArrayList<>();
+//            // 商品属性
+//            objectCodeList.add("goods-attr");
+//            // 商品档案
+//            objectCodeList.add("goods");
+//            // 销售订单
+//            objectCodeList.add("order");
+//            // 销售出库
+//            objectCodeList.add("order-out");
+//            // 库存查询
+//            objectCodeList.add("ivt-detail-report");
+//
+//            ComMenuVO comMenuVO = new ComMenuVO();
+//            comMenuVO.setCpId(cpId).setStaffId(staffId).setAppCode(Constant.AppCode.WEIXIN.getCode())
+//                    .setObjectCodeList(objectCodeList);
+//            comMenuMapper.saveByCompany(comMenuVO);
 
             // 系统参数
             List<SettingValue> settingValueList = new ArrayList<>();

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -150,7 +150,7 @@ public class OrderService extends BaseService<Order> {
     @Pagination
     public ResponseResultVO<PageList<OrderResponse>> selectByCond(OrderQuery orderQuery) {
         return super.mergeListWithCount(orderQuery, orderMapper.selectByCond(orderQuery),
-                orderMapper.countByCond(orderQuery));
+                orderMapper.countByCondForSelectByCond(orderQuery));
     }
 
     /**