MMF 2026-03-25 修改评分填报导出

qianhe-common/src/main/java/com/qianhe/common/utils/MtTimeUtil.java

+package com.qianhe.common.utils;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class MtTimeUtil {
+    private static final DateTimeFormatter DATA_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    /**
+     * LocalDateTime -> String
+     * @param localDateTime
+     * @return
+     */
+    public static String dateTimeFormat(LocalDateTime localDateTime){
+        return DATA_TIME_FORMATTER.format(localDateTime);
+    }
+}

qianhe-ydsj/src/main/java/com/qianhe/zqcz/pftb/controller/ZqczPftbController.java

@@ -57,15 +57,6 @@ public class ZqczPftbController extends BaseController {
      */
      */
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, ZqczPftbQuery zqczPftbQuery) {
     public void export(HttpServletResponse response, ZqczPftbQuery zqczPftbQuery) {
-        try {
-            Map<String, Object> resMap = zqczPftbService.list(zqczPftbQuery);
-            List<Map<String, Object>> dataList = (List<Map<String, Object>>) resMap.get("dataList");
-            MtExcelUtil utilT = new MtExcelUtil();
-            utilT.createExcel(response, dataList, "", "");
-        } catch (BusinessException e) {
-            log.warn("最强操作-评分导出失败：" + e.getMessage());
-        } catch (Exception e) {
-            log.error("最强操作-评分导出失败：" + e.getMessage());
-        }
+        zqczPftbService.export(response, zqczPftbQuery);
     }
     }
 }
 }

qianhe-ydsj/src/main/java/com/qianhe/zqcz/pftb/service/ZqczPftbService.java

@@ -4,6 +4,7 @@ import com.qianhe.zqcz.pftb.domain.ZqczPftb;
 import com.qianhe.zqcz.pftb.domain.ZqczPftbQuery;
 import com.qianhe.zqcz.pftb.domain.ZqczPftbQuery;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -22,4 +23,9 @@ public interface ZqczPftbService {
      * 根据基层任务ID删除
      * 根据基层任务ID删除
      */
      */
     int deleteByJcrwid(Long jcrwid);
     int deleteByJcrwid(Long jcrwid);
+
+    /**
+     * 导出
+     */
+    void export(HttpServletResponse response, ZqczPftbQuery zqczPftbQuery);
 }
 }

qianhe-ydsj/src/main/java/com/qianhe/zqcz/xmrylsjl/service/impl/ZqczXmRyLsjlServiceImpl.java

@@ -291,7 +291,7 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
         String dwmc = finalList.stream().map(ZqczRyxxVo::getDwmc).distinct().collect(Collectors.joining(","));
         String dwmc = finalList.stream().map(ZqczRyxxVo::getDwmc).distinct().collect(Collectors.joining(","));
         String rymc = finalList.stream().map(ZqczRyxxVo::getRymc).distinct().collect(Collectors.joining(","));
         String rymc = finalList.stream().map(ZqczRyxxVo::getRymc).distinct().collect(Collectors.joining(","));
 
 
-        ZqczXmRyLsjl xmRyLsjl = new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, bzhczXmglVo, rymc, dwmc);
+        ZqczXmRyLsjl xmRyLsjl = new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, bzhczXmglVo, dwmc, rymc);
         return xmRyLsjl;
         return xmRyLsjl;
     }
     }
 
 
@@ -337,19 +337,8 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
         String dwmc = finalList.stream().map(ZqczRyxxVo::getDwmc).distinct().collect(Collectors.joining(","));
         String dwmc = finalList.stream().map(ZqczRyxxVo::getDwmc).distinct().collect(Collectors.joining(","));
         String rymc = finalList.stream().map(ZqczRyxxVo::getRymc).distinct().collect(Collectors.joining(","));
         String rymc = finalList.stream().map(ZqczRyxxVo::getRymc).distinct().collect(Collectors.joining(","));
 
 
-        ZqczXmRyLsjl xmRyLsjl = ZqczXmRyLsjl.builder()
-                .jcrwid(jcrwid)
-                .jcdwid(jcdwid)
-                .xmmc(bzhczXmglVo.getXmmc())
-                .xmzy(bzhczXmglVo.getXmzy())
-                .xmlb(bzhczXmglVo.getXmlb())
-                .gzcj(bzhczXmglVo.getGzcj())
-                .rymc(rymc)
-                .dwmc(dwmc)
-                .create_by(SecurityUtils.getLoginUser().getUsername())
-                .update_by(SecurityUtils.getLoginUser().getUsername())
-                .create_time(new Date())
-                .build();
+
+        ZqczXmRyLsjl xmRyLsjl = new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, bzhczXmglVo, dwmc, rymc);
         return xmRyLsjl;
         return xmRyLsjl;
     }
     }
 
 
@@ -537,7 +526,7 @@ public class ZqczXmRyLsjlServiceImpl implements ZqczXmRyLsjlService {
             String rymc = rymcList.stream().distinct().collect(Collectors.joining(","));
             String rymc = rymcList.stream().distinct().collect(Collectors.joining(","));
 
 
 
 
-            ZqczXmRyLsjl spotCheckXmRyLsjl = new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, spotCheckTdyjXmgl, rymc, dwmc);
+            ZqczXmRyLsjl spotCheckXmRyLsjl = new ZqczXmRyLsjl(zsrwid, jcrwid, jcdwid, spotCheckTdyjXmgl, dwmc, rymc);
             dataList.add(spotCheckXmRyLsjl);
             dataList.add(spotCheckXmRyLsjl);
         }
         }
         return dataList;
         return dataList;

qianhe-ydsj/src/main/resources/mapper/zqcz/pftb/ZqczPftbMapper.xml

@@ -44,6 +44,7 @@
             <if test="zsrwid != null ">AND lsjl.zsrwid = #{zsrwid}</if>
             <if test="zsrwid != null ">AND lsjl.zsrwid = #{zsrwid}</if>
             <if test="jcrwid != null ">AND lsjl.jcrwid = #{jcrwid}</if>
             <if test="jcrwid != null ">AND lsjl.jcrwid = #{jcrwid}</if>
         </where>
         </where>
+        ORDER BY lsjl.xmlb
     </select>
     </select>
     <!--  添加|修改  -->
     <!--  添加|修改  -->
     <insert id="add" parameterType="com.qianhe.zqcz.pftb.domain.ZqczPftb">
     <insert id="add" parameterType="com.qianhe.zqcz.pftb.domain.ZqczPftb">