feats

src/main/java/com/example/civilizedcity/config/CorsConfig.java

@@ -1,28 +1,28 @@
-package com.example.civilizedcity.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-/**
- * 解决跨域问题
- */
-@Configuration
-public class CorsConfig {
-    private CorsConfiguration buildConfig() {
-        CorsConfiguration corsConfiguration = new CorsConfiguration();
-        corsConfiguration.addAllowedOrigin("*"); // 1 允许任何域名使用
-        corsConfiguration.addAllowedHeader("*"); // 2 允许任何头
-        corsConfiguration.addAllowedMethod("*"); // 3 允许任何方法（post、get等）
-        return corsConfiguration;
-    }
-
-    @Bean
-    public CorsFilter corsFilter() {
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", buildConfig()); // 4
-        return new CorsFilter(source);
-    }
-}
+//package com.example.civilizedcity.config;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.cors.CorsConfiguration;
+//import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+//import org.springframework.web.filter.CorsFilter;
+//
+///**
+// * 解决跨域问题
+// */
+//@Configuration
+//public class CorsConfig {
+//    private CorsConfiguration buildConfig() {
+//        CorsConfiguration corsConfiguration = new CorsConfiguration();
+//        corsConfiguration.addAllowedOrigin("*"); // 1 允许任何域名使用
+//        corsConfiguration.addAllowedHeader("*"); // 2 允许任何头
+//        corsConfiguration.addAllowedMethod("*"); // 3 允许任何方法（post、get等）
+//        return corsConfiguration;
+//    }
+//
+//    @Bean
+//    public CorsFilter corsFilter() {
+//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+//        source.registerCorsConfiguration("/**", buildConfig()); // 4
+//        return new CorsFilter(source);
+//    }
+//}

src/main/java/com/example/civilizedcity/controller/TaCheckItemController.java

@@ -246,10 +246,11 @@ public class TaCheckItemController extends BaseController {
             return ResponseBean.error("测评地点详情或小区名称未填写");
         }
 
-        int count = taCheckAnswerService.getCountByUser(id, sysUser.getUserId());
-        if (count > 0) {
-            return ResponseBean.error("您已完成测评作答");
-        }
+        // 暂时不限制一个人答多少份
+//        int count = taCheckAnswerService.getCountByUser(id, sysUser.getUserId());
+//        if (count > 0) {
+//            return ResponseBean.error("您已完成测评作答");
+//        }
 
         taCheckAnswer.setAnswerId(StringUtils.uuid());
         taCheckAnswer.setCheckId(taCheck.getCheckId());

src/main/java/com/example/civilizedcity/service/impl/TaCheckItemServiceImpl.java

@@ -203,7 +203,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
 
             // 如果得分小于0, 说明是扣分项, 生成问题单
             if (score < 0 && Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
-                createNewIssue(sysUser, taCheckItem, qu, standAn, item);
+                createNewIssue(sysUser, taCheckItem, qu, standAn, taCheckAnswer, item);
             }
         }
 
@@ -211,27 +211,29 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
     }
 
     private void createNewIssue(SysUser sysUser,
-                                   TaCheckItem taCheckItem,
-                                   TaCheckItemQu qu,
-                                   TaCheckItemAn an,
-                                   TaCheckAnswerItem answer) {
+                                TaCheckItem taCheckItem,
+                                TaCheckItemQu qu,
+                                TaCheckItemAn an,
+                                TaCheckAnswer answer,
+                                TaCheckAnswerItem answerItem) {
         LocalDateTime now = LocalDateTime.now();
         TaIssue taIssue = new TaIssue();
         taIssue.setLocId(taCheckItem.getTypeId());
         taIssue.setLocName(taCheckItem.getName());
+        taIssue.setAddr(answer.getAddr());
 
         // 如果是选择题, 答案 answer 的内容只是代码, 所以需要从 TaCheckItemAn 把对应的文字拿出来
         // 如果是填空题， 那么文字是 答案（数字） + 单位（fillUnit） , 最后结果类似 5 处。
-        String answerStr = Constants.QU_OF_FILL.equals(qu.getQuType())
+        String answerStr = Constants.QU_OF_RADIO.equals(qu.getQuType())
                 ? an.getAnswer()
-                : String.format("%s %s", answer.getAnswer(), qu.getFillUnit());
+                : String.format("%s %s", answerItem.getAnswer(), qu.getFillUnit());
         taIssue.setContent(String.format("%s 测评结果 %s", qu.getTitle(), answerStr));
         taIssue.setProcessNode(Constants.PROCESS_START);
         taIssue.setProcessStatus(Constants.APPLY_PASS); // 模拟测评的不需要审核
         taIssue.setProcessNum(0);
         taIssue.setOrgId(null);
         taIssue.setSourceType(Constants.SOURCE_CHECK);
-        taIssue.setSourceTarget(answer.getItemId()); // 实际作答的ID, 非测评项目表 ID
+        taIssue.setSourceTarget(answerItem.getItemId()); // 实际作答的ID, 非测评项目表 ID
         taIssue.setStatus(Constants.STATUS_NORMAL);
         taIssue.setCreateUser(sysUser.getUserId());
         taIssue.setUserName(sysUser.getName());
@@ -239,7 +241,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
         taIssueMapper.insert(taIssue);
 
         // 保存文件
-        List<TaAttach> attachList = answer.getAttachList();
+        List<TaAttach> attachList = answerItem.getAttachList();
         if (null != attachList && attachList.size() > 0) {
             for (TaAttach item : attachList) {
                 // 生成新对象, 目的是不影响 item;