Browse Source

客户管理问题修改,车型问题修改,合同档案代码,合同审核代码

master
hanlinghao 3 years ago
parent
commit
5be626dd60
  1. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  2. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
  3. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  4. 119
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  5. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  6. 41
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  7. 34
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
  8. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  9. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java
  10. 30
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
  11. 29
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
  12. 203
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@ -328,7 +328,7 @@
WHERE bv.modelSid = bvc.modelSid
AND bv.modelConfigSid =
bvc.configurationItemsSid
and bv.useOrg = bvc.useOrgSid) AS nowCarNum,
and bv.useOrg = bvc.useOrgSid) AS nowCarNum,
(SELECT count(*)
FROM bus_vehicle_apply_detail bvad
WHERE bvad.vehicleSid = bvc.modelSid
@ -490,7 +490,7 @@
<select id="getModelConfigPageList"
resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
SELECT
bmc.sid,
bmc.sid as configSid,
bmc.carColor,
bmc.slowMachine,
bmc.rearViewMirror,
@ -510,7 +510,7 @@
bmc.independentSources,
bmc.fuelTank,
bmc.multimedia,
bvc.guidedPrice,
bvc.guidedPrice as price,
bvc.priceValidity,
bvm.sid as modelSid,
bvm.vehicleAlias as modelName,

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@ -237,7 +237,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
public List<AppModelConfigListVo> selectAppConfigListByModelSid(String modelSid) {
List<AppModelConfigListVo> listVos = baseMapper.selectAppConfigListByModelSid(modelSid);
for (AppModelConfigListVo listVo : listVos) {
String sid = listVo.getSid();
String sid = listVo.getConfigSid();
String vehicleQuantity = baseMapper.selectVehicleQuantity(sid, modelSid);
listVo.setVehicleQuantity(vehicleQuantity);
}
@ -517,11 +517,11 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
//分公司配置列表查询
for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
String useOrg = data.getSid();
List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getSid(), useOrg);
List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), useOrg);
for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
moreConfigVo.setCompanyName(data.getName());
}
appModelConfigListVo.setMoreConfig(moreConfigVos);
appModelConfigListVo.setMoreList(moreConfigVos);
}
addDonfigName(appModelConfigListVos);
vo.setModelConfigList(appModelConfigListVos);
@ -602,7 +602,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
QueryWrapper<AppModelConfigListVo> qw = new QueryWrapper<>();
if (pagerQuery != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//名称
qw.like("bvc.vehicleAlias", pagerQuery.getName());
qw.like("bmc.configName", pagerQuery.getName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getBodyColor())) {//颜色
qw.like("bmc.carColor", pagerQuery.getBodyColor());

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@ -238,6 +238,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
* 手机端查询不本公司的现车排产车
*
* @param modelSid
* @param sid
* @return
*/
List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("useOrg") String useOrg);
@ -315,5 +316,14 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
IPage<PcBaseVehicleOrderVo> selectVo(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
/**
* 手机端-配置列表获取现车列表
*
* @param page
* @param qw
* @return
*/
IPage<AppBaseVinNowCarVo> getModelNowCarList(IPage<AppBaseVinNowCarVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBaseVinNowCarVo> qw);
BaseVehicleVo fetchVehicle(QueryWrapper<BaseVehicleVo> qw);
}

