diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index 9c47aaae..027c0496 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -9,6 +9,7 @@ import cn.hutool.core.util.StrUtil; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; import com.ccsens.mt.bean.po.*; +import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; import com.ccsens.mt.persist.dao.CompeteCompanyDao; import com.ccsens.mt.persist.dao.CompetePlayerDao; @@ -261,32 +262,37 @@ public class ProvinceService implements IProvinceService { CompeteCompany competeCompany = new CompeteCompany(); //单位id为空，新增 if (ObjectUtil.isNull(companyid)){ - Long id = snowflake.nextId(); - competeCompany.setId(id); + //检查当前用户是否已经添加过单位，有的话直接返回 + CompeteCompanyExample companyExample = new CompeteCompanyExample(); + companyExample.createCriteria().andUserIdEqualTo(userId).andCompeteTimeIdEqualTo(param.getCompeteTimeId()); + if(competeCompanyDao.countByExample(companyExample) == 0) { + Long id = snowflake.nextId(); + competeCompany.setId(id); // competeCompany.setCoachNum(param.getCoachNum()); - if (StrUtil.isEmpty(param.getCompanyName())){ - throw new BaseException(CodeEnum.NAME_EMPTY); - } - competeCompany.setName(param.getCompanyName()); + if (StrUtil.isEmpty(param.getCompanyName())) { + throw new BaseException(CodeEnum.NAME_EMPTY); + } + competeCompany.setName(param.getCompanyName()); - if (StrUtil.isEmpty(param.getContactsName())){ - throw new BaseException(CodeEnum.CONTACTS_NAME_EMPTY); - } - competeCompany.setContactsName(param.getContactsName()); + if (StrUtil.isEmpty(param.getContactsName())) { + throw new BaseException(CodeEnum.CONTACTS_NAME_EMPTY); + } + competeCompany.setContactsName(param.getContactsName()); - if(StrUtil.isEmpty(param.getContactsPhone()) || !param.getContactsPhone().matches(WebConstant.REGEX_PHONE)){ - throw new BaseException(CodeEnum.PHONE_ERR); - } - competeCompany.setContactsPhone(param.getContactsPhone()); - competeCompany.setLeaderNum(param.getGuideNum()); - competeCompany.setJoinNum(param.getPlayerNum()); - competeCompany.setUserId(userId); - competeCompany.setCompeteTimeId(param.getCompeteTimeId()); - if(param.getAuthorization() != 1){ - throw new BaseException(CodeEnum.AUTHORIZATION_AGREE); + if (StrUtil.isEmpty(param.getContactsPhone()) || !param.getContactsPhone().matches(WebConstant.REGEX_PHONE)) { + throw new BaseException(CodeEnum.PHONE_ERR); + } + competeCompany.setContactsPhone(param.getContactsPhone()); + competeCompany.setLeaderNum(param.getGuideNum()); + competeCompany.setJoinNum(param.getPlayerNum()); + competeCompany.setUserId(userId); + competeCompany.setCompeteTimeId(param.getCompeteTimeId()); + if (param.getAuthorization() != 1) { + throw new BaseException(CodeEnum.AUTHORIZATION_AGREE); + } + competeCompany.setAuthorization(param.getAuthorization()); + competeCompanyDao.insertSelective(competeCompany); } - competeCompany.setAuthorization(param.getAuthorization()); - competeCompanyDao.insertSelective(competeCompany); }else { //不为空，根据单位id查出来修改 判断传进来的参数是否为空 为空则跳过 不为空则修改 competeCompany = competeCompanyDao.selectByPrimaryKey(companyid); diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/WeekMeetingDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/WeekMeetingDto.java index ed48dbe2..ef85460e 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/WeekMeetingDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/WeekMeetingDto.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NonNull; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -46,4 +47,18 @@ public class WeekMeetingDto { @ApiModelProperty("域名") private String domainName; } + + @Data + @ApiModel("获取插件关联的信息") + public static class PluginParameter{ + @NotNull(message = "插件信息不正确") + @ApiModelProperty("插件id") + private Long pluginId; + @ApiModelProperty("任务id") + private Long subTaskId; + @ApiModelProperty("成员id") + private Long memberId; + @ApiModelProperty("项目id") + private Long projectId; + } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginParameter.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginParameter.java new file mode 100644 index 00000000..0b8360b4 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginParameter.java @@ -0,0 +1,117 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProPluginParameter implements Serializable { + private Long id; + + private Long subTaskId; + + private Long memberId; + + private Long projectId; + + private Long pluginId; + + private String parameter; + + 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 getSubTaskId() { + return subTaskId; + } + + public void setSubTaskId(Long subTaskId) { + this.subTaskId = subTaskId; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getPluginId() { + return pluginId; + } + + public void setPluginId(Long pluginId) { + this.pluginId = pluginId; + } + + public String getParameter() { + return parameter; + } + + public void setParameter(String parameter) { + this.parameter = parameter == null ? null : parameter.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(", subTaskId=").append(subTaskId); + sb.append(", memberId=").append(memberId); + sb.append(", projectId=").append(projectId); + sb.append(", pluginId=").append(pluginId); + sb.append(", parameter=").append(parameter); + 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/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginParameterExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginParameterExample.java new file mode 100644 index 00000000..09997517 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginParameterExample.java @@ -0,0 +1,751 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProPluginParameterExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProPluginParameterExample() { + 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 andSubTaskIdIsNull() { + addCriterion("sub_task_id is null"); + return (Criteria) this; + } + + public Criteria andSubTaskIdIsNotNull() { + addCriterion("sub_task_id is not null"); + return (Criteria) this; + } + + public Criteria andSubTaskIdEqualTo(Long value) { + addCriterion("sub_task_id =", value, "subTaskId"); + return (Criteria) this; + } + + public Criteria andSubTaskIdNotEqualTo(Long value) { + addCriterion("sub_task_id <>", value, "subTaskId"); + return (Criteria) this; + } + + public Criteria andSubTaskIdGreaterThan(Long value) { + addCriterion("sub_task_id >", value, "subTaskId"); + return (Criteria) this; + } + + public Criteria andSubTaskIdGreaterThanOrEqualTo(Long value) { + addCriterion("sub_task_id >=", value, "subTaskId"); + return (Criteria) this; + } + + public Criteria andSubTaskIdLessThan(Long value) { + addCriterion("sub_task_id <", value, "subTaskId"); + return (Criteria) this; + } + + public Criteria andSubTaskIdLessThanOrEqualTo(Long value) { + addCriterion("sub_task_id <=", value, "subTaskId"); + return (Criteria) this; + } + + public Criteria andSubTaskIdIn(List values) { + addCriterion("sub_task_id in", values, "subTaskId"); + return (Criteria) this; + } + + public Criteria andSubTaskIdNotIn(List values) { + addCriterion("sub_task_id not in", values, "subTaskId"); + return (Criteria) this; + } + + public Criteria andSubTaskIdBetween(Long value1, Long value2) { + addCriterion("sub_task_id between", value1, value2, "subTaskId"); + return (Criteria) this; + } + + public Criteria andSubTaskIdNotBetween(Long value1, Long value2) { + addCriterion("sub_task_id not between", value1, value2, "subTaskId"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + 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 andPluginIdIsNull() { + addCriterion("plugin_id is null"); + return (Criteria) this; + } + + public Criteria andPluginIdIsNotNull() { + addCriterion("plugin_id is not null"); + return (Criteria) this; + } + + public Criteria andPluginIdEqualTo(Long value) { + addCriterion("plugin_id =", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdNotEqualTo(Long value) { + addCriterion("plugin_id <>", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdGreaterThan(Long value) { + addCriterion("plugin_id >", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdGreaterThanOrEqualTo(Long value) { + addCriterion("plugin_id >=", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdLessThan(Long value) { + addCriterion("plugin_id <", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdLessThanOrEqualTo(Long value) { + addCriterion("plugin_id <=", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdIn(List values) { + addCriterion("plugin_id in", values, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdNotIn(List values) { + addCriterion("plugin_id not in", values, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdBetween(Long value1, Long value2) { + addCriterion("plugin_id between", value1, value2, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdNotBetween(Long value1, Long value2) { + addCriterion("plugin_id not between", value1, value2, "pluginId"); + return (Criteria) this; + } + + public Criteria andParameterIsNull() { + addCriterion("parameter is null"); + return (Criteria) this; + } + + public Criteria andParameterIsNotNull() { + addCriterion("parameter is not null"); + return (Criteria) this; + } + + public Criteria andParameterEqualTo(String value) { + addCriterion("parameter =", value, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterNotEqualTo(String value) { + addCriterion("parameter <>", value, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterGreaterThan(String value) { + addCriterion("parameter >", value, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterGreaterThanOrEqualTo(String value) { + addCriterion("parameter >=", value, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterLessThan(String value) { + addCriterion("parameter <", value, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterLessThanOrEqualTo(String value) { + addCriterion("parameter <=", value, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterLike(String value) { + addCriterion("parameter like", value, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterNotLike(String value) { + addCriterion("parameter not like", value, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterIn(List values) { + addCriterion("parameter in", values, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterNotIn(List values) { + addCriterion("parameter not in", values, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterBetween(String value1, String value2) { + addCriterion("parameter between", value1, value2, "parameter"); + return (Criteria) this; + } + + public Criteria andParameterNotBetween(String value1, String value2) { + addCriterion("parameter not between", value1, value2, "parameter"); + 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/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java index 5960b8a5..4e30b456 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java @@ -48,9 +48,9 @@ public class ProjectVo { @ApiModelProperty("子项目信息") private List subProjectList; @ApiModelProperty("是否在首页展示 0否 1是") - private byte homePageShow; + private Byte homePageShow; @ApiModelProperty("是否高亮展示 0否 1是") - private byte highlight; + private Byte highlight; @ApiModelProperty("父项目id") private Long parentId; diff --git a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java index 157e6222..dbfda3cf 100644 --- a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java +++ b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java @@ -139,6 +139,7 @@ public class SpringConfig implements WebMvcConfigurer { .excludePathPatterns("/users/password") .excludePathPatterns("/users/password/account") .excludePathPatterns("/users/account") + .excludePathPatterns("/users/phone") .excludePathPatterns("/users/token") .excludePathPatterns("/users/claims") .excludePathPatterns("/users/member") diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/ProPluginParameterMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProPluginParameterMapper.java new file mode 100644 index 00000000..fc163f66 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProPluginParameterMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.ProPluginParameter; +import com.ccsens.tall.bean.po.ProPluginParameterExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProPluginParameterMapper { + long countByExample(ProPluginParameterExample example); + + int deleteByExample(ProPluginParameterExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProPluginParameter record); + + int insertSelective(ProPluginParameter record); + + List selectByExample(ProPluginParameterExample example); + + ProPluginParameter selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProPluginParameter record, @Param("example") ProPluginParameterExample example); + + int updateByExample(@Param("record") ProPluginParameter record, @Param("example") ProPluginParameterExample example); + + int updateByPrimaryKeySelective(ProPluginParameter record); + + int updateByPrimaryKey(ProPluginParameter record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/IWeekMeetingService.java b/tall/src/main/java/com/ccsens/tall/service/IWeekMeetingService.java index da1bf5f9..be83e0e6 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IWeekMeetingService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IWeekMeetingService.java @@ -41,4 +41,12 @@ public interface IWeekMeetingService { * @return */ String getCcMinutes(Long userId, WeekMeetingDto.WeekMeetingMinutes param) throws IOException; + + /** + * 获取插件相关的参数信息 + * @param userId + * @param param + * @return + */ + String getPluginParameter(Long userId, WeekMeetingDto.PluginParameter param); } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index f67074cb..3ce1fa2e 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -476,12 +476,18 @@ public class ProTaskDetailService implements IProTaskDetailService { ProPluginConfig proPluginConfig = sysPluginDao.getPluginConfigByTaskPluginId(pluginIds[i], normalTask.getDetailId()); if (ObjectUtil.isNotNull(proPluginConfig)) { - //如果是“个人任务汇报”插件，特殊查询 - if(pluginNames[i].equalsIgnoreCase(TallConstant.PERSONAL_TASK_REPORT) && StrUtil.isEmpty(proPluginConfig.getImportParam())){ + //如果是周会相关的插件，且入参为空。特殊查询 + SysPlugin sysPlugin = sysPluginDao.selectByPrimaryKey(Long.parseLong(pluginIds[i])); + if(ObjectUtil.isNotNull(sysPlugin) && sysPlugin.getScene() == 6 && StrUtil.isEmpty(proPluginConfig.getImportParam())){ PluginVo.PersonalTaskReport personalTaskReport = taskPluginService.getPersonalTaskReport(normalTask.getProjectId()); proPluginConfig.setImportParam(JacksonUtil.beanToJson(personalTaskReport)); -// pluginConfigDao.updateByPrimaryKeySelective(proPluginConfig); } +// //如果是“个人任务汇报”插件，特殊查询 +// if(pluginNames[i].equalsIgnoreCase(TallConstant.PERSONAL_TASK_REPORT) && StrUtil.isEmpty(proPluginConfig.getImportParam())){ +// PluginVo.PersonalTaskReport personalTaskReport = taskPluginService.getPersonalTaskReport(normalTask.getProjectId()); +// proPluginConfig.setImportParam(JacksonUtil.beanToJson(personalTaskReport)); +//// pluginConfigDao.updateByPrimaryKeySelective(proPluginConfig); +// } plugin.setWebPath(proPluginConfig.getWebPath()); plugin.setRoutineLocation(proPluginConfig.getRoutineLocation()); plugin.setImportParam(proPluginConfig.getImportParam()); diff --git a/tall/src/main/java/com/ccsens/tall/service/WeekMeetingService.java b/tall/src/main/java/com/ccsens/tall/service/WeekMeetingService.java index f1c823d2..72d89bb0 100644 --- a/tall/src/main/java/com/ccsens/tall/service/WeekMeetingService.java +++ b/tall/src/main/java/com/ccsens/tall/service/WeekMeetingService.java @@ -9,6 +9,7 @@ import com.ccsens.tall.bean.po.*; import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.persist.dao.*; +import com.ccsens.tall.persist.mapper.ProPluginParameterMapper; import com.ccsens.tall.util.TallConstant; import com.ccsens.util.JacksonUtil; import com.ccsens.util.PoiUtil; @@ -50,6 +51,8 @@ public class WeekMeetingService implements IWeekMeetingService{ private ProPluginConfigDao proPluginConfigDao; @Resource private ITaskPluginService taskPluginService; + @Resource + private ProPluginParameterMapper parameterMapper; /** * 查找周会要用到的项目 @@ -159,6 +162,22 @@ public class WeekMeetingService implements IWeekMeetingService{ return PropUtil.imgDomain + "/" + fileName; } + /** + * 查找插件相关的参数信息 + */ + @Override + public String getPluginParameter(Long userId, WeekMeetingDto.PluginParameter param) { + String parameter = null; + ProPluginParameterExample parameterExample = new ProPluginParameterExample(); + parameterExample.createCriteria().andSubTaskIdEqualTo(param.getSubTaskId()).andPluginIdEqualTo(param.getPluginId()) + .andMemberIdEqualTo(param.getMemberId()).andProjectIdEqualTo(param.getProjectId()); + List parameterList = parameterMapper.selectByExample(parameterExample); + if(CollectionUtil.isNotEmpty(parameterList)){ + parameter = parameterList.get(0).getParameter(); + } + return parameter; + } + /** * 生成个人汇报的任务 * @param reportMember diff --git a/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java b/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java index db9e0673..c89b326e 100644 --- a/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java +++ b/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java @@ -38,7 +38,7 @@ public class TaskUtil { } public static Task splitTask(List taskDetails, long start, long end,Integer process) { - log.info("传入判断是否是全局：{}",taskDetails); +// log.info("传入判断是否是全局：{}",taskDetails); Task task = new Task(); List globalTask = new ArrayList<>(); List commonTask = new ArrayList<>(); @@ -53,6 +53,7 @@ public class TaskUtil { } //判断时间不明确的为全局任务（时间为空或跨天） for (TaskVo.NormalTask detail : taskDetails) { + log.info("传入判断是否是全局：{}",detail); if((process==1 && detail.getProcess()!=2) || (process==2 && detail.getProcess()==2)){ continue; } diff --git a/tall/src/main/java/com/ccsens/tall/web/WeekMeetingController.java b/tall/src/main/java/com/ccsens/tall/web/WeekMeetingController.java index 557d620a..b92b5a0d 100644 --- a/tall/src/main/java/com/ccsens/tall/web/WeekMeetingController.java +++ b/tall/src/main/java/com/ccsens/tall/web/WeekMeetingController.java @@ -76,4 +76,15 @@ public class WeekMeetingController { return JsonResponse.newInstance().ok(path); } + + @MustLogin + @ApiOperation(value = "获取插件的相关数据（json）", notes = "") + @RequestMapping(value = "/get/parameter", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getPluginParameter(@ApiParam @Validated @RequestBody QueryDto param) throws IOException { + log.info("获取插件的相关数据：{}", param); + String parameter = weekMeetingService.getPluginParameter(param.getUserId(),param.getParam()); + log.info("获取插件的相关数据：{}", parameter); + return JsonResponse.newInstance().ok(parameter); + } + } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..e75cc2c3 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: prod + include: util-prod,common diff --git a/tall/src/main/resources/mapper_dao/SysProjectDao.xml b/tall/src/main/resources/mapper_dao/SysProjectDao.xml index 3cc917ab..f811ee10 100644 --- a/tall/src/main/resources/mapper_dao/SysProjectDao.xml +++ b/tall/src/main/resources/mapper_dao/SysProjectDao.xml @@ -148,22 +148,16 @@ t_sys_project p LEFT JOIN t_sys_user_attention a ON a.project_id = p.id left join t_sys_project_label pl on pl.project_id = p.id - left join t_sys_label l on pl.label_id = l.id and - l.user_id = #{userId} + AND ( pl.rec_status = 0 OR pl.rec_status IS NULL ) + left join t_sys_label l on pl.label_id = l.id + AND ( l.rec_status = 0 OR l.rec_status IS NULL ) + and l.user_id = #{userId} WHERE a.user_id = #{userId} - and - (p.parent_id = 0 or p.home_page_show = 1) - AND - p.rec_status = 0 - and - a.rec_status = 0 - and - (l.rec_status = 0 or l.rec_status is null) - and - (pl.rec_status = 0 or pl.rec_status is null) - AND - p.template = 0 + and (p.parent_id = 0 or p.home_page_show = 1) + AND p.rec_status = 0 + and a.rec_status = 0 + AND p.template = 0 and diff --git a/tall/src/main/resources/mapper_raw/ProPluginParameterMapper.xml b/tall/src/main/resources/mapper_raw/ProPluginParameterMapper.xml new file mode 100644 index 00000000..311c8da1 --- /dev/null +++ b/tall/src/main/resources/mapper_raw/ProPluginParameterMapper.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + 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, sub_task_id, member_id, project_id, plugin_id, parameter, created_at, updated_at, + rec_status + + + + + delete from t_pro_plugin_parameter + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_plugin_parameter + + + + + + insert into t_pro_plugin_parameter (id, sub_task_id, member_id, + project_id, plugin_id, parameter, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{subTaskId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, + #{projectId,jdbcType=BIGINT}, #{pluginId,jdbcType=BIGINT}, #{parameter,jdbcType=VARCHAR}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_plugin_parameter + + + id, + + + sub_task_id, + + + member_id, + + + project_id, + + + plugin_id, + + + parameter, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{subTaskId,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{pluginId,jdbcType=BIGINT}, + + + #{parameter,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_plugin_parameter + + + id = #{record.id,jdbcType=BIGINT}, + + + sub_task_id = #{record.subTaskId,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + plugin_id = #{record.pluginId,jdbcType=BIGINT}, + + + parameter = #{record.parameter,jdbcType=VARCHAR}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_plugin_parameter + set id = #{record.id,jdbcType=BIGINT}, + sub_task_id = #{record.subTaskId,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + plugin_id = #{record.pluginId,jdbcType=BIGINT}, + parameter = #{record.parameter,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_plugin_parameter + + + sub_task_id = #{subTaskId,jdbcType=BIGINT}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + plugin_id = #{pluginId,jdbcType=BIGINT}, + + + parameter = #{parameter,jdbcType=VARCHAR}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_plugin_parameter + set sub_task_id = #{subTaskId,jdbcType=BIGINT}, + member_id = #{memberId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + plugin_id = #{pluginId,jdbcType=BIGINT}, + parameter = #{parameter,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