Browse Source

Merge branch 'master' of dd.tall.wiki:ccsens_wiki/carbasics

master
zhizhi wu 4 years ago
parent
commit
d2edf152b6
  1. 4
      src/main/java/com/ccsens/carbasics/api/FirstAidController.java
  2. 287
      src/main/java/com/ccsens/carbasics/bean/po/Organization.java
  3. 1860
      src/main/java/com/ccsens/carbasics/bean/po/OrganizationExample.java
  4. 26
      src/main/java/com/ccsens/carbasics/persist/dao/StepDao.java
  5. 58
      src/main/java/com/ccsens/carbasics/persist/mapper/OrganizationMapper.java
  6. 48
      src/main/java/com/ccsens/carbasics/service/FirstAidService.java
  7. 26
      src/main/java/com/ccsens/carbasics/util/Constant.java
  8. 2
      src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java
  9. 28
      src/main/resources/mapper_dao/FirstAidDao.xml
  10. 2
      src/main/resources/mapper_dao/FirstAidLogDao.xml
  11. 14
      src/main/resources/mapper_dao/OrganizationDao.xml
  12. 57
      src/main/resources/mapper_dao/StepDao.xml
  13. 627
      src/main/resources/mapper_raw/OrganizationMapper.xml
  14. 32
      src/main/resources/mbg.xml

4
src/main/java/com/ccsens/carbasics/api/FirstAidController.java

@ -69,9 +69,9 @@ public class FirstAidController {
@ApiOperation(value = "修改病例状态") @ApiOperation(value = "修改病例状态")
@RequestMapping(value = "/updateStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/updateStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse updateStatus(@ApiParam @Validated @RequestBody QueryDto<FirstAidDto.UpdateStatus> params) throws Exception{ public JsonResponse updateStatus(@ApiParam @Validated @RequestBody QueryDto<FirstAidDto.UpdateStatus> params) throws Exception{
log.info("查询自己相关的病例列表:{}", params); log.info("修改病例状态:{}", params);
firstAidService.updateStatus(params.getParam(), params.getUserId()); firstAidService.updateStatus(params.getParam(), params.getUserId());
log.info("查询自己相关的病例列表成功"); log.info("修改病例状态成功");
return JsonResponse.newInstance().ok(); return JsonResponse.newInstance().ok();
} }

287
src/main/java/com/ccsens/carbasics/bean/po/Organization.java

@ -1,150 +1,139 @@
package com.ccsens.carbasics.bean.po; package com.ccsens.carbasics.bean.po;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
public class Organization implements Serializable { public class Organization implements Serializable {
private Long id; private Long id;
private Byte organizationType; private Byte organizationType;
private String code; private String code;
private String name; private String name;
private String shortName; private String shortName;
private String introduce; private String introduce;
private Byte level; private Byte level;
private Long parentId; private Long operator;
private Long operator; private Date createdAt;
private Date createdAt; private Date updatedAt;
private Date updatedAt; private Byte recStatus;
private Byte recStatus; private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L; public Long getId() {
return id;
public Long getId() { }
return id;
} public void setId(Long id) {
this.id = id;
public void setId(Long id) { }
this.id = id;
} public Byte getOrganizationType() {
return organizationType;
public Byte getOrganizationType() { }
return organizationType;
} public void setOrganizationType(Byte organizationType) {
this.organizationType = organizationType;
public void setOrganizationType(Byte organizationType) { }
this.organizationType = organizationType;
} public String getCode() {
return code;
public String getCode() { }
return code;
} public void setCode(String code) {
this.code = code == null ? null : code.trim();
public void setCode(String code) { }
this.code = code == null ? null : code.trim();
} public String getName() {
return name;
public String getName() { }
return name;
} public void setName(String name) {
this.name = name == null ? null : name.trim();
public void setName(String name) { }
this.name = name == null ? null : name.trim();
} public String getShortName() {
return shortName;
public String getShortName() { }
return shortName;
} public void setShortName(String shortName) {
this.shortName = shortName == null ? null : shortName.trim();
public void setShortName(String shortName) { }
this.shortName = shortName == null ? null : shortName.trim();
} public String getIntroduce() {
return introduce;
public String getIntroduce() { }
return introduce;
} public void setIntroduce(String introduce) {
this.introduce = introduce == null ? null : introduce.trim();
public void setIntroduce(String introduce) { }
this.introduce = introduce == null ? null : introduce.trim();
} public Byte getLevel() {
return level;
public Byte getLevel() { }
return level;
} public void setLevel(Byte level) {
this.level = level;
public void setLevel(Byte level) { }
this.level = level;
} public Long getOperator() {
return operator;
public Long getParentId() { }
return parentId;
} public void setOperator(Long operator) {
this.operator = operator;
public void setParentId(Long parentId) { }
this.parentId = parentId;
} public Date getCreatedAt() {
return createdAt;
public Long getOperator() { }
return operator;
} public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
public void setOperator(Long operator) { }
this.operator = operator;
} public Date getUpdatedAt() {
return updatedAt;
public Date getCreatedAt() { }
return createdAt;
} public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
public void setCreatedAt(Date createdAt) { }
this.createdAt = createdAt;
} public Byte getRecStatus() {
return recStatus;
public Date getUpdatedAt() { }
return updatedAt;
} public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
public void setUpdatedAt(Date updatedAt) { }
this.updatedAt = updatedAt;
} @Override
public String toString() {
public Byte getRecStatus() { StringBuilder sb = new StringBuilder();
return recStatus; sb.append(getClass().getSimpleName());
} sb.append(" [");
sb.append("Hash = ").append(hashCode());
public void setRecStatus(Byte recStatus) { sb.append(", id=").append(id);
this.recStatus = recStatus; sb.append(", organizationType=").append(organizationType);
} sb.append(", code=").append(code);
sb.append(", name=").append(name);
@Override sb.append(", shortName=").append(shortName);
public String toString() { sb.append(", introduce=").append(introduce);
StringBuilder sb = new StringBuilder(); sb.append(", level=").append(level);
sb.append(getClass().getSimpleName()); sb.append(", operator=").append(operator);
sb.append(" ["); sb.append(", createdAt=").append(createdAt);
sb.append("Hash = ").append(hashCode()); sb.append(", updatedAt=").append(updatedAt);
sb.append(", id=").append(id); sb.append(", recStatus=").append(recStatus);
sb.append(", organizationType=").append(organizationType); sb.append("]");
sb.append(", code=").append(code); return sb.toString();
sb.append(", name=").append(name); }
sb.append(", shortName=").append(shortName);
sb.append(", introduce=").append(introduce);
sb.append(", level=").append(level);
sb.append(", parentId=").append(parentId);
sb.append(", operator=").append(operator);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]");
return sb.toString();
}
} }

