抽奖功能调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/controller/LuckyDrawInfoController.java

@@ -59,12 +59,34 @@ public class LuckyDrawInfoController {
         List<LuckyDrawInfoDto> records = result.getRecords();
         List<LuckyDrawInfoDto> addList = new ArrayList<>();
         records.forEach(re ->{
+            if(re.getLuckyDrawMembersDtos().size()>0){
+                re.setLuckyDrawFlag("1");
+                re.setShowFlag("2");
+            }else{
+                re.setLuckyDrawFlag("0");
+                re.setShowFlag("1");
+            }
             addList.add(re);
+            if(re.getLuckyDrawMembersDtos().size()>0){
+                LuckyDrawInfoDto sh = new LuckyDrawInfoDto();
+                sh.setAwardsName("姓名");
+                sh.setNumber("部门");
+                sh.setPrizeName("手机号");
+                sh.setShowFlag("1");
+                sh.setLuckyDrawFlag("1");
+                addList.add(sh);
+            }else{
+                re.setLuckyDrawFlag("1");
+                re.setShowFlag("2");
+            }
+
             re.getLuckyDrawMembersDtos().forEach(mem->{
                 LuckyDrawInfoDto l = new LuckyDrawInfoDto();
                 l.setAwardsName(mem.getName());
                 l.setNumber(mem.getOfficeName());
                 l.setPrizeName(mem.getPhone());
+                l.setShowFlag("0");
+                l.setLuckyDrawFlag("1");
                 addList.add(l);
             });
         });

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/controller/LuckyDrawMembersController.java

@@ -46,11 +46,11 @@ public class LuckyDrawMembersController {
     public ResponseEntity<String> save(@RequestBody LuckyDrawMembersDto dto) throws Exception{
         String s = membersService.save(dto);
         if (s == "1") {
-            return ResponseUtil.newInstance().error ("名字重复，请重新修改");
+            return ResponseEntity.badRequest().body ("名字重复，请重新修改");
         }else if (s == "2"){
-            return ResponseUtil.newInstance().error ("新增失败");
+            return ResponseEntity.badRequest().body ("新增失败");
         }
-        return ResponseUtil.newInstance().ok ("操作成功");
+        return ResponseEntity.ok ("操作成功");
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/controller/app/AppLuckyDrawInfoController.java

@@ -0,0 +1,23 @@
+/**
+ * Copyright © 2021-2025 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.test.luckyDraw.controller.app;
+
+import com.jeeplus.test.luckyDraw.controller.LuckyDrawInfoController;
+import com.jeeplus.test.mobile.controller.TestMobileController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * App测试移动表单Controller
+ * @author 刘高峰
+ * @version 2022-04-13
+ */
+
+@Api(tags ="测试移动表单")
+@RestController
+@RequestMapping(value = "/app/luckyDraw/info")
+public class AppLuckyDrawInfoController extends LuckyDrawInfoController {
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/mapper/LuckyDrawMembersMapper.java

@@ -20,7 +20,7 @@ public interface LuckyDrawMembersMapper extends BaseMapper<LuckyDrawMembers> {
 
     IPage<LuckyDrawMembersDto> findList(Page<LuckyDrawMembersDto> page, @Param(Constants.WRAPPER) QueryWrapper<LuckyDrawMembersDto> queryWrapper);
 
-    LuckyDrawMembersDto getByName(@Param("id")String id);
+    Integer getByName(LuckyDrawMembersDto dto);
 
     int getByNameAndId(String name, String eventId);
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/mapper/xml/LuckyDrawMembersMapper.xml

@@ -17,8 +17,14 @@
 			${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
     </select>
-    <select id="getByName" resultType="com.jeeplus.test.luckyDraw.service.dto.LuckyDrawMembersDto">
-		select * from lucky_draw_members where id = #{id}
+    <select id="getByName" resultType="java.lang.Integer">
+		select count(1) from lucky_draw_members
+		<where>
+			name = #{name}
+			<if test="id != null and id != ''">
+				and id != #{id}
+			</if>
+		</where>
 	</select>
 	<select id="getByNameAndId" resultType="java.lang.Integer">
 		select count(*) from lucky_draw_members where name = #{name} and event_id = #{eventId}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/service/LuckyDrawMembersService.java

@@ -57,19 +57,12 @@ public class LuckyDrawMembersService extends ServiceImpl<LuckyDrawMembersMapper,
         members.setUpdateDate(new Date());
         members.setDelFlag(0);
         //插入前先看库中是否有对应的用户名称
-        //插入前先看库中是否有对应的用户名称
-        LuckyDrawMembersDto drawMembersDto = membersMapper.getByName(dto.getId());
-        if (drawMembersDto.getName().equals(dto.getName())){
-            membersMapper.updateById(members);
+        Integer drawMembersCount = membersMapper.getByName(dto);
+        if (drawMembersCount == 0){
+            membersMapper.insert(members);
         }else {
-            int i = membersMapper.getByNameAndId(dto.getName(),dto.getEventId());
-            if (i>0){
-                return "1";
-            } else {
-                membersMapper.updateById(members);
-            }
+            return "1";
         }
-        membersMapper.insert(members);
         return id;
     }
 
@@ -80,16 +73,11 @@ public class LuckyDrawMembersService extends ServiceImpl<LuckyDrawMembersMapper,
         members.setUpdateBy(userDTO.getId());
         members.setUpdateDate(new Date());
         //插入前先看库中是否有对应的用户名称
-        LuckyDrawMembersDto drawMembersDto = membersMapper.getByName(dto.getId());
-        if (drawMembersDto.getName().equals(dto.getName())){
+        Integer drawMembersCount = membersMapper.getByName(dto);
+        if (drawMembersCount == 0){
             membersMapper.updateById(members);
         }else {
-            int i = membersMapper.getByNameAndId(dto.getName(),dto.getEventId());
-            if (i>0){
-                return "1";
-            } else {
-                membersMapper.updateById(members);
-            }
+            return "1";
         }
 
         return dto.getId();

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/service/dto/LuckyDrawInfoDto.java

@@ -23,6 +23,7 @@ public class LuckyDrawInfoDto extends BaseDTO implements Serializable {
     private String prizeName; //奖品名称
     private String number; //奖品数量
     private String luckyDrawFlag; //抽奖状态
+    private String showFlag; //展示状态
     /**
      * 奖项
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/mobile/controller/TestMobileController.java

@@ -45,6 +45,8 @@ public class TestMobileController {
 	@GetMapping("list")
 	public ResponseEntity<IPage<TestMobileDTO>> list(TestMobileDTO testMobileDTO, Page<TestMobileDTO> page) throws Exception {
 		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (testMobileDTO, TestMobileDTO.class);
+		page.setSize (-1);
+		page.setCurrent (0);
 		IPage<TestMobileDTO> result = testMobileService.findPage (page, queryWrapper);
 		return ResponseEntity.ok (result);
 	}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -60,6 +60,7 @@
 
     <select id="findPageList" resultType="com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo">
         SELECT
+        distinct
            a.id,
            b.name AS create_by,
            a.create_date,