feats

db/.back_文明创办/文明创办-backup-2023212194146.pdma.json → db/.back_文明创办/文明创办-backup-2023216160334.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-12 19:41:01",
+  "updatedTime": "2023-2-13 11:18:21",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3542,7 +3542,7 @@
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
@@ -6867,7 +6867,7 @@
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-12 19:41:46",
+  "updatedTime": "2023-2-16 16:03:34",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3542,7 +3542,7 @@
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
@@ -5219,7 +5219,7 @@
       "fields": [
         {
           "defKey": "item_id",
-          "defName": "点位ID",
+          "defName": "测评项目ID",
           "comment": "",
           "type": "",
           "len": 32,
@@ -6867,7 +6867,7 @@
           "defName": "定位",
           "comment": "",
           "type": "VARCHAR",
-          "len": 32,
+          "len": 64,
           "scale": "",
           "primaryKey": false,
           "notNull": false,

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

@@ -138,6 +138,13 @@ public class SysUserController extends BaseController {
         queryWrapper.orderByDesc("create_date");
         IPage<SysUser> result = sysUserService.page(pg, queryWrapper);
 
+        List<SysUser> list = result.getRecords();
+        if (null != list || list.size() > 0) {
+            for (SysUser sysUser : list) {
+                sysUser.setDutyList(sysUserDutyService.getListByUser(sysUser.getUserId()));
+            }
+        }
+
         return ResponseBean.success(result);
     }
 
@@ -184,7 +191,7 @@ public class SysUserController extends BaseController {
             }
 
             sysUser.setUserId(origin.getUserId());
-            if (Constants.STATUS_DELETE == sysUser.getStatus()) {
+            if (null != sysUser.getStatus() && Constants.STATUS_DELETE == sysUser.getStatus()) {
                 // 如果这个人被删除了, 则重置为正常状态
                 sysUser.setStatus(Constants.STATUS_NORMAL);
             }

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

@@ -7,6 +7,7 @@ import com.example.civilizedcity.common.BaseController;
 import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ExcelUtils;
 import com.example.civilizedcity.common.ResponseBean;
+
 import java.util.List;
 
 import com.example.civilizedcity.vo.CheckLocAnswer;
@@ -23,6 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 
 /**
  * 测评作答;(ta_check_answer)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
@@ -30,12 +32,12 @@ import javax.servlet.http.HttpServletResponse;
 @RestController
 @RequestMapping("/")
 public class TaCheckAnswerController extends BaseController {
-    
+
     @Autowired
     private TaCheckAnswerService taCheckAnswerService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param answerId 主键
      * @return 实例对象
@@ -45,69 +47,97 @@ public class TaCheckAnswerController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(taCheckAnswerService.getById(id));
     }
-    
-    /** 
-     * 分页查询
+
+    /**
+     * 分页查询答题详情
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
-    @ApiOperation("分页查询")
+    @ApiOperation("分页查询答题详情")
     @GetMapping("/taCheckAnswer")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                             @ApiParam("答卷类型") @RequestParam(value ="itemType", defaultValue = "loc") String itemType,
-                             @ApiParam("测评ID") @RequestParam(value ="checkId", required = false) 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 {
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @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) throws Exception {
+
+        IPage<TaCheckAnswer> page = new Page<>(pageNum, pageSize);
+
+        page = taCheckAnswerService.getPageBy(page, checkId, itemType, typeId, communityName, addr);
+
+        return ResponseBean.success(page);
+    }
+
+
+    /**
+     * 分页查询答题详情
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询答题详情")
+    @GetMapping("/taCheckAnswer/{answerId}/detail")
+    public ResponseBean listDetail(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                   @ApiParam("答案ID") @PathVariable String answerId,
+                                   @ApiParam("答卷类型") @RequestParam(value = "itemType", required = false) String itemType,
+                                   @ApiParam("测评ID") @RequestParam(value = "checkId", required = false) 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 {
 
         if (Constants.CHECK_OF_LOC.equals(itemType)) {
             IPage<CheckLocAnswer> pg = new Page<>(pageNum, pageSize);
-            IPage<CheckLocAnswer> result = taCheckAnswerService.getLocPageBy(pg, checkId, typeId);
+            IPage<CheckLocAnswer> result = taCheckAnswerService.getLocPageBy(pg, checkId, typeId, answerId);
             return ResponseBean.success(result);
         }
 
         if (Constants.CHECK_OF_SURVEY.equals(itemType)) {
             IPage<CheckSurveyAnswer> pg = new Page<>(pageNum, pageSize);
-            IPage<CheckSurveyAnswer> result = taCheckAnswerService.getSurveyPageBy(pg, checkId, communityName, addr);
+            IPage<CheckSurveyAnswer> result = taCheckAnswerService.getSurveyPageBy(pg, checkId, answerId, communityName, addr);
             return ResponseBean.success(result);
         }
 
         return ResponseBean.error("非法的答卷类型");
     }
 
-     /**
-      * 导出
-      *
-      * @return 查询结果
-      */
-     @ApiOperation("导出")
-     @GetMapping("/taCheckAnswer/export")
-     public ResponseBean export(@ApiParam("答卷类型") @RequestParam(value ="itemType", defaultValue = "loc") String itemType,
-                                @ApiParam("测评ID") @RequestParam(value ="checkId", required = false) 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,
-                                HttpServletResponse response) throws Exception {
-
-         if (Constants.CHECK_OF_LOC.equals(itemType)) {
-             List<CheckLocAnswer> result = taCheckAnswerService.getLocListBy(checkId, typeId);
-             ExcelUtils.flush(response, CheckLocAnswer.class, result, "实地测评答案明细");
-             return null;
-         }
-
-         if (Constants.CHECK_OF_SURVEY.equals(itemType)) {
-             List<CheckSurveyAnswer> result = taCheckAnswerService.getSurveyListBy(checkId, communityName, addr);
-             ExcelUtils.flush(response, CheckSurveyAnswer.class, result, "调查问卷答案明细");
-             return null;
-         }
-
-         return ResponseBean.error("非法的答卷类型");
-     }
-    
-    /** 
+    /**
+     * 导出答题详情
+     *
+     * @return 查询结果
+     */
+    @ApiOperation("导出答题详情")
+    @GetMapping("/taCheckAnswer/{answerId}/detail/export")
+    public ResponseBean exportDetail(
+            @ApiParam("答案ID") @PathVariable String answerId,
+            @ApiParam("答卷类型") @RequestParam(value = "itemType", required = false) String itemType,
+            @ApiParam("测评ID") @RequestParam(value = "checkId", required = false) 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,
+            HttpServletResponse response) throws Exception {
+
+        if (Constants.CHECK_OF_LOC.equals(itemType)) {
+            List<CheckLocAnswer> result = taCheckAnswerService.getLocListBy(checkId, typeId, answerId);
+            ExcelUtils.flush(response, CheckLocAnswer.class, result, "实地测评答案明细");
+            return null;
+        }
+
+        if (Constants.CHECK_OF_SURVEY.equals(itemType)) {
+            List<CheckSurveyAnswer> result = taCheckAnswerService.getSurveyListBy(checkId, answerId, communityName, addr);
+            ExcelUtils.flush(response, CheckSurveyAnswer.class, result, "调查问卷答案明细");
+            return null;
+        }
+
+        return ResponseBean.error("非法的答卷类型");
+    }
+
+    /**
      * 新增数据
      *
      * @param taCheckAnswer 实例对象
@@ -119,8 +149,8 @@ public class TaCheckAnswerController extends BaseController {
         taCheckAnswerService.save(taCheckAnswer);
         return ResponseBean.success(taCheckAnswer);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taCheckAnswer 实例对象
@@ -129,12 +159,12 @@ public class TaCheckAnswerController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taCheckAnswer/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheckAnswer taCheckAnswer,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
         taCheckAnswerService.updateById(taCheckAnswer);
         return ResponseBean.success(taCheckAnswer);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param answerId 主键
@@ -142,7 +172,7 @@ public class TaCheckAnswerController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taCheckAnswer/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taCheckAnswerService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -79,6 +79,11 @@ public class TaCheckItemController extends BaseController {
             return ResponseBean.error("未找到测评项目");
         }
 
+        if (Constants.CHECK_OF_SURVEY.equals(typeId)) {
+            SysUser sysUser = currentUser();
+            taCheckItem.setAnswerNum(taCheckAnswerService.getCountByUser(taCheckItem.getItemId(), sysUser.getUserId()));
+        }
+
         return ResponseBean.success(taCheckItem);
     }
 
@@ -212,7 +217,6 @@ public class TaCheckItemController extends BaseController {
     @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);

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

@@ -71,8 +71,9 @@ public class TaOrgIssueController extends BaseController {
 
          QueryWrapper<TaOrgIssue> queryWrapper = new QueryWrapper<>();
          queryWrapper.eq("issue_id", issueId);
-         queryWrapper.eq("org_id", StringUtils.isEmpty(orgId) ? sysUser.getOrgId() : orgId);
+         queryWrapper.eq(!Constants.ROOT_ORG.equals(sysUser.getOrgId()), "org_id", StringUtils.isEmpty(orgId) ? sysUser.getOrgId() : orgId);
          queryWrapper.eq("status", Constants.STATUS_NORMAL);
+         queryWrapper.last("limit 1");
 
          TaOrgIssue taOrgIssue = taOrgIssueService.getOne(queryWrapper);
          if (null != taOrgIssue) {

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

@@ -30,7 +30,7 @@ public class TaCheckAnswer implements Serializable,Cloneable{
     @TableId(value = "answer_id", type = IdType.INPUT)
     private String answerId ;
     /** 测评点位 */
-    @ApiModelProperty(name = "测评点位",notes = "")
+    @ApiModelProperty(name = "测评项目ID",notes = "")
     private String itemId ;
     /** 测评ID */
     @ApiModelProperty(name = "测评ID",notes = "")
@@ -79,4 +79,12 @@ public class TaCheckAnswer implements Serializable,Cloneable{
     @ApiModelProperty(name = "答案列表",notes = "")
     private List<TaCheckAnswerItem> answerItemList ;
 
+     /** 点位id */
+     @TableField(exist = false)
+     @ApiModelProperty(name = "点位id",notes = "")
+     private String typeId ;
+     /** 点位名称 */
+     @TableField(exist = false)
+     @ApiModelProperty(name = "点位名称",notes = "")
+     private String typeName ;
 }

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

@@ -31,17 +31,28 @@ public interface TaCheckAnswerMapper extends BaseMapper<TaCheckAnswer> {
 
     IPage<CheckLocAnswer> getLocPageBy(IPage<CheckLocAnswer> pg,
                                        @Param("checkId") String checkId,
-                                       @Param("typeId") String typeId);
+                                       @Param("typeId") String typeId,
+                                       @Param("answerId") String answerId);
 
     List<CheckLocAnswer> getLocListBy(@Param("checkId") String checkId,
-                                      @Param("typeId") String typeId);
+                                      @Param("typeId") String typeId,
+                                      @Param("answerId") String answerId);
 
     IPage<CheckSurveyAnswer> getSurveyPageBy(IPage<CheckSurveyAnswer> pg,
                                              @Param("checkId") String checkId,
+                                             @Param("answerId") String answerId,
                                              @Param("communityName") String communityName,
                                              @Param("addr") String addr);
 
     List<CheckSurveyAnswer> getSurveyListBy(@Param("checkId") String checkId,
+                                            @Param("answerId") String answerId,
                                             @Param("communityName") String communityName,
                                             @Param("addr") String addr);
+
+    IPage<TaCheckAnswer> getPageBy(IPage<TaCheckAnswer> page,
+                                   @Param("checkId") String checkId,
+                                   @Param("itemType") String itemType,
+                                   @Param("typeId") String typeId,
+                                   @Param("communityName") String communityName,
+                                   @Param("addr") String addr);
 }

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

@@ -1,7 +1,6 @@
 package com.example.civilizedcity.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.TaCheckAnswer;
 import com.example.civilizedcity.vo.CheckLocAnswer;
 import com.example.civilizedcity.vo.CheckSurveyAnswer;
@@ -22,11 +21,13 @@ public interface TaCheckAnswerService extends IBaseService<TaCheckAnswer> {
 
     List<TaCheckAnswer> getByUser(String itemId, String userId);
 
-    IPage<CheckLocAnswer> getLocPageBy(IPage<CheckLocAnswer> pg, String checkId, String typeId);
+    IPage<CheckLocAnswer> getLocPageBy(IPage<CheckLocAnswer> pg, String checkId, String typeId, String answerId);
 
-    List<CheckLocAnswer> getLocListBy(String checkId, String typeId);
+    List<CheckLocAnswer> getLocListBy(String checkId, String typeId, String answerId);
 
-    IPage<CheckSurveyAnswer> getSurveyPageBy(IPage<CheckSurveyAnswer> pg, String checkId, String communityName, String addr);
+    IPage<CheckSurveyAnswer> getSurveyPageBy(IPage<CheckSurveyAnswer> pg, String checkId, String answerId, String communityName, String addr);
 
-    List<CheckSurveyAnswer> getSurveyListBy(String checkId, String communityName, String addr);
+    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);
 }

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