119
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -12,12 +12,12 @@
<!--分页列表-->
<select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
SELECT bv.sid,
bv.modelName,
bv.vinNo,
bv.engineNo,
bv.vehicleStateValue,
bv.location,
bv.libraryAge
bv.modelName,
bv.vinNo,
bv.engineNo,
bv.vehicleStateValue,
bv.location,
bv.libraryAge
FROM base_vehicle bv
<where>
${ew.sqlSegment}
@ -69,10 +69,10 @@
<!--库龄(根据首次发车日期计算)-->
bv.libraryAge
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
${ew.customSqlSegment}
</select>
<!--删除或批量删除车辆信息-->
<delete id="deleteBySids" parameterType="java.util.List">
@ -158,16 +158,16 @@
bvm.isValidity,
bvm.isValidityValue
FROM base_vehicle_model bvm
LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
WHERE bvm.sid = #{modelSid}
AND bmc.sid = #{modelConfigSid}
AND bmc.sid = #{modelConfigSid}
</select>
<!--导入车辆信息-->
<insert id="saveList">
INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location,
vehicleState, firstStartDate, libraryAge)
vehicleState, firstStartDate, libraryAge)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(UUID(),<!--sid-->
@ -196,8 +196,8 @@
</select>
<select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
select bv.sid,
bv.modelSid,
bv.modelConfigSid,
bv.modelSid,
bv.modelConfigSid,
<!--车架号(VIN)-->
bv.vinNo,
<!--发动机号/许可证号-->
@ -256,13 +256,13 @@
<select id="getAppCurrentCarByPageList"
resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo">
SELECT bvm.sid AS modelSid,
bvm.vehicleAlias,
bvm.brandName,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue
bvm.vehicleAlias,
bvm.brandName,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
<where>
${ew.sqlSegment}
</where>
@ -373,9 +373,9 @@
<!--配置Sid-->
bv.modelConfigSid AS configSid
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
</select>
<select id="selectExiCarConfig" resultType="com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo">
@ -438,8 +438,8 @@
<!--销售指导价-->
bv.guidedPrice
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
WHERE bv.sid = #{sid}
</select>
@ -476,29 +476,30 @@
<!--配置Sid-->
bv.modelConfigSid AS configSid
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
ORDER BY
bv.priceDate desc
bv.priceDate desc
</select>
<select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppVehicleModelPriceVo">
SELECT bvm.sid AS modelSid,
bvm.vehicleAlias AS modelName,
bvm.carBrand AS brandSid,
bvm.brandName,
bvm.vehicleVersionValue AS versionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
bvc.priceValidity,
(SELECT count(*) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid) AS configNum,
(SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
(SELECT count(*)
FROM bus_vehicle_apply_detail bvad
WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
SELECT bvm.sid AS modelSid,
bvm.vehicleAlias AS modelName,
bvm.carBrand AS brandSid,
bvm.brandName,
bvm.vehicleVersionValue AS versionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
bvc.priceValidity,
bvc.guidedPrice,
(SELECT count(*) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid) AS configNum,
(SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
(SELECT count(*)
FROM bus_vehicle_apply_detail bvad
WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
FROM base_vehicle_model bvm
LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
<where>
${ew.sqlSegment}
</where>
@ -575,9 +576,9 @@
bmc.configName,
DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
</select>
<update id="updateByVinNo">
@ -632,9 +633,9 @@
DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
bv.priced
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
${ew.customSqlSegment}
</select>
<!--根据车架号查询现车详情-->
<select id="getPurchaseDetails" resultType="com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo">
@ -649,11 +650,11 @@
</select>
<select id="selectVo" resultType="com.yxt.anrui.base.api.basevehicle.PcBaseVehicleOrderVo">
select bv.vinNo linkNo,
bv.location linkText,
bv.sid linkSid,
if(bv.lockedState = 1, 1, 0)
as isFictitious
select bv.vinNo linkNo,
bv.location linkText,
bv.sid linkSid,
if(bv.lockedState = 1, 1, 0)
as isFictitious
from base_vehicle bv
<where>
${ew.sqlSegment}
@ -665,4 +666,8 @@
SELECT * FROM base_vehicle
${ew.customSqlSegment}
</select>
<select id="getModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo">
</select>
</mapper>

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@ -501,6 +501,10 @@ public class BaseVehicleRest implements BaseVehicleFeign {
@Override
public ResultBean<PagerVo<AppVehicleModelPriceVo>> getModelList(PagerQuery<AppVehicleModelPriceQuery> pagerQuery) {
ResultBean<PagerVo<AppVehicleModelPriceVo>> rb = ResultBean.fireFail();
AppVehicleModelPriceQuery params = pagerQuery.getParams();
if (params == null) {
return rb.setMsg("必传数据不能为空");
}
String userSid = pagerQuery.getParams().getUserSid();
if (StringUtils.isBlank(userSid)) {
return rb.setMsg("用户sid不能为空");
@ -531,5 +535,12 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.success().setData(vo);
}
@Override
public ResultBean<AppBaseConfigNowCarVo> getModelNowCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) {
ResultBean<AppBaseConfigNowCarVo> rb = ResultBean.fireFail();
AppBaseConfigNowCarVo vo = baseVehicleService.getModelNowCarList(pagerQuery);
return rb.success().setData(vo);
}
}

41
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -1196,4 +1196,45 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.eq("lockedState",03);
return qw;
}
/**
* 手机端-配置列表获取现车列表
*
* @param pagerQuery
* @return
*/
public AppBaseConfigNowCarVo getModelNowCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) {
AppBaseConfigNowCarQuery query = pagerQuery.getParams();
SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(query.getUserSid()).getData();
String useOrg = data.getSid();
AppBaseConfigNowCarVo appBaseConfigNowCarVo = new AppBaseConfigNowCarVo();
List<AppBaseVinNowCarVo> vinNowCarVos = new ArrayList<>();
QueryWrapper<AppBaseVinNowCarVo> qw = modelNowCarWrapper(query);
IPage<AppBaseVinNowCarVo> page = PagerUtil.queryToPage(pagerQuery);
IPage<AppBaseVinNowCarVo> pagging = baseMapper.getModelNowCarList(page, qw);
for (AppBaseVinNowCarVo record : pagging.getRecords()) {
vinNowCarVos.add(record);
}
appBaseConfigNowCarVo.setRecords(vinNowCarVos);
return appBaseConfigNowCarVo;
}
private QueryWrapper<AppBaseVinNowCarVo> modelNowCarWrapper(AppBaseConfigNowCarQuery query) {
QueryWrapper<AppBaseVinNowCarVo> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getNames())) {
qw.eq("bv.modelSid", query.getModelSid());//车型sid
}
if (StringUtils.isNotBlank(query.getNames())) {
qw.eq("bv.modelConfigSid", query.getConfigSid());//配置sid
}
if (StringUtils.isNotBlank(query.getNames())) {
qw.like("bv.vinNo", query.getNames());//车架号
}
if (StringUtils.isNotBlank(query.getUseOrg())) {
qw.eq("bv.useOrg", query.getUseOrg());
}
}
return qw;
}
}

