bug修改

src/main/java/com/dlbridge/feign/GeexekScoreService.java

@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
+//import com.sun.tools.javac.sym.Profiles;
+
 /**
  * 废弃单独处理成绩工程
  */

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptMapper.xml

@@ -320,7 +320,8 @@
 
 
     <select id="getEnrollUsersByUserMapId" resultType="java.util.HashMap">
-        select a.callPhone mobileNum,a.gender,ifnull(a.IDNumber,'111111111111111111') idCardNo,a.userName name,b.timerRoadId roadId,a.registerId
+        select a.callPhone mobileNum,a.gender,ifnull(a.IDNumber,'111111111111111111') idCardNo,
+        a.userName name,b.timerRoadId roadId,a.registerId
         from raceenroll.competitionusermap a
             inner join raceenroll.competitionroadmap b on a.roadId=b.roadId
         where a.userMapId=#{userMapId}

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java

@@ -103,7 +103,7 @@ public class RemoteService {
 
         if (forEntity.getStatusCode() == HttpStatus.OK) {
             String resultString = forEntity.getBody();
-            log.info("resultString:" + resultString);
+            log.info("根据号码牌获取报名信息：" + resultString);
             JSONObject object = JSONObject.parseObject(resultString);
             log.info(object.toJSONString());
             if (object.isEmpty()) {
@@ -120,7 +120,7 @@ public class RemoteService {
                     info.setPhone(content.getString("phone"));
                     info.setRemark(content.getString("remark"));
                     info.setGender("0".equals(content.getString("gender")) ? "男":"女");
-                    //info.setIdentityNo(content.getString("identityNo"));
+                    info.setIdentityNo(content.getString("identityNo"));
                     return info;
                 } else {
                     return null;

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/TemplateService.java

@@ -49,7 +49,7 @@ public class TemplateService {
         // 获取geerunner库的userId
         Integer gk_userId = templateMapper.getGeerunnerUserId(userId);
 
-        if( gk_userId == null || gk_userId == -1 ) { // 如果获取不到组委会账户的ID，则需要创建一个组委会账户
+        if( gk_userId == null || gk_userId == -1 ) {  // 如果获取不到组委会账户的ID，则需要创建一个组委会账户
             Integer gtUserId = templateMapper.getGeeRunnerSysAdmin(userId); // 先判断是否有存在记录
             log.info("获取到的计时账户："+gtUserId);
             isNewGkUser = true;
@@ -59,6 +59,7 @@ public class TemplateService {
             pamp_user.put("id", gtUserId == null ? "" : gtUserId);
             if(gtUserId == null){ // 无记录
                 orgId = "1-3-"+ templateMapper.getGeerunnerSeqVal("ZDHW"); // TODO 不知道生成组织id的序列是哪一个？
+                pamp_user.put("org_id", orgId);
                 templateMapper.copyRaceRegisterInfoToGeerunnerSysAdmin(pamp_user);
                 log.info("无计时组委会账户："+gk_userId);
             }

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -37,7 +37,6 @@ import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 
@@ -49,8 +48,6 @@ import java.util.*;
 public class MicroApiController {
     private static final String SIGNING_CODE = "1";
 
-    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-
     @Resource
     private RestTemplate restTemplate;
 
@@ -1323,7 +1320,6 @@ public class MicroApiController {
         if(StringUtils.isNotBlank(markNo)){ // 未
             List<CmptScoreRuleScoreInfo> scores = cmptScoreRuleScoreInfoService.getScoreInfosBycmptIdAndMarkNoEnd(cmptId, markNo);
 
-
             if(scores.size() > 0){
                 return Result.fail().setMsg("已经有成绩数据，无法自选号码牌！");
             }
@@ -1355,6 +1351,7 @@ public class MicroApiController {
         EnrollInfo userInfo = null;
         if(StringUtils.isNotBlank(markNo)){
             userInfo = remoteService.getUserInfoByMarkNo(markNo, cmptId); // 获取原计时信息
+            log.info("userInfo:"+userInfo);
         }
         if(userInfo == null){ // 根据号码牌判断是否已经存储
             Map<String,String> param = remoteService.getEnrollUsersByUserMapId(userMapId);
@@ -1365,6 +1362,9 @@ public class MicroApiController {
             param.put("enrollId","-1");
             param.put("remark4",stock);
             param.put("remark5",markno);
+            param.put("idCardNo",userInfo.getIdentityNo());
+            param.put("name",userInfo.getUserName());
+            param.put("roadId",userInfo.getRoadId()+"");
             param.put("gender","男".equals(userInfo.getGender()) ? "0":"1");
             if(param.get("roadId") == null){
                 return Result.fail().setMsg("未找到赛事项目！");
@@ -1385,7 +1385,7 @@ public class MicroApiController {
             }
 
         }else{
-            Map<String,String> param = remoteService.getEnrollUsersByUserMapId(userMapId);
+            Map<String,String> param = new HashMap<String,String>();//remoteService.getEnrollUsersByUserMapId(userMapId);
 
             param.put("cmptId",cmptId+"");
 
@@ -1398,8 +1398,9 @@ public class MicroApiController {
             param.put("enrollId",userInfo.getEnrollId());
             param.put("remark4",stock);
             param.put("remark5",markno);
+            param.put("idCardNo",userInfo.getIdentityNo());
             String json = new Gson().toJson(param);
-            log.info("请求参数："+json);
+            log.info("同步请求参数："+json);
             ResponseEntity<String> responseEntity = restTemplate.getForEntity(timerURL+"/mergePersonEnroll.do?org-id=1-3&personEnroll={json}", String.class,json);
             log.info("计时1返回结果："+responseEntity.getBody());
             JSONObject jsonObject = JSONObject.parseObject(responseEntity.getBody());

src/main/resources/log4j.properties

 # Output pattern : date [thread] priority category - message   FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 
-log4j.rootLogger=WARN, Console, RollingFile
+log4j.rootLogger=info, Console, RollingFile
 #Console
 log4j.appender.Console=org.apache.log4j.ConsoleAppender
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
@@ -9,6 +9,7 @@ log4j.appender.RollingFile=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.RollingFile.File=./logs/gksite.log
 log4j.appender.RollingFile.layout=org.apache.log4j.PatternLayout
 log4j.appender.RollingFile.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
+log4j.logger.com.dlbridge=DEBUG
 log4j.logger.com.thinkgem.jeesite=DEBUG
 log4j.logger.com.dlbridge.jadp.config.shiro=debug
 log4j.logger.com.dlbridge.jadp.common.utils.JedisUtils=debug

src/main/webapp/WEB-INF/views/cmpt/contact.jsp

@@ -184,7 +184,7 @@
 
 </div>
 
-<script src="${ctxStatic}/js/contact.js"></script>
+<script src="${ctxStatic}/js/contact.js?v=121222"></script>
 </body>
 <script src="${ctxStatic}/js/qikoo-input.js"></script>
 </html>

src/main/webapp/WEB-INF/views/cmpt/score_review.jsp

@@ -136,7 +136,7 @@
             <div class="data-cloumn">
                 <span class="check-all"><input v-on:click="checkAll" :checked="checked?'true':'' " type="checkbox"></span>
                 <span>姓名</span>
-                <span>参赛号码</span>
+                <span  style="width: 160px" >参赛号码</span>
                 <span>上传时间</span>
                 <span>完成时间</span>
                 <span>里程(KM)</span>
@@ -152,7 +152,7 @@
                     <div class="score-info">
                         <span class="check"><input v-on:click.stop="" type="checkbox" :value="score.cmptScoreRuleScoreinfoId" :checked="checked?'true':'' "></span>
                         <span v-text="score.name"></span>
-                        <span v-text="score.markNo"></span>
+                        <span style="width: 160px" v-text="score.markNo"></span>
                         <span>{{score.updateTime | substr(10)}}</span>
                         <span>{{score.subsectionTime | substrDate(10)}}</span>
                         <span>{{Number(score.subsectionMileage/1000).toFixed(3)}}</span>

src/main/webapp/static/cmpt/score_review.css

@@ -132,12 +132,13 @@ input.score-input-bigger{
 
 .data-cloumn>span,.score-info>span{
     display: inline-block;
-    width: 117px;
+    width: 110px;
     height: 45px;
     line-height: 45px;
     font-size:16px;
     color:rgba(153,153,153,1);
 }
+
 .data-cloumn>span:last-child,.score-info>span:last-child{
     width: 62px;
     text-align: center;

src/main/webapp/static/js/contact.js

@@ -98,15 +98,15 @@ $(document).ready(function () {
                             async: false,
                             dataType: "json",
                             success: function (data) {
-                                if(data.code == 200){
+                                if(data.code == 1){
                                     param.acceptTime = Date.now();
                                     $.ajax({
                                         type: "POST",
                                         //正式环境
-                                        // url : "http://timerbackend.geexek.com/updateRescuePhone.do",
+                                        url : "http://timerbackend.geexek.com/updateRescuePhone.do",
 
                                         //测试环境
-                                        url: "http://testtimerbackend.geexek.cn/updateRescuePhone.do",
+                                        // url: "http://testtimerbackend.geexek.cn/updateRescuePhone.do",
                                         data: {cmptId: getCmptId(), markNo: markNo, rescuePhone: $('#contact-input').val()},
                                         async: false,
                                         dataType: "json",