fix

sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -694,9 +694,9 @@ public class ActivitiServiceImpl implements ActivitiService {
             Optional.ofNullable(tfFlowApprove).orElseThrow(() -> ExceptionResultEnum.FLOW_APPROVE_NO_DATA.exception());
 
             if (tfFlowApprove.getStatus() == FlowStatusEnum.FINISH) {
-                throw ExceptionResultEnum.ERROR.exception("已结束的流程不能终止");
+                throw ExceptionResultEnum.ERROR.exception("已结束的流程不能作废");
             } else if (tfFlowApprove.getStatus() == FlowStatusEnum.END) {
-                throw ExceptionResultEnum.ERROR.exception("该流程已终止");
+                throw ExceptionResultEnum.ERROR.exception("该流程已作废");
             }
 
             TFCustomFlowEntity tfCustomFlowEntity = tfCustomFlowEntityService.getOne(new QueryWrapper<TFCustomFlowEntity>().lambda().eq(TFCustomFlowEntity::getFlowId, flowId));

sop-business/src/main/java/com/qmth/sop/business/bean/result/DingApplyDoneResult.java

@@ -117,7 +117,8 @@ public class DingApplyDoneResult extends WorkTaskResult implements Serializable
 
     public String getDingExceptionTypeStr() {
         if (Objects.nonNull(dingExceptionType)) {
-            return dingExceptionType.getTitle();
+            String[] strs = dingExceptionType.getTitle().split("｜");
+            return strs[1];
         } else {
             return dingExceptionTypeStr;
         }

sop-business/src/main/java/com/qmth/sop/business/bean/result/DingApplyUnDoneResult.java

@@ -95,7 +95,8 @@ public class DingApplyUnDoneResult extends WorkTaskResult implements Serializabl
 
     public String getDingExceptionTypeStr() {
         if (Objects.nonNull(dingExceptionType)) {
-            return dingExceptionType.getTitle();
+            String[] strs = dingExceptionType.getTitle().split("｜");
+            return strs[1];
         } else {
             return dingExceptionTypeStr;
         }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingApplyServiceImpl.java

@@ -231,8 +231,10 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
             if (Objects.nonNull(tbDing)) {
                 if (tbDingApply.getType() == InOutTypeEnum.IN) {
                     tbDing.setSignInTime(tbDingApply.getApplyTime());
+                    tbDing.setSignInAddress("(补卡)");
                 } else if (tbDingApply.getType() == InOutTypeEnum.OUT) {
                     tbDing.setSignOutTime(tbDingApply.getApplyTime());
+                    tbDing.setSignOutAddress("(补卡)");
                 }
                 tbDingService.updateById(tbDing);
             } else {
@@ -252,6 +254,13 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
                 TBUserArchives tbUserArchives = tbUserArchivesService.getOne(new QueryWrapper<TBUserArchives>().lambda().eq(TBUserArchives::getMobileNumber, sysUser.getMobileNumber()));
                 tbDing = new TBDing(tbDingApply.getSopNo(), tbDingApply.getCrmNo(), tbCrm.getServiceId(), tbUserArchives.getId(), sysRoleList.get(0).getType(), sysUser.getId(), tfCustomFlowEntity.getFlowId());
                 tbDing.setSignDate(DateFormatUtils.format(tbDingApply.getApplyTime(), SystemConstant.DEFAULT_DATE_DAY_PATTERN));
+                if (tbDingApply.getType() == InOutTypeEnum.IN) {
+                    tbDing.setSignInTime(tbDingApply.getApplyTime());
+                    tbDing.setSignInAddress("(补卡)");
+                } else if (tbDingApply.getType() == InOutTypeEnum.OUT) {
+                    tbDing.setSignOutTime(tbDingApply.getApplyTime());
+                    tbDing.setSignOutAddress("(补卡)");
+                }
                 tbDingService.save(tbDing);
                 tbDingApply.setDingId(tbDing.getId());
             }