feats

db/.back_文明创办/文明创办-backup-202318151432.pdma.json → db/.back_文明创办/文明创办-backup-2023111150516.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-7 20:25:36",
+  "updatedTime": "2023-1-11 15:04:02",
   "dbConns": [],
   "profile": {
     "default": {
@@ -5639,7 +5639,7 @@
       "env": {
         "base": {
           "nameSpace": "com.example.civilizedcity",
-          "codeRoot": "TdQuestion"
+          "codeRoot": "TdLocQuestion"
         },
         "template": {
           "JavaMybatisPlus": {
@@ -6291,6 +6291,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": "评分标准",
@@ -6483,6 +6500,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": "答案",
@@ -7358,6 +7392,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": "排序",

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-8 19:41:30",
+  "updatedTime": "2023-1-11 15:05:16",
   "dbConns": [],
   "profile": {
     "default": {
@@ -6291,6 +6291,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": "评分标准",
@@ -7375,6 +7392,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/controller/TaCheckItemController.java

@@ -43,6 +43,9 @@ public class TaCheckItemController extends BaseController {
     @Autowired
     private TaCheckItemQuService taCheckItemQuService;
 
+    @Autowired
+    private TaCheckAnswerItemService taCheckAnswerItemService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -70,17 +73,27 @@ public class TaCheckItemController extends BaseController {
     @ApiOperation("通过测评以及点位查询数据")
     @GetMapping("/taCheck/{checkId}/item/{typeId}")
     public ResponseBean queryByCheckId(@ApiParam("测评ID") @PathVariable String checkId,
-                                       @ApiParam("点位ID") @PathVariable String typeId) throws Exception {
+                                       @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(getByCheckAndType(checkId, typeId));
+        return ResponseBean.success(taCheckItem);
     }
 
     private TaCheckItem getByCheckAndType(String checkId, String typeId) {
         QueryWrapper<TaCheckItem> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("check_id", checkId);
-        queryWrapper.eq("item_type", Constants.CHECK_OF_LOC); // 只查点位
-        queryWrapper.eq("type_id", typeId);
+
+        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);
     }
@@ -97,12 +110,11 @@ public class TaCheckItemController extends BaseController {
     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,
-                             @ApiParam("是否校验") @RequestParam(value = "mustValid", defaultValue = "false") Boolean mustValid) throws Exception {
+                             @ApiParam("项目类型") @RequestParam(value = "itemType") String itemType) throws Exception {
 
         SysUser sysUser = currentUser();
         IPage<TaCheckItem> pg = new Page<>(pageNum, pageSize);
-        IPage<TaCheckItem> result = taCheckItemService.getPageBy(pg, checkId, itemType, mustValid, sysUser);
+        IPage<TaCheckItem> result = taCheckItemService.getPageBy(pg, checkId, itemType);
 
         return ResponseBean.success(result);
     }
@@ -175,15 +187,6 @@ public class TaCheckItemController extends BaseController {
             }});
         }
 
-        SysUser sysUser = currentUser();
-        int count = taCheckAnswerService.getCountByUser(taCheckItem.getItemId(), sysUser.getUserId());
-        if (count > 0) {
-            return ResponseBean.success(new HashMap<String, Object>(){{
-                put("errorCode", 2);
-                put("message", "本次测题您已作答完毕");
-            }});
-        }
-
         int cnt = taCheckAnswerService.countByItem(taCheckItem.getItemId());
         if (cnt >= taCheckItem.getNum()) {
             return ResponseBean.success(new HashMap<String, Object>(){{
@@ -198,6 +201,21 @@ public class TaCheckItemController extends BaseController {
         }});
     }
 
+    /**
+     * 获取回答
+     *
+     * @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);
+    }
+
     /**
      * 回答问题
      *
@@ -209,6 +227,7 @@ public class TaCheckItemController extends BaseController {
     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("未找到有效的答题信息");
@@ -227,7 +246,11 @@ public class TaCheckItemController extends BaseController {
             return ResponseBean.error("测评地点详情或小区名称未填写");
         }
 
-        SysUser sysUser = currentUser();
+        int count = taCheckAnswerService.getCountByUser(id, sysUser.getUserId());
+        if (count > 0) {
+            return ResponseBean.error("您已完成测评作答");
+        }
+
         taCheckAnswer.setAnswerId(StringUtils.uuid());
         taCheckAnswer.setCheckId(taCheck.getCheckId());
         taCheckAnswer.setItemId(id);
@@ -237,7 +260,7 @@ public class TaCheckItemController extends BaseController {
         taCheckAnswer.setCreateDate(LocalDateTime.now());
 
         taCheckItemService.answer(taCheckItem, taCheckAnswer);
-        return null;
+        return ResponseBean.success(taCheckAnswer);
     }
 
     /**

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

@@ -85,5 +85,5 @@ public class TaCheckItem implements Serializable, Cloneable {
 
     @TableField(exist = false)
     @ApiModelProperty(name = "是否只读, 只读代表不需要答题")
-    private Boolean readonly;
+    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/mapper/TaCheckAnswerItemMapper.java

@@ -23,4 +23,6 @@ public interface TaCheckAnswerItemMapper extends BaseMapper<TaCheckAnswerItem> {
     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

@@ -23,4 +23,6 @@ public interface TaCheckAnswerMapper extends BaseMapper<TaCheckAnswer> {
     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/TaCheckItemMapper.java

@@ -19,9 +19,7 @@ public interface TaCheckItemMapper  extends BaseMapper<TaCheckItem>{
 
      IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg,
                                   @Param("checkId") String checkId,
-                                  @Param("itemType") String itemType,
-                                  @Param("mustValid") Boolean mustValid,
-                                  @Param("userId") String userId);
+                                  @Param("itemType") String itemType);
 
      int createNewLocItems(@Param("checkId") String checkId);
 

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

@@ -13,4 +13,6 @@ import java.util.List;
 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,6 +3,8 @@ 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)表服务接口
  *
@@ -14,4 +16,6 @@ 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/TaCheckItemService.java

@@ -13,7 +13,7 @@ import com.example.civilizedcity.entity.TaCheckItem;
  */
 public interface TaCheckItemService extends IBaseService<TaCheckItem> {
 
-     IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, String checkId, String itemType, Boolean mustValid, SysUser sysUser);
+     IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, String checkId, String itemType);
 
      void createNewItems(TaCheck taCheck);
 

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

@@ -21,4 +21,9 @@ public class TaCheckAnswerItemServiceImpl extends BaseServiceImpl<TaCheckAnswerI
     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

@@ -6,6 +6,8 @@ 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)表服务实现类
  *
@@ -24,4 +26,9 @@ public class TaCheckAnswerServiceImpl extends BaseServiceImpl<TaCheckAnswerMappe
     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/TaCheckItemServiceImpl.java

@@ -38,8 +38,8 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
     TaAttachMapper taAttachMapper;
 
     @Override
-    public IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, String checkId, String itemType, Boolean mustValid, SysUser sysUser) {
-        return baseMapper.getPageBy(pg, checkId, itemType, mustValid, sysUser.getUserId());
+    public IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, String checkId, String itemType) {
+        return baseMapper.getPageBy(pg, checkId, itemType);
     }
 
     @Override

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:

src/main/resources/mapper/TaCheckAnswerItemMapper.xml

@@ -36,4 +36,13 @@
         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

@@ -43,4 +43,14 @@
           AND t.create_user = #{userId}
           AND t.`status` > -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/TaCheckItemMapper.xml

@@ -20,12 +20,7 @@
 
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaCheckItem">
         SELECT
-        <if test="null != mustValid and mustValid">
-            now() &lt; c.start_date
-            OR now() &gt; c.end_date
-            OR m.num &gt; t.num
-            OR IFNULL( m.answered, 0 ) &gt; 0 as readonly,
-        </if>
+            IFNULL(m.num, 0) as answer_num,
             t.*
         FROM
             ta_check_item t
@@ -33,20 +28,17 @@
             <if test="itemType != null and itemType == 'loc'">
                 INNER JOIN td_loc_type s ON t.type_id = s.type_id
             </if>
-            <if test="null != mustValid and mustValid">
-                LEFT JOIN (
-                    SELECT
-                        a.item_id,
-                        COUNT( * ) AS num,
-                        SUM( IF ( a.create_user = #{userId}, 1, 0 ) ) AS answered
-                    FROM
-                        ta_check_answer a
-                    WHERE
-                        a.check_id = #{checkId}
-                    GROUP BY
-                        a.item_id
-                ) m ON m.item_id = t.item_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}