diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java index de32b618..a508ebdd 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java @@ -32,7 +32,7 @@ public class CompeteVideoController { private ICompeteVedioService iCompeteVedioService; @MustLogin - @ApiOperation(value = "添加用户观看开幕式视频记录(签到用)", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据,单表操作,") + @ApiOperation(value = "添加单位观看开幕式视频记录(签到用)", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据,单表操作,") @RequestMapping(value = "/addUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse addCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { log.info("添加用户观看开幕式视频记录(签到用):{}",params); @@ -42,7 +42,6 @@ public class CompeteVideoController { @MustLogin @ApiOperation(value = "查看用户观看视频记录(签到用)", notes = "Mr.王---------根据公司的id在t_compete_player_look表中查询数据,单表操作,如果是看了,返回true,没看返回false") @RequestMapping(value = "/selectUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { log.info("添加用户观看开幕式视频记录(签到用):{}",params); boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId()); diff --git a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java index c09e9d95..c5a54df3 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -69,7 +69,7 @@ public class ExcelController { @MustLogin @ApiOperation(value = "XXX比赛报名汇总表(导出)", notes = "") @RequestMapping(value = "/competeAllCount", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse competeAllCount(@ApiParam @Validated @RequestBody QueryDto params) throws IOException { + public JsonResponse competeAllCount(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("XXX比赛报名汇总表:{}",params); String path = excelService.competeAllCount(params.getParam()); return JsonResponse.newInstance().ok(path); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/Constant.java b/mt/src/main/java/com/ccsens/mt/bean/po/Constant.java new file mode 100644 index 00000000..269d2cdc --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/Constant.java @@ -0,0 +1,128 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class Constant implements Serializable { + private Long id; + + private Long projectId; + + private Long businessId; + + private Byte businessType; + + private String tKey; + + private String tValue; + + private String description; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getBusinessId() { + return businessId; + } + + public void setBusinessId(Long businessId) { + this.businessId = businessId; + } + + public Byte getBusinessType() { + return businessType; + } + + public void setBusinessType(Byte businessType) { + this.businessType = businessType; + } + + public String gettKey() { + return tKey; + } + + public void settKey(String tKey) { + this.tKey = tKey == null ? null : tKey.trim(); + } + + public String gettValue() { + return tValue; + } + + public void settValue(String tValue) { + this.tValue = tValue == null ? null : tValue.trim(); + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description == null ? null : description.trim(); + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", projectId=").append(projectId); + sb.append(", businessId=").append(businessId); + sb.append(", businessType=").append(businessType); + sb.append(", tKey=").append(tKey); + sb.append(", tValue=").append(tValue); + sb.append(", description=").append(description); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/ConstantExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/ConstantExample.java new file mode 100644 index 00000000..82366768 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/ConstantExample.java @@ -0,0 +1,831 @@ +package com.ccsens.mt.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ConstantExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ConstantExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andBusinessIdIsNull() { + addCriterion("business_id is null"); + return (Criteria) this; + } + + public Criteria andBusinessIdIsNotNull() { + addCriterion("business_id is not null"); + return (Criteria) this; + } + + public Criteria andBusinessIdEqualTo(Long value) { + addCriterion("business_id =", value, "businessId"); + return (Criteria) this; + } + + public Criteria andBusinessIdNotEqualTo(Long value) { + addCriterion("business_id <>", value, "businessId"); + return (Criteria) this; + } + + public Criteria andBusinessIdGreaterThan(Long value) { + addCriterion("business_id >", value, "businessId"); + return (Criteria) this; + } + + public Criteria andBusinessIdGreaterThanOrEqualTo(Long value) { + addCriterion("business_id >=", value, "businessId"); + return (Criteria) this; + } + + public Criteria andBusinessIdLessThan(Long value) { + addCriterion("business_id <", value, "businessId"); + return (Criteria) this; + } + + public Criteria andBusinessIdLessThanOrEqualTo(Long value) { + addCriterion("business_id <=", value, "businessId"); + return (Criteria) this; + } + + public Criteria andBusinessIdIn(List values) { + addCriterion("business_id in", values, "businessId"); + return (Criteria) this; + } + + public Criteria andBusinessIdNotIn(List values) { + addCriterion("business_id not in", values, "businessId"); + return (Criteria) this; + } + + public Criteria andBusinessIdBetween(Long value1, Long value2) { + addCriterion("business_id between", value1, value2, "businessId"); + return (Criteria) this; + } + + public Criteria andBusinessIdNotBetween(Long value1, Long value2) { + addCriterion("business_id not between", value1, value2, "businessId"); + return (Criteria) this; + } + + public Criteria andBusinessTypeIsNull() { + addCriterion("business_type is null"); + return (Criteria) this; + } + + public Criteria andBusinessTypeIsNotNull() { + addCriterion("business_type is not null"); + return (Criteria) this; + } + + public Criteria andBusinessTypeEqualTo(Byte value) { + addCriterion("business_type =", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeNotEqualTo(Byte value) { + addCriterion("business_type <>", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeGreaterThan(Byte value) { + addCriterion("business_type >", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("business_type >=", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeLessThan(Byte value) { + addCriterion("business_type <", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeLessThanOrEqualTo(Byte value) { + addCriterion("business_type <=", value, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeIn(List values) { + addCriterion("business_type in", values, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeNotIn(List values) { + addCriterion("business_type not in", values, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeBetween(Byte value1, Byte value2) { + addCriterion("business_type between", value1, value2, "businessType"); + return (Criteria) this; + } + + public Criteria andBusinessTypeNotBetween(Byte value1, Byte value2) { + addCriterion("business_type not between", value1, value2, "businessType"); + return (Criteria) this; + } + + public Criteria andTKeyIsNull() { + addCriterion("t_key is null"); + return (Criteria) this; + } + + public Criteria andTKeyIsNotNull() { + addCriterion("t_key is not null"); + return (Criteria) this; + } + + public Criteria andTKeyEqualTo(String value) { + addCriterion("t_key =", value, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyNotEqualTo(String value) { + addCriterion("t_key <>", value, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyGreaterThan(String value) { + addCriterion("t_key >", value, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyGreaterThanOrEqualTo(String value) { + addCriterion("t_key >=", value, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyLessThan(String value) { + addCriterion("t_key <", value, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyLessThanOrEqualTo(String value) { + addCriterion("t_key <=", value, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyLike(String value) { + addCriterion("t_key like", value, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyNotLike(String value) { + addCriterion("t_key not like", value, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyIn(List values) { + addCriterion("t_key in", values, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyNotIn(List values) { + addCriterion("t_key not in", values, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyBetween(String value1, String value2) { + addCriterion("t_key between", value1, value2, "tKey"); + return (Criteria) this; + } + + public Criteria andTKeyNotBetween(String value1, String value2) { + addCriterion("t_key not between", value1, value2, "tKey"); + return (Criteria) this; + } + + public Criteria andTValueIsNull() { + addCriterion("t_value is null"); + return (Criteria) this; + } + + public Criteria andTValueIsNotNull() { + addCriterion("t_value is not null"); + return (Criteria) this; + } + + public Criteria andTValueEqualTo(String value) { + addCriterion("t_value =", value, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueNotEqualTo(String value) { + addCriterion("t_value <>", value, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueGreaterThan(String value) { + addCriterion("t_value >", value, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueGreaterThanOrEqualTo(String value) { + addCriterion("t_value >=", value, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueLessThan(String value) { + addCriterion("t_value <", value, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueLessThanOrEqualTo(String value) { + addCriterion("t_value <=", value, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueLike(String value) { + addCriterion("t_value like", value, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueNotLike(String value) { + addCriterion("t_value not like", value, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueIn(List values) { + addCriterion("t_value in", values, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueNotIn(List values) { + addCriterion("t_value not in", values, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueBetween(String value1, String value2) { + addCriterion("t_value between", value1, value2, "tValue"); + return (Criteria) this; + } + + public Criteria andTValueNotBetween(String value1, String value2) { + addCriterion("t_value not between", value1, value2, "tValue"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 9caffcb6..6ad1a736 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -247,6 +247,8 @@ public class ProvinceCompeteVo { private Long startTime; @ApiModelProperty("结束时间") private Long endTime; + @ApiModelProperty("是否限制上传时间 0不限制 1限制") + private int restrict; // public Long getEndTime(){ // if(ObjectUtil.isNotNull(startTime) && startTime != 0){ @@ -254,12 +256,12 @@ public class ProvinceCompeteVo { // } // return null; // } - public Long getStartTime(){ - if(ObjectUtil.isNotNull(endTime) && endTime != 0){ - return endTime - Constant.UPLOAD_VIDEO_TIME; - } - return null; - } +// public Long getStartTime(){ +// if(ObjectUtil.isNotNull(endTime) && endTime != 0){ +// return endTime - Constant.UPLOAD_VIDEO_TIME; +// } +// return null; +// } } diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/ConstantMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/ConstantMapper.java new file mode 100644 index 00000000..515dc1dc --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/ConstantMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.mt.persist.mapper; + +import com.ccsens.mt.bean.po.Constant; +import com.ccsens.mt.bean.po.ConstantExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ConstantMapper { + long countByExample(ConstantExample example); + + int deleteByExample(ConstantExample example); + + int deleteByPrimaryKey(Long id); + + int insert(Constant record); + + int insertSelective(Constant record); + + List selectByExample(ConstantExample example); + + Constant selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") Constant record, @Param("example") ConstantExample example); + + int updateByExample(@Param("record") Constant record, @Param("example") ConstantExample example); + + int updateByPrimaryKeySelective(Constant record); + + int updateByPrimaryKey(Constant record); +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index e7096e7b..5aae3e7b 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -159,6 +159,7 @@ public class CompeteTaskService implements ICompeteTaskService { int competeOrder = 1; //场地 int site = 1; + List taskErrorList = new ArrayList<>(); for (Long playerIdOrTeamId : playerIdOrTeamIdList) { CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); startOrderExample.createCriteria().andPlayerIdEqualTo(playerIdOrTeamId).andProjectIdEqualTo(project.getId()); @@ -168,12 +169,15 @@ public class CompeteTaskService implements ICompeteTaskService { CompeteStartOrder competeStartOrder = startOrderList.get(0); competeStartOrder.setSite((byte) site); competeStartOrder.setCompeteOrder((byte) competeOrder); - if (orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)) { +// if (orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)) { competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); + log.info("修改场次信息:{}", competeStartOrder); + startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); // 修改tall的任务 TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); - updateTaskInfo.setId(competeStartOrder.getId()); + updateTaskInfo.setId(competeStartOrder.getTaskId()); + updateTaskInfo.setName(project.getName() + competeOrder + "-" + site); updateTaskInfo.setBeginTime(competeStartOrder.getStartTime()); updateTaskInfo.setEndTime(competeStartOrder.getEndTime()); updateTaskInfo.setToken(token); @@ -184,15 +188,14 @@ public class CompeteTaskService implements ICompeteTaskService { //失败return if (ObjectUtil.isNull(normalTaskJsonResponse)) { log.info("调用tall返回null"); - return; + taskErrorList.add("修改任务失败"+competeStartOrder.getTaskId()); } if(normalTaskJsonResponse.getCode() != 200){ log.info("调用tall异常后返回:{}", normalTaskJsonResponse.getMsg()); - return; + taskErrorList.add(normalTaskJsonResponse.getMsg()+competeStartOrder.getTaskId()); } - } - log.info("修改场次信息:{}", competeStartOrder); - startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); +// } + } else { //添加tall的任务 Long taskId = null; @@ -210,11 +213,11 @@ public class CompeteTaskService implements ICompeteTaskService { log.info("添加任务后返回:{}", normalTaskJsonResponse); if (ObjectUtil.isNull(normalTaskJsonResponse)) { log.info("调用tall返回null"); - return; + continue; } if(normalTaskJsonResponse.getCode() != 200){ log.info("调用tall异常后返回:{}", normalTaskJsonResponse.getMsg()); - return; + continue; } TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); if (ObjectUtil.isNotNull(normalTask)) { @@ -233,6 +236,7 @@ public class CompeteTaskService implements ICompeteTaskService { competeStartOrder.setEndTime(projectStartTime + orderTime); log.info("添加场次信息:{}", competeStartOrder); startOrderMapper.insertSelective(competeStartOrder); + } site++; if (site > projectConfig.getSiteNum()) { @@ -252,6 +256,7 @@ public class CompeteTaskService implements ICompeteTaskService { */ @Override public List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) { + return projectConfigDao.queryStartOrderByCompany(param.getCompanyId(), param.getProjectId(), param.getCompeteTimeId()); } @@ -498,11 +503,11 @@ public class CompeteTaskService implements ICompeteTaskService { log.info("修改任务插件配置后返回:{}", pluginVoJsonResponse); if (ObjectUtil.isNull(pluginVoJsonResponse)) { log.info("调用tall返回null"); - return; + continue; } if(pluginVoJsonResponse.getCode() != 200){ log.info("调用tall异常后返回:{}", pluginVoJsonResponse.getMsg()); - return; + continue; } } } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index 7ac80102..ba21294c 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -61,7 +61,7 @@ public class CompeteVedioService implements ICompeteVedioService{ @Override public boolean selectSignVideo(Long companyId) { CompetePlayerLookExample competePlayerLookExample=new CompetePlayerLookExample(); - competePlayerLookExample.createCriteria().andCompanyIdEqualTo(companyId); + competePlayerLookExample.createCriteria().andCompanyIdEqualTo(companyId).andRecStatusEqualTo((byte) 0); List competePlayerLooks = competePlayerLookMapper.selectByExample(competePlayerLookExample); return competePlayerLooks.size()==0? false:true; } 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 58cd1872..07e3f9e0 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -590,7 +590,7 @@ public class ExcelService implements IExcelService { } @Override - public String competeAllCount(CompeteDto.CompeteTime params) throws IOException { + public String competeAllCount(CompeteDto.CompeteTime params) throws Exception { List competeAllCountList = competeAllCountList1(params.getCompeteTimeId()); return getExcelFilePathForCompeteAllCount(competeAllCountList); } @@ -721,7 +721,7 @@ public class ExcelService implements IExcelService { } - private String getExcelFilePathForCompeteAllCount(List arrayList) throws IOException { + private String getExcelFilePathForCompeteAllCount(List arrayList) throws Exception { //创建excle表格对象 List> list = new ArrayList<>(); //创建行对象 @@ -773,6 +773,118 @@ public class ExcelService implements IExcelService { list.add(cells); i++; a++; + if (competeAllCount.getProjectId()==2017){ + cells = new ArrayList<>(); + PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(); + poiUtilCel.setValue("--"); + cells.add(poiUtilCel); + PoiUtil.PoiUtilCell poiUtilCel1 = new PoiUtil.PoiUtilCell(); + poiUtilCel1.setValue("合计"); + cells.add(poiUtilCel1); + for (int j = 3; j <19 ; j++) { + PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(); + if (j==3){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(C2:C8)"); + cells.add(poiUtilCel2); + } + if (j==4){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(D2:D8)"); + cells.add(poiUtilCel2); + } + if (j==5){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(E2:E8)"); + cells.add(poiUtilCel2); + } + if (j==6){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(F2:F8)"); + cells.add(poiUtilCel2); + } if (j==7){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(G2:G8)"); + cells.add(poiUtilCel2); + } if (j==8){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(H2:H8)"); + cells.add(poiUtilCel2); + } if (j==9){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(I2:I8)"); + cells.add(poiUtilCel2); + } if (j==10){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(J2:J8)"); + cells.add(poiUtilCel2); + } if (j==11){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(K2:K8)"); + cells.add(poiUtilCel2); + } + if (j==12){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(L2:L8)"); + cells.add(poiUtilCel2); + } + if (j==13){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(M2:N8)"); + cells.add(poiUtilCel2); + } + if (j==14){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(N2:N8)"); + cells.add(poiUtilCel2); + } + if (j==15){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(O2:O8)"); + cells.add(poiUtilCel2); + } + if (j==16){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(P2:P8)"); + cells.add(poiUtilCel2); + } + if (j==17){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(Q2:Q8)"); + cells.add(poiUtilCel2); + } + if (j==18){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(R2:R8)"); + cells.add(poiUtilCel2); + } +// String T1 = PoiUtil.toRadix(j); +// poiUtilCel2.setFunction("sum(c"+2+":c"+8+")"); + } + list.add(cells); + } + + if (competeAllCount.getProjectId()==2026){ + cells = new ArrayList<>(); + PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(); + poiUtilCel.setValue("--"); + cells.add(poiUtilCel); + PoiUtil.PoiUtilCell poiUtilCel1 = new PoiUtil.PoiUtilCell(); + poiUtilCel1.setValue("合计"); + cells.add(poiUtilCel1); + PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(3 + "", 15, 1, 300, 18); + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(C10:C18)"); + cells.add(poiUtilCel2); + PoiUtil.PoiUtilCell poiUtilCel3 = new PoiUtil.PoiUtilCell(); + poiUtilCel3.setValue(""); + poiUtilCel3.setFunction("sum(R2:C19)"); + cells.add(poiUtilCel3); + list.add(cells); + } + + + } //生成excel表格对象,并将数据放入 Workbook wbs = PoiUtil.exportWB("比赛报名汇总表", list, workbook); diff --git a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java index f000aa2b..3fca6b81 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -58,7 +58,7 @@ public interface IExcelService { * @param params 大赛id * @return 返回失败的信息 */ - String competeAllCount(CompeteDto.CompeteTime params) throws IOException; + String competeAllCount(CompeteDto.CompeteTime params) throws Exception; String iCompetitionOrderService(QueryDto params); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 1ac895fc..ac92adb9 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common, util-prod + active: test + include: common, util-test diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index f99a4211..86ffbfeb 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -732,7 +732,7 @@ SELECT id, companyName, - GROUP_CONCAT( `name` ) AS `names` + GROUP_CONCAT( `name` separator '、' ) AS `names` FROM ( SELECT @@ -743,6 +743,7 @@ IF ( ( + ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where t_compete_project_player.rec_status=0) ) OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where t_compete_team_member.rec_status=0 ) ) ), diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index afe3cafe..47ac4744 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -8,7 +8,37 @@ tcc.`contacts_phone` as phone, tcpl.`look_time` as `time` from - t_compete_company tcc + ( + SELECT + * + FROM + ( + SELECT + tcc.*, + ( + IF + ( + ( + ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE t_compete_project_player.rec_status = 0 ) ) + OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE t_compete_team_member.rec_status = 0 ) ) + ), + 1, + 0 + ) + ) AS `after` + FROM + t_compete_company tcc + LEFT JOIN t_compete_player tcp ON tcp.company_id = tcc.id + WHERE + tcc.rec_status = 0 + AND tcp.rec_status = 0 + AND tcc.compete_time_id = 1 + ) t + WHERE + `after` != 0 + GROUP BY + t.id + ) tcc LEFT JOIN t_compete_time tct on tct.id=tcc.compete_time_id LEFT JOIN ( select company_id,max(look_time) as `look_time` @@ -18,18 +48,6 @@ and t_compete_player_look.`look_time` <= #{param.signEndTime,jdbcType=TIMESTAMP} group by company_id - - - - - - - - - - - - ) tcpl on tcpl.company_id=tcc.id where tct.id= #{param.id} diff --git a/mt/src/main/resources/mapper_raw/ConstantMapper.xml b/mt/src/main/resources/mapper_raw/ConstantMapper.xml new file mode 100644 index 00000000..5e544a24 --- /dev/null +++ b/mt/src/main/resources/mapper_raw/ConstantMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, project_id, business_id, business_type, t_key, t_value, description, created_at, + updated_at, rec_status + + + + + delete from t_constant + where id = #{id,jdbcType=BIGINT} + + + delete from t_constant + + + + + + insert into t_constant (id, project_id, business_id, + business_type, t_key, t_value, + description, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{businessId,jdbcType=BIGINT}, + #{businessType,jdbcType=TINYINT}, #{tKey,jdbcType=VARCHAR}, #{tValue,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_constant + + + id, + + + project_id, + + + business_id, + + + business_type, + + + t_key, + + + t_value, + + + description, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{businessId,jdbcType=BIGINT}, + + + #{businessType,jdbcType=TINYINT}, + + + #{tKey,jdbcType=VARCHAR}, + + + #{tValue,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_constant + + + id = #{record.id,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + business_id = #{record.businessId,jdbcType=BIGINT}, + + + business_type = #{record.businessType,jdbcType=TINYINT}, + + + t_key = #{record.tKey,jdbcType=VARCHAR}, + + + t_value = #{record.tValue,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_constant + set id = #{record.id,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + business_id = #{record.businessId,jdbcType=BIGINT}, + business_type = #{record.businessType,jdbcType=TINYINT}, + t_key = #{record.tKey,jdbcType=VARCHAR}, + t_value = #{record.tValue,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_constant + + + project_id = #{projectId,jdbcType=BIGINT}, + + + business_id = #{businessId,jdbcType=BIGINT}, + + + business_type = #{businessType,jdbcType=TINYINT}, + + + t_key = #{tKey,jdbcType=VARCHAR}, + + + t_value = #{tValue,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_constant + set project_id = #{projectId,jdbcType=BIGINT}, + business_id = #{businessId,jdbcType=BIGINT}, + business_type = #{businessType,jdbcType=TINYINT}, + t_key = #{tKey,jdbcType=VARCHAR}, + t_value = #{tValue,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/web/TaskController.java b/tall/src/main/java/com/ccsens/tall/web/TaskController.java index e7850019..4bdab28d 100644 --- a/tall/src/main/java/com/ccsens/tall/web/TaskController.java +++ b/tall/src/main/java/com/ccsens/tall/web/TaskController.java @@ -254,6 +254,7 @@ public class TaskController { public JsonResponse updateTask(HttpServletRequest request, @Validated @RequestBody TaskDto.UpdateTaskInfo updateTaskInfo) throws Exception { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + log.info("修改任务信息:{}",updateTaskInfo); TaskVo.NormalTask taskInfo = taskDetailService.updateTaskInfo(currentUserId,updateTaskInfo); return JsonResponse.newInstance().ok(taskInfo); } diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index 1dc1d721..792badf0 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -597,6 +597,9 @@ public class PoiUtil { public static void main(String[] args) throws Exception { + String s = toRadix(3); + System.out.println(s); + // File file = new File("F:\\wenjian\\3.xlsx"); // file.createNewFile();