From cc9d3d353ca6ff265780c8ebe4c3a9b24f1d7862 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Thu, 25 Mar 2021 11:27:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sino-activity/pom.xml                              |  6 ------
 .../controller/DrawPrizeInfoController.java        |  2 +-
 .../mapper/activity/DrawPrizeInfoMapper.xml        | 14 +++++++-------
 .../activity/{info => prizeInfo}/add.html          |  0
 .../activity/{info => prizeInfo}/edit.html         |  0
 .../activity/{info => prizeInfo}/info.html         |  0
 6 files changed, 8 insertions(+), 14 deletions(-)
 rename sino-activity/src/main/resources/templates/activity/{info => prizeInfo}/add.html (100%)
 rename sino-activity/src/main/resources/templates/activity/{info => prizeInfo}/edit.html (100%)
 rename sino-activity/src/main/resources/templates/activity/{info => prizeInfo}/info.html (100%)

diff --git a/sino-activity/pom.xml b/sino-activity/pom.xml
index 2247d48fb..5571cf257 100644
--- a/sino-activity/pom.xml
+++ b/sino-activity/pom.xml
@@ -17,12 +17,6 @@
 
     <dependencies>
 
-        <!--velocity代码生成使用模板 -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-        </dependency>
-
         <!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>
diff --git a/sino-activity/src/main/java/cn/com/sinosoft/activity/controller/DrawPrizeInfoController.java b/sino-activity/src/main/java/cn/com/sinosoft/activity/controller/DrawPrizeInfoController.java
index aeee24c9b..adf2c8eb6 100644
--- a/sino-activity/src/main/java/cn/com/sinosoft/activity/controller/DrawPrizeInfoController.java
+++ b/sino-activity/src/main/java/cn/com/sinosoft/activity/controller/DrawPrizeInfoController.java
@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/activity/info")
 public class DrawPrizeInfoController extends BaseController
 {
-    private String prefix = "activity/info";
+    private String prefix = "activity/prizeInfo";
 
     @Autowired
     private IDrawPrizeInfoService drawPrizeInfoService;
diff --git a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml
index 72a221efd..3906e103a 100644
--- a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.sinosoft.activity.mapper.DrawPrizeInfoMapper">
     
-    <resultMap type="DrawPrizeInfo" id="DrawPrizeInfoResult">
+    <resultMap type="cn.com.sinosoft.activity.domain.DrawPrizeInfo" id="DrawPrizeInfoResult">
         <result property="PRIZEID"    column="PRIZEID"    />
         <result property="PRIZECODE"    column="PRIZECODE"    />
         <result property="PRIZENAME"    column="PRIZENAME"    />
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select PRIZEID, PRIZECODE, PRIZENAME, PRIZETYPE, PRIZEVALUE, COMMENTS, CREATETIMESTAMP, LASTUPDATETIMESTAMP, STATUS, INTEGRALPROJECTCODE from draw_prize_info
     </sql>
 
-    <select id="selectDrawPrizeInfoList" parameterType="DrawPrizeInfo" resultMap="DrawPrizeInfoResult">
+    <select id="selectDrawPrizeInfoList" parameterType="cn.com.sinosoft.activity.domain.DrawPrizeInfo" resultMap="DrawPrizeInfoResult">
         <include refid="selectDrawPrizeInfoVo"/>
         <where>  
             <if test="PRIZECODE != null  and PRIZECODE != ''"> and PRIZECODE = #{PRIZECODE}</if>
@@ -36,12 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectDrawPrizeInfoById" parameterType="String" resultMap="DrawPrizeInfoResult">
+    <select id="selectDrawPrizeInfoById" parameterType="java.lang.String" resultMap="DrawPrizeInfoResult">
         <include refid="selectDrawPrizeInfoVo"/>
         where PRIZEID = #{PRIZEID}
     </select>
         
-    <insert id="insertDrawPrizeInfo" parameterType="DrawPrizeInfo">
+    <insert id="insertDrawPrizeInfo" parameterType="cn.com.sinosoft.activity.domain.DrawPrizeInfo">
         insert into draw_prize_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="PRIZEID != null">PRIZEID,</if>
@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateDrawPrizeInfo" parameterType="DrawPrizeInfo">
+    <update id="updateDrawPrizeInfo" parameterType="cn.com.sinosoft.activity.domain.DrawPrizeInfo">
         update draw_prize_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="PRIZECODE != null">PRIZECODE = #{PRIZECODE},</if>
@@ -85,11 +85,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where PRIZEID = #{PRIZEID}
     </update>
 
-    <delete id="deleteDrawPrizeInfoById" parameterType="String">
+    <delete id="deleteDrawPrizeInfoById" parameterType="java.lang.String">
         delete from draw_prize_info where PRIZEID = #{PRIZEID}
     </delete>
 
-    <delete id="deleteDrawPrizeInfoByIds" parameterType="String">
+    <delete id="deleteDrawPrizeInfoByIds" parameterType="java.lang.String">
         delete from draw_prize_info where PRIZEID in 
         <foreach item="PRIZEID" collection="array" open="(" separator="," close=")">
             #{PRIZEID}
diff --git a/sino-activity/src/main/resources/templates/activity/info/add.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/add.html
similarity index 100%
rename from sino-activity/src/main/resources/templates/activity/info/add.html
rename to sino-activity/src/main/resources/templates/activity/prizeInfo/add.html
diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/edit.html
similarity index 100%
rename from sino-activity/src/main/resources/templates/activity/info/edit.html
rename to sino-activity/src/main/resources/templates/activity/prizeInfo/edit.html
diff --git a/sino-activity/src/main/resources/templates/activity/info/info.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
similarity index 100%
rename from sino-activity/src/main/resources/templates/activity/info/info.html
rename to sino-activity/src/main/resources/templates/activity/prizeInfo/info.html