Skip to content

P
patzn-cloud-service-hmhj
Commit 808f4142 by wangweidong
Options

hmhj修改部分优化

parent 4000d190
Showing with 45 additions and 126 deletions
src/main/java/com/patzn/cloud/service/lims/common/StringHandleUtils.java
......@@ -3,6 +3,7 @@ package com.patzn.cloud.service.lims.common;
import com.google.common.collect.Lists;
import com.patzn.cloud.commons.enums.IBaseEnum;
import com.patzn.cloud.commons.toolkit.DateUtils;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
import org.apache.commons.collections.CollectionUtils;
......@@ -618,11 +619,11 @@ public class StringHandleUtils {
if (StringHandleUtils.is_alpha(dataAttribute)){
return StringHandleUtils.getFieldIfNummReturnBlankValueByFieldName(dataAttribute,vo);
}else{
List<EntrustSampleItemVO> sampleItemVOList = vo.getItemVOList();
List<EntrustSampleItemIndex> sampleItemVOList = vo.getIndexList();
if (CollectionUtils.isEmpty(sampleItemVOList)){
return "";
}
for (EntrustSampleItemVO itemVO : sampleItemVOList) {
for (EntrustSampleItemIndex itemVO : sampleItemVOList) {
if (dataAttribute.equals(itemVO.getName())){
return itemVO.getTestValue();
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/OriginalTemplateController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.baomidou.kisso.annotation.Action;
import com.baomidou.kisso.annotation.Login;
import com.patzn.cloud.feign.lims.hmhj.client.OriginalTemplateClient;
import com.patzn.cloud.oss.starter.OssFileResult;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
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 org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
......@@ -94,8 +89,12 @@ public class OriginalTemplateController extends ServiceController implements Ori
return success(originalTemplateService.uploadTemplate(file, classType,name,remark,0));
}
@Override
public RestResult<Boolean> editOriginal(String someParam, OssFileResult obsFileResult) {
@Login(action = Action.Skip)
@ApiOperation(value = "编辑原始记录", notes = "编辑证书模板")
@PostMapping({"/edit_original_{someParam}"})
public RestResult<Boolean> editOriginal(@PathVariable("someParam") String someParam, @RequestBody OssFileResult obsFileResult) {
return success(originalTemplateService.editOriginal(someParam, obsFileResult));
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemIndexMapper.java
......@@ -3,6 +3,7 @@ package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -16,5 +17,5 @@ import java.util.List;
*/
public interface EntrustSampleItemIndexMapper extends BatchMapper<EntrustSampleItemIndex> {
List<EntrustSampleItemIndexVO> listVOByExpIds(List<Long> expIdsList);
List<EntrustSampleItemIndexVO> listVOByExpIds(@Param("expIds") List<Long> expIdsList);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemIndexService.java
......@@ -20,4 +20,6 @@ public interface IEntrustSampleItemIndexService extends IBaseService<EntrustSamp
boolean removeByIds(List<Long> ids);
List<EntrustSampleItemIndexVO> listVOByExpIds(List<Long> expIdsList);
List<EntrustSampleItemIndex> listBySampleId(Long id);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemIndexServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemIndexMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemIndexService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
import java.util.stream.Collectors;
/**
* 服务实现类
......@@ -21,6 +27,10 @@ import java.util.List;
@Service
public class EntrustSampleItemIndexServiceImpl extends BaseServiceImpl<EntrustSampleItemIndexMapper, EntrustSampleItemIndex> implements IEntrustSampleItemIndexService {
@Autowired
private IEntrustSampleItemService entrustSampleItemService;
@Override
public Page<EntrustSampleItemIndex> page(Page<EntrustSampleItemIndex> page, EntrustSampleItemIndex entrustSampleItemIndex) {
Wrapper wrapper = new EntityWrapper<>(entrustSampleItemIndex);
......@@ -37,4 +47,17 @@ public class EntrustSampleItemIndexServiceImpl extends BaseServiceImpl<EntrustSa
public List<EntrustSampleItemIndexVO> listVOByExpIds(List<Long> expIdsList) {
return baseMapper.listVOByExpIds(expIdsList);
}
@Override
public List<EntrustSampleItemIndex> listBySampleId(Long id) {
List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().eq("entrust_sample_id",id));
if (CollectionUtils.isNotEmpty(itemList)){
return null;
}
List<Long> itemIds= itemList.stream().map(s->{
return s.getId();
}).collect(Collectors.toList());
return list(Condition.create().in("entrust_sample_item_id",itemIds));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
......@@ -69,7 +69,8 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
@Autowired
private IEntrustRecordService entrustRecordService;
@Autowired
private IEntrustSampleItemIndexService entrustSampleItemIndexService;
@Autowired
private IEntrustReportService entrustReportService;
@Autowired
......@@ -371,6 +372,8 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
int templateSampleNum = sysFileTemplate.getTemplateSampleNum();
if (templateSampleNum>=sampleVOList.size()){
for (EntrustSampleVO vo:sampleVOList) {
List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
vo.setIndexList(indexList);
XSSFRow xssfRow = sheetOne.getRow(beginRow);
for (OriginalTemplateConfig config:configList) {
XSSFCell cell = xssfRow.getCell(config.getColumnPlace());
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/OriginalTemplateServiceImpl.java
......@@ -318,8 +318,6 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
continue;
}
Integer itemValueIndex = collectEntity.getItemMegerRow();
if (null == itemValueIndex || itemValueIndex ==sampleMergerNum){
XSSFCell itemCell = xssfRow.getCell(collectEntity.getColumnPlace());
String value = "";
try {
......@@ -334,117 +332,14 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
continue;
}
SoilItemCollectData soilItemCollectData = new SoilItemCollectData();
if ("状态判断".equals(collectEntity.getAttribute())){
if (StringUtils.isNotBlank(sampleOfStatus)){
if ("原状".equals(sampleOfStatus)){
soilItemCollectData.setItemName("原状土"+itemName);
}else if ("重塑".equals(sampleOfStatus)){
soilItemCollectData.setItemName("重塑土"+itemName);
}
}else {
soilItemCollectData.setItemName(itemName);
}
}else{
soilItemCollectData.setItemName(itemName);
}
soilItemCollectData.setItemName(itemName);
soilItemCollectData.setTestValue(value);
soilItemCollectData.setSampleCode(sampleCode);
soilItemCollectData.setUnit(collectEntity.getUnit());
soilItemCollectData.setShortName(shortNames);
soilItemCollectData.setStatus(sampleOfStatus);
if ("状态判断".equals(collectEntity.getAttribute())){
if (StringUtils.isNotBlank(sampleOfStatus)){
if ("原状".equals(sampleOfStatus)){
soilItemCollectData.setItemName("原状土"+itemName);
}else if ("重塑".equals(sampleOfStatus)){
soilItemCollectData.setItemName("重塑土"+itemName);
}
}else {
soilItemCollectData.setItemName(itemName);
}
}else{
soilItemCollectData.setItemName(itemName);
}
soilItemCollectData.setItemName(itemName);
soilItemList.add(soilItemCollectData);
}else{
if (sampleMergerNum%itemValueIndex==0){
int nums = sampleMergerNum/itemValueIndex;
for (int j = 0; j < nums; j++) {
int itemRow = i+j*itemValueIndex;
XSSFRow itemValueRow = sheet.getRow(itemRow);
if (null == itemValueRow){
continue;
}
XSSFCell itemCell = itemValueRow.getCell(collectEntity.getColumnPlace());
if (null == itemCell){
continue;
}
String value = "";
try {
value =CellFormat.getInstance(itemCell.getCellStyle().getDataFormatString()).apply(itemCell).text;
}catch (Exception e){
value = HSSFWorkbookUtil.getJavaValue(itemCell).toString();
}
String itemName = collectEntity.getItemName();
if (StringUtils.isBlank(value)){
continue;
}
String name = "";
String [] itemArray = itemName.split("&");
if (itemArray.length==2){
int suplus = j%2;
if (suplus==0){
name=itemArray[0];
}else if (suplus == 1){
name=itemArray[1];
}
}
SoilItemCollectData soilItemCollectData = new SoilItemCollectData();
soilItemCollectData.setItemName(name);
soilItemCollectData.setTestValue(value);
soilItemCollectData.setSampleCode(sampleCode);
soilItemCollectData.setShortName(shortNames);
soilItemCollectData.setStatus(sampleOfStatus);
soilItemCollectData.setUnit(collectEntity.getUnit());
soilItemList.add(soilItemCollectData);
}
}else {
XSSFCell itemCell = xssfRow.getCell(collectEntity.getColumnPlace());
String value = null;
try {
value= CellFormat.getInstance(itemCell.getCellStyle().getDataFormatString()).apply(itemCell).text;
}catch (Exception e){
try {
value = CellFormat.getInstance(itemCell.getCellStyle().getDataFormatString()).apply(itemCell).text;
}catch (Exception w){
value =HSSFWorkbookUtil.getCellValue(itemCell).toString();
}
}
String itemName = collectEntity.getItemName();
if (StringUtils.isBlank(value)){
continue;
}
SoilItemCollectData soilItemCollectData = new SoilItemCollectData();
soilItemCollectData.setItemName(itemName);
soilItemCollectData.setTestValue(value);
soilItemCollectData.setSampleCode(sampleCode);
soilItemCollectData.setShortName(shortNames);
soilItemCollectData.setStatus(sampleOfStatus);
soilItemCollectData.setUnit(collectEntity.getUnit());
soilItemList.add(soilItemCollectData);
}
}
......@@ -500,11 +395,6 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
if (StringUtils.isBlank(status)){
exp = experiment;
break;
}else if ("原状".equals(status)) {
if (!experiment.getName().contains("重塑")){
exp = experiment;
break;
}
}else{
exp = experiment;
}
......
src/main/resources/mapper/hmhj/EntrustSampleItemIndexMapper.xml
......@@ -3,7 +3,7 @@
<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemIndexMapper">
<select id="listVOByExpIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO">
SELECT i.id,i.name,i.test_value,i.entrust_sample_item_id,s.sample_code FROM entrust_sample_item_index i JOIN
SELECT i.id,i.name,i.test_value,i.entrust_sample_item_id,s.code AS "sampleCode" FROM entrust_sample_item_index i JOIN
entrust_sample_item t ON i.entrust_sample_item_id = t.id
......
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