1860
src/main/java/com/ccsens/carbasics/bean/po/OrganizationExample.java

File diff suppressed because it is too large

26
src/main/java/com/ccsens/carbasics/persist/dao/StepDao.java

@ -13,31 +13,5 @@ import java.util.List;
*/ */
public interface StepDao extends StepMapper { public interface StepDao extends StepMapper {
/**
* 根据code查询id
* @param code code
* @param time time
* @return ID
*/
Long getIdByCode(@Param("code") String code, @Param("time") Long time);
/**
* 查询环节完成情况
* @param projectId 项目
* @return 环节完成情况
*/
List<StatisticalVo.Step> queryCompleteStatus(@Param("projectId") Long projectId);
/**
* 查询我院数据
* @param hospitalId
* @return
*/
List<Long> getPointTimeHospital(@Param("hospitalId") Long hospitalId);
/**
* 查询国际标准数据
* @param hospitalId
* @return
*/
List<Long> getPointTimeInternation(@Param("hospitalId") Long hospitalId);
} }

58
src/main/java/com/ccsens/carbasics/persist/mapper/OrganizationMapper.java

@ -1,30 +1,30 @@
package com.ccsens.carbasics.persist.mapper; package com.ccsens.carbasics.persist.mapper;
import com.ccsens.carbasics.bean.po.Organization; import com.ccsens.carbasics.bean.po.Organization;
import com.ccsens.carbasics.bean.po.OrganizationExample; import com.ccsens.carbasics.bean.po.OrganizationExample;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface OrganizationMapper { public interface OrganizationMapper {
long countByExample(OrganizationExample example); long countByExample(OrganizationExample example);
int deleteByExample(OrganizationExample example); int deleteByExample(OrganizationExample example);
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
int insert(Organization record); int insert(Organization record);
int insertSelective(Organization record); int insertSelective(Organization record);
List<Organization> selectByExample(OrganizationExample example); List<Organization> selectByExample(OrganizationExample example);
Organization selectByPrimaryKey(Long id); Organization selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") Organization record, @Param("example") OrganizationExample example); int updateByExampleSelective(@Param("record") Organization record, @Param("example") OrganizationExample example);
int updateByExample(@Param("record") Organization record, @Param("example") OrganizationExample example); int updateByExample(@Param("record") Organization record, @Param("example") OrganizationExample example);
int updateByPrimaryKeySelective(Organization record); int updateByPrimaryKeySelective(Organization record);
int updateByPrimaryKey(Organization record); int updateByPrimaryKey(Organization record);
} }

48
src/main/java/com/ccsens/carbasics/service/FirstAidService.java