34
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@ -5,9 +5,9 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
SELECT bvc.*,
bvm.modelName,
bvm.`vehicleVersionValue`,
bvm.`vehicleTypeCode`,
bvm.modelName,
bvm.`vehicleVersionValue`,
bvm.`vehicleTypeCode`,
<!--车身颜色-->
bmc.carColor,
<!--驾驶室规格-->
@ -52,10 +52,10 @@
bmc.bumper,
bmc.configName
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm
ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc
ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm
ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc
ON bvc.configurationItemsSid = bmc.sid
<where>
${ew.sqlSegment}
</where>
@ -72,14 +72,14 @@
<select id="getAppCommonlyUsedModelsByPageList"
resultType="com.yxt.anrui.base.api.basevehmodelconfig.AppCommonlyUsedModelsByPageListVo">
SELECT bvm.sid AS modelSid,
bvm.vehicleAlias,
bvm.brandName,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue
bvm.vehicleAlias,
bvm.brandName,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
<where>
${ew.sqlSegment}
</where>
@ -184,7 +184,7 @@
<select id="getAppIntentionVehicleVo"
resultType="com.yxt.anrui.base.api.basevehmodelconfig.AppModelVeDetailVo">
SELECT bvm.vehicleAlias,
SELECT bvm.vehicleAlias AS modelName,
bvm.brandName,
bvm.carBrand AS brandSid,
bvc.guidedPrice AS saleReferencePrice
@ -193,7 +193,7 @@
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrg = #{useOrg}
AND bvc.useOrgSid = #{useOrg}
</select>
<select id="fetchAllBySid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
@ -209,7 +209,7 @@
</select>
<select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
select bvc.guidedPrice, bm.modelName, bmc.otherConfig,bm.carBrand as brandSid
select bvc.guidedPrice, bm.modelName, bmc.otherConfig, bm.carBrand as brandSid
from base_vehmodel_config bvc
left join base_vehicle_model bm on bvc.modelSid = bm.sid
left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@ -367,8 +367,11 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
}
public AppModelVeDetailVo getAppIntentionVehicleVo(String userSid, String modelSid, String configSid) {
AppModelVeDetailVo vo = null;
String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
AppModelVeDetailVo vo = baseMapper.getAppIntentionVehicleVo(useOrg, modelSid, configSid);
if (StringUtils.isNotBlank(useOrg)) {
vo = baseMapper.getAppIntentionVehicleVo(useOrg, modelSid, configSid);
}
return vo;
}
@ -383,15 +386,15 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
ResultBean<BaseVehmodelVo> rb = ResultBean.fireFail();
BaseVehmodelVo vo = baseMapper.selectO(modelSid, configSid);
if(vo == null){
if (vo == null) {
return rb.setData(new BaseVehmodelVo());
}
return rb.success().setData(vo);
}
public AppCarConfigSummaryVo selectCarConfigSummary(String modelSid, String configSid,String userSid) {
public AppCarConfigSummaryVo selectCarConfigSummary(String modelSid, String configSid, String userSid) {
String orgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid,orgSid);
AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid, orgSid);
AppCarConfigSummaryVo configSummaryVo = addConfigName(appModelConfigListVo);
return configSummaryVo;
}

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java

