feats

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

@@ -207,7 +207,7 @@ public class TaCheckItemController extends BaseController {
      * @param id 实例对象
      * @return 实例对象
      */
-    @ApiOperation("更新数据")
+    @ApiOperation("获取回答")
     @GetMapping("/taCheckItem/{id}/answer")
     public ResponseBean getAnswer(@ApiParam("对象ID") @PathVariable String id) throws Exception {
 
@@ -222,7 +222,7 @@ public class TaCheckItemController extends BaseController {
      * @param taCheckAnswer 实例对象
      * @return 实例对象
      */
-    @ApiOperation("更新数据")
+    @ApiOperation("回答问题")
     @PutMapping("/taCheckItem/{id}/answer")
     public ResponseBean answer(@ApiParam("对象实体") @RequestBody TaCheckAnswer taCheckAnswer,
                                @ApiParam("对象ID") @PathVariable String id) throws Exception {
@@ -259,7 +259,7 @@ public class TaCheckItemController extends BaseController {
         taCheckAnswer.setCreateUser(sysUser.getUserId());
         taCheckAnswer.setCreateDate(LocalDateTime.now());
 
-        taCheckItemService.answer(taCheckItem, taCheckAnswer);
+        taCheckItemService.answer(taCheckItem, taCheckAnswer, sysUser);
         return ResponseBean.success(taCheckAnswer);
     }
 

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

@@ -11,6 +11,7 @@ import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.service.TaIssueService;
 import com.example.civilizedcity.service.TaOrgIssueService;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -97,13 +98,14 @@ public class TaIssueApplyController extends BaseController {
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                              @ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) Integer issueId,
                              @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType,
-                             @ApiParam("问题单来源") @RequestParam(value = "sourceType", required = false) String sourceType) throws Exception {
+                             @ApiParam("问题单来源") @RequestParam(value = "sourceType", required = false) String sourceType,
+                             @ApiParam(value = "是否全部") @RequestParam(value = "isAll", defaultValue = "false") Boolean isAll) throws Exception {
 
         SysUser sysUser = currentUser();
         String orgId = isManager(sysUser) ? null : sysUser.getOrgId();
 
         IPage<TaIssueApply> pg = new Page<>(pageNum, pageSize);
-        IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, issueId, applyType, orgId, sourceType);
+        IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, issueId, applyType, orgId, sourceType, isAll);
 
         return ResponseBean.success(result);
     }

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

@@ -111,6 +111,9 @@ public class TaIssueController extends BaseController {
             // 已打回
             queryWrapper.eq("process_node", Constants.PROCESS_APPLY_REJECT);
             queryWrapper.eq("process_status", Constants.APPLY_PASS);
+        } else {
+            // 其余节点
+            queryWrapper.likeRight(!StringUtils.isEmpty(bizStatus), "process_node", bizStatus);
         }
 
         if (mine) {

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

@@ -18,5 +18,6 @@ public interface TaIssueApplyMapper  extends BaseMapper<TaIssueApply>{
                                    @Param("issueId") Integer issueId,
                                    @Param("applyType") String applyType,
                                    @Param("orgId") String orgId,
-                                   @Param("sourceType") String sourceType);
+                                   @Param("sourceType") String sourceType,
+                                   @Param("isAll") Boolean isAll);
  }

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

@@ -17,5 +17,5 @@ public interface TaCheckItemService extends IBaseService<TaCheckItem> {
 
      void createNewItems(TaCheck taCheck);
 
-     void answer(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer) throws Exception;
+     void answer(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer, SysUser sysUser) throws Exception;
  }

src/main/java/com/example/civilizedcity/service/TaIssueApplyService.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.SysUser;
 import com.example.civilizedcity.entity.TaIssueApply;
 
@@ -14,7 +13,7 @@ public interface TaIssueApplyService extends IBaseService<TaIssueApply> {
 
      void createNewApply(TaIssueApply taIssueApply, SysUser sysUser) throws Exception;
 
-     IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType);
+     IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType, Boolean isAll);
 
      void verify(TaIssueApply taIssueApply, SysUser sysUser, TaIssueApply origin) throws Exception;
  }

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

