Skip to content

A
amos-boot-biz
Commit 11bfc587 authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix(jg):证书的分页接口添加筛选条件

parent 0e20ab03
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 127 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml
View file @ 11bfc587
......@@ -38,6 +38,9 @@
<if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
and tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}
</if>
<if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
and tjurm.receive_company_code = #{dto.receiveCompanyCode}
</if>
ORDER BY tjurm.rec_date DESC
</where>
</select>
......@@ -85,6 +88,9 @@
<if test="dto.useUnitCreditCodeForSearch != null and dto.useUnitCreditCodeForSearch != ''">
and tjurm.use_unit_credit_code = #{dto.useUnitCreditCodeForSearch}
</if>
<if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
and tjurm.receive_company_code = #{dto.receiveCompanyCode}
</if>
-- 企业根据企业统一信用代码匹配
<if test="dto.dataType == 'company' ">
AND tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java
View file @ 11bfc587
......@@ -2,9 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
import cn.hutool.poi.excel.sax.SheetRidReader;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.api.R;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.component.robot.BadRequest;
import io.swagger.annotations.ApiParam;
import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -24,7 +26,9 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
......@@ -32,7 +36,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
*
* @author system_generator
* @date 2024-07-03
*/
......@@ -44,15 +47,15 @@ public class JgUseRegistrationManageController extends BaseController {
@Autowired
JgUseRegistrationManageServiceImpl jgUseRegistrationManageServiceImpl;
/**
* 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/brushHistoryCertificate")
@ApiOperation(httpMethod = "GET", value = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中", notes = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中")
public ResponseModel<Boolean> brushHistoryCertificate() {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.brushHistoryCertificate());
}
/**
* 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/brushHistoryCertificate")
@ApiOperation(httpMethod = "GET", value = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中", notes = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中")
public ResponseModel<Boolean> brushHistoryCertificate() {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.brushHistoryCertificate());
}
/**
......@@ -61,28 +64,28 @@ public class JgUseRegistrationManageController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<JgUseRegistrationManageDto> save(@RequestBody JgUseRegistrationManageDto model) {
model = jgUseRegistrationManageServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<JgUseRegistrationManageDto> save(@RequestBody JgUseRegistrationManageDto model) {
model = jgUseRegistrationManageServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<JgUseRegistrationManageDto> updateBySequenceNbrJgUseRegistrationManage(@RequestBody JgUseRegistrationManageDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.updateWithModel(model));
}
/**
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<JgUseRegistrationManageDto> updateBySequenceNbrJgUseRegistrationManage(@RequestBody JgUseRegistrationManageDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
......@@ -91,115 +94,115 @@ public class JgUseRegistrationManageController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<JgUseRegistrationManageDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryBySeq(sequenceNbr));
}
/**
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<JgUseRegistrationManageDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<JgUseRegistrationManageDto>> queryForPage(JgUseRegistrationManageDto dto,
@RequestParam(value = "sort", required = false) String sort,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) {
Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
page.setCurrent(current);
page.setSize(size);
ReginParams info = getSelectedOrgInfo();
if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
dto.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(info.getCompany().getCompanyType()) ?
info.getCompany().getCompanyCode().split("_")[1] : info.getCompany().getCompanyCode());
} else {
dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
}
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page,dto,sort));
}
/**
* 按照单位统一代码查询当前单位下的证
* @param dto dto中的使用单位统一代码（useUnitCreditCode） 非必填，前端不传的话取当前登录单位的统一信用代码 ，有值的话查询该单位的所有证
* @return 证的列表
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/list")
@ApiOperation(httpMethod = "GET",value = "按照单位统一代码查询当前单位下的证", notes = "按照单位统一代码查询当前单位下的证")
public ResponseModel<List<JgUseRegistrationManageDto>> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) {
if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())){
// 不传的话取当前登录单位的统一信用代码
dto.setUseUnitCreditCode(getSelectedOrgInfo().getCompany().getCompanyCode());
}
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryByUseUnitCreditCode(dto));
}
/**
* 根据证的sequenceNbr 查询证下面的所有设备
* @param sequenceNbr 证的sequenceNbr
* @return 证下的所有设备
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryEquByCertificateSeq")
@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 查询证下面的所有设备", notes = "根据证的sequenceNbr 查询证下面的所有设备")
public ResponseModel<List<JSONObject>> queryEquByCertificateSeq(Long sequenceNbr) {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeq(sequenceNbr));
}
/**
* 根据证的sequenceNbr 批量查询证下面的所有设备
* @param sequenceNbrs 证的sequenceNbr集合
* @return 证下的所有设备
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryEquByCertificateSeqList")
@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
public ResponseModel<List<JSONObject>> queryEquByCertificateSeqList(@RequestParam String sequenceNbrs) {
List<Long> collect = Arrays.stream(sequenceNbrs.split(","))
.map(Long::parseLong)
.collect(Collectors.toList());
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeqList(collect));
}
/**
* 根据证的sequenceNbrs 批量查询证下面的所有设备
* @param current 非必填，不填不分页，展示全部
* @param size 非必填，不填不分页，展示全部
* @param paramMap **仅仅支持** studio平台传参类似&certificateSeqs[0]=1809032149396975618&certificateSeqs[1]=1809032151141806081
* 如需其他需求使用上面的接口查询
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryEquByCertificateSeqs")
@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
public ResponseModel<Page<JSONObject>> queryEquByCertificateSeqList( @RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam MultiValueMap<String, String> paramMap) {
List<Long> certificateSeqs = new ArrayList<>();
paramMap.forEach((key, value) -> {
if (key.startsWith("certificateSeqs[")) {
value.forEach(val -> certificateSeqs.add(Long.parseLong(val)));
}
});
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquForPageByCertificateSeqList(certificateSeqs,current,size));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<JgUseRegistrationManageDto>> queryForPage(JgUseRegistrationManageDto dto,
@RequestParam(value = "sort", required = false) String sort,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) {
Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
page.setCurrent(current);
page.setSize(size);
ReginParams info = getSelectedOrgInfo();
if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
dto.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(info.getCompany().getCompanyType()) ?
info.getCompany().getCompanyCode().split("_")[1] : info.getCompany().getCompanyCode());
} else {
dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
}
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort));
}
/**
* 按照单位统一代码查询当前单位下的证
*
* @param dto dto中的使用单位统一代码（useUnitCreditCode） 非必填，前端不传的话取当前登录单位的统一信用代码 ，有值的话查询该单位的所有证
* @return 证的列表
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/list")
@ApiOperation(httpMethod = "GET", value = "按照单位统一代码查询当前单位下的证", notes = "按照单位统一代码查询当前单位下的证")
public ResponseModel<List<JgUseRegistrationManageDto>> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) {
if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())) {
// 不传的话取当前登录单位的统一信用代码
dto.setUseUnitCreditCode(getSelectedOrgInfo().getCompany().getCompanyCode());
}
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryByUseUnitCreditCode(dto));
}
/**
* 根据证的sequenceNbr 查询证下面的所有设备
*
* @param sequenceNbr 证的sequenceNbr
* @return 证下的所有设备
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryEquByCertificateSeq")
@ApiOperation(httpMethod = "GET", value = "根据证的sequenceNbr 查询证下面的所有设备", notes = "根据证的sequenceNbr 查询证下面的所有设备")
public ResponseModel<List<JSONObject>> queryEquByCertificateSeq(Long sequenceNbr) {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeq(sequenceNbr));
}
/**
* 根据证的sequenceNbr 批量查询证下面的所有设备
*
* @param sequenceNbrs 证的sequenceNbr集合
* @return 证下的所有设备
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryEquByCertificateSeqList")
@ApiOperation(httpMethod = "GET", value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
public ResponseModel<List<JSONObject>> queryEquByCertificateSeqList(@RequestParam String sequenceNbrs) {
List<Long> collect = Arrays.stream(sequenceNbrs.split(","))
.map(Long::parseLong)
.collect(Collectors.toList());
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeqList(collect));
}
/**
* 根据证的sequenceNbrs 分页查询证下面的所有设备
*
* @param current 非必填，不填不分页，展示全部
* @param size 非必填，不填不分页，展示全部
* @param sequenceNbrs 证的sequenceNbrs
* @return 分页结果
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryEquByCertificateSeqs")
@ApiOperation(httpMethod = "GET", value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
public ResponseModel<Page<JSONObject>> queryEquByCertificateSeqList(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "sequenceNbrs") String sequenceNbrs) {
List<Long> collect = Arrays.stream(sequenceNbrs.split(","))
.map(Long::parseLong)
.collect(Collectors.toList());
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquForPageByCertificateSeqList(collect, current, size));
}
}
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/JgUseRegistrationManageServiceImpl.java
View file @ 11bfc587
......@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import org.apache.commons.collections.CollectionUtils;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.elasticsearch.action.search.SearchRequest;
......@@ -74,6 +75,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
@Autowired
private JgVehicleInformationEqMapper jgVehicleInformationEqMapper;
private Systemctl systemctl;
/**
* 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
......@@ -84,8 +86,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
// 使用登记表中已经审批通过的单子
List<JgUseRegistration> jgUseRegistrations = jgUseRegistrationMapper.selectList(new LambdaQueryWrapper<JgUseRegistration>()
.eq(JgUseRegistration::getStatus, "已完成"));
.eq(JgUseRegistration::getStatus, "已完成")
.eq(JgUseRegistration::getIsDelete, false));
for (JgUseRegistration useRegistration : jgUseRegistrations) {
// 使用单位信息
Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(useRegistration.getUseUnitCreditCode());
// 设备使用地址
String fullAddress = "";
// 设备种类/类别/品种
......@@ -136,6 +141,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
jgUseRegistrationManage.setCreateUserId(useRegistration.getCreateUserId());
jgUseRegistrationManage.setCreateDate(useRegistration.getRecDate());
jgUseRegistrationManage.setEquUseAddress(fullAddress);
jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
jgUseRegistrationManage.setUseRegistrationCode(useRegistration.getUseRegistrationCode());
jgUseRegistrationManage.setUseUnitCreditCode(useRegistration.getUseUnitCreditCode());
jgUseRegistrationManage.setReceiveCompanyCode(useRegistration.getReceiveCompanyCode());
......@@ -146,8 +152,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
// 车用气瓶使用登记表中已经审批通过的单子
List<JgVehicleInformation> jgVehicleInformations = jgVehicleInformationMapper.selectList(new LambdaQueryWrapper<JgVehicleInformation>()
.eq(JgVehicleInformation::getStatus, "已完成"));
.eq(JgVehicleInformation::getStatus, "已完成")
.eq(JgVehicleInformation::getIsDelete, false));
for (JgVehicleInformation vehicleInformation : jgVehicleInformations) {
// 使用单位信息
Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(vehicleInformation.getUseUnitCreditCode());
// 设备种类/类别/品种
Map<String, String> equType = jgUseRegistrationMapper.getEquTypeByVehSeq(String.valueOf(vehicleInformation.getSequenceNbr()));
// 组装数据
......@@ -172,13 +181,13 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
jgUseRegistrationManage.setCreateUserId(vehicleInformation.getCreateUserId());
jgUseRegistrationManage.setCreateDate(vehicleInformation.getRecDate());
jgUseRegistrationManage.setEquUseAddress("");
jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
jgUseRegistrationManage.setUseRegistrationCode(vehicleInformation.getUseRegistrationCode());
jgUseRegistrationManage.setUseUnitCreditCode(vehicleInformation.getUseUnitCreditCode());
jgUseRegistrationManage.setReceiveCompanyCode(vehicleInformation.getReceiveCompanyCode());
jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,vehicleInformation.getAuditPassDate(),vehicleInformation.getReceiveCompanyCode()));
this.baseMapper.insert(jgUseRegistrationManage);
}
return Boolean.TRUE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment