单位换算

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

@@ -54,6 +54,15 @@ public class CbQuantitySummaryController extends BaseController {
         return R.ok(baseService.subjectList(bo));
     }
 
+    /**
+     * 实体工程材料-单位换算提示
+     */
+    @GetMapping(value = "/conversionNotice")
+    public R conversionNotice(CbQuantitySummaryListBo bo) {
+        baseService.conversionNotice(bo);
+        return R.ok();
+    }
+
     /**
      * 更新月成本信息
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbQuantitySummaryMapper.java

@@ -30,7 +30,12 @@ public interface CbQuantitySummaryMapper extends BaseMapperPlus<CbQuantitySummar
 
     List<CbQuantitySummaryListVo> selectListBySubject(CbQuantitySummaryListBo bo);
 
-
+    /**
+     * 未换算数据
+     * @param bo
+     * @return
+     */
+    List<CbQuantitySummaryListVo> unconvertedList(CbQuantitySummaryListBo bo);
 
 }
 

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

 package com.dsk.cscec.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.json.JSONUtil;
+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.exception.ServiceException;
 import com.dsk.common.helper.LoginHelper;
+import com.dsk.common.utils.redis.RedisUtils;
 import com.dsk.cscec.domain.CbQuantitySummary;
 import com.dsk.cscec.domain.CbQuantitySummaryActual;
 import com.dsk.cscec.domain.CbSubject;
@@ -17,6 +26,7 @@ import com.dsk.cscec.mapper.CbSubjectMapper;
 import com.dsk.cscec.service.ICbQuantitySummaryActualService;
 import com.dsk.cscec.service.ICbQuantitySummaryService;
 import jodd.bean.BeanException;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,10 +34,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.Duration;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -145,5 +153,35 @@ public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryM
         int i = baseMapper.batchInsert(list);
         return i == list.size();
     }
+
+    @Override
+    public void conversionNotice(CbQuantitySummaryListBo bo) {
+        if (StringUtil.isBlank(bo.getRecordDate())) {
+            //默认当前月
+            bo.setRecordDate(DatePattern.SIMPLE_MONTH_FORMAT.format(new Date()));
+        }
+        //是否是实体工程材料
+        CbSubject cbSubject = cbSubjectMapper.selectOne(new LambdaQueryWrapper<CbSubject>().eq(CbSubject::getCbSubjectName, bo.getCbSubjectName()));
+        if (ObjectUtil.isNull(cbSubject)) {
+            return;
+        }
+        if (cbSubject.getCbSubjectNo().startsWith("FG") || cbSubject.getCbSubjectNo().startsWith("JD")) {
+            //是否存在未换算数据
+            List<CbQuantitySummaryListVo> unconvertedList = baseMapper.unconvertedList(bo);
+            if (CollectionUtil.isEmpty(unconvertedList)) {
+                return;
+            }
+            //是否提示
+            String key = GlobalConstants.UNIT_CONVERSION_NOTICE + LoginHelper.getUserId() + "_" + bo.getProjectId() + "_" + bo.getCbSubjectName() + "_" + bo.getRecordDate();
+            if (ObjectUtil.isNull(RedisUtils.getCacheObject(key))) {
+                Date now = new Date();
+                long expireTime = DateUtil.between(now, DateUtil.endOfDay(now), DateUnit.SECOND);
+                RedisUtils.setCacheObject(key, "noticed", Duration.ofSeconds(expireTime));
+                Assert.isTrue(false, "系统检测到您近期未进行物料单位换算，请立即进行换算。");
+            }
+
+        }
+
+    }
 }
 

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbQuantitySummaryMapper.xml

@@ -76,4 +76,21 @@
         order by a.`number` asc
     </select>
 
+    <select id="unconvertedList"  resultType="com.dsk.cscec.domain.vo.CbQuantitySummaryListVo">
+        select
+        cqs.id, cqs.cb_subject_name, cqs.company_no, cqs.org_no, cqs.cb_name, cqs.job_content, cqs.calculation_rule,
+        cqs.unit, cqs.material_description, cqs.guide_price, cqs.bid_unit_price, cqs.unit_price_difference, cqs.quantity,
+        cqs.combined_price, cqs.combined_price_tax, cqs.brand_name, cqs.bid_source, cqs.remark, cqs.`number`, cqsa.quantities,
+        cqsa.quantities_unit, cqsa.conversion_quantities, cqsa.conversion_unit, cqsa.purchase_unit_price, cqsa.create_time,
+        cqsa.id actualId, cqsa.ipm_project_code, cqsa.ipm_contract_code, cqsa.ipm_biz_code, cqsa.push_quantities
+        from cb_quantity_summary cqs
+        left join cb_quantity_summary_actual cqsa on cqs.id = cqsa.cb_quantity_summary_id
+        where cqs.del_falg = 0
+        and cqsa.quantities is not null
+        and (cqsa.conversion_unit is null or cqsa.conversion_unit = '')
+        and cqs.project_id = #{projectId}
+        and cqs.cb_stage = #{cbStage}
+        and cqsa.record_date = #{recordDate}
+        and cqs.cb_subject_name = #{cbSubjectName}
+    </select>
 </mapper>
\ No newline at end of file