xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.直观图样式修正

Browse Source
master
董哲奇 1 year ago
parent 540e81dfef
commit 521c7545cc
2 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File

12
src/main/java/com/dsic/gj_erp/service/fd/DmCzfddybService.java
Unescape View File

@ -91,18 +91,16 @@ public class DmCzfddybService extends ServiceImpl<DmCzfddybMapper,DmCzfddyb> {
if(StringUtils.isNotBlank(bmbm)&& bmbm.length()>2){
czbhs = czjbbService.list(new QueryWrapper<DmCbxxp>()
.select("replace(czbh,'#','') AS czbh")
.in("yzbs", "N", "H").ne("isnull(czjc,'')", "")
.select("replace(cbbm,'#','') AS cbbm")
.ne("isnull(wgbs,'N')","Y").eq(" isnull(cims_bs,'')","Y").
eq("left(gcqy,1)","0").
orderBy(true, true, "wgbs", "left(czbh,charindex('-',czbh)-1)", "len(czbh)", "czbh"
orderBy(true, true, "wgbs", "left(czbh,charindex('-',cbbm)-1)", "len(cbbm)", "czbh"
));
}else{
czbhs = czjbbService.list(new QueryWrapper<DmCbxxp>()
.select("replace(czbh,'#','') AS czbh")
.in("yzbs", "N", "H").ne("isnull(czjc,'')", "").
orderBy(true, true, "wgbs", "left(czbh,charindex('-',czbh)-1)", "len(czbh)", "czbh"
));
.select("replace(cbbm,'#','') AS cbbm")
.gt("charindex('-',cbbm)-1",0)
.orderBy(true, true, "wgbs", "left(cbbm,charindex('-',cbbm)-1)", "len(cbbm)", "cbbm"));
}
// 只显示海工名船 简称不等于空

83
src/main/java/com/dsic/gj_erp/service/fd/TpImpl.java
Unescape View File

@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -57,48 +58,48 @@ public class TpImpl {
}
public List<TppsQk> findTppsQk(Map map) {
List<TppsQk> tppsQks = tpbMapper.findTppsQk(map);
for (TppsQk t : tppsQks) {
// if(t.getPssl().compareTo(new BigDecimal("100"))==0){
// if(StringUtils.isNotBlank(t.getps))
List<TppsQk> tppsQks = new ArrayList<>();
// for (TppsQk t : tppsQks) {
//// if(t.getPssl().compareTo(new BigDecimal("100"))==0){
//// if(StringUtils.isNotBlank(t.getps))
////
//// }else
// //最小值 不为空 不用显示了
//
// }else
//最小值 不为空 不用显示了
if (StringUtils.isNotBlank(t.getQfpsrq())) {
// t.setYjtgq(t.getQfpsrq1());
//最小的不爲空 用最大的 jprkrq
} else if (StringUtils.isNotBlank(t.getMinjprkrq())){
Date date = DateUtil.parse(t.getMaxjprkrq());
t.setYgpprq(DateUtil.format( DateUtil.offsetDay(date, 2), "yyyy/MM/dd"));
//System.out.println("date = " + t.getMaxjprkrq()+"111"+t.getYgpprq());
} else if (StringUtils.isNotBlank(t.getFkpprq())) { //反馈配送
t.setYjtgq(t.getFkpprq());
} else if (StringUtils.isNotBlank(t.getYgpprq())) {
t.setYjtgq(t.getYgpprq());
} else {
t.setYjtgq("");
}
if ("9999/99/99".equals(t.getSjpsrqmax())) {
t.setSjpsrqmax("");
}
if(t.getXqsl().compareTo(t.getPssl())==0){
}else{
t.setPssl0(((t.getPssl().add(t.getPssl0())).divide(t.getXqsl(), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
t.setPssl5(((t.getPssl().add(t.getPssl5())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
t.setPssl10(((t.getPssl().add(t.getPssl10())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
t.setPssl15(((t.getPssl().add(t.getPssl15())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
}
}
// if (StringUtils.isNotBlank(t.getQfpsrq())) {
// // t.setYjtgq(t.getQfpsrq1());
//
// //最小的不爲空 用最大的 jprkrq
//
// } else if (StringUtils.isNotBlank(t.getMinjprkrq())){
//
// Date date = DateUtil.parse(t.getMaxjprkrq());
//
// t.setYgpprq(DateUtil.format( DateUtil.offsetDay(date, 2), "yyyy/MM/dd"));
// //System.out.println("date = " + t.getMaxjprkrq()+"111"+t.getYgpprq());
//
// } else if (StringUtils.isNotBlank(t.getFkpprq())) { //反馈配送
// t.setYjtgq(t.getFkpprq());
// } else if (StringUtils.isNotBlank(t.getYgpprq())) {
// t.setYjtgq(t.getYgpprq());
// } else {
// t.setYjtgq("");
// }
// if ("9999/99/99".equals(t.getSjpsrqmax())) {
// t.setSjpsrqmax("");
// }
//
// if(t.getXqsl().compareTo(t.getPssl())==0){
//
// }else{
// t.setPssl0(((t.getPssl().add(t.getPssl0())).divide(t.getXqsl(), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
// t.setPssl5(((t.getPssl().add(t.getPssl5())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
// t.setPssl10(((t.getPssl().add(t.getPssl10())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
// t.setPssl15(((t.getPssl().add(t.getPssl15())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
// }
//
//
// }
return tppsQks;
}
}

Write Preview
Loading…
Cancel
Save