Merge branch 'master-prod-new' into chenjiahe-再生俱乐部

chenjiahe

2024-01-19 22d199559342c1ccb3a0a8a5b5ee50e973819e16

Merge branch 'master-prod-new' into chenjiahe-再生俱乐部

 phi_platform_common/src/main/java/com/hx/phip/dao/mapper/UserMergeCommonMapper.java

New file
@@ -0,0 +1,13 @@
package com.hx.phip.dao.mapper;

import com.hx.mybatisTool.SqlSentence;

import java.util.List;
import java.util.Map;

public interface UserMergeCommonMapper {
    /**查询列表，返回Map的List*/
    List<Map<String,Object>> selectListMap(SqlSentence sqlSentence);
    /**更新，返回更新数量*/
    int updateWhere(SqlSentence sqlSentence);
}

 phi_platform_common/src/main/resources/mapper/UserMergeCommonMapper.xml

New file
@@ -0,0 +1,16 @@
<?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">
<!-- namespace:该mapper.xml映射文件的 唯一标识 -->
<mapper namespace="com.hx.phip.dao.mapper.UserMergeCommonMapper">

    <select id="selectListMap" resultType="java.util.Map" parameterType="com.hx.mybatisTool.SqlSentence" >
            ${sqlSentence}
    </select>

    <update id="updateWhere" parameterType="com.hx.mybatisTool.SqlSentence">
        ${sqlSentence}
    </update>

