字典表

src/main/java/com.huiju.welcome/controller/SysDictController.java

@@ -9,6 +9,7 @@ import com.huiju.welcome.service.ISysDictService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,7 +33,7 @@ public class SysDictController extends BaseController {
     private final Logger logger = LoggerFactory.getLogger(SysDictController.class);
 
     @Autowired
-    public ISysDictService iSysDictService;
+    private ISysDictService iSysDictService;
 
 
     /**
@@ -118,12 +119,18 @@ public class SysDictController extends BaseController {
      * 根据TYPE查询对象
      * @param type  实体type
      */
-    @RequestMapping(value="/dict/get",method= RequestMethod.GET)
-    public ResponseBean getDictByType(@RequestParam  String type){
+    @RequestMapping(value="/miniapp/dicts",method= RequestMethod.GET)
+    public ResponseBean getDictByType(String type){
         ResponseBean responseBean = new ResponseBean();
         try {
             QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("type",type);
+            if(!StringUtils.isEmpty(type)){
+                queryWrapper.eq("type",type);
+            }
+            queryWrapper.orderByAsc("type");
+            queryWrapper.orderByDesc("sort");
+            queryWrapper.orderByDesc("create_date");
+            
             responseBean.addSuccess(iSysDictService.list(queryWrapper));
         }catch (Exception e){
             logger.error("getByType -=- {}",e.toString());

src/main/java/com.huiju.welcome/controller/TaCustomerController.java

@@ -202,7 +202,7 @@ public class TaCustomerController extends BaseController {
 
             iTaMainUsherRecordService.updateByCustomer(taCustomer, follows, JWTUtils.getSubject(request));
 
-            taCustomer.setRemark(null);
+            //taCustomer.setRemark(null);
             if (iTaCustomerService.updateById(taCustomer)){
 
                 // 反更新人员

src/main/java/com.huiju.welcome/model/TaCustomer.java

@@ -49,6 +49,9 @@ public class TaCustomer implements Serializable {
     private String favorHouse;
 
     private String favorLevel;
+    
+    @TableField(exist = false)
+    private String favorLevelLable;
 
     private String remark;
 
@@ -85,6 +88,9 @@ public class TaCustomer implements Serializable {
      * 现居住区域
      */
     private Integer nowArea;
+    
+    @TableField(exist = false)
+    private String nowAreaLable;
 
     /**
      * 现居住小区
@@ -100,7 +106,9 @@ public class TaCustomer implements Serializable {
      * 家庭成员收入工作城市
      */
     private Integer familyWork;
-
+    
+    @TableField(exist = false)
+    private String familyWorkLable;
     /**
      * 请填写具体城市名称
      */
@@ -115,35 +123,68 @@ public class TaCustomer implements Serializable {
      * 家庭收入成员工作行业
      */
     private String familyIndustry;
+    
+    @TableField(exist = false)
+    private String familyIndustryLable;
 
     /**
      * 家庭收入成员工作职务
      */
     private String familyDuty;
+    
+    @TableField(exist = false)
+    private String familyDutyLable;
 
     /**
      * 家庭本市置业次数
      */
     private Integer housePurchasing;
+    
+    @TableField(exist = false)
+    private String housePurchasingLable;
 
     /**
      * 家庭本市名下房产数量
      */
     private Integer houseProperty;
+    
+    @TableField(exist = false)
+    private String housePropertyLable;
 
     /**
      * 现居住面积
      */
     private Integer houseLivingArea;
+    
+    @TableField(exist = false)
+    private String houseLivingAreaLable;
 
     /**
      * 现居住户型
      */
     private Integer houseType;
+    
+    @TableField(exist = false)
+    private String houseTypeLable;
 
     /**
      * 目前家庭结构
      */
     private Integer familyStructure;
-
+    
+    @TableField(exist = false)
+    private String familyStructureLable;
+    
+    /**
+     * 客户年龄
+     */
+    private Integer customerAge;
+    
+    @TableField(exist = false)
+    private String customerAgeLable;
+    
+    /**
+     * 身份证号
+     */
+    private String idcard;
 }

src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java

@@ -67,6 +67,9 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
 
     @Autowired
     MiniApp miniApp;
+    
+    @Autowired
+    private ISysDictService iSysDictService;
 
     @Override
     public List<TaPerson> getGroup(Integer customerId) {
@@ -293,7 +296,8 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     public TaCustomer getByPhoneOrPlate(String phone, String plateNumber) {
         QueryWrapper<TaCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(phone != null,"phone", phone).or().eq(plateNumber != null, "plate_number", plateNumber);
-        queryWrapper.eq(null == phone || null == plateNumber, "customer_id", -1); // 故意设置一个查询不到数据的条件
+        // 故意设置一个查询不到数据的条件
+        queryWrapper.eq(null == phone || null == plateNumber, "customer_id", -1);
         queryWrapper.orderByDesc("status");
         queryWrapper.orderByDesc("create_date");
         queryWrapper.last("limit 1");
@@ -304,7 +308,47 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     @Override
     public TaCustomer getWithLastVisit(Integer id) {
         TaCustomer taCustomer = taCustomerMapper.selectById(id);
-        if (null == taCustomer) return null;
+        if (null == taCustomer) {
+            return null;
+        }
+        //获取字典表所有信息
+        List<SysDict> dictList = iSysDictService.list();
+        dictList.stream().forEach(e -> {
+            //对比数据重新赛值
+            if (e.getId().equals(taCustomer.getNowArea())){
+                taCustomer.setNowAreaLable(e.getLabel());
+            }
+            if (e.getId().equals(taCustomer.getFamilyWork())){
+                taCustomer.setFamilyWorkLable(e.getLabel());
+            }
+            if (e.getId().equals(Integer.valueOf(taCustomer.getFamilyIndustry()))){
+                taCustomer.setFamilyIndustryLable(e.getLabel());
+            }
+            if (e.getId().equals(Integer.valueOf(taCustomer.getFamilyDuty()))){
+                taCustomer.setFamilyDutyLable(e.getLabel());
+            }
+            if (e.getId().equals(taCustomer.getHousePurchasing())){
+                taCustomer.setHousePurchasingLable(e.getLabel());
+            }
+            if (e.getId().equals(taCustomer.getHouseProperty())){
+                taCustomer.setHousePropertyLable(e.getLabel());
+            }
+            if (e.getId().equals(taCustomer.getHouseLivingArea())){
+                taCustomer.setHouseLivingAreaLable(e.getLabel());
+            }
+            if (e.getId().equals(taCustomer.getHouseType())){
+                taCustomer.setHouseTypeLable(e.getLabel());
+            }
+            if (e.getId().equals(taCustomer.getFamilyStructure())){
+                taCustomer.setFamilyStructureLable(e.getLabel());
+            }
+            if (e.getId().equals(taCustomer.getCustomerAge())){
+                taCustomer.setCustomerAgeLable(e.getLabel());
+            }
+            if (e.getId().equals(Integer.valueOf(taCustomer.getFavorLevel()))){
+                taCustomer.setFavorLevelLable(e.getLabel());
+            }
+        });
 
         TaMainUsherRecord taMainUsherRecord = iTaMainUsherRecordService.getTodayRecord(taCustomer.getCustomerId());
         if (null != taMainUsherRecord) {