update

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbQuantitySummaryController.java

@@ -59,8 +59,8 @@ public class CbQuantitySummaryController extends BaseController {
      */
     @GetMapping(value = "/conversionNotice")
     public R conversionNotice(CbQuantitySummaryListBo bo) {
-        baseService.conversionNotice(bo);
-        return R.ok();
+
+        return baseService.conversionNotice(bo);
     }
 
     /**

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/ICbQuantitySummaryService.java

 package com.dsk.cscec.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.common.core.domain.R;
 import com.dsk.cscec.domain.CbQuantitySummary;
 import com.dsk.cscec.domain.CbQuantitySummaryActual;
 import com.dsk.cscec.domain.bo.CbProjectBaseBo;
@@ -30,6 +31,6 @@ public interface ICbQuantitySummaryService extends IService<CbQuantitySummary> {
 
     boolean batchInsert(List<CbQuantitySummary> list);
 
-    void conversionNotice(CbQuantitySummaryListBo bo);
+    R conversionNotice(CbQuantitySummaryListBo bo);
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbQuantitySummaryServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.constant.GlobalConstants;
+import com.dsk.common.core.domain.R;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.redis.RedisUtils;
@@ -161,7 +162,7 @@ public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryM
     }
 
     @Override
-    public void conversionNotice(CbQuantitySummaryListBo bo) {
+    public R conversionNotice(CbQuantitySummaryListBo bo) {
         if (StringUtil.isBlank(bo.getRecordDate())) {
             //默认当前月
             bo.setRecordDate(DatePattern.SIMPLE_MONTH_FORMAT.format(new Date()));
@@ -169,13 +170,13 @@ public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryM
         //是否是实体工程材料
         CbSubject cbSubject = cbSubjectMapper.selectOne(new LambdaQueryWrapper<CbSubject>().eq(CbSubject::getCbSubjectName, bo.getCbSubjectName()));
         if (ObjectUtil.isNull(cbSubject)) {
-            return;
+            return R.ok();
         }
         if (cbSubject.getCbSubjectNo().startsWith("FG") || cbSubject.getCbSubjectNo().startsWith("JD")) {
             //是否存在未换算数据
             List<CbQuantitySummaryListVo> unconvertedList = baseMapper.unconvertedList(bo);
             if (CollectionUtil.isEmpty(unconvertedList)) {
-                return;
+                return R.ok();
             }
             //是否提示
             String key = GlobalConstants.UNIT_CONVERSION_NOTICE + LoginHelper.getUserId() + "_" + bo.getProjectId() + "_" + bo.getCbSubjectName() + "_" + bo.getRecordDate();
@@ -183,11 +184,11 @@ public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryM
                 Date now = new Date();
                 long expireTime = DateUtil.between(now, DateUtil.endOfDay(now), DateUnit.SECOND);
                 RedisUtils.setCacheObject(key, "noticed", Duration.ofSeconds(expireTime));
-                Assert.isTrue(false, "系统检测到您近期未进行物料单位换算，请立即进行换算。");
+                return R.ok("系统检测到您近期未进行物料单位换算，请立即进行换算。", 500);
             }
 
         }
-
+        return R.ok();
     }
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbSummaryServiceImpl.java

@@ -474,7 +474,7 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
         if (unfilled.length() > 0) {
             unfilled.deleteCharAt(unfilled.lastIndexOf("、"));
             unfilled.append(" 未填写成本，是否继续锁定？");
-            return R.fail(unfilled.toString());
+            return R.ok(unfilled.toString(),500);
         } else {
             return R.ok();
         }