@ -69,4 +69,15 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
List<CommonContractVo> selByBusSid(@Param("staffSid") String staffSid, @Param("busSid") String busSid);
CommonContractBuscenterVo selectByBusSid(String busSid);
IPage<AppCommonContractPageVo> getContractList(IPage<CommonContract> page, @Param(Constants.WRAPPER) QueryWrapper<CommonContract> qw);
/**
* 移动端-初始化合同审核
*
* @param contractSid
* @param staffSid
* @return
*/
AppCommonContractInitVo getContractInfo(@Param("contractSid") String contractSid, @Param("staffSid") String staffSid);
}

30
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@ -64,6 +64,36 @@
where busSid = #{busSid}
</select>
<select id="getContractList" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo">
SELECT
sid AS contractSid,
contractNo AS contractId,
contractTypeKey AS contractType,
partyB,
handler,
contractAmount AS contractPrice,
nodeState
FROM common_contract
<where>${ew.sqlSegment}</where>
</select>
<!--移动端-初始化合同审核-->
<select id="getContractInfo" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractInitVo">
SELECT sid AS contractSid,
price,
num AS `number`,
modelName AS model,
partyB,
contractNo AS contractId,
contractAmount AS contractPrice,
customerSid,
appdixUrl,
sceneSignUrl
FROM common_contract
WHERE sid = #{contractSid}
AND staffSid = #{staffSid}
</select>
<!--根据sid批量删除品牌管理列表数据-->
<delete id="deleteBySids" parameterType="java.util.List">
DELETE

29
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java

