feats

db/.back_文明创办/文明创办-backup-20221215163254.pdma.json → db/.back_文明创办/文明创办-backup-20221216155916.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-15 16:32:52",
+  "updatedTime": "2022-12-16 09:30:29",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4646,7 +4646,24 @@
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
         {
-          "defKey": "expire_date",
+          "defKey": "start_date",
+          "defName": "开始日期",
+          "comment": "YYYY-MM-DD",
+          "type": "VARCHAR",
+          "len": 20,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "79224057-EA94-4244-B887-4A046ACE7B35"
+        },
+        {
+          "defKey": "end_date",
           "defName": "截止时间",
           "comment": "YYYY-MM-DD",
           "type": "VARCHAR",

db/.back_文明创办/文明创办-backup-20221216093029.pdma.json → db/.back_文明创办/文明创办-backup-20221216202913.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-15 16:32:54",
+  "updatedTime": "2022-12-16 15:59:16",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4646,7 +4646,24 @@
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
         {
-          "defKey": "expire_date",
+          "defKey": "start_date",
+          "defName": "开始日期",
+          "comment": "YYYY-MM-DD",
+          "type": "VARCHAR",
+          "len": 20,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "79224057-EA94-4244-B887-4A046ACE7B35"
+        },
+        {
+          "defKey": "end_date",
           "defName": "截止时间",
           "comment": "YYYY-MM-DD",
           "type": "VARCHAR",
@@ -5063,6 +5080,23 @@
           "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "3274DF40-5C9F-49E0-8013-A8F8FC5B401A"
         },
+        {
+          "defKey": "type_id",
+          "defName": "点位ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "9E210B7C-B1A2-43DB-A734-11B2FA544C96"
+        },
         {
           "defKey": "name",
           "defName": "名称",

db/.back_文明创办/文明创办-backup-20221215163252.pdma.json → db/.back_文明创办/文明创办-backup-20221216202942.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-15 11:04:55",
+  "updatedTime": "2022-12-16 20:29:13",
   "dbConns": [],
   "profile": {
     "default": {
@@ -2408,7 +2408,7 @@
           "id": "31357233-866E-45C4-867D-1F11AD8CF851"
         },
         {
-          "defKey": "resource_p_id",
+          "defKey": "parent_id",
           "defName": "上级ID",
           "comment": "",
           "type": "",
@@ -4646,7 +4646,24 @@
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
         {
-          "defKey": "expire_date",
+          "defKey": "start_date",
+          "defName": "开始日期",
+          "comment": "YYYY-MM-DD",
+          "type": "VARCHAR",
+          "len": 20,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "79224057-EA94-4244-B887-4A046ACE7B35"
+        },
+        {
+          "defKey": "end_date",
           "defName": "截止时间",
           "comment": "YYYY-MM-DD",
           "type": "VARCHAR",
@@ -5063,6 +5080,23 @@
           "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "3274DF40-5C9F-49E0-8013-A8F8FC5B401A"
         },
+        {
+          "defKey": "type_id",
+          "defName": "点位ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "9E210B7C-B1A2-43DB-A734-11B2FA544C96"
+        },
         {
           "defKey": "name",
           "defName": "名称",
@@ -7004,9 +7038,32 @@
       "id": "507794C4-11E9-4924-AEC5-368BC6E03FD7",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaCheckItemAn"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_check_item_an",
       "defName": "项目问题答案",
@@ -7089,7 +7146,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-16 09:30:29",
+  "updatedTime": "2022-12-16 20:29:42",
   "dbConns": [],
   "profile": {
     "default": {
@@ -5080,6 +5080,23 @@
           "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "3274DF40-5C9F-49E0-8013-A8F8FC5B401A"
         },
+        {
+          "defKey": "type_id",
+          "defName": "点位ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "9E210B7C-B1A2-43DB-A734-11B2FA544C96"
+        },
         {
           "defKey": "name",
           "defName": "名称",
@@ -7021,9 +7038,32 @@
       "id": "507794C4-11E9-4924-AEC5-368BC6E03FD7",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaCheckItemAn"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_check_item_an",
       "defName": "项目问题答案",
@@ -7106,7 +7146,7 @@
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",

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

@@ -6,4 +6,8 @@ public class Constants {
     public final static int STATUS_DELETE = -1;
     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";  // 问卷调研
 }

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

@@ -61,7 +61,7 @@ public class SysOrgController extends BaseController {
 
         IPage<SysOrg> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isEmpty(name), "name", name);
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
         IPage<SysOrg> result = sysOrgService.page(pg, queryWrapper);

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

@@ -120,7 +120,7 @@ public class SysPositionController extends BaseController {
             return ResponseBean.error("名称已存在");
         }
 
-        sysPosition.setPositionPId(id);
+        sysPosition.setPositionId(id);
         sysPositionService.updateById(sysPosition);
         return ResponseBean.success(sysPosition);
     }

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

@@ -0,0 +1,101 @@
+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 java.util.List;
+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.TaCheckItemAn;
+import com.example.civilizedcity.service.TaCheckItemAnService;
+
+ /**
+ * 项目问题答案;(ta_check_item_an)表控制层
+ * @author : http://njyunzhi.com
+ * @date : 2022-12-16
+ */
+@Api(tags = "项目问题答案对象功能接口")
+@RestController
+@RequestMapping("/")
+public class TaCheckItemAnController extends BaseController {
+    
+    @Autowired
+    private TaCheckItemAnService taCheckItemAnService;
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param answerId 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taCheckItemAn/{id}")
+    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return ResponseBean.success(taCheckItemAnService.getById(id));
+    }
+    
+    /** 
+     * 分页查询
+     *
+     * @param pageNum 当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @GetMapping("/taCheckItemAn")
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+        
+        IPage<TaCheckItemAn> pg = new Page<>(pageNum, pageSize);
+        // QueryWrapper<TaCheckItemAn> queryWrapper = new QueryWrapper<>();
+        // queryWrapper.orderByDesc("create_date");
+        IPage<TaCheckItemAn> result = taCheckItemAnService.page(pg);
+        
+        return ResponseBean.success(result);
+    }
+    
+    /** 
+     * 新增数据
+     *
+     * @param taCheckItemAn 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @PostMapping("/taCheckItemAn")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaCheckItemAn taCheckItemAn) throws Exception {
+        taCheckItemAnService.save(taCheckItemAn);
+        return ResponseBean.success(taCheckItemAn);
+    }
+    
+    /** 
+     * 更新数据
+     *
+     * @param taCheckItemAn 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @PutMapping("/taCheckItemAn/{id}")
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheckItemAn taCheckItemAn,
+                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+        taCheckItemAnService.updateById(taCheckItemAn);
+        return ResponseBean.success(taCheckItemAn);
+    }
+    
+    /** 
+     * 通过主键删除数据
+     *
+     * @param answerId 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/taCheckItemAn/{id}")
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+        taCheckItemAnService.removeLogicById(id);
+        return ResponseBean.success("success");
+    }
+}

src/main/java/com/example/civilizedcity/controller/TaCheckItemController.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;
@@ -27,8 +32,8 @@ public class TaCheckItemController extends BaseController {
     @Autowired
     private TaCheckItemService taCheckItemService;
     
-    /** 
-     * 通过ID查询单条数据 
+    /**
+     * 通过ID查询单条数据
      *
      * @param itemId 主键
      * @return 实例对象
@@ -38,6 +43,31 @@ public class TaCheckItemController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(taCheckItemService.getById(id));
     }
+
+     /**
+      * 通过测评以及点位查询数据
+      *
+      * @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);
+
+        return taCheckItemService.getOne(queryWrapper);
+     }
     
     /** 
      * 分页查询
@@ -68,23 +98,35 @@ public class TaCheckItemController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taCheckItem")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaCheckItem taCheckItem) throws Exception {
-        taCheckItemService.save(taCheckItem);
+
+        TaCheckItem origin = getByCheckAndType(taCheckItem.getCheckId(), taCheckItem.getItemId());
+        if (null == origin) {
+            // 新增
+            taCheckItem.setStatus(Constants.STATUS_NORMAL);
+            taCheckItem.setCreateDate(LocalDateTime.now());
+            taCheckItemService.save(taCheckItem);
+        } else {
+            // 更新
+            taCheckItem.setItemId((origin.getItemId()));
+            taCheckItemService.updateById(taCheckItem);
+        }
+
         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);
-    }
+//    /**
+//     * 更新数据
+//     *
+//     * @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);
+//    }
     
     /** 
      * 通过主键删除数据

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

@@ -5,7 +5,11 @@ 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 java.util.List;
+
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.service.TaCheckItemAnService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +18,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaCheckItemQu;
 import com.example.civilizedcity.service.TaCheckItemQuService;
 
- /**
+/**
  * 点位问题;(ta_check_item_qu)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
@@ -23,12 +28,15 @@ import com.example.civilizedcity.service.TaCheckItemQuService;
 @RestController
 @RequestMapping("/")
 public class TaCheckItemQuController extends BaseController {
-    
+
     @Autowired
     private TaCheckItemQuService taCheckItemQuService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    @Autowired
+    private TaCheckItemAnService taCheckItemAnService;
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param id 主键
      * @return 实例对象
@@ -38,28 +46,30 @@ public class TaCheckItemQuController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
         return ResponseBean.success(taCheckItemQuService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taCheckItemQu")
-    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 = "itemId") String itemId) throws Exception {
+
         IPage<TaCheckItemQu> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaCheckItemQu> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaCheckItemQu> result = taCheckItemQuService.page(pg);
-        
+        QueryWrapper<TaCheckItemQu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("item_id", itemId);
+        queryWrapper.orderByDesc("sort_no");
+        IPage<TaCheckItemQu> result = taCheckItemQuService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taCheckItemQu 实例对象
@@ -68,25 +78,37 @@ public class TaCheckItemQuController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taCheckItemQu")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaCheckItemQu taCheckItemQu) throws Exception {
-        taCheckItemQuService.save(taCheckItemQu);
-        return ResponseBean.success(taCheckItemQu);
-    }
-    
-    /** 
-     * 更新数据
-     *
-     * @param taCheckItemQu 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("更新数据")
-    @PutMapping("/taCheckItemQu/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheckItemQu taCheckItemQu,
-                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
-        taCheckItemQuService.updateById(taCheckItemQu);
+        String quId = taCheckItemQu.getQuId();
+
+        if (StringUtils.isEmpty(quId)) {
+            // 新增
+            int maxNo = taCheckItemQuService.getMaxNoBy(taCheckItemQu.getItemId());
+            taCheckItemQu.setSortNo(maxNo + 1);
+            taCheckItemQuService.save(taCheckItemQu);
+        } else {
+            taCheckItemQuService.updateById(taCheckItemQu);
+        }
+
+        taCheckItemAnService.mergeData(taCheckItemQu.getQuId(), taCheckItemQu.getAnswerList());
+
         return ResponseBean.success(taCheckItemQu);
     }
-    
-    /** 
+
+//    /**
+//     * 更新数据
+//     *
+//     * @param taCheckItemQu 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/taCheckItemQu/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheckItemQu taCheckItemQu,
+//                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+//        taCheckItemQuService.updateById(taCheckItemQu);
+//        return ResponseBean.success(taCheckItemQu);
+//    }
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键
@@ -94,7 +116,7 @@ public class TaCheckItemQuController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taCheckItemQu/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
         taCheckItemQuService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -22,30 +22,39 @@ import lombok.experimental.Accessors;
 @ApiModel(value = "测评点位",description = "")
 @TableName("ta_check_item")
 public class TaCheckItem implements Serializable,Cloneable{
-      /** 点位ID */
-      @ApiModelProperty(name = "点位ID",notes = "")
-      @TableId(value = "item_id", type = IdType.INPUT)
-      private String itemId ;
-      /** 所属测评 */
-      @ApiModelProperty(name = "所属测评",notes = "")
-      private String checkId ;
-      /** 名称 */
-      @ApiModelProperty(name = "名称",notes = "")
-      private String name ;
-      /** 满分 */
-      @ApiModelProperty(name = "满分",notes = "")
-      private Double score ;
-      /** 事件份数 */
-      @ApiModelProperty(name = "事件份数",notes = "")
-      private Integer examinationNum ;
-      /** 状态 */
-      @ApiModelProperty(name = "状态",notes = "")
-      private Integer status ;
-      /** 创建人 */
-      @ApiModelProperty(name = "创建人",notes = "")
-      private String createUser ;
-      /** 创建时间 */
-      @ApiModelProperty(name = "创建时间",notes = "")
-      private LocalDateTime createDate ;
+       /** 点位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 ;
 
 }

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

@@ -0,0 +1,45 @@
+package com.example.civilizedcity.entity;
+
+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-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "项目问题答案",description = "")
+@TableName("ta_check_item_an")
+public class TaCheckItemAn implements Serializable,Cloneable{
+    /** 答案ID */
+    @ApiModelProperty(name = "答案ID",notes = "")
+    @TableId(value = "answer_id", type = IdType.ASSIGN_UUID)
+    private String answerId ;
+    /** 问题ID */
+    @ApiModelProperty(name = "问题ID",notes = "")
+    private String quId ;
+    /** 答案选项;ABCD等 */
+    @ApiModelProperty(name = "答案选项",notes = "ABCD等")
+    private String answerCode ;
+    /** 答案 */
+    @ApiModelProperty(name = "答案",notes = "")
+    private String answer ;
+    /** 分值 */
+    @ApiModelProperty(name = "分值",notes = "")
+    private Double score ;
+    /** 排序 */
+    @ApiModelProperty(name = "排序",notes = "")
+    private Integer sortNo ;
+
+}

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

@@ -7,6 +7,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;
@@ -51,4 +53,8 @@ public class TaCheckItemQu implements Serializable,Cloneable{
      @ApiModelProperty(name = "序号",notes = "")
      private Integer sortNo ;
 
+      /**
+       * 答案列表
+       */
+     List<TaCheckItemAn> answerList;
 }

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

@@ -0,0 +1,16 @@
+package com.example.civilizedcity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.example.civilizedcity.entity.TaCheckItemAn;
+
+ /**
+ * 项目问题答案;(ta_check_item_an)表数据库访问层
+ * @author : http://njyunzhi.com
+ * @date : 2022-12-16
+ */
+@Mapper
+public interface TaCheckItemAnMapper  extends BaseMapper<TaCheckItemAn>{
+    
+}

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

@@ -0,0 +1,16 @@
+package com.example.civilizedcity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.civilizedcity.entity.TaCheckItemAn;
+
+import java.util.List;
+
+/**
+ * 项目问题答案;(ta_check_item_an)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2022-12-16
+ */
+public interface TaCheckItemAnService extends IBaseService<TaCheckItemAn> {
+
+     boolean mergeData(String quId, List<TaCheckItemAn> answerList);
+ }

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

@@ -9,5 +9,6 @@ import com.example.civilizedcity.entity.TaCheckItemQu;
  * @date : 2022-12-13
  */
 public interface TaCheckItemQuService extends IBaseService<TaCheckItemQu> {
-    
-}
+
+     int getMaxNoBy(String itemId);
+ }

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

@@ -0,0 +1,43 @@
+package com.example.civilizedcity.service.impl;
+
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.SysRole;
+import com.example.civilizedcity.entity.SysUserRole;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.example.civilizedcity.entity.TaCheckItemAn;
+import com.example.civilizedcity.mapper.TaCheckItemAnMapper;
+import com.example.civilizedcity.service.TaCheckItemAnService;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 项目问题答案;(ta_check_item_an)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2022-12-16
+ */
+@Service
+public class TaCheckItemAnServiceImpl extends BaseServiceImpl<TaCheckItemAnMapper, TaCheckItemAn> implements TaCheckItemAnService {
+
+    @Override
+    public boolean mergeData(String quId, List<TaCheckItemAn> answerList) {
+        if (StringUtils.isEmpty(quId)) return false;
+
+        // 先删除所有
+        baseMapper.deleteByMap(new HashMap<String, Object>() {{
+            put("qu_id", quId);
+        }});
+
+        for (int i = 0; i < answerList.size(); i ++) {
+            TaCheckItemAn item = answerList.get(i);
+            // 重新排序
+            item.setSortNo(i + 1);
+            save(item);
+        }
+
+        return true;
+    }
+}

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

@@ -1,16 +1,28 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaCheckItemQu;
 import com.example.civilizedcity.mapper.TaCheckItemQuMapper;
 import com.example.civilizedcity.service.TaCheckItemQuService;
- /**
+
+/**
  * 点位问题;(ta_check_item_qu)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-13
  */
 @Service
 public class TaCheckItemQuServiceImpl extends BaseServiceImpl<TaCheckItemQuMapper, TaCheckItemQu> implements TaCheckItemQuService {
-    
+
+    @Override
+    public int getMaxNoBy(String itemId) {
+        QueryWrapper<TaCheckItemQu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("item_id", itemId);
+        queryWrapper.orderByDesc("sort_no");
+
+        TaCheckItemQu one = getOne(queryWrapper);
+        return null == one ? 0 : one.getSortNo();
+    }
 }

src/main/resources/mapper/TaCheckItemAnMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.example.civilizedcity.mapper.TaCheckItemAnMapper">
+    
+</mapper>