|
|
|
@ -21,6 +21,8 @@ import org.springframework.stereotype.Component;
|
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.math.RoundingMode;
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
@ -123,6 +125,7 @@ public class WorkDataCmd {
|
|
|
|
|
Map<String,Object> ysMap = getYsInfo(employeeId,startday,endday);
|
|
|
|
|
Map<String,Object> ysdata = (Map<String, Object>) ysMap.get("datas");
|
|
|
|
|
two = (String) ysdata.get("htzje");
|
|
|
|
|
two = parseJe(two);
|
|
|
|
|
twoword = "本年验收金额";
|
|
|
|
|
pkey = "workdata.project.ysje";
|
|
|
|
|
twourl = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
|
|
|
|
@ -136,6 +139,7 @@ public class WorkDataCmd {
|
|
|
|
|
Map<String,Object> skMap = getSkInfo(employeeId,startday,endday);
|
|
|
|
|
Map<String,Object> skdata = (Map<String, Object>) skMap.get("datas");
|
|
|
|
|
four = (String) skdata.get("skje");
|
|
|
|
|
four = parseJe(four);
|
|
|
|
|
fourword = "本年收款金额";
|
|
|
|
|
pkey = "workdata.project.skje";
|
|
|
|
|
foururl = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
|
|
|
|
@ -960,5 +964,18 @@ public class WorkDataCmd {
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static String parseJe(String value){
|
|
|
|
|
if("".equals(value)){
|
|
|
|
|
return "0.00";
|
|
|
|
|
}
|
|
|
|
|
BigDecimal dividend = new BigDecimal(value); // 被除数
|
|
|
|
|
BigDecimal divisor = new BigDecimal("10000"); // 除数
|
|
|
|
|
|
|
|
|
|
// 设置小数点后两位,并进行四舍五入
|
|
|
|
|
BigDecimal result = dividend.divide(divisor, 2, RoundingMode.HALF_UP);
|
|
|
|
|
|
|
|
|
|
return result.toString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|