@ -56,8 +56,6 @@ public class FirstAidService implements IFirstAidService{
@Resource @Resource
private Snowflake snowflake; private Snowflake snowflake;
@Resource
private FirstAidLogMapper firstAidLogMapper;
@Resource @Resource
private FirstAidMemberDao firstAidMemberDao; private FirstAidMemberDao firstAidMemberDao;
@Resource @Resource
@ -162,9 +160,9 @@ public class FirstAidService implements IFirstAidService{
firstAidLog.setFirstAidId(firstAid.getId()); firstAidLog.setFirstAidId(firstAid.getId());
firstAidLog.setOperationTime(System.currentTimeMillis()); firstAidLog.setOperationTime(System.currentTimeMillis());
firstAidLog.setOperationUserId(userId); firstAidLog.setOperationUserId(userId);
firstAidLog.setOperationType((byte) 0); firstAidLog.setOperationType(Constant.FirstAidLogType.Create.status);
firstAidLog.setOperationRole(position); firstAidLog.setOperationRole(position);
firstAidLogMapper.insertSelective(firstAidLog); firstAidLogDao.insertSelective(firstAidLog);
//如果是医生,再添加一条加入的日志 //如果是医生,再添加一条加入的日志
if(position == 1){ if(position == 1){
FirstAidLog firstAidLogJoin = new FirstAidLog(); FirstAidLog firstAidLogJoin = new FirstAidLog();
@ -172,9 +170,9 @@ public class FirstAidService implements IFirstAidService{
firstAidLogJoin.setFirstAidId(firstAid.getId()); firstAidLogJoin.setFirstAidId(firstAid.getId());
firstAidLogJoin.setOperationTime(System.currentTimeMillis()); firstAidLogJoin.setOperationTime(System.currentTimeMillis());
firstAidLogJoin.setOperationUserId(userId); firstAidLogJoin.setOperationUserId(userId);
firstAidLogJoin.setOperationType((byte) 7); firstAidLogJoin.setOperationType(Constant.FirstAidLogType.join.status);
firstAidLogJoin.setOperationRole(position); firstAidLogJoin.setOperationRole(position);
firstAidLogMapper.insertSelective(firstAidLogJoin); firstAidLogDao.insertSelective(firstAidLogJoin);
} }
//添加疑似诊断信息 //添加疑似诊断信息
FirstAidRecord firstAidRecord = new FirstAidRecord(); FirstAidRecord firstAidRecord = new FirstAidRecord();
@ -345,13 +343,12 @@ public class FirstAidService implements IFirstAidService{
firstAidLog.setFirstAidId(firstAid.getId()); firstAidLog.setFirstAidId(firstAid.getId());
firstAidLog.setOperationTime(System.currentTimeMillis()); firstAidLog.setOperationTime(System.currentTimeMillis());
firstAidLog.setOperationUserId(userId); firstAidLog.setOperationUserId(userId);
firstAidLog.setOperationUserId(userId);
firstAidLog.setOperationRole((byte) 4); firstAidLog.setOperationRole((byte) 4);
if(param.getDataStatus() == 0){ if(param.getDataStatus() == 0){
firstAidLog.setOperationType((byte) 1); firstAidLog.setOperationType(Constant.FirstAidLogType.ApplyForPass.status);
} }
if (param.getDataStatus() == 6){ if (param.getDataStatus() == 6){
firstAidLog.setOperationType((byte) 2); firstAidLog.setOperationType(Constant.FirstAidLogType.ApplyForRefuse.status);
} }
firstAidLogDao.insertSelective(firstAidLog); firstAidLogDao.insertSelective(firstAidLog);
} }
@ -377,7 +374,7 @@ public class FirstAidService implements IFirstAidService{
//判断病例是否已有医生加入 //判断病例是否已有医生加入
FirstAidMember firstAidMember = firstAidMemberDao.findByAidId(param.getFirstAidId()); FirstAidMember firstAidMember = firstAidMemberDao.findByAidId(param.getFirstAidId());
if (ObjectUtil.isNotNull(firstAidMember)) { if (0 != firstAidMember.getRecordUserId() && ObjectUtil.isNotNull(firstAidMember.getRecordUserId())) {
throw new BaseException(DefaultCodeError.DOCTOR_HAS_JOINED); throw new BaseException(DefaultCodeError.DOCTOR_HAS_JOINED);
} }
@ -386,7 +383,7 @@ public class FirstAidService implements IFirstAidService{
FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(param.getFirstAidId()); FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
CProjectVo.CopyProjectInfo copyProjectInfo = new CProjectVo.CopyProjectInfo(); CProjectVo.CopyProjectInfo copyProjectInfo = new CProjectVo.CopyProjectInfo();
//如果已有项目则不创建,使用旧项目 //如果已有项目则不创建,使用旧项目
if (firstAidInfo.getType().equals(param.getType()) && ObjectUtil.isNotNull(firstAidInfo.getProjectId())) { if (firstAidInfo.getType().equals(param.getType()) && 0 != firstAidInfo.getProjectId()) {
copyProjectInfo.setId(firstAidInfo.getProjectId()); copyProjectInfo.setId(firstAidInfo.getProjectId());
}else { }else {
CProjectDto.CopyProject copyProject = new CProjectDto.CopyProject(); CProjectDto.CopyProject copyProject = new CProjectDto.CopyProject();
@ -429,17 +426,14 @@ public class FirstAidService implements IFirstAidService{
log.info("加入急救-添加成员结束"); log.info("加入急救-添加成员结束");
//添加医生为病例的录入者 t_qcp_first_aid_member //添加医生为病例的录入者 t_qcp_first_aid_member
FirstAidMember newFirstAidMember = new FirstAidMember(); firstAidMember.setRecordUserId(userId);
newFirstAidMember.setId(snowflake.nextId()); firstAidMemberDao.updateByPrimaryKeySelective(firstAidMember);
newFirstAidMember.setFirstAidId(param.getFirstAidId());
newFirstAidMember.setCreateUserId(userId);
newFirstAidMember.setRecordUserId(userId);
firstAidMemberDao.insertSelective(newFirstAidMember);
//急救信息和项目关联 //急救信息和项目关联
FirstAid firstAid = new FirstAid(); FirstAid firstAid = new FirstAid();
firstAid.setId(param.getFirstAidId()); firstAid.setId(param.getFirstAidId());
firstAid.setProjectId(copyProjectInfo.getId()); firstAid.setProjectId(copyProjectInfo.getId());
firstAid.setType(param.getType());
firstAidDao.updateByPrimaryKeySelective(firstAid); firstAidDao.updateByPrimaryKeySelective(firstAid);
//添加急救日志(类型:加入) //添加急救日志(类型:加入)
@ -448,7 +442,7 @@ public class FirstAidService implements IFirstAidService{
firstAidLog.setFirstAidId(param.getFirstAidId()); firstAidLog.setFirstAidId(param.getFirstAidId());
firstAidLog.setOperationTime(System.currentTimeMillis()); firstAidLog.setOperationTime(System.currentTimeMillis());
firstAidLog.setOperationUserId(userId); firstAidLog.setOperationUserId(userId);
firstAidLog.setOperationType((byte)7); firstAidLog.setOperationType(Constant.FirstAidLogType.join.status);
if (0 == param.getType()){ if (0 == param.getType()){
firstAidLog.setOperationRole((byte)1); firstAidLog.setOperationRole((byte)1);
}else{ }else{
@ -478,7 +472,7 @@ public class FirstAidService implements IFirstAidService{
firstAidLog.setFirstAidId(param.getFirstAidId()); firstAidLog.setFirstAidId(param.getFirstAidId());
firstAidLog.setOperationTime(System.currentTimeMillis()); firstAidLog.setOperationTime(System.currentTimeMillis());
firstAidLog.setOperationUserId(userId); firstAidLog.setOperationUserId(userId);
firstAidLog.setOperationType((byte)8); firstAidLog.setOperationType(Constant.FirstAidLogType.quit.status);
//判断角色是否神内/神外医生 //判断角色是否神内/神外医生
OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId); OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
log.info("当前用户的科室职位信息:{}",memberPosition); log.info("当前用户的科室职位信息:{}",memberPosition);
@ -545,13 +539,13 @@ public class FirstAidService implements IFirstAidService{
} }
break; break;
case 5: case 5:
if (Constant.DataStatus.FirstAidPass.status != firstAid.getDataStatus() && Constant.DataStatus.DischargePass.status != firstAid.getDataStatus() && Constant.DataStatus.ApplyForRefuse.status != firstAid.getDataStatus()) {
throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
}
Integer updateNumber = firstAidLogDao.countUpdateNumber(param.getFirstAidId()); Integer updateNumber = firstAidLogDao.countUpdateNumber(param.getFirstAidId());
if (updateNumber >= Constant.MAX_UPDATE_NUMBER) { if (updateNumber >= Constant.MAX_UPDATE_NUMBER) {
throw new BaseException(DefaultCodeError.SURPASS_MAX_NUMBER); throw new BaseException(DefaultCodeError.SURPASS_MAX_NUMBER);
} }
if (Constant.DataStatus.FirstAidPass.status != firstAid.getDataStatus() && Constant.DataStatus.DischargePass.status != firstAid.getDataStatus() && Constant.DataStatus.ApplyForRefuse.status != firstAid.getDataStatus()) {
throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
}
break; break;
default: default:
throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR); throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
@ -564,15 +558,7 @@ public class FirstAidService implements IFirstAidService{
firstAidLog.setFirstAidId(param.getFirstAidId()); firstAidLog.setFirstAidId(param.getFirstAidId());
firstAidLog.setOperationTime(System.currentTimeMillis()); firstAidLog.setOperationTime(System.currentTimeMillis());
firstAidLog.setOperationUserId(userId); firstAidLog.setOperationUserId(userId);
if (1 == param.getDataStatus() || 3 == param.getDataStatus()){ firstAidLog.setOperationType(param.getDataStatus());
firstAidLog.setOperationType((byte)1);
}
if (2 == param.getDataStatus() || 4 == param.getDataStatus()){
firstAidLog.setOperationType((byte)2);
}
if (5 == param.getDataStatus()){
firstAidLog.setOperationType((byte)3);
}
firstAidLog.setOperationRole((byte)3); firstAidLog.setOperationRole((byte)3);
firstAidLogDao.insertSelective(firstAidLog); firstAidLogDao.insertSelective(firstAidLog);
} }

26
src/main/java/com/ccsens/carbasics/util/Constant.java

@ -123,7 +123,6 @@ public class Constant {
this.status = status; this.status = status;
this.message = message; this.message = message;
} }
} }
/**wbs相关*/ /**wbs相关*/
@ -223,4 +222,29 @@ public class Constant {
*/ */
public static final Integer MAX_UPDATE_NUMBER = 1; public static final Integer MAX_UPDATE_NUMBER = 1;
public enum FirstAidLogType {
/**
* 日志状态 0:创建 1:急救审核通过 2:急救审核拒绝 3出院审核通过 4出院审核拒绝 5:申请修改 6申请通过 7:申请拒绝 8:加入 9:退出
*/
Create((byte) 0,"创建"),
FirstAidPass((byte) 1,"急救审核通过"),
FirstAidRefuse((byte) 2,"急救审核拒绝"),
DischargePass((byte) 3,"3出院审核通过"),
DischargeRefuse((byte) 4,"出院审核拒绝"),
ApplyFor((byte) 5,"申请修改"),
ApplyForPass((byte) 6,"申请通过"),
ApplyForRefuse((byte) 7,"申请拒绝"),
join((byte) 8,"加入"),
quit((byte) 9,"退出"),
;
public byte status;
public String message;
FirstAidLogType(byte status, String message) {
this.status = status;
this.message = message;
}
}
} }

2
src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java

@ -37,7 +37,7 @@ public class DefaultCodeError extends CodeError {
public static final Code FEIGN_ERROR = new Code(28,"导入项目失败", true); public static final Code FEIGN_ERROR = new Code(28,"导入项目失败", true);
public static final Code DOCTOR_HAS_JOINED = new Code(29,"已有医生加入", true); public static final Code DOCTOR_HAS_JOINED = new Code(29,"已有医生加入", true);
public static final Code REPEAT_QUIT = new Code(30,"您已经不是录入者,无需重复退出", true); public static final Code REPEAT_QUIT = new Code(30,"您已经不是录入者,无需重复退出", true);
public static final Code DATA_STATUS_ERROR = new Code(31,"请先完成之前的审核", true); public static final Code DATA_STATUS_ERROR = new Code(31,"审核顺序错误", true);
public static final Code SURPASS_MAX_NUMBER = new Code(32,"超过最大申请修改次数", true); public static final Code SURPASS_MAX_NUMBER = new Code(32,"超过最大申请修改次数", true);
public static final Code DATA_STATUS_SAME = new Code(33,"状态一致无需修改", true); public static final Code DATA_STATUS_SAME = new Code(33,"状态一致无需修改", true);
public static final Code NOT_APPLY_FOR = new Code(34,"未申请修改,无法修改状态", true); public static final Code NOT_APPLY_FOR = new Code(34,"未申请修改,无法修改状态", true);

28
src/main/resources/mapper_dao/FirstAidDao.xml

@ -74,7 +74,8 @@
`type`, `type`,
nation, nation,
idcard, idcard,
data_status AS dataStatus data_status AS dataStatus,
updated_at
FROM FROM
t_qcp_first_aid t_qcp_first_aid
WHERE WHERE
@ -89,16 +90,16 @@
AND hospital_id = #{hospitalId} AND hospital_id = #{hospitalId}
AND type = #{template} AND type = #{template}
) t ) t
LEFT JOIN t_qcp_first_aid_record t1 ON t.id = t1.first_aid_id LEFT JOIN t_qcp_first_aid_record t1 ON t.firstAidId = t1.first_aid_id
AND t1.question_code = 'JBXX-ZYH' AND t1.question_code = 'JBXX-ZYH'
AND t1.rec_status = 0 AND t1.rec_status = 0
LEFT JOIN t_qcp_first_aid_record t2 ON t.id = t2.first_aid_id LEFT JOIN t_qcp_first_aid_record t2 ON t.firstAidId = t2.first_aid_id
AND t2.question_code = 'JBXX-DYSJ' AND t2.question_code = 'JBXX-DYSJ'
AND t2.rec_status = 0 AND t2.rec_status = 0
LEFT JOIN t_qcp_first_aid_log t3 ON t.id = t3.first_aid_id LEFT JOIN t_qcp_first_aid_log t3 ON t.firstAidId = t3.first_aid_id
AND t3.operation_type = 3 AND t3.operation_type = 3
AND t3.rec_status = 0 AND t3.rec_status = 0
LEFT JOIN t_qcp_first_aid_record t4 ON t.id = t4.first_aid_id LEFT JOIN t_qcp_first_aid_record t4 ON t.firstAidId = t4.first_aid_id
AND t4.question_code = 'CYQK-CYSJ' AND t4.question_code = 'CYQK-CYSJ'
AND t4.rec_status = 0 AND t4.rec_status = 0
WHERE WHERE
@ -113,7 +114,7 @@
AND t2.answer + 0 &lt; #{param.endTime} AND t2.answer + 0 &lt; #{param.endTime}
</if> </if>
GROUP BY GROUP BY
t.id t.updated_at DESC
</select> </select>
<select id="queryPatientListBySecretary" <select id="queryPatientListBySecretary"
resultType="com.ccsens.carbasics.bean.vo.PatientVo$PatientListByQuality"> resultType="com.ccsens.carbasics.bean.vo.PatientVo$PatientListByQuality">
@ -132,7 +133,8 @@
`type`, `type`,
nation, nation,
idcard, idcard,
data_status AS dataStatus data_status AS dataStatus,
updated_at
FROM FROM
t_qcp_first_aid t_qcp_first_aid
WHERE WHERE
@ -145,17 +147,17 @@
</if> </if>
AND rec_status = 0 AND rec_status = 0
AND hospital_id in AND hospital_id in
<foreach collection="hospitalList" open="(" close=")" separator="," item="hospitalId"> <foreach collection="hospitalList" open="(" close=")" separator="," item="hospital">
#{hospitalId} #{hospital.id}
</foreach> </foreach>
) t ) t
LEFT JOIN t_qcp_first_aid_record t1 ON t.id = t1.first_aid_id LEFT JOIN t_qcp_first_aid_record t1 ON t.firstAidId = t1.first_aid_id
AND t1.question_code = 'JBXX-ZYH' AND t1.question_code = 'JBXX-ZYH'
AND t1.rec_status = 0 AND t1.rec_status = 0
LEFT JOIN t_qcp_first_aid_record t2 ON t.id = t2.first_aid_id LEFT JOIN t_qcp_first_aid_record t2 ON t.firstAidId = t2.first_aid_id
AND t2.question_code = 'JBXX-DYSJ' AND t2.question_code = 'JBXX-DYSJ'
AND t2.rec_status = 0 AND t2.rec_status = 0
LEFT JOIN t_qcp_first_aid_log t3 ON t.id = t3.first_aid_id LEFT JOIN t_qcp_first_aid_log t3 ON t.firstAidId = t3.first_aid_id
AND t3.operation_type = 3 AND t3.operation_type = 3
AND t3.rec_status = 0 AND t3.rec_status = 0
<trim prefix="WHERE" prefixOverrides="and"> <trim prefix="WHERE" prefixOverrides="and">
@ -170,6 +172,6 @@
</if> </if>
</trim> </trim>
GROUP BY GROUP BY
t.id t.updated_at DESC
</select> </select>
</mapper> </mapper>

