feats

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

@@ -35,8 +35,12 @@ public class DateUtils {
     }
 
     public static String localDateTimeToString(LocalDateTime d) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        return d.format(formatter);
+        return toString(d, "yyyy-MM-dd HH:mm:ss");
+    }
+
+    public static String toString(LocalDateTime d, String formatter) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern(formatter);
+        return d.format(df);
     }
 
     public static LocalDateTime fromString(String str, String formatter) {

src/main/java/com/example/civilizedcity/common/excel/LocalDateTimeConverter.java

@@ -0,0 +1,39 @@
+package com.example.civilizedcity.common.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.example.civilizedcity.common.DateUtils;
+
+import java.time.LocalDateTime;
+
+public class LocalDateTimeConverter implements Converter<LocalDateTime> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return LocalDateTime.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 写 Excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public WriteCellData<?> convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+
+        String val = DateUtils.toString(value, "yyyy-MM-dd");
+
+        return new WriteCellData<String>(val);
+    }
+}

src/main/java/com/example/civilizedcity/common/excel/SexConverter.java

@@ -0,0 +1,44 @@
+package com.example.civilizedcity.common.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.text.SimpleDateFormat;
+
+public class SexConverter implements Converter<String> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 写 Excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public WriteCellData<?> convertToExcelData(String value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+
+        String val = "-";
+
+        if ("1".equals(value)) {
+            val = "男";
+        } else if ("2".equals(value)) {
+            val = "女";
+        }
+
+        return new WriteCellData<String>(val);
+    }
+}

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

@@ -1,6 +1,5 @@
 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;
@@ -10,7 +9,9 @@ import com.example.civilizedcity.common.ResponseBean;
 
 import java.util.List;
 
+import com.example.civilizedcity.vo.CheckLoc;
 import com.example.civilizedcity.vo.CheckLocAnswer;
