From 65a38f7904884cc10027cd52f750426e0ffec129 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 20 Nov 2020 14:32:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/mt/api/CompeteScoreController.java | 12 ++ .../com/ccsens/mt/bean/dto/CompeteDto.java | 11 ++ .../java/com/ccsens/mt/bean/dto/ScoreDto.java | 23 ++- .../ccsens/mt/bean/po/CompeteStartOrder.java | 22 +++ .../mt/bean/po/CompeteStartOrderExample.java | 130 +++++++++++++ .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 38 ++++ .../com/ccsens/mt/service/CompeteService.java | 172 +++++++++++++++++- .../com/ccsens/mt/service/ExcelService.java | 6 +- .../ccsens/mt/service/ICompeteService.java | 1 + .../mapper_raw/CompeteStartOrderMapper.xml | 44 ++++- 10 files changed, 444 insertions(+), 15 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 34d9924c..81bb0ffa 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -33,6 +33,8 @@ public class CompeteScoreController { @Resource private ICompeteService competeService; + + @MustLogin @ApiOperation(value = "查询比赛项目上的参赛选手列表", notes = "") @RequestMapping(value = "/get/playerList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @@ -50,6 +52,14 @@ public class CompeteScoreController { competeService.submitOrderList(params.getParam()); return JsonResponse.newInstance().ok(); } + @MustLogin + @ApiOperation(value = "花样赛提交分数查询", notes = "Mr.王----裁判判分前和后都可以查询") + @RequestMapping(value = "/selSubmitOrderList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse selSubmitOrderList(@ApiParam @Validated @RequestBody QueryDto params){ + log.info("花样赛分数查询：{}",params); + CompeteVo.SelScropeVo selScropeVo= competeService.selSubmitOrderList(params.getParam()); + return JsonResponse.newInstance().ok(selScropeVo); + } @ApiOperation(value = "花样赛成绩查看", notes = "Mr.王 -----从花样赛成绩表里面查看出这个人得成绩") @RequestMapping(value = "/showResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @@ -115,4 +125,6 @@ public class CompeteScoreController { List speedPassList = competeService.speedPass(params.getParam()); return JsonResponse.newInstance().ok(speedPassList); } + + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index 2fd4c9b4..4c238d3c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -14,6 +14,7 @@ import java.util.List; */ @Data public class CompeteDto { + @Data @ApiModel public static class CompeteType{ @@ -379,5 +380,15 @@ public class CompeteDto { private Long projectId; } + @Data + @ApiModel + public static class SelScore{ + @NotNull + @ApiModelProperty("第几届信息的id") + private Long competeTimeId; + @NotNull + @ApiModelProperty("项目id") + private Long projectId; + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java index 1779f9e0..792354bd 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java @@ -104,6 +104,12 @@ public class ScoreDto { @ApiModelProperty("裁判id") private Long judgmentId; @NotNull + @ApiModelProperty("备注") + private String remark; + @NotNull + @ApiModelProperty("裁判是否选择了弃权还是啥的") + private Byte waiver; + @NotNull @ApiModelProperty("计分项目") private List fractionsList; @@ -124,7 +130,22 @@ public class ScoreDto { @ApiModelProperty("项目id") private Long projectId; } - + @Data + @ApiModel + public static class SelScrop{ + @NotNull + @ApiModelProperty("大赛id") + private Long competeTimeId; + @NotNull + @ApiModelProperty("项目Id") + private Long projectId; + @NotNull + @ApiModelProperty("场次id") + private Long siteOrderId; + @NotNull + @ApiModelProperty("裁判id") + private Long judgmentId; + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java index 9b6b8246..a6facb50 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java @@ -28,6 +28,10 @@ public class CompeteStartOrder implements Serializable { private Long endTime; + private String remark; + + private Byte waiver; + private static final long serialVersionUID = 1L; public Long getId() { @@ -126,6 +130,22 @@ public class CompeteStartOrder implements Serializable { this.endTime = endTime; } + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Byte getWaiver() { + return waiver; + } + + public void setWaiver(Byte waiver) { + this.waiver = waiver; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -144,6 +164,8 @@ public class CompeteStartOrder implements Serializable { sb.append(", taskId=").append(taskId); sb.append(", startTime=").append(startTime); sb.append(", endTime=").append(endTime); + sb.append(", remark=").append(remark); + sb.append(", waiver=").append(waiver); sb.append("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java index 7df6cbdc..a0ba3036 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java @@ -824,6 +824,136 @@ public class CompeteStartOrderExample { addCriterion("end_time not between", value1, value2, "endTime"); return (Criteria) this; } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andWaiverIsNull() { + addCriterion("waiver is null"); + return (Criteria) this; + } + + public Criteria andWaiverIsNotNull() { + addCriterion("waiver is not null"); + return (Criteria) this; + } + + public Criteria andWaiverEqualTo(Byte value) { + addCriterion("waiver =", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverNotEqualTo(Byte value) { + addCriterion("waiver <>", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverGreaterThan(Byte value) { + addCriterion("waiver >", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverGreaterThanOrEqualTo(Byte value) { + addCriterion("waiver >=", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverLessThan(Byte value) { + addCriterion("waiver <", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverLessThanOrEqualTo(Byte value) { + addCriterion("waiver <=", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverIn(List values) { + addCriterion("waiver in", values, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverNotIn(List values) { + addCriterion("waiver not in", values, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverBetween(Byte value1, Byte value2) { + addCriterion("waiver between", value1, value2, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverNotBetween(Byte value1, Byte value2) { + addCriterion("waiver not between", value1, value2, "waiver"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index d510f12f..0e2c9730 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java @@ -2,6 +2,7 @@ package com.ccsens.mt.bean.vo; import com.ccsens.mt.bean.po.CompetePlayer; import com.ccsens.mt.bean.po.CompeteTeam; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -494,6 +495,43 @@ public class CompeteVo { // @ApiModelProperty("排名") // public int order; } + + @Data + @ApiModel("裁判评分查询") + public static class SelScropeVo{ + @ApiModelProperty("项目id") + private Long id; + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("单位") + private Long companyId; + @ApiModelProperty("单位名") + private String companyName; + @ApiModelProperty("组别id") + private Long groupId; + + @ApiModelProperty("组别名称") + private String groupName; + + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("场地信息") + private Byte site; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("分数合集") + private List scoreList; + } + @Data + @ApiModel + public static class ScropList{ + @ApiModelProperty("code") + private String code; + @ApiModelProperty("分数") + private BigDecimal score; + + } + @Data @ApiModel("项目，开始时间和比赛状态") public static class CountScore{ diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 0e3d45df..bf6c530f 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -23,9 +23,7 @@ import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.BuiltinFormats; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellType; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFRow; @@ -46,6 +44,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; /** * @author 逗 @@ -54,6 +53,8 @@ import java.util.Map; @Service @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) public class CompeteService implements ICompeteService { + @Resource + private CompeteTeamMapper competeTeamMapper; @Resource private CompeteTimeDao competeTimeDao; @Resource @@ -94,7 +95,10 @@ public class CompeteService implements ICompeteService { private CompeteScoreDao competeScoreDao; @Resource private CompeteCountScoreMapper competeCountScoreMapper; - + @Resource + private CompetePlayerMapper competePlayerMapper; + @Resource + private CompeteJudgmentMapper competeJudgmentMapper; /** * 花样赛总成绩展示 * @param param @@ -1007,7 +1011,59 @@ public class CompeteService implements ICompeteService { } @Override public void submitOrderList(ScoreDto.InformationSubmitted param) { + CompeteJudgment competeJudgment = competeJudgmentMapper.selectByPrimaryKey(param.getJudgmentId()); + CompeteStartOrder competeStartOrder1 = competeStartOrderMapper.selectByPrimaryKey(param.getSiteOrderId()); + if(competeJudgment.getChiefJudgment()!=(byte)0){ + //不是主裁判 + //先判断主裁判提交了没 + Integer ti= new Integer(0);//0代表没提交 1代表提交了 + CompeteVarietyScoreExample competeVarietyScoreExample=new CompeteVarietyScoreExample(); + competeVarietyScoreExample.createCriteria().andSiteOrderIdEqualTo(param.getSiteOrderId()).andRecStatusEqualTo((byte) 0); + List competeVarietyScoresList = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample); + //下面就是想看看主裁判提交了没 + if(competeVarietyScoresList.size()>0){ + for (CompeteVarietyScore competeVarietyScore:competeVarietyScoresList){ + CompeteJudgment competeJudgment1 = competeJudgmentMapper.selectByPrimaryKey(competeVarietyScore.getJudgmentId()); + if(competeJudgment1.getChiefJudgment()==(byte)0){ + ti=1; + break; + } + } + } + if(ti>0){ + //主裁判提交了， + if(competeStartOrder1.getWaiver()!=(byte)0){ + for(int j=0;j competeVarietyScoresList = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample); + for (CompeteVarietyScore competeVarietyScore : competeVarietyScoresList) { + competeVarietyScore.setScore(new BigDecimal(0)); + competeVarietyScoreMapper.updateByPrimaryKeySelective(competeVarietyScore); + } + } + } param.getFractionsList().forEach(mes->{ + if(StringUtils.isNotBlank(param.getRemark())){ + CompeteStartOrder competeStartOrder=new CompeteStartOrder(); + competeStartOrder.setId(param.getSiteOrderId()); + competeStartOrder.setRemark(param.getRemark()); + competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder); + } + if(param.getWaiver()!=((byte)0)){ + CompeteStartOrder competeStartOrder=new CompeteStartOrder(); + competeStartOrder.setId(param.getSiteOrderId()); + competeStartOrder.setWaiver(param.getWaiver()); + competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder); + } CompeteVarietyScore competeVarietyScore=new CompeteVarietyScore(); competeVarietyScore.setId(snowflake.nextId()); competeVarietyScore.setCompeteTimeId(param.getCompeteTimeId()); @@ -1380,4 +1436,112 @@ public class CompeteService implements ICompeteService { return countScoreCurrentSiteList; } + @Override + public CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param) { + CompeteVo.SelScropeVo selScropeVo=new CompeteVo.SelScropeVo(); + + //场次表里面的东西 + CompeteStartOrder competeStartOrder1 = competeStartOrderMapper.selectByPrimaryKey(param.getSiteOrderId()); + //项目表里面的东西 + CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(competeStartOrder1.getProjectId()); + //项目名称 + if(StringUtils.isNotBlank(competeProject.getName())){ + selScropeVo.setProjectName(competeProject.getName()); + } + //备注 + if(StringUtils.isNotBlank(competeStartOrder1.getRemark())){ + selScropeVo.setRemark(competeStartOrder1.getRemark()); + } + //场地信息 + selScropeVo.setSite(competeStartOrder1.getSite()); + + if(competeProject.getTeam()==((byte) 0)){ + //个人 + selScropeVo.setId(competeProject.getId()); + //个人信息 + CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(competeStartOrder1.getPlayerId()); + CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); + //组别信息 + selScropeVo.setGroupId(competeGroup.getId()); + selScropeVo.setGroupName(competeGroup.getGroupName()); + //单位信息 + CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); + if(StringUtils.isNotBlank(competePlayer.getName())){ + //人名 + selScropeVo.setName(competePlayer.getName()); + } + if(StringUtils.isNotBlank(competeCompany.getName())){ + //单位名称 + selScropeVo.setCompanyName(competeCompany.getName()); + selScropeVo.setCompanyId(competeCompany.getId()); + } + + /* + * { + "param": + { + "competeTimeId":1, + "judgmentId":1, + "projectId":2011, + "siteOrderId":1329256152512466944 + } +} + * */ + }else { + CompeteTeam competeTeam = competeTeamMapper.selectByPrimaryKey(competeStartOrder1.getPlayerId()); + if(competeProject.getJoinRule()==(byte)1){ + selScropeVo.setGroupName("不限组别"); + + }else { + + CompeteGroupExample competeGroupExample=new CompeteGroupExample(); + competeGroupExample.createCriteria().andSexEqualTo(competeTeam.getGenderGroup()).andGroupRemarkEqualTo(competeTeam.getGroupRemark()); + List competeGroups = competeGroupMapper.selectByExample(competeGroupExample); + if(competeGroups.size()>0){ + //设置完组别了 + selScropeVo.setGroupName(competeGroups.get(0).getGroupName()); + selScropeVo.setGroupId(competeGroups.get(0).getId()); + } + } + //设置公司名称 + selScropeVo.setCompanyName(competeCompanyMapper.selectByPrimaryKey(competeTeam.getCompanyId()).getName()); + selScropeVo.setCompanyId(competeTeam.getCompanyId()); + + CompeteTeamMemberExample competeTeamMemberExample=new CompeteTeamMemberExample(); + competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo( competeStartOrder1.getPlayerId()).andRecStatusEqualTo((byte) 0); + List competeTeamMembers = competeTeamMemberMapper.selectByExample(competeTeamMemberExample); + StringBuilder names=new StringBuilder(""); + //姓名也完成了 + competeTeamMembers.forEach(mes->{ + names.append(competePlayerMapper.selectByPrimaryKey(mes.getPlayerId()).getName()+"、"); + }); + String name= String.valueOf(names.substring(0,names.length()-2)); + selScropeVo.setName(name); + } + CompeteVarietyScoreExample competeVarietyScoreExample=new CompeteVarietyScoreExample(); + competeVarietyScoreExample.createCriteria().andSiteOrderIdEqualTo(param.getSiteOrderId()).andJudgmentIdEqualTo(param.getJudgmentId()).andProjectIdEqualTo(param.getProjectId()).andRecStatusEqualTo((byte) 0); + List competeVarietyScores = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample); + List scropLists=new ArrayList<>(); + competeVarietyScores.forEach(mes->{ + CompeteVo.ScropList scropList=new CompeteVo.ScropList(); + scropList.setCode(mes.getCode()); + scropList.setScore(mes.getScore()); + scropLists.add(scropList); + }); + /* + { + "param": + { + "competeTimeId":1, + "judgmentId":2, + "projectId":2012, + "siteOrderId":1329256313087201280 + } +} + + */ + selScropeVo.setScoreList(scropLists); + return selScropeVo; + } + } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index b01ab21a..4e1dc856 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -237,7 +237,7 @@ public class ExcelService implements IExcelService { PoiUtil.PoiUtilCell lingdui=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); lingdui.setValue("领 队:"); lingduiList.add(lingdui); - biao.add(lingduiList); + StringBuffer lingduiName=new StringBuffer(""); StringBuffer jiaolianName=new StringBuffer(""); jLandLD.forEach(jLD->{ @@ -287,7 +287,7 @@ public class ExcelService implements IExcelService { yuandongyuanName.setValue(String.valueOf(yDYLN)); yundongyuanList.add(yuandongyuanName); biao.add(yundongyuanList); - biao.add(yundongyuanList); + List entryList=new ArrayList<>(); PoiUtil.PoiUtilCell enter= new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 2, 1); entryList.add(enter); @@ -582,7 +582,7 @@ public class ExcelService implements IExcelService { int coach = 0; CompeteCoachExample competeCoachExample = new CompeteCoachExample(); competeCoachExample.createCriteria().andCompanyIdEqualTo(competeCompany.getId()).andIdentityEqualTo((byte) coach); - List competeCoachList = competeCoachMapper.selectByExample(competeCoachExample); + competeCoachMapper.selectByExample(competeCoachExample); long count = competeCoachMapper.countByExample(competeCoachExample); //每个公司的领队数量 CompeteCoachExample competeCoachExample1 = new CompeteCoachExample(); diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index 4cc0c40c..7b5e6aab 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -203,6 +203,7 @@ public interface ICompeteService { */ List queryCountScoreAll(ScoreDto.ShowResult param); + CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param); } diff --git a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml index 87ab15d4..7effd398 100644 --- a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml @@ -14,6 +14,8 @@ + + @@ -75,7 +77,7 @@ id, project_id, player_id, team, compete_order, site, created_at, updated_at, rec_status, - task_id, start_time, end_time + task_id, start_time, end_time, remark, waiver @@ -243,6 +257,12 @@ end_time = #{record.endTime,jdbcType=BIGINT}, + + remark = #{record.remark,jdbcType=VARCHAR}, + + + waiver = #{record.waiver,jdbcType=TINYINT}, + @@ -261,7 +281,9 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, task_id = #{record.taskId,jdbcType=BIGINT}, start_time = #{record.startTime,jdbcType=BIGINT}, - end_time = #{record.endTime,jdbcType=BIGINT} + end_time = #{record.endTime,jdbcType=BIGINT}, + remark = #{record.remark,jdbcType=VARCHAR}, + waiver = #{record.waiver,jdbcType=TINYINT} @@ -302,6 +324,12 @@ end_time = #{endTime,jdbcType=BIGINT}, + + remark = #{remark,jdbcType=VARCHAR}, + + + waiver = #{waiver,jdbcType=TINYINT}, + where id = #{id,jdbcType=BIGINT} @@ -317,7 +345,9 @@ rec_status = #{recStatus,jdbcType=TINYINT}, task_id = #{taskId,jdbcType=BIGINT}, start_time = #{startTime,jdbcType=BIGINT}, - end_time = #{endTime,jdbcType=BIGINT} + end_time = #{endTime,jdbcType=BIGINT}, + remark = #{remark,jdbcType=VARCHAR}, + waiver = #{waiver,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file