merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -752,7 +752,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         params.put("sfz", userVo.getIdCard());
         params.put("dh", userVo.getTelPhone());
         params.put("bmrq", DateUtils.timestampToDate(bmrq));
-        String dataTxt = params.get("zh") + params.get("bh") + params.get("year") + params.get("xm") + params.get("sfz") + params.get("dh") + params.get("bmrq");
+        params.put("dw", userVo.getCompanyName());
+        params.put("xl", userVo.getEduLevel());
+        params.put("xb", userVo.getSex()==1?"男":"女");
+        String dataTxt = params.get("zh") + params.get("bh") + params.get("year") + params.get("xm") + params.get("sfz") + params.get("dh") + params.get("dw") + params.get("xl") + params.get("xb") + params.get("bmrq");
         log.info("报名信息推送参数"+ dataTxt);
         String encrypted = dataSign(dataTxt, SEVEN_OFFICIALPUSH_TOKEN);
         params.put("SignMsg", encrypted);

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -67,6 +67,9 @@
         <result property="toOldResult" column="to_old_result"/>
         <result property="toOldTime" column="to_old_time"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="sex" column="sex"/>
+        <result property="eduLevel" column="edu_level"/>
+        <result property="companyName" column="company_name"/>
     </resultMap>
 
 
@@ -247,6 +250,9 @@
         u.realname,
         u.id_card,
         u.telphone,
+        u.sex,
+        u.edu_level,
+        u.company_name,
         cg.class_name,
         cg.official_name,
         cg.class_status,