Merge branch 'master' of http://39.106.223.11/462269006/cyyy

src/main/java/com/corp/cyyy/dubget/web/BudgetVerificationController.java

@@ -90,6 +90,19 @@ public class BudgetVerificationController{
         
         return view;
     }
+    @GetMapping(MODEL + "/tjindex.do")
+    @Function("budgetVerification.query")
+    @ResponseBody
+    public ModelAndView tjindex(Integer budgetId) {
+        ModelAndView view = new ModelAndView("/dubget/budgetVerification/tjindex.html") ;
+        view.addObject("search", BudgetVerificationQuery.class.getName());
+        view.addObject("budgetId", budgetId);
+
+        
+        return view;
+    }
+    
+    
     @GetMapping(MODEL + "/yldindex.do")
     @Function("budgetVerification.query")
     @ResponseBody
@@ -177,7 +190,24 @@ public class BudgetVerificationController{
         budgetVerificationService.queryByCondition(page);
         return JsonResult.success(page);
     }
+    /* ajax json */
 
+    @PostMapping(MODEL + "/tjlist.json")
+    @Function("budgetVerification.query")
+    @ResponseBody
+    public JsonResult<PageQuery> tjlist(BudgetVerificationQuery condtion)
+    {
+    	CoreUser user = paltformService.getCurrentUser();
+    	CoreRole role = paltformService.getRoleOfUser(user.getId());
+    	CoreOrg org = recordService.getOrg(user.getOrgId());
+    	if (role.getId().intValue()!=204) {
+    		condtion.setOrgId(org.getId().toString());
+		}
+        PageQuery page = condtion.getPageQuery();
+       
+        budgetVerificationService.queryByCondition(page);
+        return JsonResult.success(page);
+    }
     @SuppressWarnings({ "static-access", "rawtypes" })
 	@PostMapping(MODEL + "/add.json")
     @Function("budgetVerification.add")
@@ -391,5 +421,40 @@ public class BudgetVerificationController{
 		}
         return  "成功";
     }
+    
+    @PostMapping(MODEL + "/excel/export.json")
+    @Function("budgetDeclaratio.export")
+    @ResponseBody
+    public JsonResult<String> export(HttpServletResponse response,BudgetVerificationQuery condtion) {
+        /**
+         * 1)需要用你自己编写一个的excel模板
+         * 2)通常excel导出需要关联更多数据，因此budgetDeclaratioService.queryByCondition方法经常不符合需求，需要重写一个为模板导出的查询
+         * 3)参考ConsoleDictController来实现模板导入导出
+         */
+        String excelTemplate ="excelTemplates/dubget/申报执行导出.xls";
+        PageQuery<BudgetDeclaratio> page = condtion.getPageQuery();
+        //取出全部符合条件的
+        page.setPageSize(Integer.MAX_VALUE);
+        page.setPageNumber(1);
+        page.setTotalRow(Integer.MAX_VALUE);
+        //本次导出需要的数据
+       List<BudgetVerification> list = budgetVerificationService.queryByCondition(page).getList();
+        try(InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) {
+            if(is==null) {
+                throw new PlatformException("模板资源不存在："+excelTemplate);
+            }
+            FileItem item = fileService.createFileTemp("统计_"+DateUtil.now("yyyyMMddHHmmss")+".xls");
+            OutputStream os = item.openOutpuStream();
+            Context context = new Context();
+            context.putVar("list", list);
+            JxlsHelper.getInstance().processTemplate(is, os, context);
+            os.close();
+            //下载参考FileSystemContorller
+            return  JsonResult.success(item.getPath());
+        } catch (IOException e) {
+            throw new PlatformException(e.getMessage());
+        }
+        
+    }
 
 }

src/main/java/com/corp/cyyy/dubget/web/query/BudgetVerificationQuery.java

