feats

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

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-7 19:46:05",
+  "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": "开始日期",
@@ -5605,7 +5639,7 @@
       "env": {
         "base": {
           "nameSpace": "com.example.civilizedcity",
-          "codeRoot": "TdQuestion"
+          "codeRoot": "TdLocQuestion"
         },
         "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": "答案",

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-8 15:14:39",
+  "updatedTime": "2023-1-8 19:41:30",
   "dbConns": [],
   "profile": {
     "default": {
@@ -5639,7 +5639,7 @@
       "env": {
         "base": {
           "nameSpace": "com.example.civilizedcity",
-          "codeRoot": "TdQuestion"
+          "codeRoot": "TdLocQuestion"
         },
         "template": {
           "JavaMybatisPlus": {

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;

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

@@ -1,10 +1,13 @@
 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;
@@ -15,8 +18,11 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TdQuestion;
 import com.example.civilizedcity.service.TdQuestionService;
 
- /**
+import java.util.List;
+
+/**
  * 点位问题;(td_question)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
@@ -24,15 +30,15 @@ import com.example.civilizedcity.service.TdQuestionService;
 @RestController
 @RequestMapping("/")
 public class TdQuestionController extends BaseController {
-    
+
     @Autowired
     private TdQuestionService tdQuestionService;
 
-     @Autowired
-     private TdQuAnswerService tdQuAnswerService;
-    
-    /** 
-     * 通过ID查询单条数据 
+    @Autowired
+    private TdQuAnswerService tdQuAnswerService;
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param quId 主键
      * @return 实例对象
@@ -42,28 +48,39 @@ public class TdQuestionController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(tdQuestionService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/tdQuestion")
-    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) throws Exception {
+
         IPage<TdQuestion> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TdQuestion> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TdQuestion> result = tdQuestionService.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 tdQuestion 实例对象
@@ -84,8 +101,8 @@ public class TdQuestionController extends BaseController {
         tdQuAnswerService.mergeData(tdQuestion.getQuId(), tdQuestion.getQuAnswerList());
         return ResponseBean.success(tdQuestion);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param tdQuestion 实例对象
@@ -94,12 +111,12 @@ public class TdQuestionController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/tdQuestion/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdQuestion tdQuestion,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
         tdQuestionService.updateById(tdQuestion);
         return ResponseBean.success(tdQuestion);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param quId 主键
@@ -107,7 +124,7 @@ public class TdQuestionController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/tdQuestion/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         tdQuestionService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -25,28 +25,25 @@ import lombok.experimental.Accessors;
 @ApiModel(value = "点位问题",description = "")
 @TableName("td_question")
 public class TdQuestion implements Serializable,Cloneable{
-    /** 问题ID */
-    @ApiModelProperty(name = "问题ID",notes = "")
-    @TableId(value = "qu_id", type = IdType.ASSIGN_UUID)
-    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 ;
 
      /**
       * 问题答案列表

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

@@ -7,11 +7,12 @@ 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);
+    boolean mergeData(String quId, List<TdQuAnswer> quAnswerList);
 
- List<TdQuAnswer> getListByQuId(String quId);
+    List<TdQuAnswer> getListByQuId(String quId);
 }

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

@@ -1,6 +1,7 @@
 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;
@@ -13,42 +14,44 @@ 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.orderByAsc("sort_no");
-
-  return list(queryWrapper);
- }
+    @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);
+    }
 }