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

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

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

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

@@ -18,8 +18,6 @@ public class Organization implements Serializable {
 
     private Byte level;
 
-    private Long parentId;
-
     private Long operator;
 
     private Date createdAt;
@@ -86,14 +84,6 @@ public class Organization implements Serializable {
         this.level = level;
     }
 
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
     public Long getOperator() {
         return operator;
     }
@@ -139,7 +129,6 @@ public class Organization implements Serializable {
         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);

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

@@ -565,66 +565,6 @@ public class OrganizationExample {
             return (Criteria) this;
         }
 
-        public Criteria andParentIdIsNull() {
-            addCriterion("parent_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdIsNotNull() {
-            addCriterion("parent_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdEqualTo(Long value) {
-            addCriterion("parent_id =", value, "parentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdNotEqualTo(Long value) {
-            addCriterion("parent_id <>", value, "parentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdGreaterThan(Long value) {
-            addCriterion("parent_id >", value, "parentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("parent_id >=", value, "parentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdLessThan(Long value) {
-            addCriterion("parent_id <", value, "parentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdLessThanOrEqualTo(Long value) {
-            addCriterion("parent_id <=", value, "parentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdIn(List<Long> values) {
-            addCriterion("parent_id in", values, "parentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdNotIn(List<Long> values) {
-            addCriterion("parent_id not in", values, "parentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdBetween(Long value1, Long value2) {
-            addCriterion("parent_id between", value1, value2, "parentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andParentIdNotBetween(Long value1, Long value2) {
-            addCriterion("parent_id not between", value1, value2, "parentId");
-            return (Criteria) this;
-        }
-
         public Criteria andOperatorIsNull() {
             addCriterion("operator is null");
             return (Criteria) this;

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

@@ -13,31 +13,5 @@ import java.util.List;
  */
 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);
 }

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

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

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

@@ -123,7 +123,6 @@ public class Constant {
             this.status = status;
             this.message = message;
         }
-
     }
 
     /**wbs相关*/
@@ -223,4 +222,29 @@ public class Constant {
      */
     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;
+        }
+    }
+
+
 }

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 DOCTOR_HAS_JOINED = new Code(29,"已有医生加入", 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 DATA_STATUS_SAME = new Code(33,"状态一致无需修改", true);
     public static final Code NOT_APPLY_FOR = new Code(34,"未申请修改，无法修改状态", true);

src/main/resources/mapper_dao/FirstAidDao.xml

@@ -74,7 +74,8 @@
             `type`,
             nation,
             idcard,
-            data_status AS dataStatus
+            data_status AS dataStatus,
+            updated_at
             FROM
             t_qcp_first_aid
             WHERE
@@ -89,16 +90,16 @@
             AND hospital_id = #{hospitalId}
             AND type = #{template}
         ) 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.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.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.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.rec_status = 0
         WHERE
@@ -113,7 +114,7 @@
         AND t2.answer + 0 < #{param.endTime}
         </if>
         GROUP BY
-        t.id
+        t.updated_at DESC
     </select>
     <select id="queryPatientListBySecretary"
             resultType="com.ccsens.carbasics.bean.vo.PatientVo$PatientListByQuality">
@@ -132,7 +133,8 @@
             `type`,
             nation,
             idcard,
-            data_status AS dataStatus
+            data_status AS dataStatus,
+            updated_at
             FROM
             t_qcp_first_aid
             WHERE
@@ -145,17 +147,17 @@
             </if>
             AND rec_status = 0
             AND hospital_id in
-            <foreach collection="hospitalList" open="(" close=")" separator="," item="hospitalId">
-                #{hospitalId}
+            <foreach collection="hospitalList" open="(" close=")" separator="," item="hospital">
+                #{hospital.id}
             </foreach>
         ) 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.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.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.rec_status = 0
         <trim prefix="WHERE" prefixOverrides="and">
@@ -170,6 +172,6 @@
             </if>
         </trim>
         GROUP BY
-        t.id
+        t.updated_at DESC
     </select>
 </mapper>

src/main/resources/mapper_dao/FirstAidLogDao.xml

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

src/main/resources/mapper_dao/OrganizationDao.xml

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

src/main/resources/mapper_dao/StepDao.xml

@@ -3,61 +3,4 @@
 <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>

src/main/resources/mapper_raw/OrganizationMapper.xml

@@ -9,7 +9,6 @@
     <result column="short_name" jdbcType="VARCHAR" property="shortName" />
     <result column="introduce" jdbcType="VARCHAR" property="introduce" />
     <result column="level" jdbcType="TINYINT" property="level" />
-    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
     <result column="operator" jdbcType="BIGINT" property="operator" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -74,8 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, organization_type, code, name, short_name, introduce, level, parent_id, operator, 
-    created_at, updated_at, rec_status
+    id, organization_type, code, name, short_name, introduce, level, operator, created_at, 
+    updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationExample" resultMap="BaseResultMap">
     select
@@ -110,14 +109,12 @@
   <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.Organization">
     insert into t_organization (id, organization_type, code, 
       name, short_name, introduce, 
-      level, parent_id, operator, 
-      created_at, updated_at, rec_status
-      )
+      level, operator, 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}, 
-      #{level,jdbcType=TINYINT}, #{parentId,jdbcType=BIGINT}, #{operator,jdbcType=BIGINT}, 
-      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
-      )
+      #{level,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.Organization">
     insert into t_organization
@@ -143,9 +140,6 @@
       <if test="level != null">
         level,
       </if>
-      <if test="parentId != null">
-        parent_id,
-      </if>
       <if test="operator != null">
         operator,
       </if>
@@ -181,9 +175,6 @@
       <if test="level != null">
         #{level,jdbcType=TINYINT},
       </if>
-      <if test="parentId != null">
-        #{parentId,jdbcType=BIGINT},
-      </if>
       <if test="operator != null">
         #{operator,jdbcType=BIGINT},
       </if>
@@ -228,9 +219,6 @@
       <if test="record.level != null">
         level = #{record.level,jdbcType=TINYINT},
       </if>
-      <if test="record.parentId != null">
-        parent_id = #{record.parentId,jdbcType=BIGINT},
-      </if>
       <if test="record.operator != null">
         operator = #{record.operator,jdbcType=BIGINT},
       </if>
@@ -257,7 +245,6 @@
       short_name = #{record.shortName,jdbcType=VARCHAR},
       introduce = #{record.introduce,jdbcType=VARCHAR},
       level = #{record.level,jdbcType=TINYINT},
-      parent_id = #{record.parentId,jdbcType=BIGINT},
       operator = #{record.operator,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -287,9 +274,6 @@
       <if test="level != null">
         level = #{level,jdbcType=TINYINT},
       </if>
-      <if test="parentId != null">
-        parent_id = #{parentId,jdbcType=BIGINT},
-      </if>
       <if test="operator != null">
         operator = #{operator,jdbcType=BIGINT},
       </if>
@@ -313,7 +297,6 @@
       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},

src/main/resources/mbg.xml

@@ -57,22 +57,22 @@
         </javaClientGenerator>
 
         <table tableName="t_organization" domainObjectName="Organization"></table>
-        <table tableName="t_organization_department" domainObjectName="OrganizationDepartment"></table>
-        <table tableName="t_organization_member" domainObjectName="OrganizationMember"></table>
-        <table tableName="t_organization_parent" domainObjectName="OrganizationParent"></table>
-        <table tableName="t_organization_position" domainObjectName="OrganizationPosition"></table>
-        <table tableName="t_organization_project" domainObjectName="OrganizationProject"></table>
-        <table tableName="t_organization_template" domainObjectName="OrganizationTemplate"></table>
-        <table tableName="t_qcp_code_dictionaries" domainObjectName="CodeDictionaries"></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_log" domainObjectName="FirstAidLog"></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_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_question_ocr" domainObjectName="QuestionOcr"></table>
+<!--        <table tableName="t_organization_department" domainObjectName="OrganizationDepartment"></table>-->
+<!--        <table tableName="t_organization_member" domainObjectName="OrganizationMember"></table>-->
+<!--        <table tableName="t_organization_parent" domainObjectName="OrganizationParent"></table>-->
+<!--        <table tableName="t_organization_position" domainObjectName="OrganizationPosition"></table>-->
+<!--        <table tableName="t_organization_project" domainObjectName="OrganizationProject"></table>-->
+<!--        <table tableName="t_organization_template" domainObjectName="OrganizationTemplate"></table>-->
+<!--        <table tableName="t_qcp_code_dictionaries" domainObjectName="CodeDictionaries"></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_log" domainObjectName="FirstAidLog"></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_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_question_ocr" domainObjectName="QuestionOcr"></table>-->