feats

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

@@ -26,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";

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

@@ -3,10 +3,7 @@ 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.common.*;
 import com.example.civilizedcity.service.TaCheckItemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -57,12 +54,16 @@ public class TaCheckController extends BaseController {
     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.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);

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

@@ -6,18 +6,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.*;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 
 import com.example.civilizedcity.entity.*;
-import com.example.civilizedcity.service.TaCheckAnswerService;
-import com.example.civilizedcity.service.TaCheckService;
-import com.example.civilizedcity.service.TdLocTypeService;
+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.service.TaCheckItemService;
 
 /**
  * 测评点位;(ta_check_item)表控制层
@@ -42,6 +40,9 @@ public class TaCheckItemController extends BaseController {
     @Autowired
     private TaCheckAnswerService taCheckAnswerService;
 
+    @Autowired
+    private TaCheckItemQuService taCheckItemQuService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -51,7 +52,12 @@ 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);
     }
 
     /**
@@ -91,10 +97,12 @@ 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) throws Exception {
+                             @ApiParam("项目类型") @RequestParam(value = "itemType") String itemType,
+                             @ApiParam("是否校验") @RequestParam(value = "mustValid", defaultValue = "false") Boolean mustValid) throws Exception {
 
+        SysUser sysUser = currentUser();
         IPage<TaCheckItem> pg = new Page<>(pageNum, pageSize);
-        IPage<TaCheckItem> result = taCheckItemService.getPageBy(pg, checkId, itemType);
+        IPage<TaCheckItem> result = taCheckItemService.getPageBy(pg, checkId, itemType, mustValid, sysUser);
 
         return ResponseBean.success(result);
     }
@@ -146,33 +154,48 @@ public class TaCheckItemController extends BaseController {
     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.error("未找到有效的答题信息");
+            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.error("未找到有效的测评信息");
+            return ResponseBean.success(new HashMap<String, Object>(){{
+                put("errorCode", -2);
+                put("message", "未找到有效的测评信息");
+            }});
         }
 
         if (LocalDateTime.now().isAfter(DateUtils.day2LocalDateime(taCheck.getEndDate()))) {
-            return ResponseBean.error("本次测评已结束");
+            return ResponseBean.success(new HashMap<String, Object>(){{
+                put("errorCode", 1);    // 正数代表, 只能查看
+                put("message", "本次测评已结束");
+            }});
         }
 
         SysUser sysUser = currentUser();
         int count = taCheckAnswerService.getCountByUser(taCheckItem.getItemId(), sysUser.getUserId());
         if (count > 0) {
-            return ResponseBean.error("本次测题您已作答完毕");
+            return ResponseBean.success(new HashMap<String, Object>(){{
+                put("errorCode", 2);
+                put("message", "本次测题您已作答完毕");
+            }});
         }
 
-        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
-            // 如果是实地问卷
-            int cnt = taCheckAnswerService.countByItem(taCheckItem.getItemId());
-            if (cnt >= taCheckItem.getNum()) {
-                return ResponseBean.error("当前实地问卷已收齐, 无须作答");
-            }
+        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(null);
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("errorCode", 0);    // 0 代表可以答题
+            put("message", null);
+        }});
     }
 
     /**

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

@@ -1,54 +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.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 ;
+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 Boolean readonly;
 }

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

@@ -19,4 +19,8 @@ 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);
 }

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

@@ -2,6 +2,7 @@ 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;
@@ -16,7 +17,11 @@ import java.util.List;
 @Mapper
 public interface TaCheckItemMapper  extends BaseMapper<TaCheckItem>{
 
-     IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, @Param("checkId") String checkId, @Param("itemType") String itemType);
+     IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg,
+                                  @Param("checkId") String checkId,
+                                  @Param("itemType") String itemType,
+                                  @Param("mustValid") Boolean mustValid,
+                                  @Param("userId") String userId);
 
      int createNewLocItems(@Param("checkId") String checkId);
 

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

@@ -1,13 +1,16 @@
 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);
+ }

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,7 @@
 package com.example.civilizedcity.service;
 
 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;
@@ -12,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);
+     IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, String checkId, String itemType, Boolean mustValid, SysUser sysUser);
 
      void createNewItems(TaCheck taCheck);
 

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

@@ -1,16 +1,24 @@
 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());
+    }
 }

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

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import com.example.civilizedcity.service.TaCheckItemService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -33,9 +34,12 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
     @Autowired
     TaCheckAnswerMapper taCheckAnswerMapper;
 
+    @Autowired
+    TaAttachMapper taAttachMapper;
+
     @Override
-    public IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, String checkId, String itemType) {
-        return baseMapper.getPageBy(pg, checkId, itemType);
+    public IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, String checkId, String itemType, Boolean mustValid, SysUser sysUser) {
+        return baseMapper.getPageBy(pg, checkId, itemType, mustValid, sysUser.getUserId());
     }
 
     @Override
@@ -77,6 +81,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             }
         }
 
+
         double[] scores = answerItems(taCheckItem, taCheckAnswer, quList, answerItemList);
 
         if (Constants.CHECK_OF_SURVEY.equals(taCheckItem.getItemType())) {
@@ -121,6 +126,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
      */
     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) {
@@ -154,6 +160,9 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             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) {
@@ -161,6 +170,18 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             } 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};

src/main/resources/mapper/TaCheckAnswerItemMapper.xml

@@ -21,4 +21,19 @@
             t.answer_id = #{answerId}
           AND t.`status` > -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>
 </mapper>

src/main/resources/mapper/TaCheckItemMapper.xml

@@ -20,12 +20,33 @@
 
     <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>
             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>
+            <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>
         WHERE
             t.check_id = #{checkId}
           AND t.item_type = #{itemType}

src/main/resources/mapper/TaCheckItemQuMapper.xml

@@ -18,5 +18,6 @@
             ta_check_item_qu t
         WHERE
             t.item_id = #{itemId}
+        ORDER BY t.sort_no ASC
     </select>
 </mapper>