Browse Source

收文公号

大数据与最优化研究所 1 năm trước cách đây
mục cha
commit
16891fa94a

+ 2 - 5
src/main/java/com/xjrsoft/module/ledger/controller/LedgerExportController.java

@@ -34,10 +34,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @title: 台账导出
@@ -174,7 +171,7 @@ public class LedgerExportController {
 
         for (Object obj : res.getList()) {
             List<Object> data = ListUtils.newArrayList();
-
+            //Map<String, Object> map = (LinkedHashMap)obj;
             Entity rowValue = Convert.convert(Entity.class, obj);
 
             for (List<String> head : headlist){

+ 3 - 1
src/main/resources/mapper/oa/OfficialDocumentReceivedMapper.xml

@@ -4,7 +4,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.oa.mapper.OfficialDocumentReceivedMapper">
     <select id="getMaxReceivedNumber" resultType="java.lang.Integer">
-        SELECT IFNULL(MAX(SUBSTR(received_number,6,3)), 0) + 1 FROM official_document_received WHERE YEAR(received_number) = YEAR(NOW())
+        SELECT IFNULL(MAX(SUBSTR(received_number, 6, 3)), 0) + 1
+        FROM official_document_received
+        WHERE YEAR(received_date) = YEAR(NOW())
     </select>
 
 </mapper>