diff --git a/research-admin/src/main/java/com/research/web/controller/client/HomeController.java b/research-admin/src/main/java/com/research/web/controller/client/HomeController.java index e7844860..ff851f2d 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/HomeController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/HomeController.java @@ -30,39 +30,43 @@ public class HomeController { @ApiOperation(value = "查询项目统计") @RequestMapping(value = "/queryHomeInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse queryHomeInfo(){ + public JsonResponse queryHomeInfo() { return JsonResponse.ok(homeService.queryHomeInfo()); } @ApiOperation(value = "查询课题统计") @RequestMapping(value = "/queryGroupList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> queryGroupList(){ + public JsonResponse> queryGroupList() { return JsonResponse.ok(homeService.queryGroupList()); } @ApiOperation(value = "查询任务统计") @RequestMapping(value = "/queryTaskList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> queryTaskList(){ + public JsonResponse> queryTaskList() { return JsonResponse.ok(homeService.queryTaskList()); } @ApiOperation(value = "查询合作单位成员统计") @RequestMapping(value = "/queryProjressMemberList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse queryProjressMemberList(){ + public JsonResponse queryProjressMemberList() { return JsonResponse.ok(homeService.queryProjressMemberList()); } @ApiOperation(value = "查询科研成功统计") @RequestMapping(value = "/queryAchievementList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> queryAchievementList(){ + public JsonResponse> queryAchievementList() { return JsonResponse.ok(homeService.queryAchievementList()); } @ApiOperation(value = "查询会议统计") @RequestMapping(value = "/queryMeetingList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> queryMeetingList(){ + public JsonResponse> queryMeetingList() { return JsonResponse.ok(homeService.queryMeetingList()); } - + @ApiOperation(value = "查询我的消息") + @RequestMapping(value = "/queryMessageList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryMessageList() { + return JsonResponse.ok(homeService.queryMessageList()); + } } diff --git a/research-admin/src/main/java/com/research/web/controller/client/pro/ProgressController.java b/research-admin/src/main/java/com/research/web/controller/client/pro/ProgressController.java index 8c6f16f6..10d8e69b 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/pro/ProgressController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/pro/ProgressController.java @@ -2,6 +2,7 @@ package com.research.web.controller.client.pro; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.research.common.annotation.Anonymous; import com.research.common.core.domain.BaseDto; import com.research.common.core.domain.JsonResponse; import com.research.system.domain.dto.CommonDto; @@ -34,6 +35,7 @@ public class ProgressController { @Resource private ProgressService progressService; + @Anonymous @PostMapping("/query") public JsonResponse> queryProgressList(@RequestBody @Validated BaseDto query){ if (query.getPageNum() >0) { diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/CooperatorController.java b/research-admin/src/main/java/com/research/web/controller/client/project/CooperatorController.java index 52e2ef78..2b39c818 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/project/CooperatorController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/project/CooperatorController.java @@ -2,6 +2,7 @@ package com.research.web.controller.client.project; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.research.common.annotation.Anonymous; import com.research.common.core.domain.BaseDto; import com.research.common.core.domain.JsonResponse; import com.research.system.domain.dto.ClientPrjProOrgDto; @@ -38,6 +39,7 @@ public class CooperatorController { @Resource private CooperatorService cooperatorService; + @Anonymous @PostMapping("/query") public JsonResponse> query(@RequestBody @Validated BaseDto dto){ if (dto.getPageNum() > 0) { diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java index 076511a2..bdb13473 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java @@ -70,14 +70,6 @@ public class GroupController { private ISysUserService sysUserService; @Resource private IFlowDefinitionService flowDefinitionService; - @Resource - private TmsTenantUserMapper tmsTenantUserMapper; - @Resource - private SrvDataSourceMapper srvDataSourceMapper; - @Resource - private TmsTenantMapper tmsTenantMapper; - @Resource - private TmsLoginService tmsLoginService; @Anonymous @PostMapping("/query") @@ -117,7 +109,7 @@ public class GroupController { // @DataSource(DataSourceType.MASTER) public JsonResponse addMember(@RequestBody @Validated GroupDto.AddMember dto) throws Exception { KtsKtGroupMember ktsKtGroupMember = ktsGroupService.addMember(dto); - aduit(ktsKtGroupMember.getId()); +// aduit(ktsKtGroupMember.getId()); return JsonResponse.ok(); } diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/MemberAduitController.java b/research-admin/src/main/java/com/research/web/controller/client/project/MemberAduitController.java index bef66f63..dd04f14c 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/project/MemberAduitController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/project/MemberAduitController.java @@ -1,10 +1,59 @@ package com.research.web.controller.client.project; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.research.common.annotation.Anonymous; +import com.research.common.core.domain.BaseDto; +import com.research.common.core.domain.JsonResponse; +import com.research.system.domain.dto.MemberAduitDto; +import com.research.system.domain.vo.MemberAduitVo; +import com.research.system.service.MemberAduitService; +import io.swagger.annotations.Api; +import liquibase.pro.packaged.J; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + /** * @Author zzc * @Package com.research.web.controller.client.project * @Date 2025/9/16 0:26 * @description: */ +@Slf4j +@Api(tags = "成员申请") +@RestController +@RequestMapping("/memberAduit") public class MemberAduitController { + + @Resource + private MemberAduitService memberAduitService; + + @Anonymous + @PostMapping("/register") + public JsonResponse register(@RequestBody @Validated MemberAduitDto.Register dto){ + memberAduitService.register(dto); + return JsonResponse.ok(); + + } + + @PostMapping("/query") + public JsonResponse> query(@RequestBody @Validated BaseDto dto){ + if (dto.getPageNum() > 0) { + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + } + return JsonResponse.ok(new PageInfo<>(memberAduitService.query(dto.getParam()))); + } + + @PostMapping("/aduit") + public JsonResponse aduit(@RequestBody @Validated MemberAduitDto.Aduit dto){ + memberAduitService.aduit(dto.getId(), dto.getStatus()); + return JsonResponse.ok(); + } } diff --git a/research-admin/src/main/java/com/research/web/controller/client/tms/TmsTenantController.java b/research-admin/src/main/java/com/research/web/controller/client/tms/TmsTenantController.java new file mode 100644 index 00000000..4536171b --- /dev/null +++ b/research-admin/src/main/java/com/research/web/controller/client/tms/TmsTenantController.java @@ -0,0 +1,53 @@ +package com.research.web.controller.client.tms; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.research.common.annotation.Anonymous; +import com.research.common.annotation.DataSource; +import com.research.common.core.domain.BaseDto; +import com.research.common.core.domain.JsonResponse; +import com.research.common.enums.DataSourceType; +import com.research.system.domain.dto.TaskDto; +import com.research.system.domain.po.TmsTenant; +import com.research.system.domain.po.TmsTenantExample; +import com.research.system.domain.vo.TaskVo; +import com.research.system.persist.mapper.TmsTenantMapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author zzc + * @Package com.research.web.controller.client.tms + * @Date 2025/9/16 9:38 + * @description: + */ +@RestController +@RequestMapping("/tenant") +@Api(tags = "任务相关") +@Slf4j +public class TmsTenantController { + + @Resource + private TmsTenantMapper tmsTenantMapper; + + @Anonymous + @ApiOperation(value = "查询租户（项目）") + @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @DataSource(DataSourceType.MASTER) + public JsonResponse> queryList() { + TmsTenantExample tmsTenantExample = new TmsTenantExample(); + tmsTenantExample.createCriteria().andDelFlagEqualTo((byte) 0); + return JsonResponse.ok(tmsTenantMapper.selectByExample(tmsTenantExample)); + } + +} diff --git a/research-admin/src/main/java/com/research/web/controller/system/SysRoleController.java b/research-admin/src/main/java/com/research/web/controller/system/SysRoleController.java index 65db94c4..e5af3e29 100644 --- a/research-admin/src/main/java/com/research/web/controller/system/SysRoleController.java +++ b/research-admin/src/main/java/com/research/web/controller/system/SysRoleController.java @@ -2,6 +2,8 @@ package com.research.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.research.common.annotation.Anonymous; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -182,7 +184,8 @@ public class SysRoleController extends BaseController /** * 获取角色选择框列表 */ - @PreAuthorize("@ss.hasPermi('system:role:query')") + @Anonymous +// @PreAuthorize("@ss.hasPermi('system:role:query')") @GetMapping("/optionselect") public AjaxResult optionselect() { diff --git a/research-admin/src/main/java/com/research/web/controller/system/SysUserController.java b/research-admin/src/main/java/com/research/web/controller/system/SysUserController.java index 4d1e3956..5574f18d 100644 --- a/research-admin/src/main/java/com/research/web/controller/system/SysUserController.java +++ b/research-admin/src/main/java/com/research/web/controller/system/SysUserController.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import com.research.common.annotation.Anonymous; import com.research.framework.aspectj.AdminGlobalDataSourceAspect; import com.research.framework.datasource.DynamicDataSourceContextHolder; import com.research.system.domain.po.TmsTenantUser; @@ -65,7 +66,8 @@ public class SysUserController extends BaseController /** * 获取用户列表 */ - @PreAuthorize("@ss.hasPermi('system:user:list')") + @Anonymous +// @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/list") public TableDataInfo list(SysUser user) { @@ -274,7 +276,8 @@ public class SysUserController extends BaseController /** * 获取部门树列表 */ - @PreAuthorize("@ss.hasPermi('system:user:list')") + @Anonymous +// @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/deptTree") public AjaxResult deptTree(SysDept dept) { diff --git a/research-framework/src/main/java/com/research/framework/aspectj/DataScopeAspect.java b/research-framework/src/main/java/com/research/framework/aspectj/DataScopeAspect.java index 02ed45e5..85a8e889 100644 --- a/research-framework/src/main/java/com/research/framework/aspectj/DataScopeAspect.java +++ b/research-framework/src/main/java/com/research/framework/aspectj/DataScopeAspect.java @@ -66,7 +66,7 @@ public class DataScopeAspect protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) { // 获取当前的用户 - LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginUser loginUser = SecurityUtils.getLoginUserOrNull(); if (StringUtils.isNotNull(loginUser)) { SysUser currentUser = loginUser.getUser(); diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml index e1476e34..b3d80520 100644 --- a/research-generator/src/main/resources/mbg.xml +++ b/research-generator/src/main/resources/mbg.xml @@ -65,14 +65,15 @@ - + -
+
+
diff --git a/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java b/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java new file mode 100644 index 00000000..0961f901 --- /dev/null +++ b/research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java @@ -0,0 +1,99 @@ +package com.research.system.domain.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Author zzc + * @Package com.research.system.domain.dto + * @Date 2025/9/16 8:50 + * @description: + */ +public class MemberAduitDto { + + @Data + public static class Register { + private Long id; + + private Long userId; + + private String username; + private String password; + private Long deptId; + + private List roleIdList; + + private Long ktGroupId; + + private String parentMemberId; + + private String memberName; + + private String memberPhone; + + private String memberEmail; + + private Byte memberGender; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date memberBirth; + + private Byte type; + + private Byte category; + + private Integer qualification; + + private Integer title; + + private Integer sort; + + private String intro; + + private Byte auditStatus; + + private Byte memberStatus; + @ApiModelProperty("0不确认，如用户表已有该手机号信息，则报错提示 1确认添加") + private Byte confirm; + + private Long projId; + + private Long projOrgId; + + private Long parentKtId; + + private String ktGroupName; + + private Integer ktGroupSort; + + private String ktGroupIntro; + + @ApiModelProperty("负责人手机号") + private String phone; + @ApiModelProperty("负责人") + private String name; + } + + @Data + public static class Aduit{ + private Long id; + private Byte status; + private String message; + } + + @Data + public static class Query { + private String username; + private String phone; + private String type; + private Long id; + private Long ktGroupId; + private String memberName; + private String memberPhone; + private Byte status; + } +} diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java index bf2b6834..4a1d2fd4 100644 --- a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java +++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java @@ -6,37 +6,39 @@ import java.util.Date; public class KtsKtGroupMemberAduit implements Serializable { private Long id; - private Long category; + private Byte category; private Long deptId; + private Long ktGroupId; + private String ktGroupIntro; - private String memberBirth; + private Date memberBirth; - private Byte memberEmail; + private String memberEmail; - private Date memberGender; + private Byte memberGender; - private Byte memberName; + private String memberName; - private Byte memberPhone; + private String memberPhone; - private Integer parentMemberId; + private Long parentMemberId; - private Integer password; + private String password; - private Integer projOrgId; + private Long projOrgId; private String roleIdList; - private Byte title; + private String title; private Byte type; - private Byte userId; + private Long userId; - private Byte username; + private String username; private Byte delFlag; @@ -50,6 +52,22 @@ public class KtsKtGroupMemberAduit implements Serializable { private String remark; + private Byte step; + + private Byte status; + + private String reviewer; + + private Integer qualification; + + private Long reviewedPersion; + + private Date reviewedTime; + + private Long parentKtId; + + private String ktGroupName; + private static final long serialVersionUID = 1L; public Long getId() { @@ -60,11 +78,11 @@ public class KtsKtGroupMemberAduit implements Serializable { this.id = id; } - public Long getCategory() { + public Byte getCategory() { return category; } - public void setCategory(Long category) { + public void setCategory(Byte category) { this.category = category; } @@ -76,6 +94,14 @@ public class KtsKtGroupMemberAduit implements Serializable { this.deptId = deptId; } + public Long getKtGroupId() { + return ktGroupId; + } + + public void setKtGroupId(Long ktGroupId) { + this.ktGroupId = ktGroupId; + } + public String getKtGroupIntro() { return ktGroupIntro; } @@ -84,67 +110,67 @@ public class KtsKtGroupMemberAduit implements Serializable { this.ktGroupIntro = ktGroupIntro == null ? null : ktGroupIntro.trim(); } - public String getMemberBirth() { + public Date getMemberBirth() { return memberBirth; } - public void setMemberBirth(String memberBirth) { - this.memberBirth = memberBirth == null ? null : memberBirth.trim(); + public void setMemberBirth(Date memberBirth) { + this.memberBirth = memberBirth; } - public Byte getMemberEmail() { + public String getMemberEmail() { return memberEmail; } - public void setMemberEmail(Byte memberEmail) { - this.memberEmail = memberEmail; + public void setMemberEmail(String memberEmail) { + this.memberEmail = memberEmail == null ? null : memberEmail.trim(); } - public Date getMemberGender() { + public Byte getMemberGender() { return memberGender; } - public void setMemberGender(Date memberGender) { + public void setMemberGender(Byte memberGender) { this.memberGender = memberGender; } - public Byte getMemberName() { + public String getMemberName() { return memberName; } - public void setMemberName(Byte memberName) { - this.memberName = memberName; + public void setMemberName(String memberName) { + this.memberName = memberName == null ? null : memberName.trim(); } - public Byte getMemberPhone() { + public String getMemberPhone() { return memberPhone; } - public void setMemberPhone(Byte memberPhone) { - this.memberPhone = memberPhone; + public void setMemberPhone(String memberPhone) { + this.memberPhone = memberPhone == null ? null : memberPhone.trim(); } - public Integer getParentMemberId() { + public Long getParentMemberId() { return parentMemberId; } - public void setParentMemberId(Integer parentMemberId) { + public void setParentMemberId(Long parentMemberId) { this.parentMemberId = parentMemberId; } - public Integer getPassword() { + public String getPassword() { return password; } - public void setPassword(Integer password) { - this.password = password; + public void setPassword(String password) { + this.password = password == null ? null : password.trim(); } - public Integer getProjOrgId() { + public Long getProjOrgId() { return projOrgId; } - public void setProjOrgId(Integer projOrgId) { + public void setProjOrgId(Long projOrgId) { this.projOrgId = projOrgId; } @@ -156,12 +182,12 @@ public class KtsKtGroupMemberAduit implements Serializable { this.roleIdList = roleIdList == null ? null : roleIdList.trim(); } - public Byte getTitle() { + public String getTitle() { return title; } - public void setTitle(Byte title) { - this.title = title; + public void setTitle(String title) { + this.title = title == null ? null : title.trim(); } public Byte getType() { @@ -172,20 +198,20 @@ public class KtsKtGroupMemberAduit implements Serializable { this.type = type; } - public Byte getUserId() { + public Long getUserId() { return userId; } - public void setUserId(Byte userId) { + public void setUserId(Long userId) { this.userId = userId; } - public Byte getUsername() { + public String getUsername() { return username; } - public void setUsername(Byte username) { - this.username = username; + public void setUsername(String username) { + this.username = username == null ? null : username.trim(); } public Byte getDelFlag() { @@ -236,6 +262,70 @@ public class KtsKtGroupMemberAduit implements Serializable { this.remark = remark == null ? null : remark.trim(); } + public Byte getStep() { + return step; + } + + public void setStep(Byte step) { + this.step = step; + } + + public Byte getStatus() { + return status; + } + + public void setStatus(Byte status) { + this.status = status; + } + + public String getReviewer() { + return reviewer; + } + + public void setReviewer(String reviewer) { + this.reviewer = reviewer == null ? null : reviewer.trim(); + } + + public Integer getQualification() { + return qualification; + } + + public void setQualification(Integer qualification) { + this.qualification = qualification; + } + + public Long getReviewedPersion() { + return reviewedPersion; + } + + public void setReviewedPersion(Long reviewedPersion) { + this.reviewedPersion = reviewedPersion; + } + + public Date getReviewedTime() { + return reviewedTime; + } + + public void setReviewedTime(Date reviewedTime) { + this.reviewedTime = reviewedTime; + } + + public Long getParentKtId() { + return parentKtId; + } + + public void setParentKtId(Long parentKtId) { + this.parentKtId = parentKtId; + } + + public String getKtGroupName() { + return ktGroupName; + } + + public void setKtGroupName(String ktGroupName) { + this.ktGroupName = ktGroupName == null ? null : ktGroupName.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -245,6 +335,7 @@ public class KtsKtGroupMemberAduit implements Serializable { sb.append(", id=").append(id); sb.append(", category=").append(category); sb.append(", deptId=").append(deptId); + sb.append(", ktGroupId=").append(ktGroupId); sb.append(", ktGroupIntro=").append(ktGroupIntro); sb.append(", memberBirth=").append(memberBirth); sb.append(", memberEmail=").append(memberEmail); @@ -265,6 +356,14 @@ public class KtsKtGroupMemberAduit implements Serializable { sb.append(", updateBy=").append(updateBy); sb.append(", updateTime=").append(updateTime); sb.append(", remark=").append(remark); + sb.append(", step=").append(step); + sb.append(", status=").append(status); + sb.append(", reviewer=").append(reviewer); + sb.append(", qualification=").append(qualification); + sb.append(", reviewedPersion=").append(reviewedPersion); + sb.append(", reviewedTime=").append(reviewedTime); + sb.append(", parentKtId=").append(parentKtId); + sb.append(", ktGroupName=").append(ktGroupName); sb.append("]"); return sb.toString(); } diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java index f999fa14..3119c61d 100644 --- a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java +++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java @@ -2,7 +2,6 @@ package com.research.system.domain.po; import java.util.ArrayList; import java.util.Date; -import java.util.Iterator; import java.util.List; public class KtsKtGroupMemberAduitExample { @@ -106,32 +105,6 @@ public class KtsKtGroupMemberAduitExample { criteria.add(new Criterion(condition, value1, value2)); } - protected void addCriterionForJDBCDate(String condition, Date value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - addCriterion(condition, new java.sql.Date(value.getTime()), property); - } - - protected void addCriterionForJDBCDate(String condition, List values, String property) { - if (values == null || values.size() == 0) { - throw new RuntimeException("Value list for " + property + " cannot be null or empty"); - } - List dateList = new ArrayList(); - Iterator iter = values.iterator(); - while (iter.hasNext()) { - dateList.add(new java.sql.Date(iter.next().getTime())); - } - addCriterion(condition, dateList, property); - } - - protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property); - } - public Criteria andIdIsNull() { addCriterion("id is null"); return (Criteria) this; @@ -202,52 +175,52 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andCategoryEqualTo(Long value) { + public Criteria andCategoryEqualTo(Byte value) { addCriterion("category =", value, "category"); return (Criteria) this; } - public Criteria andCategoryNotEqualTo(Long value) { + public Criteria andCategoryNotEqualTo(Byte value) { addCriterion("category <>", value, "category"); return (Criteria) this; } - public Criteria andCategoryGreaterThan(Long value) { + public Criteria andCategoryGreaterThan(Byte value) { addCriterion("category >", value, "category"); return (Criteria) this; } - public Criteria andCategoryGreaterThanOrEqualTo(Long value) { + public Criteria andCategoryGreaterThanOrEqualTo(Byte value) { addCriterion("category >=", value, "category"); return (Criteria) this; } - public Criteria andCategoryLessThan(Long value) { + public Criteria andCategoryLessThan(Byte value) { addCriterion("category <", value, "category"); return (Criteria) this; } - public Criteria andCategoryLessThanOrEqualTo(Long value) { + public Criteria andCategoryLessThanOrEqualTo(Byte value) { addCriterion("category <=", value, "category"); return (Criteria) this; } - public Criteria andCategoryIn(List values) { + public Criteria andCategoryIn(List values) { addCriterion("category in", values, "category"); return (Criteria) this; } - public Criteria andCategoryNotIn(List values) { + public Criteria andCategoryNotIn(List values) { addCriterion("category not in", values, "category"); return (Criteria) this; } - public Criteria andCategoryBetween(Long value1, Long value2) { + public Criteria andCategoryBetween(Byte value1, Byte value2) { addCriterion("category between", value1, value2, "category"); return (Criteria) this; } - public Criteria andCategoryNotBetween(Long value1, Long value2) { + public Criteria andCategoryNotBetween(Byte value1, Byte value2) { addCriterion("category not between", value1, value2, "category"); return (Criteria) this; } @@ -312,6 +285,66 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } + public Criteria andKtGroupIdIsNull() { + addCriterion("kt_group_id is null"); + return (Criteria) this; + } + + public Criteria andKtGroupIdIsNotNull() { + addCriterion("kt_group_id is not null"); + return (Criteria) this; + } + + public Criteria andKtGroupIdEqualTo(Long value) { + addCriterion("kt_group_id =", value, "ktGroupId"); + return (Criteria) this; + } + + public Criteria andKtGroupIdNotEqualTo(Long value) { + addCriterion("kt_group_id <>", value, "ktGroupId"); + return (Criteria) this; + } + + public Criteria andKtGroupIdGreaterThan(Long value) { + addCriterion("kt_group_id >", value, "ktGroupId"); + return (Criteria) this; + } + + public Criteria andKtGroupIdGreaterThanOrEqualTo(Long value) { + addCriterion("kt_group_id >=", value, "ktGroupId"); + return (Criteria) this; + } + + public Criteria andKtGroupIdLessThan(Long value) { + addCriterion("kt_group_id <", value, "ktGroupId"); + return (Criteria) this; + } + + public Criteria andKtGroupIdLessThanOrEqualTo(Long value) { + addCriterion("kt_group_id <=", value, "ktGroupId"); + return (Criteria) this; + } + + public Criteria andKtGroupIdIn(List values) { + addCriterion("kt_group_id in", values, "ktGroupId"); + return (Criteria) this; + } + + public Criteria andKtGroupIdNotIn(List values) { + addCriterion("kt_group_id not in", values, "ktGroupId"); + return (Criteria) this; + } + + public Criteria andKtGroupIdBetween(Long value1, Long value2) { + addCriterion("kt_group_id between", value1, value2, "ktGroupId"); + return (Criteria) this; + } + + public Criteria andKtGroupIdNotBetween(Long value1, Long value2) { + addCriterion("kt_group_id not between", value1, value2, "ktGroupId"); + return (Criteria) this; + } + public Criteria andKtGroupIntroIsNull() { addCriterion("kt_group_intro is null"); return (Criteria) this; @@ -392,62 +425,52 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andMemberBirthEqualTo(String value) { + public Criteria andMemberBirthEqualTo(Date value) { addCriterion("member_birth =", value, "memberBirth"); return (Criteria) this; } - public Criteria andMemberBirthNotEqualTo(String value) { + public Criteria andMemberBirthNotEqualTo(Date value) { addCriterion("member_birth <>", value, "memberBirth"); return (Criteria) this; } - public Criteria andMemberBirthGreaterThan(String value) { + public Criteria andMemberBirthGreaterThan(Date value) { addCriterion("member_birth >", value, "memberBirth"); return (Criteria) this; } - public Criteria andMemberBirthGreaterThanOrEqualTo(String value) { + public Criteria andMemberBirthGreaterThanOrEqualTo(Date value) { addCriterion("member_birth >=", value, "memberBirth"); return (Criteria) this; } - public Criteria andMemberBirthLessThan(String value) { + public Criteria andMemberBirthLessThan(Date value) { addCriterion("member_birth <", value, "memberBirth"); return (Criteria) this; } - public Criteria andMemberBirthLessThanOrEqualTo(String value) { + public Criteria andMemberBirthLessThanOrEqualTo(Date value) { addCriterion("member_birth <=", value, "memberBirth"); return (Criteria) this; } - public Criteria andMemberBirthLike(String value) { - addCriterion("member_birth like", value, "memberBirth"); - return (Criteria) this; - } - - public Criteria andMemberBirthNotLike(String value) { - addCriterion("member_birth not like", value, "memberBirth"); - return (Criteria) this; - } - - public Criteria andMemberBirthIn(List values) { + public Criteria andMemberBirthIn(List values) { addCriterion("member_birth in", values, "memberBirth"); return (Criteria) this; } - public Criteria andMemberBirthNotIn(List values) { + public Criteria andMemberBirthNotIn(List values) { addCriterion("member_birth not in", values, "memberBirth"); return (Criteria) this; } - public Criteria andMemberBirthBetween(String value1, String value2) { + public Criteria andMemberBirthBetween(Date value1, Date value2) { addCriterion("member_birth between", value1, value2, "memberBirth"); return (Criteria) this; } - public Criteria andMemberBirthNotBetween(String value1, String value2) { + public Criteria andMemberBirthNotBetween(Date value1, Date value2) { addCriterion("member_birth not between", value1, value2, "memberBirth"); return (Criteria) this; } @@ -462,52 +485,62 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andMemberEmailEqualTo(Byte value) { + public Criteria andMemberEmailEqualTo(String value) { addCriterion("member_email =", value, "memberEmail"); return (Criteria) this; } - public Criteria andMemberEmailNotEqualTo(Byte value) { + public Criteria andMemberEmailNotEqualTo(String value) { addCriterion("member_email <>", value, "memberEmail"); return (Criteria) this; } - public Criteria andMemberEmailGreaterThan(Byte value) { + public Criteria andMemberEmailGreaterThan(String value) { addCriterion("member_email >", value, "memberEmail"); return (Criteria) this; } - public Criteria andMemberEmailGreaterThanOrEqualTo(Byte value) { + public Criteria andMemberEmailGreaterThanOrEqualTo(String value) { addCriterion("member_email >=", value, "memberEmail"); return (Criteria) this; } - public Criteria andMemberEmailLessThan(Byte value) { + public Criteria andMemberEmailLessThan(String value) { addCriterion("member_email <", value, "memberEmail"); return (Criteria) this; } - public Criteria andMemberEmailLessThanOrEqualTo(Byte value) { + public Criteria andMemberEmailLessThanOrEqualTo(String value) { addCriterion("member_email <=", value, "memberEmail"); return (Criteria) this; } - public Criteria andMemberEmailIn(List values) { + public Criteria andMemberEmailLike(String value) { + addCriterion("member_email like", value, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailNotLike(String value) { + addCriterion("member_email not like", value, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailIn(List values) { addCriterion("member_email in", values, "memberEmail"); return (Criteria) this; } - public Criteria andMemberEmailNotIn(List values) { + public Criteria andMemberEmailNotIn(List values) { addCriterion("member_email not in", values, "memberEmail"); return (Criteria) this; } - public Criteria andMemberEmailBetween(Byte value1, Byte value2) { + public Criteria andMemberEmailBetween(String value1, String value2) { addCriterion("member_email between", value1, value2, "memberEmail"); return (Criteria) this; } - public Criteria andMemberEmailNotBetween(Byte value1, Byte value2) { + public Criteria andMemberEmailNotBetween(String value1, String value2) { addCriterion("member_email not between", value1, value2, "memberEmail"); return (Criteria) this; } @@ -522,53 +555,53 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andMemberGenderEqualTo(Date value) { - addCriterionForJDBCDate("member_gender =", value, "memberGender"); + public Criteria andMemberGenderEqualTo(Byte value) { + addCriterion("member_gender =", value, "memberGender"); return (Criteria) this; } - public Criteria andMemberGenderNotEqualTo(Date value) { - addCriterionForJDBCDate("member_gender <>", value, "memberGender"); + public Criteria andMemberGenderNotEqualTo(Byte value) { + addCriterion("member_gender <>", value, "memberGender"); return (Criteria) this; } - public Criteria andMemberGenderGreaterThan(Date value) { - addCriterionForJDBCDate("member_gender >", value, "memberGender"); + public Criteria andMemberGenderGreaterThan(Byte value) { + addCriterion("member_gender >", value, "memberGender"); return (Criteria) this; } - public Criteria andMemberGenderGreaterThanOrEqualTo(Date value) { - addCriterionForJDBCDate("member_gender >=", value, "memberGender"); + public Criteria andMemberGenderGreaterThanOrEqualTo(Byte value) { + addCriterion("member_gender >=", value, "memberGender"); return (Criteria) this; } - public Criteria andMemberGenderLessThan(Date value) { - addCriterionForJDBCDate("member_gender <", value, "memberGender"); + public Criteria andMemberGenderLessThan(Byte value) { + addCriterion("member_gender <", value, "memberGender"); return (Criteria) this; } - public Criteria andMemberGenderLessThanOrEqualTo(Date value) { - addCriterionForJDBCDate("member_gender <=", value, "memberGender"); + public Criteria andMemberGenderLessThanOrEqualTo(Byte value) { + addCriterion("member_gender <=", value, "memberGender"); return (Criteria) this; } - public Criteria andMemberGenderIn(List values) { - addCriterionForJDBCDate("member_gender in", values, "memberGender"); + public Criteria andMemberGenderIn(List values) { + addCriterion("member_gender in", values, "memberGender"); return (Criteria) this; } - public Criteria andMemberGenderNotIn(List values) { - addCriterionForJDBCDate("member_gender not in", values, "memberGender"); + public Criteria andMemberGenderNotIn(List values) { + addCriterion("member_gender not in", values, "memberGender"); return (Criteria) this; } - public Criteria andMemberGenderBetween(Date value1, Date value2) { - addCriterionForJDBCDate("member_gender between", value1, value2, "memberGender"); + public Criteria andMemberGenderBetween(Byte value1, Byte value2) { + addCriterion("member_gender between", value1, value2, "memberGender"); return (Criteria) this; } - public Criteria andMemberGenderNotBetween(Date value1, Date value2) { - addCriterionForJDBCDate("member_gender not between", value1, value2, "memberGender"); + public Criteria andMemberGenderNotBetween(Byte value1, Byte value2) { + addCriterion("member_gender not between", value1, value2, "memberGender"); return (Criteria) this; } @@ -582,52 +615,62 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andMemberNameEqualTo(Byte value) { + public Criteria andMemberNameEqualTo(String value) { addCriterion("member_name =", value, "memberName"); return (Criteria) this; } - public Criteria andMemberNameNotEqualTo(Byte value) { + public Criteria andMemberNameNotEqualTo(String value) { addCriterion("member_name <>", value, "memberName"); return (Criteria) this; } - public Criteria andMemberNameGreaterThan(Byte value) { + public Criteria andMemberNameGreaterThan(String value) { addCriterion("member_name >", value, "memberName"); return (Criteria) this; } - public Criteria andMemberNameGreaterThanOrEqualTo(Byte value) { + public Criteria andMemberNameGreaterThanOrEqualTo(String value) { addCriterion("member_name >=", value, "memberName"); return (Criteria) this; } - public Criteria andMemberNameLessThan(Byte value) { + public Criteria andMemberNameLessThan(String value) { addCriterion("member_name <", value, "memberName"); return (Criteria) this; } - public Criteria andMemberNameLessThanOrEqualTo(Byte value) { + public Criteria andMemberNameLessThanOrEqualTo(String value) { addCriterion("member_name <=", value, "memberName"); return (Criteria) this; } - public Criteria andMemberNameIn(List values) { + public Criteria andMemberNameLike(String value) { + addCriterion("member_name like", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameNotLike(String value) { + addCriterion("member_name not like", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameIn(List values) { addCriterion("member_name in", values, "memberName"); return (Criteria) this; } - public Criteria andMemberNameNotIn(List values) { + public Criteria andMemberNameNotIn(List values) { addCriterion("member_name not in", values, "memberName"); return (Criteria) this; } - public Criteria andMemberNameBetween(Byte value1, Byte value2) { + public Criteria andMemberNameBetween(String value1, String value2) { addCriterion("member_name between", value1, value2, "memberName"); return (Criteria) this; } - public Criteria andMemberNameNotBetween(Byte value1, Byte value2) { + public Criteria andMemberNameNotBetween(String value1, String value2) { addCriterion("member_name not between", value1, value2, "memberName"); return (Criteria) this; } @@ -642,52 +685,62 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andMemberPhoneEqualTo(Byte value) { + public Criteria andMemberPhoneEqualTo(String value) { addCriterion("member_phone =", value, "memberPhone"); return (Criteria) this; } - public Criteria andMemberPhoneNotEqualTo(Byte value) { + public Criteria andMemberPhoneNotEqualTo(String value) { addCriterion("member_phone <>", value, "memberPhone"); return (Criteria) this; } - public Criteria andMemberPhoneGreaterThan(Byte value) { + public Criteria andMemberPhoneGreaterThan(String value) { addCriterion("member_phone >", value, "memberPhone"); return (Criteria) this; } - public Criteria andMemberPhoneGreaterThanOrEqualTo(Byte value) { + public Criteria andMemberPhoneGreaterThanOrEqualTo(String value) { addCriterion("member_phone >=", value, "memberPhone"); return (Criteria) this; } - public Criteria andMemberPhoneLessThan(Byte value) { + public Criteria andMemberPhoneLessThan(String value) { addCriterion("member_phone <", value, "memberPhone"); return (Criteria) this; } - public Criteria andMemberPhoneLessThanOrEqualTo(Byte value) { + public Criteria andMemberPhoneLessThanOrEqualTo(String value) { addCriterion("member_phone <=", value, "memberPhone"); return (Criteria) this; } - public Criteria andMemberPhoneIn(List values) { + public Criteria andMemberPhoneLike(String value) { + addCriterion("member_phone like", value, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneNotLike(String value) { + addCriterion("member_phone not like", value, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneIn(List values) { addCriterion("member_phone in", values, "memberPhone"); return (Criteria) this; } - public Criteria andMemberPhoneNotIn(List values) { + public Criteria andMemberPhoneNotIn(List values) { addCriterion("member_phone not in", values, "memberPhone"); return (Criteria) this; } - public Criteria andMemberPhoneBetween(Byte value1, Byte value2) { + public Criteria andMemberPhoneBetween(String value1, String value2) { addCriterion("member_phone between", value1, value2, "memberPhone"); return (Criteria) this; } - public Criteria andMemberPhoneNotBetween(Byte value1, Byte value2) { + public Criteria andMemberPhoneNotBetween(String value1, String value2) { addCriterion("member_phone not between", value1, value2, "memberPhone"); return (Criteria) this; } @@ -702,52 +755,52 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andParentMemberIdEqualTo(Integer value) { + public Criteria andParentMemberIdEqualTo(Long value) { addCriterion("parent_member_id =", value, "parentMemberId"); return (Criteria) this; } - public Criteria andParentMemberIdNotEqualTo(Integer value) { + public Criteria andParentMemberIdNotEqualTo(Long value) { addCriterion("parent_member_id <>", value, "parentMemberId"); return (Criteria) this; } - public Criteria andParentMemberIdGreaterThan(Integer value) { + public Criteria andParentMemberIdGreaterThan(Long value) { addCriterion("parent_member_id >", value, "parentMemberId"); return (Criteria) this; } - public Criteria andParentMemberIdGreaterThanOrEqualTo(Integer value) { + public Criteria andParentMemberIdGreaterThanOrEqualTo(Long value) { addCriterion("parent_member_id >=", value, "parentMemberId"); return (Criteria) this; } - public Criteria andParentMemberIdLessThan(Integer value) { + public Criteria andParentMemberIdLessThan(Long value) { addCriterion("parent_member_id <", value, "parentMemberId"); return (Criteria) this; } - public Criteria andParentMemberIdLessThanOrEqualTo(Integer value) { + public Criteria andParentMemberIdLessThanOrEqualTo(Long value) { addCriterion("parent_member_id <=", value, "parentMemberId"); return (Criteria) this; } - public Criteria andParentMemberIdIn(List values) { + public Criteria andParentMemberIdIn(List values) { addCriterion("parent_member_id in", values, "parentMemberId"); return (Criteria) this; } - public Criteria andParentMemberIdNotIn(List values) { + public Criteria andParentMemberIdNotIn(List values) { addCriterion("parent_member_id not in", values, "parentMemberId"); return (Criteria) this; } - public Criteria andParentMemberIdBetween(Integer value1, Integer value2) { + public Criteria andParentMemberIdBetween(Long value1, Long value2) { addCriterion("parent_member_id between", value1, value2, "parentMemberId"); return (Criteria) this; } - public Criteria andParentMemberIdNotBetween(Integer value1, Integer value2) { + public Criteria andParentMemberIdNotBetween(Long value1, Long value2) { addCriterion("parent_member_id not between", value1, value2, "parentMemberId"); return (Criteria) this; } @@ -762,52 +815,62 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andPasswordEqualTo(Integer value) { + public Criteria andPasswordEqualTo(String value) { addCriterion("password =", value, "password"); return (Criteria) this; } - public Criteria andPasswordNotEqualTo(Integer value) { + public Criteria andPasswordNotEqualTo(String value) { addCriterion("password <>", value, "password"); return (Criteria) this; } - public Criteria andPasswordGreaterThan(Integer value) { + public Criteria andPasswordGreaterThan(String value) { addCriterion("password >", value, "password"); return (Criteria) this; } - public Criteria andPasswordGreaterThanOrEqualTo(Integer value) { + public Criteria andPasswordGreaterThanOrEqualTo(String value) { addCriterion("password >=", value, "password"); return (Criteria) this; } - public Criteria andPasswordLessThan(Integer value) { + public Criteria andPasswordLessThan(String value) { addCriterion("password <", value, "password"); return (Criteria) this; } - public Criteria andPasswordLessThanOrEqualTo(Integer value) { + public Criteria andPasswordLessThanOrEqualTo(String value) { addCriterion("password <=", value, "password"); return (Criteria) this; } - public Criteria andPasswordIn(List values) { + public Criteria andPasswordLike(String value) { + addCriterion("password like", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotLike(String value) { + addCriterion("password not like", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordIn(List values) { addCriterion("password in", values, "password"); return (Criteria) this; } - public Criteria andPasswordNotIn(List values) { + public Criteria andPasswordNotIn(List values) { addCriterion("password not in", values, "password"); return (Criteria) this; } - public Criteria andPasswordBetween(Integer value1, Integer value2) { + public Criteria andPasswordBetween(String value1, String value2) { addCriterion("password between", value1, value2, "password"); return (Criteria) this; } - public Criteria andPasswordNotBetween(Integer value1, Integer value2) { + public Criteria andPasswordNotBetween(String value1, String value2) { addCriterion("password not between", value1, value2, "password"); return (Criteria) this; } @@ -822,52 +885,52 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andProjOrgIdEqualTo(Integer value) { + public Criteria andProjOrgIdEqualTo(Long value) { addCriterion("proj_org_id =", value, "projOrgId"); return (Criteria) this; } - public Criteria andProjOrgIdNotEqualTo(Integer value) { + public Criteria andProjOrgIdNotEqualTo(Long value) { addCriterion("proj_org_id <>", value, "projOrgId"); return (Criteria) this; } - public Criteria andProjOrgIdGreaterThan(Integer value) { + public Criteria andProjOrgIdGreaterThan(Long value) { addCriterion("proj_org_id >", value, "projOrgId"); return (Criteria) this; } - public Criteria andProjOrgIdGreaterThanOrEqualTo(Integer value) { + public Criteria andProjOrgIdGreaterThanOrEqualTo(Long value) { addCriterion("proj_org_id >=", value, "projOrgId"); return (Criteria) this; } - public Criteria andProjOrgIdLessThan(Integer value) { + public Criteria andProjOrgIdLessThan(Long value) { addCriterion("proj_org_id <", value, "projOrgId"); return (Criteria) this; } - public Criteria andProjOrgIdLessThanOrEqualTo(Integer value) { + public Criteria andProjOrgIdLessThanOrEqualTo(Long value) { addCriterion("proj_org_id <=", value, "projOrgId"); return (Criteria) this; } - public Criteria andProjOrgIdIn(List values) { + public Criteria andProjOrgIdIn(List values) { addCriterion("proj_org_id in", values, "projOrgId"); return (Criteria) this; } - public Criteria andProjOrgIdNotIn(List values) { + public Criteria andProjOrgIdNotIn(List values) { addCriterion("proj_org_id not in", values, "projOrgId"); return (Criteria) this; } - public Criteria andProjOrgIdBetween(Integer value1, Integer value2) { + public Criteria andProjOrgIdBetween(Long value1, Long value2) { addCriterion("proj_org_id between", value1, value2, "projOrgId"); return (Criteria) this; } - public Criteria andProjOrgIdNotBetween(Integer value1, Integer value2) { + public Criteria andProjOrgIdNotBetween(Long value1, Long value2) { addCriterion("proj_org_id not between", value1, value2, "projOrgId"); return (Criteria) this; } @@ -952,52 +1015,62 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andTitleEqualTo(Byte value) { + public Criteria andTitleEqualTo(String value) { addCriterion("title =", value, "title"); return (Criteria) this; } - public Criteria andTitleNotEqualTo(Byte value) { + public Criteria andTitleNotEqualTo(String value) { addCriterion("title <>", value, "title"); return (Criteria) this; } - public Criteria andTitleGreaterThan(Byte value) { + public Criteria andTitleGreaterThan(String value) { addCriterion("title >", value, "title"); return (Criteria) this; } - public Criteria andTitleGreaterThanOrEqualTo(Byte value) { + public Criteria andTitleGreaterThanOrEqualTo(String value) { addCriterion("title >=", value, "title"); return (Criteria) this; } - public Criteria andTitleLessThan(Byte value) { + public Criteria andTitleLessThan(String value) { addCriterion("title <", value, "title"); return (Criteria) this; } - public Criteria andTitleLessThanOrEqualTo(Byte value) { + public Criteria andTitleLessThanOrEqualTo(String value) { addCriterion("title <=", value, "title"); return (Criteria) this; } - public Criteria andTitleIn(List values) { + public Criteria andTitleLike(String value) { + addCriterion("title like", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotLike(String value) { + addCriterion("title not like", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleIn(List values) { addCriterion("title in", values, "title"); return (Criteria) this; } - public Criteria andTitleNotIn(List values) { + public Criteria andTitleNotIn(List values) { addCriterion("title not in", values, "title"); return (Criteria) this; } - public Criteria andTitleBetween(Byte value1, Byte value2) { + public Criteria andTitleBetween(String value1, String value2) { addCriterion("title between", value1, value2, "title"); return (Criteria) this; } - public Criteria andTitleNotBetween(Byte value1, Byte value2) { + public Criteria andTitleNotBetween(String value1, String value2) { addCriterion("title not between", value1, value2, "title"); return (Criteria) this; } @@ -1072,52 +1145,52 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andUserIdEqualTo(Byte value) { + public Criteria andUserIdEqualTo(Long value) { addCriterion("user_id =", value, "userId"); return (Criteria) this; } - public Criteria andUserIdNotEqualTo(Byte value) { + public Criteria andUserIdNotEqualTo(Long value) { addCriterion("user_id <>", value, "userId"); return (Criteria) this; } - public Criteria andUserIdGreaterThan(Byte value) { + public Criteria andUserIdGreaterThan(Long value) { addCriterion("user_id >", value, "userId"); return (Criteria) this; } - public Criteria andUserIdGreaterThanOrEqualTo(Byte value) { + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { addCriterion("user_id >=", value, "userId"); return (Criteria) this; } - public Criteria andUserIdLessThan(Byte value) { + public Criteria andUserIdLessThan(Long value) { addCriterion("user_id <", value, "userId"); return (Criteria) this; } - public Criteria andUserIdLessThanOrEqualTo(Byte value) { + public Criteria andUserIdLessThanOrEqualTo(Long value) { addCriterion("user_id <=", value, "userId"); return (Criteria) this; } - public Criteria andUserIdIn(List values) { + public Criteria andUserIdIn(List values) { addCriterion("user_id in", values, "userId"); return (Criteria) this; } - public Criteria andUserIdNotIn(List values) { + public Criteria andUserIdNotIn(List values) { addCriterion("user_id not in", values, "userId"); return (Criteria) this; } - public Criteria andUserIdBetween(Byte value1, Byte value2) { + public Criteria andUserIdBetween(Long value1, Long value2) { addCriterion("user_id between", value1, value2, "userId"); return (Criteria) this; } - public Criteria andUserIdNotBetween(Byte value1, Byte value2) { + public Criteria andUserIdNotBetween(Long value1, Long value2) { addCriterion("user_id not between", value1, value2, "userId"); return (Criteria) this; } @@ -1132,52 +1205,62 @@ public class KtsKtGroupMemberAduitExample { return (Criteria) this; } - public Criteria andUsernameEqualTo(Byte value) { + public Criteria andUsernameEqualTo(String value) { addCriterion("username =", value, "username"); return (Criteria) this; } - public Criteria andUsernameNotEqualTo(Byte value) { + public Criteria andUsernameNotEqualTo(String value) { addCriterion("username <>", value, "username"); return (Criteria) this; } - public Criteria andUsernameGreaterThan(Byte value) { + public Criteria andUsernameGreaterThan(String value) { addCriterion("username >", value, "username"); return (Criteria) this; } - public Criteria andUsernameGreaterThanOrEqualTo(Byte value) { + public Criteria andUsernameGreaterThanOrEqualTo(String value) { addCriterion("username >=", value, "username"); return (Criteria) this; } - public Criteria andUsernameLessThan(Byte value) { + public Criteria andUsernameLessThan(String value) { addCriterion("username <", value, "username"); return (Criteria) this; } - public Criteria andUsernameLessThanOrEqualTo(Byte value) { + public Criteria andUsernameLessThanOrEqualTo(String value) { addCriterion("username <=", value, "username"); return (Criteria) this; } - public Criteria andUsernameIn(List values) { + public Criteria andUsernameLike(String value) { + addCriterion("username like", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotLike(String value) { + addCriterion("username not like", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameIn(List values) { addCriterion("username in", values, "username"); return (Criteria) this; } - public Criteria andUsernameNotIn(List values) { + public Criteria andUsernameNotIn(List values) { addCriterion("username not in", values, "username"); return (Criteria) this; } - public Criteria andUsernameBetween(Byte value1, Byte value2) { + public Criteria andUsernameBetween(String value1, String value2) { addCriterion("username between", value1, value2, "username"); return (Criteria) this; } - public Criteria andUsernameNotBetween(Byte value1, Byte value2) { + public Criteria andUsernameNotBetween(String value1, String value2) { addCriterion("username not between", value1, value2, "username"); return (Criteria) this; } @@ -1571,6 +1654,506 @@ public class KtsKtGroupMemberAduitExample { addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } + + public Criteria andStepIsNull() { + addCriterion("step is null"); + return (Criteria) this; + } + + public Criteria andStepIsNotNull() { + addCriterion("step is not null"); + return (Criteria) this; + } + + public Criteria andStepEqualTo(Byte value) { + addCriterion("step =", value, "step"); + return (Criteria) this; + } + + public Criteria andStepNotEqualTo(Byte value) { + addCriterion("step <>", value, "step"); + return (Criteria) this; + } + + public Criteria andStepGreaterThan(Byte value) { + addCriterion("step >", value, "step"); + return (Criteria) this; + } + + public Criteria andStepGreaterThanOrEqualTo(Byte value) { + addCriterion("step >=", value, "step"); + return (Criteria) this; + } + + public Criteria andStepLessThan(Byte value) { + addCriterion("step <", value, "step"); + return (Criteria) this; + } + + public Criteria andStepLessThanOrEqualTo(Byte value) { + addCriterion("step <=", value, "step"); + return (Criteria) this; + } + + public Criteria andStepIn(List values) { + addCriterion("step in", values, "step"); + return (Criteria) this; + } + + public Criteria andStepNotIn(List values) { + addCriterion("step not in", values, "step"); + return (Criteria) this; + } + + public Criteria andStepBetween(Byte value1, Byte value2) { + addCriterion("step between", value1, value2, "step"); + return (Criteria) this; + } + + public Criteria andStepNotBetween(Byte value1, Byte value2) { + addCriterion("step not between", value1, value2, "step"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("status is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("status is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Byte value) { + addCriterion("status =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Byte value) { + addCriterion("status <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Byte value) { + addCriterion("status >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("status >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Byte value) { + addCriterion("status <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Byte value) { + addCriterion("status <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("status not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Byte value1, Byte value2) { + addCriterion("status between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Byte value1, Byte value2) { + addCriterion("status not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andReviewerIsNull() { + addCriterion("reviewer is null"); + return (Criteria) this; + } + + public Criteria andReviewerIsNotNull() { + addCriterion("reviewer is not null"); + return (Criteria) this; + } + + public Criteria andReviewerEqualTo(String value) { + addCriterion("reviewer =", value, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerNotEqualTo(String value) { + addCriterion("reviewer <>", value, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerGreaterThan(String value) { + addCriterion("reviewer >", value, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerGreaterThanOrEqualTo(String value) { + addCriterion("reviewer >=", value, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerLessThan(String value) { + addCriterion("reviewer <", value, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerLessThanOrEqualTo(String value) { + addCriterion("reviewer <=", value, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerLike(String value) { + addCriterion("reviewer like", value, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerNotLike(String value) { + addCriterion("reviewer not like", value, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerIn(List values) { + addCriterion("reviewer in", values, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerNotIn(List values) { + addCriterion("reviewer not in", values, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerBetween(String value1, String value2) { + addCriterion("reviewer between", value1, value2, "reviewer"); + return (Criteria) this; + } + + public Criteria andReviewerNotBetween(String value1, String value2) { + addCriterion("reviewer not between", value1, value2, "reviewer"); + return (Criteria) this; + } + + public Criteria andQualificationIsNull() { + addCriterion("qualification is null"); + return (Criteria) this; + } + + public Criteria andQualificationIsNotNull() { + addCriterion("qualification is not null"); + return (Criteria) this; + } + + public Criteria andQualificationEqualTo(Integer value) { + addCriterion("qualification =", value, "qualification"); + return (Criteria) this; + } + + public Criteria andQualificationNotEqualTo(Integer value) { + addCriterion("qualification <>", value, "qualification"); + return (Criteria) this; + } + + public Criteria andQualificationGreaterThan(Integer value) { + addCriterion("qualification >", value, "qualification"); + return (Criteria) this; + } + + public Criteria andQualificationGreaterThanOrEqualTo(Integer value) { + addCriterion("qualification >=", value, "qualification"); + return (Criteria) this; + } + + public Criteria andQualificationLessThan(Integer value) { + addCriterion("qualification <", value, "qualification"); + return (Criteria) this; + } + + public Criteria andQualificationLessThanOrEqualTo(Integer value) { + addCriterion("qualification <=", value, "qualification"); + return (Criteria) this; + } + + public Criteria andQualificationIn(List values) { + addCriterion("qualification in", values, "qualification"); + return (Criteria) this; + } + + public Criteria andQualificationNotIn(List values) { + addCriterion("qualification not in", values, "qualification"); + return (Criteria) this; + } + + public Criteria andQualificationBetween(Integer value1, Integer value2) { + addCriterion("qualification between", value1, value2, "qualification"); + return (Criteria) this; + } + + public Criteria andQualificationNotBetween(Integer value1, Integer value2) { + addCriterion("qualification not between", value1, value2, "qualification"); + return (Criteria) this; + } + + public Criteria andReviewedPersionIsNull() { + addCriterion("reviewed_persion is null"); + return (Criteria) this; + } + + public Criteria andReviewedPersionIsNotNull() { + addCriterion("reviewed_persion is not null"); + return (Criteria) this; + } + + public Criteria andReviewedPersionEqualTo(Long value) { + addCriterion("reviewed_persion =", value, "reviewedPersion"); + return (Criteria) this; + } + + public Criteria andReviewedPersionNotEqualTo(Long value) { + addCriterion("reviewed_persion <>", value, "reviewedPersion"); + return (Criteria) this; + } + + public Criteria andReviewedPersionGreaterThan(Long value) { + addCriterion("reviewed_persion >", value, "reviewedPersion"); + return (Criteria) this; + } + + public Criteria andReviewedPersionGreaterThanOrEqualTo(Long value) { + addCriterion("reviewed_persion >=", value, "reviewedPersion"); + return (Criteria) this; + } + + public Criteria andReviewedPersionLessThan(Long value) { + addCriterion("reviewed_persion <", value, "reviewedPersion"); + return (Criteria) this; + } + + public Criteria andReviewedPersionLessThanOrEqualTo(Long value) { + addCriterion("reviewed_persion <=", value, "reviewedPersion"); + return (Criteria) this; + } + + public Criteria andReviewedPersionIn(List values) { + addCriterion("reviewed_persion in", values, "reviewedPersion"); + return (Criteria) this; + } + + public Criteria andReviewedPersionNotIn(List values) { + addCriterion("reviewed_persion not in", values, "reviewedPersion"); + return (Criteria) this; + } + + public Criteria andReviewedPersionBetween(Long value1, Long value2) { + addCriterion("reviewed_persion between", value1, value2, "reviewedPersion"); + return (Criteria) this; + } + + public Criteria andReviewedPersionNotBetween(Long value1, Long value2) { + addCriterion("reviewed_persion not between", value1, value2, "reviewedPersion"); + return (Criteria) this; + } + + public Criteria andReviewedTimeIsNull() { + addCriterion("reviewed_time is null"); + return (Criteria) this; + } + + public Criteria andReviewedTimeIsNotNull() { + addCriterion("reviewed_time is not null"); + return (Criteria) this; + } + + public Criteria andReviewedTimeEqualTo(Date value) { + addCriterion("reviewed_time =", value, "reviewedTime"); + return (Criteria) this; + } + + public Criteria andReviewedTimeNotEqualTo(Date value) { + addCriterion("reviewed_time <>", value, "reviewedTime"); + return (Criteria) this; + } + + public Criteria andReviewedTimeGreaterThan(Date value) { + addCriterion("reviewed_time >", value, "reviewedTime"); + return (Criteria) this; + } + + public Criteria andReviewedTimeGreaterThanOrEqualTo(Date value) { + addCriterion("reviewed_time >=", value, "reviewedTime"); + return (Criteria) this; + } + + public Criteria andReviewedTimeLessThan(Date value) { + addCriterion("reviewed_time <", value, "reviewedTime"); + return (Criteria) this; + } + + public Criteria andReviewedTimeLessThanOrEqualTo(Date value) { + addCriterion("reviewed_time <=", value, "reviewedTime"); + return (Criteria) this; + } + + public Criteria andReviewedTimeIn(List values) { + addCriterion("reviewed_time in", values, "reviewedTime"); + return (Criteria) this; + } + + public Criteria andReviewedTimeNotIn(List values) { + addCriterion("reviewed_time not in", values, "reviewedTime"); + return (Criteria) this; + } + + public Criteria andReviewedTimeBetween(Date value1, Date value2) { + addCriterion("reviewed_time between", value1, value2, "reviewedTime"); + return (Criteria) this; + } + + public Criteria andReviewedTimeNotBetween(Date value1, Date value2) { + addCriterion("reviewed_time not between", value1, value2, "reviewedTime"); + return (Criteria) this; + } + + public Criteria andParentKtIdIsNull() { + addCriterion("parent_kt_id is null"); + return (Criteria) this; + } + + public Criteria andParentKtIdIsNotNull() { + addCriterion("parent_kt_id is not null"); + return (Criteria) this; + } + + public Criteria andParentKtIdEqualTo(Long value) { + addCriterion("parent_kt_id =", value, "parentKtId"); + return (Criteria) this; + } + + public Criteria andParentKtIdNotEqualTo(Long value) { + addCriterion("parent_kt_id <>", value, "parentKtId"); + return (Criteria) this; + } + + public Criteria andParentKtIdGreaterThan(Long value) { + addCriterion("parent_kt_id >", value, "parentKtId"); + return (Criteria) this; + } + + public Criteria andParentKtIdGreaterThanOrEqualTo(Long value) { + addCriterion("parent_kt_id >=", value, "parentKtId"); + return (Criteria) this; + } + + public Criteria andParentKtIdLessThan(Long value) { + addCriterion("parent_kt_id <", value, "parentKtId"); + return (Criteria) this; + } + + public Criteria andParentKtIdLessThanOrEqualTo(Long value) { + addCriterion("parent_kt_id <=", value, "parentKtId"); + return (Criteria) this; + } + + public Criteria andParentKtIdIn(List values) { + addCriterion("parent_kt_id in", values, "parentKtId"); + return (Criteria) this; + } + + public Criteria andParentKtIdNotIn(List values) { + addCriterion("parent_kt_id not in", values, "parentKtId"); + return (Criteria) this; + } + + public Criteria andParentKtIdBetween(Long value1, Long value2) { + addCriterion("parent_kt_id between", value1, value2, "parentKtId"); + return (Criteria) this; + } + + public Criteria andParentKtIdNotBetween(Long value1, Long value2) { + addCriterion("parent_kt_id not between", value1, value2, "parentKtId"); + return (Criteria) this; + } + + public Criteria andKtGroupNameIsNull() { + addCriterion("kt_group_name is null"); + return (Criteria) this; + } + + public Criteria andKtGroupNameIsNotNull() { + addCriterion("kt_group_name is not null"); + return (Criteria) this; + } + + public Criteria andKtGroupNameEqualTo(String value) { + addCriterion("kt_group_name =", value, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameNotEqualTo(String value) { + addCriterion("kt_group_name <>", value, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameGreaterThan(String value) { + addCriterion("kt_group_name >", value, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameGreaterThanOrEqualTo(String value) { + addCriterion("kt_group_name >=", value, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameLessThan(String value) { + addCriterion("kt_group_name <", value, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameLessThanOrEqualTo(String value) { + addCriterion("kt_group_name <=", value, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameLike(String value) { + addCriterion("kt_group_name like", value, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameNotLike(String value) { + addCriterion("kt_group_name not like", value, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameIn(List values) { + addCriterion("kt_group_name in", values, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameNotIn(List values) { + addCriterion("kt_group_name not in", values, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameBetween(String value1, String value2) { + addCriterion("kt_group_name between", value1, value2, "ktGroupName"); + return (Criteria) this; + } + + public Criteria andKtGroupNameNotBetween(String value1, String value2) { + addCriterion("kt_group_name not between", value1, value2, "ktGroupName"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/research-system/src/main/java/com/research/system/domain/po/SrvMessage.java b/research-system/src/main/java/com/research/system/domain/po/SrvMessage.java new file mode 100644 index 00000000..62002a48 --- /dev/null +++ b/research-system/src/main/java/com/research/system/domain/po/SrvMessage.java @@ -0,0 +1,128 @@ +package com.research.system.domain.po; + +import java.io.Serializable; +import java.util.Date; + +public class SrvMessage implements Serializable { + private Long id; + + private String content; + + private String receiver; + + private Byte status; + + private Long businessId; + + private Byte delFlag; + + private String createBy; + + private Date createTime; + + private String updateBy; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content == null ? null : content.trim(); + } + + public String getReceiver() { + return receiver; + } + + public void setReceiver(String receiver) { + this.receiver = receiver == null ? null : receiver.trim(); + } + + public Byte getStatus() { + return status; + } + + public void setStatus(Byte status) { + this.status = status; + } + + public Long getBusinessId() { + return businessId; + } + + public void setBusinessId(Long businessId) { + this.businessId = businessId; + } + + public Byte getDelFlag() { + return delFlag; + } + + public void setDelFlag(Byte delFlag) { + this.delFlag = delFlag; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy == null ? null : createBy.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy == null ? null : updateBy.trim(); + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @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(", content=").append(content); + sb.append(", receiver=").append(receiver); + sb.append(", status=").append(status); + sb.append(", businessId=").append(businessId); + sb.append(", delFlag=").append(delFlag); + sb.append(", createBy=").append(createBy); + sb.append(", createTime=").append(createTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", updateTime=").append(updateTime); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/research-system/src/main/java/com/research/system/domain/po/SrvMessageExample.java b/research-system/src/main/java/com/research/system/domain/po/SrvMessageExample.java new file mode 100644 index 00000000..5785c674 --- /dev/null +++ b/research-system/src/main/java/com/research/system/domain/po/SrvMessageExample.java @@ -0,0 +1,841 @@ +package com.research.system.domain.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SrvMessageExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SrvMessageExample() { + 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 andContentIsNull() { + addCriterion("content is null"); + return (Criteria) this; + } + + public Criteria andContentIsNotNull() { + addCriterion("content is not null"); + return (Criteria) this; + } + + public Criteria andContentEqualTo(String value) { + addCriterion("content =", value, "content"); + return (Criteria) this; + } + + public Criteria andContentNotEqualTo(String value) { + addCriterion("content <>", value, "content"); + return (Criteria) this; + } + + public Criteria andContentGreaterThan(String value) { + addCriterion("content >", value, "content"); + return (Criteria) this; + } + + public Criteria andContentGreaterThanOrEqualTo(String value) { + addCriterion("content >=", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLessThan(String value) { + addCriterion("content <", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLessThanOrEqualTo(String value) { + addCriterion("content <=", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLike(String value) { + addCriterion("content like", value, "content"); + return (Criteria) this; + } + + public Criteria andContentNotLike(String value) { + addCriterion("content not like", value, "content"); + return (Criteria) this; + } + + public Criteria andContentIn(List values) { + addCriterion("content in", values, "content"); + return (Criteria) this; + } + + public Criteria andContentNotIn(List values) { + addCriterion("content not in", values, "content"); + return (Criteria) this; + } + + public Criteria andContentBetween(String value1, String value2) { + addCriterion("content between", value1, value2, "content"); + return (Criteria) this; + } + + public Criteria andContentNotBetween(String value1, String value2) { + addCriterion("content not between", value1, value2, "content"); + return (Criteria) this; + } + + public Criteria andReceiverIsNull() { + addCriterion("receiver is null"); + return (Criteria) this; + } + + public Criteria andReceiverIsNotNull() { + addCriterion("receiver is not null"); + return (Criteria) this; + } + + public Criteria andReceiverEqualTo(String value) { + addCriterion("receiver =", value, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverNotEqualTo(String value) { + addCriterion("receiver <>", value, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverGreaterThan(String value) { + addCriterion("receiver >", value, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverGreaterThanOrEqualTo(String value) { + addCriterion("receiver >=", value, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverLessThan(String value) { + addCriterion("receiver <", value, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverLessThanOrEqualTo(String value) { + addCriterion("receiver <=", value, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverLike(String value) { + addCriterion("receiver like", value, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverNotLike(String value) { + addCriterion("receiver not like", value, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverIn(List values) { + addCriterion("receiver in", values, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverNotIn(List values) { + addCriterion("receiver not in", values, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverBetween(String value1, String value2) { + addCriterion("receiver between", value1, value2, "receiver"); + return (Criteria) this; + } + + public Criteria andReceiverNotBetween(String value1, String value2) { + addCriterion("receiver not between", value1, value2, "receiver"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("status is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("status is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Byte value) { + addCriterion("status =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Byte value) { + addCriterion("status <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Byte value) { + addCriterion("status >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("status >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Byte value) { + addCriterion("status <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Byte value) { + addCriterion("status <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("status not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Byte value1, Byte value2) { + addCriterion("status between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Byte value1, Byte value2) { + addCriterion("status not between", value1, value2, "status"); + 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 andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(Byte value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(Byte value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(Byte value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(Byte value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(Byte value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(Byte value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(Byte value1, Byte value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(Byte value1, Byte value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + 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/research-system/src/main/java/com/research/system/domain/vo/HomeVo.java b/research-system/src/main/java/com/research/system/domain/vo/HomeVo.java index 0fe33567..db547637 100644 --- a/research-system/src/main/java/com/research/system/domain/vo/HomeVo.java +++ b/research-system/src/main/java/com/research/system/domain/vo/HomeVo.java @@ -102,7 +102,7 @@ public class HomeVo { } @Data - public static class ProjressMemberResult{ + public static class ProjressMemberResult { private List orgMemberList; private List titleList; @@ -130,26 +130,34 @@ public class HomeVo { @Data @ApiModel("科研成果统计") - public static class AchievementResult{ - private String categoryName; - private Integer num; - + public static class AchievementResult { + private String categoryName; + private Integer num; } @Data @ApiModel("会议统计") - public static class MeetingResult{ - - private String yearMonth; - private Integer num; + public static class MeetingResult { + private String yearMonth; + private Integer num; - private String year; - private String month; + private String year; + private String month; - public String getYearMonth() { - return year + "-" + month; - } + public String getYearMonth() { + return year + "-" + month; + } + } + @Data + @ApiModel("我的消息") + public static class Message{ + private Long id; + private String content; + private Byte status; + private Long businessId; + private String createBy; + private Date createTime; } diff --git a/research-system/src/main/java/com/research/system/domain/vo/MemberAduitVo.java b/research-system/src/main/java/com/research/system/domain/vo/MemberAduitVo.java new file mode 100644 index 00000000..19f94567 --- /dev/null +++ b/research-system/src/main/java/com/research/system/domain/vo/MemberAduitVo.java @@ -0,0 +1,83 @@ +package com.research.system.domain.vo; + +import cn.hutool.core.util.StrUtil; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * @Author zzc + * @Package com.research.system.domain.vo + * @Date 2025/9/16 10:55 + * @description: + */ +public class MemberAduitVo { + + @Data + public static class Result { + private Long id; + + private Byte category; + + private Long deptId; + + private Long ktGroupId; + + private String ktGroupIntro; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date memberBirth; + + private String memberEmail; + + private Byte memberGender; + + private String memberName; + + private String memberPhone; + + private Long parentMemberId; + + private String password; + + private Long projOrgId; + + private String roleIdList; + + private String title; + + private Byte type; + + private Long userId; + + private String username; + + private String createBy; + + private Date createTime; + + private String remark; + + private Byte step; + + private Byte status; + private Integer qualification; + private String qualificationName; + private String titleName; + private String ktGroupName; + private String projOrgName; + private String ktGroupName1; + private Long reviewedPersion; + private String reviewedPersionName; + + private Date reviewedTime; + + public String getKtGroupName() { + if (StrUtil.isNotEmpty(ktGroupName1)) { + return ktGroupName1; + } + return ktGroupName; + } + } +} diff --git a/research-system/src/main/java/com/research/system/persist/dao/HomeDao.java b/research-system/src/main/java/com/research/system/persist/dao/HomeDao.java index 0151369d..506f755f 100644 --- a/research-system/src/main/java/com/research/system/persist/dao/HomeDao.java +++ b/research-system/src/main/java/com/research/system/persist/dao/HomeDao.java @@ -25,4 +25,6 @@ public interface HomeDao { List queryAchievementList(); List queryMeetingList(); + + List queryMessageList(@Param("userId") Long userId); } diff --git a/research-system/src/main/java/com/research/system/persist/dao/MemberAduitDao.java b/research-system/src/main/java/com/research/system/persist/dao/MemberAduitDao.java new file mode 100644 index 00000000..b52d64cb --- /dev/null +++ b/research-system/src/main/java/com/research/system/persist/dao/MemberAduitDao.java @@ -0,0 +1,20 @@ +package com.research.system.persist.dao; + +import com.research.system.domain.dto.MemberAduitDto; +import com.research.system.domain.vo.MemberAduitVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Author zzc + * @Package com.research.system.persist.dao + * @Date 2025/8/11 14:31 + * @description: + */ +public interface MemberAduitDao { + + List queryMemberIdList(@Param("projOrgId") Long projOrgId, @Param("roleId") Long roleId); + + List query(@Param("dto") MemberAduitDto.Query dto, @Param("userId") Long userId); +} diff --git a/research-system/src/main/java/com/research/system/persist/mapper/SrvMessageMapper.java b/research-system/src/main/java/com/research/system/persist/mapper/SrvMessageMapper.java new file mode 100644 index 00000000..6a8eca4d --- /dev/null +++ b/research-system/src/main/java/com/research/system/persist/mapper/SrvMessageMapper.java @@ -0,0 +1,28 @@ +package com.research.system.persist.mapper; + +import com.research.system.domain.po.SrvMessage; +import com.research.system.domain.po.SrvMessageExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SrvMessageMapper { + long countByExample(SrvMessageExample example); + + int deleteByPrimaryKey(Long id); + + int insert(SrvMessage record); + + int insertSelective(SrvMessage record); + + List selectByExample(SrvMessageExample example); + + SrvMessage selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") SrvMessage record, @Param("example") SrvMessageExample example); + + int updateByExample(@Param("record") SrvMessage record, @Param("example") SrvMessageExample example); + + int updateByPrimaryKeySelective(SrvMessage record); + + int updateByPrimaryKey(SrvMessage record); +} \ No newline at end of file diff --git a/research-system/src/main/java/com/research/system/service/HomeService.java b/research-system/src/main/java/com/research/system/service/HomeService.java index c5c3d95e..73443eaf 100644 --- a/research-system/src/main/java/com/research/system/service/HomeService.java +++ b/research-system/src/main/java/com/research/system/service/HomeService.java @@ -24,6 +24,6 @@ public interface HomeService { List queryMeetingList(); - + List queryMessageList(); } diff --git a/research-system/src/main/java/com/research/system/service/MemberAduitService.java b/research-system/src/main/java/com/research/system/service/MemberAduitService.java new file mode 100644 index 00000000..fb3f43b4 --- /dev/null +++ b/research-system/src/main/java/com/research/system/service/MemberAduitService.java @@ -0,0 +1,22 @@ +package com.research.system.service; + +import com.research.system.domain.dto.MemberAduitDto; +import com.research.system.domain.po.KtsKtGroupMemberAduit; +import com.research.system.domain.vo.MemberAduitVo; + +import java.util.List; + +/** + * @Author zzc + * @Package com.research.system.service + * @Date 2025/9/16 8:48 + * @description: + */ +public interface MemberAduitService { + + void register(MemberAduitDto.Register dto); + + void aduit(Long id, Byte status); + + List query(MemberAduitDto.Query dto); +} diff --git a/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java index c197ff8e..21c91430 100644 --- a/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java @@ -51,7 +51,7 @@ public class CooperatorServiceImpl implements CooperatorService { @Override public List query(ClientPrjProOrgDto.Query dto) { - return prjProOrgDao.query(dto, SecurityUtils.isAdmin(SecurityUtils.getUserId()) ? null : SecurityUtils.getTenantId()); + return prjProOrgDao.query(dto, SecurityUtils.getLoginUserOrNull() == null ? null :SecurityUtils.isAdmin(SecurityUtils.getLoginUserOrNull() == null? 0L : SecurityUtils .getUserId()) ? null : SecurityUtils.getTenantId()); } @Override diff --git a/research-system/src/main/java/com/research/system/service/impl/HomeServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/HomeServiceImpl.java index b8d7cf13..a5d9925b 100644 --- a/research-system/src/main/java/com/research/system/service/impl/HomeServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/HomeServiceImpl.java @@ -108,4 +108,9 @@ public class HomeServiceImpl implements HomeService { public List queryMeetingList() { return homeDao.queryMeetingList(); } + + @Override + public List queryMessageList() { + return homeDao.queryMessageList(SecurityUtils.getUserId()); + } } diff --git a/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java new file mode 100644 index 00000000..3f84ae03 --- /dev/null +++ b/research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java @@ -0,0 +1,144 @@ +package com.research.system.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.research.common.core.domain.entity.SysUser; +import com.research.common.exception.base.BaseException; +import com.research.common.utils.SecurityUtils; +import com.research.system.domain.dto.GroupDto; +import com.research.system.domain.dto.MemberAduitDto; +import com.research.system.domain.po.KtsKtGroupMemberAduit; +import com.research.system.domain.po.KtsKtGroupMemberAduitExample; +import com.research.system.domain.po.SrvMessage; +import com.research.system.domain.vo.MemberAduitVo; +import com.research.system.persist.dao.MemberAduitDao; +import com.research.system.persist.mapper.KtsKtGroupMemberAduitMapper; +import com.research.system.persist.mapper.SrvMessageMapper; +import com.research.system.service.ISysUserService; +import com.research.system.service.KtsGroupService; +import com.research.system.service.MemberAduitService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @Author zzc + * @Package com.research.system.service.impl + * @Date 2025/9/16 9:40 + * @description: + */ +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class MemberAduitServiceImpl implements MemberAduitService { + + @Resource + private KtsKtGroupMemberAduitMapper ktsKtGroupMemberAduitMapper; + @Resource + private ISysUserService sysUserService; + @Resource + private MemberAduitDao memberAduitDao; + @Resource + private SrvMessageMapper srvMessageMapper; + @Resource + private KtsGroupService ktsGroupService; + + @Override + public void register(MemberAduitDto.Register dto) { + //1.添加申请记录 （审核人） 待审核 + // 判定用户是否存在， 存在就提示登录 判定是否有申请记录， 有提示已申请 + KtsKtGroupMemberAduitExample ktsKtGroupMemberAduitExample = new KtsKtGroupMemberAduitExample(); + ktsKtGroupMemberAduitExample.createCriteria().andMemberPhoneEqualTo(dto.getMemberPhone()).andStatusEqualTo((byte) 0); + if (ktsKtGroupMemberAduitMapper.countByExample(ktsKtGroupMemberAduitExample) > 0) { + //提示已申请 + throw new RuntimeException("账号审核中，请耐心等待"); + } + if (StrUtil.isNotEmpty(dto.getUsername())) { + SysUser sysUser = sysUserService.selectUserByUserName(dto.getUsername()); + if (sysUser != null) { + throw new RuntimeException("账号已存在，请登录"); + } + } + List reviewerList = new ArrayList<>(); + //2.查询该合作单位负责人角色的人 发送审核消息 + if (dto.getKtGroupId() != null || dto.getParentKtId()!=null) { + //101 合作单位负责人 + //102 项目负责人 + reviewerList = memberAduitDao.queryMemberIdList(dto.getProjOrgId(), 101L); + } + KtsKtGroupMemberAduit ktsKtGroupMemberAduit = BeanUtil.copyProperties(dto, KtsKtGroupMemberAduit.class); + ktsKtGroupMemberAduit.setId(IdUtil.getSnowflakeNextId()); + ktsKtGroupMemberAduit.setStatus((byte) 0); + ktsKtGroupMemberAduit.setRoleIdList(dto.getRoleIdList().stream().map(String::valueOf).collect(Collectors.joining(","))); + ktsKtGroupMemberAduit.setReviewer(reviewerList.stream().map(String::valueOf).collect(Collectors.joining(","))); + ktsKtGroupMemberAduitMapper.insertSelective(ktsKtGroupMemberAduit); + + + if (CollUtil.isNotEmpty(reviewerList)) { + //添加消息 + SrvMessage srvMessage = new SrvMessage(); + srvMessage.setId(IdUtil.getSnowflakeNextId()); + srvMessage.setContent("成员申请审核"); + srvMessage.setBusinessId(ktsKtGroupMemberAduit.getId()); + srvMessage.setStatus((byte) 0); + srvMessage.setReceiver(reviewerList.stream().map(String::valueOf).collect(Collectors.joining(","))); + srvMessageMapper.insertSelective(srvMessage); + } + //3. 审核完成之后， 由项目负责人审核 项目负责人审核完之后，审核通过。 + } + + @Override + public void aduit(Long id, Byte status) { + KtsKtGroupMemberAduit ktsKtGroupMemberAduit = ktsKtGroupMemberAduitMapper.selectByPrimaryKey(id); + if (ktsKtGroupMemberAduit == null) { + return; + } + ktsKtGroupMemberAduit.setStatus(status); + ktsKtGroupMemberAduit.setReviewedTime(new Date()); + ktsKtGroupMemberAduit.setReviewedPersion(SecurityUtils.getUserId()); + ktsKtGroupMemberAduitMapper.updateByPrimaryKeySelective(ktsKtGroupMemberAduit); + + //通过的话判断当前审核级别， step = 0 ,需要查询项目负责人，添加项目负责人审核，发送通知 + Byte step = ktsKtGroupMemberAduit.getStep(); + if (step == 0) { + ktsKtGroupMemberAduit.setId(IdUtil.getSnowflakeNextId()); + ktsKtGroupMemberAduit.setStep((byte) 1); + List list = memberAduitDao.queryMemberIdList(ktsKtGroupMemberAduit.getProjOrgId(), 102L); + if (CollUtil.isEmpty(list)) { + throw new BaseException("未查询到项目负责人信息"); + } + ktsKtGroupMemberAduit.setRoleIdList(list.stream().map(String::valueOf).collect(Collectors.joining(","))); + ktsKtGroupMemberAduit.setReviewedPersion(null); + ktsKtGroupMemberAduit.setReviewedTime( null); + ktsKtGroupMemberAduit.setStatus((byte) 0); + ktsKtGroupMemberAduitMapper.insertSelective(ktsKtGroupMemberAduit); + //添加消息 + SrvMessage srvMessage = new SrvMessage(); + srvMessage.setId(IdUtil.getSnowflakeNextId()); + srvMessage.setContent("成员申请审核"); + srvMessage.setBusinessId(ktsKtGroupMemberAduit.getId()); + srvMessage.setStatus((byte) 0); + srvMessage.setReceiver(list.stream().map(String::valueOf).collect(Collectors.joining(","))); + srvMessageMapper.insertSelective(srvMessage); + + }else { + //审核成功， 添加成员 + GroupDto.AddMember addMember = new GroupDto.AddMember(); + BeanUtil.copyProperties(ktsKtGroupMemberAduit, addMember); + ktsGroupService.addMember(addMember); + } + + } + + @Override + public List query(MemberAduitDto.Query dto) { + return memberAduitDao.query(dto, SecurityUtils.getUserId()); + } +} diff --git a/research-system/src/main/java/com/research/system/service/impl/SysDeptServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/SysDeptServiceImpl.java index bae55a6f..cd394a05 100644 --- a/research-system/src/main/java/com/research/system/service/impl/SysDeptServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/SysDeptServiceImpl.java @@ -42,7 +42,7 @@ public class SysDeptServiceImpl implements ISysDeptService * @return 部门信息集合 */ @Override - @DataScope(deptAlias = "d") +// @DataScope(deptAlias = "d") public List selectDeptList(SysDept dept) { return deptMapper.selectDeptList(dept); diff --git a/research-system/src/main/java/com/research/system/service/impl/SysUserServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/SysUserServiceImpl.java index c99e0e09..0dc36271 100644 --- a/research-system/src/main/java/com/research/system/service/impl/SysUserServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/SysUserServiceImpl.java @@ -72,7 +72,7 @@ public class SysUserServiceImpl implements ISysUserService * @return 用户信息集合信息 */ @Override - @DataScope(deptAlias = "d", userAlias = "u") +// @DataScope(deptAlias = "d", userAlias = "u") public List selectUserList(SysUser user) { return userMapper.selectUserList(user); diff --git a/research-system/src/main/resources/mapper/dao/HomeDao.xml b/research-system/src/main/resources/mapper/dao/HomeDao.xml index b1c7eefb..56265b2b 100644 --- a/research-system/src/main/resources/mapper/dao/HomeDao.xml +++ b/research-system/src/main/resources/mapper/dao/HomeDao.xml @@ -143,4 +143,18 @@ ORDER BY year, month; + + diff --git a/research-system/src/main/resources/mapper/dao/MemberAduitDao.xml b/research-system/src/main/resources/mapper/dao/MemberAduitDao.xml new file mode 100644 index 00000000..bcd58afb --- /dev/null +++ b/research-system/src/main/resources/mapper/dao/MemberAduitDao.xml @@ -0,0 +1,95 @@ + + + + + + + + diff --git a/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml b/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml index 2873f13a..af52d753 100644 --- a/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml +++ b/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml @@ -3,28 +3,37 @@ - + + - - - - - - - - + + + + + + + + - + - - + + + + + + + + + + @@ -85,10 +94,11 @@ - id, category, dept_id, kt_group_intro, member_birth, member_email, member_gender, + id, category, dept_id, kt_group_id, kt_group_intro, member_birth, member_email, member_gender, member_name, member_phone, parent_member_id, password, proj_org_id, role_id_list, title, type, user_id, username, del_flag, create_by, create_time, update_by, update_time, - remark + remark, step, status, reviewer, qualification, reviewed_persion, reviewed_time, parent_kt_id, + kt_group_name @@ -290,52 +360,55 @@ id = #{record.id,jdbcType=BIGINT}, - category = #{record.category,jdbcType=BIGINT}, + category = #{record.category,jdbcType=TINYINT}, dept_id = #{record.deptId,jdbcType=BIGINT}, + + kt_group_id = #{record.ktGroupId,jdbcType=BIGINT}, + kt_group_intro = #{record.ktGroupIntro,jdbcType=VARCHAR}, - member_birth = #{record.memberBirth,jdbcType=VARCHAR}, + member_birth = #{record.memberBirth,jdbcType=TIMESTAMP}, - member_email = #{record.memberEmail,jdbcType=TINYINT}, + member_email = #{record.memberEmail,jdbcType=VARCHAR}, - member_gender = #{record.memberGender,jdbcType=DATE}, + member_gender = #{record.memberGender,jdbcType=TINYINT}, - member_name = #{record.memberName,jdbcType=TINYINT}, + member_name = #{record.memberName,jdbcType=VARCHAR}, - member_phone = #{record.memberPhone,jdbcType=TINYINT}, + member_phone = #{record.memberPhone,jdbcType=VARCHAR}, - parent_member_id = #{record.parentMemberId,jdbcType=INTEGER}, + parent_member_id = #{record.parentMemberId,jdbcType=BIGINT}, - password = #{record.password,jdbcType=INTEGER}, + password = #{record.password,jdbcType=VARCHAR}, - proj_org_id = #{record.projOrgId,jdbcType=INTEGER}, + proj_org_id = #{record.projOrgId,jdbcType=BIGINT}, role_id_list = #{record.roleIdList,jdbcType=VARCHAR}, - title = #{record.title,jdbcType=TINYINT}, + title = #{record.title,jdbcType=VARCHAR}, type = #{record.type,jdbcType=TINYINT}, - user_id = #{record.userId,jdbcType=TINYINT}, + user_id = #{record.userId,jdbcType=BIGINT}, - username = #{record.username,jdbcType=TINYINT}, + username = #{record.username,jdbcType=VARCHAR}, del_flag = #{record.delFlag,jdbcType=TINYINT}, @@ -355,6 +428,30 @@ remark = #{record.remark,jdbcType=VARCHAR}, + + step = #{record.step,jdbcType=TINYINT}, + + + status = #{record.status,jdbcType=TINYINT}, + + + reviewer = #{record.reviewer,jdbcType=VARCHAR}, + + + qualification = #{record.qualification,jdbcType=INTEGER}, + + + reviewed_persion = #{record.reviewedPersion,jdbcType=BIGINT}, + + + reviewed_time = #{record.reviewedTime,jdbcType=TIMESTAMP}, + + + parent_kt_id = #{record.parentKtId,jdbcType=BIGINT}, + + + kt_group_name = #{record.ktGroupName,jdbcType=VARCHAR}, + @@ -363,28 +460,37 @@ update kts_kt_group_member_aduit set id = #{record.id,jdbcType=BIGINT}, - category = #{record.category,jdbcType=BIGINT}, + category = #{record.category,jdbcType=TINYINT}, dept_id = #{record.deptId,jdbcType=BIGINT}, + kt_group_id = #{record.ktGroupId,jdbcType=BIGINT}, kt_group_intro = #{record.ktGroupIntro,jdbcType=VARCHAR}, - member_birth = #{record.memberBirth,jdbcType=VARCHAR}, - member_email = #{record.memberEmail,jdbcType=TINYINT}, - member_gender = #{record.memberGender,jdbcType=DATE}, - member_name = #{record.memberName,jdbcType=TINYINT}, - member_phone = #{record.memberPhone,jdbcType=TINYINT}, - parent_member_id = #{record.parentMemberId,jdbcType=INTEGER}, - password = #{record.password,jdbcType=INTEGER}, - proj_org_id = #{record.projOrgId,jdbcType=INTEGER}, + member_birth = #{record.memberBirth,jdbcType=TIMESTAMP}, + member_email = #{record.memberEmail,jdbcType=VARCHAR}, + member_gender = #{record.memberGender,jdbcType=TINYINT}, + member_name = #{record.memberName,jdbcType=VARCHAR}, + member_phone = #{record.memberPhone,jdbcType=VARCHAR}, + parent_member_id = #{record.parentMemberId,jdbcType=BIGINT}, + password = #{record.password,jdbcType=VARCHAR}, + proj_org_id = #{record.projOrgId,jdbcType=BIGINT}, role_id_list = #{record.roleIdList,jdbcType=VARCHAR}, - title = #{record.title,jdbcType=TINYINT}, + title = #{record.title,jdbcType=VARCHAR}, type = #{record.type,jdbcType=TINYINT}, - user_id = #{record.userId,jdbcType=TINYINT}, - username = #{record.username,jdbcType=TINYINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + username = #{record.username,jdbcType=VARCHAR}, del_flag = #{record.delFlag,jdbcType=TINYINT}, create_by = #{record.createBy,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, update_by = #{record.updateBy,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - remark = #{record.remark,jdbcType=VARCHAR} + remark = #{record.remark,jdbcType=VARCHAR}, + step = #{record.step,jdbcType=TINYINT}, + status = #{record.status,jdbcType=TINYINT}, + reviewer = #{record.reviewer,jdbcType=VARCHAR}, + qualification = #{record.qualification,jdbcType=INTEGER}, + reviewed_persion = #{record.reviewedPersion,jdbcType=BIGINT}, + reviewed_time = #{record.reviewedTime,jdbcType=TIMESTAMP}, + parent_kt_id = #{record.parentKtId,jdbcType=BIGINT}, + kt_group_name = #{record.ktGroupName,jdbcType=VARCHAR} @@ -393,52 +499,55 @@ update kts_kt_group_member_aduit - category = #{category,jdbcType=BIGINT}, + category = #{category,jdbcType=TINYINT}, dept_id = #{deptId,jdbcType=BIGINT}, + + kt_group_id = #{ktGroupId,jdbcType=BIGINT}, + kt_group_intro = #{ktGroupIntro,jdbcType=VARCHAR}, - member_birth = #{memberBirth,jdbcType=VARCHAR}, + member_birth = #{memberBirth,jdbcType=TIMESTAMP}, - member_email = #{memberEmail,jdbcType=TINYINT}, + member_email = #{memberEmail,jdbcType=VARCHAR}, - member_gender = #{memberGender,jdbcType=DATE}, + member_gender = #{memberGender,jdbcType=TINYINT}, - member_name = #{memberName,jdbcType=TINYINT}, + member_name = #{memberName,jdbcType=VARCHAR}, - member_phone = #{memberPhone,jdbcType=TINYINT}, + member_phone = #{memberPhone,jdbcType=VARCHAR}, - parent_member_id = #{parentMemberId,jdbcType=INTEGER}, + parent_member_id = #{parentMemberId,jdbcType=BIGINT}, - password = #{password,jdbcType=INTEGER}, + password = #{password,jdbcType=VARCHAR}, - proj_org_id = #{projOrgId,jdbcType=INTEGER}, + proj_org_id = #{projOrgId,jdbcType=BIGINT}, role_id_list = #{roleIdList,jdbcType=VARCHAR}, - title = #{title,jdbcType=TINYINT}, + title = #{title,jdbcType=VARCHAR}, type = #{type,jdbcType=TINYINT}, - user_id = #{userId,jdbcType=TINYINT}, + user_id = #{userId,jdbcType=BIGINT}, - username = #{username,jdbcType=TINYINT}, + username = #{username,jdbcType=VARCHAR}, del_flag = #{delFlag,jdbcType=TINYINT}, @@ -458,33 +567,66 @@ remark = #{remark,jdbcType=VARCHAR}, + + step = #{step,jdbcType=TINYINT}, + + + status = #{status,jdbcType=TINYINT}, + + + reviewer = #{reviewer,jdbcType=VARCHAR}, + + + qualification = #{qualification,jdbcType=INTEGER}, + + + reviewed_persion = #{reviewedPersion,jdbcType=BIGINT}, + + + reviewed_time = #{reviewedTime,jdbcType=TIMESTAMP}, + + + parent_kt_id = #{parentKtId,jdbcType=BIGINT}, + + + kt_group_name = #{ktGroupName,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} update kts_kt_group_member_aduit - set category = #{category,jdbcType=BIGINT}, + set category = #{category,jdbcType=TINYINT}, dept_id = #{deptId,jdbcType=BIGINT}, + kt_group_id = #{ktGroupId,jdbcType=BIGINT}, kt_group_intro = #{ktGroupIntro,jdbcType=VARCHAR}, - member_birth = #{memberBirth,jdbcType=VARCHAR}, - member_email = #{memberEmail,jdbcType=TINYINT}, - member_gender = #{memberGender,jdbcType=DATE}, - member_name = #{memberName,jdbcType=TINYINT}, - member_phone = #{memberPhone,jdbcType=TINYINT}, - parent_member_id = #{parentMemberId,jdbcType=INTEGER}, - password = #{password,jdbcType=INTEGER}, - proj_org_id = #{projOrgId,jdbcType=INTEGER}, + member_birth = #{memberBirth,jdbcType=TIMESTAMP}, + member_email = #{memberEmail,jdbcType=VARCHAR}, + member_gender = #{memberGender,jdbcType=TINYINT}, + member_name = #{memberName,jdbcType=VARCHAR}, + member_phone = #{memberPhone,jdbcType=VARCHAR}, + parent_member_id = #{parentMemberId,jdbcType=BIGINT}, + password = #{password,jdbcType=VARCHAR}, + proj_org_id = #{projOrgId,jdbcType=BIGINT}, role_id_list = #{roleIdList,jdbcType=VARCHAR}, - title = #{title,jdbcType=TINYINT}, + title = #{title,jdbcType=VARCHAR}, type = #{type,jdbcType=TINYINT}, - user_id = #{userId,jdbcType=TINYINT}, - username = #{username,jdbcType=TINYINT}, + user_id = #{userId,jdbcType=BIGINT}, + username = #{username,jdbcType=VARCHAR}, del_flag = #{delFlag,jdbcType=TINYINT}, create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, - remark = #{remark,jdbcType=VARCHAR} + remark = #{remark,jdbcType=VARCHAR}, + step = #{step,jdbcType=TINYINT}, + status = #{status,jdbcType=TINYINT}, + reviewer = #{reviewer,jdbcType=VARCHAR}, + qualification = #{qualification,jdbcType=INTEGER}, + reviewed_persion = #{reviewedPersion,jdbcType=BIGINT}, + reviewed_time = #{reviewedTime,jdbcType=TIMESTAMP}, + parent_kt_id = #{parentKtId,jdbcType=BIGINT}, + kt_group_name = #{ktGroupName,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/research-system/src/main/resources/mapper/system/SrvMessageMapper.xml b/research-system/src/main/resources/mapper/system/SrvMessageMapper.xml new file mode 100644 index 00000000..6fc619f6 --- /dev/null +++ b/research-system/src/main/resources/mapper/system/SrvMessageMapper.xml @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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, content, receiver, status, business_id, del_flag, create_by, create_time, update_by, + update_time + + + + + delete from srv_message + where id = #{id,jdbcType=BIGINT} + + + insert into srv_message (id, content, receiver, + status, business_id, del_flag, + create_by, create_time, update_by, + update_time) + values (#{id,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, + #{status,jdbcType=TINYINT}, #{businessId,jdbcType=BIGINT}, #{delFlag,jdbcType=TINYINT}, + #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}) + + + insert into srv_message + + + id, + + + content, + + + receiver, + + + status, + + + business_id, + + + del_flag, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + + + #{id,jdbcType=BIGINT}, + + + #{content,jdbcType=VARCHAR}, + + + #{receiver,jdbcType=VARCHAR}, + + + #{status,jdbcType=TINYINT}, + + + #{businessId,jdbcType=BIGINT}, + + + #{delFlag,jdbcType=TINYINT}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + + update srv_message + + + id = #{record.id,jdbcType=BIGINT}, + + + content = #{record.content,jdbcType=VARCHAR}, + + + receiver = #{record.receiver,jdbcType=VARCHAR}, + + + status = #{record.status,jdbcType=TINYINT}, + + + business_id = #{record.businessId,jdbcType=BIGINT}, + + + del_flag = #{record.delFlag,jdbcType=TINYINT}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + + + + + + update srv_message + set id = #{record.id,jdbcType=BIGINT}, + content = #{record.content,jdbcType=VARCHAR}, + receiver = #{record.receiver,jdbcType=VARCHAR}, + status = #{record.status,jdbcType=TINYINT}, + business_id = #{record.businessId,jdbcType=BIGINT}, + del_flag = #{record.delFlag,jdbcType=TINYINT}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP} + + + + + + update srv_message + + + content = #{content,jdbcType=VARCHAR}, + + + receiver = #{receiver,jdbcType=VARCHAR}, + + + status = #{status,jdbcType=TINYINT}, + + + business_id = #{businessId,jdbcType=BIGINT}, + + + del_flag = #{delFlag,jdbcType=TINYINT}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update srv_message + set content = #{content,jdbcType=VARCHAR}, + receiver = #{receiver,jdbcType=VARCHAR}, + status = #{status,jdbcType=TINYINT}, + business_id = #{businessId,jdbcType=BIGINT}, + del_flag = #{delFlag,jdbcType=TINYINT}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file