2
src/main/resources/mapper_dao/FirstAidLogDao.xml

@ -41,7 +41,7 @@
WHERE WHERE
rec_status = 0 rec_status = 0
AND first_aid_id = #{firstAidId} AND first_aid_id = #{firstAidId}
AND operation_type = 3 AND operation_type = 5
AND operation_role = 3 AND operation_role = 3
</select> </select>
</mapper> </mapper>

14
src/main/resources/mapper_dao/OrganizationDao.xml

@ -25,13 +25,13 @@
</select> </select>
<select id="getByProjectId" resultType="com.ccsens.carbasics.bean.po.Organization"> <select id="getByProjectId" resultType="com.ccsens.carbasics.bean.po.Organization">
SELECT SELECT
id, o.id,
organization_type as organizationType, o.organization_type as organizationType,
`code`, o.`code`,
`name`, o.`name`,
short_name as shortName, o.short_name as shortName,
introduce, o.introduce,
`level` o.`level`
FROM FROM
t_organization o, t_organization o,
t_organization_project p t_organization_project p

57
src/main/resources/mapper_dao/StepDao.xml

@ -3,61 +3,4 @@
<mapper namespace="com.ccsens.carbasics.persist.dao.StepDao"> <mapper namespace="com.ccsens.carbasics.persist.dao.StepDao">
<select id="getIdByCode" resultType="java.lang.Long">
select id from t_qcp_step
where code = #{code} and start_effect_time &lt;= #{time} and end_effect_time &gt; #{time} and rec_status = 0
</select>
<select id="queryCompleteStatus" resultType="com.ccsens.carbasics.bean.vo.StatisticalVo$Step">
SELECT
s.id as stepId,
s.code as stepCode,
s.name as stepName,
r.answer AS startTime,
r.submit_user_type AS type,
IF( r.submit_user_type = 0, c.serial, doctor.NAME ) AS memberName
FROM
(
SELECT
s.id,
s.code,
s.name,
s.sequence,
a.id AS aidId
FROM
t_qcp_step s,
t_qcp_first_aid a,
t_qcp_patient p
WHERE
a.project_id = #{projectId}
AND a.patient_id = p.id
and s.hospital_id = p.hospital_id
AND s.start_effect_time &lt;= unix_timestamp(a.created_at)*1000 AND s.end_effect_time &gt; unix_timestamp(a.created_at)*1000
and s.type = 0
AND s.rec_status = 0
AND a.rec_status = 0
and p.rec_status = 0
) s
LEFT JOIN t_qcp_code_dictionaries d ON s.id = d.step_id AND d.rec_status = 0
LEFT JOIN t_qcp_first_aid_record r ON s.aidId = r.first_aid_id AND d.question_code = r.question_code AND r.rec_status = 0
LEFT JOIN t_qcp_doctor doctor ON r.submit_user_id = doctor.user_id AND r.submit_user_type = 1 AND doctor.rec_status = 0
LEFT JOIN t_qcp_wisdom_car c ON r.submit_user_id = c.user_id AND r.submit_user_type = 0 AND c.rec_status = 0
ORDER BY s.sequence
</select>
<select id="getPointTimeHospital" resultType="java.lang.Long">
select
MIN(tfas.duration)/1000 as time
from
t_qcp_first_aid_standard tfas left JOIN t_qcp_step ts on tfas.step_id = ts.id
where tfas.hospital_id=#{hospitalId} and tfas.type=1 and tfas.rec_status = 0 and ts.rec_status=0
GROUP BY tfas.step_id;
</select>
<select id="getPointTimeInternation" resultType="java.lang.Long">
select
MIN(tfas.duration)/1000 as time
from
t_qcp_first_aid_standard tfas left JOIN t_qcp_step ts on tfas.step_id = ts.id
where tfas.hospital_id=#{hospitalId} and tfas.type=0 and tfas.rec_status = 0 and ts.rec_status=0
GROUP BY tfas.step_id;
</select>
</mapper> </mapper>

