inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java
@@ -1,5 +1,6 @@ package com.yuanchu.mom.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.yuanchu.mom.annotation.ValueTableShow; import com.yuanchu.mom.common.OrderBy; @@ -7,7 +8,6 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @Data public class CostStatisticsDto extends OrderBy { @@ -46,6 +46,9 @@ private Double cost;//工时 @TableField(exist = false,select = false) private String dates; public Integer getNum() { return num = 1; } inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -1,13 +1,9 @@ package com.yuanchu.mom.dto; import com.fasterxml.jackson.annotation.JsonFormat; import com.yuanchu.mom.annotation.ValueTableShow; import com.yuanchu.mom.pojo.InsOrder; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDate; import java.time.LocalDateTime; /** * @author gaoaoy @@ -18,9 +14,21 @@ public class SampleOrderDto extends InsOrder { @ValueTableShow(5) @ApiModelProperty("样品类型") @ApiModelProperty("检验对象") private String sampleType; @ValueTableShow(6) @ApiModelProperty("样品名称") private String sampleName; @ValueTableShow(6) @ApiModelProperty("样品型号") private String sampleModel; @ValueTableShow(6) @ApiModelProperty("样品编号") private String sampleCode; @ValueTableShow(7) @ApiModelProperty("检验进度%") private String insProgress; inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.dto.CostStatisticsDto; import com.yuanchu.mom.dto.SampleOrderDto; import com.yuanchu.mom.dto.SampleProductDto; import com.yuanchu.mom.dto.SampleProductDto2; import com.yuanchu.mom.pojo.InsOrder; import com.yuanchu.mom.vo.SampleDefectsFatherVo; inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -590,7 +590,7 @@ product.setTemplate(new ArrayList<>()); continue; } if (set.add(product.getTemplateId())) { if (product.getTemplateId() != null && set.add(product.getTemplateId())) { map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + ""); } String thing = map2.get(product.getTemplateId()); inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -1,20 +1,20 @@ package com.yuanchu.mom.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.common.PrintChina; import com.yuanchu.mom.dto.*; import com.yuanchu.mom.dto.CostStatisticsDto; import com.yuanchu.mom.dto.SampleOrderDto; import com.yuanchu.mom.dto.SampleProductDto; import com.yuanchu.mom.dto.SampleProductDto2; import com.yuanchu.mom.mapper.*; import com.yuanchu.mom.pojo.*; import com.yuanchu.mom.service.InsOrderService; import com.yuanchu.mom.service.StandardTemplateService; import com.yuanchu.mom.utils.GiveCode; import com.yuanchu.mom.utils.QueryWrappers; import com.yuanchu.mom.vo.SampleDefectsFatherVo; @@ -24,7 +24,9 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; /** @@ -157,11 +159,14 @@ @Override public Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto) { String dates = costStatisticsDto.getDates(); String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(","); costStatisticsDto.setDates(null); Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(CostStatisticsDto.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("costStatistics"); if (map1.get("look") == 1) costStatisticsDto.setCreateUser(map1.get("userId")); map.put("body", insOrderMapper.selectCostStatistics(page, QueryWrappers.queryWrappers(costStatisticsDto))); map.put("body", insOrderMapper.selectCostStatistics(page, QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1]+" 23:59:59"))); return map; } @Override inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -8,6 +8,7 @@ import com.yuanchu.mom.mapper.StandardTreeMapper; import com.yuanchu.mom.pojo.InsSample; import com.yuanchu.mom.pojo.StandardProductList; import com.yuanchu.mom.pojo.StandardTree; import com.yuanchu.mom.service.StandardProductListService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -104,12 +105,17 @@ pl.setSample(sp.getSample()); pl.setModel(sp.getModel()); pl.setMethodS(sp.getMethodS()); pl.setTemplateId(sp.getTemplateId()); if(sp.getAsk()!=null&&!sp.getAsk().equals("")){ pl.setAsk(sp.getAsk()); } if(sp.getTell()!=null&&!sp.getTell().equals("")){ pl.setTell(sp.getTell()); } if(sp.getPrice()!=null&&!sp.getPrice().equals("")){ pl.setPrice(sp.getPrice()); } if(sp.getManHour()!=null&&!sp.getManHour().equals("")){ pl.setManHour(sp.getManHour()); } break; } @@ -140,7 +146,13 @@ e.printStackTrace(); return null; }); ; switch (trees.length){ case 3: standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2])); break; case 4: break; } return list; } } inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
@@ -62,12 +62,22 @@ @Override public String getStandTempThingById(Integer templateId) { return standardTemplateMapper.selectById(templateId).getThing(); StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId); if(standardTemplate==null){ return null; }else{ return standardTemplate.getThing(); } } @Override public String getStandTempNameById(Integer templateId) { return standardTemplateMapper.selectById(templateId).getName(); StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId); if(standardTemplate==null){ return null; }else{ return standardTemplate.getName(); } } }
@@ -95,7 +95,10 @@ ir.id report_id, concat(ROUND((select count(*) from ins_sample isa2 where ins_state = 5 and isa2.ins_order_id = io.id) / (select count(*) from ins_sample isa2 where isa2.ins_order_id = io.id) * 100, 2), '%') insProgress where isa2.ins_order_id = io.id) * 100, 2), '%') insProgress, group_concat(distinct isa.sample_code,' ') sample_code, group_concat(distinct isa.sample,' ') sample_name, group_concat(distinct isa.model,' ') sample_model FROM ins_order io LEFT JOIN ins_sample isa ON io.id = isa.ins_order_id
