feats

db/.back_文明创办/文明创办-backup-202312205256.pdma.json → db/.back_文明创办/文明创办-backup-202318151439.pdma.json

@@ -2,9 +2,9 @@
   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.2.0",
+  "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-2 20:51:00",
+  "updatedTime": "2023-1-8 15:14:32",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4748,6 +4748,40 @@
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
+        {
+          "defKey": "loc_score",
+          "defName": "实地测评得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "D4F39D10-19B6-49F6-A398-D9278355E747"
+        },
+        {
+          "defKey": "survey_score",
+          "defName": "调查问卷得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "F2E17D81-03A9-42C4-8DD7-732C8D40DC59"
+        },
         {
           "defKey": "start_date",
           "defName": "开始日期",
@@ -5605,7 +5639,7 @@
       "env": {
         "base": {
           "nameSpace": "com.example.civilizedcity",
-          "codeRoot": "TdLocQuestion"
+          "codeRoot": "TdQuestion"
         },
         "template": {
           "JavaMybatisPlus": {
@@ -6449,6 +6483,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "0B03C02D-84EC-4306-8CEA-2BAF04806409"
         },
+        {
+          "defKey": "answer_code",
+          "defName": "答案选项",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DD78B024-C9B8-4418-BD1B-8F033743F253"
+        },
         {
           "defKey": "answer",
           "defName": "答案",
@@ -7985,9 +8036,38 @@
       "id": "430EE745-314D-48CE-A20B-ED2C4D79BC92",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaMessage"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
+              "enable": true
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java",
+              "enable": true
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
+              "enable": true
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
+              "enable": true
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
+              "enable": true
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java",
+              "enable": true
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_message",
       "defName": "消息通知",
@@ -8063,7 +8143,7 @@
       ],
       "fields": [
         {
-          "defKey": "id",
+          "defKey": "msg_id",
           "defName": "ID",
           "comment": "",
           "type": "",
@@ -8079,6 +8159,23 @@
           "uiHint": "",
           "id": "FC7B9B05-7D57-4818-8266-F8A4D62DB212"
         },
+        {
+          "defKey": "msg_type",
+          "defName": "消息类型",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "92ACF22A-5638-4B62-9656-71D9089F7D7E"
+        },
         {
           "defKey": "title",
           "defName": "消息标题",

db/.back_文明创办/文明创办-backup-202312223659.pdma.json → db/.back_文明创办/文明创办-backup-202318194130.pdma.json

@@ -2,9 +2,9 @@
   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.2.0",
+  "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-2 20:52:56",
+  "updatedTime": "2023-1-8 15:14:39",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4748,6 +4748,40 @@
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
+        {
+          "defKey": "loc_score",
+          "defName": "实地测评得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "D4F39D10-19B6-49F6-A398-D9278355E747"
+        },
+        {
+          "defKey": "survey_score",
+          "defName": "调查问卷得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "F2E17D81-03A9-42C4-8DD7-732C8D40DC59"
+        },
         {
           "defKey": "start_date",
           "defName": "开始日期",
@@ -6449,6 +6483,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "0B03C02D-84EC-4306-8CEA-2BAF04806409"
         },
+        {
+          "defKey": "answer_code",
+          "defName": "答案选项",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DD78B024-C9B8-4418-BD1B-8F033743F253"
+        },
         {
           "defKey": "answer",
           "defName": "答案",
@@ -8108,6 +8159,23 @@
           "uiHint": "",
           "id": "FC7B9B05-7D57-4818-8266-F8A4D62DB212"
         },
+        {
+          "defKey": "msg_type",
+          "defName": "消息类型",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "92ACF22A-5638-4B62-9656-71D9089F7D7E"
+        },
         {
           "defKey": "title",
           "defName": "消息标题",

db/文明创办.pdma.json

@@ -2,9 +2,13 @@
   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.2.0",
+  "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
+<<<<<<< HEAD
   "updatedTime": "2023-1-25 13:26:34",
+=======
+  "updatedTime": "2023-1-11 15:05:16",
+>>>>>>> e4b4a6f996267b72ad50673dc9482cd50e38224e
   "dbConns": [],
   "profile": {
     "default": {
@@ -4749,6 +4753,40 @@
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
+        {
+          "defKey": "loc_score",
+          "defName": "实地测评得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "D4F39D10-19B6-49F6-A398-D9278355E747"
+        },
+        {
+          "defKey": "survey_score",
+          "defName": "调查问卷得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "F2E17D81-03A9-42C4-8DD7-732C8D40DC59"
+        },
         {
           "defKey": "start_date",
           "defName": "开始日期",
@@ -6258,6 +6296,23 @@
           "domain": "",
           "id": "DD228B07-C934-4B55-BFBD-844E4CBC0A75"
         },
+        {
+          "defKey": "fill_unit",
+          "defName": "填空题单位",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "C81DEB4C-049A-4D1D-B506-21C920AE4286"
+        },
         {
           "defKey": "stand",
           "defName": "评分标准",
@@ -6450,6 +6505,23 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "0B03C02D-84EC-4306-8CEA-2BAF04806409"
         },
+        {
+          "defKey": "answer_code",
+          "defName": "答案选项",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 10,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DD78B024-C9B8-4418-BD1B-8F033743F253"
+        },
         {
           "defKey": "answer",
           "defName": "答案",
@@ -7325,6 +7397,23 @@
           "domain": "",
           "id": "EC9AB5F8-E387-4E40-B948-2581DA3E9D4D"
         },
+        {
+          "defKey": "report_issue",
+          "defName": "上报问题",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "18CF14DD-048B-4743-81D9-0D6428EDBF54"
+        },
         {
           "defKey": "sort_no",
           "defName": "排序",

src/main/java/com/example/civilizedcity/common/Constants.java

@@ -8,11 +8,6 @@ public class Constants {
     public final static int STATUS_READY = 0;
     public final static int STATUS_NORMAL = 1;
 
-
-    public final static String CHECK_ITEM_LOC = "loc";  // 实例调研
-    public final static String CHECK_ITEM_SURVEY = "survey";  // 问卷调研
-
-
     // 操作员身份
     // 督察员
     public final static String DUTY_INSPECTOR = "inspector";
@@ -31,6 +26,8 @@ public class Constants {
     public final static String ATTACH_SOURCE_ISSUE = "issue";
     // 单位问题单
     public final static String ATTACH_SOURCE_ORG_ISSUE = "org-issue";
+    // 测评答案
+    public final static String ATTACH_SOURCE_CHECK_ANSWER = "check-answer";
 
     // 督察员上报
     public final static String ISSUE_SOURCE_INSPECTOR = "inspector";
@@ -87,4 +84,12 @@ public class Constants {
     public final static String MESSAGE_TARGET_ISSUE = "issue";
     // 申请流程
     public final static String MESSAGE_TARGET_APPLY = "apply";
+
+    // 调查问卷
+    public final static String CHECK_OF_LOC = "loc"; // 实地调查
+    public final static String CHECK_OF_SURVEY = "survey"; // 调查问卷
+
+    // 题型
+    public final static String QU_OF_FILL = "fill"; // 填空题
+    public final static String QU_OF_RADIO = "radio"; // 选择题
 }

src/main/java/com/example/civilizedcity/common/StringUtils.java

@@ -13,6 +13,9 @@ public class StringUtils {
     public static boolean isEmpty(String str) {
         return null == str || "".equals(str.trim()) || "null".equals(str) || "undefined".equals(str);
     }
+    public static boolean isNotEmpty(String str) {
+        return !isEmpty(str);
+    }
 
     public static String trim(String src, String...st) {
         if (null == src) return src;
@@ -53,6 +56,10 @@ public class StringUtils {
         return sb.toString();
     }
 
+    public static String uuid() {
+        return UUID.randomUUID().toString().replaceAll("-", "");
+    }
+
     public static String urlEncode(String str) {
         if (isEmpty(str)) return str;
 

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

@@ -8,10 +8,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,6 +27,11 @@ public class CommController extends BaseController {
     @Autowired
     OSSUtils ossUtils;
 
+    @Value("${yz.upload.path}")
+    String uploadPath;
+    @Value("${yz.upload.prefix}")
+    String uploadPrefix;
+
     @GetMapping("/ma/captcha")
     @ApiOperation(value="获取验证码", notes = "获取验证码", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getCaptcha(@ApiParam("手机号码") @RequestParam("phone") String phone) throws Exception {
@@ -39,16 +48,51 @@ public class CommController extends BaseController {
     @PostMapping("/{client}/file")
     public ResponseBean uploadImage(@ApiParam("客户端") @PathVariable String client,
                                     @ApiParam("文件") @RequestParam("file") MultipartFile multipartFile,
-                                    @ApiParam("文件类型") @RequestParam(value = "fileType", defaultValue = "image") String fileType) {
-        try {
-            String url = ossUtils.putObject(multipartFile);
-
-            Map<String, Object> resp = new HashMap<>();
-            resp.put("url", url);
-            resp.put("fileType", fileType);
-            return ResponseBean.success(resp);
-        } catch (IOException e) {
-            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+                                    @ApiParam("文件类型") @RequestParam(value = "fileType", defaultValue = "image") String fileType) throws Exception {
+//        try {
+//            String url = ossUtils.putObject(multipartFile);
+//
+//            Map<String, Object> resp = new HashMap<>();
+//            resp.put("url", url);
+//            resp.put("fileType", fileType);
+//            return ResponseBean.success(resp);
+//        } catch (IOException e) {
+//            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+//        }
+
+
+        //获取文件名
+        String fileName = multipartFile.getOriginalFilename();
+        String newFileName = String.format("%s/%d-%s", getMonth(), System.currentTimeMillis(), fileName);
+
+        // 上传目录以日期分类
+        File tmp = new File(String.format("%s/%s", getUploadPath(), getMonth()));
+        if (!tmp.exists()) {
+            tmp.mkdir();
+        }
+
+        //
+        File upFile = new File(String.format("%s/%s", getUploadPath(), newFileName));
+        multipartFile.transferTo(upFile);
+
+        String url = String.format("%s/%s", uploadPrefix, newFileName);
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("url", url);
+        }});
+    }
+
+    private String getUploadPath() {
+        File tmp = new File(uploadPath);
+        if (!tmp.exists()) {
+            tmp.mkdir();
         }
+
+        return uploadPath;
+    }
+
+    private String getMonth() {
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+        return now.format(formatter);
     }
 }

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

@@ -4,8 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
 import java.util.List;
+
+import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaAttach;
+import com.example.civilizedcity.service.TaAttachService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +20,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaCheckAnswerItem;
 import com.example.civilizedcity.service.TaCheckAnswerItemService;
 
- /**
+/**
  * 测评作答详情;(ta_check_answer_item)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
@@ -23,12 +30,15 @@ import com.example.civilizedcity.service.TaCheckAnswerItemService;
 @RestController
 @RequestMapping("/")
 public class TaCheckAnswerItemController extends BaseController {
-    
+
     @Autowired
     private TaCheckAnswerItemService taCheckAnswerItemService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    @Autowired
+    private TaAttachService taAttachService;
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param itemId 主键
      * @return 实例对象
@@ -38,28 +48,33 @@ public class TaCheckAnswerItemController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(taCheckAnswerItemService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
-     * @param pageSize 每页条数
+     * @param quId  问题ID
+     * @param isMine 我的
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taCheckAnswerItem")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
-        IPage<TaCheckAnswerItem> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaCheckAnswerItem> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaCheckAnswerItem> result = taCheckAnswerItemService.page(pg);
-        
+    public ResponseBean list(@ApiParam("问题ID") @RequestParam(value = "quId") String quId,
+                             @ApiParam("我的") @RequestParam(value = "isMine") Boolean isMine) throws Exception {
+
+        SysUser sysUser = currentUser();
+        List<TaCheckAnswerItem> result = taCheckAnswerItemService.getListBy(quId, isMine, sysUser);
+
+        if (null != result && result.size() > 0) {
+            for(TaCheckAnswerItem item : result) {
+                List<TaAttach> attachList = taAttachService.getListBy(Constants.ATTACH_SOURCE_CHECK_ANSWER, item.getItemId());
+                item.setAttachList(attachList);
+            }
+        }
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taCheckAnswerItem 实例对象
@@ -71,8 +86,8 @@ public class TaCheckAnswerItemController extends BaseController {
         taCheckAnswerItemService.save(taCheckAnswerItem);
         return ResponseBean.success(taCheckAnswerItem);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taCheckAnswerItem 实例对象
@@ -81,12 +96,12 @@ public class TaCheckAnswerItemController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taCheckAnswerItem/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheckAnswerItem taCheckAnswerItem,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
         taCheckAnswerItemService.updateById(taCheckAnswerItem);
         return ResponseBean.success(taCheckAnswerItem);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param itemId 主键
@@ -94,7 +109,7 @@ public class TaCheckAnswerItemController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taCheckAnswerItem/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taCheckAnswerItemService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -1,9 +1,10 @@
 package com.example.civilizedcity.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.civilizedcity.common.BaseController;
-import com.example.civilizedcity.common.ResponseBean;
+import com.example.civilizedcity.common.*;
+import com.example.civilizedcity.service.TaCheckItemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -12,8 +13,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaCheck;
 import com.example.civilizedcity.service.TaCheckService;
 
- /**
+/**
  * 模拟测评;(ta_check)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -21,12 +23,15 @@ import com.example.civilizedcity.service.TaCheckService;
 @RestController
 @RequestMapping("/")
 public class TaCheckController extends BaseController {
-    
+
     @Autowired
     private TaCheckService taCheckService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    @Autowired
+    private TaCheckItemService taCheckItemService;
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param checkId 主键
      * @return 实例对象
@@ -36,28 +41,43 @@ public class TaCheckController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(taCheckService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taCheck")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("测评名称") @RequestParam(value = "title", required = false) String title,
+                             @ApiParam("是否有效") @RequestParam(value = "isValid", required = false) Boolean isValid,
+                             @ApiParam("开始日期") @RequestParam(value = "startDate", required = false) String startDate,
+                             @ApiParam("结束日期") @RequestParam(value = "endDate", required = false) String endDate) throws Exception {
+
+        String today = DateUtils.today();
+
         IPage<TaCheck> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<taCheck> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaCheck> result = taCheckService.page(pg);
-        
+        QueryWrapper<TaCheck> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(title), "title", title);
+        queryWrapper.nested(null != isValid && isValid, q -> q.le("start_date", today).and(f -> f.ge("end_date", today)));
+
+        if (!StringUtils.isEmpty(startDate)) {
+            queryWrapper.le("start_date", endDate);
+            queryWrapper.ge("end_date", startDate);
+        }
+
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaCheck> result = taCheckService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taCheck 实例对象
@@ -67,10 +87,14 @@ public class TaCheckController extends BaseController {
     @PostMapping("/taCheck")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaCheck taCheck) throws Exception {
         taCheckService.save(taCheck);
+
+        // 创建成功之后, 再创建
+        taCheckItemService.createNewItems(taCheck);
+
         return ResponseBean.success(taCheck);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taCheck 实例对象
@@ -79,12 +103,32 @@ public class TaCheckController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taCheck/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheck taCheck,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taCheck.setCheckId(id);
         taCheckService.updateById(taCheck);
         return ResponseBean.success(taCheck);
     }
-    
-    /** 
+
+
+    /**
+     * 计算分数
+     *
+     * @param id 实例ID
+     * @return 实例对象
+     */
+    @ApiOperation("计算分数")
+    @PutMapping("/taCheck/{id}/score")
+    public ResponseBean calcScore(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaCheck taCheck = taCheckService.getById(id);
+        if (null == taCheck || taCheck.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到模拟测评信息");
+        }
+
+        taCheckService.calcScore(taCheck);
+        return ResponseBean.success(taCheck);
+    }
+
+    /**
      * 通过主键删除数据
      *
      * @param checkId 主键
@@ -92,7 +136,7 @@ public class TaCheckController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taCheck/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taCheckService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -3,24 +3,23 @@ package com.example.civilizedcity.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.civilizedcity.common.BaseController;
-import com.example.civilizedcity.common.Constants;
-import com.example.civilizedcity.common.ResponseBean;
+import com.example.civilizedcity.common.*;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 
-import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.*;
+import com.example.civilizedcity.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.example.civilizedcity.entity.TaCheckItem;
-import com.example.civilizedcity.service.TaCheckItemService;
 
- /**
+/**
  * 测评点位;(ta_check_item)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
@@ -28,10 +27,25 @@ import com.example.civilizedcity.service.TaCheckItemService;
 @RestController
 @RequestMapping("/")
 public class TaCheckItemController extends BaseController {
-    
+
     @Autowired
     private TaCheckItemService taCheckItemService;
-    
+
+    @Autowired
+    private TdLocTypeService tdLocTypeService;
+
+    @Autowired
+    private TaCheckService taCheckService;
+
+    @Autowired
+    private TaCheckAnswerService taCheckAnswerService;
+
+    @Autowired
+    private TaCheckItemQuService taCheckItemQuService;
+
+    @Autowired
+    private TaCheckAnswerItemService taCheckAnswerItemService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -41,55 +55,71 @@ public class TaCheckItemController extends BaseController {
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/taCheckItem/{id}")
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return ResponseBean.success(taCheckItemService.getById(id));
+        TaCheckItem taCheckItem = taCheckItemService.getById(id);
+        if (null == taCheckItem || Constants.STATUS_DELETE == taCheckItem.getStatus()) {
+            return ResponseBean.error("未找到测评项目");
+        }
+
+        return ResponseBean.success(taCheckItem);
     }
 
-     /**
-      * 通过测评以及点位查询数据
-      *
-      * @param checkId 测评ID
-      * @param typeId 点位ID
-      * @return 实例对象
-      */
-     @ApiOperation("通过测评以及点位查询数据")
-     @GetMapping("/taCheck/{checkId}/item/{typeId}")
-     public ResponseBean queryByCheckId(@ApiParam("测评ID") @PathVariable String checkId,
-                                        @ApiParam("点位ID") @PathVariable String typeId) throws Exception {
-
-         return ResponseBean.success(getByCheckAndType(checkId, typeId));
-     }
-
-     private TaCheckItem getByCheckAndType(String checkId, String typeId) {
-         QueryWrapper<TaCheckItem> queryWrapper = new QueryWrapper<>();
-         queryWrapper.eq("check_id", checkId);
-         queryWrapper.eq("item_type", Constants.CHECK_ITEM_LOC); // 只查点位
-         queryWrapper.eq("type_id", typeId);
-         queryWrapper.gt("status", Constants.STATUS_DELETE);
+    /**
+     * 通过测评以及点位查询数据
+     *
+     * @param checkId 测评ID
+     * @param typeId  点位ID
+     * @return 实例对象
+     */
+    @ApiOperation("通过测评以及点位查询数据")
+    @GetMapping("/taCheck/{checkId}/item/{typeId}")
+    public ResponseBean queryByCheckId(@ApiParam("测评ID") @PathVariable String checkId,
+                                       @ApiParam("点位ID 或者 调查问卷") @PathVariable String typeId) throws Exception {
+        TaCheckItem taCheckItem = getByCheckAndType(checkId, typeId);
+        if (null == taCheckItem || Constants.STATUS_DELETE == taCheckItem.getStatus()) {
+            return ResponseBean.error("未找到测评项目");
+        }
+
+        return ResponseBean.success(taCheckItem);
+    }
+
+    private TaCheckItem getByCheckAndType(String checkId, String typeId) {
+        QueryWrapper<TaCheckItem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("check_id", checkId);
+
+        if (Constants.CHECK_OF_SURVEY.equals(typeId)) {
+            queryWrapper.eq("item_type", Constants.CHECK_OF_SURVEY);
+        } else {
+            queryWrapper.eq("item_type", Constants.CHECK_OF_LOC); // 只查点位
+            queryWrapper.eq("type_id", typeId);
+        }
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.last("limit 1");
 
         return taCheckItemService.getOne(queryWrapper);
-     }
-    
-    /** 
+    }
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taCheckItem")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("模拟测评ID") @RequestParam(value = "checkId") String checkId,
+                             @ApiParam("项目类型") @RequestParam(value = "itemType") String itemType) throws Exception {
+
+        SysUser sysUser = currentUser();
         IPage<TaCheckItem> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaCheckItem> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaCheckItem> result = taCheckItemService.page(pg);
-        
+        IPage<TaCheckItem> result = taCheckItemService.getPageBy(pg, checkId, itemType);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taCheckItem 实例对象
@@ -99,7 +129,24 @@ public class TaCheckItemController extends BaseController {
     @PostMapping("/taCheckItem")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaCheckItem taCheckItem) throws Exception {
 
-        TaCheckItem origin = getByCheckAndType(taCheckItem.getCheckId(), taCheckItem.getItemId());
+        if (StringUtils.isEmpty(taCheckItem.getItemType())) {
+            return ResponseBean.error("测评类型不能为空");
+        }
+
+        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType()) && StringUtils.isEmpty(taCheckItem.getTypeId())) {
+            return ResponseBean.error("测评点位不能为空");
+        }
+
+        if (!StringUtils.isEmpty(taCheckItem.getTypeId())) {
+            TdLocType tdLocType = tdLocTypeService.getById(taCheckItem.getTypeId());
+            if (null != tdLocType) {
+                taCheckItem.setName(tdLocType.getName());
+            } else {
+                return ResponseBean.error("测评点位选择不正确");
+            }
+        }
+
+        TaCheckItem origin = getByCheckAndType(taCheckItem.getCheckId(), taCheckItem.getTypeId());
         if (null == origin) {
             // 新增
             taCheckItem.setStatus(Constants.STATUS_NORMAL);
@@ -113,22 +160,110 @@ public class TaCheckItemController extends BaseController {
 
         return ResponseBean.success(taCheckItem);
     }
-    
-//    /**
-//     * 更新数据
-//     *
-//     * @param taCheckItem 实例对象
-//     * @return 实例对象
-//     */
-//    @ApiOperation("更新数据")
-//    @PutMapping("/taCheckItem/{id}")
-//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheckItem taCheckItem,
-//                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-//        taCheckItemService.updateById(taCheckItem);
-//        return ResponseBean.success(taCheckItem);
-//    }
-    
-    /** 
+
+    @ApiOperation("答卷检测")
+    @PutMapping("/taCheckItem/{id}/answer/pre-check")
+    public ResponseBean checkAnswer(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaCheckItem taCheckItem = taCheckItemService.getById(id);
+        if (null == taCheckItem || taCheckItem.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.success(new HashMap<String, Object>(){{
+                put("errorCode", -1);   // 负数代表不能进行任何操作, 包括查看
+                put("message", "未找到有效的答题信息");
+            }});
+        }
+
+        TaCheck taCheck = taCheckService.getById(taCheckItem.getCheckId());
+        if (null == taCheck || taCheck.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.success(new HashMap<String, Object>(){{
+                put("errorCode", -2);
+                put("message", "未找到有效的测评信息");
+            }});
+        }
+
+        if (LocalDateTime.now().isAfter(DateUtils.day2LocalDateime(taCheck.getEndDate()))) {
+            return ResponseBean.success(new HashMap<String, Object>(){{
+                put("errorCode", 1);    // 正数代表, 只能查看
+                put("message", "本次测评已结束");
+            }});
+        }
+
+        int cnt = taCheckAnswerService.countByItem(taCheckItem.getItemId());
+        if (cnt >= taCheckItem.getNum()) {
+            return ResponseBean.success(new HashMap<String, Object>(){{
+                put("errorCode", 3);
+                put("message", "当前问卷已收齐, 无须作答");
+            }});
+        }
+
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("errorCode", 0);    // 0 代表可以答题
+            put("message", null);
+        }});
+    }
+
+    /**
+     * 获取回答
+     *
+     * @param id 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @GetMapping("/taCheckItem/{id}/answer")
+    public ResponseBean getAnswer(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+
+        SysUser sysUser = currentUser();
+        List<TaCheckAnswer> answerList = taCheckAnswerService.getByUser(id, sysUser.getUserId());
+        return ResponseBean.success(answerList);
+    }
+
+    /**
+     * 回答问题
+     *
+     * @param taCheckAnswer 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @PutMapping("/taCheckItem/{id}/answer")
+    public ResponseBean answer(@ApiParam("对象实体") @RequestBody TaCheckAnswer taCheckAnswer,
+                               @ApiParam("对象ID") @PathVariable String id) throws Exception {
+
+        SysUser sysUser = currentUser();
+        TaCheckItem taCheckItem = taCheckItemService.getById(id);
+        if (null == taCheckItem || taCheckItem.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到有效的答题信息");
+        }
+
+        TaCheck taCheck = taCheckService.getById(taCheckItem.getCheckId());
+        if (null == taCheck || taCheck.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到有效的测评信息");
+        }
+
+        if (LocalDateTime.now().isAfter(DateUtils.day2LocalDateime(taCheck.getEndDate()))) {
+            return ResponseBean.error("本次测评已结束");
+        }
+
+        if (StringUtils.isEmpty(taCheckAnswer.getAddr())) {
+            return ResponseBean.error("测评地点详情或小区名称未填写");
+        }
+
+        int count = taCheckAnswerService.getCountByUser(id, sysUser.getUserId());
+        if (count > 0) {
+            return ResponseBean.error("您已完成测评作答");
+        }
+
+        taCheckAnswer.setAnswerId(StringUtils.uuid());
+        taCheckAnswer.setCheckId(taCheck.getCheckId());
+        taCheckAnswer.setItemId(id);
+        taCheckAnswer.setStatus(Constants.STATUS_NORMAL);
+        taCheckAnswer.setOrgId(sysUser.getOrgId());
+        taCheckAnswer.setCreateUser(sysUser.getUserId());
+        taCheckAnswer.setCreateDate(LocalDateTime.now());
+
+        taCheckItemService.answer(taCheckItem, taCheckAnswer);
+        return ResponseBean.success(taCheckAnswer);
+    }
+
+    /**
      * 通过主键删除数据
      *
      * @param itemId 主键
@@ -136,7 +271,7 @@ public class TaCheckItemController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taCheckItem/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taCheckItemService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -91,8 +91,8 @@ public class TaCheckItemQuController extends BaseController {
 
         if (StringUtils.isEmpty(quId)) {
             // 新增
-            int maxNo = taCheckItemQuService.getMaxNoBy(taCheckItemQu.getItemId());
-            taCheckItemQu.setSortNo(maxNo + 1);
+//            int maxNo = taCheckItemQuService.getMaxNoBy(taCheckItemQu.getItemId());
+//            taCheckItemQu.setSortNo(maxNo + 1);
             taCheckItemQuService.save(taCheckItemQu);
         } else {
             taCheckItemQuService.updateById(taCheckItemQu);

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

@@ -4,10 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.civilizedcity.common.BaseController;
-import com.example.civilizedcity.common.Constants;
-import com.example.civilizedcity.common.DateUtils;
-import com.example.civilizedcity.common.ResponseBean;
+import com.example.civilizedcity.common.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -80,19 +77,23 @@ public class TaIssueController extends BaseController {
     public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                              @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
-                             @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType) throws Exception {
+                             @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
+                             @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
+                             @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId) throws Exception {
 
         SysUser sysUser = currentUser();
-        String orgId = Constants.ROOT_ORG.equals(sysUser.getOrgId()) ? null : sysUser.getOrgId();
+        boolean isRooter = Constants.ROOT_ID.equals(sysUser.getUserId());
 
         List<String> dutyList = sysUserDutyService.getListByUser(sysUser.getUserId());
-        if (dutyList == null || dutyList.size() < 1) {
+        if (!isRooter && (dutyList == null || dutyList.size() < 1)) {
             return ResponseBean.error("暂无权限查询数据");
         }
 
-        Boolean mine = false;
+        Boolean mine = true;
         Integer validateStatus = null;
-        if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
+        if (isRooter) {
+            mine = false;
+        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
             mine = true;
         } else if (dutyList.contains(Constants.DUTY_MANAGER)) {
             mine = true;
@@ -101,9 +102,9 @@ public class TaIssueController extends BaseController {
             return ResponseBean.error("暂无权限查询数据");
         }
 
-
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("org_id", orgId);
 
         if (Constants.PROCESS_START.equals(bizStatus)) {
             // 待交办
@@ -124,15 +125,19 @@ public class TaIssueController extends BaseController {
             queryWrapper.eq("process_status", Constants.PROCESS_STATUS_REJECT);
         }
 
-        if (mine && null != validateStatus) {
-            Integer vst = validateStatus;
-            queryWrapper.nested(q -> q.eq("create_user", sysUser.getUserId()).or().gt("validate_status", vst));
-        } else if (mine) {
-            queryWrapper.eq(mine, "create_user", sysUser.getUserId());
-        } else if (null != validateStatus) {
-            queryWrapper.gt(null != validateStatus, "validate_status", validateStatus);
+        // 既是督察员又是管理员
+        if (!isRooter) {
+            if (dutyList.contains(Constants.DUTY_MANAGER)) {
+                // 管理员
+                queryWrapper.nested(q -> q.eq("create_user", sysUser.getUserId()).or().gt("validate_status", 0));
+            } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
+                // 督察员
+                queryWrapper.eq("create_user", sysUser.getUserId());
+            }
         }
 
+        queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);
+        queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
         queryWrapper.eq(Constants.ISSUE_SOURCE_FEEDBACK.equals(sourceType), "source_type", "feedback");
         queryWrapper.ne(Constants.ISSUE_SOURCE_INSPECTOR.equals(sourceType), "source_type", "feedback");
         queryWrapper.gt("status", Constants.STATUS_DELETE);

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

@@ -4,8 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
+import java.time.LocalDateTime;
 import java.util.List;
+
+import com.example.civilizedcity.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +19,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaNotice;
 import com.example.civilizedcity.service.TaNoticeService;
 
- /**
+/**
  * 通知公告;(ta_notice)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -23,14 +29,14 @@ import com.example.civilizedcity.service.TaNoticeService;
 @RestController
 @RequestMapping("/")
 public class TaNoticeController extends BaseController {
-    
+
     @Autowired
     private TaNoticeService taNoticeService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
-     * @param noticeId 主键
+     * @param id 主键
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
@@ -38,28 +44,32 @@ public class TaNoticeController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(taNoticeService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taNotice")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("发布状态") @RequestParam(value = "status", required = false) Integer status) throws Exception {
+
         IPage<TaNotice> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaNotice> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaNotice> result = taNoticeService.page(pg);
-        
+        QueryWrapper<TaNotice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(null != status, "status", status);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("weight");
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaNotice> result = taNoticeService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taNotice 实例对象
@@ -68,11 +78,19 @@ public class TaNoticeController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taNotice")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaNotice taNotice) throws Exception {
+        taNotice.setNoticeId(null);
+
+        if (StringUtils.isEmpty(taNotice.getTitle())) {
+            return ResponseBean.error("公告标题不能为空");
+        }
+
+        taNotice.setCreateDate(LocalDateTime.now());
+
         taNoticeService.save(taNotice);
         return ResponseBean.success(taNotice);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taNotice 实例对象
@@ -81,20 +99,26 @@ public class TaNoticeController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taNotice/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaNotice taNotice,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taNotice.setNoticeId(id);
+
+        if (StringUtils.isEmpty(taNotice.getTitle())) {
+            return ResponseBean.error("公告标题不能为空");
+        }
+
         taNoticeService.updateById(taNotice);
         return ResponseBean.success(taNotice);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
-     * @param noticeId 主键
+     * @param id 主键
      * @return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taNotice/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taNoticeService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -23,7 +23,7 @@ import com.example.civilizedcity.service.TdQuAnswerService;
 public class TdQuAnswerController extends BaseController {
     
     @Autowired
-    private TdQuAnswerService tdLocQuAnswerService;
+    private TdQuAnswerService tdQuAnswerService;
     
     /** 
      * 通过ID查询单条数据 
@@ -32,9 +32,9 @@ public class TdQuAnswerController extends BaseController {
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
-    @GetMapping("/tdLocQuAnswer/{id}")
+    @GetMapping("/tdQuAnswer/{id}")
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return ResponseBean.success(tdLocQuAnswerService.getById(id));
+        return ResponseBean.success(tdQuAnswerService.getById(id));
     }
     
     /** 
@@ -45,14 +45,14 @@ public class TdQuAnswerController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("分页查询")
-    @GetMapping("/tdLocQuAnswer")
+    @GetMapping("/tdQuAnswer")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
         
         IPage<TdQuAnswer> pg = new Page<>(pageNum, pageSize);
         // QueryWrapper<TdLocQuAnswer> queryWrapper = new QueryWrapper<>();
         // queryWrapper.orderByDesc("create_date");
-        IPage<TdQuAnswer> result = tdLocQuAnswerService.page(pg);
+        IPage<TdQuAnswer> result = tdQuAnswerService.page(pg);
         
         return ResponseBean.success(result);
     }
@@ -60,28 +60,28 @@ public class TdQuAnswerController extends BaseController {
     /** 
      * 新增数据
      *
-     * @param tdLocQuAnswer 实例对象
+     * @param tdQuAnswer 实例对象
      * @return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping("/tdLocQuAnswer")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody TdQuAnswer tdLocQuAnswer) throws Exception {
-        tdLocQuAnswerService.save(tdLocQuAnswer);
-        return ResponseBean.success(tdLocQuAnswer);
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TdQuAnswer tdQuAnswer) throws Exception {
+        tdQuAnswerService.save(tdQuAnswer);
+        return ResponseBean.success(tdQuAnswer);
     }
     
     /** 
      * 更新数据
      *
-     * @param tdLocQuAnswer 实例对象
+     * @param tdQuAnswer 实例对象
      * @return 实例对象
      */
     @ApiOperation("更新数据")
-    @PutMapping("/tdLocQuAnswer/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdQuAnswer tdLocQuAnswer,
+    @PutMapping("/tdQuAnswer/{id}")
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdQuAnswer tdQuAnswer,
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-        tdLocQuAnswerService.updateById(tdLocQuAnswer);
-        return ResponseBean.success(tdLocQuAnswer);
+        tdQuAnswerService.updateById(tdQuAnswer);
+        return ResponseBean.success(tdQuAnswer);
     }
     
     /** 
@@ -91,9 +91,9 @@ public class TdQuAnswerController extends BaseController {
      * @return 是否成功
      */
     @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/tdLocQuAnswer/{id}")
+    @DeleteMapping("/tdQuAnswer/{id}")
     public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
-        tdLocQuAnswerService.removeLogicById(id);
+        tdQuAnswerService.removeLogicById(id);
         return ResponseBean.success("success");
     }
 }

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

@@ -1,9 +1,15 @@
 package com.example.civilizedcity.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.TdQuAnswer;
+import com.example.civilizedcity.service.TaCheckItemAnService;
+import com.example.civilizedcity.service.TdQuAnswerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -12,8 +18,11 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TdQuestion;
 import com.example.civilizedcity.service.TdQuestionService;
 
- /**
- * 点位问题;(td_loc_question)表控制层
+import java.util.List;
+
+/**
+ * 点位问题;(td_question)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
@@ -21,79 +30,102 @@ import com.example.civilizedcity.service.TdQuestionService;
 @RestController
 @RequestMapping("/")
 public class TdQuestionController extends BaseController {
-    
+
+    @Autowired
+    private TdQuestionService tdQuestionService;
+
     @Autowired
-    private TdQuestionService tdLocQuestionService;
-    
-    /** 
-     * 通过ID查询单条数据 
+    private TdQuAnswerService tdQuAnswerService;
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param quId 主键
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
-    @GetMapping("/tdLocQuestion/{id}")
+    @GetMapping("/tdQuestion/{id}")
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return ResponseBean.success(tdLocQuestionService.getById(id));
+        return ResponseBean.success(tdQuestionService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
-    @GetMapping("/tdLocQuestion")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    @GetMapping("/tdQuestion")
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("标题") @RequestParam(value = "title", required = false) String title) throws Exception {
+
         IPage<TdQuestion> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TdLocQuestion> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TdQuestion> result = tdLocQuestionService.page(pg);
-        
+        QueryWrapper<TdQuestion> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(title), "title", title);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TdQuestion> result = tdQuestionService.page(pg, queryWrapper);
+
+        List<TdQuestion> records = result.getRecords();
+        if (null != records || records.size() > 0) {
+            for (TdQuestion tdQuestion : records) {
+                List<TdQuAnswer> answerList = tdQuAnswerService.getListByQuId(tdQuestion.getQuId());
+                tdQuestion.setQuAnswerList(answerList);
+            }
+        }
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
-     * @param tdLocQuestion 实例对象
+     * @param tdQuestion 实例对象
      * @return 实例对象
      */
     @ApiOperation("新增数据")
-    @PostMapping("/tdLocQuestion")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody TdQuestion tdLocQuestion) throws Exception {
-        tdLocQuestionService.save(tdLocQuestion);
-        return ResponseBean.success(tdLocQuestion);
+    @PostMapping("/tdQuestion")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TdQuestion tdQuestion) throws Exception {
+        String quId = tdQuestion.getQuId();
+
+        if (StringUtils.isEmpty(quId)) {
+            // 新增
+            tdQuestionService.save(tdQuestion);
+        } else {
+            tdQuestionService.updateById(tdQuestion);
+        }
+
+        tdQuAnswerService.mergeData(tdQuestion.getQuId(), tdQuestion.getQuAnswerList());
+        return ResponseBean.success(tdQuestion);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
-     * @param tdLocQuestion 实例对象
+     * @param tdQuestion 实例对象
      * @return 实例对象
      */
     @ApiOperation("更新数据")
-    @PutMapping("/tdLocQuestion/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdQuestion tdLocQuestion,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-        tdLocQuestionService.updateById(tdLocQuestion);
-        return ResponseBean.success(tdLocQuestion);
+    @PutMapping("/tdQuestion/{id}")
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdQuestion tdQuestion,
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        tdQuestionService.updateById(tdQuestion);
+        return ResponseBean.success(tdQuestion);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param quId 主键
      * @return 是否成功
      */
     @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/tdLocQuestion/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
-        tdLocQuestionService.removeLogicById(id);
+    @DeleteMapping("/tdQuestion/{id}")
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        tdQuestionService.removeLogicById(id);
         return ResponseBean.success("success");
     }
 }

src/main/java/com/example/civilizedcity/entity/TaCheck.java

@@ -33,6 +33,12 @@ public class TaCheck implements Serializable,Cloneable{
       /** 总分 */
       @ApiModelProperty(name = "总分",notes = "")
       private Integer score ;
+       /** 实地测评得分 */
+       @ApiModelProperty(name = "实地测评得分",notes = "")
+       private Double locScore ;
+       /** 调查问卷得分 */
+       @ApiModelProperty(name = "调查问卷得分",notes = "")
+       private Double surveyScore ;
       /** 开始日期;YYYY-MM-DD */
       @ApiModelProperty(name = "开始日期",notes = "YYYY-MM-DD")
       private String startDate ;

src/main/java/com/example/civilizedcity/entity/TaCheckAnswer.java

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -7,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -60,4 +63,8 @@ public class TaCheckAnswer implements Serializable,Cloneable{
     @ApiModelProperty(name = "作答时间",notes = "")
     private LocalDateTime createDate ;
 
+    @TableField(exist = false)
+    @ApiModelProperty(name = "答案列表",notes = "")
+    private List<TaCheckAnswerItem> answerItemList ;
+
 }

src/main/java/com/example/civilizedcity/entity/TaCheckAnswerItem.java

@@ -1,60 +1,81 @@
 package com.example.civilizedcity.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
- /**
+/**
  * 测评作答详情;
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value = "测评作答详情",description = "")
+@ApiModel(value = "测评作答详情", description = "")
 @TableName("ta_check_answer_item")
-public class TaCheckAnswerItem implements Serializable,Cloneable{
-    /** 答案ID */
-    @ApiModelProperty(name = "答案ID",notes = "")
-    @TableId(value = "item_id", type = IdType.INPUT)
-    private String itemId ;
-    /** 问题ID;来源点位为题 */
-    @ApiModelProperty(name = "问题ID",notes = "来源点位为题")
-    private String quId ;
-    /** 作答ID;来源测评作答 */
-    @ApiModelProperty(name = "作答ID",notes = "来源测评作答")
-    private String answerId ;
-    /** 其他问题;其他问题时, qu_id 不存在 */
-    @ApiModelProperty(name = "其他问题",notes = "其他问题时, qu_id 不存在")
-    private Integer isCustom ;
-    /** 问题描述 */
-    @ApiModelProperty(name = "问题描述",notes = "")
-    private String quTitle ;
-    /** 标准答案 */
-    @ApiModelProperty(name = "标准答案",notes = "")
-    private String standAnswer ;
-    /** 答案 */
-    @ApiModelProperty(name = "答案",notes = "")
-    private String answer ;
-    /** 得分 */
-    @ApiModelProperty(name = "得分",notes = "")
-    private Double score ;
-    /** 状态 */
-    @ApiModelProperty(name = "状态",notes = "")
-    private Integer status ;
-    /** 作答人 */
-    @ApiModelProperty(name = "作答人",notes = "")
-    private String createUser ;
-    /** 作答时间 */
-    @ApiModelProperty(name = "作答时间",notes = "")
-    private LocalDateTime createDate ;
+public class TaCheckAnswerItem implements Serializable, Cloneable {
+    /**
+     * 答案ID
+     */
+    @ApiModelProperty(name = "答案ID", notes = "")
+    @TableId(value = "item_id", type = IdType.ASSIGN_UUID)
+    private String itemId;
+    /**
+     * 问题ID;来源点位问题
+     */
+    @ApiModelProperty(name = "问题ID", notes = "来源点位问题")
+    private String quId;
+    /**
+     * 作答ID;来源测评作答
+     */
+    @ApiModelProperty(name = "作答ID", notes = "来源测评作答")
+    private String answerId;
+    /**
+     * 答案选项
+     */
+    @ApiModelProperty(name = "答案选项", notes = "")
+    private String answerCode;
+    /**
+     * 答案
+     */
+    @ApiModelProperty(name = "答案", notes = "")
+    private String answer;
+    /**
+     * 得分
+     */
+    @ApiModelProperty(name = "得分", notes = "")
+    private Double score;
+    /**
+     * 状态
+     */
+    @ApiModelProperty(name = "状态", notes = "")
+    private Integer status;
+    /**
+     * 作答人
+     */
+    @ApiModelProperty(name = "作答人", notes = "")
+    private String createUser;
+    /**
+     * 作答时间
+     */
+    @ApiModelProperty(name = "作答时间", notes = "")
+    private LocalDateTime createDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "图片列表", notes = "")
+    List<TaAttach> attachList;
 
 }

src/main/java/com/example/civilizedcity/entity/TaCheckItem.java

@@ -1,60 +1,89 @@
 package com.example.civilizedcity.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
- /**
+/**
  * 测评点位;
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value = "测评点位",description = "")
+@ApiModel(value = "测评点位", description = "")
 @TableName("ta_check_item")
-public class TaCheckItem implements Serializable,Cloneable{
-       /** 点位ID */
-       @ApiModelProperty(name = "点位ID",notes = "")
-       @TableId(value = "item_id", type = IdType.ASSIGN_UUID)
-       private String itemId ;
-       /** 所属测评 */
-       @ApiModelProperty(name = "所属测评",notes = "")
-       private String checkId ;
-       /** 项目类型;loc点位,survey问卷调查 */
-       @ApiModelProperty(name = "项目类型",notes = "loc点位,survey问卷调查")
-       private String itemType ;
-        /** 点位ID */
-        @ApiModelProperty(name = "点位ID",notes = "")
-        private String typeId ;
-       /** 名称 */
-       @ApiModelProperty(name = "名称",notes = "")
-       private String name ;
-       /** 满分 */
-       @ApiModelProperty(name = "满分",notes = "")
-       private Double fullScore ;
-       /** 得分 */
-       @ApiModelProperty(name = "得分",notes = "")
-       private Double score ;
-       /** 数量 */
-       @ApiModelProperty(name = "数量",notes = "")
-       private Integer num ;
-       /** 状态 */
-       @ApiModelProperty(name = "状态",notes = "")
-       private Integer status ;
-       /** 创建人 */
-       @ApiModelProperty(name = "创建人",notes = "")
-       private String createUser ;
-       /** 创建时间 */
-       @ApiModelProperty(name = "创建时间",notes = "")
-       private LocalDateTime createDate ;
+public class TaCheckItem implements Serializable, Cloneable {
+    /**
+     * 点位ID
+     */
+    @ApiModelProperty(name = "点位ID", notes = "")
+    @TableId(value = "item_id", type = IdType.ASSIGN_UUID)
+    private String itemId;
+    /**
+     * 所属测评
+     */
+    @ApiModelProperty(name = "所属测评", notes = "")
+    private String checkId;
+    /**
+     * 项目类型;loc点位,survey问卷调查
+     */
+    @ApiModelProperty(name = "项目类型", notes = "loc点位,survey问卷调查")
+    private String itemType;
+    /**
+     * 点位ID
+     */
+    @ApiModelProperty(name = "点位ID", notes = "")
+    private String typeId;
+    /**
+     * 名称
+     */
+    @ApiModelProperty(name = "名称", notes = "")
+    private String name;
+    /**
+     * 满分
+     */
+    @ApiModelProperty(name = "满分", notes = "")
+    private Double fullScore;
+    /**
+     * 得分
+     */
+    @ApiModelProperty(name = "得分", notes = "")
+    private Double score;
+    /**
+     * 数量
+     */
+    @ApiModelProperty(name = "数量", notes = "")
+    private Integer num;
+    /**
+     * 状态
+     */
+    @ApiModelProperty(name = "状态", notes = "")
+    private Integer status;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(name = "创建人", notes = "")
+    private String createUser;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "创建时间", notes = "")
+    private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(name = "是否只读, 只读代表不需要答题")
+    private Integer answerNum;
 }

src/main/java/com/example/civilizedcity/entity/TaCheckItemAn.java

@@ -42,4 +42,6 @@ public class TaCheckItemAn implements Serializable,Cloneable{
     @ApiModelProperty(name = "排序",notes = "")
     private Integer sortNo ;
 
+     @ApiModelProperty(name = "上报问题",notes = "")
+    private Boolean reportIssue;
 }

src/main/java/com/example/civilizedcity/entity/TaCheckItemQu.java

@@ -54,6 +54,9 @@ public class TaCheckItemQu implements Serializable,Cloneable{
      @ApiModelProperty(name = "序号",notes = "")
      private Integer sortNo ;
 
+      @ApiModelProperty(name = "填空题单位",notes = "")
+     private String fillUnit;
+
       /**
        * 答案列表
        */

src/main/java/com/example/civilizedcity/entity/TaNotice.java

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 public class TaNotice implements Serializable,Cloneable{
     /** 通知ID */
     @ApiModelProperty(name = "通知ID",notes = "")
-    @TableId(value = "notice_id", type = IdType.INPUT)
+    @TableId(value = "notice_id", type = IdType.ASSIGN_UUID)
     private String noticeId ;
     /** 标题 */
     @ApiModelProperty(name = "标题",notes = "")

src/main/java/com/example/civilizedcity/entity/TdQuAnswer.java

@@ -20,11 +20,11 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value = "点位问题答案",description = "")
-@TableName("td_loc_qu_answer")
+@TableName("td_qu_answer")
 public class TdQuAnswer implements Serializable,Cloneable{
     /** 答案ID */
     @ApiModelProperty(name = "答案ID",notes = "")
-    @TableId(value = "answer_id", type = IdType.INPUT)
+    @TableId(value = "answer_id", type = IdType.ASSIGN_UUID)
     private String answerId ;
     /** 问题ID */
     @ApiModelProperty(name = "问题ID",notes = "")

src/main/java/com/example/civilizedcity/entity/TdQuestion.java

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -7,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,29 +23,31 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value = "点位问题",description = "")
-@TableName("td_loc_question")
+@TableName("td_question")
 public class TdQuestion implements Serializable,Cloneable{
-    /** 问题ID */
-    @ApiModelProperty(name = "问题ID",notes = "")
-    @TableId(value = "qu_id", type = IdType.INPUT)
-    private String quId ;
-    /** 点位ID */
-    @ApiModelProperty(name = "点位ID",notes = "")
-    private String locId ;
-    /** 问题类型;radio 单选, fill 填空题 */
-    @ApiModelProperty(name = "问题类型",notes = "radio 单选, fill 填空题")
-    private String quType ;
-    /** 问题描述 */
-    @ApiModelProperty(name = "问题描述",notes = "")
-    private String title ;
-    /** 正确答案 */
-    @ApiModelProperty(name = "正确答案",notes = "")
-    private String rightAnswers ;
-    /** 状态 */
-    @ApiModelProperty(name = "状态",notes = "")
-    private Integer status ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private LocalDateTime createDate ;
+     /** 问题ID */
+     @ApiModelProperty(name = "问题ID",notes = "")
+     @TableId(value = "qu_id", type = IdType.ASSIGN_UUID)
+     private String quId ;
+     /** 问题类型;radio 单选, fill 填空题 */
+     @ApiModelProperty(name = "问题类型",notes = "radio 单选, fill 填空题")
+     private String quType ;
+     /** 问题描述 */
+     @ApiModelProperty(name = "问题描述",notes = "")
+     private String title ;
+     /** 正确答案 */
+     @ApiModelProperty(name = "正确答案",notes = "")
+     private String rightAnswers ;
+     /** 状态 */
+     @ApiModelProperty(name = "状态",notes = "")
+     private Integer status ;
+     /** 创建时间 */
+     @ApiModelProperty(name = "创建时间",notes = "")
+     private LocalDateTime createDate ;
 
+     /**
+      * 问题答案列表
+      */
+     @TableField(exist = false)
+     List<TdQuAnswer> quAnswerList;
 }

src/main/java/com/example/civilizedcity/mapper/TaCheckAnswerItemMapper.java

@@ -5,12 +5,24 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckAnswerItem;
 
- /**
+import java.util.List;
+
+/**
  * 测评作答详情;(ta_check_answer_item)表数据库访问层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 @Mapper
-public interface TaCheckAnswerItemMapper  extends BaseMapper<TaCheckAnswerItem>{
-    
+public interface TaCheckAnswerItemMapper extends BaseMapper<TaCheckAnswerItem> {
+
+    List<TaCheckAnswerItem> getListBy(@Param("answerId") String answerId);
+
+    int getCountByAnswer(@Param("answerId") String answerId);
+
+    List<TaCheckAnswerItem> getListByQu(@Param("quId") String quId,
+                                        @Param("isMine") Boolean isMine,
+                                        @Param("userId") String userId);
+
+    List<TaCheckAnswerItem> getListByAnswer(@Param("answerId") String answerId);
 }

src/main/java/com/example/civilizedcity/mapper/TaCheckAnswerMapper.java

@@ -5,12 +5,24 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckAnswer;
 
- /**
+import java.util.List;
+
+/**
  * 测评作答;(ta_check_answer)表数据库访问层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 @Mapper
-public interface TaCheckAnswerMapper  extends BaseMapper<TaCheckAnswer>{
-    
+public interface TaCheckAnswerMapper extends BaseMapper<TaCheckAnswer> {
+
+    Integer countByItem(@Param("itemId") String itemId);
+
+    List<TaCheckAnswer> getListBy(@Param("itemId") String itemId);
+
+    Double sumScore(@Param("itemId") String itemId, @Param("num") Integer num);
+
+    int getCountByUser(@Param("itemId") String itemId, @Param("userId") String userId);
+
+    List<TaCheckAnswer> getByUser(@Param("itemId") String itemId, @Param("userId") String userId);
 }

src/main/java/com/example/civilizedcity/mapper/TaCheckItemAnMapper.java

@@ -5,12 +5,18 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckItemAn;
 
- /**
+import java.util.List;
+
+/**
  * 项目问题答案;(ta_check_item_an)表数据库访问层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-16
  */
 @Mapper
-public interface TaCheckItemAnMapper  extends BaseMapper<TaCheckItemAn>{
-    
+public interface TaCheckItemAnMapper extends BaseMapper<TaCheckItemAn> {
+
+    List<TaCheckItemAn> getListBy(@Param("quId") String quId);
+
+    TaCheckItemAn getOneBy(@Param("quId") String quId, @Param("answerCode") String answerCode);
 }

src/main/java/com/example/civilizedcity/mapper/TaCheckItemMapper.java

@@ -1,16 +1,27 @@
 package com.example.civilizedcity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.entity.SysUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckItem;
 
- /**
+import java.util.List;
+
+/**
  * 测评点位;(ta_check_item)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 @Mapper
 public interface TaCheckItemMapper  extends BaseMapper<TaCheckItem>{
-    
-}
+
+     IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg,
+                                  @Param("checkId") String checkId,
+                                  @Param("itemType") String itemType);
+
+     int createNewLocItems(@Param("checkId") String checkId);
+
+     List<TaCheckItem> getListBy(@Param("checkId") String checkId, @Param("itemType") String itemType);
+ }

src/main/java/com/example/civilizedcity/mapper/TaCheckItemQuMapper.java

@@ -5,12 +5,17 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckItemQu;
 
- /**
+import java.util.List;
+
+/**
  * 点位问题;(ta_check_item_qu)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 @Mapper
 public interface TaCheckItemQuMapper  extends BaseMapper<TaCheckItemQu>{
-    
-}
+
+     Integer countByItem(@Param("itemId") String itemId);
+
+     List<TaCheckItemQu> getListBy(@Param("itemId") String itemId);
+ }

src/main/java/com/example/civilizedcity/service/TaCheckAnswerItemService.java

@@ -1,13 +1,18 @@
 package com.example.civilizedcity.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaCheckAnswerItem;
 
- /**
+import java.util.List;
+
+/**
  * 测评作答详情;(ta_check_answer_item)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 public interface TaCheckAnswerItemService extends IBaseService<TaCheckAnswerItem> {
-    
+
+     List<TaCheckAnswerItem> getListBy(String quId, Boolean isMine, SysUser sysUser);
+
+    List<TaCheckAnswerItem> getListByAnswer(String answerId);
 }

src/main/java/com/example/civilizedcity/service/TaCheckAnswerService.java

@@ -3,11 +3,19 @@ package com.example.civilizedcity.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.TaCheckAnswer;
 
- /**
+import java.util.List;
+
+/**
  * 测评作答;(ta_check_answer)表服务接口
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 public interface TaCheckAnswerService extends IBaseService<TaCheckAnswer> {
-    
+
+    int getCountByUser(String itemId, String userId);
+
+    int countByItem(String itemId);
+
+    List<TaCheckAnswer> getByUser(String itemId, String userId);
 }

src/main/java/com/example/civilizedcity/service/TaCheckItemQuService.java

@@ -3,7 +3,9 @@ package com.example.civilizedcity.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.TaCheckItemQu;
 
- /**
+import java.util.List;
+
+/**
  * 点位问题;(ta_check_item_qu)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
@@ -11,4 +13,6 @@ import com.example.civilizedcity.entity.TaCheckItemQu;
 public interface TaCheckItemQuService extends IBaseService<TaCheckItemQu> {
 
      int getMaxNoBy(String itemId);
+
+     List<TaCheckItemQu> getListBy(String itemId);
  }

src/main/java/com/example/civilizedcity/service/TaCheckItemService.java

@@ -1,6 +1,9 @@
 package com.example.civilizedcity.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaCheck;
+import com.example.civilizedcity.entity.TaCheckAnswer;
 import com.example.civilizedcity.entity.TaCheckItem;
 
  /**
@@ -9,5 +12,10 @@ import com.example.civilizedcity.entity.TaCheckItem;
  * @date : 2022-12-13
  */
 public interface TaCheckItemService extends IBaseService<TaCheckItem> {
-    
-}
+
+     IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, String checkId, String itemType);
+
+     void createNewItems(TaCheck taCheck);
+
+     void answer(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer) throws Exception;
+ }

src/main/java/com/example/civilizedcity/service/TaCheckService.java

@@ -8,5 +8,6 @@ import com.example.civilizedcity.entity.TaCheck;
  * @date : 2022-12-12
  */
 public interface TaCheckService extends IBaseService<TaCheck> {
-    
-}
+
+     TaCheck calcScore(TaCheck taCheck);
+ }

src/main/java/com/example/civilizedcity/service/TdQuAnswerService.java

@@ -1,12 +1,18 @@
 package com.example.civilizedcity.service;
 
+import com.example.civilizedcity.entity.TaCheckItemAn;
 import com.example.civilizedcity.entity.TdQuAnswer;
 
- /**
+import java.util.List;
+
+/**
  * 点位问题答案;(td_loc_qu_answer)表服务接口
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 public interface TdQuAnswerService extends IBaseService<TdQuAnswer> {
-    
+    boolean mergeData(String quId, List<TdQuAnswer> quAnswerList);
+
+    List<TdQuAnswer> getListByQuId(String quId);
 }

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

@@ -1,16 +1,29 @@
 package com.example.civilizedcity.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import com.example.civilizedcity.entity.SysUser;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaCheckAnswerItem;
 import com.example.civilizedcity.mapper.TaCheckAnswerItemMapper;
 import com.example.civilizedcity.service.TaCheckAnswerItemService;
- /**
+
+import java.util.List;
+
+/**
  * 测评作答详情;(ta_check_answer_item)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-13
  */
 @Service
 public class TaCheckAnswerItemServiceImpl extends BaseServiceImpl<TaCheckAnswerItemMapper, TaCheckAnswerItem> implements TaCheckAnswerItemService {
-    
+
+    @Override
+    public List<TaCheckAnswerItem> getListBy(String quId, Boolean isMine, SysUser sysUser) {
+        return baseMapper.getListByQu(quId, isMine, sysUser.getUserId());
+    }
+
+    @Override
+    public List<TaCheckAnswerItem> getListByAnswer(String answerId) {
+        return baseMapper.getListByAnswer(answerId);
+    }
 }

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

@@ -5,12 +5,30 @@ import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaCheckAnswer;
 import com.example.civilizedcity.mapper.TaCheckAnswerMapper;
 import com.example.civilizedcity.service.TaCheckAnswerService;
- /**
+
+import java.util.List;
+
+/**
  * 测评作答;(ta_check_answer)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-13
  */
 @Service
 public class TaCheckAnswerServiceImpl extends BaseServiceImpl<TaCheckAnswerMapper, TaCheckAnswer> implements TaCheckAnswerService {
-    
+
+    @Override
+    public int getCountByUser(String itemId, String userId) {
+        return baseMapper.getCountByUser(itemId, userId);
+    }
+
+    @Override
+    public int countByItem(String itemId) {
+        return baseMapper.countByItem(itemId);
+    }
+
+    @Override
+    public List<TaCheckAnswer> getByUser(String itemId, String userId) {
+        return baseMapper.getByUser(itemId, userId);
+    }
 }

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

@@ -7,6 +7,8 @@ import com.example.civilizedcity.entity.TaCheckItemQu;
 import com.example.civilizedcity.mapper.TaCheckItemQuMapper;
 import com.example.civilizedcity.service.TaCheckItemQuService;
 
+import java.util.List;
+
 /**
  * 点位问题;(ta_check_item_qu)表服务实现类
  *
@@ -26,4 +28,9 @@ public class TaCheckItemQuServiceImpl extends BaseServiceImpl<TaCheckItemQuMappe
         TaCheckItemQu one = getOne(queryWrapper);
         return null == one ? 0 : one.getSortNo();
     }
+
+    @Override
+    public List<TaCheckItemQu> getListBy(String itemId) {
+        return baseMapper.getListBy(itemId);
+    }
 }

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

@@ -1,16 +1,193 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.*;
+import com.example.civilizedcity.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.entity.TaCheckItem;
-import com.example.civilizedcity.mapper.TaCheckItemMapper;
 import com.example.civilizedcity.service.TaCheckItemService;
- /**
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
  * 测评点位;(ta_check_item)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-13
  */
 @Service
 public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, TaCheckItem> implements TaCheckItemService {
-    
+
+    @Autowired
+    TaCheckItemQuMapper taCheckItemQuMapper;
+
+    @Autowired
+    TaCheckItemAnMapper taCheckItemAnMapper;
+
+    @Autowired
+    TaCheckAnswerItemMapper taCheckAnswerItemMapper;
+
+    @Autowired
+    TaCheckAnswerMapper taCheckAnswerMapper;
+
+    @Autowired
+    TaAttachMapper taAttachMapper;
+
+    @Override
+    public IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, String checkId, String itemType) {
+        return baseMapper.getPageBy(pg, checkId, itemType);
+    }
+
+    @Override
+    public void createNewItems(TaCheck taCheck) {
+        // 先创建实地测试
+        baseMapper.createNewLocItems(taCheck.getCheckId());
+        // 再创建调查问卷
+        TaCheckItem taCheckItem = new TaCheckItem();
+        taCheckItem.setCheckId(taCheck.getCheckId());
+        taCheckItem.setItemType(Constants.CHECK_OF_SURVEY);
+        taCheckItem.setName("调查问卷");
+        save(taCheckItem);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void answer(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer) throws Exception {
+        List<TaCheckItemQu> quList = taCheckItemQuMapper.getListBy(taCheckItem.getItemId());
+        if (null == quList || quList.size() < 1) {
+            throw new Exception("校验测评问题列表出错");
+        }
+
+        List<TaCheckAnswerItem> answerItemList = taCheckAnswer.getAnswerItemList();
+        if (null == answerItemList || answerItemList.size() != quList.size()) {
+            throw new Exception("未完成全部测评问题");
+        }
+
+        // 答案列表如果没有关联问题ID
+        long cnt = answerItemList.stream().filter(f -> null == f.getQuId()).count();
+        if (cnt > 0) {
+            throw new Exception("验证部分题干信息出错");
+        }
+
+        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
+            // 如果是实地问卷, 试卷份数不能多于规定份数
+            int count = taCheckAnswerMapper.countByItem(taCheckItem.getItemId());
+            if (count >= taCheckItem.getNum()) {
+                throw new Exception("当前实地问卷已收齐, 无须作答");
+            }
+        }
+
+
+        double[] scores = answerItems(taCheckItem, taCheckAnswer, quList, answerItemList);
+
+        if (Constants.CHECK_OF_SURVEY.equals(taCheckItem.getItemType())) {
+            // 调查问卷不需要计算当前试卷的分数, 最后才能计算出来
+            taCheckAnswerMapper.insert(taCheckAnswer);
+
+            // 但是需要更新答卷份数
+            int count = taCheckAnswerMapper.countByItem(taCheckItem.getItemId());
+            taCheckItem.setNum(count);
+            updateById(taCheckItem);
+            return;
+        }
+
+        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
+            // 实地调查, 需要计算当前这份试卷的份数
+            double positiveScore = scores[0];
+            double negativeScore = scores[1];
+
+            // 每份试卷的得分 = 总分 / 份数
+            double maxScore = taCheckItem.getFullScore()  / taCheckItem.getNum();
+            double totalScore = maxScore + negativeScore + positiveScore;
+
+            if (0 > totalScore) {
+                // 如果扣分项太多
+                totalScore = 0.0;
+            }
+            if (totalScore > maxScore) {
+                // 如果得分超过总分
+                totalScore = maxScore;
+            }
+
+            taCheckAnswer.setScore(totalScore);
+            taCheckAnswerMapper.insert(taCheckAnswer);
+        }
+    }
+
+    /**
+     * 计算每份试卷份数
+     * @param taCheckItem
+     * @param taCheckAnswer
+     * @throws Exception
+     */
+    private double[] answerItems(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer, List<TaCheckItemQu> quList, List<TaCheckAnswerItem> answerItemList) throws Exception {
+
+        LocalDateTime now = LocalDateTime.now();
+        double negativeScore = 0.0; // 扣分
+        double positiveScore = 0.0; // 得分
+        for(TaCheckAnswerItem item : answerItemList) {
+            // 找到对应的题目
+            TaCheckItemQu qu = getQu(quList, item.getQuId());
+            // + 代表得分, 否则代表扣分
+            int sign = "+".equals(qu.getComputeType()) ? 1 : -1;
+
+            double score = 0.0;
+            if (Constants.QU_OF_FILL.equals(qu.getQuType())) {
+                // 如果是填空题, 用户填的应该是数字, 没填就是 0
+                Double an = StringUtils.isEmpty(item.getAnswer()) ? 0.0 : Double.parseDouble(item.getAnswer());
+                score = an * qu.getAnScore();
+                if (score > qu.getMaxScore()) {
+                    score = qu.getMaxScore();
+                }
+
+                score *= sign;
+            } else if (Constants.QU_OF_RADIO.equals(qu.getQuType())) {
+                // 如果是选择题, 先找到对应的答案
+                TaCheckItemAn standAn = taCheckItemAnMapper.getOneBy(qu.getQuId(), item.getAnswerCode());
+
+                score = standAn.getScore();
+                if (score > qu.getMaxScore()) {
+                    score = qu.getMaxScore();
+                }
+
+                score *= sign;
+            }
+
+            item.setItemId(StringUtils.uuid());
+            item.setAnswerId(taCheckAnswer.getAnswerId());
+            item.setScore(score);
+            item.setCreateDate(now);
+            item.setCreateUser(taCheckAnswer.getCreateUser());
+            item.setStatus(Constants.STATUS_NORMAL);
+            taCheckAnswerItemMapper.insert(item);
+
+            if (score > 0) {
+                positiveScore += score;
+            } else {
+                negativeScore += score;
+            }
+
+            // 保存附件
+            if (null != item.getAttachList()) {
+                for (TaAttach taAttach : item.getAttachList()) {
+                    taAttach.setOwnerType(Constants.ATTACH_SOURCE_CHECK_ANSWER);
+                    taAttach.setOwnerId(item.getItemId());
+                    taAttach.setStatus(Constants.STATUS_NORMAL);
+                    taAttach.setCreateUser(taCheckAnswer.getCreateUser());
+                    taAttach.setCreateDate(now);
+                    taAttachMapper.insert(taAttach);
+                }
+            }
+        }
+
+        return new double[] {positiveScore, negativeScore};
+    }
+
+    private TaCheckItemQu getQu(List<TaCheckItemQu> quList, String quId) {
+        return quList.stream().filter(q -> q.getQuId().equals(quId)).findFirst().orElse(null);
+    }
 }

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

@@ -1,15 +1,164 @@
 package com.example.civilizedcity.service.impl;
 
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.*;
+import com.example.civilizedcity.mapper.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.entity.TaCheck;
-import com.example.civilizedcity.mapper.TaCheckMapper;
 import com.example.civilizedcity.service.TaCheckService;
- /**
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
  * 模拟测评;(ta_mock_check)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @Service
 public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck> implements TaCheckService {
-    
+
+    @Autowired
+    TaCheckItemMapper taCheckItemMapper;
+
+    @Autowired
+    TaCheckItemQuMapper taCheckItemQuMapper;
+
+    @Autowired
+    TaCheckAnswerMapper taCheckAnswerMapper;
+
+    @Autowired
+    TaCheckAnswerItemMapper taCheckAnswerItemMapper;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public TaCheck calcScore(TaCheck taCheck) {
+
+        // 调查问卷分数
+        double surveyScore = calcSurveyScore(taCheck);
+
+        // 计算点位分数
+        double locScore = calcLocScore(taCheck);
+
+        taCheck.setLocScore(locScore);
+        taCheck.setSurveyScore(surveyScore);
+
+        updateById(taCheck);
+
+        return taCheck;
+    }
+
+    /**
+     * 计算点位分数
+     * 计算的前提是, 每份试卷（ta_check_answer）的分数已经计算好了
+     * @param taCheck
+     * @return
+     */
+    private double calcLocScore(TaCheck taCheck) {
+        List<TaCheckItem> checkItemList = taCheckItemMapper.getListBy(taCheck.getCheckId(), Constants.CHECK_OF_LOC);
+        if (null == checkItemList || checkItemList.size() == 0) return 0.0;
+
+        // 所有问卷得分的和
+        double totalScore = 0.0;
+        for (TaCheckItem checkItem : checkItemList) {
+            Double score = taCheckAnswerMapper.sumScore(checkItem.getItemId(), checkItem.getNum());
+            double s = null == score ? 0.0 : score;
+            checkItem.setScore(s);
+            taCheckItemMapper.updateById(checkItem);
+
+            totalScore += s;
+        }
+
+        return totalScore;
+    }
+
+    /**
+     * 计算调查问卷分数
+     * 计算的前提是, 每个题目（ta_check_answer_item）的分数已经计算好了
+     * 暂仅支持选择题算法
+     * 总分数 = 100 / 问卷分数 / 每份问卷的题数
+     * @param taCheck
+     * @return
+     */
+    private double calcSurveyScore(TaCheck taCheck) {
+        // 目前的需求, 此处应该只能查询到一条数据
+        List<TaCheckItem> checkItemList = taCheckItemMapper.getListBy(taCheck.getCheckId(), Constants.CHECK_OF_SURVEY);
+        if (null == checkItemList || checkItemList.size() == 0) return 0.0;
+
+        // 所有问卷得分的和
+        double totalScore = 0.0;
+        for (TaCheckItem checkItem : checkItemList) {
+            // 问卷份数
+            List<TaCheckAnswer> answerList = taCheckAnswerMapper.getListBy(checkItem.getItemId());
+            if (answerList == null || answerList.size() == 0) continue;
+            int copyNum = answerList.size();
+
+            // 题目数
+            List<TaCheckItemQu> quList = taCheckItemQuMapper.getListBy(checkItem.getItemId());
+            if (quList == null || quList.size() == 0) continue;
+            int quNum = quList.size();
+
+            // 每题的最大分数
+            double maxStandScore = 100.00 / copyNum / quNum;
+
+            // 总分
+            double score = 0.0;
+            for (TaCheckAnswer answer : answerList) {
+                // 获取答案列表
+                List<TaCheckAnswerItem> answerItemList = taCheckAnswerItemMapper.getListBy(answer.getAnswerId());
+                if (null == answerItemList || answerItemList.size() == 0) continue;
+
+                // 每题得分
+                double quScore = 0.0;
+                for (TaCheckAnswerItem answerItem : answerItemList) {
+                    if (null == answerItem.getScore() || isZero(answerItem.getScore())) {
+                        // 如果得分是 0
+                        continue;
+                    }
+
+                    // 查询对应的问题
+                    TaCheckItemQu qu = getQu(quList, answerItem.getQuId());
+                    if (null == qu) continue;   // 找不到对应题目不计算
+                    if (null == qu.getMaxScore() || isZero(qu.getMaxScore())) continue; // 题目没有维护最大分数, 不计算
+
+                    // 计算转换比
+                    double ratio = maxStandScore / qu.getMaxScore();
+
+                    // 当前得分
+                    double s = Math.abs(answerItem.getScore()) > qu.getMaxScore() ?  qu.getMaxScore() : answerItem.getScore();
+                    if (answerItem.getScore() < 0) {
+                        // 在与最大值的比较过程中, 最大值是正数, 有可能改变得分的符号
+                        // 所以此处要纠正过来
+                        s = 0 - Math.abs(s);
+                    }
+
+                    // 分值
+                    quScore += s * ratio;
+                }
+
+                answer.setScore(quScore);
+                taCheckAnswerMapper.updateById(answer);
+
+                // 分值
+                score += quScore;
+            }
+
+            checkItem.setScore(score);
+            taCheckItemMapper.updateById(checkItem);
+
+            totalScore += score;
+        }
+
+        return totalScore;
+    }
+
+    private TaCheckItemQu getQu(List<TaCheckItemQu> quList, String quId) {
+        return quList.stream().filter(q -> q.getQuId().equals(quId)).findFirst().orElse(null);
+    }
+
+    private boolean isZero(Double d) {
+        return Math.abs(d) < 0.0001;
+    }
 }

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

@@ -1,15 +1,57 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.TaCheckItemAn;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TdQuAnswer;
 import com.example.civilizedcity.mapper.TdQuAnswerMapper;
 import com.example.civilizedcity.service.TdQuAnswerService;
- /**
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
  * 点位问题答案;(td_loc_qu_answer)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-13
  */
 @Service
 public class TdQuAnswerServiceImpl extends BaseServiceImpl<TdQuAnswerMapper, TdQuAnswer> implements TdQuAnswerService {
-    
+
+    @Override
+    public boolean mergeData(String quId, List<TdQuAnswer> quAnswerList) {
+        if (StringUtils.isEmpty(quId)) return false;
+
+        // 先删除所有
+        baseMapper.deleteByMap(new HashMap<String, Object>() {{
+            put("qu_id", quId);
+        }});
+
+        if (null == quAnswerList || quAnswerList.isEmpty()) {
+            return true;
+        }
+
+        for (int i = 0; i < quAnswerList.size(); i++) {
+            TdQuAnswer item = quAnswerList.get(i);
+            item.setQuId(quId);
+            // 重新排序
+            item.setSortNo(i + 1);
+            save(item);
+        }
+
+        return true;
+    }
+
+    @Override
+    public List<TdQuAnswer> getListByQuId(String quId) {
+        QueryWrapper<TdQuAnswer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("qu_id", quId);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByAsc("sort_no");
+
+        return list(queryWrapper);
+    }
 }

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

@@ -1,5 +1,8 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.civilizedcity.entity.TaCheckItemQu;
+import com.example.civilizedcity.entity.TdQuAnswer;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TdQuestion;
 import com.example.civilizedcity.mapper.TdQuestionMapper;
@@ -11,5 +14,5 @@ import com.example.civilizedcity.service.TdQuestionService;
  */
 @Service
 public class TdQuestionServiceImpl extends BaseServiceImpl<TdQuestionMapper, TdQuestion> implements TdQuestionService {
-    
-}
+
+ }

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://110.40.183.156:3306/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://110.40.183.156:3306/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true&autoReconnect=true
     username: civilizedcity
     password: civilizedcity@ABCD1234
   mvc:
@@ -20,6 +20,9 @@ spring:
 
 ###
 yz:
+  upload:
+    path: E:\work\public-upload
+    prefix: http://127.0.0.1:8000
   filter:
     annList:
       - "/swagger-ui/**"

src/main/resources/mapper/TaCheckAnswerItemMapper.xml

@@ -2,5 +2,47 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckAnswerItemMapper">
-    
+
+    <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckAnswerItem">
+        SELECT
+            *
+        FROM
+            ta_check_answer_item t
+        WHERE
+            t.answer_id = #{answerId}
+          AND t.`status` &gt; -1
+    </select>
+    <select id="getCountByAnswer" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM
+            ta_check_answer_item t
+        WHERE
+            t.answer_id = #{answerId}
+          AND t.`status` &gt; -1
+    </select>
+    <select id="getListByQu" resultType="com.example.civilizedcity.entity.TaCheckAnswerItem">
+        SELECT
+            t.*
+        FROM
+            ta_check_answer_item t
+                INNER JOIN ta_check_answer s ON s.answer_id = t.answer_id
+        WHERE
+            t.qu_id = #{quId}
+          <if test="null != isMine and isMine">
+              AND s.create_user = #{userId}
+          </if>
+          AND t.`status` &gt; -1
+        ORDER BY
+            t.create_date ASC
+    </select>
+    <select id="getListByAnswer" resultType="com.example.civilizedcity.entity.TaCheckAnswerItem">
+        SELECT
+            *
+        FROM
+            ta_check_answer_item t
+        WHERE
+            t.answer_id = #{answerId}
+          AND t.`status` &gt; -1
+    </select>
 </mapper>

src/main/resources/mapper/TaCheckAnswerMapper.xml

@@ -2,5 +2,55 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckAnswerMapper">
-    
+
+    <select id="countByItem" resultType="java.lang.Integer">
+        SELECT
+            count( 1 )
+        FROM
+            ta_check_answer t
+        WHERE
+            t.item_id = #{itemId}
+          AND t.`status` &gt; -1
+    </select>
+    <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckAnswer">
+        SELECT
+            *
+        FROM
+            ta_check_answer t
+        WHERE
+            t.item_id = #{itemId}
+          AND t.`status` &gt; -1
+    </select>
+    <select id="sumScore" resultType="java.lang.Double">
+        SELECT
+            sum( t.score )
+        FROM
+            ta_check_answer t
+        WHERE
+            t.item_id = #{itemId}
+          AND t.`status` &gt; - 1
+        ORDER BY
+            t.create_date ASC
+        LIMIT #{num}
+    </select>
+    <select id="getCountByUser" resultType="java.lang.Integer">
+        SELECT
+            count( 1 )
+        FROM
+            ta_check_answer t
+        WHERE
+            t.item_id = #{itemId}
+          AND t.create_user = #{userId}
+          AND t.`status` &gt; -1
+    </select>
+    <select id="getByUser" resultType="com.example.civilizedcity.entity.TaCheckAnswer">
+        SELECT
+            *
+        FROM
+            ta_check_answer t
+        WHERE
+            t.item_id = #{itemId}
+          AND t.create_user = #{userId}
+          AND t.`status` &gt; -1
+    </select>
 </mapper>

src/main/resources/mapper/TaCheckItemAnMapper.xml

@@ -2,5 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckItemAnMapper">
-    
+
+    <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckItemAn">
+        SELECT
+            *
+        FROM
+            ta_check_item_an t
+        WHERE
+            t.qu_id = #{quId}
+        ORDER BY
+            t.sort_no ASC
+    </select>
+    <select id="getOneBy" resultType="com.example.civilizedcity.entity.TaCheckItemAn">
+        SELECT
+            *
+        FROM
+            ta_check_item_an t
+        WHERE
+            t.qu_id = #{quId}
+          AND t.answer_code = #{answerCode}
+        LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/TaCheckItemMapper.xml

@@ -2,5 +2,63 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckItemMapper">
-    
+    <insert id="createNewLocItems">
+        INSERT INTO ta_check_item (item_id, check_id, item_type, type_id, `name`)
+        SELECT
+            UUID_SHORT(),
+            #{checkId},
+            'loc',
+            t.type_id,
+            t.`name`
+        FROM
+            td_loc_type t
+        WHERE
+            t.`status` &gt; -1
+        ORDER BY
+            t.sort_no ASC
+    </insert>
+
+    <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaCheckItem">
+        SELECT
+            IFNULL(m.num, 0) as answer_num,
+            t.*
+        FROM
+            ta_check_item t
+            INNER JOIN ta_check c ON c.check_id = t.check_id
+            <if test="itemType != null and itemType == 'loc'">
+                INNER JOIN td_loc_type s ON t.type_id = s.type_id
+            </if>
+            LEFT JOIN (
+                SELECT
+                    a.item_id,
+                    COUNT( * ) AS num
+                FROM
+                    ta_check_answer a
+                WHERE
+                    a.check_id = #{checkId}
+                GROUP BY
+                    a.item_id
+            ) m ON m.item_id = t.item_id
+        WHERE
+            t.check_id = #{checkId}
+          AND t.item_type = #{itemType}
+          AND t.`status` &gt; -1
+        ORDER BY
+        <if test="itemType != null and itemType == 'loc'">
+            s.sort_no ASC
+        </if>
+        <if test="itemType != null and itemType != 'loc'">
+            t.create_date ASC
+        </if>
+    </select>
+    <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckItem">
+        SELECT
+            t.*
+        FROM
+            ta_check_item t
+        WHERE
+            t.check_id = #{checkId}
+          AND t.item_type = #{itemType}
+          AND t.`status` &gt; -1
+    </select>
 </mapper>

src/main/resources/mapper/TaCheckItemQuMapper.xml

@@ -2,5 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckItemQuMapper">
-    
+
+    <select id="countByItem" resultType="java.lang.Integer">
+        SELECT
+            count( 1 )
+        FROM
+            ta_check_item_qu t
+        WHERE
+            t.item_id = #{itemId}
+    </select>
+    <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckItemQu">
+        SELECT
+            *
+        FROM
+            ta_check_item_qu t
+        WHERE
+            t.item_id = #{itemId}
+        ORDER BY t.sort_no ASC
+    </select>
 </mapper>