627
src/main/resources/mapper_raw/OrganizationMapper.xml

@ -1,323 +1,306 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.carbasics.persist.mapper.OrganizationMapper"> <mapper namespace="com.ccsens.carbasics.persist.mapper.OrganizationMapper">
<resultMap id="BaseResultMap" type="com.ccsens.carbasics.bean.po.Organization"> <resultMap id="BaseResultMap" type="com.ccsens.carbasics.bean.po.Organization">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="organization_type" jdbcType="TINYINT" property="organizationType" /> <result column="organization_type" jdbcType="TINYINT" property="organizationType" />
<result column="code" jdbcType="VARCHAR" property="code" /> <result column="code" jdbcType="VARCHAR" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" /> <result column="name" jdbcType="VARCHAR" property="name" />
<result column="short_name" jdbcType="VARCHAR" property="shortName" /> <result column="short_name" jdbcType="VARCHAR" property="shortName" />
<result column="introduce" jdbcType="VARCHAR" property="introduce" /> <result column="introduce" jdbcType="VARCHAR" property="introduce" />
<result column="level" jdbcType="TINYINT" property="level" /> <result column="level" jdbcType="TINYINT" property="level" />
<result column="parent_id" jdbcType="BIGINT" property="parentId" /> <result column="operator" jdbcType="BIGINT" property="operator" />
<result column="operator" jdbcType="BIGINT" property="operator" /> <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" /> <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" /> <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" /> </resultMap>
</resultMap> <sql id="Example_Where_Clause">
<sql id="Example_Where_Clause"> <where>
<where> <foreach collection="oredCriteria" item="criteria" separator="or">
<foreach collection="oredCriteria" item="criteria" separator="or"> <if test="criteria.valid">
<if test="criteria.valid"> <trim prefix="(" prefixOverrides="and" suffix=")">
<trim prefix="(" prefixOverrides="and" suffix=")"> <foreach collection="criteria.criteria" item="criterion">
<foreach collection="criteria.criteria" item="criterion"> <choose>
<choose> <when test="criterion.noValue">
<when test="criterion.noValue"> and ${criterion.condition}
and ${criterion.condition} </when>
</when> <when test="criterion.singleValue">
<when test="criterion.singleValue"> and ${criterion.condition} #{criterion.value}
and ${criterion.condition} #{criterion.value} </when>
</when> <when test="criterion.betweenValue">
<when test="criterion.betweenValue"> and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} </when>
</when> <when test="criterion.listValue">
<when test="criterion.listValue"> and ${criterion.condition}
and ${criterion.condition} <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> #{listItem}
#{listItem} </foreach>
</foreach> </when>
</when> </choose>
</choose> </foreach>
</foreach> </trim>
</trim> </if>
</if> </foreach>
</foreach> </where>
</where> </sql>
</sql> <sql id="Update_By_Example_Where_Clause">
<sql id="Update_By_Example_Where_Clause"> <where>
<where> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <if test="criteria.valid">
<if test="criteria.valid"> <trim prefix="(" prefixOverrides="and" suffix=")">
<trim prefix="(" prefixOverrides="and" suffix=")"> <foreach collection="criteria.criteria" item="criterion">
<foreach collection="criteria.criteria" item="criterion"> <choose>
<choose> <when test="criterion.noValue">
<when test="criterion.noValue"> and ${criterion.condition}
and ${criterion.condition} </when>
</when> <when test="criterion.singleValue">
<when test="criterion.singleValue"> and ${criterion.condition} #{criterion.value}
and ${criterion.condition} #{criterion.value} </when>
</when> <when test="criterion.betweenValue">
<when test="criterion.betweenValue"> and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} </when>
</when> <when test="criterion.listValue">
<when test="criterion.listValue"> and ${criterion.condition}
and ${criterion.condition} <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> #{listItem}
#{listItem} </foreach>
</foreach> </when>
</when> </choose>
</choose> </foreach>
</foreach> </trim>
</trim> </if>
</if> </foreach>
</foreach> </where>
</where> </sql>
</sql> <sql id="Base_Column_List">
<sql id="Base_Column_List"> id, organization_type, code, name, short_name, introduce, level, operator, created_at,
id, organization_type, code, name, short_name, introduce, level, parent_id, operator, updated_at, rec_status
created_at, updated_at, rec_status </sql>
</sql> <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationExample" resultMap="BaseResultMap"> select
select <if test="distinct">
<if test="distinct"> distinct
distinct </if>
</if> <include refid="Base_Column_List" />
<include refid="Base_Column_List" /> from t_organization
from t_organization <if test="_parameter != null">
<if test="_parameter != null"> <include refid="Example_Where_Clause" />
<include refid="Example_Where_Clause" /> </if>
</if> <if test="orderByClause != null">
<if test="orderByClause != null"> order by ${orderByClause}
order by ${orderByClause} </if>
</if> </select>
</select> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> select
select <include refid="Base_Column_List" />
<include refid="Base_Column_List" /> from t_organization
from t_organization where id = #{id,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT} </select>
</select> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> delete from t_organization
delete from t_organization where id = #{id,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT} </delete>
</delete> <delete id="deleteByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationExample">
<delete id="deleteByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationExample"> delete from t_organization
delete from t_organization <if test="_parameter != null">
<if test="_parameter != null"> <include refid="Example_Where_Clause" />
<include refid="Example_Where_Clause" /> </if>
</if> </delete>
</delete> <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.Organization">
<insert id="insert" parameterType="com.ccsens.carbasics.bean.po.Organization"> insert into t_organization (id, organization_type, code,
insert into t_organization (id, organization_type, code, name, short_name, introduce,
name, short_name, introduce, level, operator, created_at,
level, parent_id, operator, updated_at, rec_status)
created_at, updated_at, rec_status values (#{id,jdbcType=BIGINT}, #{organizationType,jdbcType=TINYINT}, #{code,jdbcType=VARCHAR},
) #{name,jdbcType=VARCHAR}, #{shortName,jdbcType=VARCHAR}, #{introduce,jdbcType=VARCHAR},
values (#{id,jdbcType=BIGINT}, #{organizationType,jdbcType=TINYINT}, #{code,jdbcType=VARCHAR}, #{level,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP},
#{name,jdbcType=VARCHAR}, #{shortName,jdbcType=VARCHAR}, #{introduce,jdbcType=VARCHAR}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
#{level,jdbcType=TINYINT}, #{parentId,jdbcType=BIGINT}, #{operator,jdbcType=BIGINT}, </insert>
#{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.Organization">
) insert into t_organization
</insert> <trim prefix="(" suffix=")" suffixOverrides=",">
<insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.Organization"> <if test="id != null">
insert into t_organization id,
<trim prefix="(" suffix=")" suffixOverrides=","> </if>
<if test="id != null"> <if test="organizationType != null">
id, organization_type,
</if> </if>
<if test="organizationType != null"> <if test="code != null">
organization_type, code,
</if> </if>
<if test="code != null"> <if test="name != null">
code, name,
</if> </if>
<if test="name != null"> <if test="shortName != null">
name, short_name,
</if> </if>
<if test="shortName != null"> <if test="introduce != null">
short_name, introduce,
</if> </if>
<if test="introduce != null"> <if test="level != null">
introduce, level,
</if> </if>
<if test="level != null"> <if test="operator != null">
level, operator,
</if> </if>
<if test="parentId != null"> <if test="createdAt != null">
parent_id, created_at,
</if> </if>
<if test="operator != null"> <if test="updatedAt != null">
operator, updated_at,
</if> </if>
<if test="createdAt != null"> <if test="recStatus != null">
created_at, rec_status,
</if> </if>
<if test="updatedAt != null"> </trim>
updated_at, <trim prefix="values (" suffix=")" suffixOverrides=",">
</if> <if test="id != null">
<if test="recStatus != null"> #{id,jdbcType=BIGINT},
rec_status, </if>
</if> <if test="organizationType != null">
</trim> #{organizationType,jdbcType=TINYINT},
<trim prefix="values (" suffix=")" suffixOverrides=","> </if>
<if test="id != null"> <if test="code != null">
#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR},
</if> </if>
<if test="organizationType != null"> <if test="name != null">
#{organizationType,jdbcType=TINYINT}, #{name,jdbcType=VARCHAR},
</if> </if>
<if test="code != null"> <if test="shortName != null">
#{code,jdbcType=VARCHAR}, #{shortName,jdbcType=VARCHAR},
</if> </if>
<if test="name != null"> <if test="introduce != null">
#{name,jdbcType=VARCHAR}, #{introduce,jdbcType=VARCHAR},
</if> </if>
<if test="shortName != null"> <if test="level != null">
#{shortName,jdbcType=VARCHAR}, #{level,jdbcType=TINYINT},
</if> </if>
<if test="introduce != null"> <if test="operator != null">
#{introduce,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT},
</if> </if>
<if test="level != null"> <if test="createdAt != null">
#{level,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP},
</if> </if>
<if test="parentId != null"> <if test="updatedAt != null">
#{parentId,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP},
</if> </if>
<if test="operator != null"> <if test="recStatus != null">
#{operator,jdbcType=BIGINT}, #{recStatus,jdbcType=TINYINT},
</if> </if>
<if test="createdAt != null"> </trim>
#{createdAt,jdbcType=TIMESTAMP}, </insert>
</if> <select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationExample" resultType="java.lang.Long">
<if test="updatedAt != null"> select count(*) from t_organization
#{updatedAt,jdbcType=TIMESTAMP}, <if test="_parameter != null">
</if> <include refid="Example_Where_Clause" />
<if test="recStatus != null"> </if>
#{recStatus,jdbcType=TINYINT}, </select>
</if> <update id="updateByExampleSelective" parameterType="map">
</trim> update t_organization
</insert> <set>
<select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationExample" resultType="java.lang.Long"> <if test="record.id != null">
select count(*) from t_organization id = #{record.id,jdbcType=BIGINT},
<if test="_parameter != null"> </if>
<include refid="Example_Where_Clause" /> <if test="record.organizationType != null">
</if> organization_type = #{record.organizationType,jdbcType=TINYINT},
</select> </if>
<update id="updateByExampleSelective" parameterType="map"> <if test="record.code != null">
update t_organization code = #{record.code,jdbcType=VARCHAR},
<set> </if>
<if test="record.id != null"> <if test="record.name != null">
id = #{record.id,jdbcType=BIGINT}, name = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.organizationType != null"> <if test="record.shortName != null">
organization_type = #{record.organizationType,jdbcType=TINYINT}, short_name = #{record.shortName,jdbcType=VARCHAR},
</if> </if>
<if test="record.code != null"> <if test="record.introduce != null">
code = #{record.code,jdbcType=VARCHAR}, introduce = #{record.introduce,jdbcType=VARCHAR},
</if> </if>
<if test="record.name != null"> <if test="record.level != null">
name = #{record.name,jdbcType=VARCHAR}, level = #{record.level,jdbcType=TINYINT},
</if> </if>
<if test="record.shortName != null"> <if test="record.operator != null">
short_name = #{record.shortName,jdbcType=VARCHAR}, operator = #{record.operator,jdbcType=BIGINT},
</if> </if>
<if test="record.introduce != null"> <if test="record.createdAt != null">
introduce = #{record.introduce,jdbcType=VARCHAR}, created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.level != null"> <if test="record.updatedAt != null">
level = #{record.level,jdbcType=TINYINT}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.parentId != null"> <if test="record.recStatus != null">
parent_id = #{record.parentId,jdbcType=BIGINT}, rec_status = #{record.recStatus,jdbcType=TINYINT},
</if> </if>
<if test="record.operator != null"> </set>
operator = #{record.operator,jdbcType=BIGINT}, <if test="_parameter != null">
</if> <include refid="Update_By_Example_Where_Clause" />
<if test="record.createdAt != null"> </if>
created_at = #{record.createdAt,jdbcType=TIMESTAMP}, </update>
</if> <update id="updateByExample" parameterType="map">
<if test="record.updatedAt != null"> update t_organization
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, set id = #{record.id,jdbcType=BIGINT},
</if> organization_type = #{record.organizationType,jdbcType=TINYINT},
<if test="record.recStatus != null"> code = #{record.code,jdbcType=VARCHAR},
rec_status = #{record.recStatus,jdbcType=TINYINT}, name = #{record.name,jdbcType=VARCHAR},
</if> short_name = #{record.shortName,jdbcType=VARCHAR},
</set> introduce = #{record.introduce,jdbcType=VARCHAR},
<if test="_parameter != null"> level = #{record.level,jdbcType=TINYINT},
<include refid="Update_By_Example_Where_Clause" /> operator = #{record.operator,jdbcType=BIGINT},
</if> created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</update> updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
<update id="updateByExample" parameterType="map"> rec_status = #{record.recStatus,jdbcType=TINYINT}
update t_organization <if test="_parameter != null">
set id = #{record.id,jdbcType=BIGINT}, <include refid="Update_By_Example_Where_Clause" />
organization_type = #{record.organizationType,jdbcType=TINYINT}, </if>
code = #{record.code,jdbcType=VARCHAR}, </update>
name = #{record.name,jdbcType=VARCHAR}, <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.carbasics.bean.po.Organization">
short_name = #{record.shortName,jdbcType=VARCHAR}, update t_organization
introduce = #{record.introduce,jdbcType=VARCHAR}, <set>
level = #{record.level,jdbcType=TINYINT}, <if test="organizationType != null">
parent_id = #{record.parentId,jdbcType=BIGINT}, organization_type = #{organizationType,jdbcType=TINYINT},
operator = #{record.operator,jdbcType=BIGINT}, </if>
created_at = #{record.createdAt,jdbcType=TIMESTAMP}, <if test="code != null">
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, code = #{code,jdbcType=VARCHAR},
rec_status = #{record.recStatus,jdbcType=TINYINT} </if>
<if test="_parameter != null"> <if test="name != null">
<include refid="Update_By_Example_Where_Clause" /> name = #{name,jdbcType=VARCHAR},
</if> </if>
</update> <if test="shortName != null">
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.carbasics.bean.po.Organization"> short_name = #{shortName,jdbcType=VARCHAR},
update t_organization </if>
<set> <if test="introduce != null">
<if test="organizationType != null"> introduce = #{introduce,jdbcType=VARCHAR},
organization_type = #{organizationType,jdbcType=TINYINT}, </if>
</if> <if test="level != null">
<if test="code != null"> level = #{level,jdbcType=TINYINT},
code = #{code,jdbcType=VARCHAR}, </if>
</if> <if test="operator != null">
<if test="name != null"> operator = #{operator,jdbcType=BIGINT},
name = #{name,jdbcType=VARCHAR}, </if>
</if> <if test="createdAt != null">
<if test="shortName != null"> created_at = #{createdAt,jdbcType=TIMESTAMP},
short_name = #{shortName,jdbcType=VARCHAR}, </if>
</if> <if test="updatedAt != null">
<if test="introduce != null"> updated_at = #{updatedAt,jdbcType=TIMESTAMP},
introduce = #{introduce,jdbcType=VARCHAR}, </if>
</if> <if test="recStatus != null">
<if test="level != null"> rec_status = #{recStatus,jdbcType=TINYINT},
level = #{level,jdbcType=TINYINT}, </if>
</if> </set>
<if test="parentId != null"> where id = #{id,jdbcType=BIGINT}
parent_id = #{parentId,jdbcType=BIGINT}, </update>
</if> <update id="updateByPrimaryKey" parameterType="com.ccsens.carbasics.bean.po.Organization">
<if test="operator != null"> update t_organization
operator = #{operator,jdbcType=BIGINT}, set organization_type = #{organizationType,jdbcType=TINYINT},
</if> code = #{code,jdbcType=VARCHAR},
<if test="createdAt != null"> name = #{name,jdbcType=VARCHAR},
created_at = #{createdAt,jdbcType=TIMESTAMP}, short_name = #{shortName,jdbcType=VARCHAR},
</if> introduce = #{introduce,jdbcType=VARCHAR},
<if test="updatedAt != null"> level = #{level,jdbcType=TINYINT},
updated_at = #{updatedAt,jdbcType=TIMESTAMP}, operator = #{operator,jdbcType=BIGINT},
</if> created_at = #{createdAt,jdbcType=TIMESTAMP},
<if test="recStatus != null"> updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}, rec_status = #{recStatus,jdbcType=TINYINT}
</if> where id = #{id,jdbcType=BIGINT}
</set> </update>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.carbasics.bean.po.Organization">
update t_organization
set organization_type = #{organizationType,jdbcType=TINYINT},
code = #{code,jdbcType=VARCHAR},
name = #{name,jdbcType=VARCHAR},
short_name = #{shortName,jdbcType=VARCHAR},
introduce = #{introduce,jdbcType=VARCHAR},
level = #{level,jdbcType=TINYINT},
parent_id = #{parentId,jdbcType=BIGINT},
operator = #{operator,jdbcType=BIGINT},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper> </mapper>