@@ -14,7 +14,19 @@ public class BudgetVerificationQuery extends PageParam {
 	private String deptName;
     @Query(type=Query.TYPE_DICT,name="类型",dict = "OAtype", display = true)
     private String type;
-    private String orgId;
+    @Query(type=Query.TYPE_DICT,name="进度",dict = "zxtype", display = true)
+    private String state;
+    public String getState() {
+		return state;
+	}
+
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+
+	private String orgId;
 	
     public String getOrgId() {
 		return orgId;

src/main/resources/sql/dubget/budgetVerification.md

@@ -25,6 +25,9 @@ queryByCondition
      @if(!isEmpty(orgId)){
         and  t.DEPT_ID = #orgId#
     @}
+    @if(!isEmpty(state)){
+        and  t.state = #state#
+    @}
     ORDER BY t.IMPLEMENT_TIME DESC
 
 batchDelBudgetVerificationByIds

src/main/resources/static/js/dubget/budgetVerification/budgetVerificationApi.js

@@ -17,6 +17,12 @@ layui.define([], function(exports) {
                 Common.post("/dubget/budgetVerification/delete.json",{"ids":ids},function(){
                     callback();
                 })
+            } ,
+            exportExcel:function(form,callback){
+                var formPara = form.serializeJson();
+                Common.post("/dubget/budgetVerification/excel/export.json", formPara, function(fileId) {
+                    callback(fileId);
+                })
             }
 		
     };

src/main/resources/static/js/dubget/budgetVerification/tjindex.js

+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var budgetVerificationTable = null;
+    var view ={
+        init:function(){
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),budgetVerificationTable)
+            }
+        },
+        initTable:function(){
+        	budgetVerificationTable = table.render({
+      	        elem : '#budgetVerificationTable',
+      	        height : Lib.getTableHeight(1),
+      	        cellMinWidth: 100,
+      	        method : 'post',
+      	        url : Common.ctxPath + '/dubget/budgetVerification/tjlist.json'// 数据接口
+      	        ,page : Lib.tablePage // 开启分页
+      	        ,limit : 10,
+      	        cols : [ [ // 表头
+      	          {
+                      type : 'checkbox',
+                      fixed:'left',
+                  },
+                  {
+
+      	            field : 'deptName', 
+      	                title : '科室名称',
+      	        },
+    	        {
+
+    	            field : 'number', 
+    	                title : '预算编号',
+    	        },
+    	      {
+   	        	 field : 'implementMatter', 
+	                title : '执行事项',
+   	        },
+    	        {
+
+    	            field : 'execute', 
+    	                title : '执行金额',
+    	        },
+    	        {
+
+    	            field : 'chargeOff', 
+    	                title : '核销金额',
+    	        },
+    	      
+    	        {
+
+    	            field : 'stateText', 
+    	                title : '状态',
+    	        },
+      	        {
+      	            title: '操作',
+      	            //rowspan: 2,
+      	            align: 'center',
+      	            fixed: 'right',
+      	            minWidth: '160',
+      	            templet: function (d) {
+      	            		edit='<button type="button" class="layui-btn layui-btn-sm layui-btn-warm" lay-event="view" title="查看">查看</button>';
+
+      	                return edit;
+      	            }
+      	        }
+
+      	] ]
+
+      	});
+      	  table.on('tool(budgetVerificationTable)', function(obj){
+      	      var budget = obj.data;
+      	      if(obj.event === 'dit'){  
+      	          var url = "/dubget/budgetVerification/audit.do?id="+budget.id;
+      	          Common.openDlg(url,"执行管理>编辑");
+      	      }else if(obj.event === 'view'){
+      	        var url = "/dubget/budgetVerification/view.do?id="+budget.id;
+  	          Common.openDlg(url,"执行管理>编辑");
+      	      }
+      	  })
+      },
+
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),budgetVerificationTable,form);
+        },
+        initToolBar:function(){
+            toolbar = {
+                add : function() { // 获取选中数据
+                var checkStatus = table.checkStatus('budgetVerificationTable'),
+                data = checkStatus.data;
+                    var myCars = new Array();
+                    for (var i = 0; i < data.length; i++) {
+                    	myCars[i]=data[i].id;
+    				}
+                    $.post(Common.ctxPath + '/dubget/budget/Onekey.json',{ids:myCars.toString()},function(result){
+                 	   parent.window.dataReload();
+                        Common.info("保存成功");
+                        budgetVerificationTable.reload({});
+                 	  });   
+                },
+                edit : function() { // 获取选中数目
+                    var data = Common.getOneFromTable(table,"budgetVerificationTable");
+                    if(data==null){
+                        return ;
+                    }
+                    var url = "/dubget/budgetVerification/edit.do?id="+data.id;
+                    Common.openDlg(url,"执行子表管理>"+data.id+">编辑");
+                },
+                del : function() {
+                    layui.use(['del'], function(){
+                        var delView = layui.del
+                        delView.delBatch();
+                    });
+                },
+                exportDocument : function() {
+                    layui.use([ 'budgetVerificationApi' ], function() {
+                        var budgetVerificationApi = layui.budgetVerificationApi
+                        Common.openConfirm("确认要导出这些预算申报数据?", function() {
+                        	budgetVerificationApi.exportExcel($("#searchForm"), function(fileId) {
+                                Lib.download(fileId);
+                            })
+                        })
+                    });
+                }
+        };
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+        }
+    }
+    exports('tjindex',view);
+
+});
\ No newline at end of file

src/main/resources/templates/dubget/budgetVerification/tjindex.html

+<!--#layout("/common/layout.html",{"jsBase":"/js/dubget/budgetVerification/"}){ -->
+<layui:searchForm formId="searchForm"  condition="${search}">
+</layui:searchForm>
+<input type="hidden" id="budgetId"  name="budgetId"  class="layui-input" value="${budgetId}">
+
+     <layui:accessButton function="budgetVerification.exportDocument"  action="exportDocument">导出全部</layui:accessButton>
+
+
+<table id="budgetVerificationTable" lay-filter="budgetVerificationTable"></table>
+<!--#} -->
+<script>
+
+layui.use(['tjindex'], function(){
+    var index = layui.tjindex
+    index.init();
+});
+
+</script>