Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-db/src/main/resources/mapper/user/QuestionTitleValueV1ServiceDaoImplMapper.xml

@@ -48,7 +48,7 @@
         <if test="seq !=null and seq != ''">
             and t.seq= #{seq}
         </if>
-        order by t.create_time desc
+        order by t.seq
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -65,12 +65,6 @@
         <if test="score !=null and score != ''">
             , t.score= #{score}
         </if>
-        <if test="titleId !=null and titleId != ''">
-            , t.title_id= #{titleId}
-        </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
         <if test="qaValue !=null and qaValue != ''">
             , t.qa_value= #{qaValue}
         </if>
@@ -81,6 +75,12 @@
         <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="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 

java110-utils/src/main/java/com/java110/utils/util/ImportExcelUtils.java

@@ -128,8 +128,7 @@ public class ImportExcelUtils {
                         result = df.format(((HSSFCell) cell).getNumericCellValue());
                         break;
                     case HSSFCell.CELL_TYPE_FORMULA:
-                        result = ((HSSFCell) cell).getNumericCellValue();
-                        break;
+                        throw new IllegalArgumentException("请不要公式计算，程序没法计算Excel的公式");
                     case HSSFCell.CELL_TYPE_BOOLEAN:
                         result = ((HSSFCell) cell).getBooleanCellValue();
                         break;
@@ -157,8 +156,8 @@ public class ImportExcelUtils {
                         result = df.format(((XSSFCell) cell).getNumericCellValue());
                         break;
                     case XSSFCell.CELL_TYPE_FORMULA:
-                        result = ((XSSFCell) cell).getNumericCellValue();
-                        break;
+                        //result = ((XSSFCell) cell).getNumericCellValue();
+                        throw new IllegalArgumentException("请不要公式计算，程序没法计算Excel的公式");
                     case XSSFCell.CELL_TYPE_BOOLEAN:
                         result = ((XSSFCell) cell).getBooleanCellValue();
                         break;

service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java

@@ -31,39 +31,40 @@ public class UpdateApplyRoomDiscountBMOImpl implements IUpdateApplyRoomDiscountB
      */
     @Java110Transactional
     public ResponseEntity<String> update(ApplyRoomDiscountPo applyRoomDiscountPo) {
-
+        List<String> photos = applyRoomDiscountPo.getPhotos();
+        applyRoomDiscountPo.setPhotos(null);
         int flag = applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
 
-        if (flag > 0) {
-            //获取图片集合
-            List<String> photos = applyRoomDiscountPo.getPhotos();
-            if (photos != null && photos.size() > 0) {
-                FileRelDto fileRelDto = new FileRelDto();
-                fileRelDto.setObjId(applyRoomDiscountPo.getArdId());
-                List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-                if (fileRelDtos != null && fileRelDtos.size() > 0) {
-                    FileRelPo fileRelPo = new FileRelPo();
-                    fileRelPo.setObjId(applyRoomDiscountPo.getArdId());
-                    fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
-                }
-                FileRelPo fileRel = new FileRelPo();
-                fileRel.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
-                fileRel.setObjId(applyRoomDiscountPo.getArdId());
-                //table表示表存储 ftp表示ftp文件存储
-                fileRel.setSaveWay("ftp");
-                fileRel.setCreateTime(new Date());
-                //19000表示装修图片
-                fileRel.setRelTypeCd("19000");
-                for (String photo : photos) {
-                    fileRel.setFileRealName(photo);
-                    fileRel.setFileSaveName(photo);
-                    fileRelInnerServiceSMOImpl.saveFileRel(fileRel);
-                }
+        if (flag < 1) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+        }
+        //获取图片集合
+        if (photos != null && photos.size() > 0) {
+            FileRelDto fileRelDto = new FileRelDto();
+            fileRelDto.setObjId(applyRoomDiscountPo.getArdId());
+            List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+            if (fileRelDtos != null && fileRelDtos.size() > 0) {
+                FileRelPo fileRelPo = new FileRelPo();
+                fileRelPo.setObjId(applyRoomDiscountPo.getArdId());
+                fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
+            }
+            FileRelPo fileRel = new FileRelPo();
+            fileRel.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
+            fileRel.setObjId(applyRoomDiscountPo.getArdId());
+            //table表示表存储 ftp表示ftp文件存储
+            fileRel.setSaveWay("ftp");
+            fileRel.setCreateTime(new Date());
+            //19000表示装修图片
+            fileRel.setRelTypeCd("19000");
+            for (String photo : photos) {
+                fileRel.setFileRealName(photo);
+                fileRel.setFileSaveName(photo);
+                fileRelInnerServiceSMOImpl.saveFileRel(fileRel);
             }
-            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
         }
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+
 
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
     }
 
 }

service-user/src/main/java/com/java110/user/cmd/question/DeleteQuestionTitleCmd.java

@@ -21,8 +21,12 @@ 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.dto.questionTitle.QuestionTitleDto;
+import com.java110.dto.questionTitleValue.QuestionTitleValueDto;
 import com.java110.intf.user.IQuestionTitleV1InnerServiceSMO;
+import com.java110.intf.user.IQuestionTitleValueV1InnerServiceSMO;
 import com.java110.po.questionTitle.QuestionTitlePo;
+import com.java110.po.questionTitleValue.QuestionTitleValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -31,6 +35,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * 类表述：删除
  * 服务编码：questionTitle.deleteQuestionTitle
@@ -48,6 +54,9 @@ public class DeleteQuestionTitleCmd extends Cmd {
     @Autowired
     private IQuestionTitleV1InnerServiceSMO questionTitleV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IQuestionTitleValueV1InnerServiceSMO questionTitleValueV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "titleId", "titleId不能为空");
@@ -66,6 +75,22 @@ public class DeleteQuestionTitleCmd extends Cmd {
             throw new CmdException("删除数据失败");
         }
 
+        if (QuestionTitleDto.TITLE_TYPE_QUESTIONS.equals(questionTitlePo.getTitleType())) {
+            cmdDataFlowContext.setResponseEntity(ResultVo.success());
+            return;
+        }
+        QuestionTitleValueDto questionTitleValueDto = new QuestionTitleValueDto();
+        questionTitleValueDto.setTitleId(reqJson.getString("titleId"));
+        List<QuestionTitleValueDto> questionTitleValues = questionTitleValueV1InnerServiceSMOImpl.queryQuestionTitleValues(questionTitleValueDto);
+        if (questionTitleValues != null && questionTitleValues.size() > 0) {
+            QuestionTitleValuePo deleteQuestionTitleValuePo = new QuestionTitleValuePo();
+            deleteQuestionTitleValuePo.setTitleId(questionTitlePo.getTitleId());
+            flag = questionTitleValueV1InnerServiceSMOImpl.deleteQuestionTitleValue(deleteQuestionTitleValuePo);
+            if (flag < 1) {
+                throw new CmdException("更新数据失败");
+            }
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-user/src/main/java/com/java110/user/cmd/question/UpdateQuestionTitleCmd.java

@@ -15,14 +15,24 @@
  */
 package com.java110.user.cmd.question;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 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.core.factory.GenerateCodeFactory;
+import com.java110.dto.inspection.InspectionItemTitleDto;
+import com.java110.dto.maintainance.MaintainanceItemDto;
+import com.java110.dto.maintainance.MaintainanceItemValueDto;
+import com.java110.dto.questionTitle.QuestionTitleDto;
+import com.java110.dto.questionTitleValue.QuestionTitleValueDto;
 import com.java110.intf.user.IQuestionTitleV1InnerServiceSMO;
+import com.java110.intf.user.IQuestionTitleValueV1InnerServiceSMO;
+import com.java110.po.maintainance.MaintainanceItemValuePo;
 import com.java110.po.questionTitle.QuestionTitlePo;
+import com.java110.po.questionTitleValue.QuestionTitleValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -31,6 +41,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 
 /**
  * 类表述：更新
@@ -51,11 +63,21 @@ public class UpdateQuestionTitleCmd extends Cmd {
     @Autowired
     private IQuestionTitleV1InnerServiceSMO questionTitleV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IQuestionTitleValueV1InnerServiceSMO questionTitleValueV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "titleId", "titleId不能为空");
         Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
+        JSONArray titleValues = null;
+        if (!QuestionTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
+            titleValues = reqJson.getJSONArray("titleValues");
+            if (titleValues.size() < 1) {
+                throw new IllegalArgumentException("未包含选项");
+            }
+        }
     }
 
     @Override
@@ -69,6 +91,38 @@ public class UpdateQuestionTitleCmd extends Cmd {
             throw new CmdException("更新数据失败");
         }
 
+        if (QuestionTitleDto.TITLE_TYPE_QUESTIONS.equals(questionTitlePo.getTitleType())) {
+            cmdDataFlowContext.setResponseEntity(ResultVo.success());
+            return;
+        }
+        QuestionTitleValueDto questionTitleValueDto = new QuestionTitleValueDto();
+        questionTitleValueDto.setTitleId(reqJson.getString("titleId"));
+        List<QuestionTitleValueDto> questionTitleValues = questionTitleValueV1InnerServiceSMOImpl.queryQuestionTitleValues(questionTitleValueDto);
+        if (questionTitleValues != null && questionTitleValues.size() > 0) {
+            QuestionTitleValuePo deleteQuestionTitleValuePo = new QuestionTitleValuePo();
+            deleteQuestionTitleValuePo.setTitleId(questionTitlePo.getTitleId());
+            flag = questionTitleValueV1InnerServiceSMOImpl.deleteQuestionTitleValue(deleteQuestionTitleValuePo);
+            if (flag < 1) {
+                throw new CmdException("更新数据失败");
+            }
+        }
+        JSONArray titleValues = reqJson.getJSONArray("titleValues");
+        QuestionTitleValuePo questionTitleValuePo = null;
+        for (int titleValueIndex = 0; titleValueIndex < titleValues.size(); titleValueIndex++) {
+            questionTitleValuePo = new QuestionTitleValuePo();
+            questionTitleValuePo.setQaValue(titleValues.getJSONObject(titleValueIndex).getString("qaValue"));
+            questionTitleValuePo.setSeq(titleValues.getJSONObject(titleValueIndex).getString("seq"));
+            if(titleValues.getJSONObject(titleValueIndex).containsKey("score")) {
+                questionTitleValuePo.setScore(titleValues.getJSONObject(titleValueIndex).getString("score"));
+            }else{
+                questionTitleValuePo.setScore("0");
+            }
+            questionTitleValuePo.setTitleId(questionTitlePo.getTitleId());
+            questionTitleValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
+            questionTitleValuePo.setCommunityId(questionTitlePo.getCommunityId());
+            questionTitleValueV1InnerServiceSMOImpl.saveQuestionTitleValue(questionTitleValuePo);
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }