Skip to content

C
cyyy
Commit b6bca563 by zhangfeng
Options

代码提交

parent ab655dc2
Showing with 2584 additions and 240 deletions
.classpath
......@@ -21,6 +21,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
......
.project
......@@ -16,14 +16,22 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
.settings/.jsdtscope 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="src/main/webapp"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
</classpath>
.settings/org.eclipse.wst.common.component 0 → 100644
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="cyyy-0.0.1-SNAPSHOT">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="spk-platform-core-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/spk-platform-core/spk-platform-core">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="spk-platform-console-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/spk-platform-console/spk-platform-console">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="spk-platform-workflow-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/spk-platform-workflow/spk-platform-workflow">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="cyyy"/>
<property name="java-output-path" value="/cyyy/target/classes"/>
</wb-module>
</project-modules>
.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 0 → 100644
<root>
<facet id="jst.jaxrs">
<node name="libprov">
<attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
</node>
</facet>
</root>
.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.8"/>
<installed facet="jst.web" version="3.1"/>
<installed facet="jst.jaxrs" version="1.1"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>
.settings/org.eclipse.wst.jsdt.ui.superType.container 0 → 100644
org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
.settings/org.eclipse.wst.jsdt.ui.superType.name 0 → 100644
Window
\ No newline at end of file
.settings/org.eclipse.wst.validation.prefs 0 → 100644
disabled=06target
eclipse.preferences.version=1
pom.xml
......@@ -4,6 +4,7 @@
<groupId>com.corp</groupId>
<artifactId>cyyy</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......@@ -71,6 +72,12 @@
<artifactId>xstream</artifactId>
<version>1.4.10</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
<version>3.2.4</version>
</dependency>
<!-- lombok -->
<!-- <dependency>
<groupId>org.projectlombok</groupId>
......
src/main/java/com/corp/cyyy/dubget/entity/BudgetDeclaratio.java
......@@ -78,7 +78,7 @@ public class BudgetDeclaratio extends BaseEntity{
//批复意见
private String replyOpinion;
//状态
@Dict(type="YS_STATE")
@Dict(type="YS_STATE")
private String state ;
//年度
......@@ -111,7 +111,9 @@ public class BudgetDeclaratio extends BaseEntity{
//临时字段
private String opinionId ;
private String phone;
private String budetType;
//资金范围
@Dict(type="capitalType")
private Integer budetType;
private String replyId;
private String contacts;
private String userId;
......@@ -149,11 +151,11 @@ public class BudgetDeclaratio extends BaseEntity{
this.userId = userId;
}
public String getBudetType() {
public Integer getBudetType() {
return budetType;
}
public void setBudetType(String budetType) {
public void setBudetType(Integer budetType) {
this.budetType = budetType;
}
......@@ -345,13 +347,13 @@ public class BudgetDeclaratio extends BaseEntity{
this.quantity = quantity;
}
/**预算单价
/**预算金额
*@return
*/
public BigDecimal getBudget(){
return budget;
}
/**预算单价
/**预算金额
*@param budget
*/
public void setBudget(BigDecimal budget){
......@@ -444,6 +446,4 @@ public class BudgetDeclaratio extends BaseEntity{
public void setOpinion(String opinion){
this.opinion = opinion;
}
}
src/main/java/com/corp/cyyy/dubget/entity/BudgtBase.java
......@@ -60,7 +60,19 @@ public class BudgtBase extends BaseEntity{
private Date updateTime ;
//拼音
private String pinyin ;
public BudgtBase()
//预算范围
private String range;
public String getRange() {
return range;
}
public void setRange(String range) {
this.range = range;
}
public BudgtBase()
{
}
......
src/main/java/com/corp/cyyy/dubget/entity/BudgtType.java
......@@ -56,7 +56,8 @@ public class BudgtType extends BaseEntity{
//预算类型
private String type ;
//父级编码
private String parentId ;
//信息创建时间
private Date createTime ;
......@@ -69,7 +70,15 @@ public class BudgtType extends BaseEntity{
{
}
public String getOrgName() {
public String getParentId() {
return parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
public String getOrgName() {
return orgName;
}
......
src/main/java/com/corp/cyyy/dubget/service/BudgtBaseService.java
......@@ -2,6 +2,7 @@ package com.corp.cyyy.dubget.service;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -46,4 +47,14 @@ public class BudgtBaseService extends BaseService<BudgtBase>{
// TODO Auto-generated method stub
return budgtBaseDao.gethanzi( name);
}
public BudgtBase getBase(Integer id, String name) {
BudgtBase base=null;
if (id!=null&&StringUtils.isNotEmpty(name)) {
base = sqlManager.query(BudgtBase.class).andEq("type_id", id).andEq("name", name).single();
}
return base;
}
}
\ No newline at end of file
src/main/java/com/corp/cyyy/dubget/web/BudgetController.java
......@@ -147,6 +147,15 @@ public class BudgetController{
CoreOrg org = recordService.getOrg(user.getOrgId());
condtion.setDeptId(org.getId().toString());
if (StringUtils.isNotEmpty(condtion.getDataTime())) {
String[] Str = condtion.getDataTime().split("至");
if (StringUtils.isNotEmpty(Str[0])) {
condtion.setStaeTime(Str[0]);
}
if (StringUtils.isNotEmpty(Str[1])) {
condtion.setEndTime(Str[1]);
}
}
budgetService.queryByCondition(page);
return JsonResult.success(page);
}
......
src/main/java/com/corp/cyyy/dubget/web/BudgetDeclaratioController.java
......@@ -12,6 +12,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
......@@ -162,6 +163,7 @@ public class BudgetDeclaratioController{
ModelAndView view = new ModelAndView("/dubget/budgetDeclaratio/xgedit.html");
BudgetDeclaratio budgetDeclaratio = budgetDeclaratioService.queryById(id);
PageQuery query=new PageQuery<>();
query.setPageSize(Long.MAX_VALUE);
List<BudgtType> list = budgtTypeService.queryByCondition(query).getList();
view.addObject("budgetDeclaratio", budgetDeclaratio);
view.addObject("list", list);
......@@ -233,9 +235,9 @@ public class BudgetDeclaratioController{
@GetMapping(MODEL + "/addZJ.do")
@Function("budgetDeclaratio.addZJ")
@ResponseBody
public ModelAndView add(String id) {
public ModelAndView addZJ() {
ModelAndView view = new ModelAndView("/dubget/budgetDeclaratio/addZJ.html");
BudgetDeclaratio bu = budgetDeclaratioService.queryById(id);
/* BudgetDeclaratio bu = budgetDeclaratioService.queryById(id);
String n= budgetDeclaratioService.ZJnumer(bu.getYear());
String nu=bu.getNumber().substring(0, bu.getNumber().length()-3)+"加";
......@@ -243,7 +245,16 @@ public class BudgetDeclaratioController{
nu=nu+"0";
}
nu=nu+n;
view.addObject("number", nu);
view.addObject("number", nu);*/
return view;
}
@GetMapping(MODEL + "/addZJ2.do")
@Function("budgetDeclaratio.addZJ2")
@ResponseBody
public ModelAndView addZJ2(String id) {
ModelAndView view = new ModelAndView("/dubget/budgetDeclaratio/addZJ2.html");
BudgetDeclaratio bu = budgetDeclaratioService.queryById(id);
view.addObject("budgetDeclaratio", bu);
return view;
}
/* ajax json */
......@@ -254,6 +265,9 @@ public class BudgetDeclaratioController{
public JsonResult<PageQuery> list(BudgetDeclaratioQuery condtion)
{
CoreUser user = paltformService.getCurrentUser();
if (condtion.getType()!=null&&condtion.getType().equals("xg,")) {
condtion.setType("xg");
}
if (condtion.getType()==null||!condtion.getType().equals("xg")) {
CoreOrg org=recordService.getOrg(user.getOrgId());
......@@ -292,6 +306,43 @@ public class BudgetDeclaratioController{
budgetDeclaratioService.queryByCondition(page);
return JsonResult.success(page);
}
@PostMapping(MODEL + "/hj.json")
@Function("budgetDeclaratio.query")
@ResponseBody
public JsonResult<String> hj(BudgetDeclaratioTJQuery condtion)
{
/* if (condtion.getType()==null||!condtion.getType().equals("xg")) {
CoreUser user = paltformService.getCurrentUser();
CoreOrg org=recordService.getOrg(user.getOrgId());
condtion.setOrgId(org.getId().toString());
}
if (StringUtils.isNotEmpty(condtion.getExamine())) {
if (condtion.getExamine().equals("yld")) {
condtion.setTypeState("'1','2','3'");
}else if (condtion.getExamine().equals("cwc")) {
condtion.setTypeState("'2','3'");
}
}else {
condtion.setTypeState("'-1','0','1','3'");
}*/
CoreUser user = paltformService.getCurrentUser();
CoreRole role = paltformService.getRoleOfUser(user.getId());
if (role.getId().intValue()!=204) {
condtion.setOrgId(user.getOrgId().toString());
}
PageQuery page = condtion.getPageQuery();
page.setPageSize(Long.MAX_VALUE);
List<BudgetDeclaratio> list = budgetDeclaratioService.queryByCondition(page).getList();
BigDecimal sum = new BigDecimal("0");
for (BudgetDeclaratio budgetDeclaratio : list) {
if (budgetDeclaratio.getBudget()!=null) {
sum=budgetDeclaratio.getBudget().add(sum);
}
}
return JsonResult.success(sum.toString());
}
@PostMapping(MODEL + "/tjlist.json")
@Function("budgetDeclaratio.query")
@ResponseBody
......@@ -363,14 +414,51 @@ public class BudgetDeclaratioController{
type= budgtTypeService.queryById(budgetDeclaratio.getType()).getName();
}
//budgetDeclaratio.setNumber(budgetDeclaratioService.getNumber(budgetDeclaratio.getYear(), type, org.getName()));
budgetDeclaratio.setNumber(budgetDeclaratioService.getNumber(budgetDeclaratio.getYear(), type, org.getName())+"加");
budgetDeclaratio.setDeptId(org.getId().toString());
budgetDeclaratio.setDeptName(org.getName());
budgetDeclaratioService.save(budgetDeclaratio);
//保存记录
recordService.add("budget", budgetDeclaratio, user.getName(), user.getId().toString(), user.getName()+"申报", budgetDeclaratio.getId().toString());
recordService.add("budget", budgetDeclaratio, user.getName(), user.getId().toString(), user.getName()+"追加", budgetDeclaratio.getId().toString());
return new JsonResult().success();
}
@PostMapping(MODEL + "/addZJ2.json")
// @Function("budgetDeclaratio.add")
@ResponseBody
public JsonResult addZJ2(@Validated(ValidateConfig.ADD.class)BudgetDeclaratio budgetDeclaratio) throws BadHanyuPinyinOutputFormatCombination
{
CoreUser user = paltformService.getCurrentUser();
CoreOrg org=recordService.getOrg(user.getOrgId());
Pinyin4jUtils pinyin=new Pinyin4jUtils();
budgetDeclaratio.setPinyin(pinyin.toPinYinLowercase(budgetDeclaratio.getName()));
budgetDeclaratio.setUser(user.getName());
BudgetDeclaratio dee = budgetDeclaratioService.queryById(budgetDeclaratio.getId());
dee.setName(budgetDeclaratio.getName());
dee.setType(budgetDeclaratio.getType());
dee.setBudget(dee.getBudget().add(budgetDeclaratio.getBudget()));
dee.setState("2");
//budgetDeclaratio.setUserId(user.getId().toString());
//budgetDeclaratio.setCreateTime(new Date());
/* String type=null;
if (StringUtils.isNotEmpty(budgetDeclaratio.getType())) {
type= budgtTypeService.queryById(budgetDeclaratio.getType()).getName();
}
//budgetDeclaratio.setNumber(budgetDeclaratioService.getNumber(budgetDeclaratio.getYear(), type, org.getName()));
budgetDeclaratio.setDeptId(org.getId().toString());
budgetDeclaratio.setDeptName(org.getName());*/
budgetDeclaratioService.updateTemplate(dee);
//保存记录
recordService.add("budget", budgetDeclaratio, user.getName(), user.getId().toString(), user.getName()+"追加", budgetDeclaratio.getId().toString());
//更新预算执行
Budget budgt = budgtService.queryByNumer(dee.getNumber());
if (budgt!=null) {
budgt.setBudget(budgt.getBudget().add(budgetDeclaratio.getBudget()));
budgt.setReplyQuota(budgt.getReplyQuota().add(budgetDeclaratio.getBudget()));
budgtService.updateTemplate(budgt);
}
return new JsonResult().success();
}
@PostMapping(MODEL + "/update.json")
@Function("budgetDeclaratio.update")
@ResponseBody
......@@ -424,6 +512,7 @@ public class BudgetDeclaratioController{
}
if (budgetDeclaratio.getState().equals("3")) {
BudgetDeclaratio budget = budgetDeclaratioService.queryById(budgetDeclaratio.getId());
Budget bu=new Budget();
bu.setBudget(budget.getBudget());
bu.setCreateTime(new Date());
......@@ -435,13 +524,17 @@ public class BudgetDeclaratioController{
bu.setNumber(budget.getNumber());
bu.setQuantity(budget.getQuantity());
BudgtType ty = budgtTypeService.queryById(budget.getType());
bu.setRange(ty.getOrgName());
//根据项目类型和名称获取项目信息
BudgtBase budgtBase=budgtBaseService.getBase(ty.getId(),budgetDeclaratio.getName());
bu.setRange(budgtBase.getRange());//这个是把项目的预算范围放入预算种
// bu.setRange(ty.getOrgName());//这个是预算类型的预算范围放入预算种后期儿童的用这个
bu.setReplyQuota(budget.getBudget());
bu.setTypeId(ty.getId());
bu.setTypeName(ty.getName());
budgtService.save(bu);
OaOrg oaorg = oaOrgService.queryByOrgId(bu.getDeptId());
XstreamTest.beanToXml(bu,ty,budgetDeclaratio,oaorg);
String oa=XstreamTest.beanToXml(bu,ty,budgetDeclaratio,oaorg);
//保存记录
recordService.add("budget", budgetDeclaratio, user.getName(), user.getId().toString(), user.getName()+"批复", budgetDeclaratio.getId().toString());
......@@ -457,7 +550,7 @@ public class BudgetDeclaratioController{
@PostMapping(MODEL + "/xgupdate.json")
@Function("budgetDeclaratio.xgupdate")
@ResponseBody
public JsonResult<String> xgupdate(Integer id,Integer type) throws BadHanyuPinyinOutputFormatCombination {
public JsonResult<String> xgupdate(Integer id,Integer type,String range) throws BadHanyuPinyinOutputFormatCombination {
BudgetDeclaratio budgetDeclaratio = budgetDeclaratioService.queryById( id);
budgetDeclaratio.setType(type.toString());
String str=budgetDeclaratio.getNumber();
......@@ -470,12 +563,13 @@ public class BudgetDeclaratioController{
}
vi=vi+"_"+string;
}
vi= vi.substring(1, vi.length()-1);
vi= vi.substring(1, vi.length());
budgetDeclaratio.setNumber(vi);
BudgtBase base=new BudgtBase();
base.setCreateTime(new Date());
base.setName(budgetDeclaratio.getName());
Pinyin4jUtils pinyin=new Pinyin4jUtils();
base.setRange(range);
//budgetDeclaratio.setPinyin(pinyin.toPinYinLowercase(budgetDeclaratio.getName()));
base.setPinyin(pinyin.toPinYinLowercase(budgetDeclaratio.getName()));
base.setTypeId(type);
......@@ -529,6 +623,7 @@ public class BudgetDeclaratioController{
List<BudgetDeclaratio> list=null;
CoreUser user = paltformService.getCurrentUser();
CoreOrg org = recordService.getOrg(user.getOrgId());
Map<String,BudgetDeclaratio>map=new HashMap<String,BudgetDeclaratio>();
if(StringUtils.isNotEmpty(name)) {
if (check(name)) {
list = budgetDeclaratioService.getpinyin(name,org.getId());
......@@ -548,34 +643,26 @@ public class BudgetDeclaratioController{
}
}
ArrayList<BudgetDeclaratio> arr=new ArrayList<BudgetDeclaratio>();
for (BudgetDeclaratio budgetDeclaratio : list) {
arr.add(budgetDeclaratio);
if (list.size()>0) {
for (BudgetDeclaratio budgetDeclaratio : list) {
map.put(budgetDeclaratio.getName(), budgetDeclaratio);
}
}
if (lists!=null) {
for (BudgtBase budgtBase : lists) {
if (list.size()>0) {
for (BudgetDeclaratio budgetDeclaratio : list) {
if (budgetDeclaratio.getName().equals(budgtBase.getName())) {
break;
}
BudgetDeclaratio ba=new BudgetDeclaratio();
ba.setName(budgtBase.getName());
ba.setType(budgtBase.get("code").toString());
ba.set("typename", budgtBase.get("typename").toString());
arr.add(ba);
}
}else {
BudgetDeclaratio ba=new BudgetDeclaratio();
ba.setName(budgtBase.getName());
ba.setType(budgtBase.get("code").toString());
ba.set("typename", budgtBase.get("typename").toString());
arr.add(ba);
}
}
if (lists.size()>0) {
for (BudgtBase budgtBase : lists) {
BudgetDeclaratio ba=new BudgetDeclaratio();
ba.setName(budgtBase.getName());
ba.setType(budgtBase.get("code").toString());
ba.set("typename", budgtBase.get("typename").toString());
//arr.add(ba);
map.put(ba.getName(), ba);
}
}
for (Entry<String, BudgetDeclaratio> entry : map.entrySet()) {
arr.add(entry.getValue());
// System.out.println("Key = " + entry.getKey() + ", Value = " + entry.getValue());
}
return JsonResult.success(arr);
}
......
src/main/java/com/corp/cyyy/dubget/web/BudgetVerificationController.java
......@@ -13,6 +13,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
......@@ -203,11 +204,50 @@ public class BudgetVerificationController{
if (role.getId().intValue()!=204) {
condtion.setOrgId(org.getId().toString());
}
if (StringUtils.isNotEmpty(condtion.getDataTime())) {
String[] Str = condtion.getDataTime().split("至");
if (StringUtils.isNotEmpty(Str[0])) {
condtion.setStaeTime(Str[0]);
}
if (StringUtils.isNotEmpty(Str[1])) {
condtion.setEndTime(Str[1]);
}
}
PageQuery page = condtion.getPageQuery();
budgetVerificationService.queryByCondition(page);
return JsonResult.success(page);
}
@PostMapping(MODEL + "/hj.json")
@Function("budgetVerification.query")
@ResponseBody
public JsonResult<HashMap> hj(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();
page.setPageSize(Long.MAX_VALUE);
List<BudgetVerification> list = budgetVerificationService.queryByCondition(page).getList();
BigDecimal zx=new BigDecimal("0");
BigDecimal hx=new BigDecimal("0");
for (BudgetVerification budgetVerification : list) {
if (budgetVerification.getExecute()!=null) {
zx=budgetVerification.getExecute().add(zx);
}
if (budgetVerification.getChargeOff()!=null) {
hx=budgetVerification.getChargeOff().add(hx);
}
}
HashMap<String, String> map = new HashMap<>();
map.put("zx", zx.toString());
map.put("hx", hx.toString());
return JsonResult.success(map);
}
@SuppressWarnings({ "static-access", "rawtypes" })
@PostMapping(MODEL + "/add.json")
@Function("budgetVerification.add")
......@@ -350,11 +390,11 @@ public class BudgetVerificationController{
budgetVerificationService.batchDelBudgetVerification(idList);
return new JsonResult().success();
}
@GetMapping(MODEL + "/ExecutionBudge.json")
@PostMapping(MODEL + "/ExecutionBudge.json")
@ResponseBody
public String ExecutionBudge(String strSystemCode,String strParaSrc) throws ParseException {
public String ExecutionBudge(String strSystemCode,String strParaSrc,HttpServletRequest request) throws ParseException {
//strDepartMentCode.get
String resultXml="<?xml version=\"1.0\" encoding=\"GBK\" standalone=\"yes\"?>\r\n" +
/* String resultXml="<?xml version=\"1.0\" encoding=\"GBK\" standalone=\"yes\"?>\r\n" +
"<CASE>\r\n" +
" <ExecutionInfo>\r\n" +
" <BudgetCode>2021_名称_北京市医院管理中心_00</BudgetCode>\r\n" +
......@@ -370,9 +410,20 @@ public class BudgetVerificationController{
" <ReportType></ReportType>\r\n" +
" </ExecutionInfo>\r\n" +
"</CASE>\r\n" +
"";
Bank ban = XstreamTest.xmlToBean(resultXml);
ExecutionInfo info = ban.getExecutionInfo();
"";*/
Map<String, String[]>maps = request.getParameterMap();
for (Map.Entry<String, String[]> entry : maps.entrySet()) {
String cs = entry.getKey() + ":"+Arrays.toString(entry.getValue())+";";
System.out.println(cs);
}
try {
//System.out.println("strSystemCode"+strSystemCode+"----"+"strParaSrc"+strParaSrc);
Bank ban = XstreamTest.xmlToBean(strParaSrc);
ExecutionInfo info = ban.getExecutionInfoList().get(0);
BudgetVerification bv = budgetVerificationService.queryByNumerData(info.getBudgetCode(),info.getExtendData());
boolean fla = false;
Budget budgt = budgtService.queryByNumer(info.getBudgetCode());
......@@ -382,8 +433,49 @@ public class BudgetVerificationController{
bv.setExecute(bp);
BigDecimal zo = budgt.getReplyQuota().subtract(bp);
budgt.setReplyQuota(zo);
if (StringUtils.isNotEmpty(info.getReportState())) {
if (info.getReportState().equals("提交")) {
bv.setState("1");
}else if(info.getReportState().equals("完成")){
bv.setState("2");
}else if(info.getReportState().equals("终止")){
bv.setState("4");
}
}else {
bv.setState("-2");
}
fla=true;
}else {
if (StringUtils.isNotEmpty(info.getReportState())) {
if (info.getReportState().equals("提交")) {
budgt.setReplyQuota(budgt.getReplyQuota().add(bv.getExecute())); ;
BigDecimal bp = new BigDecimal(info.getExecutionFee());
bv.setExecute(bp);
BigDecimal zo = budgt.getReplyQuota().subtract(bp);
budgt.setReplyQuota(zo);
bv.setState("1");
}else if(info.getReportState().equals("完成")){
budgt.setReplyQuota(budgt.getReplyQuota().add(bv.getExecute())); ;
BigDecimal bp = new BigDecimal(info.getExecutionFee());
bv.setExecute(bp);
BigDecimal zo = budgt.getReplyQuota().subtract(bp);
budgt.setReplyQuota(zo);
bv.setState("2");
}else if(info.getReportState().equals("终止")){
budgt.setReplyQuota(budgt.getReplyQuota().add(bv.getExecute())); ;
/* BigDecimal bp = new BigDecimal(info.getExecutionFee());
bv.setExecute(bp);
BigDecimal zo = budgt.getReplyQuota().subtract(bp);
budgt.setReplyQuota(zo);*/
// bv.setState("1");
bv.setState("4");
}
}else {
bv.setState("-2");
}
BigDecimal zx = bv.getExecute();
BigDecimal bp = new BigDecimal(info.getExecutionFee());
BigDecimal su = budgt.getReplyQuota().add(zx.subtract(bp));
......@@ -392,34 +484,39 @@ public class BudgetVerificationController{
bv.setExecute(new BigDecimal(info.getExecutionFee()));
}
budgtService.updateTemplate(budgt);
bv.setBudgetId(budgt.getId());
bv.setNumber(info.getBudgetCode());
bv.setExtendData(info.getExtendData());
bv.setImplementMatter(info.getExecutionContent());
bv.setRemaks(info.getRemark());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
bv.setImplementTime(sdf.parse(info.getExecutionTime()));
bv.setUserName(info.getExecutionOper());
String code = info.getRemark();
OaOrg OA = oaOrgService.queryByOaID(code);
bv.setDeptId(OA.getOrgId());
bv.setDeptName(OA.getOrgNam());
bv.setType("2");
//没有联系电话、请示报告编码、报告类型
if (StringUtils.isNotEmpty(info.getReportState())) {
if (info.getReportState().equals("提交")) {
bv.setState("1");
}else if(info.getReportState().equals("完成")){
bv.setState("2");
}else if(info.getReportState().equals("终止")){
bv.setState("4");
}
}else {
bv.setState("-2");
}
OaOrg oaorg = oaOrgService.queryByOaID(info.getRemark());
BudgtType ty = budgtTypeService.queryById(budgt.getTypeId());
BudgetDeclaratio budgetDeclaratio = budgetDeclaratioService.queryById(budgt.getDeclareId());
String st=XstreamTest.beanToXml(budgt,ty,budgetDeclaratio,oaorg);
System.out.println(st);
if (fla) {
budgetVerificationService.save(bv);
}else {
budgetVerificationService.updateTemplate(bv);
}
return "成功";
} catch (Exception e) {
return e.toString();
}
}
@PostMapping(MODEL + "/excel/export.json")
......
src/main/java/com/corp/cyyy/dubget/web/BudgtTypeController.java
......@@ -87,6 +87,10 @@ public class BudgtTypeController{
public ModelAndView edit(Integer id) {
ModelAndView view = new ModelAndView("/dubget/budgtType/edit.html");
BudgtType budgtType = budgtTypeService.queryById(id);
PageQuery query=new PageQuery<>();
query.setPageSize(Long.MAX_VALUE);
List<BudgtType> list = budgtTypeService.queryByCondition(query).getList();
view.addObject("list", list);
view.addObject("budgtType", budgtType);
return view;
}
......@@ -96,6 +100,10 @@ public class BudgtTypeController{
@ResponseBody
public ModelAndView add() {
ModelAndView view = new ModelAndView("/dubget/budgtType/add.html");
PageQuery query=new PageQuery<>();
query.setPageSize(Long.MAX_VALUE);
List<BudgtType> list = budgtTypeService.queryByCondition(query).getList();
view.addObject("list", list);
return view;
}
......
src/main/java/com/corp/cyyy/dubget/web/query/BudgetQuery.java
......@@ -12,7 +12,39 @@ public class BudgetQuery extends PageParam {
private String deptName;
@Query(name = "名称", display = true)
private String name;
private String deptId;
@Query(name = "编码", display = true)
private String numer;
@Query(name = "年度", display = true,type=Query.TYPE_DATE_BETWEEN)
private String dataTime;
private String staeTime;
private String endTime;
public String getNumer() {
return numer;
}
public void setNumer(String numer) {
this.numer = numer;
}
public String getDataTime() {
return dataTime;
}
public void setDataTime(String dataTime) {
this.dataTime = dataTime;
}
public String getStaeTime() {
return staeTime;
}
public void setStaeTime(String staeTime) {
this.staeTime = staeTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
private String deptId;
public String getName() {
return name;
......
src/main/java/com/corp/cyyy/dubget/web/query/BudgetVerificationQuery.java
......@@ -16,7 +16,53 @@ public class BudgetVerificationQuery extends PageParam {
private String type;
@Query(type=Query.TYPE_DICT,name="进度",dict = "zxtype", display = true)
private String state;
public String getState() {
@Query(name = "编号", display = true)
private String nubmer;
@Query(name = "年度", display = true,type=Query.TYPE_DATE_BETWEEN)
private String dataTime;
private String staeTime;
private String endTime;
public String getNubmer() {
return nubmer;
}
public String getDataTime() {
return dataTime;
}
public void setDataTime(String dataTime) {
this.dataTime = dataTime;
}
public String getStaeTime() {
return staeTime;
}
public void setStaeTime(String staeTime) {
this.staeTime = staeTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public void setNubmer(String nubmer) {
this.nubmer = nubmer;
}
public String getState() {
return state;
}
......
src/main/java/com/corp/cyyy/dubget/web/query/BudgtTypeQuery.java
......@@ -8,9 +8,9 @@ import java.util.Date;
*BudgtType查询
*/
public class BudgtTypeQuery extends PageParam {
// @Query(name = "预算名称", display = true)
@Query(name = "预算名称", display = true)
private String name;
@Query(name = "预算类型", display = true)
// @Query(name = "预算类型", display = true)
private String type;
public String getName(){
return name;
......
src/main/java/com/corp/cyyy/po/service/PoDeptService.java
package com.corp.cyyy.po.service;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import org.beetl.sql.core.db.KeyHolder;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -10,11 +13,17 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.spk.admin.core.util.PlatformException;
import com.spk.admin.core.util.UUIDUtil;
import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
import com.corp.cyyy.dubget.entity.Budget;
import com.corp.cyyy.dubget.entity.BudgetDeclaratio;
import com.corp.cyyy.dubget.entity.BudgetVerification;
import com.corp.cyyy.dubget.entity.BudgtBase;
import com.corp.cyyy.dubget.entity.BudgtType;
import com.corp.cyyy.dubget.service.BudgetVerificationService;
import com.corp.cyyy.dubget.service.BudgtBaseService;
import com.corp.cyyy.dubget.service.BudgtTypeService;
import com.corp.cyyy.po.dao.PoDeptDao;
import com.corp.cyyy.po.entity.PoDept;
......@@ -24,6 +33,7 @@ import com.spk.admin.core.entity.BaseEntity;
import com.spk.admin.core.entity.CoreOrg;
import com.spk.admin.core.entity.CoreUser;
import com.spk.admin.core.service.BaseService;
import com.spk.admin.core.service.CorePlatformService;
/**
* PoDept Service
......@@ -35,6 +45,8 @@ public class PoDeptService extends BaseService<PoDept>{
@Autowired
PasswordEncryptService passwordEncryptService;
@Autowired private PoDeptDao poDeptDao;
@Autowired private CorePlatformService paltformService;
@Autowired private BudgtBaseService budgtBaseService;
public PageQuery<PoDept>queryByCondition(PageQuery query){
PageQuery ret = poDeptDao.queryByCondition(query);
queryListAfter(ret.getList());
......@@ -149,7 +161,17 @@ public class PoDeptService extends BaseService<PoDept>{
for (BudgtBase coreOrg : agents) {
BudgtType type = sqlManager.query(BudgtType.class).andEq("code", coreOrg.getSort()).single();
BudgtType type = sqlManager.query(BudgtType.class).andEq("name", coreOrg.getSort()).single();
if (type==null) {
type=new BudgtType();
type.setCode(UUIDUtil.uuid());
type.setName(coreOrg.getSort());
type.setType(coreOrg.getSort());
type.setCreateTime(new Date());
KeyHolder holder=new KeyHolder();
sqlManager.insert(BudgtType.class, type, holder);
type.setId(Integer.valueOf(holder.getKey().toString()));
}
CoreOrg org = sqlManager.query(CoreOrg.class).andEq("name", coreOrg.getOrgName()).single();
BudgtBase base = sqlManager.query(BudgtBase.class).andEq("name", coreOrg.getName()).single();
if (base==null) {
......@@ -189,4 +211,111 @@ public class PoDeptService extends BaseService<PoDept>{
}
public void savaListBudgetDeclaratio(List<BudgetDeclaratio> agents) {
for (BudgetDeclaratio budgetDeclaratio : agents) {
CoreOrg t=new CoreOrg();
t.setCode(budgetDeclaratio.getDeptId());
CoreOrg org = sqlManager.templateOne(t);
budgetDeclaratio.setDeptName(org.getName());
budgetDeclaratio.setDeptId(org.getId().toString());
BudgtBase ba=new BudgtBase();
ba.setName(budgetDeclaratio.getName());
BudgtBase bas = sqlManager.templateOne(ba);
if (bas!=null) {
budgetDeclaratio.setType(bas.getTypeId().toString());
}else {
budgetDeclaratio.setType("");
}
String year = budgetDeclaratio.getYear().substring(0,4);
budgetDeclaratio.setYear(year);
budgetDeclaratio.setState("3");
budgetDeclaratio.setDtype("1");
if (budgetDeclaratio.getNumber().contains("_加")) {
budgetDeclaratio.setDtype("2");
}
BudgetDeclaratio budget = budgetDeclaratio;
Budget bu=new Budget();
bu.setBudget(budget.getBudget());
bu.setCreateTime(new Date());
bu.setDeclareId(budget.getId());
bu.setDeptId(budget.getDeptId());
bu.setDeptName(budget.getDeptName());
bu.setEstimate(budget.getEstimate());
bu.setName(budget.getName());
bu.setNumber(budget.getNumber());
bu.setQuantity(budget.getQuantity());
if (budgetDeclaratio.getPhone()!=null) {
bu.setReplyQuota(new BigDecimal(budgetDeclaratio.getPhone()));
}
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());//这个是把项目的预算范围放入预算种
// bu.setRange(ty.getOrgName());//这个是预算类型的预算范围放入预算种后期儿童的用这个
bu.setTypeId(bas.getTypeId());
BudgtType tu = sqlManager.query(BudgtType.class).andEq("id", bas.getTypeId()).single();
bu.setTypeName(tu.getName());
sqlManager.insert(Budget.class, bu);
}
}
}
public void savaListBudgetVerification(List<BudgetVerification> agents) {
for (BudgetVerification budgetVerification : agents) {
CoreUser user = paltformService.getCurrentUser();
budgetVerification.setImplementTime(new Date());
budgetVerification.setUserId(user.getId().intValue());
budgetVerification.setUserName(user.getName());
// CoreOrg org = recordService.getOrg(user.getOrgId());
CoreOrg t=new CoreOrg();
t.setCode(budgetVerification.getDeptId());
CoreOrg org = sqlManager.templateOne(t);
Budget budget=new Budget();
budget.setNumber(budgetVerification.getNumber());
Budget bu = sqlManager.templateOne(budget);
if (bu!=null) {
budgetVerification.setBudgetId(bu.getId());
}
//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) {
BigDecimal replyQuota=bu.getReplyQuota();
if (budgetVerification.getChargeOff()!=null) {
replyQuota=replyQuota.subtract(budgetVerification.getChargeOff());
budget.setReplyQuota(replyQuota);
sqlManager.updateTemplateById(Budget.class, budget);
}
}
}
}
}
\ No newline at end of file
src/main/java/com/corp/cyyy/po/web/PoDeptController.java
......@@ -46,7 +46,10 @@ import com.spk.admin.core.file.FileService;
import com.spk.admin.core.service.CorePlatformService;
import com.spk.admin.core.web.JsonResult;
import com.spk.admin.core.util.*;
import com.corp.cyyy.dubget.entity.BudgetDeclaratio;
import com.corp.cyyy.dubget.entity.BudgetVerification;
import com.corp.cyyy.dubget.entity.BudgtBase;
import com.corp.cyyy.dubget.service.BudgetVerificationService;
import com.corp.cyyy.po.entity.*;
import com.corp.cyyy.po.service.*;
import com.corp.cyyy.po.web.query.*;
......@@ -279,5 +282,74 @@ public class PoDeptController{
//ins.close();
return JsonResult.success();
}
@PostMapping(MODEL + "/excel/importSB.do")
@Function("poDept.import")
@ResponseBody
public JsonResult importSB(@RequestParam("file") MultipartFile file) throws Exception {
if (file.isEmpty()) {
return JsonResult.fail();
}
InputStream ins = file.getInputStream();
InputStream inputXML = Thread.currentThread().getContextClassLoader()
.getResourceAsStream("excelTemplates/po/budget_declaratio.xml");
XLSReader mainReader = ReaderBuilder.buildFromXML(inputXML);
InputStream inputXLS = ins;
List<BudgetDeclaratio> agents = new ArrayList<BudgetDeclaratio>();
Map beans = new HashMap();
beans.put("list", agents);
ReaderConfig.getInstance().setSkipErrors(true);
XLSReadStatus readStatus = mainReader.read(inputXLS, beans);
List<XLSReadMessage> errors = readStatus.getReadMessages();
//passwordEncryptService.password(user.getPassword())
/*解析模板并导入到数据库里,参考DictConsoleContorller，使用jxls reader读取excel数据*/
if (!errors.isEmpty()) {
StringBuilder sb = new StringBuilder();
for (XLSReadMessage msg : errors) {
// sb.append(parseXLSReadMessage(msg));
sb.append(",");
}
/* sb.setLength(sb.length() - 1);
String s = sb.substring(0, 1);
String b = sb.substring(1, 2);
return JsonResult.failMessage("解析excel出错:第"+b+"行"+"第"+s+"列出错");*/
}
poDeptService.savaListBudgetDeclaratio(agents);
//ins.close();
return JsonResult.success();
}
@PostMapping(MODEL + "/excel/importZX.do")
@Function("poDept.import")
@ResponseBody
public JsonResult importZX(@RequestParam("file") MultipartFile file) throws Exception {
if (file.isEmpty()) {
return JsonResult.fail();
}
InputStream ins = file.getInputStream();
InputStream inputXML = Thread.currentThread().getContextClassLoader()
.getResourceAsStream("excelTemplates/po/budget_verification.xml");
XLSReader mainReader = ReaderBuilder.buildFromXML(inputXML);
InputStream inputXLS = ins;
List<BudgetVerification> agents = new ArrayList<BudgetVerification>();
Map beans = new HashMap();
beans.put("list", agents);
ReaderConfig.getInstance().setSkipErrors(true);
XLSReadStatus readStatus = mainReader.read(inputXLS, beans);
List<XLSReadMessage> errors = readStatus.getReadMessages();
//passwordEncryptService.password(user.getPassword())
/*解析模板并导入到数据库里,参考DictConsoleContorller，使用jxls reader读取excel数据*/
if (!errors.isEmpty()) {
StringBuilder sb = new StringBuilder();
for (XLSReadMessage msg : errors) {
// sb.append(parseXLSReadMessage(msg));
sb.append(",");
}
/* sb.setLength(sb.length() - 1);
String s = sb.substring(0, 1);
String b = sb.substring(1, 2);
return JsonResult.failMessage("解析excel出错:第"+b+"行"+"第"+s+"列出错");*/
}
poDeptService.savaListBudgetVerification(agents);
//ins.close();
return JsonResult.success();
}
}
src/main/java/com/corp/cyyy/re/dao/DowDao.java 0 → 100644
package com.corp.cyyy.re.dao;
import java.util.List;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import com.corp.cyyy.dubget.entity.BudgtType;
import com.corp.cyyy.re.entity.*;
/**
* Dow Dao
*/
@SqlResource("re.dow")
public interface DowDao extends BaseMapper<Dow>{
public PageQuery<Dow> queryByCondition(PageQuery query);
public void batchDelDowByIds( List<Long> ids);
public PageQuery getJB(PageQuery query);
public PageQuery getKS(PageQuery page);
public List<Dow> getParentId(String id);
public List<Dow> getParentId(String id, String org);
}
\ No newline at end of file
src/main/java/com/corp/cyyy/re/entity/Dow.java 0 → 100644
package com.corp.cyyy.re.entity;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Null;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import com.spk.admin.core.util.ValidateConfig;
import org.beetl.sql.core.TailBean;
import java.math.*;
import com.spk.admin.core.annotation.Dict;
import com.spk.admin.core.entity.BaseEntity;
import org.beetl.sql.core.annotatoin.InsertIgnore;
import org.beetl.sql.core.annotatoin.Version;
import org.beetl.sql.core.annotatoin.LogicDelete;
/*
*
* gen by Spring Boot2 Admin 2021-04-12
*/
public class Dow extends BaseEntity{
//主键
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
private Integer id ;
//预算类型id
private String budgtType ;
//名称
private String name ;
//名称
private String customName ;
//排序
private String sotr ;
public Dow()
{
}
public String getCustomName() {
return customName;
}
public void setCustomName(String customName) {
this.customName = customName;
}
/**主键
*@return
*/
public Integer getId(){
return id;
}
/**主键
*@param id
*/
public void setId(Integer id){
this.id = id;
}
/**预算类型id
*@return
*/
public String getBudgtType(){
return budgtType;
}
/**预算类型id
*@param budgtType
*/
public void setBudgtType(String budgtType){
this.budgtType = budgtType;
}
/**名称
*@return
*/
public String getName(){
return name;
}
/**名称
*@param name
*/
public void setName(String name){
this.name = name;
}
/**排序
*@return
*/
public String getSotr(){
return sotr;
}
/**排序
*@param sotr
*/
public void setSotr(String sotr){
this.sotr = sotr;
}
}
src/main/java/com/corp/cyyy/re/service/DowService.java 0 → 100644
package com.corp.cyyy.re.service;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.spk.admin.core.util.PlatformException;
import com.corp.cyyy.dubget.entity.BudgtType;
import com.corp.cyyy.re.dao.DowDao;
import com.corp.cyyy.re.entity.Dow;
import com.corp.cyyy.re.web.query.DowQuery;
import com.spk.admin.core.entity.CoreOrg;
import com.spk.admin.core.service.BaseService;
/**
* Dow Service
*/
@Service
@Transactional
public class DowService extends BaseService<Dow>{
@Autowired private DowDao dowDao;
public PageQuery<Dow>queryByCondition(PageQuery query){
PageQuery ret = dowDao.queryByCondition(query);
queryListAfter(ret.getList());
return ret;
}
public void batchDelDow(List<Long> ids){
try {
dowDao.batchDelDowByIds(ids);
} catch (Exception e) {
throw new PlatformException("批量删除Dow失败", e);
}
}
/**
* 查询全院
* @param query
* @return
*/
public PageQuery<Dow> getJB(PageQuery query) {
PageQuery ret = dowDao.getJB(query);
List<Dow> list = ret.getList();
for (Dow dow : list) {
//
if (dow.get("sun")!=null) {
if (StringUtils.isNotEmpty(dow.get("sun").toString())) {
Double bq = dgDow(Double.valueOf(dow.get("sun").toString()),dow.getBudgtType().toString());
dow.set("sun", bq);
}else {
Double bq = dgDow(0.00,dow.getBudgtType());
dow.set("sun", bq);
}
}else {
Double bq = dgDow(0.00, dow.getBudgtType());
dow.set("sun", bq);
}
if (dow.get("sunb")!=null) {
if (StringUtils.isNotEmpty(dow.get("sunb").toString())) {
Double bq = dgDowZJ(Double.valueOf(dow.get("sunb").toString()), dow.getBudgtType().toString());
dow.set("sunb", bq);
}else {
Double bq = dgDowZJ(0.00, dow.getBudgtType().toString());
dow.set("sunb", bq);
}
}else {
Double bq = dgDowZJ(0.00, dow.getBudgtType().toString());
dow.set("sunb", bq);
}
}
queryListAfter(ret.getList());
return ret;
}
/**
* 全院预算递归查询下级预算类型金额
* @param dow
*/
private Double dgDow(Double dq,String Id) {
//先获取当前的金额
List<Dow>list=dowDao.getParentId(Id);
if (list.size()<1) {
return dq;
}
//先把下级的金额进行累加
for (Dow dow : list) {
if (dow.get("sun")!=null) {
if (StringUtils.isNotEmpty(dow.get("sun").toString())) {
dq = Double.valueOf(dow.get("sun").toString())+dq;
}
}
}
//查看是否还有下级如果有再次调任此方法
for (Dow dow : list) {
dq=dgDow(dq, dow.getId().toString());
}
return dq;
}
/**
*全院追加 递归查询下级预算类型金额
* @param dow
*/
private Double dgDowZJ(Double dq,String Id) {
//先获取当前的金额
List<Dow>list=dowDao.getParentId(Id);
if (list.size()<1) {
return dq;
}
//先把下级的金额进行累加
for (Dow dow : list) {
if (dow.get("sunb")!=null) {
if (StringUtils.isNotEmpty(dow.get("sunb").toString())) {
dq = Double.valueOf(dow.get("sunb").toString())+dq;
}
}
}
//查看是否还有下级如果有再次调任此方法
for (Dow dow : list) {
dq=dgDowZJ(dq, dow.getId().toString());
}
return dq;
}
/**
* 科室遍历
*/
public void getKS() {
CoreOrg org=new CoreOrg();
org.setName("东区");
CoreOrg cor = sqlManager.templateOne(org);
DG(cor, "1");
CoreOrg orgx=new CoreOrg();
orgx.setName("西区");
CoreOrg corx = sqlManager.templateOne(orgx);
DG(corx, "2");
}
/**
* 递归
* @param org
* @param st
*/
public void DG(CoreOrg org,String st) {
org.setFullName(st);
sqlManager.updateTemplateById(CoreOrg.class, org);
List<CoreOrg> list = sqlManager.query(CoreOrg.class).andEq("PARENT_ORG_ID", org.getId()).select();
for (CoreOrg coreOrg : list) {
this.DG(coreOrg, st);
}
}
/**
* 查询科室
* @param page
* @return
*/
public PageQuery getKS(PageQuery page) {
PageQuery ret = dowDao.getKS(page);
List<Dow> list = ret.getList();
DowQuery fp = (DowQuery)page.getParas();
for (Dow dow : list) {
//
if (dow.get("sun")!=null) {
if (StringUtils.isNotEmpty(dow.get("sun").toString())) {
Double bq = dgDow(Double.valueOf(dow.get("sun").toString()),dow.getBudgtType().toString(),fp.getType());
dow.set("sun", bq);
}else {
Double bq = dgDow(0.00,dow.getBudgtType(),fp.getType());
dow.set("sun", bq);
}
}else {
Double bq = dgDow(0.00, dow.getBudgtType(),fp.getType());
dow.set("sun", bq);
}
if (dow.get("sunb")!=null) {
if (StringUtils.isNotEmpty(dow.get("sunb").toString())) {
Double bq = dgDowZJ(Double.valueOf(dow.get("sunb").toString()), dow.getBudgtType().toString(),fp.getType());
dow.set("sunb", bq);
}else {
Double bq = dgDowZJ(0.00, dow.getBudgtType().toString(),fp.getType());
dow.set("sunb", bq);
}
}else {
Double bq = dgDowZJ(0.00, dow.getBudgtType().toString(),fp.getType());
dow.set("sunb", bq);
}
}
queryListAfter(ret.getList());
return ret;
}
/**
* 全院预算递归查询下级预算类型金额
* @param dow
*/
private Double dgDow(Double dq,String Id,String org) {
//先获取当前的金额
List<Dow>list=dowDao.getParentId(Id,org);
if (list.size()<1) {
return dq;
}
//先把下级的金额进行累加
for (Dow dow : list) {
if (dow.get("sun")!=null) {
if (StringUtils.isNotEmpty(dow.get("sun").toString())) {
dq = Double.valueOf(dow.get("sun").toString())+dq;
}
}
}
//查看是否还有下级如果有再次调任此方法
for (Dow dow : list) {
dq=dgDow(dq, dow.getId().toString());
}
return dq;
}
/**
*全院追加 递归查询下级预算类型金额
* @param dow
*/
private Double dgDowZJ(Double dq,String Id,String org) {
//先获取当前的金额
List<Dow>list=dowDao.getParentId(Id,org);
if (list.size()<1) {
return dq;
}
//先把下级的金额进行累加
for (Dow dow : list) {
if (dow.get("sunb")!=null) {
if (StringUtils.isNotEmpty(dow.get("sunb").toString())) {
dq = Double.valueOf(dow.get("sunb").toString())+dq;
}
}
}
//查看是否还有下级如果有再次调任此方法
for (Dow dow : list) {
dq=dgDowZJ(dq, dow.getId().toString(),org);
}
return dq;
}
}
\ No newline at end of file
src/main/java/com/corp/cyyy/re/service/OaOrgService.java
......@@ -41,4 +41,9 @@ public class OaOrgService extends BaseService<OaOrg>{
return sqlManager.query(OaOrg.class).andEq("ORG_ID", deptId).single();
}
public OaOrg queryByOaID(String remark) {
// TODO Auto-generated method stub
return sqlManager.query(OaOrg.class).andEq("OA_CODE", remark).single();
}
}
\ No newline at end of file
src/main/java/com/corp/cyyy/re/web/DowController.java 0 → 100644
package com.corp.cyyy.re.web;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.beetl.sql.core.engine.PageQuery;
import org.jxls.common.Context;
import org.jxls.reader.ReaderBuilder;
import org.jxls.reader.ReaderConfig;
import org.jxls.reader.XLSReadMessage;
import org.jxls.reader.XLSReadStatus;
import org.jxls.reader.XLSReader;
import org.jxls.util.JxlsHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import com.spk.admin.console.web.dto.DictExcelImportData;
import com.spk.admin.console.web.query.UserQuery;
import com.spk.admin.core.annotation.Function;
import com.spk.admin.core.annotation.Query;
import com.spk.admin.core.entity.CoreDict;
import com.spk.admin.core.entity.CoreUser;
import com.spk.admin.core.file.FileItem;
import com.spk.admin.core.file.FileService;
import com.spk.admin.core.web.JsonResult;
import com.spk.admin.core.util.*;
import com.corp.cyyy.dubget.entity.BudgetDeclaratio;
import com.corp.cyyy.dubget.entity.BudgtType;
import com.corp.cyyy.dubget.service.BudgtTypeService;
import com.corp.cyyy.dubget.web.query.BudgetDeclaratioQuery;
import com.corp.cyyy.re.entity.*;
import com.corp.cyyy.re.service.*;
import com.corp.cyyy.re.web.query.*;
/**
* Dow 接口
*/
@Controller
public class DowController{
private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/re/dow";
@Autowired private BudgtTypeService budgtTypeService;
@Autowired private DowService dowService;
@Autowired
FileService fileService;
/* 页面 */
@GetMapping(MODEL + "/index.do")
@Function("dow.query")
@ResponseBody
public ModelAndView index() {
ModelAndView view = new ModelAndView("/re/dow/index.html") ;
view.addObject("search", DowQuery.class.getName());
return view;
}
@GetMapping(MODEL + "/edit.do")
@Function("dow.edit")
@ResponseBody
public ModelAndView edit(Integer id) {
ModelAndView view = new ModelAndView("/re/dow/edit.html");
Dow dow = dowService.queryById(id);
PageQuery query=new PageQuery<>();
query.setPageSize(Long.MAX_VALUE);
List<BudgtType> list = budgtTypeService.queryByCondition(query).getList();
view.addObject("list", list);
view.addObject("dow", dow);
return view;
}
@GetMapping(MODEL + "/add.do")
@Function("dow.add")
@ResponseBody
public ModelAndView add() {
ModelAndView view = new ModelAndView("/re/dow/add.html");
PageQuery query=new PageQuery<>();
query.setPageSize(Long.MAX_VALUE);
List<BudgtType> list = budgtTypeService.queryByCondition(query).getList();
view.addObject("list", list);
return view;
}
/* ajax json */
@PostMapping(MODEL + "/list.json")
@Function("dow.query")
@ResponseBody
public JsonResult<PageQuery> list(DowQuery condtion)
{
PageQuery page = condtion.getPageQuery();
dowService.queryByCondition(page);
return JsonResult.success(page);
}
@PostMapping(MODEL + "/add.json")
@Function("dow.add")
@ResponseBody
public JsonResult add(@Validated(ValidateConfig.ADD.class)Dow dow)
{
dowService.save(dow);
return new JsonResult().success();
}
@PostMapping(MODEL + "/update.json")
@Function("dow.update")
@ResponseBody
public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) Dow dow) {
boolean success = dowService.update(dow);
if (success) {
return new JsonResult().success();
} else {
return JsonResult.failMessage("保存失败");
}
}
@GetMapping(MODEL + "/view.json")
@Function("dow.query")
@ResponseBody
public JsonResult<Dow>queryInfo(Integer id) {
Dow dow = dowService.queryById( id);
return JsonResult.success(dow);
}
@PostMapping(MODEL + "/delete.json")
@Function("dow.delete")
@ResponseBody
public JsonResult delete(String ids) {
if (ids.endsWith(",")) {
ids = StringUtils.substringBeforeLast(ids, ",");
}
List<Long> idList = ConvertUtil.str2longs(ids);
dowService.batchDelDow(idList);
return new JsonResult().success();
}
@PostMapping(MODEL + "/excel/export.json")
@Function("budgetDeclaratio.export")
@ResponseBody
public JsonResult<String> export(HttpServletResponse response,DowQuery condtion) {
/**
* 1)需要用你自己编写一个的excel模板
* 2)通常excel导出需要关联更多数据，因此budgetDeclaratioService.queryByCondition方法经常不符合需求，需要重写一个为模板导出的查询
* 3)参考ConsoleDictController来实现模板导入导出
*/
String excelTemplate ="excelTemplates/dubget/预算简报详情模板.xls";
PageQuery page = condtion.getPageQuery();
String year = condtion.getYear();
if (StringUtils.isEmpty(year)) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
String dateString = formatter.format(new Date());
year=dateString.substring(0, 4);
}
//取出全部符合条件的
page.setPageSize(Integer.MAX_VALUE);
page.setPageNumber(1);
page.setTotalRow(Integer.MAX_VALUE);
//全部科室的金额
condtion.setType(null);
List<Dow> list =dowService.getJB(page).getList();
//科室递归进行分类
dowService.getKS();
//查询东区
condtion.setType("1");
List<Dow> listDP=dowService.getKS(page).getList();
//查询西区
condtion.setType("2");
List<Dow> listXP =dowService.getKS(page).getList();
try(InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) {
if(is==null) {
throw new PlatformException("模板资源不存在："+excelTemplate);
}
FileItem item = fileService.createFileTemp("简报"+year+DateUtil.now("yyyyMMddHHmmss")+".xls");
OutputStream os = item.openOutpuStream();
Context context = new Context();
context.putVar("list", list);
context.putVar("listDP", listDP);
context.putVar("listXP", listXP);
context.putVar("year", year);
context.putVar("Pyear", Integer.parseInt(year)-1);
context.putVar("Qyear", Integer.parseInt(year)-2);
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/re/web/query/DowQuery.java 0 → 100644
package com.corp.cyyy.re.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;
/**
*Dow查询
*/
public class DowQuery extends PageParam {
@Query(name = "名称", display = true)
private String name;
@Query(name = "年度", display = true,type=Query.DATE_YEAR)
private String year;
private String type;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
}
src/main/java/com/corp/cyyy/util/Bank.java
......@@ -9,18 +9,26 @@ public class Bank {
private String address;
private List<Account> BudgetInfoList;
private List<ExecutionInfo> ExecutionInfoList;
private ExecutionInfo ExecutionInfo;
public ExecutionInfo getExecutionInfo() {
return ExecutionInfo;
}
public String getName() {
return name;
}
public ExecutionInfo getExecutionInfo() {
return ExecutionInfo;
public List<ExecutionInfo> getExecutionInfoList() {
return ExecutionInfoList;
}
public void setExecutionInfo(ExecutionInfo executionInfo) {
ExecutionInfo = executionInfo;
}
public void setExecutionInfoList(List<ExecutionInfo> executionInfoList) {
ExecutionInfoList = executionInfoList;
}
public void setName(String name) {
this.name = name;
......@@ -45,6 +53,6 @@ public class Bank {
@Override
public String toString() {
return "Bank [name=" + name + ", address=" + address + ", BudgetInfoList=" + BudgetInfoList + ",ExecutionInfo="+ExecutionInfo+"]";
return "Bank [name=" + name + ", address=" + address + ", BudgetInfoList=" + BudgetInfoList + ",ExecutionInfo="+ExecutionInfoList.get(0)+"]";
}
}
\ No newline at end of file
src/main/java/com/corp/cyyy/util/ExecutionInfoList.java 0 → 100644
package com.corp.cyyy.util;
import java.util.List;
public class ExecutionInfoList {
private List<ExecutionInfo> ExecutionInfo;
public List<ExecutionInfo> getExecutionInfo() {
return ExecutionInfo;
}
public void setExecutionInfo(List<ExecutionInfo> executionInfo) {
ExecutionInfo = executionInfo;
}
}
src/main/java/com/corp/cyyy/util/JaxWsDynamicClientFactory.java 0 → 100644
package com.corp.cyyy.util;
import java.io.File;
import java.util.List;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.endpoint.EndpointImplFactory;
import org.apache.cxf.endpoint.dynamic.DynamicClientFactory;
import org.apache.cxf.jaxws.support.JaxWsEndpointImplFactory;
/**
* 覆写父类的compileJavaSrc方法，解决动态编译乱码问题
*
* @author yueli.liao
* @date 2019-03-08 14:10
*/
public class JaxWsDynamicClientFactory extends DynamicClientFactory {
protected JaxWsDynamicClientFactory(Bus bus) {
super(bus);
}
@Override
protected EndpointImplFactory getEndpointImplFactory() {
return JaxWsEndpointImplFactory.getSingleton();
}
protected boolean allowWrapperOps() {
return true;
}
/**
* Create a new instance using a specific <tt>Bus</tt>.
*
* @param b the <tt>Bus</tt> to use in subsequent operations with the
* instance
* @return the new instance
*/
public static JaxWsDynamicClientFactory newInstance(Bus b) {
return new JaxWsDynamicClientFactory(b);
}
/**
* Create a new instance using a default <tt>Bus</tt>.
*
* @return the new instance
* @see CXFBusFactory#getDefaultBus()
*/
public static JaxWsDynamicClientFactory newInstance() {
Bus bus = CXFBusFactory.getThreadDefaultBus();
return new JaxWsDynamicClientFactory(bus);
}
/**
* 覆写父类的该方法<br/>
* 注：解决此（错误：编码GBK的不可映射字符）问题
*
* @return
*/
@Override
protected boolean compileJavaSrc(String classPath, List<File> srcList, String dest) {
org.apache.cxf.common.util.Compiler javaCompiler
= new org.apache.cxf.common.util.Compiler();
// 设置编译编码格式（此处为新增代码）
javaCompiler.setEncoding("UTF-8");
javaCompiler.setClassPath(classPath);
javaCompiler.setOutputDir(dest);
javaCompiler.setTarget("1.6");
return javaCompiler.compileFiles(srcList);
}
}
\ No newline at end of file
src/main/java/com/corp/cyyy/util/Test.java 0 → 100644
package com.corp.cyyy.util;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
import org.json.simple.JSONObject;
public class Test {
public static void main(String[] args) {
String resultXml="<?xml version=\"1.0\" encoding=\"GBK\" standalone=\"yes\"?>\r\n" +
"<CASE>\r\n" +
" <BudgetInfoList>\r\n" +
" <BudgetInfo>\r\n" +
" <BudgetCode>2021_其他费用_本部_测试科室_加1422</BudgetCode>\r\n" +
" <BudgetType>保安服务费</BudgetType>\r\n" +
" <BudgetTitle>保安服务费</BudgetTitle>\r\n" +
" <ApprovalFee>5222</ApprovalFee>\r\n" +
" <ApprovalContent></ApprovalContent>\r\n" +
" <ExecutionFee>5000</ExecutionFee>\r\n" +
" <ExtendDepartmentCode>00001</ExtendDepartmentCode>\r\n" +
" <ExtendDepartmentName>测试科室</ExtendDepartmentName>\r\n" +
" <DepartmentCode>00001</DepartmentCode>\r\n" +
" <DepartmentName>测试科室</DepartmentName>\r\n" +
" <ExecutionType>0</ExecutionType>\r\n" +
" <State>1</State>\r\n" +
" </BudgetInfo>\r\n" +
" </BudgetInfoList>\r\n" +
"</CASE>";
// 创建动态客户端
// 创建动态客户端
JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
Client client = dcf.createClient("http://172.16.19.158:8081/BudgetService.asmx?wsdl");
Object[] objects = new Object[0];
//按照各自的文档传入参数
try {
objects = client.invoke("GetBudgetInfoDatas", resultXml);
//按照各自的文档传入参数
// objects = client.invoke("GetBudgetInfoDatas", resultXml);
//System.out.println("返回数据:" + objects[0].toString());
} catch (java.lang.Exception e) {
e.printStackTrace();
}
}
}
src/main/java/com/corp/cyyy/util/XstreamTest.java
......@@ -5,6 +5,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.cxf.endpoint.Client;
import com.corp.cyyy.dubget.entity.Budget;
import com.corp.cyyy.dubget.entity.BudgetDeclaratio;
import com.corp.cyyy.dubget.entity.BudgtType;
......@@ -15,23 +17,7 @@ import com.thoughtworks.xstream.XStream;
public class XstreamTest {
public static void main(String[] args) {
String resultXml="<?xml version=\"1.0\" encoding=\"GBK\" standalone=\"yes\"?>\r\n" +
"<CASE>\r\n" +
" <ExecutionInfo>\r\n" +
" <BudgetCode>2019_总务类设备_财务处_111</BudgetCode>\r\n" +
" <ExtendData>1</ExtendData>\r\n" +
" <ExecutionContent>测试</ExecutionContent>\r\n" +
" <Remark>测试</Remark>\r\n" +
" <ExecutionTime>2019-11-06 15:02:03</ExecutionTime>\r\n" +
" <ExecutionFee>10000.00</ExecutionFee>\r\n" +
" <ExecutionOper>执行人</ExecutionOper>\r\n" +
" <ContactPhone>6666</ContactPhone>\r\n" +
" <ReportState>提交</ReportState>\r\n" +
" <ReportCode></ReportCode>\r\n" +
" <ReportType></ReportType>\r\n" +
" </ExecutionInfo>\r\n" +
"</CASE>\r\n" +
"";
String resultXml="<?xml version='1.0' encoding='utf-8'?><CASE><ExecutionInfoList><ExecutionInfo><BudgetCode>2021_其他费用_本部_测试科室_加1422</BudgetCode><ExtendData>ec69ccad-1d6d-449b-b3c7-7caa7cdf1ec7</ExtendData><ExecutionContent>123</ExecutionContent><Remark>00001</Remark><ExecutionTime>2021/4/25 10:24:41</ExecutionTime><ExecutionFee>10.00</ExecutionFee><ExecutionOper>测试一(测试)</ExecutionOper><ContactPhone>123</ContactPhone><ReportState>提交</ReportState><ReportCode></ReportCode><ReportType>请示报告（新）</ReportType></ExecutionInfo></ExecutionInfoList></CASE>";
//采用非注解方式将对象转xml
/* String resultXml = beanToXml();
System.out.println(resultXml);
......@@ -44,7 +30,7 @@ public class XstreamTest {
*/
//将xml转成对象
Bank bank = xmlToBean(resultXml);
System.out.println(bank.getExecutionInfo());
System.out.println(bank.getExecutionInfoList().get(0));
System.out.println("*******************************************************************");
}
......@@ -53,6 +39,7 @@ public class XstreamTest {
XStream xStream = new XStream();
//将别名与xml名字对应
xStream.alias("CASE",Bank.class);
xStream.alias("ExecutionInfoList", ExecutionInfoList.class);
xStream.alias("ExecutionInfo", ExecutionInfo.class);
xStream.allowTypesByRegExp(new String[] { ".*" });
......@@ -61,6 +48,8 @@ public class XstreamTest {
ObjectMapper objectMapper = new ObjectMapper();
Bank ad = objectMapper.convertValue(bank, Bank.class);
//ad.getExecutionInfoList().get(0);
System.out.println(ad.getExecutionInfoList().get(0));
return ad;
}
......@@ -70,10 +59,10 @@ public class XstreamTest {
Account account1 = new Account();
//Account account2 = new Account();
account1.setBudgetCode(bu.getNumber());
account1.setBudgetType(bu.getName());
account1.setBudgetType(bu.getTypeName());
account1.setBudgetTitle(ty.getName());
account1.setApprovalFee(bu.getBudget().toString());
account1.setApprovalContent(budgetDeclaratio.getReplyOpinion());
account1.setApprovalContent(budgetDeclaratio.getReplyOpinion()==null?"":budgetDeclaratio.getReplyOpinion());
account1.setExecutionFee(bu.getReplyQuota().toString());
account1.setExtendDepartmentCode(oaorg.getOaCode());
account1.setExtendDepartmentName(oaorg.getOaName());
......@@ -93,11 +82,21 @@ public class XstreamTest {
xStream.alias("BudgetInfo", Account.class);
//将对象转换成xml字符串
String xml = xStream.toXML(bank);
xml="<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>\n"+xml;
xml= "<?xml version=\"1.0\" encoding=\"GBK\" standalone=\"yes\"?>\r\n"+xml;
System.out.println(xml);
return xml;
// 创建动态客户端
JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
Client client = dcf.createClient("http://172.16.19.158:8081/BudgetService.asmx?wsdl");
Object[] objects = new Object[0];
//按照各自的文档传入参数
objects = client.invoke("GetBudgetInfoDatas", xml);
//System.out.println("返回数据:" + objects[0].toString());
System.out.println("发送成功");
return "发送成功";
} catch (Exception e) {
return "发送失败";
System.out.println("发送失败："+e.toString());
return "发送失败："+e.toString();
}
}
......
src/main/resources/excelTemplates/po/TYPE.xml
......@@ -9,6 +9,7 @@
<mapping row="3" col="0">info.sort</mapping>
<mapping row="3" col="1">info.orgName</mapping>
<mapping row="3" col="2">info.name</mapping>
<mapping row="3" col="3">info.range</mapping>
</section>
<loopbreakcondition>
<rowcheck offset="0">
......
src/main/resources/excelTemplates/po/budget_declaratio.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<!-- 书写规则详见 http://jxls.sourceforge.net/reference/reader.html -->
<workbook>
<worksheet name="Sheet1">
<section startRow="0" endRow="0"></section>
<loop startrow="1" endrow="1" items="list" var="info"
varType="com.corp.cyyy.dubget.entity.BudgetDeclaratio">
<section startRow="3" endRow="3">
<mapping row="3" col="0">info.deptId</mapping>
<mapping row="3" col="1">info.name</mapping>
<mapping row="3" col="2">info.number</mapping>
<mapping row="3" col="3">info.phone</mapping>
<mapping row="3" col="4">info.budget</mapping>
<mapping row="3" col="5">info.remaks</mapping>
<mapping row="3" col="6">info.createTime</mapping>
<mapping row="3" col="7">info.year</mapping>
<mapping row="3" col="8">info.type</mapping>
</section>
<loopbreakcondition>
<rowcheck offset="0">
<cellcheck offset="0"></cellcheck>
</rowcheck>
</loopbreakcondition>
</loop>
</worksheet>
</workbook>
\ No newline at end of file
src/main/resources/excelTemplates/po/budget_verification.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<!-- 书写规则详见 http://jxls.sourceforge.net/reference/reader.html -->
<workbook>
<worksheet name="Sheet1">
<section startRow="0" endRow="0"></section>
<loop startrow="1" endrow="1" items="list" var="info"
varType="com.corp.cyyy.dubget.entity.BudgetVerification">
<section startRow="3" endRow="3">
<mapping row="3" col="0">info.deptId</mapping>
<mapping row="3" col="1">info.type</mapping>
<mapping row="3" col="2">info.number</mapping>
<mapping row="3" col="3">info.execute</mapping>
<mapping row="3" col="4">info.chargeOff</mapping>
<mapping row="3" col="5">info.auditTime</mapping>
<mapping row="3" col="6">info.remaks</mapping>
<mapping row="3" col="7">info.implementMatter</mapping>
</section>
<loopbreakcondition>
<rowcheck offset="0">
<cellcheck offset="0"></cellcheck>
</rowcheck>
</loopbreakcondition>
</loop>
</worksheet>
</workbook>
\ No newline at end of file
src/main/resources/sql/dubget/budget.md
......@@ -4,38 +4,63 @@ queryByCondition
select
@pageTag(){
t.*,sum(case when v.STATE=0 AND v.TYPE=1 then 1 else 0 end) su
*
@}
from
(select
t.*,sum(case when v.STATE=0 AND v.TYPE=1 then 1 else 0 end) su
from budget t LEFT JOIN budget_verification v on t.id=v.BUDGET_ID
where 1=1
@//数据权限，该sql语句功能点
@if(!isEmpty(deptName)){
and t.dept_name =#deptName#
and t.dept_name like #'%'+deptName+'%'#
@}
@if(!isEmpty(numer)){
and t.NUMBER like #'%'+numer+'%'#
@}
@if(!isEmpty(name)){
and t.name like #'%'+name+'%'#
@}
@if(!isEmpty(staeTime)){
and t.CREATE_TIME > #staeTime#
@}
@if(!isEmpty(endTime)){
and t.CREATE_TIME <= #endTime#
@}
and #function("budget.query")#
AND ( t.`RANGE`=1
@if(!isEmpty(deptId)){
OR (t.`RANGE`=2 AND t.DEPT_ID=#deptId#)
@}
)
GROUP BY t.id
GROUP BY t.id)A
queryByConditionHX
===
select
@pageTag(){
t.*,
sum(case when v.STATE=2 AND v.TYPE=1 then 1 else 0 end) su
*
@}
from(
select
t.*,
sum(case when v.STATE=2 then 1 else 0 end) su
from budget t LEFT JOIN budget_verification v on t.id=v.BUDGET_ID where
1=1
@if(!isEmpty(numer)){
and t.NUMBER like #'%'+numer+'%'#
@}
@if(!isEmpty(deptName)){
and t.dept_name like #'%'+deptName+'%'#
@}
@if(!isEmpty(name)){
and t.NAME like #'%'+name+'%'#
@}
AND v.STATE in(2,3)
GROUP BY t.ID
ORDER BY t.CREATE_TIME DESC
)A
queryByConditionSH
===
......
src/main/resources/sql/dubget/budgetDeclaratio.md
......@@ -12,7 +12,7 @@ queryByCondition
@//数据权限，该sql语句功能点
and #function("budgetDeclaratio.query")#
@if(!isEmpty(deptName)){
and t.DEPT_NAME =#deptName#
and t.DEPT_NAME like #'%'+deptName+'%'#
@}
@if(!isEmpty(type)){
@if(type=='xg'){
......@@ -57,17 +57,17 @@ queryByConditionYLD
@//数据权限，该sql语句功能点
and #function("budgetDeclaratio.query")#
@if(!isEmpty(deptName)){
and t.DEPT_NAME =#deptName#
and t.DEPT_NAME #'%'+deptName+'%'#
@}
@if(!isEmpty(type)){
@if(type=='xg'){
and t.TYPE =""
@}else{
and d.NAME = #'%'+name+'%'#
and d.NAME like #'%'+name+'%'#
@}
@}
@if(!isEmpty(number)){
and t.NUMBER =#number#
and t.NUMBER like #'%'+number+'%'#
@}
@if(!isEmpty(user)){
and t.USER =#user#
......@@ -93,12 +93,12 @@ gethanzi
===
*汉字查找
SELECT t.`NAME`,t.TYPE,b.`NAME` as typename FROM `budget_declaratio` t LEFT JOIN budgt_type b on t.TYPE=b.ID WHERE t.`NAME` LIKE #'%'+name+'%'# and DEPT_ID=#orgId#
SELECT t.`NAME`,t.TYPE,b.`NAME` as typename FROM `budget_declaratio` t LEFT JOIN budgt_type b on t.TYPE=b.ID WHERE t.`NAME` LIKE #'%'+name+'%'# and DEPT_ID=#orgId# GROUP BY t.`NAME`
getpinyin
===
*拼音查找
SELECT t.`NAME`,t.TYPE,b.`NAME` as typename FROM `budget_declaratio` t LEFT JOIN budgt_type b on t.TYPE=b.ID WHERE `PINYIN` LIKE #'%'+name+'%'# and DEPT_ID=#orgId#
SELECT t.`NAME`,t.TYPE,b.`NAME` as typename FROM `budget_declaratio` t LEFT JOIN budgt_type b on t.TYPE=b.ID WHERE `PINYIN` LIKE #'%'+name+'%'# and DEPT_ID=#orgId# GROUP BY t.`NAME`
ZJnumer
===
......
src/main/resources/sql/dubget/budgetVerification.md
......@@ -4,9 +4,10 @@ queryByCondition
select
@pageTag(){
t.*
t.*,d.REPLY_QUOTA
@}
from budget_verification t
LEFT JOIN budget d on d.ID=t.BUDGET_ID
where 1=1
@//数据权限，该sql语句功能点
and #function("budgetVerification.query")#
......@@ -14,7 +15,7 @@ queryByCondition
and t.budget_id=#budgetId#
@}
@if(!isEmpty(deptName)){
and t.dept_name =#deptName#
and t.dept_name like #'%'+deptName+'%'#
@}
@if(!isEmpty(name)){
and t.name like #'%'+name+'%'#
......@@ -28,6 +29,15 @@ queryByCondition
@if(!isEmpty(state)){
and t.state = #state#
@}
@if(!isEmpty(nubmer)){
and t.NUMBER like #'%'+nubmer+'%'#
@}
@if(!isEmpty(staeTime)){
and t.IMPLEMENT_TIME > #staeTime#
@}
@if(!isEmpty(endTime)){
and t.IMPLEMENT_TIME <= #endTime#
@}
ORDER BY t.IMPLEMENT_TIME DESC
batchDelBudgetVerificationByIds
......
src/main/resources/sql/dubget/budgtBase.md
......@@ -20,12 +20,12 @@ gethanzi
===
*汉字查找
SELECT t.`NAME`,b.TYPE as typename,b.id as code FROM `budgt_base` t LEFT JOIN budgt_type b on t.TYPE_ID=b.ID WHERE t.`NAME` LIKE #'%'+name+'%'#
SELECT t.`NAME`,b.TYPE as typename,b.id as code FROM `budgt_base` t LEFT JOIN budgt_type b on t.TYPE_ID=b.ID WHERE t.`NAME` LIKE #'%'+name+'%'# GROUP BY t.`NAME`
getpinyin
===
*拼音查找
SELECT t.`NAME`,b.TYPE as typename,b.id as code FROM `budgt_base` t LEFT JOIN budgt_type b on t.TYPE_ID=b.ID WHERE `PINYIN` LIKE #'%'+name+'%'#
SELECT t.`NAME`,b.TYPE as typename,b.id as code FROM `budgt_base` t LEFT JOIN budgt_type b on t.TYPE_ID=b.ID WHERE `PINYIN` LIKE #'%'+name+'%'# GROUP BY t.`NAME`
......
src/main/resources/sql/dubget/budgtType.md
......@@ -14,7 +14,7 @@ queryByCondition
and t.NAME like #'%'+name+'%'#
@}
@if(!isEmpty(type)){
and t.TYPE= #type#
and t.TYPE like #'%'+type+'%'#
@}
ORDER BY SORT ASC
......
src/main/resources/sql/re/dow.md 0 → 100644
queryByCondition
===
select
@pageTag(){
t.*
@}
from dow t
where 1=1
@//数据权限，该sql语句功能点
and #function("dow.query")#
@if(!isEmpty(name)){
and t.NAME like #'%'+name+'%'#
@}
ORDER BY SOTR
getJB
===
SELECT
@pageTag(){
a.*,
t.sunB
@}
FROM
(
SELECT
d.*,
b.BUDGET,
SUM( b.BUDGET ) AS sun
FROM
`dow` d
LEFT JOIN (SELECT * FROM budget_declaratio WHERE
DTYPE = '1'
@if(!isEmpty(year)){
and b.`YEAR` = #year#
@}
) b ON d.BUDGT_TYPE = b.TYPE
GROUP BY
d.ID
ORDER BY SOTR
) a
LEFT JOIN (
SELECT
d.*,
b.BUDGET,
SUM( b.BUDGET ) AS sunB
FROM
`dow` d
LEFT JOIN (SELECT * FROM budget_declaratio WHERE
DTYPE = '2'
@if(!isEmpty(year)){
and t.NAME = #year#
@}
) b ON d.BUDGT_TYPE = b.TYPE
GROUP BY
d.ID
ORDER BY SOTR
) t ON a.id = t.id
getKS
===
SELECT
@pageTag(){
a.*,
t.sunB
@}
FROM
(
SELECT
d.*,
b.BUDGET,
SUM( b.BUDGET ) AS sun
FROM
`dow` d
LEFT JOIN (SELECT * FROM budget_declaratio WHERE
DTYPE = '1' ) b ON d.BUDGT_TYPE = b.TYPE
LEFT JOIN (SELECT * FROM core_org WHERE 1=1
@if(!isEmpty(type)){
AND FULL_NAME=#type#
@}
)
o on b.DEPT_ID=o.ID
GROUP BY
d.ID
ORDER BY SOTR
) a
LEFT JOIN (
SELECT
d.*,
b.BUDGET,
SUM( b.BUDGET ) AS sunB
FROM
`dow` d
LEFT JOIN (SELECT * FROM budget_declaratio WHERE
DTYPE = '2' ) b ON d.BUDGT_TYPE = b.TYPE
LEFT JOIN (SELECT * FROM core_org WHERE 1=1
@if(!isEmpty(type)){
AND FULL_NAME=#type#
@}
) o on b.DEPT_ID=o.ID
GROUP BY
d.ID
ORDER BY SOTR
) t ON a.id = t.id
getParentId
===
*根据父id查询下级
SELECT
@pageTag(){
A.* ,
B.sunB
@}
FROM
(
SELECT
t.ID,
t.`NAME`,
t.PARENT_ID,
SUM( b.BUDGET ) AS sun
FROM
`budgt_type` t
LEFT JOIN ( SELECT * FROM budget_declaratio WHERE DTYPE = '1') b ON t.ID = b.TYPE
LEFT JOIN core_org o on b.DEPT_ID=o.ID
WHERE
t.PARENT_ID = #id#
@if(!isEmpty(org)){
and o.FULL_NAME = #org#
@}
GROUP BY
t.ID
) A LEFT JOIN (
SELECT
t.ID,
t.`NAME`,
t.PARENT_ID,
SUM( b.BUDGET ) AS sunB
FROM
`budgt_type` t
LEFT JOIN ( SELECT * FROM budget_declaratio WHERE DTYPE = '2') b ON t.ID = b.TYPE
LEFT JOIN core_org o on b.DEPT_ID=o.ID
WHERE
t.PARENT_ID = #id#
@if(!isEmpty(org)){
and o.FULL_NAME = #org#
@}
GROUP BY
t.ID
) B ON A.ID=B.ID
batchDelDowByIds
===
* 批量逻辑删除
DELETE FROM dow where ID in( #join(ids)#)
src/main/resources/static/js/dubget/budget/add.js
......@@ -10,6 +10,7 @@ layui.define([ 'form', 'laydate', 'table','budgetApi'], function(exports) {
initSubmit:function(){
$("#addButton").click(function(){
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetApi.addBudget($('#addForm'),function(){
parent.window.dataReload();
Common.info("添加成功");
......
src/main/resources/static/js/dubget/budget/edit.js
......@@ -10,6 +10,7 @@ layui.define([ 'form', 'laydate', 'table','budgetApi'], function(exports) {
initSubmit:function(){
$("#updateButton").click(function(){
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetApi.updateBudget($('#updateForm'),function(){
parent.window.dataReload();
Common.info("更新成功");
......
src/main/resources/static/js/dubget/budget/hxindex.js
......@@ -25,6 +25,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
{
......@@ -53,10 +54,20 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
},
{
field : '',
title : '进度',
templet: function (d) {
//consonle.log(parseFloat(budget));
return GetPercent((parseFloat(d.budget)-parseFloat(d.replyQuota)),d.budget)
}
},
{
field : 'typeName',
title : '预算类型',
},
/* {
/* {GetPercent
field : 'rangeText',
title : '预算范围',
......@@ -126,8 +137,23 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
var type = $(this).data('type');
toolbar[type] ? toolbar[type].call(this) : '';
});
},
}
function GetPercent(num, total) {
/// <summary>
/// 求百分比
/// </summary>
/// <param name="num">当前数</param>
/// <param name="total">总数</param>
num = parseFloat(num);
total = parseFloat(total);
if (isNaN(num) || isNaN(total)) {
return "-";
}
return total <= 0 ? "0%" : (Math.round(num / total * 10000) / 100.00)+"%";
}
exports('hxindex',view);
});
\ No newline at end of file
src/main/resources/static/js/dubget/budget/index.js
......@@ -25,17 +25,38 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
{
field : 'deptName',
title : '科室名称',
},
{
field : 'name',
title : '名称',
},
{
field : 'budget',
title : '预算金额',
},
{
field : 'replyQuota',
title : '可行额度',
},
{
field : '',
title : '已执行额度',
templet: function (d) {
return d.budget-d.replyQuota
}
},
{
......@@ -52,11 +73,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'typeName',
title : '预算类型',
},
{
field : 'budget',
title : '预算金额',
},
{
title: '操作',
//rowspan: 2,
......
src/main/resources/static/js/dubget/budgetDeclaratio/add.js
......@@ -11,6 +11,7 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
$("#addButton").click(function(){
$("#state").val("2");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.addBudgetDeclaratio($('#addForm'),function(){
parent.window.dataReload();
Common.info("提交成功");
......@@ -21,6 +22,7 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
$("#addButton-staging").click(function(){
$("#state").val("0");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.addBudgetDeclaratio($('#addForm'),function(){
parent.window.dataReload();
Common.info("暂存成功");
......
src/main/resources/static/js/dubget/budgetDeclaratio/addZJ.js
......@@ -11,6 +11,7 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
$("#addButton").click(function(){
$("#state").val("2");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.addZJBudgetDeclaratio($('#addForm'),function(){
parent.window.dataReload();
Common.info("提交成功");
......@@ -21,6 +22,7 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
$("#addButton-staging").click(function(){
$("#state").val("0");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.addZJBudgetDeclaratio($('#addForm'),function(){
parent.window.dataReload();
Common.info("暂存成功");
......
src/main/resources/static/js/dubget/budgetDeclaratio/addZJ2.js 0 → 100644
layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(exports) {
var form = layui.form;
var budgetDeclaratioApi = layui.budgetDeclaratioApi;
var index = layui.index;
var view = {
init:function(){
Lib.initGenrealForm($("#addForm"),form);
this.initSubmit();
},
initSubmit:function(){
$("#addButton").click(function(){
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.addZJBudgetDeclaratio2($('#addForm'),function(){
parent.window.dataReload();
Common.info("提交成功");
Lib.closeFrame();
});
});
});
$("#addButton-staging").click(function(){
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.addZJBudgetDeclaratio2($('#addForm'),function(){
parent.window.dataReload();
Common.info("暂存成功");
Lib.closeFrame();
});
});
});
$("#addButton-cancel").click(function(){
Lib.closeFrame();
});
}
}
exports('addZJ2',view);
});
\ No newline at end of file
src/main/resources/static/js/dubget/budgetDeclaratio/budgetDeclaratioApi.js
......@@ -10,6 +10,9 @@ layui.define([], function(exports) {
addZJBudgetDeclaratio:function(form,callback){
Lib.submitForm("/dubget/budgetDeclaratio/addZJ.json",form,{},callback)
},
addZJBudgetDeclaratio2:function(form,callback){
Lib.submitForm("/dubget/budgetDeclaratio/addZJ2.json",form,{},callback)
},
del:function(ids,callback){
Common.post("/dubget/budgetDeclaratio/delete.json",{"ids":ids},function(){
callback();
......
src/main/resources/static/js/dubget/budgetDeclaratio/cwcindex.js
......@@ -24,7 +24,8 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
cols : [ [ // 表头
{
type : 'checkbox',
//fixed:'left',
fixed:'left',
width: 40
},
{
......
src/main/resources/static/js/dubget/budgetDeclaratio/edit.js
......@@ -12,6 +12,7 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
$("#updateButton").click(function(){
$("#state").val("2");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.updateBudgetDeclaratio($('#updateForm'),function(){
parent.window.dataReload();
Common.info("提交成功");
......@@ -22,6 +23,7 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
$("#updateButton-staging").click(function(){
$("#state").val("0");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.updateBudgetDeclaratio($('#updateForm'),function(){
parent.window.dataReload();
Common.info("暂存成功");
......@@ -33,8 +35,8 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
$("#ylddateButton").click(function(){
$("#state").val("2");
$("#userType").val("yld");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.updateBudgetDeclaratio($('#updateForm'),function(){
parent.window.dataReload();
Common.info("审核成功");
......@@ -45,7 +47,9 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
$("#ylddateButton-staging").click(function(){
$("#state").val("-1");
$("#userType").val("yld");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.updateBudgetDeclaratio($('#updateForm'),function(){
parent.window.dataReload();
Common.info("审核成功");
......@@ -57,19 +61,25 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
$("#cwcddateButton").click(function(){
$("#state").val("3");
$("#userType").val("cwc");
form.on('submit(form)', function(){
budgetDeclaratioApi.updateBudgetDeclaratio($('#updateForm'),function(){
parent.window.dataReload();
Common.info("批复成功");
Lib.closeFrame();
});
});
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetDeclaratioApi.updateBudgetDeclaratio($('#updateForm'),function(){
console.log('form')
parent.window.dataReload();
Common.info("批复成功");
Lib.closeFrame();
});
// return false;
});
// console.log(data.value)//打印当前select选中的值
});
$("#cwcddateButton-staging").click(function(){
$("#state").val("-1");
$("#userType").val("cwc");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
// $("#cwcddateButton-staging").addClass('layui-btn-disabled').attr('disabled',true);
budgetDeclaratioApi.updateBudgetDeclaratio($('#updateForm'),function(){
parent.window.dataReload();
Common.info("批复成功");
......
src/main/resources/static/js/dubget/budgetDeclaratio/index.js
......@@ -25,6 +25,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
{
......@@ -278,14 +279,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
})
});
},
importDocument:function(){
var uploadUrl = Common.ctxPath+"/dubget/budgetDeclaratio/excel/import.do";
//模板,
var templatePath= "/dubget/budgetDeclaratio/budgetDeclaratio_upload_template.xls";
//公共的简单上传文件处理
var url = "/core/file/simpleUpload.do?uploadUrl="+uploadUrl+"&templatePath="+templatePath;
Common.openDlg(url, "预算申报管理>上传");
}
};
$('.ext-toolbar').on('click', function() {
var type = $(this).data('type');
......
src/main/resources/static/js/dubget/budgetDeclaratio/indexZJ.js
......@@ -25,6 +25,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
{
......@@ -229,6 +230,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
initToolBar:function(){
toolbar = {
add : function() { // 获取选中数据
var url = "/dubget/budgetDeclaratio/addZJ.do";
Common.openDlg(url,"预算申报管理>新增");
},
edits : function() { // 获取选中数据
var data = Common.getOneFromTable(table,"budgetDeclaratioTable");
......@@ -239,24 +244,15 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
if (data.dtype=='2') {
Common.info("追加预算不可再追加");
}else{
var url = "/dubget/budgetDeclaratio/addZJ.do?id="+data.id;
var url = "/dubget/budgetDeclaratio/addZJ2.do?id="+data.id;
Common.openDlg(url,"预算申报管理>新增");
}
}else{
var url = "/dubget/budgetDeclaratio/addZJ.do?id="+data.id;
var url = "/dubget/budgetDeclaratio/addZJ2.do?id="+data.id;
Common.info("未批复不可追加");
}
},
edit : function() {
var data = Common.getOneFromTable(table,"poDeptTable");
if(data==null){
return ;
}
var url = "/dubget/budgetDeclaratio/addZJ.do?id="+data.id;
Common.openDlg(url,"预算申报管理>新增");
},
del : function() {
layui.use(['del'], function(){
var delView = layui.del
......
src/main/resources/static/js/dubget/budgetDeclaratio/tjindex.js
......@@ -19,6 +19,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
{
field : 'deptName',
......@@ -160,6 +161,22 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
tr.css("color", "white");
}
});
var far=$("#searchForm");
var data = far.serializeJson();
$.ajax({
url:Common.ctxPath + '/dubget/budgetDeclaratio/hj.json',
type:"post",
data:data,
success:function(result){
var a=parseInt(result.data);
$("#hxzy").text(a.toLocaleString())
}
})
/* $.post(Common.ctxPath + '/dubget/budgetDeclaratio/hj.json',{condtion:data)},function(result){
$("#hxzy").text(result.data)
}); */
// viewTable.initEvent(budgetDeclaratioTable.config,res)
}
......
src/main/resources/static/js/dubget/budgetDeclaratio/xgedit.js
......@@ -10,9 +10,12 @@ layui.define([ 'form', 'laydate', 'table','budgetDeclaratioApi'], function(expor
initSubmit:function(){
//编辑修改按钮
$("#updateButton").click(function(){
$.post("/dubget/budgetDeclaratio/xgupdate.json",{id:$("#id").val(),type:$("#type").val()},function(result){
parent.window.dataReload();
Common.info(result.data);
$(this).attr('disabled',true).addClass('layui-btn-disabled');
$.post("/dubget/budgetDeclaratio/xgupdate.json",{id:$("#id").val(),type:$("#type").val(),range:$("#range").val()},function(result){
//debugger;
Common.info(result.data);
parent.window.location.reload()
//parent.window.dataReload();
Lib.closeFrame();
});
/* form.on('submit(form)', function(){
......
src/main/resources/static/js/dubget/budgetDeclaratio/xgindex.js
......@@ -25,6 +25,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
{
......@@ -38,6 +39,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
},
{
field : 'deptName',
title : '科室名称',
},
{
field : 'name',
title : '名称',
},
......
src/main/resources/static/js/dubget/budgetDeclaratio/yldindex.js
......@@ -25,6 +25,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
{
......
src/main/resources/static/js/dubget/budgetVerification/audit.js
......@@ -13,6 +13,7 @@ layui.define([ 'form', 'laydate', 'table','budgetVerificationApi'], function(exp
$("#auditddateButton").click(function(){
$("#state").val("3");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetVerificationApi.hxupdateBudgetVerification($('#updateForm'),function(){
parent.window.dataReload();
Common.info("核销成功");
......@@ -24,6 +25,7 @@ layui.define([ 'form', 'laydate', 'table','budgetVerificationApi'], function(exp
$("#auditddateButton-staging").click(function(){
$("#state").val("-1");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetVerificationApi.hxupdateBudgetVerification($('#updateForm'),function(){
parent.window.dataReload();
Common.info("核销成功");
......
src/main/resources/static/js/dubget/budgetVerification/edit.js
......@@ -12,7 +12,9 @@ layui.define([ 'form', 'laydate', 'table','budgetVerificationApi'], function(exp
initSubmit:function(){
$("#updateButton-staging").click(function(){
$("#state").val("0");
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
budgetVerificationApi.updateBudgetVerification($('#updateForm'),function(){
parent.window.location.reload()
Common.info("更新成功");
......@@ -24,6 +26,7 @@ layui.define([ 'form', 'laydate', 'table','budgetVerificationApi'], function(exp
$("#updateButton").click(function(){
$("#state").val("2");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetVerificationApi.updateBudgetVerification($('#updateForm'),function(){
parent.window.location.reload()
Common.info("更新成功");
......
src/main/resources/static/js/dubget/budgetVerification/index.js
......@@ -26,6 +26,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
{
......@@ -65,7 +66,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
minWidth: '160',
templet: function (d) {
var edit =null;
if (d.state=='2'&&d.type=="1") {
if (d.state=='2') {
edit='<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" lay-event="dit" title="核销">核销</button>'
+'<button type="button" class="layui-btn layui-btn-sm layui-btn-warm" lay-event="view" title="查看">查看</button>';
}
......
src/main/resources/static/js/dubget/budgetVerification/tjindex.js
......@@ -25,6 +25,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
{
......@@ -50,7 +51,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'chargeOff',
title : '核销金额',
},
{
field : 'replyQuota',
title : '剩余可执行金额',
},
{
field : 'stateText',
......@@ -69,7 +74,26 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}
}
] ]
] ],
done: function (res, curr, count) { // 表格渲染完成之后的回调
var far=$("#searchForm");
var data = far.serializeJson();
$.ajax({
url:Common.ctxPath + '/dubget/budgetVerification/hj.json',
type:"post",
data:data,
success:function(result){
$("#zx").text(parseInt(result.data.zx).toLocaleString())
$("#hx").text(parseInt(result.data.hx).toLocaleString())
}
})
/* $.post(Common.ctxPath + '/dubget/budgetDeclaratio/hj.json',{condtion:data)},function(result){
$("#hxzy").text(result.data)
}); */
// viewTable.initEvent(budgetDeclaratioTable.config,res)
}
});
table.on('tool(budgetVerificationTable)', function(obj){
......
src/main/resources/static/js/dubget/budgetVerification/yldaudit.js
......@@ -13,6 +13,7 @@ layui.define([ 'form', 'laydate', 'table','budgetVerificationApi'], function(exp
$("#auditddateButton").click(function(){
$("#state").val("2");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetVerificationApi.shupdateBudgetVerification($('#updateForm'),function(){
parent.window.dataReload();
Common.info("审核成功");
......@@ -24,6 +25,7 @@ layui.define([ 'form', 'laydate', 'table','budgetVerificationApi'], function(exp
$("#auditddateButton-staging").click(function(){
$("#state").val("-1");
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
budgetVerificationApi.shupdateBudgetVerification($('#updateForm'),function(){
parent.window.dataReload();
Common.info("审核成功");
......
src/main/resources/static/js/dubget/budgtBase/add.js
......@@ -25,6 +25,7 @@ layui.define([ 'form', 'laydate', 'table','budgtBaseApi','xmSelect'], function(e
initSubmit:function(){
$("#addButton").click(function(){
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
budgtBaseApi.addBudgtBase($('#addForm'),function(){
parent.window.dataReload();
Common.info("添加成功");
......
src/main/resources/static/js/dubget/budgtBase/edit.js
......@@ -24,7 +24,9 @@ layui.define([ 'form', 'laydate', 'table','budgtBaseApi','xmSelect'], function(e
},
initSubmit:function(){
$("#updateButton").click(function(){
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
budgtBaseApi.updateBudgtBase($('#updateForm'),function(){
parent.window.dataReload();
Common.info("更新成功");
......
src/main/resources/static/js/dubget/budgtBase/index.js
......@@ -26,6 +26,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
{
......
src/main/resources/static/js/dubget/budgtType/add.js
......@@ -12,6 +12,7 @@ layui.define([ 'form', 'laydate', 'table','budgtTypeApi'], function(exports) {
initSubmit:function(){
$("#addButton").click(function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
form.on('submit(form)', function(){
budgtTypeApi.addBudgtType($('#addForm'),function(){
parent.window.dataReload();
......
src/main/resources/static/js/dubget/budgtType/edit.js
......@@ -24,6 +24,7 @@ layui.define([ 'form', 'laydate', 'table','budgtTypeApi'], function(exports) {
},
initSubmit:function(){
$("#updateButton").click(function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
form.on('submit(form)', function(){
budgtTypeApi.updateBudgtType($('#updateForm'),function(){
parent.window.dataReload();
......
src/main/resources/static/js/dubget/budgtType/index.js
......@@ -25,6 +25,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{
type : 'checkbox',
fixed:'left',
width: 40
},
/* {
......@@ -33,11 +34,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
fixed:'left',
width : 60,
},*/
/* {
{
field : 'name',
title : '预算名称',
},*/
},
{
field : 'type',
......@@ -98,7 +99,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
toolbar = {
add : function() { // 获取选中数据
var url = "/dubget/budgtType/add.do";
Common.openDlg(url,"BudgtType管理>新增");
Common.openDlg(url,"预算类型管理>新增");
},
edit : function() { // 获取选中数目
var data = Common.getOneFromTable(table,"budgtTypeTable");
......@@ -106,7 +107,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
return ;
}
var url = "/dubget/budgtType/edit.do?id="+data.id;
Common.openDlg(url,"BudgtType管理>"+data.id+">编辑");
Common.openDlg(url,"预算类型管理>"+data.id+">编辑");
},
del : function() {
layui.use(['del'], function(){
......
src/main/resources/static/js/po/poDept/index.js
......@@ -61,7 +61,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'sort',
title : '排序',
}
] ]
});
......@@ -122,6 +121,23 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
//公共的简单上传文件处理
var url = "/core/file/simpleUpload.do?uploadUrl="+uploadUrl+"&templatePath="+templatePath;
Common.openDlg(url, "预算申报管理>上传");
},
importSB:function(){
var uploadUrl = Common.ctxPath+"/po/poDept/excel/importSB.do";
//模板,
var templatePath= "/po/预算申报导入模板.xls";
//公共的简单上传文件处理
var url = "/core/file/simpleUpload.do?uploadUrl="+uploadUrl+"&templatePath="+templatePath;
Common.openDlg(url, "预算申报管理>上传");
}
,
importZX:function(){
var uploadUrl = Common.ctxPath+"/po/poDept/excel/importZX.do";
//模板,
var templatePath= "/po/执行导入模板.xlsx";
//公共的简单上传文件处理
var url = "/core/file/simpleUpload.do?uploadUrl="+uploadUrl+"&templatePath="+templatePath;
Common.openDlg(url, "预算申报管理>上传");
}
};
$('.ext-toolbar').on('click', function() {
......
src/main/resources/static/js/re/dow/add.js 0 → 100644
layui.define([ 'form', 'laydate', 'table','dowApi'], function(exports) {
var form = layui.form;
var dowApi = layui.dowApi;
var index = layui.index;
var view = {
init:function(){
Lib.initGenrealForm($("#addForm"),form);
this.initSubmit();
},
initSubmit:function(){
$("#addButton").click(function(){
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
dowApi.addDow($('#addForm'),function(){
parent.window.dataReload();
Common.info("添加成功");
Lib.closeFrame();
});
});
});
$("#addButton-cancel").click(function(){
Lib.closeFrame();
});
}
}
exports('add',view);
});
\ No newline at end of file
src/main/resources/static/js/re/dow/del.js 0 → 100644
layui.define(['table', 'dowApi'], function(exports) {
var dowApi = layui.dowApi;
var table=layui.table;
var view = {
init:function(){
},
delBatch:function(){
var data = Common.getMoreDataFromTable(table,"dowTable");
if(data==null){
return ;
}
Common.openConfirm("确认要删除这些Dow?",function(){
var ids =Common.concatBatchId(data,"id");
dowApi.del(ids,function(){
Common.info("删除成功");
dataReload();
})
})
}
}
exports('del',view);
});
\ No newline at end of file
src/main/resources/static/js/re/dow/dowApi.js 0 → 100644
/*访问后台的代码*/
layui.define([], function(exports) {
var api={
updateDow:function(form,callback){
Lib.submitForm("/re/dow/update.json",form,{},callback)
},
addDow:function(form,callback){
Lib.submitForm("/re/dow/add.json",form,{},callback)
},
del:function(ids,callback){
Common.post("/re/dow/delete.json",{"ids":ids},function(){
callback();
})
} ,
exportExcel:function(form,callback){
var formPara = form.serializeJson();
Common.post("/re/dow/excel/export.json", formPara, function(fileId) {
callback(fileId);
})
}
};
exports('dowApi',api);
});
\ No newline at end of file
src/main/resources/static/js/re/dow/edit.js 0 → 100644
layui.define([ 'form', 'laydate', 'table','dowApi'], function(exports) {
var form = layui.form;
var dowApi = layui.dowApi;
var index = layui.index;
var view = {
init:function(){
Lib.initGenrealForm($("#updateForm"),form);
this.initSubmit();
},
initSubmit:function(){
$("#updateButton").click(function(){
form.on('submit(form)', function(){
$(this).attr('disabled',true).addClass('layui-btn-disabled');
dowApi.updateDow($('#updateForm'),function(){
parent.window.dataReload();
Common.info("更新成功");
Lib.closeFrame();
});
});
});
$("#updateButton-cancel").click(function(){
Lib.closeFrame();
});
}
}
exports('edit',view);
});
\ No newline at end of file
src/main/resources/static/js/re/dow/index.js 0 → 100644
layui.define([ 'form', 'laydate', 'table' ], function(exports) {
var form = layui.form;
var laydate = layui.laydate;
var table = layui.table;
var dowTable = null;
var view ={
init:function(){
this.initTable();
this.initSearchForm();
this.initToolBar();
window.dataReload = function(){
Lib.doSearchForm($("#searchForm"),dowTable)
}
},
initTable:function(){
dowTable = table.render({
elem : '#dowTable',
height : Lib.getTableHeight(1),
cellMinWidth: 100,
method : 'post',
url : Common.ctxPath + '/re/dow/list.json' // 数据接口
,page : Lib.tablePage // 开启分页
,limit : 10,
cols : [ [ // 表头
{
type : 'checkbox',
fixed:'left',
},
{
field : 'id',
title : '主键',
fixed:'left',
width : 60,
},
{
field : 'budgtType',
title : '预算类型id',
},
{
field : 'name',
title : '名称',
},
{
field : 'customName',
title : '自定义名称',
},
{
field : 'sotr',
title : '排序',
}
] ]
});
table.on('checkbox(dowTable)', function(obj){
var dow = obj.data;
if(obj.checked){
//按钮逻辑Lib.buttonEnable()
}else{
}
})
},
initSearchForm:function(){
Lib.initSearchForm( $("#searchForm"),dowTable,form);
},
initToolBar:function(){
toolbar = {
add : function() { // 获取选中数据
var url = "/re/dow/add.do";
Common.openDlg(url,"Dow管理>新增");
},
edit : function() { // 获取选中数目
var data = Common.getOneFromTable(table,"dowTable");
if(data==null){
return ;
}
var url = "/re/dow/edit.do?id="+data.id;
Common.openDlg(url,"Dow管理>"+data.id+">编辑");
},
del : function() {
layui.use(['del'], function(){
var delView = layui.del
delView.delBatch();
});
} ,
exportDocument : function() {
layui.use([ 'dowApi' ], function() {
var dowApi = layui.dowApi
Common.openConfirm("确认要导出这些数据?", function() {
dowApi.exportExcel($("#searchForm"), function(fileId) {
Lib.download(fileId);
})
})
});
},
};
$('.ext-toolbar').on('click', function() {
var type = $(this).data('type');
toolbar[type] ? toolbar[type].call(this) : '';
});
}
}
exports('index',view);
});
\ No newline at end of file
src/main/resources/static/js/re/oaOrg/add.js
......@@ -8,8 +8,8 @@ layui.define([ 'form', 'laydate', 'table','oaOrgApi'], function(exports) {
this.initSubmit();
},
initSubmit:function(){
$("#addButton").click(function(){
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
oaOrgApi.addOaOrg($('#addForm'),function(){
parent.window.dataReload();
Common.info("添加成功");
......
src/main/resources/static/js/re/oaOrg/edit.js
......@@ -10,6 +10,7 @@ layui.define([ 'form', 'laydate', 'table','oaOrgApi'], function(exports) {
initSubmit:function(){
$("#updateButton").click(function(){
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
oaOrgApi.updateOaOrg($('#updateForm'),function(){
parent.window.dataReload();
Common.info("更新成功");
......
src/main/resources/static/js/re/re/add.js
......@@ -10,6 +10,7 @@ layui.define([ 'form', 'laydate', 'table','reApi'], function(exports) {
initSubmit:function(){
$("#addButton").click(function(){
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
reApi.addRe($('#addForm'),function(){
parent.window.dataReload();
Common.info("添加成功");
......
src/main/resources/static/js/re/re/edit.js
......@@ -10,6 +10,7 @@ layui.define([ 'form', 'laydate', 'table','reApi'], function(exports) {
initSubmit:function(){
$("#updateButton").click(function(){
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
reApi.updateRe($('#updateForm'),function(){
parent.window.dataReload();
Common.info("更新成功");
......
src/main/resources/static/js/re/record/add.js
......@@ -10,6 +10,7 @@ layui.define([ 'form', 'laydate', 'table','recordApi'], function(exports) {
initSubmit:function(){
$("#addButton").click(function(){
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
recordApi.addRecord($('#addForm'),function(){
parent.window.dataReload();
Common.info("添加成功");
......
src/main/resources/static/js/re/record/edit.js
......@@ -10,6 +10,7 @@ layui.define([ 'form', 'laydate', 'table','recordApi'], function(exports) {
initSubmit:function(){
$("#updateButton").click(function(){
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
recordApi.updateRecord($('#updateForm'),function(){
parent.window.dataReload();
Common.info("更新成功");
......
src/main/resources/static/js/re/tem/add.js
......@@ -10,6 +10,7 @@ layui.define([ 'form', 'laydate', 'table','temApi'], function(exports) {
initSubmit:function(){
$("#addButton").click(function(){
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
temApi.addTem($('#addForm'),function(){
parent.window.dataReload();
Common.info("添加成功");
......
src/main/resources/static/js/re/tem/edit.js
......@@ -10,6 +10,7 @@ layui.define([ 'form', 'laydate', 'table','temApi'], function(exports) {
initSubmit:function(){
$("#updateButton").click(function(){
form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
temApi.updateTem($('#updateForm'),function(){
parent.window.dataReload();
Common.info("更新成功");
......
src/main/resources/templates/dubget/budgetDeclaratio/add.html
......@@ -33,7 +33,7 @@
<div class="layui-inline">
<label class="layui-form-label">预算金额</label>
<div class="layui-input-inline">
<input type="text" name="budget" lay-verify="number" class="layui-input" >
<input type="text" name="budget" class="layui-input" >
</div>
</div>
......@@ -62,9 +62,16 @@
<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" >
</div>
</div>
<div class="layui-inline">
<!-- <label class="layui-form-label">资金范围</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="capitalType" lay-filter="budetType" layVerify=""
id="budetType" name="budetType" value="" />
</div>
</div> -->
</div>
</div>
<div class="layui-form-item layui-form-text">
......@@ -88,6 +95,7 @@ layui.use(['add','laydate'], function(){
laydate.render({
elem: '#year' //指定元素
,type:'year'
,trigger: 'click' //采用click弹出
});
var oTxt = document.getElementById('graduateCollege');
var oList = document.getElementById('list');
......
src/main/resources/templates/dubget/budgetDeclaratio/addZJ.html
......@@ -12,7 +12,6 @@
<input type="text" id="graduateCollege" name="name" lay-verify="required" autocomplete="off" class="layui-input" >
<input type="hidden" id="type" name="type" class="layui-input" >
<input type="hidden" id="dtype" name="dtype" class="layui-input" value="2" >
<input type="hidden" id="number" name="number" class="layui-input" value="${number}" >
<ul id="list" class="layui-nav-child layui-anim layui-anim-up"></ul>
</div>
</div>
......@@ -34,7 +33,7 @@
<div class="layui-inline">
<label class="layui-form-label">预算金额</label>
<div class="layui-input-inline">
<input type="text" name="budget"lay-verify="number" class="layui-input" >
<input type="text" name="budget" class="layui-input" >
</div>
</div>
......@@ -90,6 +89,7 @@ layui.use(['addZJ','laydate'], function(){
laydate.render({
elem: '#year' //指定元素
,type:'year'
,trigger: 'click' //采用click弹出
});
var oTxt = document.getElementById('graduateCollege');
var oList = document.getElementById('list');
......
src/main/resources/templates/dubget/budgetDeclaratio/addZJ2.html 0 → 100644
<!--# layout("/common/layout.html",{"jsBase":"/js/dubget/budgetDeclaratio/"}){ -->
<form class="layui-form layui-form-pane" id="addForm">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">名称</label>
<div class="layui-input-inline">
<input type="text" id="graduateCollege" name="name" value="${budgetDeclaratio.name}" lay-verify="required" autocomplete="off" class="layui-input" >
<input type="hidden" id="type" name="type" class="layui-input" value="${budgetDeclaratio.type}">
<input type="hidden" id="dtype" name="dtype" class="layui-input" value="1" >
<input type="hidden" id="number" name="number" class="layui-input" value="${budgetDeclaratio.number}" >
<ul id="list" class="layui-nav-child layui-anim layui-anim-up"></ul>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">追加金额</label>
<div class="layui-input-inline">
<input type="text" name="budget" class="layui-input" >
<input type="hidden" name="id" value="${budgetDeclaratio.id}" class="layui-input" >
</div>
</div>
</div>
</div>
</div>
<div style="left:0; text-align: center;">
<button class="layui-btn layui-btn-danger" type="button" id="addButton" lay-submit lay-filter="form">保存</button>
<button class="layui-btn" type="button" id="addButton-cancel">取消</button>
</div>
</form>
<!--#} -->
<script>
layui.use(['addZJ2','laydate'], function(){
/* var laydate = layui.laydate;
//执行一个laydate实例
laydate.render({
elem: '#year' //指定元素
,type:'year'
}); */
var oTxt = document.getElementById('graduateCollege');
var oList = document.getElementById('list');
var fruits =null;
var cpLock = false;
$('#graduateCollege').on('compositionstart', function () {
debugger;
cpLock = true;
});
$('#graduateCollege').on('compositionend', function () {
cpLock = false;
debugger;
var keyWord = oTxt.value;
if(keyWord!=""){
$.post(Common.ctxPath + '/dubget/budgetDeclaratio/history.json' ,{"name":oTxt.value},function(data){
var att = data.data.map(function(item){
return item.name +'---'+item.typename+"---"+item.type;
})
renderFruits(att);
});
}else{
renderFruits([]);
}
});
$('#graduateCollege').on('input', function () {
if (!cpLock) {
var keyWord = oTxt.value;
if(keyWord!=""){
$.post(Common.ctxPath + '/dubget/budgetDeclaratio/history.json' ,{"name":oTxt.value},function(data){
var att = data.data.map(function(item){
return item.name +'---'+item.typename+"---"+item.type;
})
renderFruits(att);
});
}else{
renderFruits([]);
}
}
});
$(document).on('click',function(e){
$(e.target).attr('id') == undefined && $('#list').hide()
})
function renderFruits(list){
if(!(list instanceof Array)){
return ;
}
oList.innerHTML = '';
var len = list.length;
var item = null;
for(var i=0;i<len;i++){
item = document.createElement('li');
item.innerHTML = list[i].split("---")[0]+"---"+list[i].split("---")[1];
item.setAttribute('text',list[i].split("---")[0]);
item.setAttribute('type',list[i].split("---")[2]);
oList.appendChild(item);
}
$('#list').show().css({
'top': '36px'
}).children().css({
"padding-left" : "5px"
});
$('#list').on('click','li',function(){
$('#list').hide();
$('#graduateCollege').val( $(this).attr('text') );
$('#type').val($(this).attr('type') )
})
}
var budgetDeclaratioAdd = layui.addZJ2
budgetDeclaratioAdd.init();
});
</script>
src/main/resources/templates/dubget/budgetDeclaratio/cwcindex.html
......@@ -3,8 +3,8 @@
</layui:searchForm>
<div class="layui-btn-group">
<layui:accessButton function="budgetDeclaratio.add" action="add">批量审核</layui:accessButton>
<!-- <layui:accessButton function="budgetDeclaratio.edit" action="edit">编辑</layui:accessButton>
<!-- <layui:accessButton function="budgetDeclaratio.add" action="add">批量审核</layui:accessButton>
--> <!-- <layui:accessButton function="budgetDeclaratio.edit" action="edit">编辑</layui:accessButton>
<layui:accessButton function="budgetDeclaratio.del" action="del">删除</layui:accessButton>
<layui:accessButton function="budgetDeclaratio.exportDocument" action="exportDocument">导出</layui:accessButton>
<layui:accessButton function="budgetDeclaratio.importDocument" action="importDocument">导入</layui:accessButton> -->
......
src/main/resources/templates/dubget/budgetDeclaratio/indexZJ.html
......@@ -3,7 +3,8 @@
</layui:searchForm>
<div class="layui-btn-group">
<layui:accessButton function="budgetDeclaratio.add" action="add">追加</layui:accessButton>
<layui:accessButton function="budgetDeclaratio.add" action="add">追加新项目</layui:accessButton>
<layui:accessButton function="budgetDeclaratio.edits" action="edits">原项目追加</layui:accessButton>
<!-- <layui:accessButton function="budgetDeclaratio.edit" action="edit">批量提交</layui:accessButton> -->
<!-- <layui:accessButton function="budgetDeclaratio.del" action="del">删除</layui:accessButton>
<layui:accessButton function="budgetDeclaratio.exportDocument" action="exportDocument">导出</layui:accessButton>
......
src/main/resources/templates/dubget/budgetDeclaratio/reply.html
......@@ -13,7 +13,7 @@
<div class="layui-inline">
<label class="layui-form-label">预算类型</label>
<div class="layui-input-inline">
<input type="text" readonly="readonly" value="${budgtType.type}" class="layui-input" >
<input type="text" readonly="readonly" value="${budgtType.name}" class="layui-input" >
<input type="hidden" readonly="readonly" id="type" name="type" value="${budgetDeclaratio.type}" class="layui-input" >
</div>
</div>
......
src/main/resources/templates/dubget/budgetDeclaratio/tjindex.html
......@@ -9,9 +9,8 @@
<layui:accessButton function="budgetDeclaratio.importDocument" action="importDocument">导入</layui:accessButton>
-->
<layui:accessButton function="budgetDeclaratio.exportDocument" action="exportDocument">导出全部</layui:accessButton>
</div>
<h1>申报预算总额<i id="hxzy" style="color: red;">0</i></h1>
<table id="budgetDeclaratioTable" lay-filter="budgetDeclaratioTable"></table>
<!--#} -->
<script type="text/javascript" src="${ctxPath}/js/layui_exts/excel.min.js"></script>
......
src/main/resources/templates/dubget/budgetDeclaratio/xgedit.html
......@@ -64,7 +64,17 @@
<input type="text" id="year" readonly="readonly" name="year" value="${budgetDeclaratio.year}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">预算范围</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="range" lay-filter="range" layVerify=""
id="range" name="range" value="" />
</div>
</div>
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">备注：</label>
......
src/main/resources/templates/dubget/budgetVerification/add.html
......@@ -19,7 +19,7 @@
<div class="layui-inline">
<label class="layui-form-label">执行金额</label>
<div class="layui-input-inline">
<input type="text" id="execute" name="execute" class="layui-input" lay-verify="number" >
<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; " >
......
src/main/resources/templates/dubget/budgetVerification/audit.html
......@@ -28,7 +28,7 @@
<div class="layui-inline">
<label class="layui-form-label">核销金额</label>
<div class="layui-input-inline">
<input type="text" id="chargeOff" name="chargeOff" value="${budgetVerification.chargeOff}" class="layui-input" lay-verify="number" >
<input type="text" id="chargeOff" name="chargeOff" value="${budgetVerification.execute}" class="layui-input" >
</div>
<div class="layui-inline">
<input autocomplete="off" class="layui-input" value="不超过${budgetVerification.execute}" style="border: 0;color: red; " >
......
src/main/resources/templates/dubget/budgetVerification/tjindex.html
......@@ -4,8 +4,7 @@
<input type="hidden" id="budgetId" name="budgetId" class="layui-input" value="${budgetId}">
<layui:accessButton function="budgetVerification.exportDocument" action="exportDocument">导出全部</layui:accessButton>
<h1>执行总额<i id="zx" style="color: red;">0</i>,核销总额<i id="hx" style="color: red;">0</i></h1>
<table id="budgetVerificationTable" lay-filter="budgetVerificationTable"></table>
<!--#} -->
<script>
......
src/main/resources/templates/dubget/budgtBase/add.html
......@@ -18,18 +18,14 @@
</div>
</div>
<div class="layui-form-item">
<!-- <div class="layui-inline">
<label class="layui-form-label">科室名称</label>
<div class="layui-input-inline">
<input type="text" name="orgName" class="layui-input"
readonly="readonly"> <input id="orgId" name="orgId"
type="hidden" class="layui-input">
</div>
<div class="layui-input-inline">
<button id="selectTitleCode" type="button"
class="layui-btn layui-btn-primary">选择</button>
</div>
</div> -->
<div class="layui-inline">
<label class="layui-form-label">预算范围</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="range" lay-filter="range" layVerify=""
id="range" name="range" value="" />
</div>
</div>
</div>
</div>
<layui:submitButtons id="addButton" />
......
src/main/resources/templates/dubget/budgtBase/edit.html
......@@ -17,23 +17,18 @@
</div>
</div>
</div>
<!-- <div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">科室名称</label>
<div class="layui-input-inline">
<input type="text" name="orgName" class="layui-input"
readonly="readonly" value="${budgtBase.orgName}"> <input id="orgId" name="orgId"
type="hidden" class="layui-input" value="${budgtBase.orgId}" >
</div>
<div class="layui-input-inline">
<button id="selectTitleCode" type="button"
class="layui-btn layui-btn-primary">选择</button>
</div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">预算范围</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="range" lay-filter="range" layVerify=""
id="range" name="range" value="${budgtBase.range}" />
</div>
</div>
</div>
</div>
</div> -->
</div>
<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
<input type="hidden" name="id" value=${budgtBase.id} />
<layui:submitButtons id="updateButton" />
......
src/main/resources/templates/dubget/budgtType/add.html
......@@ -10,12 +10,23 @@
<input type="text" name="type" class="layui-input" >
</div>
</div>
<!-- <div class="layui-inline">
<label class="layui-form-label">预算编码</label>
<div class="layui-inline">
<label class="layui-form-label">上级预算类型</label>
<div class="layui-input-inline">
<input type="text" name="code" class="layui-input" >
<select name="parentId" id="parentId" lay-filter="mySelect">
<option value="">请选择</option>
<!--#
for(var i = 0; i < list.~size; i++){
var ty=list[i];
-->
<option value="${ty.id}">${ty.name}</option>
<!--# } -->
</select>
</div>
</div> -->
</div>
</div>
</div>
......
src/main/resources/templates/dubget/budgtType/edit.html
......@@ -9,10 +9,20 @@
<input type="text" id="type" name="type" value="${budgtType.type}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">预算编码</label>
<div class="layui-input-inline">
<input type="text" id="code" name="code" value="${budgtType.code}" class="layui-input" >
<div class="layui-inline">
<label class="layui-form-label">上级预算类型</label>
<div class="layui-input-inline ">
<select name="parentId" id="parentId" lay-filter="mySelect" lay-search >
<option value="">请选择</option>
<!--#
for(var i = 0; i < list.~size; i++){
var ty=list[i];
-->
<option value="${ty.id}">${ty.name}</option>
<!--# } -->
</select>
</div>
</div>
</div>
......@@ -41,11 +51,14 @@
<layui:submitButtons id="updateButton" />
</form>
<!--#} -->
<script type="text/javascript" src="${ctxPath}/js/dubget/budgtType/selectObject.js"></script>
<script type="text/javascript" src="${ctxPath}/js/dubget/budgtBase/selectObject.js"></script>
<script>
layui.use(['edit'], function(){
layui.use(['edit','form'], function(){
var budgtTypeEdit = layui.edit
budgtTypeEdit.init();
$("#parentId").val("${budgtType.parentId}")
var form=layui.form;
form.render();
});
</script>
src/main/resources/templates/index.html
<!--#layout("/common/container.html"){ -->
<!--#layout("/common/container.html"){ -->
<!-- 顶部 -->
<link rel="stylesheet" href="${ctxPath}/plugins/messages/css/message.css">
<style type="text/css">
......@@ -19,11 +19,7 @@
width: 100%;
}
.ellipsis{ line-height: 20px; text-indent:2em; }
a.looklist{ margin-top:10px;}
.fsTopMenu{ width: calc(100% - 570px);min-width: 200px;overflow:hidden;background-color: transparent;border: 0;}
#fsTopMenu li a,#fsTopMenu .layui-tab-bar{color:#ffffff; display:inline;}
#fsTopMenu .layui-this,#fsTopMenu .layui-this a{color: #333;}
.layui-layout-left>.layui-tab-title{ background-color: transparent; }
a.looklist{ margin-top:10px;}
.layadmin-iframe{position:relative;}
</style>
<form class="layui-form layui-form-pane">
......@@ -33,19 +29,7 @@
<!-- <a href="javascript:;" class="layui-hide-xs"><div class="fsSwitchMenu"><i class="layui-icon iconfont layui-icon-shrink-right"></i></div></a>
-->
<!-- 顶部菜单spk-platform-core/src/resources/templates/index.html -->
<div class="layui-layout-left fsTopMenu layui-tab layui-tab-card"id="fsTopMenu" >
<ul class="layui-tab-title" lay-filter="fsTopMenu">
<!--#for(node in menus.children){ -->
<li class=" ${nodeLP.first?'layui-this'}" dataPid="${node.data.id}"><a href="javascript:;"><i class="layui-icon">${node.data.icon}</i>
<!--#if(nodeLP.first){ -->
<cite>${node.data.name}</cite>
<!--#}else{ -->
${node.data.name}
<!--#} -->
</a></li>
<!--#} -->
</ul>
</div>
<ul class="layui-nav layui-layout-right">
<!-- 消息提醒 -->
<li class="layui-nav-item layui-hide-xs">
......@@ -55,11 +39,6 @@
<a href="javascript:;">
${session["core:user"].name}
</a>
<dl class="layui-nav-child">
<dd><a href="javascript:;">基本资料</a></dd>
<dd id="changeCompanyButton"><a href="javascript:;">${session["core:currentOrg"].name}</a>
</dd>
</dl>
</li>
<li class="layui-nav-item layui-hide-xs user-modify-password"><a style="cursor: pointer;"><i class="layui-icon layui-icon-set"></i> 修改密码</a></li>
<li class="layui-nav-item layui-hide-xs"><a href="${ctxPath}/logout.do"><i class="iconfont icon-tuichu"></i> 退出</a></li>
......@@ -97,7 +76,7 @@
<!-- 内容 -->
<div class="layui-tab layui-tab-card fsTab">
<iframe loading="lazy" class="layadmin-iframe"></iframe>
<iframe loading="lazy" class="layadmin-iframe" src="${ctxPath}/admin/notice/unReplyNotice.do"></iframe>
</div>
</div>
<!-- 配色弹窗 -->
......@@ -136,7 +115,7 @@
var hasSite = true;//系统的第一个菜单默认显示
-->
<!--#for(subSystem in node.children){ -->
<li class="layui-nav-item layui-nav-itemed" dataPid="${node.data.id}" style="display: none;">
<li class="layui-nav-item layui-nav-itemed" dataPid="${node.data.id}">
<a href="javascript:;">${subSystem.data.name}</a>
<dl class="layui-nav-child">
<!--#for(menu in subSystem.children){ -->
......
src/main/resources/templates/po/poDept/index.html
......@@ -6,9 +6,12 @@
<layui:accessButton function="poDept.add" action="add">增加</layui:accessButton>
<layui:accessButton function="poDept.edit" action="edit">编辑</layui:accessButton>
<layui:accessButton function="poDept.del" action="del">删除</layui:accessButton>
<layui:accessButton function="poDept.importDocument" action="importDocument">导入</layui:accessButton> </div>
<layui:accessButton function="poDept.importUser" action="importUser">导入人员</layui:accessButton> </div>
<layui:accessButton function="poDept.importType" action="importType">导入预算类型</layui:accessButton> </div>
<layui:accessButton function="poDept.importDocument" action="importDocument">导入</layui:accessButton>
<layui:accessButton function="poDept.importUser" action="importUser">导入人员</layui:accessButton>
<layui:accessButton function="poDept.importType" action="importType">导入预算类型</layui:accessButton>
<layui:accessButton function="poDept.importSB" action="importSB">导入预算申报</layui:accessButton>
<layui:accessButton function="poDept.importZX" action="importZX">导入预算执行</layui:accessButton>
</div>
<table id="poDeptTable" lay-filter="poDeptTable"></table>
<!--#} -->
<script>
......
src/main/resources/templates/re/dow/add.html 0 → 100644
<!--# layout("/common/layout.html",{"jsBase":"/js/re/dow/"}){ -->
<form class="layui-form layui-form-pane" id="addForm">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">预算类型</label>
<div class="layui-input-inline">
<select name="budgtType" id="budgtType" lay-filter="mySelect" lay-search>
<option value="">请选择</option>
<!--#
for(var i = 0; i < list.~size; i++){
var ty=list[i];
-->
<option value="${ty.id}">${ty.name}</option>
<!--# } -->
</select>
</div>
</div>
<input type="hidden" name="name" id="name" class="layui-input" >
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">排序</label>
<div class="layui-input-inline">
<input type="text" name="sotr" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">自定义名称</label>
<div class="layui-input-inline">
<input type="text" name="customName" class="layui-input" >
</div>
</div>
</div>
</div>
<layui:submitButtons id="addButton" />
</form>
<!--#} -->
<script>
layui.use(['add','form'], function(){
var dowAdd = layui.add;
dowAdd.init();
var form=layui.form;
form.on('select(mySelect)', function(data){
/* console.log(data.elem); //得到select原始DOM对象
console.log(data.value); //得到被选中的值 */
$("#name").val(data.elem[data.elem.selectedIndex].text)
// console.log(data.elem[data.elem.selectedIndex].text); //得到文本
});
});
</script>
src/main/resources/templates/re/dow/edit.html 0 → 100644
<!--# layout("/common/layout.html",{"jsBase":"/js/re/dow/"}){ -->
<form class="layui-form layui-form-pane" id="updateForm">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">预算类型</label>
<div class="layui-input-inline">
<select name="budgtType" id="budgtType" lay-filter="mySelect" lay-search>
<option value="">请选择</option>
<!--#
for(var i = 0; i < list.~size; i++){
var ty=list[i];
-->
<option value="${ty.id}">${ty.name}</option>
<!--# } -->
</select>
</div>
</div>
<input type="hidden" name="name" id="name" class="layui-input" value="${dow.name}" >
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">排序</label>
<div class="layui-input-inline">
<input type="text" id="sotr" name="sotr" value="${dow.sotr}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">自定义名称</label>
<div class="layui-input-inline">
<input type="text" id="customName" name="customName" value="${dow.customName}" class="layui-input" >
</div>
</div>
</div>
</div>
<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
<input type="hidden" name="id" value=${dow.id} />
<layui:submitButtons id="updateButton" />
</form>
<!--#} -->
<script>
layui.use(['edit','form'], function(){
var dowEdit = layui.edit
dowEdit.init();
$("#budgtType").val("${dow.budgtType}")
var form=layui.form;
form.render();
form.on('select(mySelect)', function(data){
/* console.log(data.elem); //得到select原始DOM对象
console.log(data.value); //得到被选中的值 */
$("#name").val(data.elem[data.elem.selectedIndex].text)
// console.log(data.elem[data.elem.selectedIndex].text); //得到文本
});
});
</script>
src/main/resources/templates/re/dow/index.html 0 → 100644
<!--#layout("/common/layout.html",{"jsBase":"/js/re/dow/"}){ -->
<layui:searchForm formId="searchForm" condition="${search}">
</layui:searchForm>
<div class="layui-btn-group">
<layui:accessButton function="dow.add" action="add">增加</layui:accessButton>
<layui:accessButton function="dow.edit" action="edit">编辑</layui:accessButton>
<layui:accessButton function="dow.del" action="del">删除</layui:accessButton>
<layui:accessButton function="dow.exportDocument" action="exportDocument">导出</layui:accessButton>
</div>
<table id="dowTable" lay-filter="dowTable"></table>
<!--#} -->
<script>
layui.use(['index'], function(){
var index = layui.index
index.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