Merge branch 'master_after20' into master_cj_zq

@@ -98,6 +98,14 @@ public class ContractFrameworkController extends DefaultBaseController {
 
 
             vo.setCustomerIdList(customerList.stream().map(Customer::getId).collect(Collectors.toList()));
             vo.setCustomerIdList(customerList.stream().map(Customer::getId).collect(Collectors.toList()));
         }
         }
+        if (vo != null && StringUtils.isNotBlank(vo.getKeyword())) {
+            QueryCustomerVo queryCustomerVo = new QueryCustomerVo();
+            queryCustomerVo.setName(vo.getKeyword());
+            List<Customer> customerList = customerService.query(queryCustomerVo);
+            if (CollectionUtils.isNotEmpty(customerList)) {
+                vo.setCustomerIdList(customerList.stream().map(Customer::getId).collect(Collectors.toList()));
+            }
+        }
 
 
         PageResult<ContractFramework> pageResult = contractFrameworkService.query(getPageIndex(vo), getPageSize(vo), vo);
         PageResult<ContractFramework> pageResult = contractFrameworkService.query(getPageIndex(vo), getPageSize(vo), vo);
 
 

@@ -37,14 +37,14 @@ public class LatexFormulaExcelExporterUtil {
             }
             }
 
 
             latex.append(formatScientificNotation(comp.getBase()));
             latex.append(formatScientificNotation(comp.getBase()));
-            if (comp.getSup() != null && comp.getSup().compareTo(BigDecimal.ZERO) > 0) {
+            if (comp.getSup() != null && comp.getSup().compareTo(BigDecimal.ZERO) >= 0) {
                 latex.append("^{+").append(formatScientificNotation(comp.getSup())).append("}");
                 latex.append("^{+").append(formatScientificNotation(comp.getSup())).append("}");
             }
             }
             if (comp.getSup() != null && comp.getSup().compareTo(BigDecimal.ZERO) < 0) {
             if (comp.getSup() != null && comp.getSup().compareTo(BigDecimal.ZERO) < 0) {
                 latex.append("^{").append(formatScientificNotation(comp.getSup())).append("}");
                 latex.append("^{").append(formatScientificNotation(comp.getSup())).append("}");
             }
             }
 
 
-            if (comp.getSub() != null && comp.getSub().compareTo(BigDecimal.ZERO) > 0) {
+            if (comp.getSub() != null && comp.getSub().compareTo(BigDecimal.ZERO) >= 0) {
                 latex.append("_{+").append(formatScientificNotation(comp.getSub())).append("}");
                 latex.append("_{+").append(formatScientificNotation(comp.getSub())).append("}");
             }
             }
             if (comp.getSub() != null && comp.getSub().compareTo(BigDecimal.ZERO) < 0) {
             if (comp.getSub() != null && comp.getSub().compareTo(BigDecimal.ZERO) < 0) {

@@ -92,4 +92,10 @@ public class QueryContractFrameworkVo extends PageVo implements BaseVo, Serializ
      */
      */
     @ApiModelProperty("客户Id集合")
     @ApiModelProperty("客户Id集合")
     private List<String> customerIdList;
     private List<String> customerIdList;
+
+    /**
+     * 移动端搜索
+     */
+    @ApiModelProperty("移动端搜索")
+    private String keyword;
 }
 }

@@ -63,12 +63,31 @@
             <if test="vo.validityTimeEnd != null">
             <if test="vo.validityTimeEnd != null">
                 AND tb.validity_time &lt;= #{vo.validityTimeEnd}
                 AND tb.validity_time &lt;= #{vo.validityTimeEnd}
             </if>
             </if>
-            <if test="vo.customerIdList != null and vo.customerIdList.size() > 0">
-                AND tb.customer_id IN
-                <foreach collection="vo.customerIdList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
-            </if>
+            <choose>
+                <!-- 情况1：customerIdList 和 keyword 都有值 -->
+                <when test="vo.customerIdList != null and vo.customerIdList.size() > 0 and vo.keyword != null and vo.keyword != ''">
+                    AND (
+                    tb.customer_id IN
+                    <foreach collection="vo.customerIdList" open="(" separator="," close=")" item="item">
+                        #{item}
+                    </foreach>
+                    OR tb.code LIKE CONCAT('%', #{vo.keyword}, '%')
+                    )
+                </when>
+
+                <!-- 情况2：只有 customerIdList 有值 -->
+                <when test="vo.customerIdList != null and vo.customerIdList.size() > 0">
+                    AND tb.customer_id IN
+                    <foreach collection="vo.customerIdList" open="(" separator="," close=")" item="item">
+                        #{item}
+                    </foreach>
+                </when>
+
+                <!-- 情况3：只有 keyword 有值 -->
+                <when test="vo.keyword != null and vo.keyword != ''">
+                    AND tb.code LIKE CONCAT('%', #{vo.keyword}, '%')
+                </when>
+            </choose>
         </where>
         </where>
         order by tb.create_time desc
         order by tb.create_time desc
     </select>
     </select>