feats

db/.back_文明创办/文明创办-backup-2023323142334.pdma.json → db/.back_文明创办/文明创办-backup-2023330100554.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-3-13 11:26:57",
+  "updatedTime": "2023-3-27 19:12:07",
   "dbConns": [],
   "profile": {
     "default": {
@@ -493,7 +493,8 @@
         "refKey": "extProps",
         "hideInGraph": true
       }
-    ]
+    ],
+    "modelType": "modalGroup"
   },
   "entities": [
     {
@@ -3911,6 +3912,23 @@
           "refDict": "",
           "uiHint": "",
           "id": "7FF626A4-AF1C-4CF5-B356-D46DB6D534B3"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "复制来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "1F85BFC4-DBF4-4BA5-9BD8-DC9C2BFA1646"
         }
       ],
       "correlations": [],
@@ -4968,6 +4986,23 @@
           "refDict": "",
           "uiHint": "",
           "id": "1E651F5A-E5FA-4AB5-A67E-C2EF184FFD36"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "FF90BF79-2A75-4638-98AE-B17BFD53F8CA"
         }
       ],
       "correlations": [],
@@ -5454,6 +5489,23 @@
           "refDict": "",
           "uiHint": "",
           "id": "4D9B5070-3252-4714-86D7-34928A0C5552"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "id": "0279B08D-E12C-4409-8253-A5D7766A7133"
         }
       ],
       "correlations": [],
@@ -6443,6 +6495,23 @@
           "extProps": {},
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "A8365D64-DE0A-4F0E-9427-83DFF0ED66C6"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "id": "E2BA367C-D262-43FB-A729-D26D6453D20C"
         }
       ],
       "correlations": [],
@@ -7668,6 +7737,23 @@
           "refDict": "",
           "extProps": {},
           "id": "90218D19-7731-4AFE-8883-74944A66D6C8"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "id": "C0B26905-831F-4891-9B83-F84E4D111C44"
         }
       ],
       "correlations": [],

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-3-27 19:12:07",
+  "updatedTime": "2023-3-30 10:05:54",
   "dbConns": [],
   "profile": {
     "default": {

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.example</groupId>
     <artifactId>civilizedCity</artifactId>
-    <version>0.0.11</version>
+    <version>0.0.12</version>
     <name>civilizedCity</name>
     <description>civilizedCity</description>
     <properties>

src/main/java/com/example/civilizedcity/common/DateUtils.java

@@ -24,6 +24,11 @@ public class DateUtils {
         return dt.format(formatter);
     }
 
+    public static String yestoday() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return LocalDateTime.now().minusDays(1).format(formatter);
+    }
+
     public static String today() {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         return LocalDateTime.now().format(formatter);

src/main/java/com/example/civilizedcity/controller/TaIssueController.java

@@ -101,7 +101,7 @@ public class TaIssueController extends BaseController {
         } else if ("expired".equals(bizStatus)) {
             // 已逾期
             queryWrapper.ne("process_node", Constants.PROCESS_END);
-            queryWrapper.le("expire_date", DateUtils.today());
+            queryWrapper.le("expire_date", DateUtils.yestoday());
         } else if ("reject".equals(bizStatus)) {
             // 已打回
             queryWrapper.eq("process_node", Constants.PROCESS_APPLY_REJECT);

src/main/resources/mapper/TaIssueMapper.xml

@@ -73,7 +73,7 @@
             UUID_SHORT( ) AS id,
             IFNULL( SUM( IF ( t.process_node = '03', t.process_num, 0 ) ), 0 ) AS endNum,
             IFNULL( SUM( IF ( t.process_node LIKE '02%', t.process_num, 0 ) ), 0 ) AS assignedNum,
-            IFNULL( SUM( IF ( TO_DAYS(t.expire_date) < TO_DAYS(NOW()) AND t.process_node != '03', t.process_num, 0 ) ), 0 ) AS expireNum
+            IFNULL( SUM( IF ( TO_DAYS(t.expire_date) < TO_DAYS(DATE_SUB(NOW(), INTERVAL 1 DAY)) AND t.process_node != '03', t.process_num, 0 ) ), 0 ) AS expireNum
         FROM
             ta_issue t
         WHERE

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -44,7 +44,7 @@
         </if>
         <if test="isExpire != null and isExpire">
             AND t.process_node != '03'
-            AND TO_DAYS(t.expire_date) &lt; TO_DAYS(now())
+            AND TO_DAYS(t.expire_date) &lt; TO_DAYS(DATE_SUB(now(), INTERVAL 1 DAY))
         </if>
             AND t.`status` &gt; -1
         ORDER BY
@@ -68,7 +68,7 @@
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         select
-            SUM( IF ( TO_DAYS( now( ) ) > TO_DAYS( t.expire_date ) AND t.process_node != '03', 1, 0 ) ) AS delay_num,
+            SUM( IF (TO_DAYS(DATE_SUB(NOW(), INTERVAL 1 DAY)) > TO_DAYS( t.expire_date ) AND t.process_node != '03', 1, 0 ) ) AS delay_num,
             SUM( IF (t.process_node = '03', 1, 0 ) ) AS end_num,
             SUM( IF (t.process_node != '03', 1, 0 ) ) AS doing_num
         from ta_issue t