Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java

@@ -28,6 +28,9 @@ public class BaseDiscountpackagePageListVo implements Vo {
     @ApiModelProperty("优惠包价值")
     private String discountMoney;
 
+    @ApiModelProperty("优惠包成本")
+    private String projectCost;
+
     @ApiModelProperty("优惠项目说明")
     private String discountExplain;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java

@@ -46,6 +46,11 @@ public class BaseVehicleCertificate extends BaseEntity {
     @ApiModelProperty(value = "合格证情况")
     private String certificateSituationValue;
 
+    @ApiModelProperty("合格证状态key")
+    private String certificateState;
+    @ApiModelProperty("合格证状态value")
+    private String certificateStateValue;
+
     @ApiModelProperty("到证日期（陕汽必须字段）")
     private Date toCardDate;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java

@@ -36,6 +36,11 @@ public class BaseVehicleCertificateDetailsVo implements Vo {
     @ApiModelProperty("合格证情况Value值（陕汽必须字段）")
     private String certificateSituationValue;
 
+    @ApiModelProperty("合格证状态key")
+    private String certificateState;
+    @ApiModelProperty("合格证状态value")
+    private String certificateStateValue;
+
     @ApiModelProperty("到证日期（陕汽必须字段）")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date toCardDate;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java

@@ -46,6 +46,10 @@ public class BaseVehicleCertificateDto implements Dto {
     @ApiModelProperty("合格证情况Value值（陕汽必须字段）")
     private String certificateSituationValue;
 
+    @ApiModelProperty("合格证状态key")
+    private String certificateState;
+    @ApiModelProperty("合格证状态value")
+    private String certificateStateValue;
 
     @ApiModelProperty("到证日期（陕汽必须字段）")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateQuery.java

@@ -28,9 +28,12 @@ public class BaseVehicleCertificateQuery implements Query {
     @ApiModelProperty("合格证编号（陕汽必须字段）")
     private String certificationNo;
 
-    @ApiModelProperty("发证日期（陕汽必须字段）")
-    private String certificateDate;
+    @ApiModelProperty("发证开始日期（陕汽必须字段）")
+    private String certificateStartDate;
 
-    @ApiModelProperty("合格证情况（陕汽必须字段）")
-    private String certificateSituation;
+    @ApiModelProperty("发证结束日期（陕汽必须字段）")
+    private String certificateEndDate;
+
+    @ApiModelProperty("合格证状态（陕汽必须字段）")
+    private String certificateState;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateVo.java

@@ -41,6 +41,9 @@ public class BaseVehicleCertificateVo implements Vo {
     @ApiModelProperty("合格证情况Value值（陕汽必须字段）")
     private String certificateSituationValue;
 
+    @ApiModelProperty("合格证状态value")
+    private String certificateStateValue;
+
     @ApiModelProperty("到证日期")
     private String toCardDate;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelSelectVo.java

@@ -100,6 +100,9 @@ public class BaseVehicleModelSelectVo implements Vo {
     @ApiModelProperty(value = "细分市场（陕汽、欧曼特有）")
     private String marketSegments;
 
+    @ApiModelProperty(value = "细分市场value（陕汽、欧曼特有）")
+    private String marketSegmentsValue;
+
     @ApiModelProperty(value = "规格型号（陕汽特有）")
     private String specifications;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java

@@ -39,7 +39,7 @@ public class BaseVehicleModelVo implements Vo {
     @ApiModelProperty(value = "车型名称（产品名称）")
     private String modelName;
     @ApiModelProperty(value = "产品线")
-    private String productLine;
+    private String productLineValue;
     @ApiModelProperty(value = "驱动形式")
     private String driveForm;
     @ApiModelProperty(value = "马力")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java

@@ -103,6 +103,12 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
     public ResultBean<BaseDiscountpackageVo> fetchSid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseDiscountpackageVo vo = baseDiscountpackageService.selectBySid(sid);
+        String discountMoney = vo.getDiscountMoney();
+        String projectCost = vo.getProjectCost();
+        discountMoney = discountMoney.substring(0,discountMoney.indexOf("."));
+        projectCost = projectCost.substring(0,projectCost.indexOf("."));
+        vo.setDiscountMoney(discountMoney);
+        vo.setProjectCost(projectCost);
         return rb.success().setData(vo);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -63,6 +63,15 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         IPage<BaseDiscountpackageQuery> page = PagerUtil.queryToPage(pq);
         QueryWrapper<BaseDiscountpackagePageListVo> qw = buildQueryWrapper(pq.getParams());
         IPage<BaseDiscountpackagePageListVo> busOrderDiscountPageListVoIPage = baseMapper.listPage(page, qw);
+        List<BaseDiscountpackagePageListVo> records = busOrderDiscountPageListVoIPage.getRecords();
+        for (BaseDiscountpackagePageListVo record : records) {
+            String discountMoney = record.getDiscountMoney();
+            String projectCost = record.getProjectCost();
+            discountMoney = discountMoney.substring(0,discountMoney.indexOf("."));
+            projectCost = projectCost.substring(0,projectCost.indexOf("."));
+            record.setDiscountMoney(discountMoney);
+            record.setProjectCost(projectCost);
+        }
         return busOrderDiscountPageListVoIPage;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -16,6 +16,8 @@
         <!--合格证情况-->
         bvc.certificateSituation,
         bvc.certificateSituationValue,
+        <!--合格证状态-->
+        bvc.certificateStateValue,
         <!--到证日期-->
         DATE_FORMAT(bvc.toCardDate, '%Y-%m-%d') as toCardDate,
         <!--领取日期-->
@@ -25,7 +27,6 @@
         <!--备注-->
         bvc.remarks
         FROM base_vehicle_certificate bvc
-        where isDelete = 0
             ${ew.customSqlSegment}
     </select>
 
@@ -72,6 +73,9 @@
         bvc.certificateSituation,
         <!--合格证情况Value值-->
         bvc.certificateSituationValue,
+        <!--合格证状态-->
+        bvc.certificateState,
+        bvc.certificateStateValue,
         <!--到证日期-->
         DATE_FORMAT(bvc.toCardDate, '%Y-%m-%d') as toCardDate,
         <!--领取日期-->

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -52,15 +52,18 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
      */
     private QueryWrapper<BaseVehicleCertificateVo> buildQueryWrapper(BaseVehicleCertificateQuery pagerQuery) {
         QueryWrapper<BaseVehicleCertificateVo> qw = new QueryWrapper<>();
+        qw.eq("bvc.isDelete",0);
         if (pagerQuery != null) {
             if (StringUtils.isNotBlank(pagerQuery.getCertificationNo())) {//合格证编号
                 qw.like("bvc.certificationNo", pagerQuery.getCertificationNo());
             }
-            if (StringUtils.isNotBlank(pagerQuery.getCertificateDate())) {//发证日期
-                qw.eq("bvc.certificateDate", pagerQuery.getCertificateDate());
-            }
-            if (StringUtils.isNotBlank(pagerQuery.getCertificateSituation())) {//合格证情况
-                qw.like("bvc.certificateSituation", pagerQuery.getCertificateSituation());
+            String certificateStartDate = pagerQuery.getCertificateStartDate();
+            String certificateEndDate = pagerQuery.getCertificateEndDate();
+            qw.apply(StringUtils.isNotBlank(certificateStartDate), "date_format (certificateDate,'%Y-%m-%d') >= date_format('" + certificateStartDate + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(certificateEndDate), "date_format (certificateDate,'%Y-%m-%d') <= date_format('" + certificateEndDate + "','%Y-%m-%d')"
+                    );
+            if (StringUtils.isNotBlank(pagerQuery.getCertificateState())) {//合格证状态
+                qw.like("bvc.certificateState", pagerQuery.getCertificateState());
             }
         }
         return qw;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java

@@ -148,5 +148,11 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
 
     IPage<VehModelVo> listPageByVehmodel(IPage<VehModelVo> page,@Param(Constants.WRAPPER) QueryWrapper<VehModelVo> qw);
 
-    int checkByModelName(String modelName);
+    int checkSaveByModelName(String modelName);
+
+    int checkSaveByVehicleTypeCode(String vehicleTypeCode);
+
+    int checkUpdateByModelName(@Param("modelName") String modelName,@Param("sid") String sid);
+
+    int checkUpdateByVehicleTypeCode(@Param("vehicleTypeCode") String vehicleTypeCode,@Param("sid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -277,6 +277,7 @@
         bvm.useOrgName,
         <!--细分市场（陕汽、欧曼特有）-->
         bvm.marketSegments,
+        bvm.marketSegmentsValue,
         <!--规格型号（陕汽特有）-->
         bvm.specifications,
         <!--内部编码（欧曼特有）-->
@@ -405,7 +406,29 @@
         </where>
     </select>
 
-    <select id="checkByModelName" resultType="int">
-        SELECT COUNT(*) FROM base_vehicle_model WHERE modelName = #{modelName} and isDelete = 0
+    <select id="checkSaveByModelName" resultType="int">
+        SELECT COUNT(*) FROM base_vehicle_model
+        WHERE modelName = #{modelName}
+          and isDelete = 0
+    </select>
+
+    <select id="checkUpdateByModelName" resultType="int">
+        SELECT COUNT(*) FROM base_vehicle_model
+        WHERE modelName = #{modelName}
+          and sid != #{sid}
+          and isDelete = 0
+    </select>
+
+    <select id="checkSaveByVehicleTypeCode" resultType="int">
+        SELECT COUNT(*) FROM base_vehicle_model
+        WHERE vehicleTypeCode = #{vehicleTypeCode}
+          and isDelete = 0
+    </select>
+
+    <select id="checkUpdateByVehicleTypeCode" resultType="int">
+        SELECT COUNT(*) FROM base_vehicle_model
+        WHERE vehicleTypeCode = #{vehicleTypeCode}
+          and sid != #{sid}
+          and isDelete = 0
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -509,7 +509,12 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             entity.setModelName(entity.getVehicleTypeValue()+entity.getProductLineValue()+entity.getDriveFormValue()+entity.getGearboxTypeValue()+entity.getVehicleVersionValue()+entity.getPowerValue()+entity.getFuelTypeValue()+entity.getEngineTypeValue()+entity.getEmissionStandardValue()+entity.getMarketSegmentsValue()+entity.getSpecifications()+entity.getDepartmentValue());
             entity.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
             String modelName = entity.getModelName();
-            int i = baseMapper.checkByModelName(modelName);
+            String vehicleTypeCode = entity.getVehicleTypeCode();
+            int i1 = baseMapper.checkSaveByVehicleTypeCode(vehicleTypeCode);
+            if (i1 > 0){
+                return rb.setMsg("该车型编码已存在");
+            }
+            int i = baseMapper.checkSaveByModelName(modelName);
             if (i > 0){
                 return rb.setMsg("该车型信息已存在");
             }
@@ -538,11 +543,16 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         dto.setModelName(dto.getVehicleTypeValue()+dto.getProductLineValue()+dto.getDriveFormValue()+dto.getGearboxTypeValue()+dto.getVehicleVersionValue()+dto.getPowerValue()+dto.getFuelTypeValue()+dto.getEngineTypeValue()+dto.getEmissionStandardValue()+dto.getMarketSegmentsValue()+dto.getSpecifications()+dto.getDepartmentValue());
         dto.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
         String modelName = dto.getModelName();
-        int i = baseMapper.checkByModelName(modelName);
+        String vehicleTypeCode = dto.getVehicleTypeCode();
+        int i1 = baseMapper.checkUpdateByVehicleTypeCode(vehicleTypeCode, sid);
+        if (i1 > 0){
+            return rb.setMsg("该车型编码已存在");
+        }
+        int i = baseMapper.checkUpdateByModelName(modelName,sid);
         if (i > 0){
             return rb.setMsg("该车型信息已存在");
         }
-        updateBySid(dto.toMap(), sid);
+        int i2 = updateBySid(dto.toMap(), sid);
         baseVehicleModelAppendixService.deleteByVehModelSid(sid);
         List<BaseVehicleModelAppendixDto> baseVehicleModelAppendixDtos = dto.getBaseVehicleModelAppendixDtos();
         for (BaseVehicleModelAppendixDto baseVehicleModelAppendixDto : baseVehicleModelAppendixDtos) {
@@ -556,7 +566,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             baseVehicleModelAppendixDto.fillEntity(baseVehicleModelAppendix);
             baseVehicleModelAppendixService.save(baseVehicleModelAppendix);
         }
-        if (i == 0) {
+        if (i2 == 0) {
             return rb.setMsg("修改失败");
         }
         return rb.success().setMsg("修改成功");