增加根据部门code与职位code查询角色名称

src/main/java/com/ccsens/carbasics/api/FirstAidRecordController.java

@@ -35,7 +35,9 @@ public class FirstAidRecordController {
     @ApiOperation(value = "查询类型的所有下级和完成情况", notes = "")
     @RequestMapping(value = "/subordinate", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<PatientVo.QuerySubordinate> querySubordinate(@ApiParam @Validated @RequestBody QueryDto<PatientDto.QuerySubordinate> params) throws Exception{
+        log.info("查询类型的所有下级和完成情况开始:{}",params);
         PatientVo.QuerySubordinate querySubordinate = patientService.querySubordinate(params.getParam(), params.getUserId());
+        log.info("查询类型的所有下级和完成情况结束:{}",querySubordinate);
         return JsonResponse.newInstance().ok(querySubordinate);
     }
 
@@ -43,7 +45,9 @@ public class FirstAidRecordController {
     @ApiOperation(value = "批量提交急救信息", notes = "")
     @RequestMapping(value = "/aidRecord", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse saveAidRecordN(@ApiParam @Validated @RequestBody QueryDto<PatientDto.SaveAidRecordN> params) throws Exception{
+        log.info("批量提交急救信息开始:{}",params);
         patientService.saveAidRecordN(params.getParam(), params.getUserId());
+        log.info("批量提交急救信息结束");
         return JsonResponse.newInstance().ok();
     }
 
@@ -51,7 +55,9 @@ public class FirstAidRecordController {
     @ApiOperation(value = "批量查询急救信息", notes = "")
     @RequestMapping(value = "/queryAidRecord", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<PatientVo.QueryAidRecordN> queryAidRecordN(@ApiParam @Validated @RequestBody QueryDto<PatientDto.QueryAidRecord> params) throws Exception{
+        log.info("批量查询急救信息开始:{}",params);
         PatientVo.QueryAidRecordN queryAidRecord = patientService.queryAidRecordN(params.getParam(), params.getUserId());
+        log.info("批量查询急救信息结束:{}",queryAidRecord);
         return JsonResponse.newInstance().ok(queryAidRecord);
     }
 

src/main/java/com/ccsens/carbasics/bean/po/CodeName.java

@@ -0,0 +1,95 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CodeName implements Serializable {
+    private Long id;
+
+    private String departmentCode;
+
+    private String positionCode;
+
+    private String value;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getDepartmentCode() {
+        return departmentCode;
+    }
+
+    public void setDepartmentCode(String departmentCode) {
+        this.departmentCode = departmentCode == null ? null : departmentCode.trim();
+    }
+
+    public String getPositionCode() {
+        return positionCode;
+    }
+
+    public void setPositionCode(String positionCode) {
+        this.positionCode = positionCode == null ? null : positionCode.trim();
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value == null ? null : value.trim();
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", departmentCode=").append(departmentCode);
+        sb.append(", positionCode=").append(positionCode);
+        sb.append(", value=").append(value);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/CodeNameExample.java

@@ -0,0 +1,651 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CodeNameExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CodeNameExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    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<Criteria> 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<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> 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<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> 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 andDepartmentCodeIsNull() {
+            addCriterion("department_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeIsNotNull() {
+            addCriterion("department_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeEqualTo(String value) {
+            addCriterion("department_code =", value, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeNotEqualTo(String value) {
+            addCriterion("department_code <>", value, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeGreaterThan(String value) {
+            addCriterion("department_code >", value, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("department_code >=", value, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeLessThan(String value) {
+            addCriterion("department_code <", value, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeLessThanOrEqualTo(String value) {
+            addCriterion("department_code <=", value, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeLike(String value) {
+            addCriterion("department_code like", value, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeNotLike(String value) {
+            addCriterion("department_code not like", value, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeIn(List<String> values) {
+            addCriterion("department_code in", values, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeNotIn(List<String> values) {
+            addCriterion("department_code not in", values, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeBetween(String value1, String value2) {
+            addCriterion("department_code between", value1, value2, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentCodeNotBetween(String value1, String value2) {
+            addCriterion("department_code not between", value1, value2, "departmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeIsNull() {
+            addCriterion("position_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeIsNotNull() {
+            addCriterion("position_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeEqualTo(String value) {
+            addCriterion("position_code =", value, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeNotEqualTo(String value) {
+            addCriterion("position_code <>", value, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeGreaterThan(String value) {
+            addCriterion("position_code >", value, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("position_code >=", value, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeLessThan(String value) {
+            addCriterion("position_code <", value, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeLessThanOrEqualTo(String value) {
+            addCriterion("position_code <=", value, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeLike(String value) {
+            addCriterion("position_code like", value, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeNotLike(String value) {
+            addCriterion("position_code not like", value, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeIn(List<String> values) {
+            addCriterion("position_code in", values, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeNotIn(List<String> values) {
+            addCriterion("position_code not in", values, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeBetween(String value1, String value2) {
+            addCriterion("position_code between", value1, value2, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionCodeNotBetween(String value1, String value2) {
+            addCriterion("position_code not between", value1, value2, "positionCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNull() {
+            addCriterion("value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNotNull() {
+            addCriterion("value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueEqualTo(String value) {
+            addCriterion("value =", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotEqualTo(String value) {
+            addCriterion("value <>", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThan(String value) {
+            addCriterion("value >", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThanOrEqualTo(String value) {
+            addCriterion("value >=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThan(String value) {
+            addCriterion("value <", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThanOrEqualTo(String value) {
+            addCriterion("value <=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLike(String value) {
+            addCriterion("value like", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotLike(String value) {
+            addCriterion("value not like", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIn(List<String> values) {
+            addCriterion("value in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotIn(List<String> values) {
+            addCriterion("value not in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueBetween(String value1, String value2) {
+            addCriterion("value between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotBetween(String value1, String value2) {
+            addCriterion("value not between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/ccsens/carbasics/persist/dao/CodeNameDao.java

@@ -0,0 +1,20 @@
+package com.ccsens.carbasics.persist.dao;
+
+import com.ccsens.carbasics.persist.mapper.CodeNameMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author AUSU
+ */
+@Repository
+public interface CodeNameDao extends CodeNameMapper {
+
+    /**
+     * 根据职位code和部门code查询角色名称
+     * @param positionCode 职位code
+     * @param departmentCode 部门code
+     * @return 项目角色名称
+     */
+    String queryRoleName(@Param("positionCode") String positionCode,@Param("departmentCode") String departmentCode);
+}

src/main/java/com/ccsens/carbasics/persist/mapper/CodeNameMapper.java

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

src/main/java/com/ccsens/carbasics/service/AccountManageService.java

@@ -53,6 +53,8 @@ public class AccountManageService implements IAccountManageService {
     @Resource
     private QuestionnaireDetailDao questionnaireDetailDao;
     @Resource
+    private CodeNameDao codeNameDao;
+    @Resource
     private Snowflake snowflake;
     @Override
     public void submitAccount(AccountDto.SubmitAccount param, Long userId) {
@@ -81,7 +83,7 @@ public class AccountManageService implements IAccountManageService {
         //创建项目
         AccountManage accountManageInfo = accountManageDao.selectByPrimaryKey(param.getAccountManageId());
         //查看是否有问卷调查
-        Long detailId = questionnaireDetailDao.queryByUserId(userId);
+        Long detailId = questionnaireDetailDao.queryByUserId(accountManageInfo.getSubmitterUserId());
         boolean flag = true;
         //1.校验字段是否都填写
         Integer num = questionnaireDetailDao.countCodeNumber(detailId);

src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java

@@ -87,6 +87,8 @@ public class QuestionnaireService implements IQuestionnaireService{
     private Tall3FeignClient tall3FeignClient;
     @Resource
     private AccountManageDao accountManageDao;
+    @Resource
+    private CodeNameDao codeNameDao;
 
     @Override
     public List<QuestionnaireVo.AreaInfo> queryArea(QuestionnaireDto.QueryArea param, Long userId) {
@@ -441,7 +443,7 @@ public class QuestionnaireService implements IQuestionnaireService{
                 organizationMemberPositionDao.insertSelective(position);
             }
             //创建项目
-            return createProject(newOrganization.getId(), hospitalName, memberName, phone, userId,positionId);
+            return createProject(newOrganization.getId(), hospitalName, memberName, phone, userId,positionId,departmentCode);
         }else {
             OrganizationDepartment department = departmentDao.queryByOrganization(organization.getId(),departmentName);
             if (ObjectUtil.isNull(department)) {
@@ -479,7 +481,7 @@ public class QuestionnaireService implements IQuestionnaireService{
                     organizationMemberPositionDao.insertSelective(position);
                 }
                 //创建项目
-                return createProject(organization.getId(),hospitalName,memberName,phone,userId,positionId);
+                return createProject(organization.getId(),hospitalName,memberName,phone,userId,positionId,departmentCode);
             }else {
                 //创建用户
                 //查询用户是否存在
@@ -508,13 +510,13 @@ public class QuestionnaireService implements IQuestionnaireService{
                     organizationMemberPositionDao.insertSelective(position);
                 }
                 //创建项目
-                return createProject(organization.getId(), hospitalName, memberName, phone, userId,positionId);
+                return createProject(organization.getId(), hospitalName, memberName, phone, userId,positionId,departmentCode);
             }
         }
     }
 
 
-    public Long createProject(Long organizationId,String hospitalName,String memberName,String phone,Long userId,Long positionId) {
+    public Long createProject(Long organizationId,String hospitalName,String memberName,String phone,Long userId,Long positionId,String departmentCode) {
         OrganizationProject project = organizationProjectDao.queryByOrganizationId(organizationId);
         if (ObjectUtil.isNull(project)) {
             //创建项目
@@ -527,7 +529,9 @@ public class QuestionnaireService implements IQuestionnaireService{
             CMemberDto.SaveMember saveMember = new CMemberDto.SaveMember();
             saveMember.setProjectId(copyProjectInfo.getId());
             //查询角色code
-            saveMember.setRoleName(queryRole(positionId));
+            OrganizationPosition position = positionDao.selectByPrimaryKey(positionId);
+            String roleName = codeNameDao.queryRoleName(position.getCode(),departmentCode);
+            saveMember.setRoleName(roleName);
 //            saveMember.setRoleName(Constant.RoleName.SHEN_NEI);
             saveMember.setName(memberName);
             saveMember.setPhone(phone);

src/main/resources/mapper_dao/CodeNameDao.xml

@@ -0,0 +1,17 @@
+<?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">
+<mapper namespace="com.ccsens.carbasics.persist.dao.CodeNameDao">
+
+
+    <select id="queryRoleName" resultType="java.lang.String">
+        SELECT
+            `value`
+        FROM
+            t_qcp_code_name
+        WHERE
+            rec_status = 0
+        AND position_code = #{positionCode}
+        AND department_code = #{departmentCode}
+    </select>
+
+</mapper>

src/main/resources/mapper_raw/CodeNameMapper.xml

@@ -0,0 +1,243 @@
+<?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">
+<mapper namespace="com.ccsens.carbasics.persist.mapper.CodeNameMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.carbasics.bean.po.CodeName">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="department_code" jdbcType="VARCHAR" property="departmentCode" />
+    <result column="position_code" jdbcType="VARCHAR" property="positionCode" />
+    <result column="value" jdbcType="VARCHAR" property="value" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, department_code, position_code, value, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.CodeNameExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_qcp_code_name
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_qcp_code_name
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_qcp_code_name
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.carbasics.bean.po.CodeNameExample">
+    delete from t_qcp_code_name
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.CodeName">
+    insert into t_qcp_code_name (id, department_code, position_code, 
+      value, created_at, updated_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{departmentCode,jdbcType=VARCHAR}, #{positionCode,jdbcType=VARCHAR}, 
+      #{value,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.CodeName">
+    insert into t_qcp_code_name
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="departmentCode != null">
+        department_code,
+      </if>
+      <if test="positionCode != null">
+        position_code,
+      </if>
+      <if test="value != null">
+        value,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="departmentCode != null">
+        #{departmentCode,jdbcType=VARCHAR},
+      </if>
+      <if test="positionCode != null">
+        #{positionCode,jdbcType=VARCHAR},
+      </if>
+      <if test="value != null">
+        #{value,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.CodeNameExample" resultType="java.lang.Long">
+    select count(*) from t_qcp_code_name
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_qcp_code_name
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.departmentCode != null">
+        department_code = #{record.departmentCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.positionCode != null">
+        position_code = #{record.positionCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.value != null">
+        value = #{record.value,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_qcp_code_name
+    set id = #{record.id,jdbcType=BIGINT},
+      department_code = #{record.departmentCode,jdbcType=VARCHAR},
+      position_code = #{record.positionCode,jdbcType=VARCHAR},
+      value = #{record.value,jdbcType=VARCHAR},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.carbasics.bean.po.CodeName">
+    update t_qcp_code_name
+    <set>
+      <if test="departmentCode != null">
+        department_code = #{departmentCode,jdbcType=VARCHAR},
+      </if>
+      <if test="positionCode != null">
+        position_code = #{positionCode,jdbcType=VARCHAR},
+      </if>
+      <if test="value != null">
+        value = #{value,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.carbasics.bean.po.CodeName">
+    update t_qcp_code_name
+    set department_code = #{departmentCode,jdbcType=VARCHAR},
+      position_code = #{positionCode,jdbcType=VARCHAR},
+      value = #{value,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/resources/mbg.xml

@@ -82,7 +82,8 @@
 <!--        <table tableName="t_qcp_account_manage" domainObjectName="AccountManage"></table>-->
 <!--        <table tableName="t_qcp_first_aid_record" domainObjectName="FirstAidRecord"></table>-->
 <!--        <table tableName="t_constant" domainObjectName="ConstantDB"></table>-->
-        <table tableName="t_qcp_last_role_choose" domainObjectName="LastRoleChoose"></table>
+<!--        <table tableName="t_qcp_last_role_choose" domainObjectName="LastRoleChoose"></table>-->
+        <table tableName="t_qcp_code_name" domainObjectName="CodeName"></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>-->