Commit e9f6a171 authored by 李驰骋's avatar 李驰骋

bug调整

parent a1d45d84
...@@ -58,6 +58,7 @@ public class GlobalHandlerExceptionResolver implements HandlerExceptionResolver ...@@ -58,6 +58,7 @@ public class GlobalHandlerExceptionResolver implements HandlerExceptionResolver
@Override @Override
public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response) throws Exception { public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response) throws Exception {
response.setContentType("application/json;charset=utf-8");
response.getOutputStream().write(mapper.writeValueAsBytes(model.values().stream().findFirst())); response.getOutputStream().write(mapper.writeValueAsBytes(model.values().stream().findFirst()));
} }
} }
......
...@@ -22,7 +22,7 @@ public class PurtaController { ...@@ -22,7 +22,7 @@ public class PurtaController {
@Autowired @Autowired
private PurtaService purtaService; private PurtaService purtaService;
@ApiOperation("新增请购单") @ApiOperation("新增请购单")
@PostMapping("/purta/insert") @PostMapping("/purta/create")
public void create(@RequestBody PurtaCreateParams create){ public void create(@RequestBody PurtaCreateParams create){
purtaService.create(create); purtaService.create(create);
} }
......
...@@ -28,7 +28,7 @@ public class PurtaCreateParams { ...@@ -28,7 +28,7 @@ public class PurtaCreateParams {
private String ta002; private String ta002;
@ApiModelProperty("工单单别") @ApiModelProperty("工单单别")
private String orderSource; private String workorderType;
@ApiModelProperty("工单单号") @ApiModelProperty("工单单号")
private String workorderCode; private String workorderCode;
......
...@@ -37,9 +37,11 @@ public class EntityChangeListener implements ApplicationContextAware { ...@@ -37,9 +37,11 @@ public class EntityChangeListener implements ApplicationContextAware {
Cmsmv currentActor = getCurrentActor(); Cmsmv currentActor = getCurrentActor();
String company = getCompany(); String company = getCompany();
entity.setCompany(company); entity.setCompany(company);
if(currentActor!=null) {
entity.setCreator(currentActor.getMv001()); entity.setCreator(currentActor.getMv001());
entity.setCreateDate(DateUtil.currentDateTimeString());
entity.setUsr_group(currentActor.getUsr_group()); entity.setUsr_group(currentActor.getUsr_group());
}
entity.setCreateDate(DateUtil.currentDateTimeString());
entity.setFlag(1); entity.setFlag(1);
} }
} }
......
...@@ -36,8 +36,8 @@ public class PurtaService { ...@@ -36,8 +36,8 @@ public class PurtaService {
@Transactional @Transactional
public void create(PurtaCreateParams create){ public void create(PurtaCreateParams create){
Mocta mocta = moctaDao.findById(new MoctaId(create.getOrderSource(), create.getWorkorderCode())) Mocta mocta = moctaDao.findById(new MoctaId(create.getWorkorderType(), create.getWorkorderCode()))
.orElseThrow(()->new TopsunitException(String.format("未找到工单:%s-%s",create.getOrderSource(), create.getWorkorderCode()))); .orElseThrow(()->new TopsunitException(String.format("未找到工单:%s-%s",create.getWorkorderType(), create.getWorkorderCode())));
Calendar curr = Calendar.getInstance(); Calendar curr = Calendar.getInstance();
String currStr = DateUtil.format(curr.getTime(), "yyyyMMdd"); String currStr = DateUtil.format(curr.getTime(), "yyyyMMdd");
Purta purta = BeanUtil.toBeanIgnoreError(create, Purta.class); Purta purta = BeanUtil.toBeanIgnoreError(create, Purta.class);
......
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