@@ -11,7 +11,9 @@ import com.example.civilizedcity.service.TaCheckItemService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 测评点位;(ta_check_item)表服务实现类
@@ -37,6 +39,15 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
     @Autowired
     TaAttachMapper taAttachMapper;
 
+    @Autowired
+    SysUserMapper sysUserMapper;
+
+    @Autowired
+    TaIssueMapper taIssueMapper;
+
+    @Autowired
+    TaIssueProcessMapper taIssueProcessMapper;
+
     @Override
     public IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, String checkId, String itemType) {
         return baseMapper.getPageBy(pg, checkId, itemType);
@@ -56,7 +67,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void answer(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer) throws Exception {
+    public void answer(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer, SysUser sysUser) throws Exception {
         List<TaCheckItemQu> quList = taCheckItemQuMapper.getListBy(taCheckItem.getItemId());
         if (null == quList || quList.size() < 1) {
             throw new Exception("校验测评问题列表出错");
@@ -81,8 +92,8 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             }
         }
 
-
-        double[] scores = answerItems(taCheckItem, taCheckAnswer, quList, answerItemList);
+        // 答题的时候, 顺便把问题单生成好
+        double[] scores = answerItems(taCheckItem, taCheckAnswer, quList, answerItemList, sysUser);
 
         if (Constants.CHECK_OF_SURVEY.equals(taCheckItem.getItemType())) {
             // 调查问卷不需要计算当前试卷的分数, 最后才能计算出来
@@ -124,14 +135,20 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
      * @param taCheckAnswer
      * @throws Exception
      */
-    private double[] answerItems(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer, List<TaCheckItemQu> quList, List<TaCheckAnswerItem> answerItemList) throws Exception {
-
+    private double[] answerItems(TaCheckItem taCheckItem,
+                                 TaCheckAnswer taCheckAnswer,
+                                 List<TaCheckItemQu> quList,
+                                 List<TaCheckAnswerItem> answerItemList,
+                                 SysUser sysUser
+    ) throws Exception {
         LocalDateTime now = LocalDateTime.now();
         double negativeScore = 0.0; // 扣分
         double positiveScore = 0.0; // 得分
         for(TaCheckAnswerItem item : answerItemList) {
             // 找到对应的题目
             TaCheckItemQu qu = getQu(quList, item.getQuId());
+            // 如果是选择题, 对应的答案
+            TaCheckItemAn standAn = null;
             // + 代表得分, 否则代表扣分
             int sign = "+".equals(qu.getComputeType()) ? 1 : -1;
 
@@ -146,8 +163,8 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
 
                 score *= sign;
             } else if (Constants.QU_OF_RADIO.equals(qu.getQuType())) {
-                // 如果是选择题, 先找到对应的答案
-                TaCheckItemAn standAn = taCheckItemAnMapper.getOneBy(qu.getQuId(), item.getAnswerCode());
+                // 如果是选择题, 找到对应的答案
+                standAn = taCheckItemAnMapper.getOneBy(qu.getQuId(), item.getAnswerCode());
 
                 score = standAn.getScore();
                 if (score > qu.getMaxScore()) {
@@ -174,6 +191,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             // 保存附件
             if (null != item.getAttachList()) {
                 for (TaAttach taAttach : item.getAttachList()) {
+                    taAttach.setAttachId(null);
                     taAttach.setOwnerType(Constants.SOURCE_CHECK_ANSWER);
                     taAttach.setOwnerId(item.getItemId());
                     taAttach.setStatus(Constants.STATUS_NORMAL);
@@ -182,11 +200,75 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
                     taAttachMapper.insert(taAttach);
                 }
             }
+
+            // 如果得分小于0, 说明是扣分项, 生成问题单
+            if (score < 0 && Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
+                createNewIssue(sysUser, taCheckItem, qu, standAn, item);
+            }
         }
 
         return new double[] {positiveScore, negativeScore};
     }
 
+    private void createNewIssue(SysUser sysUser,
+                                   TaCheckItem taCheckItem,
+                                   TaCheckItemQu qu,
+                                   TaCheckItemAn an,
+                                   TaCheckAnswerItem answer) {
+        LocalDateTime now = LocalDateTime.now();
+        TaIssue taIssue = new TaIssue();
+        taIssue.setLocId(taCheckItem.getTypeId());
+        taIssue.setLocName(taCheckItem.getName());
+
+        // 如果是选择题, 答案 answer 的内容只是代码, 所以需要从 TaCheckItemAn 把对应的文字拿出来
+        // 如果是填空题， 那么文字是 答案（数字） + 单位（fillUnit） , 最后结果类似 5 处。
+        String answerStr = Constants.QU_OF_FILL.equals(qu.getQuType())
+                ? an.getAnswer()
+                : String.format("%s %s", answer.getAnswer(), qu.getFillUnit());
+        taIssue.setContent(String.format("%s 测评结果 %s", qu.getTitle(), answerStr));
+        taIssue.setProcessNode(Constants.PROCESS_START);
+        taIssue.setProcessStatus(Constants.APPLY_PASS); // 模拟测评的不需要审核
+        taIssue.setProcessNum(0);
+        taIssue.setOrgId(null);
+        taIssue.setSourceType(Constants.SOURCE_CHECK);
+        taIssue.setSourceTarget(answer.getItemId()); // 实际作答的ID, 非测评项目表 ID
+        taIssue.setStatus(Constants.STATUS_NORMAL);
+        taIssue.setCreateUser(sysUser.getUserId());
+        taIssue.setUserName(sysUser.getName());
+        taIssue.setCreateDate(now);
+        taIssueMapper.insert(taIssue);
+
+        // 保存文件
+        List<TaAttach> attachList = answer.getAttachList();
+        if (null != attachList && attachList.size() > 0) {
+            for (TaAttach item : attachList) {
+                // 生成新对象, 目的是不影响 item;
+                TaAttach newItem = new TaAttach();
+                newItem.setAttachId(null);
+                newItem.setFileType(item.getFileType());
+                newItem.setName(item.getName());
+                newItem.setUrl(item.getUrl());
+                newItem.setOwnerType(Constants.SOURCE_ISSUE);
+                newItem.setOwnerId(taIssue.getIssueId().toString());
+                newItem.setStatus(Constants.STATUS_NORMAL);
+                newItem.setCreateDate(now);
+                taAttachMapper.insert(newItem);
+            }
+        }
+
+        // 流程开始
+        TaIssueProcess process = new TaIssueProcess();
+        process.setIssueId(taIssue.getIssueId());
+        process.setOrgId(sysUser.getOrgId());
+        process.setProcessNode(taIssue.getProcessNode());
+        process.setProcessStatus(taIssue.getProcessStatus());
+        process.setStatus(Constants.STATUS_NORMAL);
+        process.setCreateUser(sysUser.getUserId());
+        process.setUserName(sysUser.getName());
+        process.setCreateDate(LocalDateTime.now());
+        taIssueProcessMapper.insert(process);
+    }
+
     private TaCheckItemQu getQu(List<TaCheckItemQu> quList, String quId) {
         return quList.stream().filter(q -> q.getQuId().equals(quId)).findFirst().orElse(null);
     }

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

@@ -1,9 +1,7 @@
 package com.example.civilizedcity.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
-import com.example.civilizedcity.common.ResponseBean;
 import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.event.MessagEvent;
 import com.example.civilizedcity.mapper.*;
@@ -79,8 +77,12 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
     }
 
     @Override
-    public IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType) {
-        return baseMapper.getPageBy(pg, issueId, applyType, orgId, sourceType);
+    public IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType, Boolean isAll) {
+
+        // 如果 isAll 是 false
+        // 那么只查询还未审核的
+
+        return baseMapper.getPageBy(pg, issueId, applyType, orgId, sourceType, isAll);
     }
 
     @Transactional(rollbackFor = Exception.class)

src/main/resources/mapper/TaIssueApplyMapper.xml

@@ -28,6 +28,9 @@
         <if test="sourceType != null and sourceType != 'feedback'">
             AND s.source_type != 'feedback'
         </if>
+        <if test="isAll == null or !isAll">
+            AND t.verify_date is null
+        </if>
         ORDER BY
             IFNULL(t.verify_status, -1) ASC,
             t.create_date DESC