Compare commits

..

No commits in common. "432a1164b7d1f196f58168de1790195e87e521d1" and "d1fcb0d4d5e0422db4d6bdfa645a6bc5aead3d0c" have entirely different histories.

4 changed files with 8 additions and 9 deletions

View File

@ -46,7 +46,6 @@ public class HealthPersonInfoController extends BaseController {
List<HealthPersonInfo> list = healthPersonInfoService.selectHealthPersonInfoList(healthPersonInfo); List<HealthPersonInfo> list = healthPersonInfoService.selectHealthPersonInfoList(healthPersonInfo);
return getDataTable(list); return getDataTable(list);
} }
/** /**
* 导出人员健康情况列表 * 导出人员健康情况列表
*/ */

View File

@ -103,7 +103,7 @@ public class InquiryController extends BaseController {
@PostMapping @PostMapping
public AjaxResult add(@RequestBody Inquiry inquiry) { public AjaxResult add(@RequestBody Inquiry inquiry) {
try { try {
return success(inquiryService.insertInquiry(inquiry)); return toAjax(inquiryService.insertInquiry(inquiry));
} catch (Exception e) { } catch (Exception e) {
return error(e.getMessage()); return error(e.getMessage());
} }
@ -119,7 +119,7 @@ public class InquiryController extends BaseController {
@PostMapping("/edit") @PostMapping("/edit")
public AjaxResult edit(@RequestBody Inquiry inquiry) { public AjaxResult edit(@RequestBody Inquiry inquiry) {
try { try {
return success(inquiryService.updateInquiry(inquiry)); return toAjax(inquiryService.updateInquiry(inquiry));
} catch (Exception e) { } catch (Exception e) {
return error(e.getMessage()); return error(e.getMessage());
} }

View File

@ -42,7 +42,7 @@ public interface IInquiryService {
* @param inquiry 询价单 * @param inquiry 询价单
* @return 结果 * @return 结果
*/ */
public Inquiry insertInquiry(Inquiry inquiry); public int insertInquiry(Inquiry inquiry);
/** /**
* 修改询价单 * 修改询价单
@ -50,7 +50,7 @@ public interface IInquiryService {
* @param inquiry 询价单 * @param inquiry 询价单
* @return 结果 * @return 结果
*/ */
public Inquiry updateInquiry(Inquiry inquiry); public int updateInquiry(Inquiry inquiry);
public int updateInquirySupplier(InquirySupplier supplier); public int updateInquirySupplier(InquirySupplier supplier);
/** /**
* 批量删除询价单 * 批量删除询价单

View File

@ -111,7 +111,7 @@ public class InquiryServiceImpl implements IInquiryService {
* @return 结果 * @return 结果
*/ */
@Override @Override
public Inquiry insertInquiry(Inquiry inquiry) { public int insertInquiry(Inquiry inquiry) {
inquiry.setCreateTime(DateUtils.getNowDate()); inquiry.setCreateTime(DateUtils.getNowDate());
try { try {
List<InquiryDetail> detailList=new ArrayList<>(); List<InquiryDetail> detailList=new ArrayList<>();
@ -142,7 +142,7 @@ public class InquiryServiceImpl implements IInquiryService {
inquiryDetailMapper.insertInquiryDetail(vo); inquiryDetailMapper.insertInquiryDetail(vo);
} }
} }
return inquiry; return 1;
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
} }
@ -155,7 +155,7 @@ public class InquiryServiceImpl implements IInquiryService {
* @return 结果 * @return 结果
*/ */
@Override @Override
public Inquiry updateInquiry(Inquiry inquiry) { public int updateInquiry(Inquiry inquiry) {
inquiry.setUpdateTime(DateUtils.getNowDate()); inquiry.setUpdateTime(DateUtils.getNowDate());
try { try {
List<InquiryDetail> detailList=new ArrayList<>(); List<InquiryDetail> detailList=new ArrayList<>();
@ -190,7 +190,7 @@ public class InquiryServiceImpl implements IInquiryService {
inquiryDetailMapper.insertInquiryDetail(vo); inquiryDetailMapper.insertInquiryDetail(vo);
} }
} }
return inquiry; return 1;
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
} }