Andru
2024-01-05 f879940afe43a46be42be1511a8460b25c035671
项目转增凭证
2个文件已修改
20 ■■■■ 已修改文件
phi_platform_common/src/main/resources/mapper/platform/UserProjectTurnMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/controller/user/UserProjectController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/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);
        }