+import com.example.civilizedcity.vo.CheckSurvey;
 import com.example.civilizedcity.vo.CheckSurveyAnswer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,7 +40,7 @@ public class TaCheckAnswerController extends BaseController {
     /**
      * 通过ID查询单条数据
      *
-     * @param answerId 主键
+     * @param id 主键
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
@@ -63,16 +64,43 @@ public class TaCheckAnswerController extends BaseController {
                              @ApiParam("测评ID") @RequestParam(value = "checkId") String checkId,
                              @ApiParam("点位ID") @RequestParam(value = "typeId", required = false) String typeId,
                              @ApiParam("社区") @RequestParam(value = "communityName", required = false) String communityName,
-                             @ApiParam("答卷类型") @RequestParam(value = "addr", required = false) String addr) throws Exception {
+                             @ApiParam("答卷类型") @RequestParam(value = "addr", required = false) String addr,
+                             @ApiParam("答题人") @RequestParam(value = "userName", required = false) String userName) throws Exception {
 
         IPage<TaCheckAnswer> page = new Page<>(pageNum, pageSize);
 
-        page = taCheckAnswerService.getPageBy(page, checkId, itemType, typeId, communityName, addr);
+        page = taCheckAnswerService.getPageBy(page, checkId, itemType, typeId, communityName, addr, userName);
 
         return ResponseBean.success(page);
     }
 
 
+    /**
+     * 答题详情导出
+     *
+     * @return 查询结果
+     */
+    @ApiOperation("答题详情导出")
+    @PostMapping("/taCheckAnswer/export")
+    public ResponseBean export(@ApiParam("答卷类型") @RequestParam(value = "itemType") String itemType,
+                               @ApiParam("测评ID") @RequestParam(value = "checkId") String checkId,
+                               @ApiParam("点位ID") @RequestParam(value = "typeId", required = false) String typeId,
+                               @ApiParam("社区") @RequestParam(value = "communityName", required = false) String communityName,
+                               @ApiParam("答卷类型") @RequestParam(value = "addr", required = false) String addr,
+                               @ApiParam("答题人") @RequestParam(value = "userName", required = false) String userName,
+                               HttpServletResponse response) throws Exception {
+
+        if (Constants.CHECK_OF_SURVEY.equals(itemType)) {
+            List<CheckSurvey> list = taCheckAnswerService.getList2By(checkId, itemType, typeId, communityName, addr, userName);
+            ExcelUtils.flush(response, CheckSurvey.class, list, "问卷调查答卷");
+        } else {
+            List<CheckLoc> list = taCheckAnswerService.getListBy(checkId, itemType, typeId, communityName, addr, userName);
+            ExcelUtils.flush(response, CheckLoc.class, list, "实地测评答卷");
+        }
+
+        return null;
+    }
+
     /**
      * 分页查询答题详情
      *
@@ -167,7 +195,7 @@ public class TaCheckAnswerController extends BaseController {
     /**
      * 通过主键删除数据
      *
-     * @param answerId 主键
+     * @param id 主键
      * @return 是否成功
      */
     @ApiOperation("通过主键删除数据")

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

@@ -10,21 +10,18 @@ import com.example.civilizedcity.common.*;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
-import com.example.civilizedcity.entity.SysUser;
-import com.example.civilizedcity.entity.TaAttach;
-import com.example.civilizedcity.entity.TaIssueProcess;
-import com.example.civilizedcity.service.SysUserDutyService;
-import com.example.civilizedcity.service.TaAttachService;
-import com.example.civilizedcity.service.TaIssueProcessService;
+import com.example.civilizedcity.entity.*;
+import com.example.civilizedcity.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.example.civilizedcity.entity.TaIssue;
-import com.example.civilizedcity.service.TaIssueService;
+
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 问题表;(ta_issue)表控制层
@@ -49,6 +46,9 @@ public class TaIssueController extends BaseController {
     @Autowired
     private SysUserDutyService sysUserDutyService;
 
+    @Autowired
+    private SysOrgService sysOrgService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -67,31 +67,16 @@ public class TaIssueController extends BaseController {
     }
 
     /**
-     * 分页查询
-     *
-     * @param pageNum  当前页码
-     * @param pageSize 每页条数
-     * @return 查询结果
+     * 构造 查询构造器
+     * @param sysUser
+     * @param bizStatus
+     * @param sourceType
+     * @param locId
+     * @param mine
+     * @param orgId
+     * @return
      */
-    @ApiOperation("分页查询")
-    @GetMapping("/taIssue")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                             @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
-                             @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
-                             @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
-                             @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine,
-                             @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId) throws Exception {
-
-        SysUser sysUser = currentUser();
-        boolean isRooter = Constants.ROOT_ID.equals(sysUser.getUserId());
-
-        List<String> dutyList = sysUserDutyService.getListByUser(sysUser.getUserId());
-        if (!isRooter && (dutyList == null || dutyList.size() < 1)) {
-            return ResponseBean.error("暂无权限查询数据");
-        }
-
-        IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
+    private QueryWrapper<TaIssue> buildQuery(SysUser sysUser, String bizStatus, String sourceType, String locId, Boolean mine, String orgId) {
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
 
         if (Constants.PROCESS_START.equals(bizStatus)) {
@@ -126,11 +111,102 @@ public class TaIssueController extends BaseController {
         queryWrapper.ne(!Constants.SOURCE_FEEDBACK.equals(sourceType), "source_type", Constants.SOURCE_FEEDBACK);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
+
+        return queryWrapper;
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @GetMapping("/taIssue")
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
+                             @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
+                             @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
+                             @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine,
+                             @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId) throws Exception {
+
+        SysUser sysUser = currentUser();
+        boolean isRooter = Constants.ROOT_ID.equals(sysUser.getUserId());
+
+        List<String> dutyList = sysUserDutyService.getListByUser(sysUser.getUserId());
+        if (!isRooter && (dutyList == null || dutyList.size() < 1)) {
+            return ResponseBean.error("暂无权限查询数据");
+        }
+
+        IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, bizStatus, sourceType, locId, mine, orgId);
         IPage<TaIssue> result = taIssueService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
     }
 
+
+    /**
+     * 导出
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("导出")
+    @PostMapping("/taIssue/export")
+    public ResponseBean export(@ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
+                               @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
+                               @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
+                               @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine,
+                               @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId,
+                               HttpServletResponse response) throws Exception {
+
+        SysUser sysUser = currentUser();
+        boolean isRooter = Constants.ROOT_ID.equals(sysUser.getUserId());
+
+        List<String> dutyList = sysUserDutyService.getListByUser(sysUser.getUserId());
+        if (!isRooter && (dutyList == null || dutyList.size() < 1)) {
+            return ResponseBean.error("暂无权限查询数据");
+        }
+
+        QueryWrapper<TaIssue> queryWrapper = buildQuery(sysUser, bizStatus, sourceType, locId, mine, orgId);
+        List<TaIssue> list = taIssueService.list(queryWrapper);
+
+        if (null != list && list.size() > 0) {
+            List<SysOrg> orgList = sysOrgService.list();
+            for (TaIssue taIssue : list) {
+
+                // 转换机构
+                if (StringUtils.isNotEmpty(taIssue.getOrgId())) {
+                    Optional<SysOrg> sysOrg = orgList.stream().filter(x -> x.getOrgId().equals(taIssue.getOrgId())).findFirst();
+                    if (sysOrg.isPresent()) {
+                        taIssue.setOrgId(sysOrg.get().getName());
+                    } else {
+                        taIssue.setOrgId(null);
+                    }
+                }
+
+                // 转换流程状态
+                String processNode = taIssue.getProcessNode();
+                if (processNode.equals(Constants.PROCESS_START)) {
+                    taIssue.setProcessNode("待交办");
+                } else if (processNode.equals(Constants.PROCESS_END)) {
+                    taIssue.setProcessNode("已办结");
+                } else if (StringUtils.isNotEmpty(taIssue.getExpireDate()) && LocalDateTime.now().isAfter(DateUtils.day2LocalDateime(taIssue.getExpireDate()))) {
+                    taIssue.setProcessNode("已逾期");
+                } else {
+                    taIssue.setProcessNode("已交办");
+                }
+            }
+        }
+
+        ExcelUtils.flush(response, TaIssue.class, list, "问题单列表");
+        return null;
+    }
+
     /**
      * 新增数据
      *

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

@@ -1,11 +1,16 @@
 package com.example.civilizedcity.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.example.civilizedcity.common.excel.LocalDateTimeConverter;
 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.Date;
@@ -15,104 +20,140 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
- /**
+/**
  * 问题表;
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value = "问题表",description = "")
+@ApiModel(value = "问题表", description = "")
 @TableName("ta_issue")
-public class TaIssue implements Serializable,Cloneable{
-      /** 问题ID */
-      @ApiModelProperty(name = "问题ID",notes = "")
-      @TableId(value = "issue_id", type = IdType.AUTO)
-      private Integer issueId ;
-      /** 标题 */
-      @ApiModelProperty(name = "标题",notes = "")
-      private String title ;
-      /** 所属分类 */
-      @ApiModelProperty(name = "所属分类",notes = "")
-      private String typeId ;
-      /** 分类名称 */
-      @ApiModelProperty(name = "分类名称",notes = "")
-      private String typeName ;
-      /** 点位ID */
-      @ApiModelProperty(name = "点位ID",notes = "")
-      private String locId ;
-       /** 点位名称 */
-       @ApiModelProperty(name = "点位名称",notes = "")
-       private String locName ;
-      /** 定位 */
-      @ApiModelProperty(name = "定位",notes = "")
-      private String location ;
-      /** 具体位置 */
-      @ApiModelProperty(name = "具体位置",notes = "")
-      private String addr ;
-      /** 问题详情 */
-      @ApiModelProperty(name = "问题详情",notes = "")
-      private String content ;
-      /** 流程节点 */
-      @ApiModelProperty(name = "流程节点",notes = "")
-      private String processNode ;
-      /** 处理状态 */
-      @ApiModelProperty(name = "处理状态",notes = "")
-      private String processStatus ;
-       /** 截止时间;YYYY-MM-DD */
-       @ApiModelProperty(name = "截止时间",notes = "YYYY-MM-DD")
-       private String expireDate ;
-     /** 办结时间 */
-     @ApiModelProperty(name = "办结时间",notes = "")
-     private LocalDateTime endDate ;
-      /** 交办次数 */
-      @ApiModelProperty(name = "交办次数",notes = "")
-      private Integer processNum ;
-      /** 责任单位 */
-      @ApiModelProperty(name = "责任单位",notes = "")
-      private String orgId ;
-      /** 来源类型;feedback市民上报,check模拟测评 */
-      @ApiModelProperty(name = "来源类型",notes = "feedback市民上报,check模拟测评")
-      private String sourceType ;
-      /** 来源ID */
-      @ApiModelProperty(name = "来源ID",notes = "")
-      private String sourceTarget ;
-
-       /** 当前申请类型 */
-       @ApiModelProperty(name = "当前申请类型",notes = "")
-       private String applyType ;
-       /** 当前申请ID */
-       @ApiModelProperty(name = "当前申请ID",notes = "")
-       private Integer applyId ;
-
-       /** 审核状态 */
-       @ApiModelProperty(name = "审核状态",notes = "")
-       private Integer validateStatus ;
-      /** 状态 */
-      @ApiModelProperty(name = "状态",notes = "")
-      private Integer status ;
-      /** 上报人 */
-      @ApiModelProperty(name = "上报人",notes = "")
-      private String createUser ;
-      /** 上报人名称 */
-      @ApiModelProperty(name = "上报人名称",notes = "")
-      private String userName ;
-      /** 上报人身份 */
-      @ApiModelProperty(name = "上报人身份",notes = "")
-      private String userDuty ;
-      /** 创建时间 */
-      @ApiModelProperty(name = "创建时间",notes = "")
-      private LocalDateTime createDate ;
-      /** 更新人 */
-      @ApiModelProperty(name = "更新人",notes = "")
-      private String updateUser ;
-      /** 更新时间 */
-      @ApiModelProperty(name = "更新时间",notes = "")
-      private LocalDateTime updateDate ;
-
-
-      @TableField(exist = false)
-       @ApiModelProperty(name = "文件列表",notes = "")
-      private List<TaAttach> attachList;
+public class TaIssue implements Serializable, Cloneable {
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "问题ID", notes = "")
+    @TableId(value = "issue_id", type = IdType.AUTO)
+    private Integer issueId;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "标题", notes = "")
+    private String title;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "所属分类", notes = "")
+    private String typeId;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "分类名称", notes = "")
+    private String typeName;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "点位ID", notes = "")
+    private String locId;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "点位", index = 1)
+    @ApiModelProperty(name = "点位名称", notes = "")
+    private String locName;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "定位", notes = "")
+    private String location;
+
+    @ColumnWidth(50)
+    @ExcelProperty(value = "位置", index = 2)
+    @ApiModelProperty(name = "具体位置", notes = "")
+    private String addr;
+
+    @ColumnWidth(80)
+    @ExcelProperty(value = "问题详情", index = 3)
+    @ApiModelProperty(name = "问题详情", notes = "")
+    private String content;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "流程状态", index = 5)
+    @ApiModelProperty(name = "流程节点", notes = "")
+    private String processNode;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "处理状态", notes = "")
+    private String processStatus;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "截止时间", index = 6)
+    @ApiModelProperty(name = "截止时间", notes = "YYYY-MM-DD")
+    private String expireDate;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "办结时间", notes = "")
+    private LocalDateTime endDate;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "交办次数", index = 7)
+    @ApiModelProperty(name = "交办次数", notes = "")
+    private Integer processNum;
+    /**
+     * 责任单位
+     */
+    @ColumnWidth(40)
+    @ExcelProperty(value = "责任单位", index = 4)
+    @ApiModelProperty(name = "责任单位", notes = "")
+    private String orgId;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "来源类型", notes = "feedback市民上报,check模拟测评")
+    private String sourceType;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "来源ID", notes = "")
+    private String sourceTarget;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "当前申请类型", notes = "")
+    private String applyType;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "当前申请ID", notes = "")
+    private Integer applyId;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "审核状态", notes = "")
+    private Integer validateStatus;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "状态", notes = "")
+    private Integer status;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "上报人", notes = "")
+    private String createUser;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "上报人名称", notes = "")
+    private String userName;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "上报人身份", notes = "")
+    private String userDuty;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "上报日期", index = 0, converter = LocalDateTimeConverter.class)
+    @ApiModelProperty(name = "创建时间", notes = "")
+    private LocalDateTime createDate;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "更新人", notes = "")
+    private String updateUser;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "更新时间", notes = "")
+    private LocalDateTime updateDate;
+
+    @ExcelIgnore
+    @TableField(exist = false)
+    @ApiModelProperty(name = "文件列表", notes = "")
+    private List<TaAttach> attachList;
 }

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

