finikes alpha 19

src/main/java/com/finikes/oc/management/controller/AuthController.java

@@ -25,9 +25,9 @@ public class AuthController {
 
         ProxyAuthDTO dto = new ProxyAuthDTO();
         if (authorityDAO.haveProxyChoiceAuth(proxyId) > 0) {
-            dto.setHave("true");
+            dto.setHave(true);
         } else {
-            dto.setHave("false");
+            dto.setHave(false);
         }
 
         return new BaseDTO().setContent(dto);

src/main/java/com/finikes/oc/management/dto/HouseInfoDTO.java

@@ -3,7 +3,7 @@ package com.finikes.oc.management.dto;
 public class HouseInfoDTO {
     private String houseId;
     private String houseName;
-    private String enabled;
+    private boolean enabled;
 
     public String getHouseId() {
         return houseId;
@@ -21,11 +21,11 @@ public class HouseInfoDTO {
         this.houseName = houseName;
     }
 
-    public String getEnabled() {
+    public boolean getEnabled() {
         return enabled;
     }
 
-    public void setEnabled(String enabled) {
+    public void setEnabled(boolean enabled) {
         this.enabled = enabled;
     }
 }

src/main/java/com/finikes/oc/management/dto/ProxyAuthDTO.java

@@ -1,13 +1,13 @@
 package com.finikes.oc.management.dto;
 
 public class ProxyAuthDTO {
-    private String have;
+    private boolean have;
 
-    public String getHave() {
+    public boolean getHave() {
         return have;
     }
 
-    public void setHave(String have) {
+    public void setHave(boolean have) {
         this.have = have;
     }
 }

src/main/java/com/finikes/oc/vote/controller/ChoicesController.java

@@ -115,7 +115,7 @@ public class ChoicesController {
         List<Integer> houseIds = houseRelationDAO.findHousesByPassportChoice(Passports.getPassport(request).getId(), voteId);
         for (Integer houseId : houseIds) {
             HouseInfoDTO dto = new HouseInfoDTO();
-            dto.setEnabled("true");
+            dto.setEnabled(false);
             dto.setHouseId(String.valueOf(houseId));
             dto.setHouseName(houses.getHouseFullName(houseDAO.findById(houseId)));
 
@@ -126,7 +126,7 @@ public class ChoicesController {
         houseIds = houseRelationDAO.findHousesByNotPassportChoice(Passports.getPassport(request).getId(), voteId);
         for (Integer houseId : houseIds) {
             HouseInfoDTO dto = new HouseInfoDTO();
-            dto.setEnabled("false");
+            dto.setEnabled(true);
             dto.setHouseId(String.valueOf(houseId));
             dto.setHouseName(houses.getHouseFullName(houseDAO.findById(houseId)));
 

src/main/resources/mapper/ChoiceMapper.xml

@@ -5,8 +5,8 @@
 
     <insert id="insert" useGeneratedKeys="true" keyProperty="id" keyColumn="id"
             parameterType="com.finikes.oc.vote.entity.Choice">
-        INSERT INTO t_choice (option_id, passport_id, choose_time, proxy, assignee_id, house_id)
-        VALUES (#{optionId}, #{passportId}, #{chooseTime}, #{proxy}, #{assigneeId}, #{houseId})
+        INSERT INTO t_choice (option_id, choose_time, proxy, assignee_id, house_id)
+        VALUES (#{optionId}, #{chooseTime}, #{proxy}, #{assigneeId}, #{houseId})
     </insert>
 
     <update id="update" parameterType="com.finikes.oc.vote.entity.Choice">

src/main/resources/mapper/HouseRelationMapper.xml

@@ -53,24 +53,36 @@
     </select>
 
     <select id="findHousesByNotPassportChoice" resultType="java.lang.Integer">
-        SELECT houseId
-        FROM t_house_relation
-        WHERE passportId = #{passportId}
-          AND houseId not IN (
-            SELECT house_id
-            FROM t_choice
-            WHERE option_id IN (SELECT id FROM t_option WHERE vote_id = #{voteId})
-              AND passport_Id = #{passportId})
+        SELECT
+            houseId
+        FROM
+            t_house_relation
+        WHERE
+            passportId = #{passportId}
+          AND houseId NOT IN (
+            SELECT
+                house_id
+            FROM
+                t_choice
+            WHERE
+                option_id IN ( SELECT id FROM t_option WHERE vote_id = #{voteId} )
+              AND house_id IN ( SELECT houseId FROM t_house_relation WHERE passportId = #{passportId} AND state = 1 ))
     </select>
 
     <select id="findHousesByPassportChoice" resultType="java.lang.Integer">
-        SELECT houseId
-        FROM t_house_relation
-        WHERE passportId = #{passportId}
+        SELECT
+            houseId
+        FROM
+            t_house_relation
+        WHERE
+            passportId = #{passportId}
           AND houseId IN (
-            SELECT house_id
-            FROM t_choice
-            WHERE option_id IN (SELECT id FROM t_option WHERE vote_id = #{voteId})
-              AND passport_Id = #{passportId})
+            SELECT
+                house_id
+            FROM
+                t_choice
+            WHERE
+                option_id IN ( SELECT id FROM t_option WHERE vote_id = #{voteId} )
+              AND house_id IN ( SELECT houseId FROM t_house_relation WHERE passportId = #{passportId} AND state = 1 ))
     </select>
 </mapper>