Merge remote-tracking branch 'origin/dev_v2' into dev_v2

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/impl/TpAreaOptionalParaPriceServiceImpl.java

@@ -184,7 +184,7 @@ public class TpAreaOptionalParaPriceServiceImpl extends ServiceImpl<TpAreaOption
     {
         tpAreaOptionalParaPrice.setUpdateBy(SecurityUtils.getUserId().toString());
         tpAreaOptionalParaPrice.setUpdateTime(DateUtils.getNowDate());
-        if (Objects.nonNull(tpAreaOptionalParaPrice.getPriceFormulaTxt())){
+        if (Objects.nonNull(tpAreaOptionalParaPrice.getPriceFormulaTxt()) || Objects.nonNull(tpAreaOptionalParaPrice.getQuantityFormulaTxt()) ){
             getFormula(Lists.newArrayList(tpAreaOptionalParaPrice));
         }
 

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/quotation/impl/TqQuotationServiceImpl.java

@@ -70,6 +70,7 @@ import java.util.stream.Collectors;
 
 import com.ruoyi.project.business.service.quotation.*;
 import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.mapper.SysDictDataMapper;
 import fr.opensagres.xdocreport.document.images.FileImageProvider;
 import fr.opensagres.xdocreport.template.formatter.NullImageBehaviour;
 import lombok.RequiredArgsConstructor;
@@ -80,6 +81,7 @@ import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -146,7 +148,8 @@ public class TqQuotationServiceImpl extends ServiceImpl<TqQuotationMapper, TqQuo
     private final ITpParaLibraryService tpParaLibraryService;
 
     private final ITpParaSelectItemService tpParaSelectItemService;
-
+    @Resource
+    private SysDictDataMapper dictDataMapper;
 
     /**
      * 查询【请填写功能名称】
@@ -1272,7 +1275,12 @@ public class TqQuotationServiceImpl extends ServiceImpl<TqQuotationMapper, TqQuo
         // 2.3 规格统计信息
         String targetPort = "";
         if (isNotBlank(tqQuotation.getTargetPort())){
-            targetPort = DictUtils.getInternationalDictLabel("target_port", tqQuotation.getTargetPort());
+            //targetPort = DictUtils.getInternationalDictLabel("target_port", tqQuotation.getTargetPort());
+            List<SysDictData> dict = dictDataMapper.selectDictDataByType("target_port").stream()
+                    .filter(it->it.getDictValue().equals(tqQuotation.getTargetPort())).collect(Collectors.toList());
+            if(ObjectUtils.isNotEmpty(dict)){
+                targetPort = dict.get(0).getDictLabelUS();
+            }
             //装船口岸需要字典
             map.put("targetPort", "- To " + targetPort);
         }

RuoYi-Vue-fast-master/src/main/resources/mybatis/business/TcProjectMapper.xml

@@ -334,7 +334,7 @@
 
     <sql id="whereSql">
         <where>
-            <if test="startDate != null and endDate != null"> and p.update_time between #{startDate} and #{endDate}</if>
+            <if test="startDate != null and endDate != null"> and p.create_time between #{startDate} and #{endDate}</if>
             <if test="projectId != null"> and p.project_id = #{projectId}</if>
             <if test="projectNo != null and projectNo != ''"> and p.project_no like concat('%',#{projectNo},'%') escape '/'</if>
             <if test="areaId != null and areaId.size() > 0">

ruoyi-ui-vue2/src/views/board/lossProject/index.vue

@@ -5,7 +5,7 @@
     <!-- 未跟进项目列表 -->
     <div class="unfollowed-list">
       <div class="chart-box-title">
-      <span>{{ $t('board.leadCountStat') }}</span>
+      <span>{{ $t('board.lossProject') }}</span>
 
       <el-select v-model="statMode" :placeholder="$t('common.pleaseSelect')" style="width: 100px;"
                  @change="leadStatModeChange">
@@ -36,19 +36,19 @@
                 :header-cell-style="{'text-align':'center','background-color':'#F4F3F2','border-right':'1px solid #dfdcdc'}"
                 border stripe
       >
-        <el-table-column type="index" label="No." width="50" align="center" fixed>
+        <el-table-column type="index" label="No." width="50" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.index }}</span>
           </template>
         </el-table-column>
         <!-- 项目编码 -->
-        <Column :label="$t('project.no')" prop="projectNo" :searchParams="queryParams" :showSearch="false" fixed width="200">
+        <Column :label="$t('project.no')" prop="projectNo" :searchParams="queryParams" :showSearch="false" width="200">
           <template #default="{ row }">
             <span @click="handleView(row)" class="link-type">{{ row.projectNo }}</span>
           </template>
         </Column>
         <!-- 项目名称 -->
-        <Column :label="$t('project.name')" prop="projectName" :searchParams="queryParams" :showSearch="false" fixed
+        <Column :label="$t('project.name')" prop="projectName" :searchParams="queryParams" :showSearch="false"
                 width="250px"/>
         <!-- 区域 -->
         <Column v-if="showAreaColumn" :label="$t('user.area')" prop="areaId" :searchParams="queryParams"