kangwei: 数据问题上报功能开发-后端（主表、处理日志表两表）

@@ -82,4 +82,9 @@ public class ErpProblemDetail {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
+
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "驳回原因")
+	private String approveMessage;
 }

@@ -59,12 +59,14 @@ public class ErpProblemServiceImpl extends ServiceImpl<ErpProblemMapper, ErpProb
         // 删除后批量新增
         Integer handleStatus = null;
         Date handleTime = null;
+        String approveMessage = null;
         if(erpProblemVO.getProblemDetailList() != null && !erpProblemVO.getProblemDetailList().isEmpty()){
             for(ErpProblemDetail problemDetail  : erpProblemVO.getProblemDetailList()){
                 problemDetail.setProblemId(problem.getId());
 
                 handleStatus = problemDetail.getHandleStatus();
                 handleTime = problemDetail.getHandleTime();
+                approveMessage = problemDetail.getApproveMessage();
                 problemDetailMapper.insert(problemDetail);
             }
         }
@@ -74,6 +76,9 @@ public class ErpProblemServiceImpl extends ServiceImpl<ErpProblemMapper, ErpProb
         if(handleTime != null){
             problem.setHandleTime(handleTime);
         }
+        if(StringUtils.isNotEmpty(approveMessage)){
+            problem.setApproveMessage(approveMessage);
+        }
         this.baseMapper.updateById(problem);
         return true;
     }