@@ -2,7 +2,9 @@ package com.example.civilizedcity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.vo.CheckLoc;
 import com.example.civilizedcity.vo.CheckLocAnswer;
+import com.example.civilizedcity.vo.CheckSurvey;
 import com.example.civilizedcity.vo.CheckSurveyAnswer;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -54,5 +56,20 @@ public interface TaCheckAnswerMapper extends BaseMapper<TaCheckAnswer> {
                                    @Param("itemType") String itemType,
                                    @Param("typeId") String typeId,
                                    @Param("communityName") String communityName,
-                                   @Param("addr") String addr);
+                                   @Param("addr") String addr,
+                                   @Param("userName") String userName);
+
+    List<CheckLoc> getCheckListBy(@Param("checkId") String checkId,
+                                  @Param("itemType") String itemType,
+                                  @Param("typeId") String typeId,
+                                  @Param("communityName") String communityName,
+                                  @Param("addr") String addr,
+                                  @Param("userName") String userName);
+
+    List<CheckSurvey> getCheckList2By(@Param("checkId") String checkId,
+                                      @Param("itemType") String itemType,
+                                      @Param("typeId") String typeId,
+                                      @Param("communityName") String communityName,
+                                      @Param("addr") String addr,
+                                      @Param("userName") String userName);
 }

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