</mapper>

 phi_platform_common/src/main/resources/mapper/platform/AppointmentMapper.xml

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,shopId = #{shopId},doctorId = #{doctorId},obeyDoctor = #{obeyDoctor},userId = #{userId},nurseId = #{nurseId},startTime = #{startTime},endTime = #{endTime},duration = #{duration},corpUserId = #{corpUserId},createCorpUserId = #{createCorpUserId},createRoleId = #{createRoleId},createRoleStr = #{createRoleStr},createManId = #{createManId},createManName = #{createManName},createManType = #{createManType},visitType = #{visitType},appType = #{appType},comDuration = #{comDuration},docComDuration = #{docComDuration},readyDuration = #{readyDuration},proDuration = #{proDuration},treatDuration = #{treatDuration},comRoomId = #{comRoomId},treatRoomId = #{treatRoomId},remark = #{remark},obeyTime = #{obeyTime},status = #{status},approveAdmin = #{approveAdmin},approveRemark = #{approveRemark},cancelApproveRemark = #{cancelApproveRemark},dayStr = #{dayStr},weekStr = #{weekStr},monthStr = #{monthStr},isSwitch = #{isSwitch},notifyStatus = #{notifyStatus},isModify = #{isModify},isApproveModify = #{isApproveModify},isMicApprove = #{isMicApprove},cancelStatus = #{cancelStatus},cancelType = #{cancelType},cancelRemark = #{cancelRemark},isArrive = #{isArrive},projectNames = #{projectNames},projectIds = #{projectIds},imgUrls = #{imgUrls},isReadyNotify = #{isReadyNotify},isUnArriveNotify = #{isUnArriveNotify},applyCancelTime = #{applyCancelTime},arriveTime = #{arriveTime},realDuration = #{realDuration},realComDuration = #{realComDuration},realProDuration = #{realProDuration},realDocComDuration = #{realDocComDuration},realTreatDuration = #{realTreatDuration},realReadyDuration = #{realReadyDuration},isAnaesthesia = #{isAnaesthesia},apiId = #{apiId},needSync = #{needSync},corpUserTeamId = #{corpUserTeamId},projectJson = #{projectJson},activityDayId = #{activityDayId},addMode = #{addMode},recordType = #{recordType},relationId = #{relationId},waitDuration = #{waitDuration},realWaitDuration = #{realWaitDuration},palsyDuration = #{palsyDuration},realPalsyDuration = #{realPalsyDuration},doctorZlDuration = #{doctorZlDuration},isLifeBeauty = #{isLifeBeauty},isSendMsg = #{isSendMsg},deductionNum = #{deductionNum},isPretriage = #{isPretriage},isAutoTriage = #{isAutoTriage},sourceId = #{sourceId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,shopId = #{shopId},doctorId = #{doctorId},obeyDoctor = #{obeyDoctor},userId = #{userId},nurseId = #{nurseId},startTime = #{startTime},endTime = #{endTime},specialUser = #{specialUser},duration = #{duration},corpUserId = #{corpUserId},createCorpUserId = #{createCorpUserId},createRoleId = #{createRoleId},createRoleStr = #{createRoleStr},createManId = #{createManId},createManName = #{createManName},createManType = #{createManType},visitType = #{visitType},appType = #{appType},comDuration = #{comDuration},docComDuration = #{docComDuration},readyDuration = #{readyDuration},proDuration = #{proDuration},treatDuration = #{treatDuration},comRoomId = #{comRoomId},treatRoomId = #{treatRoomId},remark = #{remark},obeyTime = #{obeyTime},status = #{status},approveAdmin = #{approveAdmin},approveRoleCode = #{approveRoleCode},approveRemark = #{approveRemark},cancelApproveRemark = #{cancelApproveRemark},dayStr = #{dayStr},weekStr = #{weekStr},monthStr = #{monthStr},isSwitch = #{isSwitch},occupySwitch = #{occupySwitch},rulePreType = #{rulePreType},notifyStatus = #{notifyStatus},isModify = #{isModify},isApproveModify = #{isApproveModify},isMicApprove = #{isMicApprove},cancelStatus = #{cancelStatus},cancelType = #{cancelType},cancelRemark = #{cancelRemark},isArrive = #{isArrive},projectNames = #{projectNames},projectIds = #{projectIds},imgUrls = #{imgUrls},isReadyNotify = #{isReadyNotify},isUnArriveNotify = #{isUnArriveNotify},applyCancelTime = #{applyCancelTime},arriveTime = #{arriveTime},realDuration = #{realDuration},realComDuration = #{realComDuration},realProDuration = #{realProDuration},realDocComDuration = #{realDocComDuration},realTreatDuration = #{realTreatDuration},realReadyDuration = #{realReadyDuration},isAnaesthesia = #{isAnaesthesia},apiId = #{apiId},needSync = #{needSync},corpUserTeamId = #{corpUserTeamId},projectJson = #{projectJson},activityDayId = #{activityDayId},addMode = #{addMode},recordType = #{recordType},relationId = #{relationId},waitDuration = #{waitDuration},realWaitDuration = #{realWaitDuration},palsyDuration = #{palsyDuration},realPalsyDuration = #{realPalsyDuration},doctorZlDuration = #{doctorZlDuration},isLifeBeauty = #{isLifeBeauty},isSendMsg = #{isSendMsg},isArriveSendMsg = #{isArriveSendMsg},deductionNum = #{deductionNum},isPretriage = #{isPretriage},isAutoTriage = #{isAutoTriage},sourceId = #{sourceId},orStartTime = #{orStartTime},cancelTime = #{cancelTime},approveTime = #{approveTime},isMarkDel = #{isMarkDel},isUpOrder = #{isUpOrder},micRemark = #{micRemark},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,11 +19,11 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into appointment (id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,isDel,createTime,editTime)  values (#{id},#{shopId},#{doctorId},#{obeyDoctor},#{userId},#{nurseId},#{startTime},#{endTime},#{duration},#{corpUserId},#{createCorpUserId},#{createRoleId},#{createRoleStr},#{createManId},#{createManName},#{createManType},#{visitType},#{appType},#{comDuration},#{docComDuration},#{readyDuration},#{proDuration},#{treatDuration},#{comRoomId},#{treatRoomId},#{remark},#{obeyTime},#{status},#{approveAdmin},#{approveRemark},#{cancelApproveRemark},#{dayStr},#{weekStr},#{monthStr},#{isSwitch},#{notifyStatus},#{isModify},#{isApproveModify},#{isMicApprove},#{cancelStatus},#{cancelType},#{cancelRemark},#{isArrive},#{projectNames},#{projectIds},#{imgUrls},#{isReadyNotify},#{isUnArriveNotify},#{applyCancelTime},#{arriveTime},#{realDuration},#{realComDuration},#{realProDuration},#{realDocComDuration},#{realTreatDuration},#{realReadyDuration},#{isAnaesthesia},#{apiId},#{needSync},#{corpUserTeamId},#{projectJson},#{activityDayId},#{addMode},#{recordType},#{relationId},#{waitDuration},#{realWaitDuration},#{palsyDuration},#{realPalsyDuration},#{doctorZlDuration},#{isLifeBeauty},#{isSendMsg},#{deductionNum},#{isPretriage},#{isAutoTriage},#{sourceId},#{isDel},#{createTime},#{editTime})
        insert into appointment (id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,specialUser,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRoleCode,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,occupySwitch,rulePreType,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,isArriveSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,orStartTime,cancelTime,approveTime,isMarkDel,isUpOrder,micRemark,isDel,createTime,editTime)  values (#{id},#{shopId},#{doctorId},#{obeyDoctor},#{userId},#{nurseId},#{startTime},#{endTime},#{specialUser},#{duration},#{corpUserId},#{createCorpUserId},#{createRoleId},#{createRoleStr},#{createManId},#{createManName},#{createManType},#{visitType},#{appType},#{comDuration},#{docComDuration},#{readyDuration},#{proDuration},#{treatDuration},#{comRoomId},#{treatRoomId},#{remark},#{obeyTime},#{status},#{approveAdmin},#{approveRoleCode},#{approveRemark},#{cancelApproveRemark},#{dayStr},#{weekStr},#{monthStr},#{isSwitch},#{occupySwitch},#{rulePreType},#{notifyStatus},#{isModify},#{isApproveModify},#{isMicApprove},#{cancelStatus},#{cancelType},#{cancelRemark},#{isArrive},#{projectNames},#{projectIds},#{imgUrls},#{isReadyNotify},#{isUnArriveNotify},#{applyCancelTime},#{arriveTime},#{realDuration},#{realComDuration},#{realProDuration},#{realDocComDuration},#{realTreatDuration},#{realReadyDuration},#{isAnaesthesia},#{apiId},#{needSync},#{corpUserTeamId},#{projectJson},#{activityDayId},#{addMode},#{recordType},#{relationId},#{waitDuration},#{realWaitDuration},#{palsyDuration},#{realPalsyDuration},#{doctorZlDuration},#{isLifeBeauty},#{isSendMsg},#{isArriveSendMsg},#{deductionNum},#{isPretriage},#{isAutoTriage},#{sourceId},#{orStartTime},#{cancelTime},#{approveTime},#{isMarkDel},#{isUpOrder},#{micRemark},#{isDel},#{createTime},#{editTime})
    </insert>

    <insert id="insertById" parameterType="com.hx.phiappt.model.Appointment">
        insert into appointment (id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,isDel,createTime,editTime)  values (#{id},#{shopId},#{doctorId},#{obeyDoctor},#{userId},#{nurseId},#{startTime},#{endTime},#{duration},#{corpUserId},#{createCorpUserId},#{createRoleId},#{createRoleStr},#{createManId},#{createManName},#{createManType},#{visitType},#{appType},#{comDuration},#{docComDuration},#{readyDuration},#{proDuration},#{treatDuration},#{comRoomId},#{treatRoomId},#{remark},#{obeyTime},#{status},#{approveAdmin},#{approveRemark},#{cancelApproveRemark},#{dayStr},#{weekStr},#{monthStr},#{isSwitch},#{notifyStatus},#{isModify},#{isApproveModify},#{isMicApprove},#{cancelStatus},#{cancelType},#{cancelRemark},#{isArrive},#{projectNames},#{projectIds},#{imgUrls},#{isReadyNotify},#{isUnArriveNotify},#{applyCancelTime},#{arriveTime},#{realDuration},#{realComDuration},#{realProDuration},#{realDocComDuration},#{realTreatDuration},#{realReadyDuration},#{isAnaesthesia},#{apiId},#{needSync},#{corpUserTeamId},#{projectJson},#{activityDayId},#{addMode},#{recordType},#{relationId},#{waitDuration},#{realWaitDuration},#{palsyDuration},#{realPalsyDuration},#{doctorZlDuration},#{isLifeBeauty},#{isSendMsg},#{deductionNum},#{isPretriage},#{isAutoTriage},#{sourceId},#{isDel},#{createTime},#{editTime})
        insert into appointment (id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,specialUser,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRoleCode,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,occupySwitch,rulePreType,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,isArriveSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,orStartTime,cancelTime,approveTime,isMarkDel,isUpOrder,micRemark,isDel,createTime,editTime)  values (#{id},#{shopId},#{doctorId},#{obeyDoctor},#{userId},#{nurseId},#{startTime},#{endTime},#{specialUser},#{duration},#{corpUserId},#{createCorpUserId},#{createRoleId},#{createRoleStr},#{createManId},#{createManName},#{createManType},#{visitType},#{appType},#{comDuration},#{docComDuration},#{readyDuration},#{proDuration},#{treatDuration},#{comRoomId},#{treatRoomId},#{remark},#{obeyTime},#{status},#{approveAdmin},#{approveRoleCode},#{approveRemark},#{cancelApproveRemark},#{dayStr},#{weekStr},#{monthStr},#{isSwitch},#{occupySwitch},#{rulePreType},#{notifyStatus},#{isModify},#{isApproveModify},#{isMicApprove},#{cancelStatus},#{cancelType},#{cancelRemark},#{isArrive},#{projectNames},#{projectIds},#{imgUrls},#{isReadyNotify},#{isUnArriveNotify},#{applyCancelTime},#{arriveTime},#{realDuration},#{realComDuration},#{realProDuration},#{realDocComDuration},#{realTreatDuration},#{realReadyDuration},#{isAnaesthesia},#{apiId},#{needSync},#{corpUserTeamId},#{projectJson},#{activityDayId},#{addMode},#{recordType},#{relationId},#{waitDuration},#{realWaitDuration},#{palsyDuration},#{realPalsyDuration},#{doctorZlDuration},#{isLifeBeauty},#{isSendMsg},#{isArriveSendMsg},#{deductionNum},#{isPretriage},#{isAutoTriage},#{sourceId},#{orStartTime},#{cancelTime},#{approveTime},#{isMarkDel},#{isUpOrder},#{micRemark},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.Appointment" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -55,14 +55,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.Appointment" parameterType="java.lang.Object" >
        select 
            id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,isDel,createTime,editTime
            id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,specialUser,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRoleCode,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,occupySwitch,rulePreType,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,isArriveSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,orStartTime,cancelTime,approveTime,isMarkDel,isUpOrder,micRemark,isDel,createTime,editTime
        from appointment
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.Appointment" parameterType="java.lang.Object" >
        select 
            id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,isDel,createTime,editTime
            id,shopId,doctorId,obeyDoctor,userId,nurseId,startTime,endTime,specialUser,duration,corpUserId,createCorpUserId,createRoleId,createRoleStr,createManId,createManName,createManType,visitType,appType,comDuration,docComDuration,readyDuration,proDuration,treatDuration,comRoomId,treatRoomId,remark,obeyTime,status,approveAdmin,approveRoleCode,approveRemark,cancelApproveRemark,dayStr,weekStr,monthStr,isSwitch,occupySwitch,rulePreType,notifyStatus,isModify,isApproveModify,isMicApprove,cancelStatus,cancelType,cancelRemark,isArrive,projectNames,projectIds,imgUrls,isReadyNotify,isUnArriveNotify,applyCancelTime,arriveTime,realDuration,realComDuration,realProDuration,realDocComDuration,realTreatDuration,realReadyDuration,isAnaesthesia,apiId,needSync,corpUserTeamId,projectJson,activityDayId,addMode,recordType,relationId,waitDuration,realWaitDuration,palsyDuration,realPalsyDuration,doctorZlDuration,isLifeBeauty,isSendMsg,isArriveSendMsg,deductionNum,isPretriage,isAutoTriage,sourceId,orStartTime,cancelTime,approveTime,isMarkDel,isUpOrder,micRemark,isDel,createTime,editTime
        from appointment
        WHERE id = #{value}
    </select>

 phi_platform_common/src/main/resources/mapper/platform/InvestigateDataMapper.xml

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,investigateId = #{investigateId},userId = #{userId},data = #{data},projectId = #{projectId},projectName = #{projectName},shopId = #{shopId},shopName = #{shopName},deductionSingleId = #{deductionSingleId},type = #{type},startTime = #{startTime},doneTime = #{doneTime},proposal = #{proposal},userName = #{userName},doctorCorpUserId = #{doctorCorpUserId},doctorCorpUserName = #{doctorCorpUserName},nurseCorpUserId = #{nurseCorpUserId},nurseCorpUserName = #{nurseCorpUserName},deductionSingleTime = #{deductionSingleTime},isDone = #{isDone},nurseScore = #{nurseScore},consultantScore = #{consultantScore},isHighQuality = #{isHighQuality},isComplete = #{isComplete},doctorScore = #{doctorScore},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,investigateId = #{investigateId},userId = #{userId},data = #{data},projectId = #{projectId},projectName = #{projectName},shopId = #{shopId},shopName = #{shopName},deductionSingleId = #{deductionSingleId},type = #{type},startTime = #{startTime},doneTime = #{doneTime},proposal = #{proposal},userName = #{userName},doctorCorpUserId = #{doctorCorpUserId},doctorCorpUserName = #{doctorCorpUserName},nurseCorpUserId = #{nurseCorpUserId},nurseCorpUserName = #{nurseCorpUserName},deductionSingleTime = #{deductionSingleTime},isDone = #{isDone},nurseScore = #{nurseScore},consultantScore = #{consultantScore},isHighQuality = #{isHighQuality},isComplete = #{isComplete},doctorScore = #{doctorScore},receptionScore = #{receptionScore},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,7 +19,7 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into investigate_data (id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,isDel,createTime,editTime)  values (#{id},#{investigateId},#{userId},#{data},#{projectId},#{projectName},#{shopId},#{shopName},#{deductionSingleId},#{type},#{startTime},#{doneTime},#{proposal},#{userName},#{doctorCorpUserId},#{doctorCorpUserName},#{nurseCorpUserId},#{nurseCorpUserName},#{deductionSingleTime},#{isDone},#{nurseScore},#{consultantScore},#{isHighQuality},#{isComplete},#{doctorScore},#{isDel},#{createTime},#{editTime})
        insert into investigate_data (id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,receptionScore,isDel,createTime,editTime)  values (#{id},#{investigateId},#{userId},#{data},#{projectId},#{projectName},#{shopId},#{shopName},#{deductionSingleId},#{type},#{startTime},#{doneTime},#{proposal},#{userName},#{doctorCorpUserId},#{doctorCorpUserName},#{nurseCorpUserId},#{nurseCorpUserName},#{deductionSingleTime},#{isDone},#{nurseScore},#{consultantScore},#{isHighQuality},#{isComplete},#{doctorScore},#{receptionScore},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.questionnaire.InvestigateData" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -51,14 +51,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.questionnaire.InvestigateData" parameterType="java.lang.Object" >
        select 
            id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,isDel,createTime,editTime
            id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,receptionScore,isDel,createTime,editTime
        from investigate_data
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.questionnaire.InvestigateData" parameterType="java.lang.Object" >
        select 
            id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,isDel,createTime,editTime
            id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,receptionScore,isDel,createTime,editTime
        from investigate_data
        WHERE id = #{value}
    </select>

 phi_platform_common/src/main/resources/mapper/platform/TreatProjectMapper.xml

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,positionData = #{positionData},projectNo = #{projectNo},projectName = #{projectName},price = #{price},num = #{num},useDuration = #{useDuration},palsyDuration = #{palsyDuration},projectId = #{projectId},treatSingleId = #{treatSingleId},remarkInfo = #{remarkInfo},hisId = #{hisId},isDeduct = #{isDeduct},userProjectItemId = #{userProjectItemId},goodsId = #{goodsId},treatSingleNo = #{treatSingleNo},deductNum = #{deductNum},isUserPro = #{isUserPro},indicationId = #{indicationId},indication = #{indication},partType = #{partType},sdRemark = #{sdRemark},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,positionData = #{positionData},projectNo = #{projectNo},projectName = #{projectName},price = #{price},num = #{num},useDuration = #{useDuration},palsyDuration = #{palsyDuration},projectId = #{projectId},treatSingleId = #{treatSingleId},remarkInfo = #{remarkInfo},hisId = #{hisId},isDeduct = #{isDeduct},isUsed = #{isUsed},userProjectItemId = #{userProjectItemId},goodsId = #{goodsId},treatSingleNo = #{treatSingleNo},deductNum = #{deductNum},isUserPro = #{isUserPro},indicationId = #{indicationId},indication = #{indication},partType = #{partType},sdRemark = #{sdRemark},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,11 +19,11 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime)  values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{sdRemark},#{isDel},#{createTime},#{editTime})
        insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,isUsed,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime)  values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{isUsed},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{sdRemark},#{isDel},#{createTime},#{editTime})
    </insert>

    <insert id="insertById" parameterType="com.hx.phiappt.model.treat.TreatProject">
        insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime)  values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{sdRemark},#{isDel},#{createTime},#{editTime})
        insert into treat_project (id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,isUsed,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime)  values (#{id},#{positionData},#{projectNo},#{projectName},#{price},#{num},#{useDuration},#{palsyDuration},#{projectId},#{treatSingleId},#{remarkInfo},#{hisId},#{isDeduct},#{isUsed},#{userProjectItemId},#{goodsId},#{treatSingleNo},#{deductNum},#{isUserPro},#{indicationId},#{indication},#{partType},#{sdRemark},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.treat.TreatProject" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -55,14 +55,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.treat.TreatProject" parameterType="java.lang.Object" >
        select 
            id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime
            id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,isUsed,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime
        from treat_project
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.treat.TreatProject" parameterType="java.lang.Object" >
        select 
            id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime
            id,positionData,projectNo,projectName,price,num,useDuration,palsyDuration,projectId,treatSingleId,remarkInfo,hisId,isDeduct,isUsed,userProjectItemId,goodsId,treatSingleNo,deductNum,isUserPro,indicationId,indication,partType,sdRemark,isDel,createTime,editTime
        from treat_project
        WHERE id = #{value}
    </select>

 phi_platform_common/src/main/resources/mapper/platform/UserProjectTurnMapper.xml

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,turnOutUserProjectItemId = #{turnOutUserProjectItemId},turnOutUserProjectName = #{turnOutUserProjectName},turnIntoUserProjectItemId = #{turnIntoUserProjectItemId},turnIntoUserProjectName = #{turnIntoUserProjectName},turnOutUserId = #{turnOutUserId},turnOutUserName = #{turnOutUserName},turnOutUserNO = #{turnOutUserNO},turnOutUserShopId = #{turnOutUserShopId},turnOutUserShopName = #{turnOutUserShopName},turnIntoUserId = #{turnIntoUserId},turnIntoUserName = #{turnIntoUserName},turnIntoUserNo = #{turnIntoUserNo},turnIntoUserShopId = #{turnIntoUserShopId},turnIntoUserShopName = #{turnIntoUserShopName},opType = #{opType},noDeductionAmount = #{noDeductionAmount},turnNumber = #{turnNumber},status = #{status},operatorType = #{operatorType},operatorId = #{operatorId},operatorName = #{operatorName},originChannel = #{originChannel},sourceCode = #{sourceCode},sourceName = #{sourceName},remarks = #{remarks},turnAddId = #{turnAddId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,turnOutUserProjectItemId = #{turnOutUserProjectItemId},turnOutUserProjectName = #{turnOutUserProjectName},turnIntoUserProjectItemId = #{turnIntoUserProjectItemId},turnIntoUserProjectName = #{turnIntoUserProjectName},turnOutUserId = #{turnOutUserId},turnOutUserName = #{turnOutUserName},turnOutUserNO = #{turnOutUserNO},turnOutUserShopId = #{turnOutUserShopId},turnOutUserShopName = #{turnOutUserShopName},turnIntoUserId = #{turnIntoUserId},turnIntoUserName = #{turnIntoUserName},turnIntoUserNo = #{turnIntoUserNo},turnIntoUserShopId = #{turnIntoUserShopId},turnIntoUserShopName = #{turnIntoUserShopName},opType = #{opType},noDeductionAmount = #{noDeductionAmount},turnNumber = #{turnNumber},status = #{status},operatorType = #{operatorType},operatorId = #{operatorId},operatorName = #{operatorName},originChannel = #{originChannel},sourceCode = #{sourceCode},sourceName = #{sourceName},remarks = #{remarks},turnApproveImageUrl = #{turnApproveImageUrl},turnAddId = #{turnAddId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,8 +19,12 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into user_project_turn (id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnAddId,isDel,createTime,editTime)  values (#{id},#{turnOutUserProjectItemId},#{turnOutUserProjectName},#{turnIntoUserProjectItemId},#{turnIntoUserProjectName},#{turnOutUserId},#{turnOutUserName},#{turnOutUserNO},#{turnOutUserShopId},#{turnOutUserShopName},#{turnIntoUserId},#{turnIntoUserName},#{turnIntoUserNo},#{turnIntoUserShopId},#{turnIntoUserShopName},#{opType},#{noDeductionAmount},#{turnNumber},#{status},#{operatorType},#{operatorId},#{operatorName},#{originChannel},#{sourceCode},#{sourceName},#{remarks},#{turnAddId},#{isDel},#{createTime},#{editTime})
        insert into user_project_turn (id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnApproveImageUrl,turnAddId,isDel,createTime,editTime)  values (#{id},#{turnOutUserProjectItemId},#{turnOutUserProjectName},#{turnIntoUserProjectItemId},#{turnIntoUserProjectName},#{turnOutUserId},#{turnOutUserName},#{turnOutUserNO},#{turnOutUserShopId},#{turnOutUserShopName},#{turnIntoUserId},#{turnIntoUserName},#{turnIntoUserNo},#{turnIntoUserShopId},#{turnIntoUserShopName},#{opType},#{noDeductionAmount},#{turnNumber},#{status},#{operatorType},#{operatorId},#{operatorName},#{originChannel},#{sourceCode},#{sourceName},#{remarks},#{turnApproveImageUrl},#{turnAddId},#{isDel},#{createTime},#{editTime})
    </insert>

    <insert id="insertById" parameterType="com.hx.phiappt.model.user.UserProjectTurn">
        insert into user_project_turn (id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnApproveImageUrl,turnAddId,isDel,createTime,editTime)  values (#{id},#{turnOutUserProjectItemId},#{turnOutUserProjectName},#{turnIntoUserProjectItemId},#{turnIntoUserProjectName},#{turnOutUserId},#{turnOutUserName},#{turnOutUserNO},#{turnOutUserShopId},#{turnOutUserShopName},#{turnIntoUserId},#{turnIntoUserName},#{turnIntoUserNo},#{turnIntoUserShopId},#{turnIntoUserShopName},#{opType},#{noDeductionAmount},#{turnNumber},#{status},#{operatorType},#{operatorId},#{operatorName},#{originChannel},#{sourceCode},#{sourceName},#{remarks},#{turnApproveImageUrl},#{turnAddId},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.user.UserProjectTurn" parameterType="com.hx.mybatisTool.SqlSentence" >
        ${sqlSentence}
@@ -51,14 +55,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.user.UserProjectTurn" parameterType="java.lang.Object" >
        select 
            id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnAddId,isDel,createTime,editTime
            id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnApproveImageUrl,turnAddId,isDel,createTime,editTime
        from user_project_turn
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.user.UserProjectTurn" parameterType="java.lang.Object" >
        select 
            id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnAddId,isDel,createTime,editTime
            id,turnOutUserProjectItemId,turnOutUserProjectName,turnIntoUserProjectItemId,turnIntoUserProjectName,turnOutUserId,turnOutUserName,turnOutUserNO,turnOutUserShopId,turnOutUserShopName,turnIntoUserId,turnIntoUserName,turnIntoUserNo,turnIntoUserShopId,turnIntoUserShopName,opType,noDeductionAmount,turnNumber,status,operatorType,operatorId,operatorName,originChannel,sourceCode,sourceName,remarks,turnApproveImageUrl,turnAddId,isDel,createTime,editTime
        from user_project_turn
        WHERE id = #{value}
    </select>

 phi_platform_user/src/main/java/com/hx/phip/AutoDomeUtil.java

@@ -2,7 +2,7 @@

import com.hx.auto.GeneratorUtil;
import com.hx.auto.common.UrlData;
import com.hx.phiappt.model.user.UserAcquisitionRecord;
import com.hx.phiappt.model.questionnaire.InvestigateData;
import com.hx.util.StringUtils;

import java.io.File;
@@ -27,7 +27,7 @@
        String controllerPackRootResourse = "phi_platform_user.src.main.resources";

        // 替换此处名字
        Class<?> clas = UserAcquisitionRecord.class;
        Class<?> clas = InvestigateData.class;


        // 获取对象生成的上层包名

 phi_platform_user/src/main/java/com/hx/phip/controller/consultation/ConsultationRecordController.java

@@ -70,6 +70,7 @@
            if (consultationRecord == null) {
                throw new PlatTipsException(PlatformCode.ERROR_TIPS, "找不到咨询记录！");
            }
            consultRecordDto.setCreateTime(consultationRecord.getCreateTime());
        }

        String id = consultationRecordService.insertOrEdit(consultRecordDto, systemParameterService, commonService);

 phi_platform_user/src/main/java/com/hx/phip/controller/message/CorpMessageController.java

@@ -311,6 +311,30 @@
                    if (userInfo == null) {
                        throw new PlatTipsException(PlatformCode.ERROR_TIPS, "未找到客户信息！");
                    }
                    // 是否过期提醒
                    int isExpire = BaseEntity.NO;
                    // 待过期预告升降级信息
                    if (NotificationLog.NOTIFICATION_SUBJECT_USER_LEVEL_1_EXPIRE_NOTICE.equals(notificationLog.getNotificationSubject()) ||
                            NotificationLog.NOTIFICATION_SUBJECT_USER_LEVEL_2_EXPIRE_NOTICE.equals(notificationLog.getNotificationSubject()) ||
                            NotificationLog.NOTIFICATION_SUBJECT_USER_LEVEL_3_EXPIRE_NOTICE.equals(notificationLog.getNotificationSubject())) {
                        // 是否过期提醒
                        isExpire = BaseEntity.YES;
                        // 标题处理
                        title = "客户即将降级通知";
                        // 计算降级保级查询数据
                        UserLevelRecord checkUserLevelRecord = UserLevelTool.handlerSaveAndDownLevel(commonService, userLevelRecord, BaseEntity.YES, BaseEntity.NO);
                        if (checkUserLevelRecord != null) {
                            // 回填显示数据
                            userLevelRecord.setBeforeLevelName(checkUserLevelRecord.getBeforeLevelName());
                            userLevelRecord.setLevelName(checkUserLevelRecord.getLevelName());
                            // 保级不用发送通知
                            if (UserLevelRecord.CHANGE_LEVEL_TYPE_SAVE_LEVEL.equals(checkUserLevelRecord.getChangeLevelType())){
                               return;
                            }
                        } else {
                            throw new PlatTipsException(PlatformCode.ERROR_TIPS, "未计算出客户等级降级保级信息！");
                        }
                    }
                    // 姓名
                    net.sf.json.JSONObject contentItem401 = new net.sf.json.JSONObject();
                    contentItem401.put("key", "客户姓名");
@@ -318,10 +342,12 @@
                    contentItem401.put("value", userInfo.getName() + ciqInfo);
                    jsonArray.add(contentItem401);
                    // 变动日期
                    net.sf.json.JSONObject contentItem402 = new net.sf.json.JSONObject();
                    contentItem402.put("key", "变动日期");
                    contentItem402.put("value", DateUtil.formatDate_9(userLevelRecord.getCreateTime()));
                    jsonArray.add(contentItem402);
                    if (BaseEntity.NO == isExpire) {
                        net.sf.json.JSONObject contentItem402 = new net.sf.json.JSONObject();
                        contentItem402.put("key", "变动日期");
                        contentItem402.put("value", DateUtil.formatDate_9(userLevelRecord.getCreateTime()));
                        jsonArray.add(contentItem402);
                    }
                    // 原等级
                    net.sf.json.JSONObject contentItem403 = new net.sf.json.JSONObject();
                    contentItem403.put("key", "原等级");
@@ -340,7 +366,13 @@
                    // 变动原因
                    net.sf.json.JSONObject contentItem406 = new net.sf.json.JSONObject();
                    contentItem406.put("key", "变动原因");
                    String reasonInfo = UserLevelTool.getUserLevelReasonInfo(commonService, userLevelRecord);
                    // 获取变动原因
                    String reasonInfo;
                    if (BaseEntity.NO == isExpire) {
                        reasonInfo = UserLevelTool.getUserLevelReasonInfo(commonService, userLevelRecord);
                    } else {
                        reasonInfo = "保级未达成，会员降级";
                    }
                    contentItem406.put("value", reasonInfo);
                    jsonArray.add(contentItem406);
                    break;

 phi_platform_user/src/main/java/com/hx/phip/controller/mp/MpQrCodeController.java

@@ -1,18 +1,21 @@
package com.hx.phip.controller.mp;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.hx.common.BaseController;
import com.hx.exception.TipsException;
import com.hx.mp.util.MPWeixinBaseUtil;
import com.hx.phiappt.common.QrCodeConstants;
import com.hx.phiappt.model.BaseEntity;
import com.hx.phip.common.wx.corp.WeiXinMpUtil;
import com.hx.phip.config.CustomParameter;
import com.hx.phip.model.ApplyParameter;
import com.hx.phip.model.SysParameter;
import com.hx.phip.tool.ApplyParameterTool;
import com.hx.util.AesUtil;
import com.hx.util.HttpServletRequestUtil;
import com.hx.util.QRCodeUtil;
import com.hx.util.StringUtils;
import com.hx.util.corp.CorpMpUtil;
import com.hx.util.corp.entity.AppLetInfo;
import com.hz.his.dto.mp.MpQrCodeDto;
import com.platform.constants.PlatformPattern;
import com.platform.exception.PlatTipsException;
@@ -20,16 +23,12 @@
import com.platform.resultTool.PlatformResult;
import com.platform.resultTool.SystemCode;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.FileUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;


/**
@@ -72,16 +71,30 @@
        }


        String sence = QrCodeConstants.PREFIX_HIS_CODE + "_" + mpQrCodeDto.getCiq() + "_" + mpQrCodeDto.getShopCode();
        String scene = QrCodeConstants.PREFIX_HIS_CODE + "_" + mpQrCodeDto.getCiq() + "_" + mpQrCodeDto.getShopCode();

        String imgUrl = null;
        try {

            String version = "trial";

            if(PlatformPattern.PROD.equals(customParameter.getPlatformPattern())){
                version = "release";
            }
            //获取token值
            SysParameter sysParameter = getMpToken(HiSMPAPPID);

            File file = MPWeixinBaseUtil.createUnlimitQrCode(sysParameter.getParamValue(), sence, "package_medical_guide/wb_visit/visitAdd",430, false, null, false);
            if (file.length() < 300) {
            //data.put("senceCode",sence);
            //File file = MPWeixinBaseUtil.createUnlimitQrCode(sysParameter.getParamValue(), scene, "package_medical_guide/wb_visit/visitAdd",430, false, null, false);
            //生成小程序链接
            AppLetInfo appLetInfo = CorpMpUtil.getAppLetUrl("/package_medical_guide/wb_visit/visitAdd", sysParameter.getParamValue(), version, "scene="+scene);
            log.info("返回小程序链接数据：{}", JSON.toJSONString(appLetInfo));
            if (appLetInfo.getErrcode().equals(BaseEntity.NO)) {
                //转换为普通二维码
                 imgUrl = QRCodeUtil.QRCodeCreate(appLetInfo.getUrlLink(), 430, null);
            }

   /*         if (file.length() < 300) {
                throw new TipsException("跳转链接不正确！");
            }
            // 直接返回图片文件路径
@@ -90,7 +103,7 @@
            // 或者读取图片文件字节,base64编码,返回Data URI
            byte[] imgData = FileUtils.readFileToByteArray(file);
            String imgBase64 = Base64.encodeBase64String(imgData);
            imgUrl = "data:image/jpeg;base64," + imgBase64;
            imgUrl = "data:image/jpeg;base64," + imgBase64;*/
        } catch (Exception e) {
            throw new TipsException(e.getMessage());
        }

 phi_platform_user/src/main/java/com/hx/phip/controller/user/UserProjectController.java

@@ -391,6 +391,10 @@
            userProjectTurn.setSourceCode(thirtApplication.getAppId());
            userProjectTurn.setSourceName(thirtApplication.getName());
        }
        // 保存转赠凭证
        if (userProjectTurn.getTurnApproveImageList() != null && userProjectTurn.getTurnApproveImageList().size() > 0) {
            userProjectTurn.setTurnApproveImageUrl(com.alibaba.fastjson.JSONArray.toJSONString(userProjectTurn.getTurnApproveImageList()));
        }
        // 校验参数
        checkTurnProjectParam(userProjectTurn);
        // 转赠用户项目
@@ -444,6 +448,10 @@
            userProjectTurn.setRemarks(userProjectTurnDto.getRemarks());
            userProjectTurn.setSourceCode(sourceCode);
            userProjectTurn.setSourceName(sourceName);
            // 保存转赠凭证
            if (userProjectTurn.getTurnApproveImageList() != null && userProjectTurn.getTurnApproveImageList().size() > 0) {
                userProjectTurn.setTurnApproveImageUrl(com.alibaba.fastjson.JSONArray.toJSONString(userProjectTurn.getTurnApproveImageList()));
            }
            // 校验参数
            checkTurnProjectParam(userProjectTurn);
        }

 phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java

@@ -118,6 +118,8 @@

        sqlSentence.setSqlSentence(" select * from user_info where isDel = 0 and userId = #{m.userId} ");
        UserInfo userInfo = commonService.selectOne(UserInfoMapper.class, sqlSentence);
        //来源名称
        String sourceName = "";
        if (userInfo != null) {
           // userInfoMap.put("professionTypeName", userInfo.getProfessionTypeName());
            userInfoMap.put("marriageTypeName", userInfo.getMarriageTypeName());
@@ -128,6 +130,7 @@
            userInfoMap.put("mainAppeal", userInfo.getMainAppeal());
            userInfoMap.put("minorAppeal", userInfo.getMinorAppeal());
            userInfoMap.put("professionName", userInfo.getProfessionTypeName());
            sourceName = userInfo.getSourceName();
            //查询对应职业标签
            sqlSentence.sqlSentence("SELECT * FROM user_general_label where isDel = 0 and " +
                    " name in ('室内为主','需要外出','经常出差') and userId = #{m.userId} ORDER BY createTime desc limit 1",values);
@@ -173,8 +176,10 @@
        }else {
            userInfoMap.put("isExitsChannel", 0);
        }
         //20231207  mot扫码判断用户是否有渠道，有渠道则不修改
        if(StringUtils.isEmpty(user.getChannelType(),user.getChannelType2()) ){
         //20231207  mot扫码判断用户是否有渠道，有渠道或有来源名称则不修改


        if(StringUtils.isEmpty(user.getChannelType()) && StringUtils.isEmpty(user.getChannelType2()) && StringUtils.isEmpty(sourceName)){
            userInfoMap.put("isShowChannel", 0);
        }else {
            userInfoMap.put("isShowChannel", 1);

 phi_platform_user/src/main/java/com/hx/phip/service/market/impl/MarketActivityServiceImpl.java

@@ -76,15 +76,16 @@

        //遍历领取
        String couponName = "";
        Integer isApprove = null;
        Integer isApprove = BaseEntity.NO;
        for(MarketActivityItem activityCoupon : list)
        {
            //新增
            recordItem = new MarketActivityReceiveRecordItem(activityCoupon);
            recordItemList.add(recordItem);
            //获取优惠券名称
            couponName = activityCoupon.getCommonName();
            //判断是否需要审批，如果需要审批先跳过不发放优惠券
            if(activityCoupon.getIsApprove() == BaseEntity.YES){
                couponName = activityCoupon.getCommonName();
                isApprove = activityCoupon.getIsApprove();
                continue;
            }
@@ -137,7 +138,7 @@
        }

        //发送审批通知给活动负责人-------------------------------------------------------------------------------------
        if(isApprove == BaseEntity.YES) {
//        if(isApprove == BaseEntity.YES) {
            try {
                String empUserId;
                Shop shop = commonService.selectOneByKey(ShopMapper.class, receiveRecord.getOpShopId());
@@ -153,7 +154,7 @@
                    empUserId = "18023612893";
                }

                String sendDate = MessageTemplate.receiveCouponSendToManager(empUserId, user.getName(), receiveRecord.getOpName(), shop.getName(), marketActivity.getTitle(), couponName, customParameter.getCorpMpAppId());
                String sendDate = MessageTemplate.receiveCouponSendToManager(isApprove,empUserId, user.getName(), receiveRecord.getOpName(), shop.getName(), marketActivity.getTitle(), couponName, customParameter.getCorpMpAppId());
                log.info("小程序营销活动领取优惠券通知活动负责人，userId为:{}", empUserId);
                String token = WeiXinCorpMpUtil.getApplicationAccessToken(commonService, customParameter.getCorpAppId(), customParameter.getCorpMpSecret());
                SendMessageTool.sendMessge(sendDate, token);
@@ -161,7 +162,7 @@
                log.info("小程序用户营销活动发送通知失败");
                log.info(GlobalExceptionHandler.getExceptionInformation(e));
            }
        }
//        }
        //-------------------------------------------------------------------------------------------
    }


 phi_platform_user/src/main/java/com/hx/phip/service/questionnaire/impl/QuestionnaireServiceImpl.java

@@ -446,6 +446,7 @@
        StringBuilder proposal = new StringBuilder();
        StringBuilder nurse = new StringBuilder();
        StringBuilder doctor = new StringBuilder();
        StringBuilder reception = new StringBuilder();
        //List<String> clozeIds = Arrays.asList(questionInvestigateConfig.getNewProposal(), questionInvestigateConfig.getOldProposal());
        Integer isHighQuality = 0;
        QuestionTitle questionTitle = null;
@@ -489,6 +490,13 @@
                                doctor.append(",");
                            }
                        }
                    }else if (QuestionTitle.SPECIAL_TYPE_RECEPTION.equals(questionTitle.getSpecialType())){
                        for (int s = 0; s < answerDto.getAnswer().length; s++) {
                            reception.append(answerDto.getAnswer()[s]);
                            if (s != answerDto.getAnswer().length - 1) {
                                reception.append(",");
                            }
                        }
                    }
                }
            }
