Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgVehicleInformationDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,13 +49,17 @@ public class JgVehicleInformationDto extends BaseDto {
     private String inspectResult;
 
     @ApiModelProperty(value = "终审通过时间")
-    private Date auditPassDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
+    private String auditPassDate;
 
     @ApiModelProperty(value = "登记类别")
     private String regType;
 
     @ApiModelProperty(value = "注册登记日期")
-    private Date regDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
+    private String regDate;
 
     @ApiModelProperty(value = "注册登记人员ID")
     private String regPersonId;
@@ -93,6 +100,9 @@ public class JgVehicleInformationDto extends BaseDto {
     @ApiModelProperty(value = "使用单位统一信用代码")
     private String useUnitCreditCode;
 
+    @ApiModelProperty(value = "使用单位code：用作接收搜索条件")
+    private String useUnitCode;
+
     @ApiModelProperty(value = "检验机构代码")
     private String inspectUnitCreditCode;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml

@@ -15,11 +15,20 @@
             <if test="dto.carNumber != null and dto.carNumber != ''">
                 and  tjvi.car_number like concat('%',#{dto.carNumber},'%')
             </if>
+            <if test="dto.regDate != null and dto.regDate != ''">
+                and tjvi.reg_date like concat('%',DATE_FORMAT(#{dto.reg_date},'%Y-%m-%d'),'%')
+            </if>
+            <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
+                and tjvi.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
+            </if>
             <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
+            <if test="dto.useUnitCode != null and dto.useUnitCode != ''">
+                and tjvi.use_unit_credit_code = #{dto.useUnitCode}
+            </if>
             <if test="dto.dataType == 'supervision' ">
                 and  tjvi.receive_company_code = #{dto.useUnitCreditCode}
                 AND  tjvi.instance_id  <![CDATA[<>]]>  ''

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -179,7 +179,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         installationInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName());
         installationInfo.put("city", notice.getCity() + "_" + notice.getCityName());
         installationInfo.put("county", notice.getCounty() + "_" + notice.getCountyName());
-        installationInfo.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
+        installationInfo.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName() +
+                "_"+ notice.getUseUnitCreditCode().substring(notice.getUseUnitCreditCode().length() - 4));
         installationInfo.put("receiveOrgCreditCode", notice.getReceiveOrgCreditCode() + "_" + notice.getReceiveOrgName());
         installationInfo.put("installLeaderId", notice.getInstallLeaderId() + "_" + notice.getInstallLeaderName());
         if (!ValidationUtil.isEmpty(notice.getInspectUnitId()) && !ValidationUtil.isEmpty(notice.getInspectUnitName())) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -869,16 +869,16 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         // 更新使用信息
         useInfoMapper.update(useInfo, lambda);
 
-        InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
-        BeanUtil.copyProperties(map, inspectionDetectionInfo);
-        LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
-        inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("record"));
+        //InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
+        //BeanUtil.copyProperties(map, inspectionDetectionInfo);
+        //LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
+        //inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("record"));
         // 更新检验检测信息
-        inspectionDetectionInfo.setInspectReport(jgVehicleInformation.getInspectionCertificate());
-        inspectionDetectionInfo.setInspectOrgName(jgVehicleInformation.getInspectUnitName());
-        inspectionDetectionInfo.setInspectOrgCode(jgVehicleInformation.getInspectUnitCreditCode());
-        inspectionDetectionInfo.setNextInspectDate(jgVehicleInformation.getNextInspectionDate());
-        inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+        //inspectionDetectionInfo.setInspectReport(jgVehicleInformation.getInspectionCertificate());
+        //inspectionDetectionInfo.setInspectOrgName(jgVehicleInformation.getInspectUnitName());
+        //inspectionDetectionInfo.setInspectOrgCode(jgVehicleInformation.getInspectUnitCreditCode());
+        //inspectionDetectionInfo.setNextInspectDate(jgVehicleInformation.getNextInspectionDate());
+        //inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
 
         // 更新设备监管部门
         IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();