@@ -2,7 +2,9 @@ package com.example.civilizedcity.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.entity.TaCheckAnswer;
+import com.example.civilizedcity.vo.CheckLoc;
 import com.example.civilizedcity.vo.CheckLocAnswer;
+import com.example.civilizedcity.vo.CheckSurvey;
 import com.example.civilizedcity.vo.CheckSurveyAnswer;
 
 import java.util.List;
@@ -29,5 +31,9 @@ public interface TaCheckAnswerService extends IBaseService<TaCheckAnswer> {
 
     List<CheckSurveyAnswer> getSurveyListBy(String checkId, String answerId, String communityName, String addr);
 
-    IPage<TaCheckAnswer> getPageBy(IPage<TaCheckAnswer> page, String checkId, String itemType, String typeId, String communityName, String addr);
+    IPage<TaCheckAnswer> getPageBy(IPage<TaCheckAnswer> page, String checkId, String itemType, String typeId, String communityName, String addr, String userName);
+
+    List<CheckLoc> getListBy(String checkId, String itemType, String typeId, String communityName, String addr, String userName);
+
+    List<CheckSurvey> getList2By(String checkId, String itemType, String typeId, String communityName, String addr, String userName);
 }

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

@@ -1,7 +1,9 @@
 package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.vo.CheckLoc;
 import com.example.civilizedcity.vo.CheckLocAnswer;