@ -13,6 +13,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
@ -170,7 +171,7 @@ public class CommonContractRest implements CommonContractFeign {
attachType = CommonAttachTypeEnum.CONTRACT.getAttachType();
if (pcCommonAppendixDtoList != null) {
for (PcCommonAppendixDto pcCommonAppendixDto : pcCommonAppendixDtoList) {
commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, sid, dto.getStaffSid(),attachType);
commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, sid, dto.getStaffSid(), attachType);
fileUploadComponent.getUrlPrefix();
String filePath = pcCommonAppendixDto.getFilePath();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -184,7 +185,7 @@ public class CommonContractRest implements CommonContractFeign {
attachType = CommonAttachTypeEnum.SCENESIGN.getAttachType();
if (sceneSignUrlList.size() != 0) {
for (PcCommonAppendixDto pcCommonAppendixDto : sceneSignUrlList) {
commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, dto.getSid(), dto.getStaffSid(),attachType);
commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, dto.getSid(), dto.getStaffSid(), attachType);
fileUploadComponent.getUrlPrefix();
String filePath = pcCommonAppendixDto.getFilePath();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -499,4 +500,28 @@ public class CommonContractRest implements CommonContractFeign {
public ResultBean submitCarSaleContractApprove(CarSaleContractApproveDto dto) {
return commonContractService.submitCarSaleContractApprove(dto);
}
@Override
@ApiOperation("移动端-合同审核列表")
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
ResultBean rb = ResultBean.fireFail();
PagerVo<AppCommonContractPageVo> pv = commonContractService.getContractList(pagerQuery);
return rb.success().setData(pv);
}
@Override
@ApiOperation("移动端-初始化合同审核")
public ResultBean<AppCommonContractInitVo> getContractInfo(String contractSid, String userSid) {
ResultBean rb = ResultBean.fireFail();
AppCommonContractInitVo vo = commonContractService.getContractInfo(contractSid, userSid);
return rb.success().setData(vo);
}
@Override
@ApiOperation("移动端-保存合同审核")
public ResultBean saveContractInfo(AppCrmCustomerFileDto dto) {
ResultBean rb = ResultBean.fireFail();
ResultBean resultBean = commonContractService.saveContractInfo(dto);
return rb.success();
}
}

203
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
@ -14,7 +16,11 @@ import com.yxt.anrui.base.biz.flow.FlowableService;
import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign;
import com.yxt.anrui.buscenter.api.busorder.BusOrderVo;
import com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderVo;
import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFile;
import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign;
import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileListVo;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@ -25,6 +31,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.base.config.component.FileUploadComponent;
@ -40,6 +47,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.xml.crypto.Data;
import java.io.File;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
@ -81,10 +89,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
private DictCommonFeign dictCommonFeign;
@Autowired
private BusDepositFeign busDepositFeign;
/* @Autowired
private BusOrderFeign busOrderFeign;
@Autowired
private BusOrderDiscountFeign busOrderDiscountFeign;*/
/* @Autowired
private BusOrderFeign busOrderFeign;
@Autowired
private BusOrderDiscountFeign busOrderDiscountFeign;*/
/* @Autowired
private BusOrderModelFeign busOrderModelFeign;
@Autowired
@ -104,6 +112,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
@Autowired
private SysFormLinkFeign sysFormLinkFeign;
@Autowired
private CrmCustomerFileFeign crmCustomerFileFeign;
@Autowired
private CrmCustomerFeign crmCustomerFeign;
@Autowired
private BaseModelSzconfigService baseModelSzconfigService;
@ -933,6 +943,157 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
commonContractVo.setSceneSignUrlList(sceneSignUrlList);
return rb.success().setData(commonContractVo);
}
/**
* 移动端-合同审核列表
*
* @param pagerQuery
* @return
*/
public PagerVo<AppCommonContractPageVo> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
AppCommonContractQuery query = pagerQuery.getParams();
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(query.getUserSid()).getData().getStaffSid();
query.setStaffSid(staffSid);
QueryWrapper<CommonContract> qw = appCreateQueryWrapper(query);
IPage<CommonContract> page = PagerUtil.queryToPage(pagerQuery);
IPage<AppCommonContractPageVo> iPage = baseMapper.getContractList(page, qw);
PagerVo<AppCommonContractPageVo> p = PagerUtil.pageToVo(iPage, null);
return p;
}
private QueryWrapper<CommonContract> appCreateQueryWrapper(AppCommonContractQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<CommonContract> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getType())) { //合同类型
qw.eq("contractTypeKey", query.getType());
}
if (StringUtils.isNotBlank(query.getNames())) { // 甲方名称
qw.like("partyA", query.getNames());
}
if (StringUtils.isNotBlank(query.getNames())) { // 乙方名称
qw.like("partyB", query.getNames());
}
if (StringUtils.isNotBlank(query.getNames())) { // 其他方名称
qw.like("partyC", query.getNames());
}
if (StringUtils.isNotBlank(query.getStaffSid())) { // 业务员sid
qw.like("staffSid", query.getStaffSid());
}
return qw;
}
/**
* 移动端-初始化合同审核
*
* @param contractSid
* @param userSid
* @return
*/
public AppCommonContractInitVo getContractInfo(String contractSid, String userSid) {
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData().getStaffSid();
AppCommonContractInitVo vo = baseMapper.getContractInfo(contractSid, staffSid);
String urlPrefix = fileUploadComponent.getUrlPrefix();
String[] split1 = vo.getAppdixUrl().split(",");
List<String> contract = new ArrayList<>();
List<String> contractImages = Arrays.asList(split1);
for (String contractImage : contractImages) {
String contractImageUrl = urlPrefix + contractImage;
contract.add(contractImageUrl);
}
vo.setContractImages(contract);
String[] split2 = vo.getSceneSignUrl().split(",");
List<String> siteSig = new ArrayList<>();
List<String> siteSigImages = Arrays.asList(split2);
for (String siteSigImage : siteSigImages) {
String siteSigImagesUrl = urlPrefix + siteSigImage;
siteSig.add(siteSigImagesUrl);
}
vo.setSiteSigImages(siteSig);
if (vo.getCustomerKey().equals("1")) {
vo.setIdCardArchives(false);
if (StringUtils.isNotBlank(vo.getSceneSignUrl())) {
String[] split3 = vo.getSceneSignUrl().split(",");
List<String> idCard = new ArrayList<>();
List<String> idCardImages = Arrays.asList(split3);
for (String idCardImage : idCardImages) {
String idCardImagesUrl = urlPrefix + idCardImage;
idCard.add(idCardImagesUrl);
}
vo.setIdCardImages(idCard);
} else {
vo.setIdCardImages(new ArrayList<>());
}
} else if (vo.getCustomerKey().equals("2")) {
vo.setIdCardArchives(true);
// 往里添加客户档案里的身份证信息
}
return vo;
}
/**
* 合同审核保存接口
*
* @param dto
* @return
*/
@Transactional(rollbackFor = Exception.class)
public ResultBean saveContractInfo(AppCrmCustomerFileDto dto) {
ResultBean rb = ResultBean.fireFail();
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
CommonContract commonContract = new CommonContract();
commonContract.setContractNo(dto.getContractId());
commonContract.setPrice(dto.getPrice());
commonContract.setNum(Integer.valueOf(dto.getNumber()));
commonContract.setModelName(dto.getModel());
commonContract.setPartyB(dto.getPartyB());
commonContract.setContractAmount(dto.getContractPrice());
commonContract.setCustomerSid(dto.getCustomerSid());
commonContract.setStaffSid(data.getStaffSid());
commonContract.setStaffName(data.getStaffName());
commonContract.setOrgSid(data.getOrgSid());
String s1 = "";
String s2 = "";
String s3 = "";
if (dto.getContractImages().size() > 0) {
for (String contractImage : dto.getContractImages()) {
if (contractImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
contractImage = contractImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
s1 += contractImage + ",";
}
commonContract.setAppdixUrl(s1.substring(0, s1.length() - 1));
}
if (dto.getContractImages().size() > 0) {
for (String siteSigImages : dto.getSiteSigImages()) {
if (siteSigImages.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
siteSigImages = siteSigImages.replace(fileUploadComponent.getUrlPrefix(), "");
}
s2 += siteSigImages + ",";
}
commonContract.setSceneSignUrl(s2.substring(0, s2.length() - 1));
}
if (dto.getContractImages().size() > 0) {
for (String idCardImage : dto.getIdCardImages()) {
if (idCardImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
idCardImage = idCardImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
s3 += idCardImage + ",";
}
commonContract.setIdImagesUrl(s3.substring(0, s3.length() - 1));
}
save(commonContract);
return rb.success();
}
//ToDo:
/**
* 合同信息数据
@ -942,22 +1103,22 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
*/
/* public Map<String, Object> getMap(Map<String, Object> map, PrintConfirmDto dto) {
Map<String, Object> commonContractMap = map;*/
/**
* 车辆登记合同参数
* 甲方${partyA}
* 乙方${partyB}
* 签订时间${createDate}
* 车辆出售方${partyA}
* 车辆信息List:
* {
* 序号
* 品牌${item.brandName}
* 车架号${item.VINNo}
* 发动机号${item.engineNo}
* }
*/
//甲方为卖方,即xxx公司,即根据销售订单的单位sid查询单位的名称
//乙方为受卖方,即销售订单的客户名称
/**
* 车辆登记合同参数
* 甲方${partyA}
* 乙方${partyB}
* 签订时间${createDate}
* 车辆出售方${partyA}
* 车辆信息List:
* {
* 序号
* 品牌${item.brandName}
* 车架号${item.VINNo}
* 发动机号${item.engineNo}
* }
*/
//甲方为卖方,即xxx公司,即根据销售订单的单位sid查询单位的名称
//乙方为受卖方,即销售订单的客户名称
/* ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid());
if (busOrderVoResultBean.getSuccess() && busOrderVoResultBean.getData() != null) {
BusOrderVo orderVo = busOrderVoResultBean.getData();
@ -968,7 +1129,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}
return commonContractMap;*/
/* }*/
/* }*/
/**
* 涉及高低开票的需要打印两套合同

Loading…
Cancel
Save