5月份测评

src/main/java/com/ygj/yuemum/controller/promotion/PromotionTestResultShowController.java

@@ -0,0 +1,23 @@
+package com.ygj.yuemum.controller.promotion;
+
+
+import com.ygj.yuemum.domain.promotion.PromotionTestResultShow;
+import com.ygj.yuemum.service.promotion.PromotionTestResultShowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class PromotionTestResultShowController {
+
+    @Autowired
+    private PromotionTestResultShowService promotionTestResultShowService;
+
+    @GetMapping("/getPromotionTestResultShowByPrxID")
+    public List<PromotionTestResultShow> getPromotionTestResultShowByPrxID(@RequestParam("prx_id") Integer prx_id){
+        return promotionTestResultShowService.getPromotionTestResultShowByPrxID(prx_id);
+    }
+}

src/main/java/com/ygj/yuemum/controller/promotion/PromotionTestUserScoreController.java

@@ -13,9 +13,9 @@ public class PromotionTestUserScoreController {
     @Autowired
     private PromotionTestUserScoreService promotionTestUserScoreService;
 
-    @GetMapping("/getPromotionTestUserScoreByOpenID")
-    public PromotionTestUserScore getPromotionTestResultByPtID(@RequestParam("pc_openid") String pc_openid){
-        return promotionTestUserScoreService.getPromotionTestUserScoreByOpenID(pc_openid);
+    @PostMapping("/getPromotionTestUserScoreByOpenID")
+    public PromotionTestUserScore getPromotionTestResultByPtID(@ModelAttribute PromotionTestUserScore promotionTestUserScore){
+        return promotionTestUserScoreService.getPromotionTestUserScoreByOpenID(promotionTestUserScore);
     }
 
     @PostMapping("/insertPromotionTestUserScore")

src/main/java/com/ygj/yuemum/dao/promotion/PromotionDCUserInfoDao.java

@@ -9,7 +9,7 @@ import java.util.List;
 public interface PromotionDCUserInfoDao {
 
     int insertPromotionDCUserInfo(PromotionDCUserInfo promotionDCUserInfo);
-    int getCheckDCInfo(String pd_phone);
+    int getCheckDCInfo(PromotionDCUserInfo promotionDCUserInfo);
 
     List<PromotionDCUserInfo> getPromotionDCUserInfos(PromotionDCUserInfo promotionDCUserInfo);
 

src/main/java/com/ygj/yuemum/dao/promotion/PromotionTestResultShowDao.java

@@ -0,0 +1,12 @@
+package com.ygj.yuemum.dao.promotion;
+
+import com.ygj.yuemum.domain.promotion.PromotionTestResultShow;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PromotionTestResultShowDao {
+
+    List<PromotionTestResultShow> getPromotionTestResultShowByPrxID(Integer prx_id);
+}

src/main/java/com/ygj/yuemum/dao/promotion/PromotionTestUserScoreDao.java

@@ -7,5 +7,5 @@ import org.springframework.stereotype.Repository;
 public interface PromotionTestUserScoreDao {
 
     int insertPromotionTestUserScore(PromotionTestUserScore promotionTestUserScore);
-    PromotionTestUserScore getPromotionTestUserScoreByOpenID(String pc_openid);
+    PromotionTestUserScore getPromotionTestUserScoreByOpenID(PromotionTestUserScore promotionTestUserScore);
 }

src/main/java/com/ygj/yuemum/domain/promotion/PromotionTest.java

@@ -7,6 +7,16 @@ public class PromotionTest {
     private Integer pt_seq;
     private String pt_img_path;
     private String pt_tips;
+    private Integer pt_type;
+
+
+    public Integer getPt_type() {
+        return pt_type;
+    }
+
+    public void setPt_type(Integer pt_type) {
+        this.pt_type = pt_type;
+    }
 
     public String getPt_tips() {
         return pt_tips;

src/main/java/com/ygj/yuemum/domain/promotion/PromotionTestResultShow.java

@@ -0,0 +1,58 @@
+package com.ygj.yuemum.domain.promotion;
+
+public class PromotionTestResultShow {
+    private Integer id;
+    private Integer prx_id;
+    private Integer ptrs_greater;
+    private Integer ptrs_less;
+    private String ptrs_img;
+    private String ptrs_img_name;
+
+    public String getPtrs_img_name() {
+        return ptrs_img_name;
+    }
+
+    public void setPtrs_img_name(String ptrs_img_name) {
+        this.ptrs_img_name = ptrs_img_name;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getPrx_id() {
+        return prx_id;
+    }
+
+    public void setPrx_id(Integer prx_id) {
+        this.prx_id = prx_id;
+    }
+
+    public Integer getPtrs_greater() {
+        return ptrs_greater;
+    }
+
+    public void setPtrs_greater(Integer ptrs_greater) {
+        this.ptrs_greater = ptrs_greater;
+    }
+
+    public Integer getPtrs_less() {
+        return ptrs_less;
+    }
+
+    public void setPtrs_less(Integer ptrs_less) {
+        this.ptrs_less = ptrs_less;
+    }
+
+    public String getPtrs_img() {
+        return ptrs_img;
+    }
+
+    public void setPtrs_img(String ptrs_img) {
+        this.ptrs_img = ptrs_img;
+    }
+}

src/main/java/com/ygj/yuemum/domain/promotion/PromotionTestUserScore.java

@@ -5,6 +5,15 @@ public class PromotionTestUserScore {
     private String pc_openid;
     private String pc_date;
     private Integer pc_score;
+    private Integer pc_prx_id;
+
+    public Integer getPc_prx_id() {
+        return pc_prx_id;
+    }
+
+    public void setPc_prx_id(Integer pc_prx_id) {
+        this.pc_prx_id = pc_prx_id;
+    }
 
     public Integer getId() {
         return id;

src/main/java/com/ygj/yuemum/service/global/CreatePOPService.java

@@ -48,14 +48,15 @@ public class CreatePOPService {
         g.drawImage(ImageIO.read(qrCodeImg), 100, iconHeight-300, 200, 200, null);
 
         Graphics2D g2 = (Graphics2D) g;
+        Graphics2D g3 = (Graphics2D) g;
         int scorex = 0;
         int fenx = 0;
         if(score == 100) {
-            scorex = 730;
-            fenx = 920;
-        } else {
-            scorex = 780;
+            scorex = 700;
             fenx = 890;
+        } else {
+            scorex = 750;
+            fenx = 860;
         }
         Font rewardFirstFont = new Font("DejaVuLGCSansMono", Font.BOLD, 130);
         AffineTransform affineTransform = new AffineTransform();
@@ -65,18 +66,19 @@ public class CreatePOPService {
         g2.setFont(rotatedFont);
         g2.drawString(String.valueOf(score),scorex,50);
 
-        Font rewardLastFont = new Font("DejaVuLGCSansMono", Font.CENTER_BASELINE, 70);
+        Font rewardLastFont = new Font("DejaVuLGCSansMono", Font.CENTER_BASELINE, 80);
         AffineTransform affineTransform2 = new AffineTransform();
         affineTransform2.rotate(Math.toRadians(15), 0, 0);
         Font rotatedFont2 = rewardLastFont.deriveFont(affineTransform);
-        g2.setFont(rotatedFont2);
-        g2.setColor(Color.decode("#F50000"));
-        g2.drawString("分",fenx,280);
+        g3.setFont(rotatedFont2);
+        g3.setColor(Color.decode("#F50000"));
+        g3.drawString("分",fenx,280);
 
 
 
         g.dispose();
         g2.dispose();
+        g3.dispose();
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         ImageIO.write(bufferedImage, "jpg", os);
         //保存为图片文件

src/main/java/com/ygj/yuemum/service/promotion/PromotionDCUserInfoService.java

@@ -20,7 +20,7 @@ public class PromotionDCUserInfoService {
     public int insertPromotionDCUserInfo(PromotionDCUserInfo promotionDCUserInfo) {
         // 判断是否领取
         try {
-            int temp = promotionDCUserInfoDao.getCheckDCInfo(promotionDCUserInfo.getPd_phone());
+            int temp = promotionDCUserInfoDao.getCheckDCInfo(promotionDCUserInfo);
             if(temp > 0) {
                 return 99;
             }

src/main/java/com/ygj/yuemum/service/promotion/PromotionTestResultShowService.java

@@ -0,0 +1,19 @@
+package com.ygj.yuemum.service.promotion;
+
+import com.ygj.yuemum.dao.promotion.PromotionTestResultShowDao;
+import com.ygj.yuemum.domain.promotion.PromotionTestResultShow;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PromotionTestResultShowService {
+
+    @Autowired
+    private PromotionTestResultShowDao promotionTestResultShowDao;
+    public List<PromotionTestResultShow> getPromotionTestResultShowByPrxID(Integer prx_id){
+        return promotionTestResultShowDao.getPromotionTestResultShowByPrxID(prx_id);
+    }
+
+}

src/main/java/com/ygj/yuemum/service/promotion/PromotionTestUserScoreService.java

@@ -13,8 +13,8 @@ public class PromotionTestUserScoreService {
 
     @Autowired
     private PromotionTestUserScoreDao promotionTestUserScoreDao;
-    public PromotionTestUserScore getPromotionTestUserScoreByOpenID(String pc_openid){
-        return promotionTestUserScoreDao.getPromotionTestUserScoreByOpenID(pc_openid);
+    public PromotionTestUserScore getPromotionTestUserScoreByOpenID(PromotionTestUserScore promotionTestUserScore){
+        return promotionTestUserScoreDao.getPromotionTestUserScoreByOpenID(promotionTestUserScore);
     }
     public int insertPromotionTestUserScore(PromotionTestUserScore promotionTestUserScore) {
         Date date = new Date();

src/main/java/com/ygj/yuemum/shiro/ShiroConfig.java

@@ -95,6 +95,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/CreateTestShare", "anon");
         filterChainDefinitionMap.put("/getPromotionDCByID", "anon");
         filterChainDefinitionMap.put("/getPromotionTestUserScoreByOpenID", "anon");
+        filterChainDefinitionMap.put("/getPromotionTestResultShowByPrxID", "anon");
         //萌动开放权限
         filterChainDefinitionMap.put("/getNewUserCoupon", "anon");
         filterChainDefinitionMap.put("/getConsultTaskCoupon", "anon");

src/main/resources/mybatis/mapper/promotion/PromotionChannelLogMapper.xml

@@ -32,6 +32,12 @@
             <if test="pcl_channel_code != null and pcl_channel_code != ''">
                 and pcl_channel_code = #{pcl_channel_code,jdbcType=VARCHAR}
             </if>
+            <if test="pcl_startdate != null and pcl_startdate != ''">
+                and DATE_FORMAT(pcl_date,'%Y-%m-%d') &gt;= DATE_FORMAT(#{pcl_startdate,jdbcType=DATE},'%Y-%m-%d')
+            </if>
+            <if test="pcl_enddate != null and pcl_enddate != ''">
+                and DATE_FORMAT(pcl_date,'%Y-%m-%d') &lt;= DATE_FORMAT(#{pcl_enddate,jdbcType=DATE},'%Y-%m-%d')
+            </if>
         GROUP BY
             pcl_channel_code
         ORDER BY

src/main/resources/mybatis/mapper/promotion/PromotionDCUserInfoMapper.xml

@@ -13,11 +13,18 @@
     </resultMap>
 
 
-    <select id="getCheckDCInfo" resultType="java.lang.Integer" parameterType="java.lang.String" >
+    <select id="getCheckDCInfo" resultType="java.lang.Integer" parameterType="com.ygj.yuemum.domain.promotion.PromotionDCUserInfo" >
         select
         count(1)
         from promotion_dc_userinfo
-        where pd_phone = #{pd_phone,jdbcType=VARCHAR}
+        where
+        1=1
+        <if test="pd_phone != null and pd_phone != ''">
+            and pd_phone = #{pd_phone,jdbcType=VARCHAR}
+        </if>
+        <if test="pd_prom_id != null and pd_prom_id != ''">
+            and pd_prom_id = #{pd_prom_id,jdbcType=INTEGER}
+        </if>
     </select>
 
     <!-- 插入一条培训信息 -->
@@ -42,6 +49,7 @@
             <if test="pd_dc_phone != null" >
                 pd_dc_phone
             </if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
             <if test="pd_phone != null" >
@@ -62,6 +70,7 @@
             <if test="pd_dc_phone != null" >
                 #{pd_dc_phone,jdbcType=VARCHAR}
             </if>
+
         </trim>
     </insert>
 
@@ -73,7 +82,7 @@
         fgetpromotiondcname(pd_prom_id) pd_prom_name,
         fgetbranches_name(pd_city) pd_cityname,
         pd_dc_phone,
-        fgetdcconsultantname(pd_phone) consultname
+        fgetdcconsultantname(pd_phone,pd_prom_id) consultname
         from promotion_dc_userinfo
         where 1=1
         <if test="pd_phone != null and pd_phone != ''">

src/main/resources/mybatis/mapper/promotion/PromotionTestMapper.xml

@@ -9,6 +9,7 @@
         <result column="pt_seq" property="pt_seq" jdbcType="INTEGER" />
         <result column="pt_img_path" property="pt_img_path" jdbcType="VARCHAR" />
         <result column="pt_tips" property="pt_tips" jdbcType="VARCHAR" />
+        <result column="pt_type" property="pt_type" jdbcType="INTEGER" />
     </resultMap>
 
     <!--获取所有数据-->

src/main/resources/mybatis/mapper/promotion/PromotionTestResultShowMapper.xml

@@ -0,0 +1,23 @@
+<?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" >
+<mapper namespace="com.ygj.yuemum.dao.promotion.PromotionTestResultShowDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.promotion.PromotionTestResultShow" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="prx_id" property="prx_id" jdbcType="INTEGER" />
+        <result column="ptrs_greater" property="ptrs_greater" jdbcType="INTEGER" />
+        <result column="ptrs_less" property="ptrs_less" jdbcType="INTEGER" />
+        <result column="ptrs_img" property="ptrs_img" jdbcType="VARCHAR" />
+        <result column="ptrs_img_name" property="ptrs_img_name" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getPromotionTestResultShowByPrxID" resultType="com.ygj.yuemum.domain.promotion.PromotionTestResultShow" parameterType="java.lang.Integer" >
+        select
+        *
+        from promotion_test_result_show
+        where
+         prx_id = #{prx_id,jdbcType=INTEGER}
+    </select>
+
+</mapper>

src/main/resources/mybatis/mapper/promotion/PromotionTestUserScoreMapper.xml

@@ -7,15 +7,22 @@
         <result column="pc_openid" property="pc_openid" jdbcType="VARCHAR" />
         <result column="pc_date" property="pc_date" jdbcType="DATE" />
         <result column="pc_score" property="pc_score" jdbcType="INTEGER" />
+        <result column="pc_prx_id" property="pc_prx_id" jdbcType="INTEGER" />
     </resultMap>
 
     <!--获取所有数据-->
-    <select id="getPromotionTestUserScoreByOpenID" resultType="com.ygj.yuemum.domain.promotion.PromotionTestUserScore" parameterType="java.lang.String" >
+    <select id="getPromotionTestUserScoreByOpenID" resultType="com.ygj.yuemum.domain.promotion.PromotionTestUserScore" parameterType="com.ygj.yuemum.domain.promotion.PromotionTestUserScore" >
         select
         *
         from promotion_test_user_score
         where
-         pc_openid = #{pc_openid,jdbcType=VARCHAR }
+        1=1
+        <if test="pc_openid != null and pc_openid != ''">
+            and pc_openid = #{pc_openid,jdbcType=VARCHAR}
+        </if>
+        <if test="pc_prx_id != null and pc_prx_id != ''">
+            and pc_prx_id = #{pc_prx_id,jdbcType=INTEGER}
+        </if>
         order by 1 desc limit 1
     </select>
     <insert id="insertPromotionTestUserScore" parameterType="com.ygj.yuemum.domain.promotion.PromotionTestUserScore" >
@@ -28,7 +35,10 @@
                 pc_date,
             </if>
             <if test="pc_score != null" >
-                pc_score
+                pc_score,
+            </if>
+            <if test="pc_prx_id != null" >
+                pc_prx_id
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -39,7 +49,10 @@
                 #{pc_date,jdbcType=DATE},
             </if>
             <if test="pc_score != null" >
-                #{pc_score,jdbcType=INTEGER}
+                #{pc_score,jdbcType=INTEGER},
+            </if>
+            <if test="pc_prx_id != null" >
+                #{pc_prx_id,jdbcType=INTEGER}
             </if>
         </trim>
     </insert>