java110 2 年 前
コミット
803afe6803
共有16 個のファイルを変更した815 個の追加224 個の削除を含む
  1. 59 28
      java110-bean/src/main/java/com/java110/dto/user/UserQuestionAnswerDto.java
  2. 6 123
      java110-bean/src/main/java/com/java110/dto/user/UserQuestionAnswerValueDto.java
  3. 89 0
      java110-bean/src/main/java/com/java110/po/userQuestionAnswerValue/UserQuestionAnswerValuePo.java
  4. 124 0
      java110-db/src/main/resources/mapper/user/UserQuestionAnswerValueV1ServiceDaoImplMapper.xml
  5. 68 0
      java110-interface/src/main/java/com/java110/intf/user/IUserQuestionAnswerValueV1InnerServiceSMO.java
  6. 6 6
      service-report/src/main/java/com/java110/report/api/ReportQuestionAnswerApi.java
  7. 2 2
      service-report/src/main/java/com/java110/report/bmo/reportQuestionAnswer/impl/GetReportQuestionAnswerBMOImpl.java
  8. 1 2
      service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
  9. 126 0
      service-user/src/main/java/com/java110/user/cmd/question/ListUserQuestionAnswerCmd.java
  10. 14 13
      service-user/src/main/java/com/java110/user/cmd/userQuestionAnswer/DeleteUserQuestionAnswerCmd.java
  11. 16 16
      service-user/src/main/java/com/java110/user/cmd/userQuestionAnswer/ListUserQuestionAnswerCmd.java
  12. 18 21
      service-user/src/main/java/com/java110/user/cmd/userQuestionAnswer/SaveUserQuestionAnswerCmd.java
  13. 14 13
      service-user/src/main/java/com/java110/user/cmd/userQuestionAnswer/UpdateUserQuestionAnswerCmd.java
  14. 73 0
      service-user/src/main/java/com/java110/user/dao/IUserQuestionAnswerValueV1ServiceDao.java
  15. 112 0
      service-user/src/main/java/com/java110/user/dao/impl/UserQuestionAnswerValueV1ServiceDaoImpl.java
  16. 87 0
      service-user/src/main/java/com/java110/user/smo/impl/UserQuestionAnswerValueV1InnerServiceSMOImpl.java

+ 59 - 28
java110-bean/src/main/java/com/java110/dto/user/UserQuestionAnswerDto.java

