Commit 477f00c0 by lijingjing

添加业务数据和业务人员批量添加功能;

parent 04a3dcab
package com.patzn.cloud.service.lims.hmhj.controller; package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.enums.BusinessDataEnum; import com.patzn.cloud.service.hmhj.enums.BusinessDataEnum;
import com.patzn.cloud.service.hmhj.enums.BusinessStaffEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants; import com.patzn.cloud.commons.api.RestConstants;
...@@ -94,4 +88,16 @@ public class BusinessDataController extends ServiceController { ...@@ -94,4 +88,16 @@ public class BusinessDataController extends ServiceController {
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) { public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(businessDataService.removeByIds(ids)); return success(businessDataService.removeByIds(ids));
} }
@ApiOperation("批量添加或修改样品来源")
@PostMapping("/save_or_update_batch_sample_from")
public RestResult<Boolean> saveOrUpdateBatchSampleFrom(@RequestBody String dataJson) {
return success(businessDataService.saveOrUpdateBatch(BusinessDataEnum.SAMPLE_SOURCE, dataJson));
}
@ApiOperation("批量添加或修改产品标准")
@PostMapping("/save_or_update_batch_project_standard")
public RestResult<Boolean> saveOrUpdateBatchProjectStandard(@RequestBody String dataJson) {
return success(businessDataService.saveOrUpdateBatch(BusinessDataEnum.PRODUCT_STANDARD, dataJson));
}
} }
...@@ -40,12 +40,14 @@ public class BusinessStaffController extends ServiceController { ...@@ -40,12 +40,14 @@ public class BusinessStaffController extends ServiceController {
return success(businessStaffService.page(getPage(), businessStaff)); return success(businessStaffService.page(getPage(), businessStaff));
} }
@ApiOperation("委托人员列表")
@PostMapping("/list_assignor") @PostMapping("/list_assignor")
public RestResult<List<BusinessStaff>> getListSampleFrom(BusinessStaff businessStaff) { public RestResult<List<BusinessStaff>> getListSampleFrom(BusinessStaff businessStaff) {
businessStaff.setBizType(BusinessStaffEnum.ASSIGNOR.getName()); businessStaff.setBizType(BusinessStaffEnum.ASSIGNOR.getName());
return success(businessStaffService.listData(businessStaff)); return success(businessStaffService.listData(businessStaff));
} }
@ApiOperation("报告接收人员列表")
@PostMapping("/list_report_recipient") @PostMapping("/list_report_recipient")
public RestResult<List<BusinessStaff>> getListProductStandard(BusinessStaff businessStaff) { public RestResult<List<BusinessStaff>> getListProductStandard(BusinessStaff businessStaff) {
businessStaff.setBizType(BusinessStaffEnum.REPORT_RECIPIENT.getName()); businessStaff.setBizType(BusinessStaffEnum.REPORT_RECIPIENT.getName());
......
...@@ -3,6 +3,7 @@ package com.patzn.cloud.service.lims.hmhj.service; ...@@ -3,6 +3,7 @@ package com.patzn.cloud.service.lims.hmhj.service;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.IBaseService; import com.patzn.cloud.commons.service.IBaseService;
import com.patzn.cloud.service.hmhj.entity.BusinessData; import com.patzn.cloud.service.hmhj.entity.BusinessData;
import com.patzn.cloud.service.hmhj.enums.BusinessDataEnum;
import java.util.List; import java.util.List;
...@@ -20,4 +21,5 @@ public interface IBusinessDataService extends IBaseService<BusinessData> { ...@@ -20,4 +21,5 @@ public interface IBusinessDataService extends IBaseService<BusinessData> {
List<BusinessData> list(BusinessData businessData); List<BusinessData> list(BusinessData businessData);
Boolean saveOrUpdateBatch(BusinessDataEnum productStandard, String dataJson);
} }
package com.patzn.cloud.service.lims.hmhj.service.impl; package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.exception.PatznException;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl; import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.BusinessData; import com.patzn.cloud.service.hmhj.entity.BusinessData;
import com.patzn.cloud.service.hmhj.enums.BusinessDataEnum;
import com.patzn.cloud.service.lims.hmhj.mapper.BusinessDataMapper; import com.patzn.cloud.service.lims.hmhj.mapper.BusinessDataMapper;
import com.patzn.cloud.service.lims.hmhj.service.IBusinessDataService; import com.patzn.cloud.service.lims.hmhj.service.IBusinessDataService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -37,4 +42,22 @@ public class BusinessDataServiceImpl extends BaseServiceImpl<BusinessDataMapper, ...@@ -37,4 +42,22 @@ public class BusinessDataServiceImpl extends BaseServiceImpl<BusinessDataMapper,
Wrapper<BusinessData> wrapper = new EntityWrapper<>(businessData); Wrapper<BusinessData> wrapper = new EntityWrapper<>(businessData);
return baseMapper.selectList(wrapper); return baseMapper.selectList(wrapper);
} }
@Override
public Boolean saveOrUpdateBatch(BusinessDataEnum businessDataEnum, String dataJson) {
RestAssert.fail(StringUtils.isBlank(dataJson), "人员信息为空");
try {
List<BusinessData> dataList = JSONArray.parseArray(dataJson, BusinessData.class);
RestAssert.fail(dataList.stream().anyMatch(t -> null == t.getBizId()), "业务编号为空");
if (BusinessDataEnum.PRODUCT_STANDARD == businessDataEnum) {
RestAssert.fail(dataList.stream().anyMatch(t -> null == t.getDataId()), "业务数据ID为空");
}
dataList.forEach(t -> t.setBizType(businessDataEnum.getName()));
saveOrUpdateBatch(dataList);
} catch (Exception e) {
logger.error(e.getMessage(), e.getCause());
throw new PatznException("业务数据转换异常");
}
return 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