Skip to content

P
patzn-cloud-service-hmhj
Commit 371b7b25 by lijingjing
Options

修改采样流转相关功能；

parent cd63c3fe
Showing with 57 additions and 29 deletions
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleBackupController.java
......@@ -61,7 +61,7 @@ public class EntrustSampleBackupController extends ServiceController {
public RestResult<Page<EntrustSampleBackupVO>> getPageSampling(EntrustSampleBackupVO entrustSampleBackup) {
entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.BACKUP_ING);
entrustSampleBackup.setType("BY");
entrustSampleBackup.setGroupNameList(userInfoService.getCurGroupNameList());
// entrustSampleBackup.setGroupNameList(userInfoService.getCurGroupNameList());
return success(entrustSampleBackupService.pageCO(getPage(), entrustSampleBackup));
}
......@@ -144,6 +144,36 @@ public class EntrustSampleBackupController extends ServiceController {
return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
}
// --
@ApiOperation("合同样品处理分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_handle_list")
public RestResult<Page<EntrustSampleBackupVO>> getPageListHandle(EntrustSampleBackupVO entrustSampleBackup) {
entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.HANDLE);
// entrustSampleBackup.setGroupNameList(userInfoService.getCurGroupNameList());
return success(entrustSampleBackupService.pageCO(getPage(), entrustSampleBackup));
}
@ApiOperation("样品处理历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_handle_list_his")
public RestResult<Page<EntrustSampleBackupVO>> getPageHandleListHis(EntrustSampleBackupVO entrustSampleBackup) {
entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.HANDLE_OK);
// entrustSampleBackup.setGroupNameList(userInfoService.getCurGroupNameList());
return success(entrustSampleBackupService.pageCO(getPage(), entrustSampleBackup));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleBackupService.java
......@@ -30,5 +30,5 @@ public interface IEntrustSampleBackupService extends IBaseService<EntrustSampleB
Page<EntrustSampleBackupVO> pageManage(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup);
void updateEntrustId(Long id, List<String> contractSamplings);
void updateEntrustId(Long id, List<Long> contractSamplings);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleServiceImpl.java
......@@ -265,7 +265,8 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
// contractSampleRecordService.record(ids, ContractSampleStatusEnum.CHECK_ACCEPT_REG, ContractSampleStatusEnum.ENTRUST_REG, 0, "验收任务登记提交至委托登记", account);
// lmsMsgService.sendMsg("/hmhj/entrust_manage/entrust_register", "委托登记由验收任务登记提交过来，请及时处理", "新的委托登记任务！", account, null);
// return super.update(contractSample, Condition.create().in("id", ids));
// 额外处理备样数据
backupSampleHandler(ids, account);
contractSampleRecordService.record(ids, ContractSampleStatusEnum.DATA_SAMPLING, ContractSampleStatusEnum.ENTRUST_REG, 0, "采样管理提交至委托登记", account);
lmsMsgService.sendMsg("/hmhj/entrust_manage/entrust_register", "委托登记由采样管理提交过来，请及时处理", "新的委托登记任务！", account, null);
return super.update(contractSample, Condition.create().in("id", ids));
......@@ -741,14 +742,15 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
contractSamples.forEach(t -> {
List<ContractSampling> samplingList = contractSamplingService.list(Condition.create().eq("contract_sample_id", t.getId()).ne("type", 0));
if (CollectionUtils.isEmpty(samplingList)) {
if (CollectionUtils.isNotEmpty(samplingList)) {
sampleBackupList.addAll(samplingList.stream().map(x -> {
EntrustSampleBackup backup = new EntrustSampleBackup();
BeanUtils.copyProperties(x, backup);
backup.setId(null);
backup.setContractId(x.getContractSampleId()).setSampleId(x.getId()).setType("BY")
backup.setContractId(x.getContractSampleId()).setSamplingId(x.getId()).setType("BY")
.setStatus(EntrustSampleBackupStatusEnum.BACKUP_ING)
.setProgress(EntrustSampleBackupStatusEnum.BACKUP_ING)
.setStorageLocation(t.getStoragePlace())
.setCtime(new Date()).setUid(account.getUserId()).setLid(null).setLtime(null);
return backup;
}).collect(Collectors.toList()));
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleBackupServiceImpl.java
......@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.constant.CommonConstants;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleBackup;
......@@ -14,7 +13,9 @@ import com.patzn.cloud.service.hmhj.enums.EntrustSampleBackupStatusEnum;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleBackupVO;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleBackupMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleBackupService;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleService;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -29,6 +30,9 @@ import java.util.List;
@Service
public class EntrustSampleBackupServiceImpl extends BaseServiceImpl<EntrustSampleBackupMapper, EntrustSampleBackup> implements IEntrustSampleBackupService {
@Autowired
private IEntrustSampleService entrustSampleService;
@Override
public Page<EntrustSampleBackup> page(Page<EntrustSampleBackup> page, EntrustSampleBackup entrustSampleBackup) {
Wrapper wrapper = new EntityWrapper<>(entrustSampleBackup);
......@@ -77,19 +81,10 @@ public class EntrustSampleBackupServiceImpl extends BaseServiceImpl<EntrustSampl
}
@Override
public void updateEntrustId(Long entrustId, List<String> contractSamplings) {
if (null == entrustId || CollectionUtils.isEmpty(contractSamplings)) {
public void updateEntrustId(Long entrustId, List<Long> contractSampleIds) {
if (null == entrustId || CollectionUtils.isEmpty(contractSampleIds)) {
return;
}
Wrapper<EntrustSampleBackup> wrapper = Condition.wrapper();
for (String s : contractSamplings) {
String[] ids = s.split(CommonConstants.SYMBOL_UNDERLINE);
if (ids.length != 2) {
continue;
}
wrapper.orNew().eq("contract_id", ids[0]).eq("sampling_id", ids[1]);
}
update(new EntrustSampleBackup().setEntrustId(entrustId), wrapper);
update(new EntrustSampleBackup().setEntrustId(entrustId), Condition.create().in("contract_id", contractSampleIds).isNull("entrust_id"));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java
......@@ -348,11 +348,11 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
List<EntrustSample> saveSampleList = new ArrayList<>();
List<EntrustSampleItem> saveEntrustSampleItemList = new ArrayList<>();
List<String> contractSamplings = new ArrayList<>();
List<Long> contractSampleIds = new ArrayList<>();
int incNum = 10;
for (EntrustSampleDTO sampleDTO : sampleDTOList) {
if (null != sampleDTO.getContractSampleId() && null != sampleDTO.getSamplingId()) {
contractSamplings.add(sampleDTO.getContractSampleId() + "_" + sampleDTO.getSamplingId());
if (null != sampleDTO.getContractSampleId()) {
contractSampleIds.add(sampleDTO.getContractSampleId());
}
EntrustSample sample = sampleDTO.convert(EntrustSample.class);
sample.setEntrustId(entrust.getId());
......@@ -385,15 +385,15 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
}
if (saveEntrust(entrust)) {
// 更新备样entrust_id 字段
entrustSampleBackupService.updateEntrustId(entrust.getId(),contractSamplings);
if (CollectionUtils.isNotEmpty(saveSampleList)) {
entrustSampleService.saveBatch(saveSampleList);
}
if (CollectionUtils.isNotEmpty(saveEntrustSampleItemList)) {
entrustSampleItemService.saveBatch(saveEntrustSampleItemList);
}
// 更新备样entrust_id字段
entrustSampleBackupService.updateEntrustId(entrust.getId(), contractSampleIds);
}
}
return true;
......
src/main/resources/mapper/hmhj/EntrustSampleBackupMapper.xml
......@@ -4,7 +4,7 @@
<sql id="where">
<where>
AND b.deleted = 0 AND s.deleted = 0 AND e.deleted = 0
AND b.deleted = 0 AND s.deleted = 0
<if test="null!=vo.sampleCode">
AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
</if>
......@@ -54,8 +54,8 @@
entrust_sample_backup b
JOIN entrust_sample s ON b.sample_id = s.ID
JOIN entrust e ON s.entrust_id = e.ID
<include refid="where"/>
AND e.deleted = 0
order by date_part('day', CAST(b.storage_period AS TIMESTAMP) - CAST( now() AS TIMESTAMP)) asc,b.ctime desc
</select>
......@@ -77,9 +77,10 @@
FROM
entrust_sample_backup b
JOIN contract_sampling s ON b.sampling_id = s.ID
LEFT JOIN entrust e ON s.entrust_id = e.ID
LEFT JOIN (
select e.* from entrust e where e.deleted = 0
) e ON b.entrust_id = e.ID
<include refid="where"/>
order by date_part('day', CAST(b.storage_period AS TIMESTAMP) - CAST( now() AS TIMESTAMP)) asc,b.ctime desc
</select>
......@@ -103,7 +104,7 @@
JOIN entrust_sample s ON b.sample_id = s.ID
JOIN entrust e ON s.entrust_id = e.ID
<include refid="where"/>
AND e.deleted = 0
order by (case when e.sample_handle_advise = '检测完毕退还' and s.status &gt;20 then 1 else 0 end) desc, b.ctime desc
</select>
</mapper>
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