+import com.example.civilizedcity.vo.CheckSurvey;
 import com.example.civilizedcity.vo.CheckSurveyAnswer;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaCheckAnswer;
@@ -55,7 +57,17 @@ public class TaCheckAnswerServiceImpl extends BaseServiceImpl<TaCheckAnswerMappe
     }
 
     @Override
-    public IPage<TaCheckAnswer> getPageBy(IPage<TaCheckAnswer> page, String checkId, String itemType, String typeId, String communityName, String addr) {
-        return baseMapper.getPageBy(page, checkId, itemType, typeId, communityName, addr);
+    public IPage<TaCheckAnswer> getPageBy(IPage<TaCheckAnswer> page, String checkId, String itemType, String typeId, String communityName, String addr, String userName) {
+        return baseMapper.getPageBy(page, checkId, itemType, typeId, communityName, addr, userName);
+    }
+
+    @Override
+    public List<CheckLoc> getListBy(String checkId, String itemType, String typeId, String communityName, String addr, String userName) {
+        return baseMapper.getCheckListBy(checkId, itemType, typeId, communityName, addr, userName);
+    }
+
+    @Override
+    public List<CheckSurvey> getList2By(String checkId, String itemType, String typeId, String communityName, String addr, String userName) {
+        return baseMapper.getCheckList2By(checkId, itemType, typeId, communityName, addr, userName);
     }
 }

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

