默认密码修改为‘Sx’+身份证后六位

gjjapp-zhfwpt/gjjapp-zhfwpt-dao/src/main/java/com/changda/gjjapp/zhfwpt/dao/wjdc/WJDCDao.java

@@ -148,7 +148,7 @@ public interface WJDCDao {
      * @param grzh     个人账号
      * @return
      */
-    int insertFK(@Param("wjid") String wjid, @Param("wtid") String wtid, @Param("daanid") String daanid, @Param("username") String username, @Param("grzh") String grzh, @Param("qdid") String qdid);
+    int insertFK(@Param("wjid") String wjid, @Param("wtid") String wtid, @Param("daanid") String daanid, @Param("username") String username, @Param("grzh") String grzh, @Param("qdid") String qdid,@Param("tpxx")String tpxx);
 
     /**
      * 查询问卷

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

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "mybatis-3-mapper.dtd" >
 <mapper namespace="com.changda.gjjapp.zhfwpt.dao.wjdc.WJDCDao">
 	<insert id="insertFK">
-		insert into m_wjdchf
-		values(sys_guid(),#{wjid},#{wtid},#{daanid},sysdate,#{username},#{grzh},#{qdid})
+		insert into m_wjdchf(WJDCFKID,WJID,WTID,DAANID,TPSJ,USERNAME,GRZH)
+		values(sys_guid(),#{wjid},#{wtid},#{daanid},sysdate,#{username},#{grzh})
 	</insert>
 
 	<select id="sreachWJXX" resultType="map">

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

@@ -2,7 +2,7 @@
 <!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 GJJ80.wxn_user set GJJ80.wxn_user.pswd = '888888'
+        update GJJ80.wxn_user set GJJ80.wxn_user.pswd = = CONCAT('Sx', right(GJJ80.wxn_user.zjhm, 6))
         where 1=1
         <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>

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

@@ -437,17 +437,39 @@ 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];
-					Date dt = new Date();
-					SimpleDateFormat sdf = new SimpleDateFormat("dd");
-					String nowday = sdf.format(dt);
-					if (tzr.equals(nowday)) {
-						return 0;
+				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("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;
+						}
 					}
+				}
+
 			}
 		}
 		

gjjapp-zhfwpt/gjjapp-zhfwpt-service/src/main/java/com/changda/gjjapp/zhfwpt/service/impl/wjdc/WJDCImp.java

@@ -262,8 +262,7 @@ public class WJDCImp implements WJDCService {
 			String wtid = map3.get("wtid").toString();
 			// 答案id
 			String daanid = map3.get("daanid").toString();
-
-			num = wJDCDao.insertFK(wjid, wtid, daanid, username, grzh, qdid);
+			num = wJDCDao.insertFK(wjid, wtid, daanid, username, grzh, qdid,null);
 		}
 		// 业务状态 待处理
 		String ywzt = "0";