Merge remote-tracking branch 'origin/master' into master

ruoyi-quartz/pom.xml

@@ -34,6 +34,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
 
     </dependencies>
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/JcglTask.java

+package com.ruoyi.quartz.task;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.Jcglry;
+import com.ruoyi.system.domain.Yxry;
+import com.ruoyi.system.mapper.JcglryMapper;
+import com.ruoyi.system.mapper.YxryMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 定时任务调度
+ * 
+ * @author ruoyi
+ */
+@Component("jcglTask")
+public class JcglTask
+{
+
+    @Autowired
+    private JcglryMapper jcglryMapper;
+    @Autowired
+    private YxryMapper yxryMapper;
+    public void updateAddress()
+    {
+        System.out.println("定时执行同步隔离人员");
+        List<Jcglry> list = jcglryMapper.selectAllJcglry();
+        List<Jcglry> jcglries = new ArrayList<>();
+        for (Jcglry jcglry : list) {
+            List<Yxry> yxries = yxryMapper.selectYxryByCard(jcglry.getCardNo());
+            if (!yxries.isEmpty()){
+                jcglry.setStreet(yxries.get(0).getStreet());
+                jcglry.setCommittee(yxries.get(0).getCommittee());
+                jcglry.setCommunity(yxries.get(0).getCommunity());
+                jcglry.setBuilding(yxries.get(0).getBuilding());
+                jcglry.setUnit(yxries.get(0).getUnit());
+                jcglry.setHouse(yxries.get(0).getHouse());
+                jcglries.add(jcglry);
+            }
+        }
+        if (!jcglries.isEmpty()){
+            jcglryMapper.updateBatch(jcglries);
+        }
+
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/JcglryMapper.java

@@ -66,4 +66,7 @@ public interface JcglryMapper
 
     int updateBatchYxry(@Param("list")List<Jcglry> list);
 
+    public List<Jcglry> selectAllJcglry();
+
+    int updateBatch(@Param("list")List<Jcglry> list);
 }

ruoyi-system/src/main/resources/mapper/system/GldryMapper.xml

@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null  and phone != ''"> and a.phone like concat('%', #{phone}, '%')</if>
             <if test="area != null  and area != ''"> and a.area = #{area}</if>
             <if test="street != null  and street != ''"> and a.street = #{street}</if>
-            <if test="community != null  and community != ''"> and a.community like concat('%', #{community}, '%')</if>
+            <if test="community != null  and community != ''"> and a.community = #{community}</if>
             <if test="unit != null  and unit != ''"> and a.unit like concat('%', #{unit}, '%')</if>
             <if test="zrTime != null "> and a.zr_time = #{zrTime}</if>
             <if test="zcTime != null "> and a.zc_time = #{zcTime}</if>

ruoyi-system/src/main/resources/mapper/system/JcglryMapper.xml

@@ -76,6 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectAllJcglry" resultMap="JcglryResult">
+        <include refid="selectJcglryVo"/>
+        where del_flag = '0'
+    </select>
+
     <select id="selectYxryByCard" resultType="com.ruoyi.system.domain.Jcglry" parameterType="java.lang.String">
         <include refid="selectJcglryVo"/>
         where del_flag = '0' and card_no = #{cardNo}
@@ -232,4 +237,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <update id="updateBatch" parameterType="com.ruoyi.system.domain.Jcglry">
+        <foreach item="item" index="index" collection="list" separator=";">
+            update jcglry
+            <trim prefix="SET" suffixOverrides=",">
+                street = #{item.street},
+                committee = #{item.committee},
+                community = #{item.community},
+                unit = #{item.unit},
+                building = #{item.building},
+                house = #{item.house},
+            </trim>
+            where id = #{item.id}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file

ruoyi-ui/src/views/system/fcry/index.vue

@@ -599,28 +599,28 @@ export default {
       zcTimeOption: {
         disabledDate: time => {
           if (this.form.zcTime) {
-            return time.getTime() > new Date(this.form.zcTime).getTime()
+            return time.getTime() > new Date().getTime()
           }
         }
       },
       otherGldTimeOption: {
         disabledDate: time => {
           if (this.form.otherGldTime) {
-            return time.getTime() > new Date(this.form.otherGldTime).getTime()
+            return time.getTime() > new Date().getTime()
           }
         }
       },
       otherFcTimeOption: {
         disabledDate: time => {
           if (this.form.otherFcTime) {
-            return time.getTime() > new Date(this.form.otherFcTime).getTime()
+            return time.getTime() > new Date().getTime()
           }
         }
       },
       zrTimeOption: {
         disabledDate: time => {
           if (this.form.zrTime) {
-            return time.getTime() > new Date(this.form.zrTime).getTime()
+            return time.getTime() > new Date().getTime()
           }
         }
       },
@@ -1246,7 +1246,7 @@ export default {
     handleExport() {
       this.download('system/fcry/export', {
         ...this.queryParams
-      }, `fcry_${new Date().getTime()}.xlsx`)
+      }, `方舱人员数据.xlsx`)
     }
   }
 };

ruoyi-ui/src/views/system/fkqk/index.vue

@@ -487,7 +487,7 @@ export default {
         expireTimeOPtion: {
           disabledDate: time => {
             if (this.form.fkTime) {
-              return time.getTime() > new Date(this.form.fkTime).getTime()
+              return time.getTime() > new Date().getTime()
             }
           }
         },
@@ -496,7 +496,7 @@ export default {
         expireTimeOPtion: {
           disabledDate: time => {
             if (this.form.realTime) {
-              return time.getTime() > new Date(this.form.realTime).getTime()
+              return time.getTime() > new Date().getTime()
             }
           }
         },
@@ -505,7 +505,7 @@ export default {
         expireTimeOPtion: {
           disabledDate: time => {
             if (this.form.hsTime) {
-              return time.getTime() > new Date(this.form.hsTime).getTime()
+              return time.getTime() > new Date().getTime()
             }
           }
         },
@@ -514,7 +514,7 @@ export default {
         expireTimeOPtion: {
           disabledDate: time => {
             if (this.form.jfTime) {
-              return time.getTime() > new Date(this.form.jfTime).getTime()
+              return time.getTime() > new Date().getTime()
             }
           }
         },
@@ -1099,7 +1099,7 @@ export default {
     handleExport() {
       this.download('system/fkqk/export', {
         ...this.queryParams
-      }, `fkqk_${new Date().getTime()}.xlsx`)
+      }, `小区封控情况数据.xlsx`)
     }
   }
 };

ruoyi-ui/src/views/system/gldry/index.vue

@@ -543,22 +543,26 @@ export default {
     return {
       expireTimeOPtion: {
         disabledDate: time => {
-          if (this.form.zrTime) {
-            return time.getTime() > new Date(this.form.zrTime).getTime()
+          if(this.form.zcTime) {
+            return time.getTime() > new Date().getTime() || time.getTime() > new Date(this.form.zcTime).getTime()
+          } else {
+            return time.getTime() > new Date().getTime()
           }
         }
       },
       otherZrTimeOPtion: {
         disabledDate: time => {
           if (this.form.otherZrTime) {
-            return time.getTime() > new Date(this.form.otherZrTime).getTime()
+            return time.getTime() > new Date().getTime()
           }
         }
       },
       zcTimeOPtion: {
         disabledDate: time => {
-          if (this.form.zcTime) {
-            return time.getTime() > new Date(this.form.zcTime).getTime()
+          if (this.form.zrTime) {
+            return time.getTime() > new Date().getTime() || time.getTime() < new Date(this.form.zrTime).getTime()
+          } else {
+            return time.getTime() > new Date().getTime()
           }
         }
       },
@@ -1181,7 +1185,7 @@ export default {
     handleExport() {
       this.download('system/gldry/export', {
         ...this.queryParams
-      }, `gldry_${new Date().getTime()}.xlsx`)
+      }, `隔离点人员数据.xlsx`)
     }
   }
 };

ruoyi-ui/src/views/system/hscj/index.vue

@@ -1341,7 +1341,7 @@ export default {
     handleExport() {
       this.download('system/hscj/export', {
         ...this.queryParams
-      }, `hscj_${new Date().getTime()}.xlsx`)
+      }, `核算采集数据.xlsx`)
     }
   }
 };

ruoyi-ui/src/views/system/jcglry/index.vue

@@ -965,7 +965,7 @@ export default {
     handleExport() {
       this.download('system/jcglry/export', {
         ...this.queryParams
-      }, `jcglry_${new Date().getTime()}.xlsx`)
+      }, `解除隔离人员数据.xlsx`)
     }
   }
 }

ruoyi-ui/src/views/system/ycsb/index.vue

@@ -1092,7 +1092,7 @@ export default {
     handleExport() {
       this.download('system/ycsb/export', {
         ...this.queryParams
-      }, `ycsb_${new Date().getTime()}.xlsx`)
+      }, `抗原异常上报数据.xlsx`)
     }
   }
 };

ruoyi-ui/src/views/system/yxry/index.vue

@@ -1327,7 +1327,7 @@ export default {
     handleExport() {
       this.download('system/yxry/export', {
         ...this.queryParams
-      }, `yxry_${new Date().getTime()}.xlsx`)
+      }, `阳性人员数据.xlsx`)
     }
   }
 };