@@ -107,25 +107,28 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
         }
 
         if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
-            // 实地调查, 需要计算当前这份试卷的份数
+            // 实地调查, 需要计算当前这份试卷的分数
             double positiveScore = scores[0];
             double negativeScore = scores[1];
 
             // 每份试卷的得分 = 总分 / 份数
             double maxScore = taCheckItem.getFullScore()  / taCheckItem.getNum();
-            double totalScore = negativeScore + positiveScore;
-//            double totalScore = maxScore + negativeScore + positiveScore;
+            double score = negativeScore + positiveScore;
 //
-//            if (0 > totalScore) {
-//                // 如果扣分项太多
-//                totalScore = 0.0;
-//            }
-            if (totalScore > maxScore) {
-                // 如果得分超过总分
-                totalScore = maxScore;
+            if (score > 0) {
+                // 没有扣分就是满分
+                score = maxScore;
+            } else {
+                // 有扣分项, 总分 - 扣分
+                score = maxScore + score;
+            }
+
+            // 如果得分超过总分
+            if (score > maxScore) {
+                score = maxScore;
             }
 
-            taCheckAnswer.setScore(totalScore);
+            taCheckAnswer.setScore(score);
             taCheckAnswerMapper.insert(taCheckAnswer);
         }
     }
@@ -159,22 +162,17 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
                 // 如果是填空题, 用户填的应该是数字, 没填就是 0
                 Double an = StringUtils.isEmpty(item.getAnswer()) ? 0.0 : Double.parseDouble(item.getAnswer());
                 score = an * qu.getAnScore();
-                if (score > qu.getMaxScore()) {
-                    score = qu.getMaxScore();
-                }
-
-                score *= sign;
             } else if (Constants.QU_OF_RADIO.equals(qu.getQuType())) {
                 // 如果是选择题, 找到对应的答案
                 standAn = taCheckItemAnMapper.getOneBy(qu.getQuId(), item.getAnswerCode());
 
                 score = standAn.getScore();
-                if (score > qu.getMaxScore()) {
-                    score = qu.getMaxScore();
-                }
+            }
 
-                score *= sign;
+            if (score > qu.getMaxScore()) {
+                score = qu.getMaxScore();
             }
+            score *= sign;
 
             item.setItemId(StringUtils.uuid());
             item.setAnswerId(taCheckAnswer.getAnswerId());

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

@@ -65,22 +65,25 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
         for (TaCheckItem checkItem : checkItemList) {
             Double score = taCheckAnswerMapper.sumScore(checkItem.getItemId(), checkItem.getNum());
             double s = null == score ? 0.0 : score;
-            checkItem.setScore(s);
-            taCheckItemMapper.updateById(checkItem);
+
+            double maxScore = checkItem.getFullScore() / checkItem.getNum();
 
             // 如果得到正分, 说明试卷得了满分
             if (s > 0) {
-                s = checkItem.getFullScore();
+                s = maxScore;
             }
 
             // 如果产生扣分项
             if (s < 0) {
-                s = checkItem.getFullScore() + s;
+                s = maxScore + s;
                 if (s < 0) {
                     s = 0;
                 }
             }
 
+            checkItem.setScore(s);
+            taCheckItemMapper.updateById(checkItem);
+
             totalScore += s;
         }
 

src/main/java/com/example/civilizedcity/vo/CheckLoc.java

@@ -0,0 +1,44 @@
+package com.example.civilizedcity.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.example.civilizedcity.common.excel.LocalDateTimeConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("实地测评答案")
+public class CheckLoc {
+    @ColumnWidth(20)
+    @ExcelProperty(value = "点位名称", index = 2)
+    @ApiModelProperty("点位名称")
+    private String typeName;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "测评名称", index = 0)
+    @ApiModelProperty("测评名称")
+    private String checkTitle;
+
+    @ColumnWidth(60)
+    @ExcelProperty(value = "详细地址", index = 3)
+    @ApiModelProperty("详细地址")
+    private String addr;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "答题人", index = 4)
+    @ApiModelProperty("作答人")
+    private String userName;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "答题时间", index = 1, converter = LocalDateTimeConverter.class)
+    @ApiModelProperty("作答时间")
+    private LocalDateTime createDate;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "得分", index = 5)
+    @ApiModelProperty("得分")
+    private Float score;
+}

src/main/java/com/example/civilizedcity/vo/CheckSurvey.java

@@ -0,0 +1,56 @@
+package com.example.civilizedcity.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.example.civilizedcity.common.excel.LocalDateTimeConverter;
+import com.example.civilizedcity.common.excel.SexConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("调查问卷答案")
+public class CheckSurvey {
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "社区名称", index = 2)
+    @ApiModelProperty("社区名称")
+    private String communityName;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "小区名称", index = 3)
+    @ApiModelProperty("小区名称")
+    private String addr;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "测评名称", index = 0)
+    @ApiModelProperty("测评名称")
+    private String checkTitle;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "答题人", index = 4)
+    @ApiModelProperty("作答人")
+    private String userName;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "答题时间", index = 1, converter = LocalDateTimeConverter.class)
+    @ApiModelProperty("答题时间")
+    private LocalDateTime createDate;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "受访者性别", index = 5, converter = SexConverter.class)
+    @ApiModelProperty("受访者性别")
+    private String sex;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "受访者年龄段", index = 6)
+    @ApiModelProperty("受访者年龄段")
+    private String age;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "得分", index = 7)
+    @ApiModelProperty("得分")
+    private Float score;
+}

src/main/resources/mapper/TaCheckAnswerMapper.xml

@@ -149,30 +149,45 @@
     <select id="getSurveyListBy" resultType="com.example.civilizedcity.vo.CheckSurveyAnswer">
         <include refid="getSurveyAnswers"></include>
     </select>
-    <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaCheckAnswer">
+
+    <sql id="getCheckList">
         SELECT
             t.*,
             s.type_id,
-            s.`name` as type_name
+            s.`name` as type_name,
+            m.title as check_title
         FROM
             ta_check_answer t
-                INNER JOIN ta_check_item s ON t.item_id = s.item_id
+            INNER JOIN ta_check_item s ON t.item_id = s.item_id
+            INNER JOIN ta_check m ON t.check_id = m.check_id
         WHERE
             t.check_id = #{checkId}
-          <if test="itemType != null and itemType != ''">
-              AND s.item_type = #{itemType}
-          </if>
-        <if test="typeId != null and typeId != ''">
-            AND s.type_id = #{typeId}
-        </if>
-          <if test="communityName != null and communityName != ''">
-              AND t.community_name LIKE CONCAT( #{communityName}, '%' )
-          </if>
-          <if test="addr != null and addr != ''">
-              AND t.addr LIKE CONCAT( #{addr}, '%' )
-          </if>
-          AND t.`status` &gt; - 1
+            <if test="itemType != null and itemType != ''">
+                AND s.item_type = #{itemType}
+            </if>
+            <if test="typeId != null and typeId != ''">
+                AND s.type_id = #{typeId}
+            </if>
+            <if test="communityName != null and communityName != ''">
+                AND t.community_name LIKE CONCAT( #{communityName}, '%' )
+            </if>
+            <if test="addr != null and addr != ''">
+                AND t.addr LIKE CONCAT( #{addr}, '%' )
+            </if>
+            <if test="userName != null and userName != ''">
+                AND t.user_name LIKE CONCAT('%', #{userName}, '%' )
+            </if>
+            AND t.`status` &gt; - 1
         ORDER BY
             t.create_date DESC
+    </sql>
+    <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaCheckAnswer">
+        <include refid="getCheckList"></include>
+    </select>
+    <select id="getCheckListBy" resultType="com.example.civilizedcity.vo.CheckLoc">
+        <include refid="getCheckList"></include>
+    </select>
+    <select id="getCheckList2By" resultType="com.example.civilizedcity.vo.CheckSurvey">
+        <include refid="getCheckList"></include>
     </select>
 </mapper>