Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@@ -31,17 +31,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.as.api.ascustomervehicle.*;
 import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenance;
 import com.yxt.anrui.as.biz.ascustomervehmaintenance.AsCustomervehMaintenanceService;
-import com.yxt.anrui.as.feign.crm.CrmCustomerTempDto;
 import com.yxt.anrui.as.feign.crm.CrmCustomerTempFeign;
 import com.yxt.anrui.as.feign.yxtcrm.CrmCustomerDto;
 import com.yxt.anrui.as.feign.yxtcrm.YxtCrmCustomerTempFeign;
-import com.yxt.common.core.result.ResultBean;
-import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -263,9 +261,9 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
         ResultBean rb = ResultBean.fireFail();
         CrmCustomerDto tempDto = new CrmCustomerDto();
         BeanUtil.copyProperties(dto, tempDto);
-        ResultBean save = yxtCrmCustomerTempFeign.saveForQuickVeh(tempDto);
+        ResultBean<String> save = yxtCrmCustomerTempFeign.saveForQuickVeh(tempDto);
         if (save.getSuccess()) {
-            String sid = (String) save.getData();
+            String sid = save.getData();
             dto.setCustomerSid(sid);
             AsCustomerVehicleDetails vehicleDetails = new AsCustomerVehicleDetails();
             BeanUtil.copyProperties(dto, vehicleDetails);

yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java

@@ -29,9 +29,13 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.HanZiConverterPinYin;
 import com.yxt.common.base.utils.HttpStatusEnum;
-import com.yxt.crm.biz.crmcustomerorg.CrmCustomerOrg;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import com.yxt.crm.feign.anruicrm.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.crm.feign.anruicrm.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.crm.feign.as.ascustomervehicle.AsCustomerCrmVehVo;
@@ -51,21 +55,15 @@ import com.yxt.crm.feign.portal.sysuser.SysUserDto;
 import com.yxt.crm.feign.portal.sysuser.SysUserFeign;
 import com.yxt.crm.feign.portal.sysuser.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -659,6 +657,7 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
         String sid = "";
         if (dto.getVehState().equals("0")) {
             CrmCustomer crmCustomerTemp = new CrmCustomer();
+            sid = crmCustomerTemp.getSid();
             BeanUtil.copyProperties(dto,crmCustomerTemp,"sid");
             String orgSid = "";
             if (StringUtils.isNotBlank(dto.getOrgPath())) {

yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmdockingpeople/CrmDockingPeopleMapper.xml

@@ -11,6 +11,12 @@
 		SELECT * FROM crm_docking_people <where> ${ew.sqlSegment} </where>
 	</select>
     <select id="getListByCustomerSid" resultType="com.yxt.crm.biz.crmdockingpeople.PeopleList">
-		SELECT * FROM crm_docking_people where customerSid =#{customerSid}
+		SELECT
+		       sid,
+		       `name`,
+		       mobile,
+		       remarks,
+			   IF(isEnable = 0, '禁用', '启用') isEnable
+		FROM crm_docking_people where customerSid =#{customerSid}
 	</select>
 </mapper>

yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmdockingpeople/PeopleList.java

@@ -17,4 +17,5 @@ public class PeopleList {
     @ApiModelProperty("手机号码")
     private String mobile; // 手机号码
     private String remarks;
+    private String isEnable;
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptanceapply/AdBeverageAcceptanceApplyMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.oa.biz.adofficesuppliesapply.AdOfficeSuppliesApplyMapper">
+<mapper namespace="com.yxt.anrui.oa.biz.adbeverageacceptanceapply.AdBeverageAcceptanceApplyMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.oa.biz.adofficesuppliesdetail.AdOfficeSuppliesDetailMapper">
+<mapper namespace="com.yxt.anrui.oa.biz.adbeverageacceptancedetail.AdBeverageAcceptanceDetailMapper">
     <select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adofficesuppliesdetail.AdOfficeSuppliesDetailVo">
         select *
         from ad_office_supplies_detail