Commit 7bd193bf authored by 刘林's avatar 刘林

fix(JG):解决单位办理打证单位错误问题,解决导入设备代码重复问题

parent 0aedf6ad
...@@ -237,7 +237,7 @@ public class EquipmentCategoryController extends BaseController { ...@@ -237,7 +237,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@RequestMapping(value = "/checkCode", method = RequestMethod.POST) @RequestMapping(value = "/checkCode", method = RequestMethod.POST)
@ApiOperation(httpMethod = "post", value = "校验96333码", notes = "校验96333码") @ApiOperation(httpMethod = "POST", value = "校验96333码", notes = "校验96333码")
public ResponseModel<Object> checkCode(@RequestBody Map<String,Object> obj){ public ResponseModel<Object> checkCode(@RequestBody Map<String,Object> obj){
List<CategoryOtherInfo> categoryOtherInfos = equipmentCategoryService.checkCode(obj); List<CategoryOtherInfo> categoryOtherInfos = equipmentCategoryService.checkCode(obj);
if(categoryOtherInfos.size() == 0){ if(categoryOtherInfos.size() == 0){
...@@ -269,7 +269,7 @@ public class EquipmentCategoryController extends BaseController { ...@@ -269,7 +269,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@RequestMapping(value = "/createEquipmentCategoryData", method = RequestMethod.GET) @RequestMapping(value = "/createEquipmentCategoryData", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "初始化一码通总览数据", notes = "初始化一码通总览数据") @ApiOperation(httpMethod = "GET", value = "初始化一码通总览数据", notes = "初始化一码通总览数据")
public ResponseModel<Object> createEquipmentCategoryData(){ public ResponseModel<Object> createEquipmentCategoryData(){
equipmentCategoryService.createEquipmentCategoryData(); equipmentCategoryService.createEquipmentCategoryData();
return ResponseHelper.buildResponse("SUCCESS"); return ResponseHelper.buildResponse("SUCCESS");
......
...@@ -32,7 +32,7 @@ public class CarCylController { ...@@ -32,7 +32,7 @@ public class CarCylController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/userInfo/list", method = RequestMethod.GET) @RequestMapping(value = "/userInfo/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){ public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){
return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key)); return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key));
} }
...@@ -43,7 +43,7 @@ public class CarCylController { ...@@ -43,7 +43,7 @@ public class CarCylController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET) @RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){ public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){
return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr)); return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr));
} }
......
...@@ -235,7 +235,7 @@ public class EquipmentCategoryController extends BaseController { ...@@ -235,7 +235,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@RequestMapping(value = "/checkCode", method = RequestMethod.POST) @RequestMapping(value = "/checkCode", method = RequestMethod.POST)
@ApiOperation(httpMethod = "post", value = "校验96333码", notes = "校验96333码") @ApiOperation(httpMethod = "POST", value = "校验96333码", notes = "校验96333码")
public ResponseModel<Object> checkCode(@RequestBody Map<String,Object> obj){ public ResponseModel<Object> checkCode(@RequestBody Map<String,Object> obj){
List<CategoryOtherInfo> categoryOtherInfos = equipmentCategoryService.checkCode(obj); List<CategoryOtherInfo> categoryOtherInfos = equipmentCategoryService.checkCode(obj);
if(categoryOtherInfos.size() == 0){ if(categoryOtherInfos.size() == 0){
...@@ -267,7 +267,7 @@ public class EquipmentCategoryController extends BaseController { ...@@ -267,7 +267,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@RequestMapping(value = "/createEquipmentCategoryData", method = RequestMethod.GET) @RequestMapping(value = "/createEquipmentCategoryData", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "初始化一码通总览数据", notes = "初始化一码通总览数据") @ApiOperation(httpMethod = "GET", value = "初始化一码通总览数据", notes = "初始化一码通总览数据")
public ResponseModel<Object> createEquipmentCategoryData(){ public ResponseModel<Object> createEquipmentCategoryData(){
equipmentCategoryService.createEquipmentCategoryData(); equipmentCategoryService.createEquipmentCategoryData();
return ResponseHelper.buildResponse("SUCCESS"); return ResponseHelper.buildResponse("SUCCESS");
......
...@@ -32,7 +32,7 @@ public class CarCylController { ...@@ -32,7 +32,7 @@ public class CarCylController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/userInfo/list", method = RequestMethod.GET) @RequestMapping(value = "/userInfo/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){ public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){
return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key)); return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key));
} }
...@@ -43,7 +43,7 @@ public class CarCylController { ...@@ -43,7 +43,7 @@ public class CarCylController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET) @RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){ public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){
return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr)); return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr));
} }
......
...@@ -235,7 +235,7 @@ public class EquipmentCategoryController extends BaseController { ...@@ -235,7 +235,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@RequestMapping(value = "/checkCode", method = RequestMethod.POST) @RequestMapping(value = "/checkCode", method = RequestMethod.POST)
@ApiOperation(httpMethod = "post", value = "校验96333码", notes = "校验96333码") @ApiOperation(httpMethod = "POST", value = "校验96333码", notes = "校验96333码")
public ResponseModel<Object> checkCode(@RequestBody Map<String,Object> obj){ public ResponseModel<Object> checkCode(@RequestBody Map<String,Object> obj){
List<CategoryOtherInfo> categoryOtherInfos = equipmentCategoryService.checkCode(obj); List<CategoryOtherInfo> categoryOtherInfos = equipmentCategoryService.checkCode(obj);
if(categoryOtherInfos.size() == 0){ if(categoryOtherInfos.size() == 0){
...@@ -267,7 +267,7 @@ public class EquipmentCategoryController extends BaseController { ...@@ -267,7 +267,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@RequestMapping(value = "/createEquipmentCategoryData", method = RequestMethod.GET) @RequestMapping(value = "/createEquipmentCategoryData", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "初始化一码通总览数据", notes = "初始化一码通总览数据") @ApiOperation(httpMethod = "GET", value = "初始化一码通总览数据", notes = "初始化一码通总览数据")
public ResponseModel<Object> createEquipmentCategoryData(){ public ResponseModel<Object> createEquipmentCategoryData(){
equipmentCategoryService.createEquipmentCategoryData(); equipmentCategoryService.createEquipmentCategoryData();
return ResponseHelper.buildResponse("SUCCESS"); return ResponseHelper.buildResponse("SUCCESS");
......
...@@ -32,7 +32,7 @@ public class CarCylController { ...@@ -32,7 +32,7 @@ public class CarCylController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/userInfo/list", method = RequestMethod.GET) @RequestMapping(value = "/userInfo/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){ public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){
return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key)); return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key));
} }
...@@ -43,7 +43,7 @@ public class CarCylController { ...@@ -43,7 +43,7 @@ public class CarCylController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET) @RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){ public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){
return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr)); return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr));
} }
......
...@@ -292,7 +292,7 @@ public class CommonController extends BaseController { ...@@ -292,7 +292,7 @@ public class CommonController extends BaseController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getCompanyUser") @GetMapping(value = "/getCompanyUser")
@ApiOperation(httpMethod = "get", value = "根据公司id获取公司下人员", notes = "根据公司id获取公司下人员") @ApiOperation(httpMethod = "GET", value = "根据公司id获取公司下人员", notes = "根据公司id获取公司下人员")
public ResponseModel<Object> getCompanyUser(@RequestParam(value = "companyId", required = false) Long companyId) { public ResponseModel<Object> getCompanyUser(@RequestParam(value = "companyId", required = false) Long companyId) {
if (ObjectUtils.isEmpty(companyId)) { if (ObjectUtils.isEmpty(companyId)) {
return null; return null;
......
...@@ -1012,7 +1012,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -1012,7 +1012,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
//使用登记证编号 //使用登记证编号
exportParamsMap.put("useRegistrationCode", ValidationUtil.isEmpty(transfer.getUseRegistCode()) ? "" : transfer.getUseRegistCode()); exportParamsMap.put("useRegistrationCode", ValidationUtil.isEmpty(transfer.getUseRegistCode()) ? "" : transfer.getUseRegistCode());
//使用单位名称 //使用单位名称
exportParamsMap.put("useUnitName", transfer.getUseUnitName()); exportParamsMap.put("useUnitName", transfer.getNewUseUnitName());
//监管码 //监管码
LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(OtherInfo::getRecord, jgChangeRegistrationUnitEq.getEquId()); queryWrapper1.eq(OtherInfo::getRecord, jgChangeRegistrationUnitEq.getEquId());
......
...@@ -265,7 +265,7 @@ public class EquipmentCategoryController extends BaseController { ...@@ -265,7 +265,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/checkCode", method = RequestMethod.POST) @RequestMapping(value = "/checkCode", method = RequestMethod.POST)
@ApiOperation(httpMethod = "post", value = "校验96333码", notes = "校验96333码") @ApiOperation(httpMethod = "POST", value = "校验96333码", notes = "校验96333码")
public ResponseModel<Object> checkCode(@RequestBody Map<String, Object> obj) { public ResponseModel<Object> checkCode(@RequestBody Map<String, Object> obj) {
List<CategoryOtherInfo> categoryOtherInfos = equipmentCategoryService.checkCode(obj); List<CategoryOtherInfo> categoryOtherInfos = equipmentCategoryService.checkCode(obj);
if (categoryOtherInfos.size() == 0) { if (categoryOtherInfos.size() == 0) {
...@@ -295,7 +295,7 @@ public class EquipmentCategoryController extends BaseController { ...@@ -295,7 +295,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/createEquipmentCategoryData", method = RequestMethod.GET) @RequestMapping(value = "/createEquipmentCategoryData", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "初始化一码通总览数据", notes = "初始化一码通总览数据") @ApiOperation(httpMethod = "GET", value = "初始化一码通总览数据", notes = "初始化一码通总览数据")
public ResponseModel<Object> createEquipmentCategoryData() { public ResponseModel<Object> createEquipmentCategoryData() {
equipmentCategoryService.createEquipmentCategoryData(); equipmentCategoryService.createEquipmentCategoryData();
return ResponseHelper.buildResponse("SUCCESS"); return ResponseHelper.buildResponse("SUCCESS");
......
...@@ -32,7 +32,7 @@ public class CarCylController { ...@@ -32,7 +32,7 @@ public class CarCylController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/userInfo/list", method = RequestMethod.GET) @RequestMapping(value = "/userInfo/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){ public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){
return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key)); return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key));
} }
...@@ -43,7 +43,7 @@ public class CarCylController { ...@@ -43,7 +43,7 @@ public class CarCylController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET) @RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){ public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){
return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr)); return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr));
} }
......
...@@ -279,7 +279,7 @@ public class EquipmentCategoryController extends BaseController { ...@@ -279,7 +279,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/checkCode", method = RequestMethod.POST) @RequestMapping(value = "/checkCode", method = RequestMethod.POST)
@ApiOperation(httpMethod = "post", value = "校验使用登记证编号、设备代码、96333码重复", notes = "校验使用登记证编号、设备代码、96333码重复") @ApiOperation(httpMethod = "POST", value = "校验使用登记证编号、设备代码、96333码重复", notes = "校验使用登记证编号、设备代码、96333码重复")
public ResponseModel<Object> checkCode(@RequestBody Map<String,Object> obj){ public ResponseModel<Object> checkCode(@RequestBody Map<String,Object> obj){
String message = equipmentCategoryService.checkCode(obj); String message = equipmentCategoryService.checkCode(obj);
if(ObjectUtils.isEmpty(message)){ if(ObjectUtils.isEmpty(message)){
......
...@@ -32,7 +32,7 @@ public class CarCylController { ...@@ -32,7 +32,7 @@ public class CarCylController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/userInfo/list", method = RequestMethod.GET) @RequestMapping(value = "/userInfo/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){ public ResponseModel<IPage<TzCarcylRegDto>> getUserInfo(PageParam pageParam, TzCarcylRegDto tzCarcylRegDto, String key){
return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key)); return ResponseHelper.buildResponse(iTzCarcylService.page(pageParam,tzCarcylRegDto,key));
} }
...@@ -43,7 +43,7 @@ public class CarCylController { ...@@ -43,7 +43,7 @@ public class CarCylController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET) @RequestMapping(value = "/traceInfo/{sequenceNbr}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){ public ResponseModel<TzCarcylTraceDto> getTraceInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr){
return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr)); return ResponseHelper.buildResponse(iTzCarcylService.getTrace(sequenceNbr));
} }
......
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