@@ -3,7 +3,6 @@ package com.example.civilizedcity.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.vo.CheckLocAnswer;
 import com.example.civilizedcity.vo.CheckSurveyAnswer;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaCheckAnswer;
 import com.example.civilizedcity.mapper.TaCheckAnswerMapper;
@@ -36,22 +35,27 @@ public class TaCheckAnswerServiceImpl extends BaseServiceImpl<TaCheckAnswerMappe
     }
 
     @Override
-    public IPage<CheckLocAnswer> getLocPageBy(IPage<CheckLocAnswer> pg, String checkId, String typeId) {
-        return baseMapper.getLocPageBy(pg, checkId, typeId);
+    public IPage<CheckLocAnswer> getLocPageBy(IPage<CheckLocAnswer> pg, String checkId, String typeId, String answerId) {
+        return baseMapper.getLocPageBy(pg, checkId, typeId, answerId);
     }
 
     @Override
-    public List<CheckLocAnswer> getLocListBy(String checkId, String typeId) {
-        return baseMapper.getLocListBy(checkId, typeId);
+    public List<CheckLocAnswer> getLocListBy(String checkId, String typeId, String answerId) {
+        return baseMapper.getLocListBy(checkId, typeId, answerId);
     }
 
     @Override
-    public IPage<CheckSurveyAnswer> getSurveyPageBy(IPage<CheckSurveyAnswer> pg, String checkId, String communityName, String addr) {
-        return baseMapper.getSurveyPageBy(pg, checkId, communityName, addr);
+    public IPage<CheckSurveyAnswer> getSurveyPageBy(IPage<CheckSurveyAnswer> pg, String checkId, String answerId, String communityName, String addr) {
+        return baseMapper.getSurveyPageBy(pg, checkId, answerId, communityName, addr);
     }
 
     @Override
-    public List<CheckSurveyAnswer> getSurveyListBy(String checkId, String communityName, String addr) {
-        return baseMapper.getSurveyListBy(checkId, communityName, addr);
+    public List<CheckSurveyAnswer> getSurveyListBy(String checkId, String answerId, String communityName, String addr) {
+        return baseMapper.getSurveyListBy(checkId, answerId, communityName, addr);
+    }
+
+    @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);
     }
 }

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

@@ -145,6 +145,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
         double negativeScore = 0.0; // 扣分
         double positiveScore = 0.0; // 得分
         for(TaCheckAnswerItem item : answerItemList) {
+            boolean mustCreateIssue = false;
             // 找到对应的题目
             TaCheckItemQu qu = getQu(quList, item.getQuId());
             // 如果是选择题, 对应的答案
@@ -185,7 +186,18 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             if (score > 0) {
                 positiveScore += score;
             } else {
-                negativeScore += score;
+//                negativeScore += score;
+
+                // 扣分项
+                if (sign < 0) {
+                    mustCreateIssue = true;
+                    score = qu.getMaxScore() - score;
+                    if (score < 0) {
+                        score = 0;
+                    }
+
+                    positiveScore += score;
+                }
             }
 
             // 保存附件
@@ -202,7 +214,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             }
 
             // 如果得分小于0, 说明是扣分项, 生成问题单
-            if (score < 0 && Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
+            if (mustCreateIssue && Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
                 createNewIssue(sysUser, taCheckItem, qu, standAn, taCheckAnswer, item);
             }
         }

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

@@ -127,12 +127,13 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
                     double ratio = maxStandScore / qu.getMaxScore();
 
                     // 当前得分
-                    double s = Math.abs(answerItem.getScore()) > qu.getMaxScore() ?  qu.getMaxScore() : answerItem.getScore();
-                    if (answerItem.getScore() < 0) {
-                        // 在与最大值的比较过程中, 最大值是正数, 有可能改变得分的符号
-                        // 所以此处要纠正过来
-                        s = 0 - Math.abs(s);
-                    }
+                    double s = answerItem.getScore();
+//                    double s = Math.abs(answerItem.getScore()) > qu.getMaxScore() ?  qu.getMaxScore() : answerItem.getScore();
+//                    if (answerItem.getScore() < 0) {
+//                        // 在与最大值的比较过程中, 最大值是正数, 有可能改变得分的符号
+//                        // 所以此处要纠正过来
+//                        s = 0 - Math.abs(s);
+//                    }
 
                     // 分值
                     quScore += s * ratio;

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

@@ -143,6 +143,9 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
         taIssueMapper.updateById(taIssue);
         taOrgIssueMapper.updateById(taOrgIssue);
 
+        // 再次生成流程记录,
+        createProcessByIssue(taIssue, sysUser);
+
 //        // 如果是用户随手拍
 //        if (Constants.SOURCE_FEEDBACK.equals(taIssue.getSourceType())) {
 //            // 如果是销单了
@@ -153,6 +156,19 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
         applicationEventPublisher.publishEvent(new MessagEvent(this, origin));
     }
 
