Compare commits
No commits in common. "8af4336aa650294a615f580d3f6b199e00a972ea" and "9cd671dc78c8e7b9cab3833bfd9fffff4cbd04a1" have entirely different histories.
8af4336aa6
...
9cd671dc78
|
|
@ -1,6 +1,8 @@
|
||||||
package com.chinaweal.aiccs.aiceps.annual.controller;
|
package com.chinaweal.aiccs.aiceps.annual.controller;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.chinaweal.aiccs.aiccs.abnormal.entity.Gzaiccode;
|
||||||
|
import com.chinaweal.aiccs.aiccs.market.entity.TSSueInspect;
|
||||||
import com.chinaweal.aiccs.aiceps.annual.entity.AnModifyPermit;
|
import com.chinaweal.aiccs.aiceps.annual.entity.AnModifyPermit;
|
||||||
import com.chinaweal.aiccs.aiceps.annual.service.AnModifyPermitService;
|
import com.chinaweal.aiccs.aiceps.annual.service.AnModifyPermitService;
|
||||||
import com.chinaweal.aiccs.common.base.controller.BaseController;
|
import com.chinaweal.aiccs.common.base.controller.BaseController;
|
||||||
|
|
@ -53,7 +55,7 @@ public class AnModifyPermitController extends BaseController {
|
||||||
AnModifyPermit anModifyPermit = null;
|
AnModifyPermit anModifyPermit = null;
|
||||||
anModifyPermit = anModifyPermitService.getById(id);
|
anModifyPermit = anModifyPermitService.getById(id);
|
||||||
if(anModifyPermit != null){
|
if(anModifyPermit != null){
|
||||||
anModifyPermitService.removeById(anModifyPermit);
|
anModifyPermitService.updateById(anModifyPermit);
|
||||||
}
|
}
|
||||||
|
|
||||||
return RestResult.ok();
|
return RestResult.ok();
|
||||||
|
|
@ -63,7 +65,7 @@ public class AnModifyPermitController extends BaseController {
|
||||||
@PostMapping("/update")
|
@PostMapping("/update")
|
||||||
public RestResult<String> updatePermit(@RequestBody @Valid AnModifyPermit anModifyPermit, BindingResult bindingResult) {
|
public RestResult<String> updatePermit(@RequestBody @Valid AnModifyPermit anModifyPermit, BindingResult bindingResult) {
|
||||||
AssertUtils.isBndingValidit(bindingResult);
|
AssertUtils.isBndingValidit(bindingResult);
|
||||||
anModifyPermitService.updateById(anModifyPermit);
|
anModifyPermitService.save(anModifyPermit);
|
||||||
return RestResult.ok();
|
return RestResult.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -81,9 +83,8 @@ public class AnModifyPermitController extends BaseController {
|
||||||
Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap();
|
Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap();
|
||||||
if (customParamMap == null) return;
|
if (customParamMap == null) return;
|
||||||
// 统一码
|
// 统一码
|
||||||
String uniscid = StringUtils.tranObject(customParamMap.get("uniscid"));
|
if (customParamMap.get("uniscid") != null) {
|
||||||
if (StringUtils.isNotBlank(uniscid)) {
|
queryWrapper.lambda().eq(AnModifyPermit::getUniscid, customParamMap.get("uniscid"));
|
||||||
queryWrapper.lambda().eq(AnModifyPermit::getUniscid, uniscid);
|
|
||||||
}
|
}
|
||||||
}, null);
|
}, null);
|
||||||
return RestResult.ok(data);
|
return RestResult.ok(data);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue