1、修改导出

2、修改常用功能

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

@@ -27,5 +27,12 @@ public interface MenuFrequencyMapper extends BaseMapper<MenuFrequency>{
      * @date   : 2024-03-28 10:30
      */
     List<MenuFrequencyResponse> selectByCond(MenuFrequencyQuery menuFrequencyQuery);
+
+    /**
+     * @desc   : 查询功能频率
+     * @author : 周兴
+     * @date   : 2024-03-28 10:30
+     */
+    MenuFrequencyResponse selectMenuById(MenuFrequency menuFrequency);
 }
 

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

@@ -98,33 +98,18 @@
         )
         on conflict (menu_uuid,staff_id,app_code) do update set
         cp_id = excluded."cp_id",
-        qty = excluded."qty" + 1;
+        qty = excluded."qty" ;
     </insert>
 
     <!-- 根据主键查询表t_mst_menu_frequency的一行数据 -->
-    <select id="selectById" resultMap="BaseResultMap">
+    <select id="selectMenuById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mst_menu_frequency
-        WHERE menu_uuid = #{id}::uuid
-    </select>
-
-    <!-- 根据主键锁定表t_mst_menu_frequency的一行数据 -->
-    <select id="selectByIdForUpdate" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_mst_menu_frequency
-        WHERE menu_uuid = #{menuUuid}
-        for update
-    </select>
-
-    <!-- 根据主键锁定表t_mst_menu_frequency的多行数据 -->
-    <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_mst_menu_frequency
-        <include refid="idsForeach"/>
-        for update
+        WHERE menu_uuid = #{menuUuid}::uuid
+        and cp_id = #{cpId}
+        and app_code = #{appCode}
+        and staff_id = #{staffId} ::uuid
     </select>
 
     <insert id="insertBatch">

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

@@ -70,7 +70,10 @@ public class ExportService {
         if (list != null && list.size() > 0) {
             // 处理数据
             List<Map<String, Object>> mapList = filterExportColumns(condition, list);
-            String path = ExcelPoiUtils.createExcel(mapList, title + "_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")) + ".xlsx", title);
+            String fileName = UUID.randomUUID().toString();
+            String path = ExcelPoiUtils.createExcel(mapList,
+                    fileName + "_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")) + ".xlsx",
+                    title, param.get("name").toString());
             return ResponseResultUtil.success(path);
         }
         return ResponseResultUtil.success("");

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

@@ -7,6 +7,7 @@ import com.dk.mdm.model.pojo.mst.MenuFrequency;
 import com.dk.mdm.mapper.mst.MenuFrequencyMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.response.mst.MenuFrequencyResponse;
 import com.dk.mdm.model.vo.mst.MenuFrequencyVO;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,31 +17,37 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class MenuFrequencyService extends BaseService<MenuFrequency> {
 
-	@Override
-	public BaseMapper<MenuFrequency> getRepository() {
-		return menuFrequencyMapper;
-	}
+    @Override
+    public BaseMapper<MenuFrequency> getRepository() {
+        return menuFrequencyMapper;
+    }
 
-	@Autowired
-	private MenuFrequencyMapper menuFrequencyMapper;
+    @Autowired
+    private MenuFrequencyMapper menuFrequencyMapper;
 
-	@Autowired
-	private MenuFrequencyConvert menuFrequencyConvert;
+    @Autowired
+    private MenuFrequencyConvert menuFrequencyConvert;
 
-	/**
-	 * @desc : 保存用户功能频率表
-	 * @author : 周兴
-	 * @date : 2024/3/28 9:39
-	 */
-	@Transactional(
-			rollbackFor = {Exception.class}
-	)
-	public ResponseResultVO<?> save(MenuFrequencyVO menuFrequencyVO) {
-		MenuFrequency  menuFrequency = menuFrequencyConvert.convertToPo(menuFrequencyVO);
-		menuFrequency.setQty(1);
-		// 保存用户功能频率表
-		menuFrequencyMapper.save(menuFrequency);
-		return ResponseResultUtil.success();
-	}
+    /**
+     * @desc : 保存用户功能频率表
+     * @author : 周兴
+     * @date : 2024/3/28 9:39
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public ResponseResultVO<?> save(MenuFrequencyVO menuFrequencyVO) {
+        MenuFrequency menuFrequency = menuFrequencyConvert.convertToPo(menuFrequencyVO);
+        // 先查出数量
+        MenuFrequencyResponse mf = menuFrequencyMapper.selectMenuById(menuFrequency);
+        if (mf == null) {
+            menuFrequency.setQty(1);
+        }else{
+            menuFrequency.setQty(mf.getQty() + 1);
+        }
+        // 保存用户功能频率表
+        menuFrequencyMapper.save(menuFrequency);
+        return ResponseResultUtil.success();
+    }
 
 }