客户登记

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/domain/CwWorkClientBase.java

@@ -5,6 +5,8 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.query.Query;
+import com.jeeplus.core.query.QueryType;
 import lombok.Data;
 
 /**
@@ -23,11 +25,13 @@ public class CwWorkClientBase extends BaseEntity {
     /**
      * 客户编号
      */
+    @Query(tableColumn = "cw_wcb.no")
     private String no;
 
     /**
      * 客户名称
      */
+    @Query(tableColumn = "cw_wcb.name")
     private String name;
 
     /**
@@ -38,16 +42,19 @@ public class CwWorkClientBase extends BaseEntity {
     /**
      * 英文名称
      */
+    @Query(tableColumn = "cw_wcb.english_name")
     private String englishName;
 
     /**
      * 客户类型
      */
+    @Query(tableColumn = "cw_wcb.type",type = QueryType.EQ)
     private String type;
 
     /**
      * 统一社会信用代码
      */
+    @Query(tableColumn = "cw_wcb.usc_code")
     private String uscCode;
 
     /**
@@ -83,11 +90,13 @@ public class CwWorkClientBase extends BaseEntity {
     /**
      * 所属行业
      */
+    @Query(tableColumn = "cw_wcb.industry",type = QueryType.EQ)
     private String industry;
 
     /**
      * 企业隶属关系划分
      */
+    @Query(tableColumn = "cw_wcb.affiliation",type = QueryType.EQ)
     private String affiliation;
 
     /**
@@ -133,6 +142,7 @@ public class CwWorkClientBase extends BaseEntity {
     /**
      * 状态
      */
+    @Query(tableColumn = "cw_wcb.status",type = QueryType.EQ)
     private String status;
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/mapper/xml/CwWorkClientBaseMapper.xml

@@ -211,6 +211,7 @@
         su.name as user_name
         from cw_work_client_base cw_wcb
         left join sys_user su on su.id = cw_wcb.create_by
+        left join cw_work_client_type cw_wct on cw_wct.client_id = cw_wcb.id and cw_wct.del_flag = '0'
         ${ew.customSqlSegment}
     </select>
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/CwWorkClientService.java

@@ -1,6 +1,7 @@
 package com.jeeplus.test.cw.workClientInfo.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -59,6 +60,16 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
         QueryWrapper<CwWorkClientBase> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwWorkClientBaseWrapper.INSTANCE.toEntity(cwWorkClientBaseDTO), CwWorkClientBase.class );
         queryWrapper.eq("cw_wcb.del_flag","0");
         queryWrapper.orderByDesc("cw_wcb.create_date");
+        if (ObjectUtil.isNotEmpty(cwWorkClientBaseDTO)) {
+            if (ArrayUtil.isNotEmpty(cwWorkClientBaseDTO.getCreateDates())) {
+                queryWrapper.between("cw_wcb.create_date", cwWorkClientBaseDTO.getCreateDates()[0], cwWorkClientBaseDTO.getCreateDates()[1]);
+            }
+            if (ObjectUtil.isNotEmpty(cwWorkClientBaseDTO.getCwWorkClientTypeDTO())){
+                if (StringUtils.isNotBlank(cwWorkClientBaseDTO.getCwWorkClientTypeDTO().getOwnershipType())) {
+                    queryWrapper.eq("cw_wct.ownership_type",cwWorkClientBaseDTO.getCwWorkClientTypeDTO().getOwnershipType());
+                }
+            }
+        }
         IPage<CwWorkClientBaseDTO> list = cwWorkClientBaseMapper.findList(page, queryWrapper);
         return list;
     }
@@ -71,6 +82,11 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
     }
 
     public String saveForm(CwWorkClientBaseDTO cwWorkClientBaseDTO) throws Exception{
+        if (ObjectUtil.isNotEmpty(cwWorkClientBaseDTO)) {
+            if (StringUtils.isEmpty(cwWorkClientBaseDTO.getId())) {
+                cwWorkClientBaseDTO.setCreateBy(new UserDTO());
+            }
+        }
         CwWorkClientBase cwWorkClientBase = CwWorkClientBaseWrapper.INSTANCE.toEntity(cwWorkClientBaseDTO);
         if(ObjectUtil.isNotEmpty(cwWorkClientBase)){
             if(StringUtils.isBlank(cwWorkClientBase.getId())){

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/dto/CwWorkClientBaseDTO.java

@@ -1,5 +1,6 @@
 package com.jeeplus.test.cw.workClientInfo.service.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.service.dto.BaseDTO;
@@ -173,5 +174,10 @@ public class CwWorkClientBaseDTO extends BaseDTO {
      */
     private List<WorkAttachmentDto> workAttachmentDtoList;
 
+    /**
+     * 创建时间
+     */
+    private String[] createDates;
+
     private static final long serialVersionUID = 1L;
 }