+    private void createProcessByIssue(TaIssue taIssue, SysUser sysUser) {
+        TaIssueProcess taIssueProcess = new TaIssueProcess();
+        taIssueProcess.setIssueId(taIssue.getIssueId());
+        taIssueProcess.setOrgId(taIssue.getOrgId());
+        taIssueProcess.setProcessNode(taIssue.getProcessNode());
+        taIssueProcess.setProcessStatus(taIssue.getProcessStatus());
+        taIssueProcess.setProcessResult(null);
+        taIssueProcess.setCreateUser(sysUser.getUserId());
+        taIssueProcess.setCreateDate(LocalDateTime.now());
+        taIssueProcess.setStatus(Constants.STATUS_NORMAL);
+        taIssueProcessMapper.insert(taIssueProcess);
+    }
+
     // 问题单审核
     public void verifyIssue(TaIssueApply taIssueApply, TaIssue taIssue, TaOrgIssue taOrgIssue) throws Exception {
         taIssue.setProcessNode(Constants.PROCESS_ASSIGNED);

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

@@ -67,4 +67,8 @@ public class CheckLocAnswer {
     @ExcelProperty(value = "作答时间", index = 6)
     @ApiModelProperty("作答时间")
     private LocalDateTime createDate;
+
+    @ExcelIgnore
+    @ApiModelProperty("得分")
+    private Float score;
 }

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

@@ -65,12 +65,16 @@ public class CheckSurveyAnswer {
     private LocalDateTime createDate;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "受访者年龄段", index = 7)
-    @ApiModelProperty("受访者年龄段")
+    @ExcelProperty(value = "受访者性别", index = 7)
+    @ApiModelProperty("受访者性别")
     private String sex;
 
     @ColumnWidth(30)
     @ExcelProperty(value = "受访者年龄段", index = 8)
     @ApiModelProperty("受访者年龄段")
     private String age;
+
+    @ExcelIgnore
+    @ApiModelProperty("得分")
+    private Float score;
 }

src/main/resources/mapper/TaCheckAnswerMapper.xml

@@ -58,6 +58,7 @@
         SELECT
             t.item_id AS answer_item_id,
             t.answer_id,
+            t.score,
             m.item_id AS check_item_id,
             m.type_id,
             m.`name` AS type_name,
@@ -79,6 +80,9 @@
         WHERE
             m.item_type = 'loc'
             AND t.`status` = 1
+        <if test="answerId != null and answerId != ''">
+            AND t.answer_id = #{answerId}
+        </if>
             <if test="checkId != null and checkId != ''">
                 AND n.check_id = #{checkId}
             </if>
@@ -100,6 +104,7 @@
         SELECT
             t.item_id AS answer_item_id,
             t.answer_id,
+            t.score,
             m.item_id AS check_item_id,
             n.check_id,
             n.title AS check_title,
@@ -122,6 +127,9 @@
         WHERE
             m.item_type = 'survey'
           AND t.`status` = 1
+        <if test="answerId != null and answerId != ''">
+            AND t.answer_id = #{answerId}
+        </if>
         <if test="checkId != null and checkId != ''">
             AND n.check_id = #{checkId}
         </if>
@@ -141,4 +149,30 @@
     <select id="getSurveyListBy" resultType="com.example.civilizedcity.vo.CheckSurveyAnswer">
         <include refid="getSurveyAnswers"></include>
     </select>
+    <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaCheckAnswer">
+        SELECT
+            t.*,
+            s.type_id,
+            s.`name` as type_name
+        FROM
+            ta_check_answer t
+                INNER JOIN ta_check_item s ON t.item_id = s.item_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
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>