Skip to content

C
cyyy
Commit 04b621ca by zhangfeng
Options

问题

parent d1d1bcfa
Showing with 281 additions and 37 deletions
src/main/java/com/corp/cyyy/dubget/entity/BudgetDeclaratio.java
......@@ -334,13 +334,13 @@ public class BudgetDeclaratio extends BaseEntity{
this.estimate = estimate;
}
/**数量
/**联系电话
*@return
*/
public String getQuantity(){
return quantity;
}
/**数量
/**联系电话
*@param quantity
*/
public void setQuantity(String quantity){
......
src/main/java/com/corp/cyyy/dubget/web/BudgetDeclaratioController.java
......@@ -111,7 +111,7 @@ public class BudgetDeclaratioController{
}else if (dtype.equals("2")) {
view=new ModelAndView("/dubget/budgetDeclaratio/indexZJ.html") ;
}
view.addObject("search", BudgetDeclaratioQuery.class.getName());
view.addObject("search", BudgetDeclaratioQueryKS.class.getName());
return view;
}
@GetMapping(MODEL + "/xgindex.do")
......
src/main/java/com/corp/cyyy/dubget/web/query/BudgetDeclaratioQueryKS.java 0 → 100644
package com.corp.cyyy.dubget.web.query;
import com.spk.admin.core.annotation.Query;
import com.spk.admin.core.util.enums.CoreDictType;
import com.spk.admin.core.web.query.PageParam;
import java.util.Date;
/**
*BudgetDeclaratio查询
*/
public class BudgetDeclaratioQueryKS extends PageParam {
//@Query(name = "科室名称", display = true)
private String deptName;
@Query(name = "预算类型", display = true)
private String type;
@Query(name = "预算编号", display = true)
private String number;
@Query(name = "申报人员", display = true)
private String user;
@Query(name = "年度", display = true)
private String year;
private String examine;
private String typeState;
private String orgId;
private String state;
private String dtype;
public String getDtype() {
return dtype;
}
public void setDtype(String dtype) {
this.dtype = dtype;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getTypeState() {
return typeState;
}
public void setTypeState(String typeState) {
this.typeState = typeState;
}
public String getExamine() {
return examine;
}
public void setExamine(String examine) {
this.examine = examine;
}
public String getDeptName(){
return deptName;
}
public void setDeptName(String deptName ){
this.deptName = deptName;
}
public String getType(){
return type;
}
public void setType(String type ){
this.type = type;
}
public String getNumber(){
return number;
}
public void setNumber(String number ){
this.number = number;
}
public String getUser(){
return user;
}
public void setUser(String user ){
this.user = user;
}
public String getYear(){
return year;
}
public void setYear(String year ){
this.year = year;
}
}
src/main/java/com/corp/cyyy/po/service/PoDeptService.java
......@@ -212,7 +212,7 @@ public class PoDeptService extends BaseService<PoDept>{
}
public void savaListBudgetDeclaratio(List<BudgetDeclaratio> agents) {
public void savaListBudgetDeclaratio(List<BudgetDeclaratio> agents) throws BadHanyuPinyinOutputFormatCombination {
for (BudgetDeclaratio budgetDeclaratio : agents) {
CoreOrg t=new CoreOrg();
t.setCode(budgetDeclaratio.getDeptId());
......@@ -223,15 +223,61 @@ public class PoDeptService extends BaseService<PoDept>{
BudgtBase ba=new BudgtBase();
ba.setName(budgetDeclaratio.getName());
BudgtBase bas = sqlManager.templateOne(ba);
Pinyin4jUtils pinyin=new Pinyin4jUtils();
if (bas!=null) {
budgetDeclaratio.setType(bas.getTypeId().toString());
}else {
budgetDeclaratio.setType("");
String type = budgetDeclaratio.getType();
/*if (condition) {
}*/
System.out.println(type);
if (type.equals("未指定类型")) {
budgetDeclaratio.setType("");
budgetDeclaratio.setState("2");
}else {
BudgtType by=new BudgtType();
by.setName(type);
BudgtType tt = sqlManager.templateOne(by);
//插入项目名称
if (tt==null) {
tt=new BudgtType();
tt.setName(type);
tt.setCode(UUIDUtil.uuid());
tt.setOrgId(org.getId().toString());
tt.setOrgName(org.getName());
tt.setCreateTime(new Date());
sqlManager.insert(BudgtType.class, tt,true);
bas=new BudgtBase();
bas.setName(budgetDeclaratio.getName());
bas.setOrgId(org.getId().toString());
bas.setOrgName(org.getName());
bas.setTypeId(tt.getId());
bas.setPinyin(pinyin.toPinYinLowercase(budgetDeclaratio.getName()));
bas.setRange(budgetDeclaratio.getQuantity());
bas.setCreateTime(new Date());
sqlManager.insert(BudgtBase.class, bas,true);
budgetDeclaratio.setType(tt.getId().toString());
}else {
bas=new BudgtBase();
bas.setName(budgetDeclaratio.getName());
bas.setOrgId(org.getId().toString());
bas.setOrgName(org.getName());
bas.setTypeId(tt.getId());
bas.setPinyin(pinyin.toPinYinLowercase(budgetDeclaratio.getName()));
bas.setRange(budgetDeclaratio.getQuantity());
bas.setCreateTime(new Date());
sqlManager.insert(BudgtBase.class, bas,true);
budgetDeclaratio.setType(tt.getId().toString());
}
budgetDeclaratio.setState("3");
//budgetDeclaratio.setType("");
}
}
String year = budgetDeclaratio.getYear().substring(0,4);
budgetDeclaratio.setYear(year);
budgetDeclaratio.setState("3");
budgetDeclaratio.setDtype("1");
if (budgetDeclaratio.getNumber().contains("_加")) {
......@@ -253,12 +299,13 @@ public class PoDeptService extends BaseService<PoDept>{
}
budgetDeclaratio.setPhone(null);
sqlManager.insert(BudgetDeclaratio.class, budgetDeclaratio);
//BudgtType ty = budgtTypeService.queryById(budget.getType());
//bu.setReplyQuota(budget.getBudget());
if (bas!=null) {
//根据项目类型和名称获取项目信息
BudgtBase budgtBase=budgtBaseService.getBase(bas.getTypeId(),budgetDeclaratio.getName());
bu.setRange(budgtBase.getRange());//这个是把项目的预算范围放入预算种
//BudgtBase budgtBase=budgtBaseService.getBase(bas.getTypeId(),budgetDeclaratio.getName());
bu.setRange(bas.getRange());//这个是把项目的预算范围放入预算种
// bu.setRange(ty.getOrgName());//这个是预算类型的预算范围放入预算种后期儿童的用这个
bu.setTypeId(bas.getTypeId());
......@@ -284,6 +331,17 @@ public class PoDeptService extends BaseService<PoDept>{
budgetVerification.setImplementTime(new Date());
budgetVerification.setUserId(user.getId().intValue());
budgetVerification.setUserName(user.getName());
BudgtType type=new BudgtType();
type.setName(budgetVerification.getType());
BudgtType ty = sqlManager.templateOne(type);
budgetVerification.setType(ty.getId().toString());
if (budgetVerification.getChargeOff()==null) {
budgetVerification.setChargeOff(new BigDecimal("0"));
}
if (budgetVerification.getExecute()==null) {
budgetVerification.setExecute(new BigDecimal("0"));
}
// CoreOrg org = recordService.getOrg(user.getOrgId());
CoreOrg t=new CoreOrg();
t.setCode(budgetVerification.getDeptId());
......@@ -293,27 +351,30 @@ public class PoDeptService extends BaseService<PoDept>{
Budget bu = sqlManager.templateOne(budget);
if (bu!=null) {
budgetVerification.setBudgetId(bu.getId());
budgetVerification.setType(bu.getTypeId().toString());
}else {
continue;
}
//budgetDeclaratio.setDeptName(org.getName());
budgetVerification.setDeptId(org.getId().toString());
budgetVerification.setDeptName(org.getName());
budgetVerification.setType("1");
budgetVerification.setState("3");
sqlManager.insert(BudgetVerification.class, budgetVerification);
// budgetVerificationService.save(budgetVerification);
// Budget budget = budgetService.queryById(budgetVerification.getBudgetId());
if (bu!=null) {
/* if (bu!=null) {
BigDecimal replyQuota=bu.getReplyQuota();
if (budgetVerification.getChargeOff()!=null) {
replyQuota=replyQuota.subtract(budgetVerification.getChargeOff());
budget.setReplyQuota(replyQuota);
sqlManager.updateTemplateById(Budget.class, budget);
bu.setReplyQuota(replyQuota);
sqlManager.updateTemplateById(Budget.class, bu);
}
}
}*/
sqlManager.insert(BudgetVerification.class, budgetVerification);
}
}
......
src/main/resources/excelTemplates/po/budget_declaratio.xml
......@@ -15,6 +15,7 @@
<mapping row="3" col="6">info.createTime</mapping>
<mapping row="3" col="7">info.year</mapping>
<mapping row="3" col="8">info.type</mapping>
<mapping row="3" col="9">info.quantity</mapping>
</section>
<loopbreakcondition>
<rowcheck offset="0">
......
src/main/resources/excelTemplates/po/budget_verification.xml
......@@ -14,6 +14,7 @@
<mapping row="3" col="5">info.auditTime</mapping>
<mapping row="3" col="6">info.remaks</mapping>
<mapping row="3" col="7">info.implementMatter</mapping>
<mapping row="3" col="7">info.state</mapping>
</section>
<loopbreakcondition>
<rowcheck offset="0">
......
src/main/resources/static/js/dubget/budget/hxindex.js
......@@ -46,11 +46,19 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'budget',
title : '预算金额',
templet:function(d){
var a=parseInt(d.budget);
return a.toLocaleString();
},
},
{
field : 'replyQuota',
title : '可执行额度',
templet:function(d){
var a=parseInt(d.replyQuota);
return a.toLocaleString();
},
},
{
......
src/main/resources/static/js/dubget/budget/index.js
......@@ -42,11 +42,19 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'budget',
title : '预算金额',
templet:function(d){
var a=parseInt(d.budget);
return a.toLocaleString();
},
},
{
field : 'replyQuota',
title : '可行额度',
templet:function(d){
var a=parseInt(d.replyQuota);
return a.toLocaleString();
},
},
{
......@@ -54,7 +62,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
title : '已执行额度',
templet: function (d) {
return d.budget-d.replyQuota
return (d.budget-d.replyQuota).toLocaleString();
}
},
......
src/main/resources/static/js/dubget/budgetDeclaratio/cwcindex.js
......@@ -51,6 +51,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'budget',
title : '预算金额',
templet:function(d){
var a=parseInt(d.budget);
return a.toLocaleString();
},
},
{
......@@ -120,14 +124,14 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
if(obj.event === 'view'){
var url = "/dubget/budgetDeclaratio/view.do?id="+data.id;
Common.openDlg(url,"预算>"+data.type+">查看");
Common.openDlg(url,"预算>"+data.number+">查看");
}else if(obj.event === 'edit'){
var url = "/dubget/budgetDeclaratio/reply.do?type=2&id="+data.id;
if (data.type=="") {
alert("无预算类型")
}else{
Common.openDlg(url,"预算>"+data.type+">批复");
Common.openDlg(url,"预算>"+data.number+">批复");
}
......
src/main/resources/static/js/dubget/budgetDeclaratio/index.js
......@@ -47,6 +47,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'budget',
title : '预算金额',
templet:function(d){
var a=parseInt(d.budget);
return a.toLocaleString();
},
},
......@@ -124,10 +128,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
if(obj.event === 'dit'){
var url = "/dubget/budgetDeclaratio/edit.do?id="+data.id;
Common.openDlg(url,"预算>"+data.type+">编辑");
Common.openDlg(url,"预算>"+data.number+">编辑");
} else if (obj.event === 'view') {
var url = "/dubget/budgetDeclaratio/view.do?id="+data.id;
Common.openDlg(url,"预算>"+data.type+">查看");
Common.openDlg(url,"预算>"+data.number+">查看");
}else if(obj.event === 'instList'){
layer.open({
type: 2,
......
src/main/resources/static/js/dubget/budgetDeclaratio/indexZJ.js
......@@ -47,6 +47,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'budget',
title : '预算金额',
templet:function(d){
var a=parseInt(d.budget);
return a.toLocaleString();
},
},
......@@ -125,11 +129,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
if(obj.event === 'dit'){
var url = "/dubget/budgetDeclaratio/edit.do?id="+data.id;
Common.openDlg(url,"预算>"+data.type+">编辑");
Common.openDlg(url,"预算>"+data.number+">编辑");
} else if (obj.event === 'view') {
var url = "/dubget/budgetDeclaratio/view.do?id="+data.id;
Common.openDlg(url,"预算>"+data.type+">查看");
Common.openDlg(url,"预算>"+data.number+">查看");
}else if(obj.event === 'instList'){
layer.open({
type: 2,
......
src/main/resources/static/js/dubget/budgetDeclaratio/tjindex.js
......@@ -90,6 +90,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
field : 'budget',
title : '预算金额',
templet:function(d){
var a=parseInt(d.budget);
return a.toLocaleString();
},
},
{
field : 'estimate',
......
src/main/resources/static/js/dubget/budgetDeclaratio/xgedit.js
......@@ -11,6 +11,10 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
//编辑修改按钮
$("#updateButton").click(function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
debugger;
if (!$("#range").val()) {
return alert("请选择预算范围")
}
$.post("/dubget/budgetDeclaratio/xgupdate.json",{id:$("#id").val(),type:$("#type").val(),range:$("#range").val()},function(result){
//debugger;
Common.info(result.data);
......
src/main/resources/static/js/dubget/budgetDeclaratio/xgindex.js
......@@ -29,6 +29,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
},
{
field : 'deptName',
title : '科室名称',
},
{
field : 'number',
title : '预算编号',
},
......@@ -37,11 +42,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'typename',
title : '预算类型',
},
{
field : 'deptName',
title : '科室名称',
},
{
field : 'name',
......@@ -51,6 +52,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'budget',
title : '预算金额',
templet:function(d){
var a=parseInt(d.budget);
return a.toLocaleString();
},
},
{
......
src/main/resources/static/js/dubget/budgetDeclaratio/yldindex.js
......@@ -51,6 +51,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'budget',
title : '预算金额',
templet:function(d){
var a=parseInt(d.budget);
return a.toLocaleString();
},
},
{
......
src/main/resources/static/js/dubget/budgetVerification/audit.js
......@@ -28,7 +28,7 @@ layui.define([ 'form', 'laydate', 'table','budgetVerificationApi'], function(exp
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetVerificationApi.hxupdateBudgetVerification($('#updateForm'),function(){
parent.window.dataReload();
Common.info("核销成功");
Common.info("退回成功");
Lib.closeFrame();
});
});
......
src/main/resources/static/js/dubget/budgetVerification/index.js
......@@ -46,11 +46,19 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'execute',
title : '执行金额',
templet:function(d){
var a=parseInt(d.execute);
return a.toLocaleString();
},
},
{
field : 'chargeOff',
title : '核销金额',
templet:function(d){
var a=parseInt(d.chargeOff);
return a.toLocaleString();
},
},
{
......
src/main/resources/static/js/dubget/budgetVerification/tjindex.js
......@@ -45,16 +45,28 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'execute',
title : '执行金额',
templet:function(d){
var a=parseInt(d.execute);
return a.toLocaleString();
},
},
{
field : 'chargeOff',
title : '核销金额',
templet:function(d){
var a=parseInt(d.chargeOff);
return a.toLocaleString();
},
},
{
field : 'replyQuota',
title : '剩余可执行金额',
templet:function(d){
var a=parseInt(d.replyQuota);
return a.toLocaleString();
},
},
{
......
src/main/resources/static/js/dubget/budgetVerification/viewindex.js
......@@ -45,11 +45,19 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'execute',
title : '执行金额',
templet:function(d){
var a=parseInt(d.execute);
return a.toLocaleString();
},
},
{
field : 'chargeOff',
title : '核销金额',
templet:function(d){
var a=parseInt(d.chargeOff);
return a.toLocaleString();
},
},
{
......
src/main/resources/static/js/dubget/budgetVerification/yldindex.js
......@@ -45,11 +45,19 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'execute',
title : '执行金额',
templet:function(d){
var a=parseInt(d.execute);
return a.toLocaleString();
},
},
{
field : 'chargeOff',
title : '核销金额',
templet:function(d){
var a=parseInt(d.chargeOff);
return a.toLocaleString();
},
},
{
......
src/main/resources/static/js/re/record/index.js
......@@ -93,7 +93,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
if(obj.event === 'view'){
debugger;
var url = data.url+"?record="+data.id;
Common.openDlg(url,"记录>"+data.type+">查看");
Common.openDlg(url,"记录>操作记录>查看");
}
})
},
......
src/main/resources/templates/dubget/budgetDeclaratio/add.html
......@@ -62,7 +62,7 @@
<div class="layui-inline">
<label class="layui-form-label">年度</label>
<div class="layui-input-inline">
<input type="text" id="year" name="year" class="layui-input" >
<input type="text" id="year" name="year" class="layui-input" readonly="readonly" >
</div>
</div>
<div class="layui-inline">
......@@ -92,11 +92,14 @@ layui.use(['add','laydate'], function(){
var laydate = layui.laydate;
//执行一个laydate实例
laydate.render({
/* laydate.render({
elem: '#year' //指定元素
,type:'year'
,trigger: 'click' //采用click弹出
});
}); */
var date = new Date();
var year = date.getFullYear();
$("#year").val(year+1)
var oTxt = document.getElementById('graduateCollege');
var oList = document.getElementById('list');
......@@ -203,5 +206,8 @@ layui.use(['add','laydate'], function(){
var budgetDeclaratioAdd = layui.add
budgetDeclaratioAdd.init();
});
</script>
src/main/resources/templates/dubget/budgetDeclaratio/addZJ.html
......@@ -63,7 +63,7 @@
<label class="layui-form-label">年度</label>
<div class="layui-input-inline">
<input type="text" id="year" name="year" class="layui-input" >
<input type="text" id="year" name="year" class="layui-input" readonly="readonly" >
</div>
</div>
</div>
......@@ -86,11 +86,14 @@ layui.use(['addZJ','laydate'], function(){
var laydate = layui.laydate;
//执行一个laydate实例
laydate.render({
/* laydate.render({
elem: '#year' //指定元素
,type:'year'
,trigger: 'click' //采用click弹出
});
}); */
var date = new Date();
var year = date.getFullYear();
$("#year").val(year)
var oTxt = document.getElementById('graduateCollege');
var oList = document.getElementById('list');
......
src/main/resources/templates/dubget/budgetDeclaratio/edit.html
......@@ -51,7 +51,7 @@
<div class="layui-inline">
<label class="layui-form-label">年度</label>
<div class="layui-input-inline">
<input type="text" id="year" name="year" value="${budgetDeclaratio.year}" class="layui-input" >
<input type="text" id="year" name="year" value="${budgetDeclaratio.year}" readonly="readonly" >
</div>
</div>
</div>
......
src/main/resources/templates/dubget/budgetVerification/add.html
......@@ -22,7 +22,7 @@
<input type="text" id="execute" name="execute" class="layui-input" >
</div>
<div class="layui-inline">
<input autocomplete="off" class="layui-input" value="不超过${budget.replyQuota}" style="border: 0;color: red; " >
<input autocomplete="off" id="aa" class="layui-input" value="" style="border: 0;color: red; " >
</div>
</div>
</div>
......@@ -54,6 +54,8 @@ layui.use(['add'], function(){
var budgetVerificationAdd = layui.add
budgetVerificationAdd.init();
$("#aa").val("不超过"+parseInt("${budget.replyQuota}").toLocaleString());
//输入框的值改变时触发
$("#execute").on("input",function(e){
if(parseInt(e.delegateTarget.value)>parseInt("${budget.replyQuota}")){
......
src/main/resources/templates/dubget/budgetVerification/edit.html
......@@ -21,7 +21,7 @@
<input type="text" id="execute" name="execute" value="${budgetVerification.execute}" class="layui-input" >
</div>
<div class="layui-inline">
<input autocomplete="off" class="layui-input" value="不超过${budget.replyQuota+budgetVerification.execute}" style="border: 0;color: red; " >
<input autocomplete="off" id="aa" class="layui-input" value="" style="border: 0;color: red; " >
</div>
</div>
</div>
......@@ -46,6 +46,7 @@
<script>
layui.use(['edit'], function(){
var budgetVerificationEdit = layui.edit
$("#aa").val("不超过"+parseInt("${budget.replyQuota+budgetVerification.execute}").toLocaleString());
budgetVerificationEdit.init();
});
</script>
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