diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index ad4bb5ed..2efd7c44 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -250,11 +250,11 @@ public interface TallFeignClient { /** * 给复制后的模板项目添加成员 - * @param memberForTemplate 项目id/角色名称/成员手机号或userId + * @param memberForTemplate 项目id和成员 * @return 成功/失败 */ @RequestMapping(value = "/members/addMemberForTemplate",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"}) - JsonResponse addMemberForTemplate(MemberRoleDto.SaveMemberForTemplate memberForTemplate); + JsonResponse addMemberForTemplate(QueryDto memberForTemplate); } @@ -423,8 +423,10 @@ class TallFeignClientFallBack implements FallbackFactory { } + + @Override - public JsonResponse addMemberForTemplate(MemberRoleDto.SaveMemberForTemplate memberForTemplate) { + public JsonResponse addMemberForTemplate(QueryDto memberForTemplate) { return JsonResponse.newInstance().fail(); } }; diff --git a/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java index 29a7d1d5..276b9b3f 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java @@ -1,5 +1,6 @@ package com.ccsens.tall.service; +import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto; import com.ccsens.tall.bean.dto.MemberDto; import com.ccsens.tall.bean.dto.ProjectDto; import com.ccsens.tall.bean.po.ProMember; @@ -90,5 +91,5 @@ public interface IProMemberService { * @param param 项目id,成员手机号 * */ - void addMemberForTemplate(MemberDto.SaveMemberForTemplate param); + void addMemberForTemplate(MemberRoleDto.SaveMemberForTemplate param); } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java index f12f09c2..866165c1 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java @@ -524,10 +524,10 @@ public class ProMemberService implements IProMemberService { @Override - public void addMemberForTemplate(MemberDto.SaveMemberForTemplate param) { + public void addMemberForTemplate(com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto.SaveMemberForTemplate param) { if (CollectionUtil.isNotEmpty(param.getMemberForTemplate())){ - for (MemberDto.MemberForTemplate memberForTemplate : param.getMemberForTemplate()) { + for (com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto.MemberForTemplate memberForTemplate : param.getMemberForTemplate()) { //只有手机号的情况 if (ObjectUtil.isNotNull(memberForTemplate.getPhone())){ @@ -561,31 +561,78 @@ public class ProMemberService implements IProMemberService { //知道成员的userId的情况 if (ObjectUtil.isNotNull(memberForTemplate.getUserId())){ SysUser user = userDao.selectByPrimaryKey(memberForTemplate.getUserId()); - String phone = userService.getPhone(memberForTemplate.getUserId()); - //用项目id和手机号判断用户是否存在 - int isExist = proMemberDao.findUserIsExist(param.getProjectId(),phone); - if (0!=isExist) { - throw new BaseException(CodeEnum.WBS_REPEAT_MEMBER_PHONE); - } + if (ObjectUtil.isNotNull(user)){ + String phone = userService.getPhone(memberForTemplate.getUserId()); + //用项目id和手机号判断用户是否存在 + ProMemberExample memberExample = new ProMemberExample(); + memberExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andPhoneEqualTo(phone); + List memberList = proMemberDao.selectByExample(memberExample); + + if (CollectionUtil.isNotEmpty(memberList)) { + SysUser oldUser = userDao.selectByPrimaryKey(memberList.get(0).getUserId()); + if (ObjectUtil.isNotNull(oldUser)){ + //添加用户关注项目信息 + if (ObjectUtil.isNotNull(oldUser.getId())) { + //查找此用户是否以关注项目 + UserAttentionExample attentionExample = new UserAttentionExample(); + attentionExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andUserIdEqualTo(oldUser.getId()); + if (userAttentionDao.countByExample(attentionExample) <= 0) { + UserAttention userAttention = new UserAttention(); + userAttention.setId(snowflake.nextId()); + userAttention.setUserId(oldUser.getId()); + userAttention.setProjectId(param.getProjectId()); + userAttentionDao.insertSelective(userAttention); + } + } + + for (String roleName : memberForTemplate.getRoleName()) { + Long roleId = proRoleDao.findRoelIdByProjectAndName(param.getProjectId(),roleName); + if (null != roleId){ + ProMemberRole proMemberRole = new MemberRoleDto(); + proMemberRole.setId(snowflake.nextId()); + proMemberRole.setRoleId(roleId); + proMemberRole.setMemberId(memberList.get(0).getId()); + proMemberRoleDao.insertSelective(proMemberRole); + } + } + continue; + } + } - //添加成员 - ProMember proMember = new ProMember(); - proMember.setId(snowflake.nextId()); - proMember.setPhone(phone); - proMember.setUserId(memberForTemplate.getUserId()); - proMember.setProjectId(param.getProjectId()); - if(ObjectUtil.isNotNull(user.getNickname())){ - proMember.setNickname(user.getNickname()); - } - proMemberDao.insertSelective(proMember); - for (String roleName : memberForTemplate.getRoleName()) { - Long roleId = proRoleDao.findRoelIdByProjectAndName(param.getProjectId(),roleName); - if (null != roleId){ - ProMemberRole proMemberRole = new MemberRoleDto(); - proMemberRole.setId(snowflake.nextId()); - proMemberRole.setRoleId(roleId); - proMemberRole.setMemberId(proMember.getId()); - proMemberRoleDao.insertSelective(proMemberRole); + //添加成员 + ProMember proMember = new ProMember(); + proMember.setId(snowflake.nextId()); + proMember.setPhone(phone); + proMember.setUserId(memberForTemplate.getUserId()); + proMember.setProjectId(param.getProjectId()); + if(ObjectUtil.isNotNull(user.getNickname())){ + proMember.setNickname(user.getNickname()); + } + proMemberDao.insertSelective(proMember); + //让成员关注项目 + //添加用户关注项目信息 + if (ObjectUtil.isNotNull(user.getId())) { + //查找此用户是否以关注项目 + UserAttentionExample attentionExample = new UserAttentionExample(); + attentionExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andUserIdEqualTo(user.getId()); + if (userAttentionDao.countByExample(attentionExample) <= 0) { + UserAttention userAttention = new UserAttention(); + userAttention.setId(snowflake.nextId()); + userAttention.setUserId(user.getId()); + userAttention.setProjectId(param.getProjectId()); + userAttentionDao.insertSelective(userAttention); + } + } + + for (String roleName : memberForTemplate.getRoleName()) { + Long roleId = proRoleDao.findRoelIdByProjectAndName(param.getProjectId(),roleName); + if (null != roleId){ + ProMemberRole proMemberRole = new MemberRoleDto(); + proMemberRole.setId(snowflake.nextId()); + proMemberRole.setRoleId(roleId); + proMemberRole.setMemberId(proMember.getId()); + proMemberRoleDao.insertSelective(proMemberRole); + } } } } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java index a8f88662..3cf9ddd4 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java @@ -721,30 +721,30 @@ public class ProjectService implements IProjectService { } } //当前创建人默认为项目经理 - SysUser sysUser = sysUserDao.selectByPrimaryKey(userId); +// SysUser sysUser = sysUserDao.selectByPrimaryKey(userId); //添加成员 - ProMember proMember = new ProMember(); - proMember.setId(snowflake.nextId()); - proMember.setUserId(userId); - proMember.setProjectId(newProjectId); - proMember.setNickname(sysUser.getNickname()); - proMember.setPhone(sysUser.getPhone()); - proMemberDao.insertSelective(proMember); +// ProMember proMember = new ProMember(); +// proMember.setId(snowflake.nextId()); +// proMember.setUserId(userId); +// proMember.setProjectId(newProjectId); +// proMember.setNickname(sysUser.getNickname()); +// proMember.setPhone(sysUser.getPhone()); +// proMemberDao.insertSelective(proMember); //查找项目经理的id - ProRoleExample proRoleExample=new ProRoleExample(); - proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(newProjectId); - List firstPmId = proRoleDao.selectByExample(proRoleExample).stream().map(ProRole::getId).collect(Collectors.toList()); - ProRoleExample secondPMExample=new ProRoleExample(); - secondPMExample.createCriteria().andRecStatusEqualTo((byte)0).andParentIdIn(firstPmId); - List proRoles = proRoleDao.selectByExample(secondPMExample); - List secondPM = proRoles.stream().map(action->action.getId()).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(secondPM)){ - ProMemberRole proMemberRole = new ProMemberRole(); - proMemberRole.setId(snowflake.nextId()); - proMemberRole.setMemberId(proMember.getId()); - proMemberRole.setRoleId(secondPM.get(0)); - memberRoleDao.insertSelective(proMemberRole); - } +// ProRoleExample proRoleExample=new ProRoleExample(); +// proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(newProjectId); +// List firstPmId = proRoleDao.selectByExample(proRoleExample).stream().map(ProRole::getId).collect(Collectors.toList()); +// ProRoleExample secondPMExample=new ProRoleExample(); +// secondPMExample.createCriteria().andRecStatusEqualTo((byte)0).andParentIdIn(firstPmId); +// List proRoles = proRoleDao.selectByExample(secondPMExample); +// List secondPM = proRoles.stream().map(action->action.getId()).collect(Collectors.toList()); +// if (CollectionUtil.isNotEmpty(secondPM)){ +// ProMemberRole proMemberRole = new ProMemberRole(); +// proMemberRole.setId(snowflake.nextId()); +// proMemberRole.setMemberId(proMember.getId()); +// proMemberRole.setRoleId(secondPM.get(0)); +// memberRoleDao.insertSelective(proMemberRole); +// } //添加对谁不可见 @@ -1553,7 +1553,7 @@ public class ProjectService implements IProjectService { copyRole(oldProject.getId(), newProject.getId(),userId,newProjectFeign); //复制项目配置信息 copyProjectConfig(oldProject.getId(), newProject.getId(),userId); - //复制项目下的角色 + return newProjectFeign; } diff --git a/tall/src/main/java/com/ccsens/tall/web/MemberController.java b/tall/src/main/java/com/ccsens/tall/web/MemberController.java index 577039b3..d7cfb214 100644 --- a/tall/src/main/java/com/ccsens/tall/web/MemberController.java +++ b/tall/src/main/java/com/ccsens/tall/web/MemberController.java @@ -1,6 +1,7 @@ package com.ccsens.tall.web; import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto; import com.ccsens.tall.bean.dto.MemberDto; import com.ccsens.tall.bean.dto.ProjectDto; import com.ccsens.tall.bean.vo.ProjectVo; @@ -110,7 +111,7 @@ public class MemberController { @ApiOperation(value = "复制后的项目添加成员", notes = "") @RequestMapping(value = "/addMemberForTemplate", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse addMemberForTemplate(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + public JsonResponse addMemberForTemplate(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("根据模板复制项目新:{}",params); proMemberService.addMemberForTemplate(params.getParam()); log.info("根据模板复制项目新结束"); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/Step.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/Step.java index 8b248929..142248d7 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/Step.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/Step.java @@ -20,6 +20,8 @@ public class Step implements Serializable { private Byte recStatus; + private String taskSubName; + private static final long serialVersionUID = 1L; public Long getId() { @@ -86,6 +88,14 @@ public class Step implements Serializable { this.recStatus = recStatus; } + public String getTaskSubName() { + return taskSubName; + } + + public void setTaskSubName(String taskSubName) { + this.taskSubName = taskSubName == null ? null : taskSubName.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -100,6 +110,7 @@ public class Step implements Serializable { sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); + sb.append(", taskSubName=").append(taskSubName); sb.append("]"); return sb.toString(); } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/StepExample.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/StepExample.java index 58df6650..31058c97 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/StepExample.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/po/StepExample.java @@ -604,6 +604,76 @@ public class StepExample { addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } + + public Criteria andTaskSubNameIsNull() { + addCriterion("task_sub_name is null"); + return (Criteria) this; + } + + public Criteria andTaskSubNameIsNotNull() { + addCriterion("task_sub_name is not null"); + return (Criteria) this; + } + + public Criteria andTaskSubNameEqualTo(String value) { + addCriterion("task_sub_name =", value, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameNotEqualTo(String value) { + addCriterion("task_sub_name <>", value, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameGreaterThan(String value) { + addCriterion("task_sub_name >", value, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameGreaterThanOrEqualTo(String value) { + addCriterion("task_sub_name >=", value, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameLessThan(String value) { + addCriterion("task_sub_name <", value, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameLessThanOrEqualTo(String value) { + addCriterion("task_sub_name <=", value, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameLike(String value) { + addCriterion("task_sub_name like", value, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameNotLike(String value) { + addCriterion("task_sub_name not like", value, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameIn(List values) { + addCriterion("task_sub_name in", values, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameNotIn(List values) { + addCriterion("task_sub_name not in", values, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameBetween(String value1, String value2) { + addCriterion("task_sub_name between", value1, value2, "taskSubName"); + return (Criteria) this; + } + + public Criteria andTaskSubNameNotBetween(String value1, String value2) { + addCriterion("task_sub_name not between", value1, value2, "taskSubName"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/HospitalWrokingDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/HospitalWrokingDao.java index 87702373..90e15c1e 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/HospitalWrokingDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/HospitalWrokingDao.java @@ -21,4 +21,10 @@ public interface HospitalWrokingDao extends HospitalWrokingMapper { */ List findWorkingDoctor(@Param("hospitalId") Long hospitalId,@Param("currentTime") Long currentTime); + /** + * 查找主任 + * @param hospitalId 医院id + * @return 主任userId + */ + Long findHeadOfPM(@Param("hospitalId") Long hospitalId); } \ No newline at end of file diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java index 5c85afdd..3c9eabf2 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java @@ -7,8 +7,7 @@ import com.ccsens.wisdomcar.bean.dto.WisdomCarDto; import com.ccsens.wisdomcar.bean.po.HospitalMember; import com.ccsens.wisdomcar.bean.po.HospitalMemberExample; import com.ccsens.wisdomcar.bean.vo.WisdomCarVo; -import com.ccsens.wisdomcar.persist.dao.HospitalMemberDao; -import com.ccsens.wisdomcar.persist.dao.WisdomCarDao; +import com.ccsens.wisdomcar.persist.dao.*; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto; @@ -19,9 +18,6 @@ import com.ccsens.util.JsonResponse; import com.ccsens.util.RedisUtil; import com.ccsens.wisdomcar.bean.dto.CreateCaseDto; import com.ccsens.wisdomcar.bean.po.*; -import com.ccsens.wisdomcar.persist.dao.HospitalWrokingDao; -import com.ccsens.wisdomcar.persist.dao.PatientFamilyDao; -import com.ccsens.wisdomcar.persist.dao.PatientProjectDao; import com.ccsens.wisdomcar.util.Constant; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -56,6 +52,10 @@ public class WisdomCarService implements IWisdomCarService { private TallFeignClient tallFeignClient; @Resource private WisdomCarDao wisdomcarDao; + @Resource + private StepDao stepDao; + @Resource + private StepTaskDao stepTaskDao; @Override @@ -140,9 +140,24 @@ public class WisdomCarService implements IWisdomCarService { if (Constant.SPECIALIST_TWO.equals(member.getPosition())){ roleName.add(Constant.SPECIALIST); } + if (Constant.TRIAGE_TABLE_THREE.equals(member.getPosition())){ + roleName.add(Constant.TRIAGE_TABLE); + } + memberForTemplate.setRoleName(roleName); memberList.add(memberForTemplate); } + //查找主任,主任为项目经理 + Long headOfPM = hospitalWrokingDao.findHeadOfPM(hospitalMembers.get(0).getHospitalId()); + if (ObjectUtil.isNotNull(headOfPM)){ + List roleName = new ArrayList<>(); + MemberRoleDto.MemberForTemplate memberForTemplate = new MemberRoleDto.MemberForTemplate(); + roleName.add(Constant.HEAD); + memberForTemplate.setUserId(headOfPM); + memberForTemplate.setRoleName(roleName); + memberList.add(memberForTemplate); + } + } @@ -164,11 +179,35 @@ public class WisdomCarService implements IWisdomCarService { ProjectVo.ProjectInfo data = projectId.getData(); if (ObjectUtil.isNotNull(data)){ + //将分解任务与tall绑定 + if (ObjectUtil.isNotNull(data.getTaskDetails())){ + for (ProjectVo.TaskDetail taskDetail : data.getTaskDetails()) { + if (Constant.TASK_DETAIL_LEVEL_TWO.equals(taskDetail.getTaskDetailLevel())){ + StepExample stepExample = new StepExample(); + stepExample.createCriteria().andTaskSubNameEqualTo(taskDetail.getTaskDetailName()); + List steps = stepDao.selectByExample(stepExample); + if (ObjectUtil.isNotNull(taskDetail.getTaskSubList())){ + for (ProjectVo.TaskSub taskSub : taskDetail.getTaskSubList()) { + StepTask stepTask = new StepTask(); + stepTask.setId(snowflake.nextId()); + stepTask.setBatch(1); + stepTask.setPatientId(patient.getId()); + stepTask.setTaskSubId(taskSub.getTaskSubId()); + stepTask.setStepId(steps.get(0).getId()); + stepTaskDao.insertSelective(stepTask); + } + } + } + } + } + + //调用tall的添加成员接口 saveMemberForTemplate.setProjectId(data.getId()); saveMemberForTemplate.setMemberForTemplate(memberList); - //调用tall的添加成员接口 log.info("调用tall内的给复制的项目添加成员接口"); - JsonResponse jsonResponse = tallFeignClient.addMemberForTemplate(saveMemberForTemplate); + QueryDto queryDto = new QueryDto<>(); + queryDto.setParam(saveMemberForTemplate); + JsonResponse jsonResponse = tallFeignClient.addMemberForTemplate(queryDto); if (!jsonResponse.getCode().equals(Constant.RESPONSE_OK)){ log.info("调用tall异常后返回:{}",jsonResponse.getMsg()); throw new BaseException(Constant.RETURN_ERROR); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java index e40093ba..9a77e9ca 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java @@ -75,6 +75,10 @@ public class Constant { * 角色名称:分诊台 */ public static final String TRIAGE_TABLE = "分诊台"; + /** + * 角色名称:项目经理(主任) + */ + public static final String HEAD = "项目经理"; /** * 0急诊护士 @@ -92,6 +96,10 @@ public class Constant { * 3-分诊台 */ public static final Byte TRIAGE_TABLE_THREE = 3; + /** + * 4-主任 + */ + public static final Byte HEAD_FOUR = 4; /** * 响应成功 @@ -111,4 +119,9 @@ public class Constant { * 调用Tall异常 */ public static final String RETURN_ERROR = "调用Tall异常"; + + /** + * 调用Tall异常 + */ + public static final Byte TASK_DETAIL_LEVEL_TWO = 2; } diff --git a/wisdomcar/src/main/resources/mapper_dao/HospitalWorkingDao.xml b/wisdomcar/src/main/resources/mapper_dao/HospitalWorkingDao.xml index d2cb12ee..a4cbacf3 100644 --- a/wisdomcar/src/main/resources/mapper_dao/HospitalWorkingDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/HospitalWorkingDao.xml @@ -18,4 +18,15 @@ AND hw.end_time > #{currentTime} + \ No newline at end of file diff --git a/wisdomcar/src/main/resources/mapper_raw/StepMapper.xml b/wisdomcar/src/main/resources/mapper_raw/StepMapper.xml index fca31c13..fae620fa 100644 --- a/wisdomcar/src/main/resources/mapper_raw/StepMapper.xml +++ b/wisdomcar/src/main/resources/mapper_raw/StepMapper.xml @@ -10,6 +10,7 @@ + @@ -70,7 +71,7 @@ - id, name, code, sequence, step_type, created_at, updated_at, rec_status + id, name, code, sequence, step_type, created_at, updated_at, rec_status, task_sub_name @@ -198,6 +207,9 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, + + task_sub_name = #{record.taskSubName,jdbcType=VARCHAR}, + @@ -212,7 +224,8 @@ step_type = #{record.stepType,jdbcType=TINYINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} + rec_status = #{record.recStatus,jdbcType=TINYINT}, + task_sub_name = #{record.taskSubName,jdbcType=VARCHAR} @@ -241,6 +254,9 @@ rec_status = #{recStatus,jdbcType=TINYINT}, + + task_sub_name = #{taskSubName,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} @@ -252,7 +268,8 @@ step_type = #{stepType,jdbcType=TINYINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} + rec_status = #{recStatus,jdbcType=TINYINT}, + task_sub_name = #{taskSubName,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file