Skip to content

Q
qianhe-ydsj
Commit 8b0a4fb0 by wangjian
Options

2025-09-22 wj 整体修改3

parent 96324235
Showing with 116 additions and 192 deletions
qianhe-system/src/main/java/com/qianhe/system/domain/SysDeptCb.java
......@@ -27,8 +27,8 @@ public class SysDeptCb extends BaseEntity
@Excel(name = "年度")
private String nd;
/** 单位类型（油气开发单位、主要专业化单位、科研、监督、服务协调单位） */
@Excel(name = "单位类型", readConverterExp = "油=气开发单位、主要专业化单位、科研、监督、服务协调单位")
/** 单位类型（油气生产单位、专业化单位、科研监督单位） */
@Excel(name = "单位类型", readConverterExp = "油=气开发单位、专业化单位、科研监督单位")
private String dwlx;
/** 交油气量（万吨）/经营收入（万元） */
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjFybpZbController.java
......@@ -96,7 +96,7 @@ public class SjFybpZbController extends BaseController
BigDecimal yxbzsl = BigDecimal.valueOf(deptCb.getYxbzsl());
BigDecimal fyje = sjFybpZb.getFyje()!=null?sjFybpZb.getFyje():new BigDecimal(0);
fyje=fyje.setScale(2,BigDecimal.ROUND_HALF_UP);
if("油气开发单位".equals(dwlx)){
if("油气生产单位".equals(dwlx)){
//计算标准
jyqlhjysr= deptCb.getJyqlhjysr().multiply(new BigDecimal(10000));//万吨 换算成吨
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(2)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
......@@ -112,7 +112,7 @@ public class SjFybpZbController extends BaseController
msg="保存成功！费用总额"+fyje+"万元低于"+sum+"万元。\n计算标准为："
+deptCb.getJyqlhjysr().setScale(2,BigDecimal.ROUND_HALF_UP)+"万吨*2元/吨*30%+"+jcrysl+"*1000元/人*30%+"+jcdwsl+"*15万元/单位*20%+"+yxbzsl+"*2万元/班站*20%="+sum;
}
}else if("主要专业化单位".equals(dwlx)) {
}else if("专业化单位".equals(dwlx)) {
//计算标准
if(yxbzsl.equals(new BigDecimal(0))){
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(0.0001)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
......@@ -143,7 +143,7 @@ public class SjFybpZbController extends BaseController
}
}
}else if("科研、监督、服务协调单位".equals(dwlx)) {
}else if("科研监督单位".equals(dwlx)) {
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(0.0001)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal rys=jcrysl.multiply(new BigDecimal(1000)).multiply(new BigDecimal(0.4)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal dws=jcdwsl.multiply(new BigDecimal(50000)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
......@@ -187,7 +187,7 @@ public class SjFybpZbController extends BaseController
BigDecimal yxbzsl = BigDecimal.valueOf(deptCb.getYxbzsl());
BigDecimal fyje = sjFybpZb.getFyje()!=null?sjFybpZb.getFyje():new BigDecimal(0);
fyje=fyje.setScale(2,BigDecimal.ROUND_HALF_UP);
if("油气开发单位".equals(dwlx)){
if("油气生产单位".equals(dwlx)){
//计算标准
jyqlhjysr= deptCb.getJyqlhjysr().multiply(new BigDecimal(10000));//万吨 换算成吨
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(2)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
......@@ -203,7 +203,7 @@ public class SjFybpZbController extends BaseController
msg="保存成功！费用总额"+fyje+"万元低于"+sum+"万元。\n计算标准为："
+deptCb.getJyqlhjysr().setScale(2,BigDecimal.ROUND_HALF_UP)+"万吨*2元/吨*30%+"+jcrysl+"*1000元/人*30%+"+jcdwsl+"*15万元/单位*20%+"+yxbzsl+"*2万元/班站*20%="+sum;
}
}else if("主要专业化单位".equals(dwlx)) {
}else if("专业化单位".equals(dwlx)) {
//计算标准
if(yxbzsl.equals(new BigDecimal(0))){
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(0.0001)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
......@@ -234,7 +234,7 @@ public class SjFybpZbController extends BaseController
}
}
}else if("科研、监督、服务协调单位".equals(dwlx)) {
}else if("科研监督单位".equals(dwlx)) {
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(0.0001)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal rys=jcrysl.multiply(new BigDecimal(1000)).multiply(new BigDecimal(0.4)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal dws=jcdwsl.multiply(new BigDecimal(50000)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
......@@ -324,7 +324,7 @@ public class SjFybpZbController extends BaseController
BigDecimal yxbzsl = BigDecimal.valueOf(deptCb.getYxbzsl());
BigDecimal fyje = sjFybpZb.getFyje()!=null?sjFybpZb.getFyje():new BigDecimal(0);
fyje=fyje.setScale(2,BigDecimal.ROUND_HALF_UP);
if("油气开发单位".equals(dwlx)){
if("油气生产单位".equals(dwlx)){
//计算标准
jyqlhjysr= deptCb.getJyqlhjysr().multiply(new BigDecimal(10000));//万吨 换算成吨
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(2)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
......@@ -345,7 +345,7 @@ public class SjFybpZbController extends BaseController
sjFybpZb.setTqbz("交油气量（万吨）×2 元/吨×30%+基层人员数量×1000 元/人×30%+\n" +
"基层单位数量×15 万元/单位×20%+一线班站数量×2 万元/班站×20%");
}else if("主要专业化单位".equals(dwlx)) {
}else if("专业化单位".equals(dwlx)) {
//计算标准
if(yxbzsl.equals(new BigDecimal(0))){
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(0.0001)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
......@@ -383,7 +383,112 @@ public class SjFybpZbController extends BaseController
sjFybpZb.setTqbz("经营收入（万元）×1‰×30%+基层人员数量×1000 元/人×30%+基层\n" +
"单位数量×15 万元/单位×20%+一线班站数量×2 万元/班站×20%");
}
}else if("科研、监督、服务协调单位".equals(dwlx)) {
}else if("科研监督单位".equals(dwlx)) {
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(0.0001)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal rys=jcrysl.multiply(new BigDecimal(1000)).multiply(new BigDecimal(0.4)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal dws=jcdwsl.multiply(new BigDecimal(50000)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal sum=jys.add(rys).add(dws);
sum=sum.divide(new BigDecimal(10000)).setScale(2,BigDecimal.ROUND_HALF_UP);
if(fyje.compareTo(sum)>-1){
sjFybpZb.setJl("费用总额"+fyje+"万元不低于"+sum+"万元。");
sjFybpZb.setJlflag(true);
}else {
sjFybpZb.setJl("费用总额"+fyje+"万元低于"+sum+"万元。");
sjFybpZb.setJlflag(false);
}
sjFybpZb.setJsbz("计算标准为："
+deptCb.getJyqlhjysr().setScale(2,BigDecimal.ROUND_HALF_UP)+"万吨*2元/吨*30%+"+jcrysl+"*1000元/人*40%+"+jcdwsl+"*5万元/单位*30%="+sum);
sjFybpZb.setTqbz("经营收入（万元）×1‰×30%+基层人员数量×1000 元/人×40%+基层\n" +
"单位数量×5 万元/单位×30%");
}
}
}
return success(sjFybpZb);
}
/**
* 获取三基-费用报批 参考标准
*/
@GetMapping(value = "/getCkbz")
public AjaxResult getCkbz(SjFybpZb sjFybpZb)
{
SysDeptCb sysDeptCb =new SysDeptCb();
sysDeptCb.setNd(sjFybpZb.getFyrq());
sysDeptCb.setDeptId(sjFybpZb.getDeptId());
SysDeptCb deptCb = sysDeptCbMapper.getInfoBydeptId(sysDeptCb);
if(deptCb==null){
sjFybpZb.setJl("该单位基础信息未维护，请到部门管理中进行设置！");
}else {
if(StringUtils.isNotEmpty( deptCb.getDwlx() )){
String dwlx = deptCb.getDwlx();
BigDecimal jyqlhjysr = deptCb.getJyqlhjysr();//万吨 换算成吨
BigDecimal jcrysl = BigDecimal.valueOf(deptCb.getJcrysl());
BigDecimal jcdwsl = BigDecimal.valueOf(deptCb.getJcdwsl());
BigDecimal yxbzsl = BigDecimal.valueOf(deptCb.getYxbzsl());
BigDecimal fyje = sjFybpZb.getFyje()!=null?sjFybpZb.getFyje():new BigDecimal(0);
fyje=fyje.setScale(2,BigDecimal.ROUND_HALF_UP);
if("油气生产单位".equals(dwlx)){
//计算标准
jyqlhjysr= deptCb.getJyqlhjysr().multiply(new BigDecimal(10000));//万吨 换算成吨
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(2)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal rys=jcrysl.multiply(new BigDecimal(1000)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal dws=jcdwsl.multiply(new BigDecimal(150000)).multiply(new BigDecimal(0.2)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal bzs=yxbzsl.multiply(new BigDecimal(20000)).multiply(new BigDecimal(0.2)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal sum=jys.add(rys).add(dws).add(bzs);
sum=sum.divide(new BigDecimal(10000)).setScale(2,BigDecimal.ROUND_HALF_UP);
if(fyje.compareTo(sum)>-1){
sjFybpZb.setJl("费用总额"+fyje+"万元不低于"+sum+"万元。");
sjFybpZb.setJlflag(true);
}else {
sjFybpZb.setJl("费用总额"+fyje+"万元低于"+sum+"万元。");
sjFybpZb.setJlflag(false);
}
sjFybpZb.setJsbz("计算标准为："
+deptCb.getJyqlhjysr().setScale(2,BigDecimal.ROUND_HALF_UP)+"万吨*2元/吨*30%+"+jcrysl+"*1000元/人*30%+"+jcdwsl+"*15万元/单位*20%+"+yxbzsl+"*2万元/班站*20%="+sum);
sjFybpZb.setTqbz("交油气量（万吨）×2 元/吨×30%+基层人员数量×1000 元/人×30%+\n" +
"基层单位数量×15 万元/单位×20%+一线班站数量×2 万元/班站×20%");
}else if("专业化单位".equals(dwlx)) {
//计算标准
if(yxbzsl.equals(new BigDecimal(0))){
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(0.0001)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal rys=jcrysl.multiply(new BigDecimal(1000)).multiply(new BigDecimal(0.4)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal dws=jcdwsl.multiply(new BigDecimal(150000)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal sum=jys.add(rys).add(dws);
sum=sum.divide(new BigDecimal(10000)).setScale(2,BigDecimal.ROUND_HALF_UP);
if(fyje.compareTo(sum)>-1){
sjFybpZb.setJl("费用总额"+fyje+"万元不低于"+sum+"万元。");
sjFybpZb.setJlflag(true);
}else {
sjFybpZb.setJl("费用总额"+fyje+"万元低于"+sum+"万元。");
sjFybpZb.setJlflag(false);
}
sjFybpZb.setJsbz("计算标准为："
+deptCb.getJyqlhjysr().setScale(2,BigDecimal.ROUND_HALF_UP)+"万吨*2元/吨*30%+"+jcrysl+"*1000元/人*40%+"+jcdwsl+"*15万元/单位*30%="+sum);
sjFybpZb.setTqbz("经营收入（万元）×1‰×30%+基层人员数量×1000 元/人×40%+基层\n" +
"单位数量×15 万元/单位×30%");
}else {
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(0.0001)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal rys=jcrysl.multiply(new BigDecimal(1000)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal dws=jcdwsl.multiply(new BigDecimal(150000)).multiply(new BigDecimal(0.2)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal bzs=yxbzsl.multiply(new BigDecimal(20000)).multiply(new BigDecimal(0.2)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal sum=jys.add(rys).add(dws).add(bzs);
sum=sum.divide(new BigDecimal(10000)).setScale(2,BigDecimal.ROUND_HALF_UP);
if(fyje.compareTo(sum)>-1){
sjFybpZb.setJl("费用总额"+fyje+"万元不低于"+sum+"万元。");
sjFybpZb.setJlflag(true);
}else {
sjFybpZb.setJl("费用总额"+fyje+"万元低于"+sum+"万元。");
sjFybpZb.setJlflag(false);
}
sjFybpZb.setJsbz("计算标准为："
+deptCb.getJyqlhjysr().setScale(2,BigDecimal.ROUND_HALF_UP)+"万吨*2元/吨*30%+"+jcrysl+"*1000元/人*30%+"+jcdwsl+"*15万元/单位*20%+"+yxbzsl+"*2万元/班站*20%="+sum);
sjFybpZb.setTqbz("经营收入（万元）×1‰×30%+基层人员数量×1000 元/人×30%+基层\n" +
"单位数量×15 万元/单位×20%+一线班站数量×2 万元/班站×20%");
}
}else if("科研监督单位".equals(dwlx)) {
BigDecimal jys= jyqlhjysr.multiply(new BigDecimal(0.0001)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal rys=jcrysl.multiply(new BigDecimal(1000)).multiply(new BigDecimal(0.4)).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal dws=jcdwsl.multiply(new BigDecimal(50000)).multiply(new BigDecimal(0.3)).setScale(2,BigDecimal.ROUND_HALF_UP);
......
qianhe-ydsj/src/main/java/com/qianhe/domain/SjFybpZb.java
......@@ -100,186 +100,5 @@ public class SjFybpZb extends BaseEntity
private String jl;
private Boolean jlflag;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setFyrq(String fyrq)
{
this.fyrq = fyrq;
}
public String getFyrq()
{
return fyrq;
}
public void setDeptId(String deptId)
{
this.deptId = deptId;
}
public String getDeptId()
{
return deptId;
}
public void setFyje(BigDecimal fyje)
{
this.fyje = fyje;
}
public BigDecimal getFyje()
{
return fyje;
}
public void setZt(String zt)
{
this.zt = zt;
}
public String getZt()
{
return zt;
}
public void setTjr(String tjr)
{
this.tjr = tjr;
}
public String getTjr()
{
return tjr;
}
public void setTjrq(String tjrq)
{
this.tjrq = tjrq;
}
public String getTjrq()
{
return tjrq;
}
public void setSprq(String sprq)
{
this.sprq = sprq;
}
public String getSprq()
{
return sprq;
}
public void setSpr(String spr)
{
this.spr = spr;
}
public String getSpr()
{
return spr;
}
public void setYsyje(BigDecimal ysyje)
{
this.ysyje = ysyje;
}
public BigDecimal getYsyje()
{
return ysyje;
}
public void setSpyj(String spyj)
{
this.spyj = spyj;
}
public String getSpyj()
{
return spyj;
}
public void setYl1(String yl1)
{
this.yl1 = yl1;
}
public String getYl1()
{
return yl1;
}
public void setYl2(String yl2)
{
this.yl2 = yl2;
}
public String getYl2()
{
return yl2;
}
public void setYl3(String yl3)
{
this.yl3 = yl3;
}
public String getYl3()
{
return yl3;
}
public void setYl4(String yl4)
{
this.yl4 = yl4;
}
public String getYl4()
{
return yl4;
}
public void setYl5(String yl5)
{
this.yl5 = yl5;
}
public String getYl5()
{
return yl5;
}
public List<SjFybp> getSjFybpList()
{
return sjFybpList;
}
public void setSjFybpList(List<SjFybp> sjFybpList)
{
this.sjFybpList = sjFybpList;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("fyrq", getFyrq())
.append("deptId", getDeptId())
.append("fyje", getFyje())
.append("zt", getZt())
.append("tjr", getTjr())
.append("tjrq", getTjrq())
.append("sprq", getSprq())
.append("spr", getSpr())
.append("ysyje", getYsyje())
.append("spyj", getSpyj())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("yl1", getYl1())
.append("yl2", getYl2())
.append("yl3", getYl3())
.append("yl4", getYl4())
.append("yl5", getYl5())
.append("sjFybpList", getSjFybpList())
.toString();
}
}
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