feats

db/.back_文明创办/文明创办-backup-20221216155916.pdma.json → db/.back_文明创办/文明创办-backup-20221218172610.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",

db/文明创办.pdma.json

@@ -2,9 +2,9 @@
   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.1.4",
+  "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-16 20:29:42",
+  "updatedTime": "2022-12-18 17:26:10",
   "dbConns": [],
   "profile": {
     "default": {
@@ -493,7 +493,8 @@
         "refKey": "extProps",
         "hideInGraph": true
       }
-    ]
+    ],
+    "modelType": "modalGroup"
   },
   "entities": [
     {

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

@@ -5,7 +5,9 @@ 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;
@@ -14,8 +16,9 @@ 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
  */
@@ -23,12 +26,12 @@ import com.example.civilizedcity.service.TaCheckItemAnService;
 @RestController
 @RequestMapping("/")
 public class TaCheckItemAnController extends BaseController {
-    
+
     @Autowired
     private TaCheckItemAnService taCheckItemAnService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param answerId 主键
      * @return 实例对象
@@ -38,28 +41,26 @@ public class TaCheckItemAnController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(taCheckItemAnService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
-     * @param pageSize 每页条数
+     * @param quId 问题ID
      * @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);
-        
+    public ResponseBean list(@ApiParam("问题ID") @RequestParam(value = "quId") String quId) throws Exception {
+
+        QueryWrapper<TaCheckItemAn> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("qu_id", quId);
+        queryWrapper.orderByAsc("sort_no");
+        List<TaCheckItemAn> result = taCheckItemAnService.list(queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taCheckItemAn 实例对象
@@ -71,8 +72,8 @@ public class TaCheckItemAnController extends BaseController {
         taCheckItemAnService.save(taCheckItemAn);
         return ResponseBean.success(taCheckItemAn);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taCheckItemAn 实例对象
@@ -81,12 +82,12 @@ public class TaCheckItemAnController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taCheckItemAn/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheckItemAn taCheckItemAn,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
         taCheckItemAnService.updateById(taCheckItemAn);
         return ResponseBean.success(taCheckItemAn);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param answerId 主键
@@ -94,7 +95,7 @@ public class TaCheckItemAnController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taCheckItemAn/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taCheckItemAnService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -9,6 +9,7 @@ import com.example.civilizedcity.common.ResponseBean;
 import java.util.List;
 
 import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.TaCheckItemAn;
 import com.example.civilizedcity.service.TaCheckItemAnService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -66,6 +67,14 @@ public class TaCheckItemQuController extends BaseController {
         queryWrapper.orderByDesc("sort_no");
         IPage<TaCheckItemQu> result = taCheckItemQuService.page(pg, queryWrapper);
 
+        List<TaCheckItemQu> quList = result.getRecords();
+        if (quList != null && quList.size() > 0) {
+            for (TaCheckItemQu item : quList) {
+                List<TaCheckItemAn> answerList = taCheckItemAnService.getListByQuId(item.getQuId());
+                item.setAnswerList(answerList);
+            }
+        }
+
         return ResponseBean.success(result);
     }
 

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

@@ -68,6 +68,7 @@ public class TdLocTypeController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/tdLocType")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TdLocType tdLocType) throws Exception {
+        tdLocType.setTypeId(null);
         tdLocTypeService.save(tdLocType);
         return ResponseBean.success(tdLocType);
     }

src/main/java/com/example/civilizedcity/entity/TaCheckItemQu.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;
@@ -56,5 +57,6 @@ public class TaCheckItemQu implements Serializable,Cloneable{
       /**
        * 答案列表
        */
+      @TableField(exist = false)
      List<TaCheckItemAn> answerList;
 }

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

@@ -13,4 +13,6 @@ import java.util.List;
 public interface TaCheckItemAnService extends IBaseService<TaCheckItemAn> {
 
      boolean mergeData(String quId, List<TaCheckItemAn> answerList);
- }
+
+    List<TaCheckItemAn> getListByQuId(String quId);
+}

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

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysRole;
 import com.example.civilizedcity.entity.SysUserRole;
@@ -33,6 +34,7 @@ public class TaCheckItemAnServiceImpl extends BaseServiceImpl<TaCheckItemAnMappe
 
         for (int i = 0; i < answerList.size(); i ++) {
             TaCheckItemAn item = answerList.get(i);
+            item.setQuId(quId);
             // 重新排序
             item.setSortNo(i + 1);
             save(item);
@@ -40,4 +42,13 @@ public class TaCheckItemAnServiceImpl extends BaseServiceImpl<TaCheckItemAnMappe
 
         return true;
     }
+
+    @Override
+    public List<TaCheckItemAn> getListByQuId(String quId) {
+        QueryWrapper<TaCheckItemAn> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("qu_id", quId);
+        queryWrapper.orderByAsc("sort_no");
+
+        return list(queryWrapper);
+    }
 }