一键通知相关接口10.20晚

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

@@ -18,6 +18,8 @@ public class FirstAidMember implements Serializable {
 
     private Byte recStatus;
 
+    private Byte createUserType;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -76,6 +78,14 @@ public class FirstAidMember implements Serializable {
         this.recStatus = recStatus;
     }
 
+    public Byte getCreateUserType() {
+        return createUserType;
+    }
+
+    public void setCreateUserType(Byte createUserType) {
+        this.createUserType = createUserType;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -89,6 +99,7 @@ public class FirstAidMember implements Serializable {
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
+        sb.append(", createUserType=").append(createUserType);
         sb.append("]");
         return sb.toString();
     }

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

@@ -524,6 +524,66 @@ public class FirstAidMemberExample {
             addCriterion("rec_status not between", value1, value2, "recStatus");
             return (Criteria) this;
         }
+
+        public Criteria andCreateUserTypeIsNull() {
+            addCriterion("create_user_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeIsNotNull() {
+            addCriterion("create_user_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeEqualTo(Byte value) {
+            addCriterion("create_user_type =", value, "createUserType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeNotEqualTo(Byte value) {
+            addCriterion("create_user_type <>", value, "createUserType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeGreaterThan(Byte value) {
+            addCriterion("create_user_type >", value, "createUserType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("create_user_type >=", value, "createUserType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeLessThan(Byte value) {
+            addCriterion("create_user_type <", value, "createUserType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("create_user_type <=", value, "createUserType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeIn(List<Byte> values) {
+            addCriterion("create_user_type in", values, "createUserType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeNotIn(List<Byte> values) {
+            addCriterion("create_user_type not in", values, "createUserType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeBetween(Byte value1, Byte value2) {
+            addCriterion("create_user_type between", value1, value2, "createUserType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("create_user_type not between", value1, value2, "createUserType");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/ccsens/carbasics/mq/QcpButtonReceive.java

@@ -34,6 +34,7 @@ import javax.annotation.Resource;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 暴风眼接收qcp一键通知相关消息
@@ -66,22 +67,28 @@ public class QcpButtonReceive {
     private OrganizationMemberDao organizationMemberDao;
 
     @RabbitHandler
-    public void process(String messageJson) throws Exception {
-        log.info("接收到的消息为:{}",messageJson);
-        ButtonDto.CarBasicsMq carBasicsMq = JSONObject.parseObject(messageJson, ButtonDto.CarBasicsMq.class);
-        switch (carBasicsMq.getType()){
-            case 0:
-                idCardDiscern(carBasicsMq.getIdCardInfoMq());
-                break;
-            case 1:
-                buttonStart(carBasicsMq.getButtonStartMq());
-                break;
-            case 2:
-                updateStatus(carBasicsMq.getUpDateStatusMq());
-                break;
-            default:
-                break;
+    public void process(String messageJson){
+        try {
+            log.info("接收到的消息为:{}",messageJson);
+            ButtonDto.CarBasicsMq carBasicsMq = JSONObject.parseObject(messageJson, ButtonDto.CarBasicsMq.class);
+            switch (carBasicsMq.getType()){
+                case 0:
+                    idCardDiscern(carBasicsMq.getIdCardInfoMq());
+                    break;
+                case 1:
+                    buttonStart(carBasicsMq.getButtonStartMq());
+                    break;
+                case 2:
+                    updateStatus(carBasicsMq.getUpDateStatusMq());
+                    break;
+                default:
+                    break;
+            }
+        }catch (Exception e) {
+            //TODO 待记录异常 程序和人工两方面介入处理
+            log.error("暴风眼接受消息异常",e);
         }
+
     }
 
     /**
@@ -107,7 +114,7 @@ public class QcpButtonReceive {
                 PatientDto.SavePatient savePatient = new PatientDto.SavePatient();
                 BeanUtil.copyProperties(param,savePatient);
                 savePatient.setGender(param.getSex());
-                FirstAid firstAid = firstAidService.getFirstAid(savePatient, param.getUserId(), (byte) 5, organizationId);
+                FirstAid firstAid = firstAidService.getFirstAid(savePatient, param.getUserId(), (byte) 5, organizationId, (byte) 1);
                 //查询设备信息,并保存状态
                 EquipmentVo.ButtonInfo buttonInfo = qcpDao.queryEquipmentInfoByUserId(param.getUserId());
                 if (ObjectUtil.isNotNull(buttonInfo)) {
@@ -119,7 +126,7 @@ public class QcpButtonReceive {
                     equipmentStatus.setTime(System.currentTimeMillis());
                     equipmentStatusDao.insertSelective(equipmentStatus);
                 }
-                sendDoctor(firstAid.getId(), firstAid.getName(), firstAid.getHospitalId(), (byte) 1);
+                sendDoctor(firstAid.getId(), firstAid.getName(), firstAid.getHospitalId());
             }
 
         }
@@ -134,6 +141,10 @@ public class QcpButtonReceive {
         log.info("暴风眼一键启动接收到的参数{}",param);
         //查询设备信息
         EquipmentVo.ButtonInfo buttonInfo = qcpDao.queryEquipmentInfoByUserId(param.getUserId());
+        if (!Constant.Equipment.TYPE_TRIAGE_TABLE.equals(buttonInfo.getType())) {
+            log.info("不是分诊台设备不可一键启动{}",buttonInfo);
+            return;
+        }
         if (ObjectUtil.isNotNull(buttonInfo)) {
             Long projectId = qcpDao.queryProjectByUserId(param.getUserId());
             Long organizationId = organizationProjectDao.queryByProjectId(projectId);
@@ -142,6 +153,7 @@ public class QcpButtonReceive {
                 Long firstAidId = firstAid.getId();
                 EquipmentStatus equipmentStatus = equipmentStatusDao.queryByEidAndFid(buttonInfo.getId(), firstAidId);
                 if (ObjectUtil.isNotNull(equipmentStatus)) {
+                    log.info("一键启动已存在,程序结束{}",equipmentStatus);
                     return;
                 }
                 EquipmentStatus triageStatus = new EquipmentStatus();
@@ -150,12 +162,12 @@ public class QcpButtonReceive {
                 triageStatus.setEquipmentId(buttonInfo.getId());
                 triageStatus.setEquipmentStatus(Constant.Equipment.RUNNING_STATUS);
                 triageStatus.setTime(param.getTime());
-                equipmentStatusDao.insertSelective(equipmentStatus);
+                equipmentStatusDao.insertSelective(triageStatus);
                 Long hospitalId = buttonInfo.getHospitalId();
                 String name = firstAid.getName();
                 Long time = param.getTime();
                 sendEquipmentStart(firstAidId, hospitalId, name, time);
-                sendDoctor(firstAidId, firstAid.getName(), firstAid.getHospitalId(), (byte) 2);
+                sendDoctor(firstAidId, firstAid.getName(), firstAid.getHospitalId());
             }
         }
 
@@ -175,8 +187,13 @@ public class QcpButtonReceive {
                 data.setName(name);
                 data.setContent(name + equipmentInform.getContent());
                 data.setFirstAidId(firstAidId);
-                data.setTotalCountdown(equipmentInform.getTotalCountdown());
-                data.setRealCountdown(System.currentTimeMillis() - time);
+                if (equipmentInform.getTotalCountdown() == 0) {
+                    data.setTotalCountdown(null);
+                    data.setRealCountdown(null);
+                }else {
+                    data.setTotalCountdown(equipmentInform.getTotalCountdown());
+                    data.setRealCountdown(equipmentInform.getTotalCountdown() - (System.currentTimeMillis() - time));
+                }
                 data.setTime(time);
                 ButtonStartVo buttonStartVo = new ButtonStartVo();
                 buttonStartVo.setData(data);
@@ -206,8 +223,8 @@ public class QcpButtonReceive {
             log.info("{}未找到急救", param.getFirstAidId());
             return;
         }
-        EquipmentStatus equipmentStatus = equipmentStatusDao.queryByEidAndFidAndStatus(buttonInfo.getId(),param.getFirstAidId(),param.getStatus());
-        if (ObjectUtil.isNotNull(equipmentStatus)) {
+        List<EquipmentStatus> equipmentStatus = equipmentStatusDao.queryByEidAndFidAndStatus(buttonInfo.getId(),param.getFirstAidId(),param.getStatus());
+        if (CollectionUtil.isNotEmpty(equipmentStatus)) {
             return;
         }
         if (1 == buttonInfo.getType()) {
@@ -216,27 +233,34 @@ public class QcpButtonReceive {
                 List<EquipmentVo.ButtonInfo> triageTableList = qcpDao.queryTriageTable(buttonInfo.getHospitalId());
                 log.info("查询分诊台的设备id列表:{}",triageTableList);
                 if (CollectionUtil.isNotEmpty(triageTableList)) {
-                    HashSet<String> userSet = new HashSet<>();
-                    for (EquipmentVo.ButtonInfo triageTable : triageTableList) {
-                        userSet.add(triageTable.getUserId().toString());
-                        //保存分诊台关闭的信息
-                        EquipmentStatus triageTableStatus = new EquipmentStatus();
-                        triageTableStatus.setId(snowflake.nextId());
-                        triageTableStatus.setTime(System.currentTimeMillis());
-                        triageTableStatus.setEquipmentStatus((byte) 2);
-                        triageTableStatus.setEquipmentId(triageTable.getId());
-                        triageTableStatus.setFirstAidId(param.getFirstAidId());
-                        equipmentStatusDao.insertSelective(triageTableStatus);
+                    List<Long> buttonIdList = triageTableList.stream().map(EquipmentVo.ButtonInfo::getId).collect(Collectors.toList());
+                    //查询分诊台是否关闭过,如果没有则通知关闭
+                    List<EquipmentStatus> equipmentStatusList = equipmentStatusDao.queryTriageTableIsExist(buttonIdList,param.getFirstAidId());
+                    log.info("查询分诊台是否关闭过:{}",equipmentStatusList);
+                    if (CollectionUtil.isEmpty(equipmentStatusList)) {
+                        HashSet<String> userSet = new HashSet<>();
+                        for (EquipmentVo.ButtonInfo triageTable : triageTableList) {
+                            userSet.add(triageTable.getUserId().toString());
+                            //保存分诊台关闭的信息
+                            EquipmentStatus triageTableStatus = new EquipmentStatus();
+                            triageTableStatus.setId(snowflake.nextId());
+                            triageTableStatus.setTime(System.currentTimeMillis());
+                            triageTableStatus.setEquipmentStatus((byte) 2);
+                            triageTableStatus.setEquipmentId(triageTable.getId());
+                            triageTableStatus.setFirstAidId(param.getFirstAidId());
+                            equipmentStatusDao.insertSelective(triageTableStatus);
+                        }
+                        UpdateStatusVo.Data data = new UpdateStatusVo.Data(System.currentTimeMillis(), (byte) 2,param.getFirstAidId());
+                        UpdateStatusVo updateStatusVo = new UpdateStatusVo();
+                        updateStatusVo.setData(data);
+                        InMessage inMessage = new InMessage();
+                        inMessage.setTos(userSet);
+                        inMessage.setData(JacksonUtil.beanToJson(updateStatusVo));
+                        inMessage.setToDomain(MessageConstant.DomainType.User);
+                        log.info("更改状态调用消息系统传参{}",inMessage);
+                        amqpTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME,JacksonUtil.beanToJson(inMessage));
                     }
-                    UpdateStatusVo.Data data = new UpdateStatusVo.Data(System.currentTimeMillis(), (byte) 2,param.getFirstAidId());
-                    UpdateStatusVo updateStatusVo = new UpdateStatusVo();
-                    updateStatusVo.setData(data);
-                    InMessage inMessage = new InMessage();
-                    inMessage.setTos(userSet);
-                    inMessage.setData(JacksonUtil.beanToJson(updateStatusVo));
-                    inMessage.setToDomain(MessageConstant.DomainType.User);
-                    log.info("更改状态调用消息系统传参{}",inMessage);
-                    amqpTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME,JacksonUtil.beanToJson(inMessage));
+
                 }
 
             }
@@ -250,14 +274,14 @@ public class QcpButtonReceive {
         saveEquipmentStatus.setFirstAidId(param.getFirstAidId());
         equipmentStatusDao.insertSelective(saveEquipmentStatus);
 
-        sendDoctor(param.getFirstAidId(), firstAid.getName(), firstAid.getHospitalId(), (byte) 3);
+        sendDoctor(param.getFirstAidId(), firstAid.getName(), firstAid.getHospitalId());
     }
 
     /**
      * 通知医院的所有成员病例进度
      * @param firstAidId 病例
      */
-    private void sendDoctor(Long firstAidId, String firstAidName, Long organizationId,Byte type) throws Exception {
+    private void sendDoctor(Long firstAidId, String firstAidName, Long organizationId) throws Exception {
         // 查询医院所有成员
         List<Long> userIds =  organizationMemberDao.queryUserIdsByOrganizationId(organizationId);
         // 查询当前未完成的状态
@@ -273,7 +297,7 @@ public class QcpButtonReceive {
         data.setName(firstAidName);
         data.setContent(inform.getEquipmentStatus().equals(Constant.Equipment.ID_CARD_IDENTIFY_STATUS) ? firstAidName : firstAidName + inform.getContent());
         data.setFirstAidId(firstAidId);
-        if (type.equals((byte)1)){
+        if (inform.getTotalCountdown() == 0){
             data.setTotalCountdown(null);
             data.setRealCountdown(null);
         }else {

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

@@ -7,6 +7,8 @@ import com.ccsens.carbasics.persist.mapper.EquipmentStatusMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author ma
  */
@@ -48,5 +50,13 @@ public interface EquipmentStatusDao extends EquipmentStatusMapper {
      * @param status 设备状态
      * @return 设备状态信息
      */
-    EquipmentStatus queryByEidAndFidAndStatus(@Param("eid") Long eid,@Param("fid") Long fid,@Param("status") Byte status);
+    List<EquipmentStatus> queryByEidAndFidAndStatus(@Param("eid") Long eid, @Param("fid") Long fid, @Param("status") Byte status);
+
+    /**
+     * 查询分诊台是否已经通知过关闭
+     * @param buttonIdList 分诊台id
+     * @param firstAidId 急救id
+     * @return 状态修改记录
+     */
+    List<EquipmentStatus> queryTriageTableIsExist(@Param("eidList") List<Long> buttonIdList,@Param("fid") Long firstAidId);
 }

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

@@ -147,7 +147,7 @@ public class FirstAidService implements IFirstAidService{
             //不是急诊护士或者不是神内的医生，提示没有权限
             throw new BaseException(DefaultCodeError.NO_POWER);
         }
-        FirstAid firstAid = getFirstAid(param, userId, position, organizationId);
+        FirstAid firstAid = getFirstAid(param, userId, position, organizationId, (byte) 0);
 
         PatientVo.PatientSimple simple = new PatientVo.PatientSimple();
         simple.setFirstAidId(firstAid.getId());
@@ -155,7 +155,7 @@ public class FirstAidService implements IFirstAidService{
     }
 
     @Override
-    public FirstAid getFirstAid(PatientDto.SavePatient param, Long userId, Byte position, Long organizationId) {
+    public FirstAid getFirstAid(PatientDto.SavePatient param, Long userId, Byte position, Long organizationId,Byte createUserType) {
         //创建病例
         FirstAid firstAid = new FirstAid();
         firstAid.setId(snowflake.nextId());
@@ -178,6 +178,7 @@ public class FirstAidService implements IFirstAidService{
         firstAidMember.setId(snowflake.nextId());
         firstAidMember.setFirstAidId(firstAid.getId());
         firstAidMember.setCreateUserId(userId);
+        firstAidMember.setCreateUserType(createUserType);
         firstAidMemberDao.insertSelective(firstAidMember);
         //添加急救日志表(创建信息)
         FirstAidLog firstAidLog = new FirstAidLog();

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

@@ -104,5 +104,5 @@ public interface IFirstAidService {
     CodeError.Code report(PatientDto.Report param, Long userId);
 
 
-    FirstAid getFirstAid(PatientDto.SavePatient param, Long userId, Byte position, Long organizationId);
+    FirstAid getFirstAid(PatientDto.SavePatient param, Long userId, Byte position, Long organizationId,Byte createUserType);
 }

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

@@ -494,7 +494,7 @@ public class QuestionnaireService implements IQuestionnaireService{
             organizationProjectDao.insertSelective(organizationProject);
             //创建病例
             PatientDto.SavePatient savePatient = new PatientDto.SavePatient();
-            firstAidService.getFirstAid(savePatient,userId,(byte)1,organizationId);
+            firstAidService.getFirstAid(savePatient,userId,(byte)1,organizationId, (byte) 0);
             //tall3添加项目,关联项目
             ProjectDto.SaveProjectDto saveProjectDto = new ProjectDto.SaveProjectDto();
             saveProjectDto.setId(copyProjectInfo.getId());

src/main/resources/mapper_dao/EquipmentStatusDao.xml

@@ -81,8 +81,14 @@
         WHERE
             rec_status = 0
             AND first_aid_id = #{fid}
-            AND equipment_id = #{eid}
             AND equipment_status = 1
+            AND equipment_id IN (
+            SELECT
+                id
+            FROM
+                qcp.t_qcp_hospital_equipment AS he
+        WHERE
+            type = ( SELECT type FROM qcp.t_qcp_hospital_equipment WHERE id = #{eid} AND rec_status = 0 ))
     </select>
 
     <select id="queryByEidAndFidAndStatus" resultType="com.ccsens.carbasics.bean.po.EquipmentStatus">
@@ -97,7 +103,32 @@
         WHERE
             rec_status = 0
             AND first_aid_id = #{fid}
-            AND equipment_id = #{eid}
             AND equipment_status = #{status}
+            AND equipment_id IN (
+            SELECT
+                id
+            FROM
+                qcp.t_qcp_hospital_equipment AS he
+        WHERE
+            type = ( SELECT type FROM qcp.t_qcp_hospital_equipment WHERE id = #{eid} AND rec_status = 0 ))
+    </select>
+
+    <select id="queryTriageTableIsExist" resultType="com.ccsens.carbasics.bean.po.EquipmentStatus">
+        SELECT
+            id,
+            equipment_id,
+            first_aid_id,
+            equipment_status,
+            time
+        FROM
+            t_qcp_equipment_status
+        WHERE
+            rec_status = 0
+            AND first_aid_id = #{fid}
+            AND equipment_status = 2
+            AND equipment_id IN
+            <foreach collection="eidList" item="item" separator="," open="(" close=")">
+            #{item}
+            </foreach>
     </select>
 </mapper>

src/main/resources/mapper_dao/FirstAidDao.xml

@@ -30,7 +30,7 @@
         where
         <choose>
             <when test="param.type == 0">
-                m.create_user_id = #{userId}
+                (m.create_user_id = #{userId} or m.create_user_type = 1)
             </when>
             <when test="param.type == 1">
                 m.record_user_id in (#{userId}, 0)
@@ -213,6 +213,7 @@
             gender,
             age,
             nation,
+            hospital_id,
             project_id
         FROM
             t_qcp_first_aid
@@ -220,5 +221,8 @@
             rec_status = 0
             AND hospital_id = #{oid}
             AND idcard = #{idcard}
+        ORDER BY
+            created_at DESC
+            LIMIT 1
     </select>
 </mapper>

src/main/resources/mapper_dao/OrganizationDao.xml

@@ -426,7 +426,7 @@
                 questionnaire_detail_id as detail_id,
                 answer
                 FROM `t_qcp_questionnaire_record`
-                WHERE question_code = 'AIS-Nnt' and rec_status = 0)a2
+                WHERE question_code = 'FIT-Nnt' and rec_status = 0)a2
                 WHERE
                 a1.detail_id = a2.detail_id
             </when>

src/main/resources/mapper_raw/FirstAidMemberMapper.xml

@@ -9,6 +9,7 @@
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="create_user_type" jdbcType="TINYINT" property="createUserType" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -69,7 +70,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, first_aid_id, create_user_id, record_user_id, created_at, updated_at, rec_status
+    id, first_aid_id, create_user_id, record_user_id, created_at, updated_at, rec_status, 
+    create_user_type
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.FirstAidMemberExample" resultMap="BaseResultMap">
     select
@@ -104,10 +106,10 @@
   <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.FirstAidMember">
     insert into t_qcp_first_aid_member (id, first_aid_id, create_user_id, 
       record_user_id, created_at, updated_at, 
-      rec_status)
+      rec_status, create_user_type)
     values (#{id,jdbcType=BIGINT}, #{firstAidId,jdbcType=BIGINT}, #{createUserId,jdbcType=BIGINT}, 
       #{recordUserId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{recStatus,jdbcType=TINYINT})
+      #{recStatus,jdbcType=TINYINT}, #{createUserType,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.FirstAidMember">
     insert into t_qcp_first_aid_member
@@ -133,6 +135,9 @@
       <if test="recStatus != null">
         rec_status,
       </if>
+      <if test="createUserType != null">
+        create_user_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -156,6 +161,9 @@
       <if test="recStatus != null">
         #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="createUserType != null">
+        #{createUserType,jdbcType=TINYINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.FirstAidMemberExample" resultType="java.lang.Long">
@@ -188,6 +196,9 @@
       <if test="record.recStatus != null">
         rec_status = #{record.recStatus,jdbcType=TINYINT},
       </if>
+      <if test="record.createUserType != null">
+        create_user_type = #{record.createUserType,jdbcType=TINYINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -201,7 +212,8 @@
       record_user_id = #{record.recordUserId,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{record.recStatus,jdbcType=TINYINT}
+      rec_status = #{record.recStatus,jdbcType=TINYINT},
+      create_user_type = #{record.createUserType,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -227,6 +239,9 @@
       <if test="recStatus != null">
         rec_status = #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="createUserType != null">
+        create_user_type = #{createUserType,jdbcType=TINYINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -237,7 +252,8 @@
       record_user_id = #{recordUserId,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{recStatus,jdbcType=TINYINT}
+      rec_status = #{recStatus,jdbcType=TINYINT},
+      create_user_type = #{createUserType,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mbg.xml

@@ -63,8 +63,8 @@
 <!--        <table tableName="t_qcp_questionnaire_detail" domainObjectName="QuestionnaireDetail"></table>-->
 <!--        <table tableName="t_qcp_questionnaire_record" domainObjectName="QuestionnaireRecord"></table>-->
 <!--        <table tableName="t_qcp_button_config" domainObjectName="ButtonConfig"></table>-->
-        <table tableName="t_qcp_equipment_status" domainObjectName="EquipmentStatus"></table>
-        <table tableName="t_qcp_equipment_inform" domainObjectName="EquipmentInform"></table>
+<!--        <table tableName="t_qcp_equipment_status" domainObjectName="EquipmentStatus"></table>-->
+<!--        <table tableName="t_qcp_equipment_inform" domainObjectName="EquipmentInform"></table>-->
 <!--        <table tableName="t_area" domainObjectName="Area"></table>-->
 <!--        <table tableName="t_organization_department" domainObjectName="OrganizationDepartment"></table>-->
 <!--        <table tableName="t_organization_member" domainObjectName="OrganizationMember"></table>-->
@@ -77,7 +77,7 @@
 <!--        <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_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>-->