32
src/main/resources/mbg.xml

@ -57,22 +57,22 @@
</javaClientGenerator> </javaClientGenerator>
<table tableName="t_organization" domainObjectName="Organization"></table> <table tableName="t_organization" domainObjectName="Organization"></table>
<table tableName="t_organization_department" domainObjectName="OrganizationDepartment"></table> <!-- <table tableName="t_organization_department" domainObjectName="OrganizationDepartment"></table>-->
<table tableName="t_organization_member" domainObjectName="OrganizationMember"></table> <!-- <table tableName="t_organization_member" domainObjectName="OrganizationMember"></table>-->
<table tableName="t_organization_parent" domainObjectName="OrganizationParent"></table> <!-- <table tableName="t_organization_parent" domainObjectName="OrganizationParent"></table>-->
<table tableName="t_organization_position" domainObjectName="OrganizationPosition"></table> <!-- <table tableName="t_organization_position" domainObjectName="OrganizationPosition"></table>-->
<table tableName="t_organization_project" domainObjectName="OrganizationProject"></table> <!-- <table tableName="t_organization_project" domainObjectName="OrganizationProject"></table>-->
<table tableName="t_organization_template" domainObjectName="OrganizationTemplate"></table> <!-- <table tableName="t_organization_template" domainObjectName="OrganizationTemplate"></table>-->
<table tableName="t_qcp_code_dictionaries" domainObjectName="CodeDictionaries"></table> <!-- <table tableName="t_qcp_code_dictionaries" domainObjectName="CodeDictionaries"></table>-->
<table tableName="t_qcp_code_parent" domainObjectName="CodeParent"></table> <!-- <table tableName="t_qcp_code_parent" domainObjectName="CodeParent"></table>-->
<table tableName="t_qcp_first_aid" domainObjectName="FirstAid"></table> <!-- <table tableName="t_qcp_first_aid" domainObjectName="FirstAid"></table>-->
<table tableName="t_qcp_first_aid_log" domainObjectName="FirstAidLog"></table> <!-- <table tableName="t_qcp_first_aid_log" domainObjectName="FirstAidLog"></table>-->
<table tableName="t_qcp_first_aid_member" domainObjectName="FirstAidMember"></table> <!-- <table tableName="t_qcp_first_aid_member" domainObjectName="FirstAidMember"></table>-->
<table tableName="t_qcp_first_aid_record" domainObjectName="FirstAidRecord"></table> <!-- <table tableName="t_qcp_first_aid_record" domainObjectName="FirstAidRecord"></table>-->
<table tableName="t_qcp_first_aid_record_log" domainObjectName="FirstAidRecordLog"></table> <!-- <table tableName="t_qcp_first_aid_record_log" domainObjectName="FirstAidRecordLog"></table>-->
<table tableName="t_qcp_first_aid_record_log" domainObjectName="FirstAidRecordLog"></table> <!-- <table tableName="t_qcp_first_aid_record_log" domainObjectName="FirstAidRecordLog"></table>-->
<table tableName="t_step" domainObjectName="Step"></table> <!-- <table tableName="t_step" domainObjectName="Step"></table>-->
<table tableName="t_question_ocr" domainObjectName="QuestionOcr"></table> <!-- <table tableName="t_question_ocr" domainObjectName="QuestionOcr"></table>-->

Loading…
Cancel
Save