成绩提交后台sever

src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/CmptScoreFieldValue.java

+package com.dlbridge.jadp.plugins.cmpt.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 对自定义字段进行设置值
+ */
+@Getter
+@Setter
+@ToString
+public class CmptScoreFieldValue {
+    @ApiModelProperty(value = "赛事规则值的自增长ID")
+    private  int id;
+    @ApiModelProperty(value = "赛事规则值的字段ID")
+    private  int scoreFieldId;
+    @ApiModelProperty(value = "赛事规则值的字段名字，冗余值")
+    private  String scoreFieldName;
+    @ApiModelProperty(value = "赛事规则值的字段的存储值")
+    private  String scoreFieldValue;
+    @ApiModelProperty(value = "赛事规则值的字段对应的赛事ID")
+    private  int cmptId;
+}

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

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptSettingMapper">
+<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreFieldMapper">
 
     <select id="getCmptScoreFieldsByCmptId" resultType="CmptScoreField">
        select id,cmpt_id as cmptId,field_name as fieldName,field_type as fieldType,field_index as fieldIndex from gk_cmpt_score_field  where cmpt_id=#{cmptId} order by index

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

+package com.dlbridge.jadp.plugins.cmpt.dao.mapper;
+
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreFieldValue;
+
+import java.util.List;
+
+/**
+ * 获取赛事成绩收集信息字段的值的mapper
+ */
+public interface CmptScoreFieldValueMapper {
+
+    /**
+     * 根据赛事Id获取成绩收集信息字段的值
+     * @param cmptId
+     * @return
+     */
+    public List<CmptScoreFieldValue> getCmptScoreFieldValueByCmptId(int cmptId);
+
+    /**
+     * 对赛事成绩收集信息进行存储
+     * @param cmptScoreFieldValue
+     */
+    public void  save(CmptScoreFieldValue cmptScoreFieldValue);
+
+    /**
+     * 对赛事成绩收集信息进行更新
+     * @param cmptScoreFieldValue
+     */
+    public  void update(CmptScoreFieldValue cmptScoreFieldValue);
+
+}

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreFieldValueMapper">
+
+    <select id="getCmptScoreFieldValuesByCmptId" resultType="CmptScoreFieldValue">
+       select id,scoreFieldId,scoreFieldName,scoreFieldValue,cmptId from gk_cmpt_score_field_value  where cmptId=#{cmptId} order by id
+    </select>
+
+    <insert id="insert">
+       INNER JOIN gk_cmpt_score_field_value(scoreFieldId,scoreFieldName,scoreFieldValue,cmptId) VALUES(#scoreFieldId,#scoreFieldName,#scoreFieldValue,#cmptId)
+    </insert>
+
+    <update id="update">
+       UPDATE gk_cmpt_score_field_value set cmptId=#{cmptId},scoreFieldName=#{scoreFieldName},scoreFieldValue=#{scoreFieldValue} where scoreFieldId=#{scoreFieldId}
+    </update>
+
+</mapper>
\ No newline at end of file

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

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptSettingMapper">
+<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreFieldValueMapper">
 
     <select id="getCmptScoreRuleByCmptId" resultType="CmptScoreRule">
         select id,index,cmpt_id as cmptId,start_time as startTime,end_time as endTime from gk_cmpt_score_rule where cmpt_id=#{cmptId} order by index

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

@@ -4,6 +4,8 @@ import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreField;
 import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRule;
 import com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreFieldMapper;
 import com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreRuleMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -11,6 +13,8 @@ import java.util.List;
 /**
  * 成绩收集字段的service
  */
+@Service
+@Transactional
 public class CmptScoreFieldService {
     @Resource
     CmptScoreFieldMapper cmptScoreFieldMapper;

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

+package com.dlbridge.jadp.plugins.cmpt.service;
+
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreField;
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreFieldValue;
+import com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreFieldValueMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 成绩收集字段值的service
+ */
+@Service
+@Transactional
+public class CmptScoreFieldValueService {
+    @Resource
+    CmptScoreFieldValueMapper cmptScoreFieldValueMapper;
+    /**
+     * 根据赛事成绩收集Id，判断是更新成绩收集字段还是插入成绩收集字段
+     * @param cmptScoreFieldValues
+     * @return
+     */
+    public   int saveOrUpdate(List<CmptScoreFieldValue> cmptScoreFieldValues){
+        for(CmptScoreFieldValue cmptScoreFieldValue:cmptScoreFieldValues){
+            if(cmptScoreFieldValue.getId()==0){
+                cmptScoreFieldValueMapper.save(cmptScoreFieldValue);
+            }else{
+                cmptScoreFieldValueMapper.update(cmptScoreFieldValue);
+            }
+        }
+        return 1;
+    }
+
+    /**
+     * 根据赛事Id获取赛事的规则列表
+     * @param cmptId
+     * @return
+     */
+    public List<CmptScoreFieldValue> getCmptScoreFieldValueByCmptId(int cmptId){
+        List<CmptScoreFieldValue> cmptScoreFieldValueList=null;
+        cmptScoreFieldValueList=cmptScoreFieldValueMapper.getCmptScoreFieldValueByCmptId(cmptId);
+        return cmptScoreFieldValueList;
+    }
+
+}

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

@@ -2,12 +2,15 @@ package com.dlbridge.jadp.plugins.cmpt.service;
 
 import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRule;
 import com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreRuleMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 
-
+@Service
+@Transactional
 public class CmptScoreRuleService {
 
     @Resource

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

@@ -5,6 +5,8 @@ import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRule;
 import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreFieldService;
 import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreRuleService;
 import com.neusoft.www.utils.web.Result;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -12,6 +14,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
 import java.util.List;
 
+@Controller
+@RequestMapping(value = "/gk/cmptScoreField/")
+@Log4j2
 public class CmptScoreFieldController {
 
     @Resource
@@ -21,9 +26,9 @@ public class CmptScoreFieldController {
      * @param cmptScoreFields
      * @return
      */
-    @RequestMapping("saveCmptScoreRule")
+    @RequestMapping("saveCmptScoreField")
     @ResponseBody
-    private Result updateCmptScoreRule(@RequestBody List<CmptScoreField> cmptScoreFields){
+    private Result saveCmptScoreField(@RequestBody List<CmptScoreField> cmptScoreFields){
         cmptScoreFieldService.saveOrUpdate(cmptScoreFields);
         return Result.success().setContent(cmptScoreFields);
     }
@@ -34,6 +39,7 @@ public class CmptScoreFieldController {
      * @return
      */
     @ResponseBody
+    @RequestMapping("getCmptScoreFieldByCmptId")
     private Result getCmptScoreFieldByCmptId(int cmptId){
         List<CmptScoreField> cmptScoreField=cmptScoreFieldService.getCmptScoreFieldByCmptId(cmptId);
         return Result.success().setContent(cmptScoreField);

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

+package com.dlbridge.jadp.plugins.cmpt.web;
+
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreField;
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreFieldValue;
+import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreFieldService;
+import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreFieldValueService;
+import com.neusoft.www.utils.web.Result;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Controller
+@RequestMapping(value = "/gk/cmptScoreFieldValue/")
+@Log4j2
+public class CmptScoreFieldValueController {
+
+    @Resource
+    CmptScoreFieldValueService cmptScoreFieleValueService;
+    /**
+     *  更新赛事规则信息的值
+     * @param cmptScoreFieldValues
+     * @return
+     */
+    @RequestMapping("saveCmptScoreFieldValue")
+    @ResponseBody
+    private Result saveCmptScoreFieldValue(@RequestBody List<CmptScoreFieldValue> cmptScoreFieldValues){
+        cmptScoreFieleValueService.saveOrUpdate(cmptScoreFieldValues);
+        return Result.success().setContent(cmptScoreFieldValues);
+    }
+
+    /**
+     * 根据赛事Id获取赛事规则信息
+     * @param cmptId
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("getCmptScoreFieldValueByCmptId")
+    private Result getCmptScoreFieldValueByCmptId(int cmptId){
+        List<CmptScoreFieldValue> cmptScoreFieldValue=cmptScoreFieleValueService.getCmptScoreFieldValueByCmptId(cmptId);
+        return Result.success().setContent(cmptScoreFieldValue);
+    }
+
+}

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

@@ -14,7 +14,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Controller
-@RequestMapping(value = "/gk/cmpt/")
+@RequestMapping(value = "/gk/cmptScoreRule/")
 @Log4j2
 public class CmptScoreRuleController {
 
@@ -38,6 +38,7 @@ public class CmptScoreRuleController {
      * @param cmptId
      * @return
      */
+    @RequestMapping("getCmptScoreRuleByCmptId")
     @ResponseBody
     private Result getCmptScoreRuleByCmptId(int cmptId){
         List<CmptScoreRule> cmptScoreRules=cmptScoreRuleService.getCmptScoreRulesByCmptId(cmptId);