@@ -1,8 +1,10 @@
 package com.java110.dto.user;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -17,80 +19,101 @@ public class UserQuestionAnswerDto extends PageDto implements Serializable {
     public static final String STATE_WAIT = "1201";//1201 待处理 1202 完成
     public static final String STATE_FINISH = "1202";//1201 待处理 1202 完成
     private String score;
-private String ownerName;
-private String link;
-private String userQaId;
-private String state;
-private String ownerId;
-private String communityId;
-private String roomId;
-private String roomName;
-private String qaId;
+    private String ownerName;
+    private String link;
+    private String userQaId;
+    private String state;
+    private String ownerId;
+    private String communityId;
+    private String roomId;
+    private String roomName;
+    private String qaId;
 
 
     private Date createTime;
 
     private String statusCd = "0";
 
+    private List<UserQuestionAnswerValueDto> values;
+
 
     public String getScore() {
         return score;
     }
-public void setScore(String score) {
+
+    public void setScore(String score) {
         this.score = score;
     }
-public String getOwnerName() {
+
+    public String getOwnerName() {
         return ownerName;
     }
-public void setOwnerName(String ownerName) {
+
+    public void setOwnerName(String ownerName) {
         this.ownerName = ownerName;
     }
-public String getLink() {
+
+    public String getLink() {
         return link;
     }
-public void setLink(String link) {
+
+    public void setLink(String link) {
         this.link = link;
     }
-public String getUserQaId() {
+
+    public String getUserQaId() {
         return userQaId;
     }
-public void setUserQaId(String userQaId) {
+
+    public void setUserQaId(String userQaId) {
         this.userQaId = userQaId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getOwnerId() {
+
+    public String getOwnerId() {
         return ownerId;
     }
-public void setOwnerId(String ownerId) {
+
+    public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getRoomId() {
+
+    public String getRoomId() {
         return roomId;
     }
-public void setRoomId(String roomId) {
+
+    public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
-public String getRoomName() {
+
+    public String getRoomName() {
         return roomName;
     }
-public void setRoomName(String roomName) {
+
+    public void setRoomName(String roomName) {
         this.roomName = roomName;
     }
-public String getQaId() {
+
+    public String getQaId() {
         return qaId;
     }
-public void setQaId(String qaId) {
+
+    public void setQaId(String qaId) {
         this.qaId = qaId;
     }
 
@@ -110,4 +133,12 @@ public void setQaId(String qaId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public List<UserQuestionAnswerValueDto> getValues() {
+        return values;
+    }
+
+    public void setValues(List<UserQuestionAnswerValueDto> values) {
+        this.values = values;
+    }
 }

+ 6 - 123
java110-bean/src/main/java/com/java110/dto/user/UserQuestionAnswerValueDto.java

@@ -7,7 +7,7 @@ import java.util.Date;
 
 /**
  * @ClassName FloorDto
- * @Description 卷答案数据层封装
+ * @Description 卷答案数据层封装
  * @Author wuxw
  * @Date 2019/4/24 8:52
  * @Version 1.0
@@ -15,26 +15,13 @@ import java.util.Date;
  **/
 public class UserQuestionAnswerValueDto extends PageDto implements Serializable {
 
-    private String score;
     private String valueId;
     private String titleId;
-    private String answerType;
-    private String objId;
-    private String[] objIds;
     private String userQaId;
     private String valueContent;
-    private String personId;
-    private String objType;
+    private String communityId;
     private String userTitleId;
     private String qaId;
-    private String qaTypeName;
-    private String userName;
-    private String qaName;
-    private String qaTitle;
-    private String qaValue;
-    private String qaType;
-    private String startTime;
-    private String endTime;
 
 
     private Date createTime;
@@ -42,14 +29,6 @@ public class UserQuestionAnswerValueDto extends PageDto implements Serializable
     private String statusCd = "0";
 
 
-    public String getScore() {
-        return score;
-    }
-
-    public void setScore(String score) {
-        this.score = score;
-    }
-
     public String getValueId() {
         return valueId;
     }
@@ -66,22 +45,6 @@ public class UserQuestionAnswerValueDto extends PageDto implements Serializable
         this.titleId = titleId;
     }
 
-    public String getAnswerType() {
-        return answerType;
-    }
-
-    public void setAnswerType(String answerType) {
-        this.answerType = answerType;
-    }
-
-    public String getObjId() {
-        return objId;
-    }
-
-    public void setObjId(String objId) {
-        this.objId = objId;
-    }
-
     public String getUserQaId() {
         return userQaId;
     }
@@ -98,20 +61,12 @@ public class UserQuestionAnswerValueDto extends PageDto implements Serializable
         this.valueContent = valueContent;
     }
 
-    public String getPersonId() {
-        return personId;
-    }
-
-    public void setPersonId(String personId) {
-        this.personId = personId;
-    }
-
-    public String getObjType() {
-        return objType;
+    public String getCommunityId() {
+        return communityId;
     }
 
-    public void setObjType(String objType) {
-        this.objType = objType;
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
     }
 
     public String getUserTitleId() {
@@ -146,76 +101,4 @@ public class UserQuestionAnswerValueDto extends PageDto implements Serializable
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-
-    public String getQaTypeName() {
-        return qaTypeName;
-    }
-
-    public void setQaTypeName(String qaTypeName) {
-        this.qaTypeName = qaTypeName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getQaName() {
-        return qaName;
-    }
-
-    public void setQaName(String qaName) {
-        this.qaName = qaName;
-    }
-
-    public String getQaTitle() {
-        return qaTitle;
-    }
-
-    public void setQaTitle(String qaTitle) {
-        this.qaTitle = qaTitle;
-    }
-
-    public String getQaValue() {
-        return qaValue;
-    }
-
-    public void setQaValue(String qaValue) {
-        this.qaValue = qaValue;
-    }
-
-    public String getQaType() {
-        return qaType;
-    }
-
-    public void setQaType(String qaType) {
-        this.qaType = qaType;
-    }
-
-    public String[] getObjIds() {
-        return objIds;
-    }
-
-    public void setObjIds(String[] objIds) {
-        this.objIds = objIds;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
 }

+ 89 - 0
java110-bean/src/main/java/com/java110/po/userQuestionAnswerValue/UserQuestionAnswerValuePo.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.po.userQuestionAnswerValue;
+
+import java.io.Serializable;
+import java.util.Date;
+/**
+ * 类表述: Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
+ * add by 吴学文 at 2023-07-14 13:27:51 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+public class UserQuestionAnswerValuePo implements Serializable {
+
+    private String valueId;
+private String titleId;
+private String userQaId;
+private String valueContent;
+private String statusCd = "0";
+private String communityId;
+private String userTitleId;
+private String qaId;
+public String getValueId() {
+        return valueId;
+    }
+public void setValueId(String valueId) {
+        this.valueId = valueId;
+    }
+public String getTitleId() {
+        return titleId;
+    }
+public void setTitleId(String titleId) {
+        this.titleId = titleId;
+    }
+public String getUserQaId() {
+        return userQaId;
+    }
+public void setUserQaId(String userQaId) {
+        this.userQaId = userQaId;
+    }
+public String getValueContent() {
+        return valueContent;
+    }
+public void setValueContent(String valueContent) {
+        this.valueContent = valueContent;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+public String getUserTitleId() {
+        return userTitleId;
+    }
+public void setUserTitleId(String userTitleId) {
+        this.userTitleId = userTitleId;
+    }
+public String getQaId() {
+        return qaId;
+    }
+public void setQaId(String qaId) {
+        this.qaId = qaId;
+    }
+
+
+
+}

+ 124 - 0
java110-db/src/main/resources/mapper/user/UserQuestionAnswerValueV1ServiceDaoImplMapper.xml

@@ -0,0 +1,124 @@
+<?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="userQuestionAnswerValueV1ServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存问卷答案信息 add by wuxw 2018-07-03 -->
+    <insert id="saveUserQuestionAnswerValueInfo" parameterType="Map">
+        insert into user_question_answer_value(
+value_id,title_id,user_qa_id,value_content,community_id,user_title_id,qa_id
+) values (
+#{valueId},#{titleId},#{userQaId},#{valueContent},#{communityId},#{userTitleId},#{qaId}
+)
+    </insert>
+
+
+
+    <!-- 查询问卷答案信息 add by wuxw 2018-07-03 -->
+    <select id="getUserQuestionAnswerValueInfo" parameterType="Map" resultType="Map">
+        select  t.value_id,t.value_id valueId,t.title_id,t.title_id titleId,t.user_qa_id,t.user_qa_id userQaId,t.value_content,t.value_content valueContent,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.user_title_id,t.user_title_id userTitleId,t.qa_id,t.qa_id qaId 
+from user_question_answer_value t 
+where 1 =1 
+<if test="valueId !=null and valueId != ''">
+   and t.value_id= #{valueId}
+</if> 
+<if test="titleId !=null and titleId != ''">
+   and t.title_id= #{titleId}
+</if> 
+<if test="userQaId !=null and userQaId != ''">
+   and t.user_qa_id= #{userQaId}
+</if> 
+<if test="valueContent !=null and valueContent != ''">
+   and t.value_content= #{valueContent}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="userTitleId !=null and userTitleId != ''">
+   and t.user_title_id= #{userTitleId}
+</if> 
+<if test="qaId !=null and qaId != ''">
+   and t.qa_id= #{qaId}
+</if> 
+order by t.create_time desc
+<if test="page != -1 and page != null ">
+   limit #{page}, #{row}
+</if> 
+
+    </select>
+
+
+
+
+    <!-- 修改问卷答案信息 add by wuxw 2018-07-03 -->
+    <update id="updateUserQuestionAnswerValueInfo" parameterType="Map">
+        update  user_question_answer_value t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="valueId !=null and valueId != ''">
+, t.value_id= #{valueId}
+</if> 
+<if test="titleId !=null and titleId != ''">
+, t.title_id= #{titleId}
+</if> 
+<if test="userQaId !=null and userQaId != ''">
+, t.user_qa_id= #{userQaId}
+</if> 
+<if test="valueContent !=null and valueContent != ''">
+, t.value_content= #{valueContent}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="qaId !=null and qaId != ''">
+, t.qa_id= #{qaId}
+</if> 
+ where 1=1 <if test="userTitleId !=null and userTitleId != ''">
+and t.user_title_id= #{userTitleId}
+</if> 
+
+    </update>
+
+    <!-- 查询问卷答案数量 add by wuxw 2018-07-03 -->
+     <select id="queryUserQuestionAnswerValuesCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from user_question_answer_value t 
+where 1 =1 
+<if test="valueId !=null and valueId != ''">
+   and t.value_id= #{valueId}
+</if> 
+<if test="titleId !=null and titleId != ''">
+   and t.title_id= #{titleId}
+</if> 
+<if test="userQaId !=null and userQaId != ''">
+   and t.user_qa_id= #{userQaId}
+</if> 
+<if test="valueContent !=null and valueContent != ''">
+   and t.value_content= #{valueContent}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="userTitleId !=null and userTitleId != ''">
+   and t.user_title_id= #{userTitleId}
+</if> 
+<if test="qaId !=null and qaId != ''">
+   and t.qa_id= #{qaId}
+</if> 
+
+
+     </select>
+
+</mapper>

+ 68 - 0
java110-interface/src/main/java/com/java110/intf/user/IUserQuestionAnswerValueV1InnerServiceSMO.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.intf.user;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.user.UserQuestionAnswerValueDto;
+import com.java110.po.userQuestionAnswerValue.UserQuestionAnswerValuePo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 类表述: 服务之前调用的接口类,不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2023-07-14 13:27:51 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@FeignClient(name = "user-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/userQuestionAnswerValueV1Api")
+public interface IUserQuestionAnswerValueV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveUserQuestionAnswerValue", method = RequestMethod.POST)
+    public int saveUserQuestionAnswerValue(@RequestBody  UserQuestionAnswerValuePo userQuestionAnswerValuePo);
+
+    @RequestMapping(value = "/updateUserQuestionAnswerValue", method = RequestMethod.POST)
+    public int updateUserQuestionAnswerValue(@RequestBody  UserQuestionAnswerValuePo userQuestionAnswerValuePo);
+
+    @RequestMapping(value = "/deleteUserQuestionAnswerValue", method = RequestMethod.POST)
+    public int deleteUserQuestionAnswerValue(@RequestBody  UserQuestionAnswerValuePo userQuestionAnswerValuePo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param userQuestionAnswerValueDto 数据对象分享
+     * @return UserQuestionAnswerValueDto 对象数据
+     */
+    @RequestMapping(value = "/queryUserQuestionAnswerValues", method = RequestMethod.POST)
+    List<UserQuestionAnswerValueDto> queryUserQuestionAnswerValues(@RequestBody UserQuestionAnswerValueDto userQuestionAnswerValueDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param userQuestionAnswerValueDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryUserQuestionAnswerValuesCount", method = RequestMethod.POST)
+    int queryUserQuestionAnswerValuesCount(@RequestBody UserQuestionAnswerValueDto userQuestionAnswerValueDto);
+}

+ 6 - 6
service-report/src/main/java/com/java110/report/api/ReportQuestionAnswerApi.java

@@ -40,12 +40,12 @@ public class ReportQuestionAnswerApi {
         UserQuestionAnswerValueDto userQuestionAnswerValueDto = new UserQuestionAnswerValueDto();
         userQuestionAnswerValueDto.setPage(page);
         userQuestionAnswerValueDto.setRow(row);
-        userQuestionAnswerValueDto.setObjIds(new String[]{storeId, communityId});
-        userQuestionAnswerValueDto.setQaType(qaType);
-        userQuestionAnswerValueDto.setStartTime(startTime);
-        if(!StringUtil.isEmpty(endTime)){
-            userQuestionAnswerValueDto.setEndTime(endTime+" 23:59:59");
-        }
+        userQuestionAnswerValueDto.setCommunityId(communityId);
+//        userQuestionAnswerValueDto.setQaType(qaType);
+//        userQuestionAnswerValueDto.setStartTime(startTime);
+//        if(!StringUtil.isEmpty(endTime)){
+//            userQuestionAnswerValueDto.setEndTime(endTime+" 23:59:59");
+//        }
         userQuestionAnswerValueDto.setTitleId(titleId);
         return getReportQuestionAnswerBMOImpl.get(userQuestionAnswerValueDto);
     }

+ 2 - 2
service-report/src/main/java/com/java110/report/bmo/reportQuestionAnswer/impl/GetReportQuestionAnswerBMOImpl.java

@@ -52,8 +52,8 @@ public class GetReportQuestionAnswerBMOImpl implements IGetReportQuestionAnswerB
         }
 
         for (UserQuestionAnswerValueDto userQuestionAnswerValueDto : userQuestionAnswerValueDtos) {
-            if (StringUtil.isEmpty(userQuestionAnswerValueDto.getQaValue())) {
-                userQuestionAnswerValueDto.setQaValue(userQuestionAnswerValueDto.getValueContent());
+            if (StringUtil.isEmpty(userQuestionAnswerValueDto.getValueContent())) {
+                userQuestionAnswerValueDto.setValueContent(userQuestionAnswerValueDto.getValueContent());
             }
         }
     }

+ 1 - 2
service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java

@@ -2,7 +2,6 @@ package com.java110.user.api;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.questionAnswer.QuestionAnswerDto;
 import com.java110.dto.user.UserQuestionAnswerDto;
 import com.java110.dto.user.UserQuestionAnswerValueDto;
 import com.java110.po.user.UserQuestionAnswerPo;
@@ -227,7 +226,7 @@ public class UserQuestionAnswerApi {
         UserQuestionAnswerValueDto userQuestionAnswerValueDto = new UserQuestionAnswerValueDto();
         userQuestionAnswerValueDto.setPage(page);
         userQuestionAnswerValueDto.setRow(row);
-        userQuestionAnswerValueDto.setObjId(communityId);
+        userQuestionAnswerValueDto.setCommunityId(communityId);
         return getUserQuestionAnswerValueBMOImpl.get(userQuestionAnswerValueDto);
     }
 }

+ 126 - 0
service-user/src/main/java/com/java110/user/cmd/question/ListUserQuestionAnswerCmd.java

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.user.cmd.question;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.user.UserQuestionAnswerValueDto;
+import com.java110.intf.user.IUserQuestionAnswerV1InnerServiceSMO;
+import com.java110.intf.user.IUserQuestionAnswerValueV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.java110.dto.user.UserQuestionAnswerDto;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * 类表述:查询
+ * 服务编码:userQuestionAnswer.listUserQuestionAnswer
+ * 请求路劲:/app/userQuestionAnswer.ListUserQuestionAnswer
+ * add by 吴学文 at 2023-07-13 00:38:00 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "question.listUserQuestionAnswer")
+public class ListUserQuestionAnswerCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(ListUserQuestionAnswerCmd.class);
+    @Autowired
+    private IUserQuestionAnswerV1InnerServiceSMO userQuestionAnswerV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IUserQuestionAnswerValueV1InnerServiceSMO userQuestionAnswerValueV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息");
+        Assert.hasKeyAndValue(reqJson, "qaId", "未包含小区信息");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        UserQuestionAnswerDto userQuestionAnswerDto = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerDto.class);
+
+        int count = userQuestionAnswerV1InnerServiceSMOImpl.queryUserQuestionAnswersCount(userQuestionAnswerDto);
+
+        List<UserQuestionAnswerDto> userQuestionAnswerDtos = null;
+
+        if (count > 0) {
+            userQuestionAnswerDtos = userQuestionAnswerV1InnerServiceSMOImpl.queryUserQuestionAnswers(userQuestionAnswerDto);
+        } else {
+            userQuestionAnswerDtos = new ArrayList<>();
+        }
+
+        //todo 刷入答案
+        freshUserQuestionAnswerValues(userQuestionAnswerDtos);
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, userQuestionAnswerDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+
+    /**
+     * 刷入 投票内容
+     *
+     * @param userQuestionAnswerDtos
+     */
+    private void freshUserQuestionAnswerValues(List<UserQuestionAnswerDto> userQuestionAnswerDtos) {
+
+        if (userQuestionAnswerDtos == null || userQuestionAnswerDtos.size() < 1) {
+            return;
+        }
+        UserQuestionAnswerValueDto userQuestionAnswerValueDto = new UserQuestionAnswerValueDto();
+        userQuestionAnswerValueDto.setQaId(userQuestionAnswerDtos.get(0).getQaId());
+        userQuestionAnswerValueDto.setCommunityId(userQuestionAnswerDtos.get(0).getCommunityId());
+        List<UserQuestionAnswerValueDto> values
+                = userQuestionAnswerValueV1InnerServiceSMOImpl.queryUserQuestionAnswerValues(userQuestionAnswerValueDto);
+
+        if (values == null || values.size() < 1) {
+            return;
+        }
+        //todo 比较
+        List<UserQuestionAnswerValueDto> tValues = null;
+        for (UserQuestionAnswerDto userQuestionAnswerDto : userQuestionAnswerDtos) {
+            tValues = new ArrayList<>();
+            for (UserQuestionAnswerValueDto tmpUserQuestionAnswerValue : values) {
+                if (userQuestionAnswerDto.getUserQaId().equals(tmpUserQuestionAnswerValue.getUserQaId())) {
+                    tValues.add(tmpUserQuestionAnswerValue);
+                }
+            }
+            userQuestionAnswerDto.setValues(tValues);
+        }
+
+    }
+}

+ 14 - 13
service-user/src/main/java/com/java110/user/cmd/userQuestionAnswer/DeleteUserQuestionAnswerCmd.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.user.cmd.userQuestionAnswer;
+package com.java110.user.cmd.userQuestionAnswerValue;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -21,8 +21,9 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.user.IUserQuestionAnswerV1InnerServiceSMO;
-import com.java110.po.user.UserQuestionAnswerPo;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.user.IUserQuestionAnswerValueV1InnerServiceSMO;
+import com.java110.po.userQuestionAnswerValue.UserQuestionAnswerValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -32,24 +33,24 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 /**
  * 类表述:删除
- * 服务编码:userQuestionAnswer.deleteUserQuestionAnswer
- * 请求路劲:/app/userQuestionAnswer.DeleteUserQuestionAnswer
- * add by 吴学文 at 2023-07-13 00:38:00 mail: 928255095@qq.com
+ * 服务编码:userQuestionAnswerValue.deleteUserQuestionAnswerValue
+ * 请求路劲:/app/userQuestionAnswerValue.DeleteUserQuestionAnswerValue
+ * add by 吴学文 at 2023-07-14 13:27:51 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网:http://www.homecommunity.cn
  * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "userQuestionAnswer.deleteUserQuestionAnswer")
-public class DeleteUserQuestionAnswerCmd extends Cmd {
-  private static Logger logger = LoggerFactory.getLogger(DeleteUserQuestionAnswerCmd.class);
+@Java110Cmd(serviceCode = "userQuestionAnswerValue.deleteUserQuestionAnswerValue")
+public class DeleteUserQuestionAnswerValueCmd extends Cmd {
+  private static Logger logger = LoggerFactory.getLogger(DeleteUserQuestionAnswerValueCmd.class);
 
     @Autowired
-    private IUserQuestionAnswerV1InnerServiceSMO userQuestionAnswerV1InnerServiceSMOImpl;
+    private IUserQuestionAnswerValueV1InnerServiceSMO userQuestionAnswerValueV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "userQaId", "userQaId不能为空");
+        Assert.hasKeyAndValue(reqJson, "userTitleId", "userTitleId不能为空");
 Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
     }
@@ -58,8 +59,8 @@ Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       UserQuestionAnswerPo userQuestionAnswerPo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerPo.class);
-        int flag = userQuestionAnswerV1InnerServiceSMOImpl.deleteUserQuestionAnswer(userQuestionAnswerPo);
+       UserQuestionAnswerValuePo userQuestionAnswerValuePo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerValuePo.class);
+        int flag = userQuestionAnswerValueV1InnerServiceSMOImpl.deleteUserQuestionAnswerValue(userQuestionAnswerValuePo);
 
         if (flag < 1) {
             throw new CmdException("删除数据失败");

+ 16 - 16
service-user/src/main/java/com/java110/user/cmd/userQuestionAnswer/ListUserQuestionAnswerCmd.java

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.user.cmd.userQuestionAnswer;
+package com.java110.user.cmd.userQuestionAnswerValue;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.user.IUserQuestionAnswerV1InnerServiceSMO;
+import com.java110.intf.user.IUserQuestionAnswerValueV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.user.UserQuestionAnswerDto;
+import com.java110.dto.user.UserQuestionAnswerValueDto;
 import java.util.List;
 import java.util.ArrayList;
 import org.springframework.http.ResponseEntity;
@@ -36,20 +36,20 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 类表述:查询
- * 服务编码:userQuestionAnswer.listUserQuestionAnswer
- * 请求路劲:/app/userQuestionAnswer.ListUserQuestionAnswer
- * add by 吴学文 at 2023-07-13 00:38:00 mail: 928255095@qq.com
+ * 服务编码:userQuestionAnswerValue.listUserQuestionAnswerValue
+ * 请求路劲:/app/userQuestionAnswerValue.ListUserQuestionAnswerValue
+ * add by 吴学文 at 2023-07-14 13:27:51 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网:http://www.homecommunity.cn
  * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "userQuestionAnswer.listUserQuestionAnswer")
-public class ListUserQuestionAnswerCmd extends Cmd {
+@Java110Cmd(serviceCode = "userQuestionAnswerValue.listUserQuestionAnswerValue")
+public class ListUserQuestionAnswerValueCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListUserQuestionAnswerCmd.class);
+  private static Logger logger = LoggerFactory.getLogger(ListUserQuestionAnswerValueCmd.class);
     @Autowired
-    private IUserQuestionAnswerV1InnerServiceSMO userQuestionAnswerV1InnerServiceSMOImpl;
+    private IUserQuestionAnswerValueV1InnerServiceSMO userQuestionAnswerValueV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -59,19 +59,19 @@ public class ListUserQuestionAnswerCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           UserQuestionAnswerDto userQuestionAnswerDto = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerDto.class);
+           UserQuestionAnswerValueDto userQuestionAnswerValueDto = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerValueDto.class);
 
-           int count = userQuestionAnswerV1InnerServiceSMOImpl.queryUserQuestionAnswersCount(userQuestionAnswerDto);
+           int count = userQuestionAnswerValueV1InnerServiceSMOImpl.queryUserQuestionAnswerValuesCount(userQuestionAnswerValueDto);
 
-           List<UserQuestionAnswerDto> userQuestionAnswerDtos = null;
+           List<UserQuestionAnswerValueDto> userQuestionAnswerValueDtos = null;
 
            if (count > 0) {
-               userQuestionAnswerDtos = userQuestionAnswerV1InnerServiceSMOImpl.queryUserQuestionAnswers(userQuestionAnswerDto);
+               userQuestionAnswerValueDtos = userQuestionAnswerValueV1InnerServiceSMOImpl.queryUserQuestionAnswerValues(userQuestionAnswerValueDto);
            } else {
-               userQuestionAnswerDtos = new ArrayList<>();
+               userQuestionAnswerValueDtos = new ArrayList<>();
            }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, userQuestionAnswerDtos);
+           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, userQuestionAnswerValueDtos);
 
            ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 

+ 18 - 21
service-user/src/main/java/com/java110/user/cmd/userQuestionAnswer/SaveUserQuestionAnswerCmd.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.user.cmd.userQuestionAnswer;
+package com.java110.user.cmd.userQuestionAnswerValue;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -22,8 +22,8 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.user.IUserQuestionAnswerV1InnerServiceSMO;
-import com.java110.po.user.UserQuestionAnswerPo;
+import com.java110.intf.user.IUserQuestionAnswerValueV1InnerServiceSMO;
+import com.java110.po.userQuestionAnswerValue.UserQuestionAnswerValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -34,35 +34,32 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 类表述:保存
- * 服务编码:userQuestionAnswer.saveUserQuestionAnswer
- * 请求路劲:/app/userQuestionAnswer.SaveUserQuestionAnswer
- * add by 吴学文 at 2023-07-13 00:38:00 mail: 928255095@qq.com
+ * 服务编码:userQuestionAnswerValue.saveUserQuestionAnswerValue
+ * 请求路劲:/app/userQuestionAnswerValue.SaveUserQuestionAnswerValue
+ * add by 吴学文 at 2023-07-14 13:27:51 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网:http://www.homecommunity.cn
  * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "userQuestionAnswer.saveUserQuestionAnswer")
-public class SaveUserQuestionAnswerCmd extends Cmd {
+@Java110Cmd(serviceCode = "userQuestionAnswerValue.saveUserQuestionAnswerValue")
+public class SaveUserQuestionAnswerValueCmd extends Cmd {
 
-    private static Logger logger = LoggerFactory.getLogger(SaveUserQuestionAnswerCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(SaveUserQuestionAnswerValueCmd.class);
 
     public static final String CODE_PREFIX_ID = "10";
 
     @Autowired
-    private IUserQuestionAnswerV1InnerServiceSMO userQuestionAnswerV1InnerServiceSMOImpl;
+    private IUserQuestionAnswerValueV1InnerServiceSMO userQuestionAnswerValueV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "qaId", "请求报文中未包含qaId");
-Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
-Assert.hasKeyAndValue(reqJson, "roomName", "请求报文中未包含roomName");
-Assert.hasKeyAndValue(reqJson, "ownerId", "请求报文中未包含ownerId");
-Assert.hasKeyAndValue(reqJson, "ownerName", "请求报文中未包含ownerName");
-Assert.hasKeyAndValue(reqJson, "link", "请求报文中未包含link");
+        Assert.hasKeyAndValue(reqJson, "userQaId", "请求报文中未包含userQaId");
+Assert.hasKeyAndValue(reqJson, "qaId", "请求报文中未包含qaId");
+Assert.hasKeyAndValue(reqJson, "titleId", "请求报文中未包含titleId");
+Assert.hasKeyAndValue(reqJson, "valueId", "请求报文中未包含valueId");
+Assert.hasKeyAndValue(reqJson, "valueContent", "请求报文中未包含valueContent");
 Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-Assert.hasKeyAndValue(reqJson, "score", "请求报文中未包含score");
-Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
 
     }
 
@@ -70,9 +67,9 @@ Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       UserQuestionAnswerPo userQuestionAnswerPo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerPo.class);
-        userQuestionAnswerPo.setUserQaId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = userQuestionAnswerV1InnerServiceSMOImpl.saveUserQuestionAnswer(userQuestionAnswerPo);
+       UserQuestionAnswerValuePo userQuestionAnswerValuePo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerValuePo.class);
+        userQuestionAnswerValuePo.setUserTitleId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        int flag = userQuestionAnswerValueV1InnerServiceSMOImpl.saveUserQuestionAnswerValue(userQuestionAnswerValuePo);
 
         if (flag < 1) {
             throw new CmdException("保存数据失败");

+ 14 - 13
service-user/src/main/java/com/java110/user/cmd/userQuestionAnswer/UpdateUserQuestionAnswerCmd.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.user.cmd.userQuestionAnswer;
+package com.java110.user.cmd.userQuestionAnswerValue;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -21,8 +21,9 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.user.IUserQuestionAnswerV1InnerServiceSMO;
-import com.java110.po.user.UserQuestionAnswerPo;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.user.IUserQuestionAnswerValueV1InnerServiceSMO;
+import com.java110.po.userQuestionAnswerValue.UserQuestionAnswerValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -34,26 +35,26 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 类表述:更新
- * 服务编码:userQuestionAnswer.updateUserQuestionAnswer
- * 请求路劲:/app/userQuestionAnswer.UpdateUserQuestionAnswer
- * add by 吴学文 at 2023-07-13 00:38:00 mail: 928255095@qq.com
+ * 服务编码:userQuestionAnswerValue.updateUserQuestionAnswerValue
+ * 请求路劲:/app/userQuestionAnswerValue.UpdateUserQuestionAnswerValue
+ * add by 吴学文 at 2023-07-14 13:27:51 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网:http://www.homecommunity.cn
  * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "userQuestionAnswer.updateUserQuestionAnswer")
-public class UpdateUserQuestionAnswerCmd extends Cmd {
+@Java110Cmd(serviceCode = "userQuestionAnswerValue.updateUserQuestionAnswerValue")
+public class UpdateUserQuestionAnswerValueCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateUserQuestionAnswerCmd.class);
+  private static Logger logger = LoggerFactory.getLogger(UpdateUserQuestionAnswerValueCmd.class);
 
 
     @Autowired
-    private IUserQuestionAnswerV1InnerServiceSMO userQuestionAnswerV1InnerServiceSMOImpl;
+    private IUserQuestionAnswerValueV1InnerServiceSMO userQuestionAnswerValueV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "userQaId", "userQaId不能为空");
+        Assert.hasKeyAndValue(reqJson, "userTitleId", "userTitleId不能为空");
 Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
     }
@@ -62,8 +63,8 @@ Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       UserQuestionAnswerPo userQuestionAnswerPo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerPo.class);
-        int flag = userQuestionAnswerV1InnerServiceSMOImpl.updateUserQuestionAnswer(userQuestionAnswerPo);
+       UserQuestionAnswerValuePo userQuestionAnswerValuePo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerValuePo.class);
+        int flag = userQuestionAnswerValueV1InnerServiceSMOImpl.updateUserQuestionAnswerValue(userQuestionAnswerValuePo);
 
         if (flag < 1) {
             throw new CmdException("更新数据失败");

+ 73 - 0
service-user/src/main/java/com/java110/user/dao/IUserQuestionAnswerValueV1ServiceDao.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.user.dao;
+
+
+import com.java110.utils.exception.DAOException;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述:
+ * add by 吴学文 at 2023-07-14 13:27:51 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+public interface IUserQuestionAnswerValueV1ServiceDao {
+
+
+    /**
+     * 保存 问卷答案信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveUserQuestionAnswerValueInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询问卷答案信息(instance过程)
+     * 根据bId 查询问卷答案信息
+     * @param info bId 信息
+     * @return 问卷答案信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getUserQuestionAnswerValueInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改问卷答案信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateUserQuestionAnswerValueInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询问卷答案总数
+     *
+     * @param info 问卷答案信息
+     * @return 问卷答案数量
+     */
+    int queryUserQuestionAnswerValuesCount(Map info);
+
+}

+ 112 - 0
service-user/src/main/java/com/java110/user/dao/impl/UserQuestionAnswerValueV1ServiceDaoImpl.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.user.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.user.dao.IUserQuestionAnswerValueV1ServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述:
+ * add by 吴学文 at 2023-07-14 13:27:51 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Service("userQuestionAnswerValueV1ServiceDaoImpl")
+public class UserQuestionAnswerValueV1ServiceDaoImpl extends BaseServiceDao implements IUserQuestionAnswerValueV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(UserQuestionAnswerValueV1ServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存问卷答案信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveUserQuestionAnswerValueInfo(Map info) throws DAOException {
+        logger.debug("保存 saveUserQuestionAnswerValueInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("userQuestionAnswerValueV1ServiceDaoImpl.saveUserQuestionAnswerValueInfo",info);
+
+        return saveFlag;
+    }
+
+
+    /**
+     * 查询问卷答案信息(instance)
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getUserQuestionAnswerValueInfo(Map info) throws DAOException {
+        logger.debug("查询 getUserQuestionAnswerValueInfo 入参 info : {}",info);
+
+        List<Map> businessUserQuestionAnswerValueInfos = sqlSessionTemplate.selectList("userQuestionAnswerValueV1ServiceDaoImpl.getUserQuestionAnswerValueInfo",info);
+
+        return businessUserQuestionAnswerValueInfos;
+    }
+
+
+    /**
+     * 修改问卷答案信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateUserQuestionAnswerValueInfo(Map info) throws DAOException {
+        logger.debug("修改 updateUserQuestionAnswerValueInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("userQuestionAnswerValueV1ServiceDaoImpl.updateUserQuestionAnswerValueInfo",info);
+
+        return saveFlag;
+    }
+
+     /**
+     * 查询问卷答案数量
+     * @param info 问卷答案信息
+     * @return 问卷答案数量
+     */
+    @Override
+    public int queryUserQuestionAnswerValuesCount(Map info) {
+        logger.debug("查询 queryUserQuestionAnswerValuesCount 入参 info : {}",info);
+
+        List<Map> businessUserQuestionAnswerValueInfos = sqlSessionTemplate.selectList("userQuestionAnswerValueV1ServiceDaoImpl.queryUserQuestionAnswerValuesCount", info);
+        if (businessUserQuestionAnswerValueInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessUserQuestionAnswerValueInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 87 - 0
service-user/src/main/java/com/java110/user/smo/impl/UserQuestionAnswerValueV1InnerServiceSMOImpl.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.user.smo.impl;
+
+
+import com.java110.user.dao.IUserQuestionAnswerValueV1ServiceDao;
+import com.java110.intf.user.IUserQuestionAnswerValueV1InnerServiceSMO;
+import com.java110.dto.user.UserQuestionAnswerValueDto;
+import com.java110.po.userQuestionAnswerValue.UserQuestionAnswerValuePo;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 类表述: 服务之前调用的接口实现类,不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2023-07-14 13:27:51 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@RestController
+public class UserQuestionAnswerValueV1InnerServiceSMOImpl extends BaseServiceSMO implements IUserQuestionAnswerValueV1InnerServiceSMO {
+
+    @Autowired
+    private IUserQuestionAnswerValueV1ServiceDao userQuestionAnswerValueV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveUserQuestionAnswerValue(@RequestBody  UserQuestionAnswerValuePo userQuestionAnswerValuePo) {
+        int saveFlag = userQuestionAnswerValueV1ServiceDaoImpl.saveUserQuestionAnswerValueInfo(BeanConvertUtil.beanCovertMap(userQuestionAnswerValuePo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateUserQuestionAnswerValue(@RequestBody  UserQuestionAnswerValuePo userQuestionAnswerValuePo) {
+        int saveFlag = userQuestionAnswerValueV1ServiceDaoImpl.updateUserQuestionAnswerValueInfo(BeanConvertUtil.beanCovertMap(userQuestionAnswerValuePo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteUserQuestionAnswerValue(@RequestBody  UserQuestionAnswerValuePo userQuestionAnswerValuePo) {
+       userQuestionAnswerValuePo.setStatusCd("1");
+       int saveFlag = userQuestionAnswerValueV1ServiceDaoImpl.updateUserQuestionAnswerValueInfo(BeanConvertUtil.beanCovertMap(userQuestionAnswerValuePo));
+       return saveFlag;
+    }
+
+    @Override
+    public List<UserQuestionAnswerValueDto> queryUserQuestionAnswerValues(@RequestBody  UserQuestionAnswerValueDto userQuestionAnswerValueDto) {
+
+        //校验是否传了 分页信息
+
+        int page = userQuestionAnswerValueDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            userQuestionAnswerValueDto.setPage((page - 1) * userQuestionAnswerValueDto.getRow());
+        }
+
+        List<UserQuestionAnswerValueDto> userQuestionAnswerValues = BeanConvertUtil.covertBeanList(userQuestionAnswerValueV1ServiceDaoImpl.getUserQuestionAnswerValueInfo(BeanConvertUtil.beanCovertMap(userQuestionAnswerValueDto)), UserQuestionAnswerValueDto.class);
+
+        return userQuestionAnswerValues;
+    }
+
+
+    @Override
+    public int queryUserQuestionAnswerValuesCount(@RequestBody UserQuestionAnswerValueDto userQuestionAnswerValueDto) {
+        return userQuestionAnswerValueV1ServiceDaoImpl.queryUserQuestionAnswerValuesCount(BeanConvertUtil.beanCovertMap(userQuestionAnswerValueDto));    }
+
+}