Skip to content

T
tianjin-cement
Commit f3030eff authored by 竹天卫's avatar 竹天卫
Browse files
Options

化学式下标 优化

parent 5dc6af87
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 33 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/TeamController.java
View file @ f3030eff
......@@ -7,6 +7,7 @@ import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.PageTableRequest;
import cn.wise.sc.cement.business.model.query.ProjectQuery;
import cn.wise.sc.cement.business.model.query.TeamQuery;
import cn.wise.sc.cement.business.service.ISysDictionaryService;
import cn.wise.sc.cement.business.service.ITeamService;
import cn.wise.sc.cement.business.wrapper.WrapMapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -39,6 +40,9 @@ public class TeamController {
@Autowired
private ITeamService teamService;
@Autowired
private ISysDictionaryService dictionaryService;
@ApiOperation(value = "检测项分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "status", value = "状态0:禁用 1:启用", paramType = "query", dataType = "Integer"),
......@@ -131,5 +135,21 @@ public class TeamController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "获取检测项目列表")
@GetMapping("/getTeamNameList")
public BaseResponse getTeamNameList() {
try {
return dictionaryService.getContent("检测项目");
} catch (Exception e) {
log.debug("获取检测项目列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleQuery.java
View file @ f3030eff
......@@ -45,12 +45,6 @@ public class SampleQuery {
@ApiModelProperty("本所编号")
private String cementCode;
@ApiModelProperty("收费标准")
private BigDecimal charge;
@ApiModelProperty("产值")
private BigDecimal outputValue;
@ApiModelProperty("委托表id")
private Integer entrustId;
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java
View file @ f3030eff
......@@ -182,25 +182,25 @@ public class CommonServiceImpl {
for(String name : checkResutlList){
if(name.equals("L.O.I")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("SiO2")){
}else if(name.equals("SiO<sub>2</sub>")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Al2O3+TiO2")){
}else if(name.equals("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Al2O3")){
}else if(name.equals("Al<sub>2</sub>O<sub>3</sub>")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Fe2O3")){
}else if(name.equals("Fe<sub>2</sub>O<sub>3</sub>")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("CaO")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("MgO")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("TiO2")){
}else if(name.equals("TiO<sub>2</sub>")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("重量法_SO3")){
}else if(name.equals("重量法_SO<sub>3</sub>")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("K2O")){
}else if(name.equals("K<sub>2</sub>O")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Na2O")){
}else if(name.equals("Na<sub>2</sub>O")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("MnO")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
......@@ -229,7 +229,7 @@ public class CommonServiceImpl {
//输出检测项第二次循环
for(String name : checkResutlList){
if(name.equals("SO3")){
if(name.equals("SO<sub>3</sub>")){
String countSO3 = CheckCountUtil.countSO3(resultMap, countMap);
countMap.put(name, countSO3);
}else if(name.equals("KH")){
......@@ -350,10 +350,6 @@ public class CommonServiceImpl {
}
return countMap;
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ f3030eff
......@@ -298,11 +298,17 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.errorMsg("选择MgO必须要选择CaO");
}
}
if(teamNameList.contains("Al2O3")){
if(!teamNameList.contains("Fe2O3")){
if(teamNameList.contains("Al<sub>2</sub>O<sub>3</sub>")){
if(!teamNameList.contains("Fe<sub>2</sub>O<sub>3</sub>")){
return BaseResponse.errorMsg("选择Al2O3必须要选择Fe2O3");
}
}
//选择比表面积必须选择密度
if(teamNameList.contains("比表面积")){
if(!teamNameList.contains("密度")){
return BaseResponse.errorMsg("选择比表面积必须选择密度");
}
}
}
//如果为加急委托，产值是正常的3倍
if(entrust.getIsUrgent()==1){
......@@ -860,6 +866,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
.setIsHandle(0)//样品处理未完成状态
.setIsDistribution(0)//任务派发未完成状态
.setIsCheck(0)//样品校核未完成状态
.setOutputValue(sample.getCharge()) //产值不用评审人员修改
.setParallelCode(sampleQuery.getCementCode());
sampleList.add(sample);
}else{ //是平行样
......@@ -901,9 +908,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
//*****************************样品处理派发合并到评审接口中******************
List<Sample> sampleList = sampleMapper.getSampleList(entrustVo.getId());
String userIds = "";
List<Integer> userIdList = new ArrayList<>();
for (Sample sample : sampleList) {
//样品的处理项
List<Integer> handleUserIds = new ArrayList<>();
// List<Integer> handleUserIds = new ArrayList<>();
String teamIds = sample.getTeamIds();
if (teamIds != null) {
String[] teamIdS = teamIds.split("、");
......@@ -912,8 +920,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
if (teamVo != null) {
HandleVo handleVo = handleMapper.getDetail(teamVo.getHandleId());
if(handleVo != null && !handleUserIds.contains(handleVo.getUserId())){
handleUserIds.add(handleVo.getUserId());
if(handleVo != null && !userIdList.contains(handleVo.getUserId())){
userIdList.add(handleVo.getUserId());
}
//样品处理表 同一个样品多个相同处理项时 去重。
if(handleVo != null && !handleIds.contains(handleVo.getId())){
......@@ -958,7 +966,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if(handleUser == null){
return BaseResponse.errorMsg("样品处理人信息错误");
}
if(StringUtils.isNotBlank(handleUser.getWxId()) && !handleUserIds.contains(handleUser.getId())){
if(StringUtils.isNotBlank(handleUser.getWxId()) && !userIdList.contains(handleUser.getId())){
userIds = userIds.equals("")?handleUser.getWxId():userIds+"|"+handleUser.getWxId();
}
}
......@@ -2139,25 +2147,25 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("SiO2")) {
} else if (name.equals("SiO<sub>2</sub>")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name, (groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))?
map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("Al2O3+TiO2")) {
} else if (name.equals("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("Al2O3")) {
} else if (name.equals("Al<sub>2</sub>O<sub>3</sub>")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("Fe2O3")) {
} else if (name.equals("Fe<sub>2</sub>O<sub>3</sub>")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
......@@ -2175,25 +2183,25 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("TiO2")) {
} else if (name.equals("TiO<sub>2</sub>")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("K2O")) {
} else if (name.equals("K<sub>2</sub>O")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("Na2O")) {
} else if (name.equals("Na<sub>2</sub>O")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("SO3")) {
} else if (name.equals("SO<sub>3</sub>")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
......
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