@@ -507,7 +515,9 @@
        if (doctor.length() > 0){
            data.setDoctorScore(doctor.toString());
        }

        if (reception.length() > 0){
            data.setReceptionScore(reception.toString());
        }
        data.setIsHighQuality(isHighQuality);
        int i = investigateDataMapper.insert(data);
        if (i != 1) {

 phi_platform_user/src/main/java/com/hx/phip/service/user/impl/UserMergeLogServiceImpl.java

@@ -5,8 +5,10 @@
import com.hx.guide.model.VLatelyLog;
import com.hx.guide.model.VisitOrder;
import com.hx.guide.model.VisitRecord;
import com.hx.mybatis.aes.springbean.ConstantBean;
import com.hx.mybatisTool.SqlSentence;
import com.hx.phiappt.common.OperationReasonConstants;
import com.hx.phiappt.dto.MerUserFileDto;
import com.hx.phiappt.model.*;
import com.hx.phiappt.model.aliyun.call.AliyunSecretCallRecord;
import com.hx.phiappt.model.appearancePlan.AppearanceTotal;
@@ -39,6 +41,7 @@
import com.hx.phiappt.model.user.*;
import com.hx.phiappt.model.userMoney.UserMoneyUnclaimed;
import com.hx.phiappt.model.wechat.gzh.GzhMsg;
import com.hx.phiappt.util.MerUserFileUtil;
import com.hx.phip.config.CustomParameter;
import com.hx.phip.dao.mapper.*;
import com.hx.phip.dto.user.UserMergeConsumeDto;
@@ -171,6 +174,8 @@
    @Resource
    private ConsultationNeededProjectMapper consultationNeededProjectMapper;
    @Resource
    private ConsultationTreatProjectMapper consultationTreatProjectMapper;
    @Resource
    private VGuideLogMapper vGuideLogMapper;
    @Resource
    private UserStatisticsMapper userStatisticsMapper;
@@ -218,6 +223,10 @@
    private KoapOrderTotalMapper koapOrderTotalMapper;
    @Resource
    private UserMoneyLogMapper userMoneyLogMapper;
    @Resource
    private ConstantBean constantBean;
    @Resource
    private UserMergeCommonMapper userMergeCommonMapper;

    /**
     * 合并账号
@@ -400,9 +409,90 @@
        //处理消费摘要
        timeConsumeHandler(user, delUser, userMergeLog, sqlSentence, sqlMap);

        //处理含注解的
        annotationHandler(user,delUser,userMergeLog, sqlSentence, sqlMap);


        //修改状态
        otherService.logStatusUpdate(userMergeLog.getId(),1);
        logger.info("------------------------------------结束处理账号合并-------------------------------------");
    }

    /**
     * 处理含注解的表
     * */
    private void annotationHandler(User user, User delUser, UserMergeLog userMergeLog, SqlSentence sqlSentence, Map<String, Object> sqlMap) {
        logger.info("<-扫描含注解的表合并开始->");
        List<MerUserFileDto> merUserFileUtilList = null;
        try {
            merUserFileUtilList = MerUserFileUtil.getMerUserFileUtilList(constantBean);
        }catch (Exception e){
            logger.error("合并账号扫描含注解的表错误,保留{},作废{}"+user.getId(),delUser.getId());
        }
        if (merUserFileUtilList == null || merUserFileUtilList.size() < 1){
            logger.info("<-扫描含注解的表无所属,结束->");
            return;
        }
        StringBuilder sql = new StringBuilder();
        List<Map<String, Object>> delUserDataList = null;
        UserMergeLogItem dUserLog = null;
        for (MerUserFileDto merUserFileDto : merUserFileUtilList) {
            logger.info("扫描注解处理,表{},字段{}",merUserFileDto.getTableName(),merUserFileDto.getFileName());
            //获取旧用户数据
            if (sql.length() > 0){
                sql.delete(0,sql.length());
            }
            sql.append(" SELECT * FROM ").append(merUserFileDto.getTableName()).append(" WHERE isDel = #{m.isDel} ");
            sql.append(" AND ").append(merUserFileDto.getFileName()).append(" = #{m.delUserId} ");
            sqlSentence.sqlSentence(sql.toString(), sqlMap);
            delUserDataList = userMergeCommonMapper.selectListMap(sqlSentence);
            if (delUserDataList == null || delUserDataList.size() < 1){
                logger.info("作废用户无数据,表{},字段{}",merUserFileDto.getTableName(),merUserFileDto.getFileName());
                continue;
            }

            int sortNum = 0;
            dUserLog = new UserMergeLogItem();
            dUserLog.setMergeLogId(userMergeLog.getId());
            dUserLog.setMergeLogNo(userMergeLog.getMergeNo());
            dUserLog.setPersistUserId(userMergeLog.getPersistUserId());
            dUserLog.setRepealUserId(userMergeLog.getRepealUserId());

            dUserLog.setIsHaveOther(0);
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(merUserFileDto.getType());
            dUserLog.setTableName(merUserFileDto.getTableName());
            dUserLog.setFieldId(merUserFileDto.getFileName());
            dUserLog.setFieldName("用户标识");
            dUserLog.setBeforeValue(delUser.getId());
            dUserLog.setAfterValue(user.getId());
            for (Map<String, Object> map : delUserDataList) {
                logger.info("当前处理,表{},字段{},记录标识{}",merUserFileDto.getTableName(),merUserFileDto.getFileName(),map.get("id"));
                dUserLog.setSortNum(sortNum);
                dUserLog.setOpContent(JSON.toJSONString(map));

                sqlMap.put("id", map.get("id"));
                if (sql.length() > 0){
                    sql.delete(0,sql.length());
                }
                sql.append(" UPDATE ").append(merUserFileDto.getTableName()).append(" SET ");
                sql.append(merUserFileDto.getFileName()).append(" = #{m.userId} WHERE id = #{m.id} ");
                sqlSentence.sqlUpdate(sql.toString(), sqlMap);
                if (userMergeCommonMapper.updateWhere(sqlSentence) != 1) {
                    logger.info("合并失败,当前处理,表{},字段{},记录标识{}",merUserFileDto.getTableName(),merUserFileDto.getFileName(),map.get("id"));
                    dUserLog.setStatus(0);
                    otherService.logAdd(dUserLog);
                    otherService.logStatusUpdate(userMergeLog.getId(),0);
                    throw new PlatTipsException(PlatformCode.ERROR_TIPS, "合并失败!");
                }
                dUserLog.setStatus(1);
                otherService.logAdd(dUserLog);
                sortNum = sortNum + 1;
            }
        }
        logger.info("<-扫描含注解的表合并结束->");
    }

    /**
@@ -426,7 +516,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_ADDRESS);
            dUserLog.setType(UserMergeLogItem.TYPE_USER_INTERESTS);
            dUserLog.setTableName("user_interests");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2423,7 +2513,7 @@
                sqlMap.put("id", record.getId());
                sqlSentence.sqlUpdate(" userId = #{m.userId} WHERE id = #{m.id} ", sqlMap);
                if (consultationPotentialProjectMapper.updateWhere(sqlSentence) != 1) {
                    logger.error("合并用户咨询记录-关注活动记录失败" + JSON.toJSONString(record));
                    logger.error("合并用户咨询记录-潜在项目记录失败" + JSON.toJSONString(record));
                    dUserLog.setStatus(0);
                    otherService.logAdd(dUserLog);
                    otherService.logStatusUpdate(userMergeLog.getId(),0);
@@ -2479,6 +2569,53 @@
            }
        }
        logger.info("<-合并用户咨询记录-推荐项目记录结束->");


        //治疗项目consultation_treat_project
        logger.info("<-合并用户咨询记录-治疗项目记录开始->");
        //要作废账号的咨询记录-治疗项目列表
        sqlSentence.sqlSentence("SELECT * FROM consultation_treat_project WHERE userId = #{m.delUserId} AND isDel = #{m.isDel}", sqlMap);
        List<ConsultationTreatProject> consultationTreatProjectList = consultationTreatProjectMapper.selectList(sqlSentence);
        if (consultationTreatProjectList != null && consultationTreatProjectList.size() > 0) {
            logger.info("<-当前作废账号存在咨询记录-治疗项目记录->");
            UserMergeLogItem dUserLog = new UserMergeLogItem();
            dUserLog.setMergeLogId(userMergeLog.getId());
            dUserLog.setMergeLogNo(userMergeLog.getMergeNo());
            dUserLog.setPersistUserId(userMergeLog.getPersistUserId());
            dUserLog.setRepealUserId(userMergeLog.getRepealUserId());

            dUserLog.setIsHaveOther(0);
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_CONSULT);
            dUserLog.setTableName("consultation_treat_project");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
            dUserLog.setBeforeValue(delUser.getId());
            dUserLog.setAfterValue(user.getId());

            for (ConsultationTreatProject record : consultationTreatProjectList) {
                logger.info("当前处理咨询记录-治疗项目记录,标识" + record.getId());
                dUserLog.setSortNum(sortNum);
                dUserLog.setOpContent(JSON.toJSONString(record));

                sqlMap.put("id", record.getId());
                sqlSentence.sqlUpdate(" userId = #{m.userId} WHERE id = #{m.id} ", sqlMap);
                if (consultationTreatProjectMapper.updateWhere(sqlSentence) != 1) {
                    logger.error("合并用户咨询记录-治疗项目记录失败" + JSON.toJSONString(record));
                    dUserLog.setStatus(0);
                    otherService.logAdd(dUserLog);
                    otherService.logStatusUpdate(userMergeLog.getId(),0);
                    throw new PlatTipsException(PlatformCode.ERROR_TIPS, "合并用户咨询记录-治疗项目记录失败!");
                }
                dUserLog.setStatus(1);
                otherService.logAdd(dUserLog);
                sortNum = sortNum + 1;
            }
        }
        logger.info("<-合并用户咨询记录-治疗项目记录结束->");

    }

    /**