ids;
+
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterPriceRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterPriceRequest.java
index cee747c..6d7f616 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterPriceRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterPriceRequest.java
@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
*
* 计量管理-价格库请求实体
@@ -50,4 +52,11 @@
*/
@ApiModelProperty(value = "项目", dataType = "String")
private String priceItem;
+
+ /**
+ * 导出ids
+ */
+ @ApiModelProperty(value = "导出ids", dataType = "List")
+ private List ids;
+
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java
index 3403124..708e575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterStaffRequest.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
*
* 计量管理-计量人员-计量人员表请求实体
@@ -56,5 +58,10 @@
@ApiModelProperty(value = "证书提醒列表", dataType = "String")
private String remindType;
+ /**
+ * 导出ids
+ */
+ @ApiModelProperty(value = "导出ids", dataType = "List")
+ private List ids;
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentApplyRequest.java
index 19fab62..ad686cb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentApplyRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentApplyRequest.java
@@ -7,6 +7,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* 测量设备-标准装置申请请求实体
* @author xiezhuangz
@@ -71,4 +73,11 @@
@ApiModelProperty(value = "创建人", dataType = "String",required = true)
private String createUser;
+ /**
+ * 导出ids
+ */
+ @ApiModelProperty(value = "导出ids", dataType = "List")
+ private List ids;
+
+
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index 7a5e871..2d244e8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -16,6 +16,7 @@
import com.casic.missiles.dto.meter.MeterCertificateImport;
import com.casic.missiles.dto.meter.MeterStaffRequest;
import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.enums.MeterDictEnum;
import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper;
import com.casic.missiles.mapper.meter.MeterCertificateMapper;
@@ -28,6 +29,7 @@
import com.casic.missiles.utils.MinioUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -52,6 +54,9 @@
private MeterStaffMapper meterStaffMapper;
@Resource
+ private MeterCertificateService meterCertificateService;
+
+ @Resource
private MeterCertificateExpireMessageMapper messageMapper;
@Resource
@@ -61,9 +66,6 @@
private MeterCertificateExpireMessageService messageService;
@Resource
- private DeptMapper deptMapper;
-
- @Resource
private MinioUtil minioUtil;
@Resource
@@ -106,12 +108,19 @@
@Override
public void exportCertificateList(MeterStaffRequest meterStaffRequest, HttpServletResponse response) {
try {
- List meterCertificateList = supplementList(meterCertificateMapper.queryCertificateList(meterStaffRequest));
+ List meterCertificateList;
+ if(!CollectionUtils.isEmpty(meterStaffRequest.getIds())){
+ MeterStaffRequest request = new MeterStaffRequest();
+ request.setIds(meterStaffRequest.getIds());
+ meterCertificateList = supplementList(meterCertificateMapper.queryCertificateList(request));
+ }else{
+ meterCertificateList = supplementList(meterCertificateMapper.queryCertificateList(meterStaffRequest));
+ }
meterCertificateList.forEach(bean->{
- bean.setSex(bean.getSex().equals("0")?"女":"男");
+ bean.setSex(bean.getSex().equals("2")?"女":"男");
bean.setCertificateStatus(bean.getCertificateStatus().equals("0")?"正常":"已失效");
});
- iBaseExportService.exportExcel(response, MeterCertificateDto.class,meterCertificateList,"sheet");
+ iBaseExportService.exportExcel(response, MeterCertificateDto.class,meterCertificateList, ExportEnum.STAFF_CERTIFICATE.getSheetName());
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java
index f574719..e9e4d3e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCheckInfoServiceImpl.java
@@ -9,6 +9,8 @@
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
import com.casic.missiles.dto.meter.MeterCheckInfoRequest;
+import com.casic.missiles.dto.meter.MeterStaffRequest;
+import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.mapper.meter.MeterCheckInfoFileMapper;
import com.casic.missiles.mapper.meter.MeterCheckInfoMapper;
import com.casic.missiles.model.*;
@@ -19,6 +21,7 @@
import com.sun.org.apache.bcel.internal.generic.NEW;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -31,6 +34,9 @@
private MeterCheckInfoMapper meterCheckInfoMapper;
@Resource
+ private MeterCheckInfoService checkInfoService;
+
+ @Resource
private IBaseExportService iBaseExportService;
@Resource
@@ -90,20 +96,27 @@
@Override
public void exportCheckInfoList(MeterCheckInfoRequest request, HttpServletResponse response) throws Exception {
- QueryWrapper wrapper = getWrapper(request);
- List resultList = meterCheckInfoMapper.selectList(wrapper);
+ List resultList;
+ if(!CollectionUtils.isEmpty(request.getIds())){
+ resultList = checkInfoService.listByIds(request.getIds());
+ }else{
+ QueryWrapper wrapper = getWrapper(request);
+ resultList = meterCheckInfoMapper.selectList(wrapper);
+ }
for (MeterCheckInfo meterCheckInfo : resultList) {
DictCodeUtils.convertDictCodeToName(meterCheckInfo);
}
- iBaseExportService.exportExcel(response, MeterCheckInfo.class,resultList,"sheet");
+ iBaseExportService.exportExcel(response, MeterCheckInfo.class,resultList, ExportEnum.CHECK_INFO.getSheetName());
}
private QueryWrapper getWrapper(MeterCheckInfoRequest request) {
QueryWrapper wrapper = new QueryWrapper<>();
wrapper.like(StringUtils.isNotBlank(request.getCheckNo()), "check_no", request.getCheckNo());
wrapper.like(StringUtils.isNotBlank(request.getCheckName()), "check_name", request.getCheckName());
- wrapper.apply(StringUtils.isNotBlank(request.getCheckDate()),
- "{0} = DATE_FORMAT(check_date,'%Y-%m-%d')", request.getCheckDate());
+ wrapper.apply(StringUtils.isNotBlank(request.getCheckStartDate()),
+ "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getCheckStartDate());
+ wrapper.apply(StringUtils.isNotBlank(request.getCheckEndDate()),
+ "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getCheckEndDate());
wrapper.eq("is_del", 0);
wrapper.orderByDesc("create_time");
return wrapper;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java
index 6362888..4255235 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java
@@ -12,6 +12,7 @@
import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
import com.casic.missiles.enums.ApprovalStatusEnum;
import com.casic.missiles.enums.EquipmentApplyEnum;
+import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.mapper.meter.MeterEquipmentApplyEquipmentMapper;
import com.casic.missiles.mapper.meter.MeterEquipmentApplyMapper;
import com.casic.missiles.model.*;
@@ -20,6 +21,7 @@
import com.casic.missiles.utils.DictCodeUtils;
import com.casic.missiles.utils.NumberGeneratorUtil;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -33,6 +35,9 @@
private MeterEquipmentApplyMapper equipmentApplyMapper;
@Resource
+ private MeterEquipmentApplyService equipmentApplyService;
+
+ @Resource
private MeterEquipmentApplyEquipmentMapper equipmentMapper;
@Resource
@@ -99,12 +104,15 @@
int updateFlg = equipmentApplyMapper.updateById(meterEquipmentApply);
if(updateFlg>0){
List ids = new ArrayList<>();
+ List equipmentList = new ArrayList<>();
for (MeterEquipmentApplyEquipment applyEquipment : meterEquipmentApply.getEquipmentList()) {
if(null != applyEquipment.getIsDel() && applyEquipment.getIsDel() == 1){
ids.add(applyEquipment.getId());
+ equipmentList.add(applyEquipment);
}
}
equipmentMapper.deleteBatchIds(ids);
+ meterEquipmentApply.getEquipmentList().removeAll(equipmentList);
boolean saveOrUpdateBatchFlg = equipmentService.saveOrUpdateBatch(meterEquipmentApply.getEquipmentList());
if(saveOrUpdateBatchFlg){
return ReturnUtil.success();
@@ -116,11 +124,16 @@
@Override
public void exportStaffList(MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception {
- List resultList = equipmentApplyMapper.equipmentApplyList(request);
+ List resultList;
+ if(!CollectionUtils.isEmpty(request.getIds())){
+ resultList = equipmentApplyService.listByIds(request.getIds());
+ }else{
+ resultList = equipmentApplyMapper.equipmentApplyList(request);
+ }
for (MeterEquipmentApply meterEquipmentApply : resultList) {
DictCodeUtils.convertDictCodeToName(meterEquipmentApply);
}
- iBaseExportService.exportExcel(response, MeterEquipmentApply.class,resultList,"sheet");
+ iBaseExportService.exportExcel(response, MeterEquipmentApply.class,resultList, ExportEnum.EQUIPMENT_APPLY.getSheetName());
}
@Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
index b0e7338..315bace 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
@@ -14,6 +14,7 @@
import com.casic.missiles.dto.meter.MeterPriceImport;
import com.casic.missiles.dto.meter.MeterPriceRequest;
import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.enums.MeterDictEnum;
import com.casic.missiles.mapper.meter.MeterPriceMapper;
import com.casic.missiles.model.*;
@@ -25,6 +26,7 @@
import com.casic.missiles.utils.NumberGeneratorUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -48,7 +50,7 @@
private AbstractDictService dictService;
@Resource
- private MeterHistoricalPriceService meterHistoricalPriceService;
+ private MeterPriceService meterPriceService;
@Resource
private IBaseExportService iBaseExportService;
@@ -97,9 +99,14 @@
@Override
public void exportPriceList(MeterPriceRequest meterPriceRequest, HttpServletResponse response) {
try {
- QueryWrapper wrapper = getQueryWrapper(meterPriceRequest);
- List meterPrices = supplementList(meterPriceMapper.selectList(wrapper));
- iBaseExportService.exportExcel(response,MeterPrice.class,meterPrices,"sheet");
+ List meterPrices;
+ if(!CollectionUtils.isEmpty(meterPriceRequest.getIds())){
+ meterPrices = meterPriceService.listByIds(meterPriceRequest.getIds());
+ }else{
+ QueryWrapper wrapper = getQueryWrapper(meterPriceRequest);
+ meterPrices = supplementList(meterPriceMapper.selectList(wrapper));
+ }
+ iBaseExportService.exportExcel(response,MeterPrice.class,meterPrices, ExportEnum.METER_PRICE.getSheetName());
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
index c20594a..eb89506 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
@@ -12,9 +12,11 @@
import com.casic.missiles.dto.IdDTO;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterCertificateDto;
import com.casic.missiles.dto.meter.MeterStaffImport;
import com.casic.missiles.dto.meter.MeterStaffRequest;
import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.enums.MeterDictEnum;
import com.casic.missiles.mapper.meter.MeterCertificateMapper;
import com.casic.missiles.mapper.meter.MeterStaffMapper;
@@ -33,6 +35,7 @@
import com.casic.missiles.utils.NumberGeneratorUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -148,12 +151,19 @@
@Override
public void exportStaffList(MeterStaffRequest meterStaffRequest, HttpServletResponse response) {
try {
- List meterStaffList = supplementList(meterStaffMapper.selectStaffList(meterStaffRequest));
+ List meterStaffList;
+ if(!CollectionUtils.isEmpty(meterStaffRequest.getIds())){
+ MeterStaffRequest request = new MeterStaffRequest();
+ request.setIds(meterStaffRequest.getIds());
+ meterStaffList = supplementList(meterStaffMapper.selectStaffList(request));
+ }else{
+ meterStaffList = supplementList(meterStaffMapper.selectStaffList(meterStaffRequest));
+ }
meterStaffList.forEach(bean->{
- bean.setSex(bean.getSex().equals("0")?"女":"男");
+ bean.setSex(bean.getSex().equals("2")?"女":"男");
bean.setTechnologyExam(bean.getTechnologyExam().equals("0")?"已考核":"未考核");
});
- iBaseExportService.exportExcel(response, MeterStaff.class,meterStaffList,"sheet");
+ iBaseExportService.exportExcel(response, MeterStaff.class,meterStaffList, ExportEnum.METER_STAFF.getSheetName());
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java
index a579961..f78c8c1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java
@@ -8,8 +8,10 @@
import com.casic.missiles.dto.IdDTO;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterStaffRequest;
import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.mapper.MeterFixedAssetsMapper;
import com.casic.missiles.mapper.meter.*;
import com.casic.missiles.model.*;
@@ -20,6 +22,7 @@
import com.casic.missiles.utils.NumberGeneratorUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -139,12 +142,19 @@
}
@Override
- public void exportStaffList(StandardEquipmentApplyRequest request, HttpServletResponse response) throws Exception{
- List resultList = meterStandardApplyMapper.standardEquipmentList(request);
+ public void exportList(StandardEquipmentApplyRequest request, HttpServletResponse response) throws Exception{
+ List resultList;
+ if(!CollectionUtils.isEmpty(request.getIds())){
+ StandardEquipmentApplyRequest applyRequest = new StandardEquipmentApplyRequest();
+ applyRequest.setIds(request.getIds());
+ resultList = meterStandardApplyMapper.standardEquipmentList(applyRequest);
+ }else{
+ resultList = meterStandardApplyMapper.standardEquipmentList(request);
+ }
for (MeterStandardApply item: resultList) {
DictCodeUtils.convertDictCodeToName(item);
}
- iBaseExportService.exportExcel(response, MeterStandardApply.class,resultList,"sheet");
+ iBaseExportService.exportExcel(response, MeterStandardApply.class,resultList, ExportEnum.STANDARD_EQUIPMENT_APPLY.getSheetName());
}
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java
index bdd4104..7ea2f1c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java
@@ -101,7 +101,7 @@
@ResponseBody
public void exportList(@RequestBody StandardEquipmentApplyRequest request, HttpServletResponse response) throws Exception{
try {
- standardEquipmentApplyService.exportStaffList(request,response);
+ standardEquipmentApplyService.exportList(request,response);
}catch (Exception e){
e.printStackTrace();
}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 840aedb..e9142f7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -19,7 +19,13 @@
MEASURE_ACCOUNT("measureAccount", "measureAccount", "测量工装"),
STANDARD_SUPPORT_EQUIPMENT("standardSupportEquipment", "standardSupportEquipment", "标准配套设备"),
STANDARD_EQUIPMENT("standardEquipment", "standardEquipment", "标准装置"),
- FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义");
+ FLOW_DEF_EXPORT("flowDefData", "flowDefData", "流程定义"),
+ STAFF_CERTIFICATE("certificate", "certificate", "计量人员证书"),
+ CHECK_INFO("checkInfo", "checkInfo", "设备管理点检测"),
+ EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"),
+ METER_PRICE("meterPrice", "meterPrice", "价格库"),
+ METER_STAFF("meterStaff", "meterStaff", "计量人员"),
+ STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请");
ExportEnum(String fileName, String sheetName, String description) {
this.fileName = fileName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
index 2fa740b..9cd0c0d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
@@ -2,7 +2,7 @@
public enum MeterRoleTypeEnum {
- METER_DEPT_ADMIN("2", "计量部门负责人");
+ METER_DEPT_ADMIN("1586711737844137956", "计量部门负责人");
private String code;
private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index 6eb532b..505c947 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -41,7 +41,8 @@
t2.education,
t2.technology_job,
t2.administration_job,
- t3.FULL_NAME as dept_id
+ t3.FULL_NAME as dept_name,
+ t2.dept_id
FROM
meter_certificate AS t1
LEFT JOIN meter_staff t2 ON t1.staff_id = t2.id
@@ -66,6 +67,12 @@
and DATE_FORMAT(t1.valid_date,'%Y-%m-%d') <= DATE_SUB(curdate(),INTERVAL -30 day)
+
+ and t1.id in
+
+ #{id}
+
+