切换数据库 hg2018. --》 gjj80.

gjjapp-zhfwpt/gjjapp-zhfwpt-dao/src/main/resources/mappings/HomePage.xml

@@ -4,14 +4,14 @@
 	<select id="complaintRate" resultType="com.changda.gjjapp.zhfwpt.dto.homepage.ComplaintRateDto">
 	 select  
  to_char(
- trunc((select sum(count(*)) from M_TSXQ a,s_tslx b where a.tslxid = b.tslxid <if test="year != null and year !='' "> and to_char(a.tssj,'yyyy') = #{year} </if> and b.zlx = 1 group by grzh)/(select count(*) from hg2018.wxn_user) ,6)*100
+ trunc((select sum(count(*)) from M_TSXQ a,s_tslx b where a.tslxid = b.tslxid <if test="year != null and year !='' "> and to_char(a.tssj,'yyyy') = #{year} </if> and b.zlx = 1 group by grzh)/(select count(*) from gjj80..wxn_user) ,6)*100
  ,'999990.9999')   ||'%' tslzb,   
  to_char(
- 1-trunc((select sum(count(*)) from M_TSXQ a,s_tslx b where a.tslxid = b.tslxid <if test="year != null and year !='' "> and to_char(a.tssj,'yyyy') = #{year} </if> and b.zlx = 1 group by grzh)/(select count(*) from hg2018.wxn_user) ,6)*100
+ 1-trunc((select sum(count(*)) from M_TSXQ a,s_tslx b where a.tslxid = b.tslxid <if test="year != null and year !='' "> and to_char(a.tssj,'yyyy') = #{year} </if> and b.zlx = 1 group by grzh)/(select count(*) from gjj80..wxn_user) ,6)*100
  ,'999990.9999')   ||'%' ftslzb, 
-   trunc((select sum(count(*)) from M_TSXQ a,s_tslx b where a.tslxid = b.tslxid <if test="year != null and year !='' "> and to_char(a.tssj,'yyyy') = #{year} </if> and b.zlx = 1 group by grzh)/(select count(*) from hg2018.wxn_user) ,6)*100
+   trunc((select sum(count(*)) from M_TSXQ a,s_tslx b where a.tslxid = b.tslxid <if test="year != null and year !='' "> and to_char(a.tssj,'yyyy') = #{year} </if> and b.zlx = 1 group by grzh)/(select count(*) from gjj80..wxn_user) ,6)*100
   tslsl,
-  1-trunc((select sum(count(*)) from M_TSXQ a,s_tslx b where a.tslxid = b.tslxid <if test="year != null and year !='' "> and to_char(a.tssj,'yyyy') = #{year} </if> and b.zlx = 1 group by grzh)/(select count(*) from hg2018.wxn_user) ,6)*100     
+  1-trunc((select sum(count(*)) from M_TSXQ a,s_tslx b where a.tslxid = b.tslxid <if test="year != null and year !='' "> and to_char(a.tssj,'yyyy') = #{year} </if> and b.zlx = 1 group by grzh)/(select count(*) from gjj80..wxn_user) ,6)*100     
    ftslsl
 from dual  
 	</select>

gjjapp-zhfwpt/gjjapp-zhfwpt-dao/src/main/resources/mappings/QuDaoQuanXianGuanLi.xml

@@ -34,11 +34,11 @@
 
     <select id="duanXinZTSreach" resultType="map">
         select z.zjzxdm ZJZXDM,z.zjzxjc ZJZXJC,(case when z.dxzt = '1' then '开启' when z.dxzt = '0' then '关闭' end ) ZT
-        ,(case when z.dxzt = '1' then 'true' when z.dxzt = '0' then 'fales' end ) DXZT from hg2018.b_zjzx z
+        ,(case when z.dxzt = '1' then 'true' when z.dxzt = '0' then 'fales' end ) DXZT from gjj80..b_zjzx z
     </select>
 
     <update id="updateDuanXinZT">
-        update hg2018.b_zjzx z set z.dxzt = #{dxzt} where z.zjzxdm = #{zjzxdm}
+        update gjj80..b_zjzx z set z.dxzt = #{dxzt} where z.zjzxdm = #{zjzxdm}
     </update>
 
 	<select id="qdkzInfo" resultType="map">

gjjapp-zhfwpt/gjjapp-zhfwpt-dao/src/main/resources/mappings/QuDaoYeWuBanLiShu.xml

@@ -157,11 +157,11 @@
     
     <select id="qdywblgnldTj" resultType="com.changda.gjjapp.zhfwpt.dto.qdxxgl.QdfwnldTjDto">
     select 
-(select count(*) from m_ywblxq a,hg2018.wxn_user b where a.grzh = b.grzh and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &gt; 18 and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &lt;= 30 <if test="qssj != null and qssj !='' and zzsj != null and zzsj !=''">and to_char(a.blsj,'yyyy-mm-dd') between #{qssj} and  #{zzsj}</if>  and a.ywlx = #{ywbm}) age1830,
-(select count(*) from m_ywblxq a,hg2018.wxn_user b where a.grzh = b.grzh and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &gt; 30 and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &lt;= 40 <if test="qssj != null and qssj !='' and zzsj != null and zzsj !=''">and to_char(a.blsj,'yyyy-mm-dd') between #{qssj} and  #{zzsj}</if>  and a.ywlx = #{ywbm}) age3040,
-(select count(*) from m_ywblxq a,hg2018.wxn_user b where a.grzh = b.grzh and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &gt; 40 and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &lt;= 50 <if test="qssj != null and qssj !='' and zzsj != null and zzsj !=''">and to_char(a.blsj,'yyyy-mm-dd') between #{qssj} and  #{zzsj}</if>  and a.ywlx = #{ywbm}) age4050,
-(select count(*) from m_ywblxq a,hg2018.wxn_user b where a.grzh = b.grzh and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &gt; 50 and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &lt;= 65 <if test="qssj != null and qssj !='' and zzsj != null and zzsj !=''">and to_char(a.blsj,'yyyy-mm-dd') between #{qssj} and  #{zzsj}</if>  and a.ywlx = #{ywbm}) age5065,
-(select count(*) from m_ywblxq a,hg2018.wxn_user b where a.grzh = b.grzh and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &gt; 65 <if test="qssj != null and qssj !='' and zzsj != null and zzsj !=''"> and to_char(a.blsj,'yyyy-mm-dd')  between #{qssj} and  #{zzsj}</if>  and a.ywlx = #{ywbm}) age65
+(select count(*) from m_ywblxq a,gjj80.wxn_user b where a.grzh = b.grzh and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &gt; 18 and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &lt;= 30 <if test="qssj != null and qssj !='' and zzsj != null and zzsj !=''">and to_char(a.blsj,'yyyy-mm-dd') between #{qssj} and  #{zzsj}</if>  and a.ywlx = #{ywbm}) age1830,
+(select count(*) from m_ywblxq a,gjj80.wxn_user b where a.grzh = b.grzh and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &gt; 30 and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &lt;= 40 <if test="qssj != null and qssj !='' and zzsj != null and zzsj !=''">and to_char(a.blsj,'yyyy-mm-dd') between #{qssj} and  #{zzsj}</if>  and a.ywlx = #{ywbm}) age3040,
+(select count(*) from m_ywblxq a,gjj80.wxn_user b where a.grzh = b.grzh and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &gt; 40 and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &lt;= 50 <if test="qssj != null and qssj !='' and zzsj != null and zzsj !=''">and to_char(a.blsj,'yyyy-mm-dd') between #{qssj} and  #{zzsj}</if>  and a.ywlx = #{ywbm}) age4050,
+(select count(*) from m_ywblxq a,gjj80.wxn_user b where a.grzh = b.grzh and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &gt; 50 and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &lt;= 65 <if test="qssj != null and qssj !='' and zzsj != null and zzsj !=''">and to_char(a.blsj,'yyyy-mm-dd') between #{qssj} and  #{zzsj}</if>  and a.ywlx = #{ywbm}) age5065,
+(select count(*) from m_ywblxq a,gjj80.wxn_user b where a.grzh = b.grzh and to_char(sysdate,'yyyy') - substr(b.csny,1,4) &gt; 65 <if test="qssj != null and qssj !='' and zzsj != null and zzsj !=''"> and to_char(a.blsj,'yyyy-mm-dd')  between #{qssj} and  #{zzsj}</if>  and a.ywlx = #{ywbm}) age65
 from dual
     </select>
     

gjjapp-zhfwpt/gjjapp-zhfwpt-dao/src/main/resources/mappings/WJDC.xml

@@ -295,7 +295,7 @@
 	</select>
 	
 	<select id="selectuserpd" parameterType="String" resultType="Integer">
-		select count(*) M_COUNT from hg2020.wxn_user where xingming=#{yhxm}
+		select count(*) M_COUNT from gjj80.wxn_user where xingming=#{yhxm}
 	</select>
 </mapper>
 	
\ No newline at end of file

gjjapp-zhfwpt/gjjapp-zhfwpt-dao/src/main/resources/mappings/YongHuXinXiGuanLi.xml

@@ -2,15 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "mybatis-3-mapper.dtd" >
 <mapper namespace="com.changda.gjjapp.zhfwpt.dao.yhxxgl.YHXXGLDao">
     <update id="updatePwd">
-        update hg2018.wxn_user set hg2018.wxn_user.pswd = '888888'
+        update gjj80..wxn_user set gjj80..wxn_user.pswd = '888888'
         where 1=1
-        <if test="zjhm != null and zjhm !=''">and hg2018.wxn_user.zjhm =#{zjhm}</if>
-        <if test="grzh != null and grzh !=''">and hg2018.wxn_user.grzh = #{grzh}</if>
+        <if test="zjhm != null and zjhm !=''">and gjj80..wxn_user.zjhm =#{zjhm}</if>
+        <if test="grzh != null and grzh !=''">and gjj80..wxn_user.grzh = #{grzh}</if>
     </update>
 
     <select id="yongHuXinXiSearch" resultType="com.changda.gjjapp.db.entity.WXN_USER">
 		select  a.qdmc zcqdmc,b.qdmc zhdlqdmc,w.xingming,w.zjhm,w.pswd,w.sjhm,w.zhucerq,w.denglurq,w.grzh,w.zcqdid,w.zhdlqdid,w.xingbie,w.xmqp,w.csny,w.iszx,w.zxbz 
-        from hg2018.wxn_user w inner join s_qdzd a on w.zcqdid = a.qdid inner join s_qdzd b on w.zhdlqdid = b.qdid and w.grzh is not null and (INSTR(w.ZJHM || ',' || w.XINGMING || ',' || w.GRZH, #{data}) > 0 OR #{data} IS NULL)
+        from gjj80..wxn_user w inner join s_qdzd a on w.zcqdid = a.qdid inner join s_qdzd b on w.zhdlqdid = b.qdid and w.grzh is not null and (INSTR(w.ZJHM || ',' || w.XINGMING || ',' || w.GRZH, #{data}) > 0 OR #{data} IS NULL)
         <if test="yhlb != null and yhlb !=''">and iszx = #{yhlb}</if>
         <choose>
             <when test="zckssj != null and zckssj !='' and zcjssj != null and zcjssj !=''">
@@ -31,16 +31,16 @@
     </select>
     
     <update id="userInfoUpdate">
-    	update hg2018.wxn_user a set a.grzh = a.grzh <if test="xingbie != null and xingbie !=''">,a.xingbie = #{xingbie}</if> <if test="xmqp != null and xmqp !=''">,a.xmqp =#{xmqp}</if> <if test="csny != null and csny !=''">,a.csny = #{csny}</if>   
+    	update gjj80..wxn_user a set a.grzh = a.grzh <if test="xingbie != null and xingbie !=''">,a.xingbie = #{xingbie}</if> <if test="xmqp != null and xmqp !=''">,a.xmqp =#{xmqp}</if> <if test="csny != null and csny !=''">,a.csny = #{csny}</if>   
     	where a.grzh = #{grzh}
     </update>
     
     <update id="iszx">
-    	update hg2018.wxn_user a set a.iszx = #{iszx},a.zxbz=#{zxbz} where a.grzh = #{grzh}
+    	update gjj80..wxn_user a set a.iszx = #{iszx},a.zxbz=#{zxbz} where a.grzh = #{grzh}
     </update>
     
     <select id="zxzt" resultType="string">
-    	select iszx from hg2018.wxn_user where grzh = #{grzh}
+    	select iszx from gjj80..wxn_user where grzh = #{grzh}
     </select>
     
     <insert id="userLoginRecording">

gjjapp-zhfwpt/gjjapp-zhfwpt-service/src/main/java/com/changda/gjjapp/zhfwpt/service/impl/qdywquanxiankz/QuDaoQuanXianKZServiceImp.java

@@ -437,20 +437,42 @@ public class QuDaoQuanXianKZServiceImp implements QuDaoQuanXianKongZhiService {
 	public int qdztkzInterface(String ywbm,String qdid) {
 		M_YWZTKZ_2 mYwztkz_2  = quDaoQuanXianGuanLiDao.qdztkzInterface(ywbm);
 		String tstzr = mYwztkz_2.getTstzr();
-		//特殊时间停止
-		if (tstzr != null ) {
+		// 特殊时间停止
+		if (tstzr != null) {
 			String[] tstzrs = tstzr.split(",");
 			for (int i = 0; i < tstzrs.length; i++) {
 				String tzr = tstzrs[i];
+				String[] tstzsjs = tzr.split("-");
+				String kssj = tstzsjs[0];// 开始拒绝时间
+				String jssj = tstzsjs[0].substring(0, 2) + "2359";// 结束拒绝时间
+				if (tstzsjs.length > 1) {
+					jssj = tstzsjs[1];
+				}
+				if (kssj.length() == 6 && kssj.length() == 6) {
+					boolean kssj_f = false;
+					if (kssj.matches("^[0-3][0-9][0-2][0-9][0-5][0-9]$")) {
+						kssj_f = true;
+					}
+					boolean jssj_f = false;
+					if (jssj.matches("^[0-3][0-9][0-2][0-9][0-5][0-9]$")) {
+						jssj_f = true;
+					}
+					if (kssj_f && jssj_f) {
 						Date dt = new Date();
-					SimpleDateFormat sdf = new SimpleDateFormat("dd");
-					String nowday = sdf.format(dt);
-					if (tzr.equals(nowday)) {
+						SimpleDateFormat sdf = new SimpleDateFormat("ddHHmm");
+						String nowdayhm = sdf.format(dt);
+						int nowdayhm_i = Integer.parseInt(nowdayhm);
+						int kssj_i = Integer.parseInt(kssj);
+						int jssj_i = Integer.parseInt(jssj);
+						if (nowdayhm_i >= kssj_i && nowdayhm_i <= jssj_i) {
 							return 0;
 						}
 					}
 				}
 
+			}
+		}
+		
 		String temp_str = "";
 		Date dt = new Date();
 		// 最后的aa表示“上午”或“下午” HH表示24小时制 如果换成hh表示12小时制

gjjapp-zhfwpt/gjjapp-zhfwpt-service/src/main/java/com/changda/gjjapp/zhfwpt/service/impl/yhxxgl/YHXXGLServiceImp.java

@@ -24,7 +24,7 @@ public class YHXXGLServiceImp implements YHXXGLService {
     @Autowired
     private YHXXGLDao YHXXGLDao;
 
-    private String dbServer = "hg2018.";
+    private String dbServer = "gjj80.";
     //private String dbServer = "gjj80";
 
     //用户密码重置