bug

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/BaseCustomInfoController.java

 package com.ruoyi.web.controller.business;
 
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -79,6 +80,8 @@ public class BaseCustomInfoController extends BaseController
     public AjaxResult add(@RequestBody BaseCustomInfo baseCustomInfo)
     {
         baseCustomInfo.setFzr(getUsername());
+        baseCustomInfo.setCreateTime(new Date());
+        baseCustomInfo.setCreateBy(getUsername());
         return toAjax(baseCustomInfoService.insertBaseCustomInfo(baseCustomInfo));
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseCustomInfo.java

@@ -84,6 +84,14 @@ public class BaseCustomInfo extends BaseEntity
 
     private String[] customTrade;
 
+    private String[] customStatus;
+
+    private String[] purposeLevel;
+
+    private String[] productType;
+
+    private String[] customSource;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -268,4 +276,36 @@ public class BaseCustomInfo extends BaseEntity
     public void setBz(String bz) {
         this.bz = bz;
     }
+
+    public String[] getCustomStatus() {
+        return customStatus;
+    }
+
+    public void setCustomStatus(String[] customStatus) {
+        this.customStatus = customStatus;
+    }
+
+    public String[] getPurposeLevel() {
+        return purposeLevel;
+    }
+
+    public void setPurposeLevel(String[] purposeLevel) {
+        this.purposeLevel = purposeLevel;
+    }
+
+    public String[] getProductType() {
+        return productType;
+    }
+
+    public void setProductType(String[] productType) {
+        this.productType = productType;
+    }
+
+    public String[] getCustomSource() {
+        return customSource;
+    }
+
+    public void setCustomSource(String[] customSource) {
+        this.customSource = customSource;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/business/impl/BaseCustomInfoServiceImpl.java

 package com.ruoyi.system.service.business.impl;
 
 import java.util.List;
+
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.business.BaseCustomInfo;
 import com.ruoyi.system.mapper.business.BaseCustomInfoMapper;
@@ -16,8 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2025-02-10
  */
 @Service
-public class BaseCustomInfoServiceImpl implements IBaseCustomInfoService
-{
+public class BaseCustomInfoServiceImpl implements IBaseCustomInfoService {
     @Autowired
     private BaseCustomInfoMapper baseCustomInfoMapper;
 
@@ -28,8 +28,7 @@ public class BaseCustomInfoServiceImpl implements IBaseCustomInfoService
      * @return 客户信息
      */
     @Override
-    public BaseCustomInfo selectBaseCustomInfoById(Long id)
-    {
+    public BaseCustomInfo selectBaseCustomInfoById(Long id) {
         return baseCustomInfoMapper.selectBaseCustomInfoById(id);
     }
 
@@ -40,8 +39,7 @@ public class BaseCustomInfoServiceImpl implements IBaseCustomInfoService
      * @return 客户信息
      */
     @Override
-    public List<BaseCustomInfo> selectBaseCustomInfoList(BaseCustomInfo baseCustomInfo)
-    {
+    public List<BaseCustomInfo> selectBaseCustomInfoList(BaseCustomInfo baseCustomInfo) {
         return baseCustomInfoMapper.selectBaseCustomInfoList(baseCustomInfo);
     }
 
@@ -52,9 +50,10 @@ public class BaseCustomInfoServiceImpl implements IBaseCustomInfoService
      * @return 结果
      */
     @Override
-    public int insertBaseCustomInfo(BaseCustomInfo baseCustomInfo)
-    {
+    public int insertBaseCustomInfo(BaseCustomInfo baseCustomInfo) {
         baseCustomInfo.setCreateTime(DateUtils.getNowDate());
+        baseCustomInfo.setKhgs(baseCustomInfo.getKhgs() == null ? "无" : baseCustomInfo.getKhgs());
+        baseCustomInfo.setKhgs(baseCustomInfo.getKhxm() == null ? "未知" : baseCustomInfo.getKhxm());
         return baseCustomInfoMapper.insertBaseCustomInfo(baseCustomInfo);
     }
 
@@ -65,8 +64,7 @@ public class BaseCustomInfoServiceImpl implements IBaseCustomInfoService
      * @return 结果
      */
     @Override
-    public int updateBaseCustomInfo(BaseCustomInfo baseCustomInfo)
-    {
+    public int updateBaseCustomInfo(BaseCustomInfo baseCustomInfo) {
         baseCustomInfo.setUpdateTime(DateUtils.getNowDate());
         return baseCustomInfoMapper.updateBaseCustomInfo(baseCustomInfo);
     }
@@ -78,8 +76,7 @@ public class BaseCustomInfoServiceImpl implements IBaseCustomInfoService
      * @return 结果
      */
     @Override
-    public int deleteBaseCustomInfoByIds(Long[] ids)
-    {
+    public int deleteBaseCustomInfoByIds(Long[] ids) {
         return baseCustomInfoMapper.deleteBaseCustomInfoByIds(ids);
     }
 
@@ -90,8 +87,7 @@ public class BaseCustomInfoServiceImpl implements IBaseCustomInfoService
      * @return 结果
      */
     @Override
-    public int deleteBaseCustomInfoById(Long id)
-    {
+    public int deleteBaseCustomInfoById(Long id) {
         return baseCustomInfoMapper.deleteBaseCustomInfoById(id);
     }
 }

ruoyi-system/src/main/resources/mapper/business/BaseCustomInfoMapper.xml

@@ -48,6 +48,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{hy}
                 </foreach>
             </if>
+            <if test="customStatus != null ">
+                and khzt in
+                <foreach collection="customStatus" item="khzt" open="(" separator="," close=")">
+                    #{khzt}
+                </foreach>
+            </if>
+            <if test="purposeLevel != null ">
+                and yxdj in
+                <foreach collection="purposeLevel" item="yxdj" open="(" separator="," close=")">
+                    #{yxdj}
+                </foreach>
+            </if>
+            <if test="productType != null ">
+                and cplb in
+                <foreach collection="productType" item="cplb" open="(" separator="," close=")">
+                    #{cplb}
+                </foreach>
+            </if>
+            <if test="customSource != null ">
+                and khly in
+                <foreach collection="customSource" item="khly" open="(" separator="," close=")">
+                    #{khly}
+                </foreach>
+            </if>
             <if test="yxdj != null "> and yxdj = #{yxdj}</if>
             <if test="khzt != null "> and khzt = #{khzt}</if>
             <if test="gs != null "> and gs = #{gs}</if>