From fe02f176b512a9d6a4e12437d929e04e99bb7567 Mon Sep 17 00:00:00 2001
From: zs <zhoushuai@zbooksoft.com>
Date: 星期三, 04 二月 2026 16:17:26 +0800
Subject: [PATCH] 报表调整，新增统计图，入库时需要移动附件位置
---
src/main/java/com/zbooksoft/gdmis/data/entity/SaveQuestion.java | 42 +++
src/main/java/com/zbooksoft/gdmis/service/SaveQuestionService.java | 15 +
src/main/java/com/zbooksoft/gdmis/controller/ScreenController.java | 32 +-
src/main/java/com/zbooksoft/gdmis/dao/SaveQuestionMapper.java | 19 +
src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport.xml | 17 +
src/main/java/com/zbooksoft/gdmis/operate/CatAjjxxOperate.java | 114 +++++++++-
src/main/java/com/zbooksoft/gdmis/operate/TransferOperate.java | 20 +
src/main/webapp/WEB-INF/view/gh/utlStatistics/utlStatisticsByDept.jsp | 9
src/main/webapp/WEB-INF/view/gh/search/advancedQuery.jsp | 1
src/main/webapp/WEB-INF/view/gh/search/searchResult.jsp | 4
src/main/java/com/zbooksoft/gdmis/controller/CatAjjxxController.java | 64 +++++
src/main/java/com/zbooksoft/gdmis/service/impl/XmlServiceImpl.java | 4
src/main/webapp/WEB-INF/view/gh/utlStatistics/transferStatistics.jsp | 124 +++++++---
src/main/webapp/WEB-INF/view/gh/utlStatistics/typeStatistics.jsp | 21 +
src/main/java/com/zbooksoft/gdmis/service/impl/SaveQuestionServiceImpl.java | 21 +
src/main/webapp/WEB-INF/view/gh/catAjjxx/checkIndex.jsp | 51 ++--
src/main/java/com/zbooksoft/gdmis/data/entity/CheckQuestion.java | 12
src/main/java/com/zbooksoft/gdmis/controller/UtlStatisticsController.java | 82 ++++++-
src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp | 7
19 files changed, 530 insertions(+), 129 deletions(-)
diff --git a/src/main/java/com/zbooksoft/gdmis/controller/CatAjjxxController.java b/src/main/java/com/zbooksoft/gdmis/controller/CatAjjxxController.java
index 555e5e0..28e3c41 100644
--- a/src/main/java/com/zbooksoft/gdmis/controller/CatAjjxxController.java
+++ b/src/main/java/com/zbooksoft/gdmis/controller/CatAjjxxController.java
@@ -9,9 +9,7 @@
import com.ruili.wcp.web.model.AjaxResponse;
import com.ruili.wcp.web.model.ErrorInfo;
import com.zbooksoft.gdmis.config.ArchivesCustomConfig;
-import com.zbooksoft.gdmis.data.entity.CatCgwjxx;
-import com.zbooksoft.gdmis.data.entity.CatCheck;
-import com.zbooksoft.gdmis.data.entity.CatYswjxx;
+import com.zbooksoft.gdmis.data.entity.*;
import com.zbooksoft.gdmis.service.*;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -66,6 +64,10 @@
UpdateXml2023Service updateXml2023Service;
@Autowired
XmlService xmlService;
+ @Autowired
+ CheckQuestionService checkQuestionService;
+ @Autowired
+ SaveQuestionService saveQuestionService;
@Autowired
CustomConfigUtil customConfigUtil;
@@ -381,7 +383,7 @@
String uploadPath = archivesCustomConfig.getOriginalPath();
for (Map<String, Object> map : list) {
// String dh = map.get("DH").toString();
- String dh = map.get("XMKYQBH").toString();
+ String dh = map.get("XMKYQBH").toString()+"["+map.get("XMKYQMC")+"]";
//d/鐪侀妗ｅ彿
String filePath = uploadPath + dh + File.separator + "鐢靛瓙鏂囦欢" + File.separator;
Long id = Long.parseLong(map.get("ID").toString());
@@ -557,6 +559,47 @@
}
/**
+ * 娣诲姞楠屾敹闂
+ *
+ * @return
+ */
+ @RequestMapping({"/SaveQuestion"})
+ @ResponseBody
+ @RequiresUser
+ public Object SaveQuestion(@RequestBody Map<String, Object> postData) {
+ try {
+ Long id = Long.parseLong(postData.get("id").toString());
+
+ String selectSql = "SELECT * FROM BUS_TRANSFER_LOG WHERE ID =" + id;
+ Map<String, Object> map = jdbcTemplate.queryForMap(selectSql);
+ Object ajId = map.get("AJ_ID");
+ List<String> ids= (List<String>) postData.get("ids");
+ for (String questionId : ids) {
+ CheckQuestion question= checkQuestionService.getById(questionId);
+ if (question != null) {
+ QueryWrapper<SaveQuestion> queryWrapper=new QueryWrapper<>();
+ queryWrapper.eq("TRANSFER_ID",id).eq("CHECK_ID",question.getId());
+ List<SaveQuestion> saveQuestionList=saveQuestionService.list(queryWrapper);
+ if (saveQuestionList.size()==0){
+ SaveQuestion saveQuestion=new SaveQuestion();
+ saveQuestion.setQuestion(question.getQuestion());
+ saveQuestion.setRequirements(question.getRequirements());
+ saveQuestion.setTranslation(question.getTranslation());
+ saveQuestion.setTransferId(id);
+ saveQuestion.setCheckId(question.getId());
+ saveQuestionService.saveOrUpdate(saveQuestion);
+ }
+ }
+ }
+
+ return new AjaxResponse(true);
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return new AjaxResponse(new ErrorInfo(e.getMessage()), false);
+ }
+ }
+
+ /**
* 璧勬枡楠屾敹
*
* @return
@@ -580,18 +623,23 @@
CatCheck catCheck = new CatCheck();
catCheck.setItemId(id);
catCheck.setAjId(Long.parseLong(ajId.toString()));
- catCheck.setQuestion(postData.get("question").toString());
+// catCheck.setQuestion(postData.get("question").toString());
catCheck.setIsPass(checkState);
catCheck.setCreateTime(new Date());
catCheck.setCreateUserName(user.getUserName());
catCheck.setCreateUserId(user.getUserId());
- catCheck.setCheckQuestion(postData.get("checkQuestion") == null ? "" : postData.get("checkQuestion").toString());
+// catCheck.setCheckQuestion(postData.get("checkQuestion") == null ? "" : postData.get("checkQuestion").toString());
catCheckService.saveOrUpdate(catCheck);
String updateSql = "update BUS_TRANSFER_LOG set YSZT = '" + checkState + "' where ID = " + id;
jdbcTemplate.execute(updateSql);
- String updateSqlY = "update CAT_ITEM_YSWJXX set YSZT = '" + checkState + "' where YJ_ID = " + id;
- jdbcTemplate.execute(updateSqlY);
+ if (checkState==1){
+ String updateSqlY = "update CAT_ITEM_YSWJXX set YSZT = '" + checkState + "' where YJ_ID = " + id;
+ jdbcTemplate.execute(updateSqlY);
+ }else if (checkState==3){
+ String updateSqlY = "update CAT_FILE_AJJXX set YSWSJ = '" + postData.get("checkData") + "' where ID = " + ajId;
+ jdbcTemplate.execute(updateSqlY);
+ }
return new AjaxResponse(true);
} catch (Exception e) {
logger.error(e.getMessage(), e);
diff --git a/src/main/java/com/zbooksoft/gdmis/controller/ScreenController.java b/src/main/java/com/zbooksoft/gdmis/controller/ScreenController.java
index f89f3bb..99f6f2c 100644
--- a/src/main/java/com/zbooksoft/gdmis/controller/ScreenController.java
+++ b/src/main/java/com/zbooksoft/gdmis/controller/ScreenController.java
@@ -10,6 +10,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -32,6 +33,8 @@
DesktopLayoutService desktopLayoutService;
private static final Logger logger = LoggerFactory.getLogger(ScreenController.class);
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
@RequestMapping
@@ -108,29 +111,16 @@
// 鑾峰彇鏉′欢鎼滅储鐨勬煴鐘跺浘鏁版嵁
@RequestMapping("/getSearchConditionEchartsHistogram")
@ResponseBody
- public Object getSearchConditionEchartsHistogram() {
+ public Object getSearchConditionEchartsHistogram(String columnName) {
+ String Sql="select "+columnName+",count("+columnName+") as num FROM cat_item_yswjxx where "+columnName+" is not null group by "+columnName;
+ List<Map<String,Object>> list=jdbcTemplate.queryForList(Sql);
List<String> xAxisData = new ArrayList<String>();
- xAxisData.add("娴锋磱鍖哄煙鍦拌川璋冩煡");
- xAxisData.add("娴峰哺甯﹀湴璐ㄧ熆浜ц皟鏌�");
- xAxisData.add("澶ч檰鏋跺湴璐ㄧ熆浜ц皟鏌�");
- xAxisData.add("鍥介檯娴峰簳鍦拌川鐭夸骇璋冩煡");
- xAxisData.add("鏋佸湴鍦拌川璋冩煡");
- xAxisData.add("鍏朵粬娴锋磱鍦拌川璋冩煡");
- xAxisData.add("姘村伐鐜湴璐ㄥ嫎鏌�");
- xAxisData.add("鍦拌川绉戝鐮旂┒");
- xAxisData.add("鎶�鏈柟娉曠爺绌�");
- List<JSONObject> seriesList = new ArrayList<JSONObject>();
List<Object> yList = new ArrayList<Object>();
- yList.add(10);
- yList.add(20);
- yList.add(80);
- yList.add(0);
- yList.add(30);
- yList.add(10);
- yList.add(40);
- yList.add(50);
- yList.add(60);
-
+ for (Map<String,Object> map:list){
+ xAxisData.add(map.get(columnName).toString());
+ yList.add(map.get("num"));
+ }
+ List<JSONObject> seriesList = new ArrayList<JSONObject>();
JSONObject job = new JSONObject();
job.put("name", "妗ｆ鏁伴噺");
job.put("type", "bar");
diff --git a/src/main/java/com/zbooksoft/gdmis/controller/UtlStatisticsController.java b/src/main/java/com/zbooksoft/gdmis/controller/UtlStatisticsController.java
index 9d62c41..effd38f 100644
--- a/src/main/java/com/zbooksoft/gdmis/controller/UtlStatisticsController.java
+++ b/src/main/java/com/zbooksoft/gdmis/controller/UtlStatisticsController.java
@@ -86,14 +86,15 @@
@RequestMapping(value = "/transferStatistics")
@RequiresUser
public ModelAndView transferStatistics() {
- ModelAndView mav = new ModelAndView("gh/utlStatistics/transferStatistics");
+// ModelAndView mav = new ModelAndView("gh/utlStatistics/transferStatistics");
+ ModelAndView mav = new ModelAndView("gh/utlStatistics/cs");
return mav;
}
@RequestMapping({"/getTransferStatistics"})
@ResponseBody
@RequiresUser
- public Object getTransferStatistics(String year, String startData, String endData) {
+ public Object getTransferStatistics(String selectParameter, String startData, String endData) {
try {
String sql = "SELECT " +
" A.ID," +
@@ -103,12 +104,17 @@
" COUNT(CASE WHEN C.yszt = '3' THEN C.ID END) AS tidyCount," +
" COUNT(CASE WHEN C.yszt = '3' THEN C.ID END) AS acceptCount," +
" SUM(C.WJDX) AS acceptData," +
- " COUNT(CASE WHEN D.is_pass = 0 THEN D.id END) AS returnTime" +
+ " COUNT(CASE WHEN D.is_pass = 0 THEN D.id END) AS returnTime," +
+ " SUM(C.YM) AS YM," +
+ " SUM(C.SL) AS SL" +
" FROM CAT_FILE_AJJXX A" +
" LEFT JOIN BUS_TRANSFER_LOG B ON A.ID = B.AJ_ID" +
" LEFT JOIN CAT_ITEM_YSWJXX C ON A.ID = C.AJ_ID" +
" LEFT JOIN CAT_CHECK_INFO D ON A.ID = D.aj_id" +
" WHERE 1=1 ";
+ if (selectParameter.equals("rk")){
+ sql += " AND C.YSZT=3 ";
+ }
// 娣诲姞鏃堕棿娈电瓫閫夋潯浠�
if (startData != null && !startData.isEmpty()) {
sql += " AND B.TRANSFER_TIEM >= '" + startData + "'";
@@ -118,6 +124,53 @@
}
sql += " GROUP BY A.ID, A.XMKYQMC" +
" ORDER BY A.ID;";
+ List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sql);
+ return mapList;
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return new AjaxResponse(new ErrorInfo(e.getMessage()), false);
+ }
+
+ }
+
+ // 鑾峰彇楗肩姸鍥炬暟鎹�
+ @RequestMapping("/getCollectionEchartsPieData")
+ @ResponseBody
+ public Object getCollectionEchartsPieData() {
+ String sql="select xmkyqlx as name,count(b.id) as value FROM cat_file_ajjxx a left join cat_item_yswjxx b on b.aj_id=a.id GROUP by a.xmkyqlx";
+ List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sql);
+ // 灏嗛敭鍚嶈浆鎹负灏忓啓
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Map<String, Object> map : mapList) {
+ Map<String, Object> newMap = new HashMap<>();
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ newMap.put(entry.getKey().toLowerCase(), entry.getValue());
+ }
+ result.add(newMap);
+ }
+ return result;
+ }
+
+ /**
+ * 鍏ュ簱缁熻
+ * @param year
+ * @param startData
+ * @param endData
+ * @return
+ */
+ @RequestMapping({"/getInboundTimelinessRate"})
+ @ResponseBody
+ @RequiresUser
+ public Object getInboundTimelinessRate(String year, String startData, String endData) {
+ try {
+ String sql = "select aj.xmkyqmc,ys.wjtm,ys.sl,ys.ym,ys.wjdx from CAT_ITEM_YSWJXX as ys left join cat_file_ajjxx as aj on ys.aj_id=aj.id where ys.yszt='3' ";
+ // 娣诲姞鏃堕棿娈电瓫閫夋潯浠�
+ if (startData != null && !startData.isEmpty()) {
+ sql += " AND aj.yswsj >= '" + startData + "'";
+ }
+ if (endData != null && !endData.isEmpty()) {
+ sql += " AND aj.yswsj <= '" + endData + "'";
+ }
List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sql);
return mapList;
} catch (Exception e) {
@@ -191,19 +244,22 @@
@RequestMapping({"/getUtlStatisticsByDept"})
@ResponseBody
@RequiresUser
- public Object getUtlStatisticsByDept(String deptName) {
+ public Object getUtlStatisticsByDept(String deptName,String startData, String endData) {
try {
List<Map<String, Object>> mapList = new ArrayList<>();
-
- if (deptName == null || deptName.equals("")) {
- String yearSQL = "SELECT DISTINCT DEPT_NAME AS DEPT_NAME FROM UTL_VIEW_FORM";
- jdbcTemplate.queryForList(yearSQL).forEach(map -> {
- String deptNames = map.get("DEPT_NAME") == null ? "" : map.get("DEPT_NAME").toString();
- Map<String, Object> hashMap = getCount("DEPT_NAME", deptNames);
- hashMap.put("deptName", deptNames);
- mapList.add(hashMap);
- });
+ String yearSQL="SELECT DISTINCT DEPT_NAME AS DEPT_NAME FROM UTL_VIEW_FORM where dept_name like '%"+deptName+"%'";
+ if (startData != null && !startData.isEmpty()) {
+ yearSQL += " AND date >= '" + startData + "'";
}
+ if (endData != null && !endData.isEmpty()) {
+ yearSQL += " AND date <= '" + endData + "'";
+ }
+ jdbcTemplate.queryForList(yearSQL).forEach(map -> {
+ String deptNames = map.get("DEPT_NAME") == null ? "" : map.get("DEPT_NAME").toString();
+ Map<String, Object> hashMap = getCount("DEPT_NAME", deptNames);
+ hashMap.put("deptName", deptNames);
+ mapList.add(hashMap);
+ });
return mapList;
} catch (Exception e) {
logger.error(e.getMessage(), e);
diff --git a/src/main/java/com/zbooksoft/gdmis/dao/SaveQuestionMapper.java b/src/main/java/com/zbooksoft/gdmis/dao/SaveQuestionMapper.java
new file mode 100644
index 0000000..967cd2c
--- /dev/null
+++ b/src/main/java/com/zbooksoft/gdmis/dao/SaveQuestionMapper.java
@@ -0,0 +1,19 @@
+package com.zbooksoft.gdmis.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zbooksoft.gdmis.data.entity.CheckQuestion;
+import com.zbooksoft.gdmis.data.entity.SaveQuestion;
+import com.zbooksoft.gdmis.data.vo.ParentBorrowInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 鍊熼槄鏄庣粏鎺ュ彛
+ * </p>
+ *
+ * @author cb
+ * @since 2020-01-03
+ */
+public interface SaveQuestionMapper extends BaseMapper<SaveQuestion> {
+}
diff --git a/src/main/java/com/zbooksoft/gdmis/data/entity/CheckQuestion.java b/src/main/java/com/zbooksoft/gdmis/data/entity/CheckQuestion.java
index 5782725..9a015f6 100644
--- a/src/main/java/com/zbooksoft/gdmis/data/entity/CheckQuestion.java
+++ b/src/main/java/com/zbooksoft/gdmis/data/entity/CheckQuestion.java
@@ -20,11 +20,19 @@
@TableId(type = IdType.ID_WORKER)
private Long id;
/**
- * 楠屾敹闂
+ * 妫�鏌ラ」
*/
private String question;
/**
- * 妗堝嵎绾d
+ * 闂璇存槑
+ */
+ private String translation;
+ /**
+ * 淇敼瑕佹眰
+ */
+ private String requirements;
+ /**
+ * 澶囨敞
*/
private String remark;
}
diff --git a/src/main/java/com/zbooksoft/gdmis/data/entity/SaveQuestion.java b/src/main/java/com/zbooksoft/gdmis/data/entity/SaveQuestion.java
new file mode 100644
index 0000000..e5d3981
--- /dev/null
+++ b/src/main/java/com/zbooksoft/gdmis/data/entity/SaveQuestion.java
@@ -0,0 +1,42 @@
+package com.zbooksoft.gdmis.data.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @Description:鍊熼槄鍗曟槑缁�
+ * @Author: zhai
+ * @Date: 2024/8/2
+ **/
+@TableName("BUS_SAVE_QUESTION")
+@Data
+public class SaveQuestion {
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.ID_WORKER)
+ private Long id;
+ /**
+ * 妫�鏌ラ」
+ */
+ private String question;
+ /**
+ * 闂璇存槑
+ */
+ private String translation;
+ /**
+ * 淇敼瑕佹眰
+ */
+ private String requirements;
+ /**
+ * 绉讳氦ID
+ */
+ private Long transferId;
+ /**
+ * 闂椤笽D
+ */
+ private Long checkId;
+}
diff --git a/src/main/java/com/zbooksoft/gdmis/operate/CatAjjxxOperate.java b/src/main/java/com/zbooksoft/gdmis/operate/CatAjjxxOperate.java
index 9bf2167..96c8cb6 100644
--- a/src/main/java/com/zbooksoft/gdmis/operate/CatAjjxxOperate.java
+++ b/src/main/java/com/zbooksoft/gdmis/operate/CatAjjxxOperate.java
@@ -1,7 +1,9 @@
package com.zbooksoft.gdmis.operate;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruili.wcp.common.CustomConfigUtil;
import com.ruili.wcp.common.SpringContextUtil;
+import com.ruili.wcp.configsettting.SystemConfig;
import com.ruili.wcp.data.entity.config.Module;
import com.ruili.wcp.data.entity.config.View;
import com.ruili.wcp.data.entity.management.User;
@@ -10,8 +12,10 @@
import com.ruili.wcp.service.config.ViewService;
import com.ruili.wcp.web.model.AjaxResponse;
import com.ruili.wcp.web.model.ErrorInfo;
+import com.zbooksoft.gdmis.config.ArchivesCustomConfig;
import com.zbooksoft.gdmis.data.entity.BorrowDetail;
import com.zbooksoft.gdmis.data.entity.CatAjjxx;
+import com.zbooksoft.gdmis.data.entity.CatYswjxx;
import com.zbooksoft.gdmis.data.entity.PhysicalDetail;
import com.zbooksoft.gdmis.service.*;
import org.apache.shiro.SecurityUtils;
@@ -22,6 +26,8 @@
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
import org.springframework.jdbc.core.JdbcTemplate;
+import java.io.File;
+import java.io.IOException;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.time.LocalDateTime;
@@ -43,6 +49,8 @@
ModuleService moduleService = (ModuleService) SpringContextUtil.getBean("moduleServiceImpl");
JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtil.getBean("jdbcTemplate");
IFormData iform = (IFormData) SpringContextUtil.getBean("iFormData");
+ CatYswjxxService catYswjxxService = (CatYswjxxService) SpringContextUtil.getBean("catYswjxxServiceImpl");
+ CustomConfigUtil customConfigUtil = (CustomConfigUtil) SpringContextUtil.getBean("customConfigUtil");
/**
@@ -73,11 +81,91 @@
return idList.size();
}
});
+ QueryWrapper<CatYswjxx> queryWrapper=new QueryWrapper<>();
+ queryWrapper.in("aj_id",idList).eq("yszt",3);
+// queryWrapper.in("aj_id",idList);
+ List<CatYswjxx> catYswjxxList=catYswjxxService.list(queryWrapper);
+ ArchivesCustomConfig archivesCustomConfig = customConfigUtil.getConfigObj(ArchivesCustomConfig.class);
+ for (CatYswjxx catYswjxx : catYswjxxList) {
+ String destDir = archivesCustomConfig.getOriginalPath() + "宸插叆搴�" + File.separator + catYswjxx.getWjlj().substring(archivesCustomConfig.getOriginalPath().length());
+ // 婧愭枃浠惰矾寰�
+ File sourceFile = new File(catYswjxx.getWjlj());
+ // 鐩爣鏂囦欢璺緞
+ File destFile = new File(destDir);
+
+ // 纭繚鐩爣鐩綍瀛樺湪
+ File destParentDir = destFile.getParentFile();
+ if (destParentDir != null && !destParentDir.exists()) {
+ destParentDir.mkdirs();
+ }
+
+ // 鍒ゆ柇婧愭枃浠舵槸鏂囦欢杩樻槸鏂囦欢澶�
+ if (sourceFile.isDirectory()) {
+ // 濡傛灉鏄枃浠跺す锛屽鍒舵暣涓枃浠跺す鍙婂叾鍐呭
+ copyDirectory(sourceFile, destFile);
+ } else {
+ // 濡傛灉鏄枃浠讹紝鐩存帴澶嶅埗
+ java.nio.file.Files.copy(sourceFile.toPath(), destFile.toPath(),
+ java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+ }
+
+ // 鍒犻櫎婧愭枃浠舵垨婧愭枃浠跺す
+ deleteDirectory(sourceFile);
+
+ catYswjxx.setWjlj(destDir);
+ catYswjxxService.saveOrUpdate(catYswjxx);
+ }
return new AjaxResponse(true);
} catch (Exception e) {
logger.error(e.getMessage(), e);
return new AjaxResponse(new ErrorInfo(e.getMessage()), false);
}
+ }
+
+ /**
+ * 澶嶅埗鐩綍鍙婂叾瀛愮洰褰曞拰鏂囦欢
+ * @param source 婧愮洰褰�
+ * @param target 鐩爣鐩綍
+ * @throws IOException
+ */
+ private void copyDirectory(File source, File target) throws IOException {
+ if (source.isDirectory()) {
+ // 濡傛灉鐩爣鐩綍涓嶅瓨鍦紝鍒欏垱寤�
+ if (!target.exists()) {
+ target.mkdirs();
+ }
+
+ // 鑾峰彇婧愮洰褰曚笅鐨勬墍鏈夋枃浠跺拰瀛愮洰褰�
+ String[] files = source.list();
+ if (files != null) {
+ for (String file : files) {
+ File srcFile = new File(source, file);
+ File destFile = new File(target, file);
+ // 閫掑綊澶嶅埗
+ copyDirectory(srcFile, destFile);
+ }
+ }
+ } else {
+ // 濡傛灉鏄枃浠讹紝鐩存帴澶嶅埗
+ java.nio.file.Files.copy(source.toPath(), target.toPath(),
+ java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+ }
+ }
+
+ /**
+ * 鍒犻櫎鐩綍鍙婂叾瀛愮洰褰曞拰鏂囦欢
+ * @param directory 瑕佸垹闄ょ殑鐩綍
+ */
+ private void deleteDirectory(File directory) {
+ if (directory.isDirectory()) {
+ File[] files = directory.listFiles();
+ if (files != null) {
+ for (File file : files) {
+ deleteDirectory(file);
+ }
+ }
+ }
+ directory.delete();
}
/**
@@ -91,7 +179,10 @@
try {
int state = 0;
String columnName = "fbzt";
- updateState(viewId, idList, state, columnName);
+// updateState(viewId, idList, state, columnName);
+ QueryWrapper<CatAjjxx> fileQueryWrapper = new QueryWrapper<>();
+ fileQueryWrapper.in("id",idList);
+ List<CatAjjxx> catAjjxxList=catAjjxxService.list(fileQueryWrapper);
return new AjaxResponse(true);
} catch (Exception e) {
logger.error(e.getMessage(), e);
@@ -122,17 +213,18 @@
public void updateState(Long viewId, ArrayList<Long> idList, Integer state, String columnName) {
View view = viewService.getViewById(viewId);
String strSql = "update " + view.getMainTableName() + " set " + columnName + " = " + state;
- jdbcTemplate.batchUpdate(strSql + " where " + view.getIdField() + "=?", new BatchPreparedStatementSetter() {
- @Override
- public void setValues(PreparedStatement ps, int i) throws SQLException {
- ps.setLong(1, idList.get(i));// 涓嬫爣浠�1寮�濮�
- }
+// jdbcTemplate.batchUpdate(strSql + " where " + view.getIdField() + "=?", new BatchPreparedStatementSetter() {
+// @Override
+// public void setValues(PreparedStatement ps, int i) throws SQLException {
+// ps.setLong(1, idList.get(i));// 涓嬫爣浠�1寮�濮�
+// }
+//
+// @Override
+// public int getBatchSize() {
+// return idList.size();
+// }
+// });
- @Override
- public int getBatchSize() {
- return idList.size();
- }
- });
}
diff --git a/src/main/java/com/zbooksoft/gdmis/operate/TransferOperate.java b/src/main/java/com/zbooksoft/gdmis/operate/TransferOperate.java
index a68d623..a535e90 100644
--- a/src/main/java/com/zbooksoft/gdmis/operate/TransferOperate.java
+++ b/src/main/java/com/zbooksoft/gdmis/operate/TransferOperate.java
@@ -5,6 +5,7 @@
import com.ruili.wcp.service.config.ViewService;
import com.ruili.wcp.web.model.AjaxResponse;
import com.ruili.wcp.web.model.ErrorInfo;
+import com.zbooksoft.gdmis.data.entity.CatAjjxx;
import com.zbooksoft.gdmis.service.CatSmxxService;
import com.zbooksoft.gdmis.service.CatYswjxxService;
import com.zbooksoft.gdmis.service.PackingManageService;
@@ -13,6 +14,8 @@
import org.springframework.jdbc.core.JdbcTemplate;
import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* @Description:鍘熷鏂囦欢淇℃伅鎿嶄綔鏂规硶
@@ -77,4 +80,21 @@
return new AjaxResponse(new ErrorInfo(e.getMessage()), false);
}
}
+
+ /**
+ * 鎺ユ敹鍒板疄浣撹祫鏂欏悗纭楠屾敹鍚堟牸
+ *
+ * @param viewId
+ * @param idList
+ * @return
+ */
+ public AjaxResponse qualified(Long viewId, ArrayList<Long> idList) {
+ try {
+ String updateSqlY = "update CAT_ITEM_YSWJXX set YSZT = '3' where YJ_ID = " + idList.get(0);
+ jdbcTemplate.execute(updateSqlY);
+ return new AjaxResponse(true);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
}
diff --git a/src/main/java/com/zbooksoft/gdmis/service/SaveQuestionService.java b/src/main/java/com/zbooksoft/gdmis/service/SaveQuestionService.java
new file mode 100644
index 0000000..774ccab
--- /dev/null
+++ b/src/main/java/com/zbooksoft/gdmis/service/SaveQuestionService.java
@@ -0,0 +1,15 @@
+package com.zbooksoft.gdmis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zbooksoft.gdmis.data.entity.SaveQuestion;
+
+import java.util.List;
+
+
+/**
+ * @Description
+ * @Author zhai
+ * @Date 2024/7/31
+ **/
+public interface SaveQuestionService extends IService<SaveQuestion> {
+}
diff --git a/src/main/java/com/zbooksoft/gdmis/service/impl/SaveQuestionServiceImpl.java b/src/main/java/com/zbooksoft/gdmis/service/impl/SaveQuestionServiceImpl.java
new file mode 100644
index 0000000..847117e
--- /dev/null
+++ b/src/main/java/com/zbooksoft/gdmis/service/impl/SaveQuestionServiceImpl.java
@@ -0,0 +1,21 @@
+package com.zbooksoft.gdmis.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zbooksoft.gdmis.dao.SaveQuestionMapper;
+import com.zbooksoft.gdmis.data.entity.SaveQuestion;
+import com.zbooksoft.gdmis.service.SaveQuestionService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author cb
+ * @since 2020-01-03
+ */
+@Service
+public class SaveQuestionServiceImpl extends ServiceImpl<SaveQuestionMapper, SaveQuestion> implements SaveQuestionService {
+}
diff --git a/src/main/java/com/zbooksoft/gdmis/service/impl/XmlServiceImpl.java b/src/main/java/com/zbooksoft/gdmis/service/impl/XmlServiceImpl.java
index d7ba784..30963da 100644
--- a/src/main/java/com/zbooksoft/gdmis/service/impl/XmlServiceImpl.java
+++ b/src/main/java/com/zbooksoft/gdmis/service/impl/XmlServiceImpl.java
@@ -203,6 +203,8 @@
String zxblc = getNodeText(yswjxxNode, "ZXBLC");
String wjgs = getNodeText(yswjxxNode, "WJGSXX/WJGS");
String wjgssm = getNodeText(yswjxxNode, "WJGSXX/WJGSSM");
+ String zllb = getNodeText(yswjxxNode, "ZLLB");
+ String ztlx = getNodeText(yswjxxNode, "ZTLX");
map.put("ID", catYswjxxId);
@@ -220,6 +222,7 @@
}
+ map.put("ZLLB",zllb);
map.put("WJM", wjm);
map.put("XCDWMC", xcdw);
map.put("BXZ", xcr);
@@ -236,6 +239,7 @@
map.put("WJLX", wjlb);
// map.put("WJLJ", wjlj);
map.put("GDZTXS", ztxs);
+ map.put("ZTLX",ztlx);
map.put("QZY", qzy);
map.put("FTHXBLC", hxblc);
map.put("FTZXBLC", zxblc);
diff --git a/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport.xml b/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport.xml
index d95d564..197af5b 100644
--- a/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport.xml
+++ b/src/main/webapp/WEB-INF/ureportfiles/borrow_approval_hn.ureport.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" col-span="13"><cell-style font-size="14" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"></cell-style><simple-value><![CDATA[鍦拌川璧勬枡鍊熼槄鐢宠琛╙]></simple-value></cell><cell expand="None" name="A2" row="2" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜篯]></simple-value></cell><cell expand="None" name="D2" row="2" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_USER_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G2" row="2" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢佃瘽]]></simple-value></cell><cell expand="None" name="I2" row="2" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_TEL" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A3" row="3" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎵�鍦ㄩ儴闂╙]></simple-value></cell><cell expand="None" name="D3" row="3" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="DEPT_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A4" row="4" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠鏃ユ湡]]></simple-value></cell><cell expand="None" name="D4" row="4" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_DATE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G4" row="4" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[褰掕繕鏃堕棿]]></simple-value></cell><cell expand="None" name="I4" row="4" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鈻�1涓湀 鈻″氨鍦板�熼槄]]></simple-value></cell><cell expand="None" name="A5" row="5" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡鐢ㄩ�擼]></simple-value></cell><cell expand="None" name="D5" row="5" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_PURPOSE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A6" row="6" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡瀵嗙骇]]></simple-value></cell><cell expand="None" name="D6" row="6" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鈻＄粷瀵嗙骇 鈻℃満瀵嗙骇 鈻＄瀵嗙骇 鈻″伐浣滅瀵哴]></simple-value></cell><cell expand="None" name="A7" row="7" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[妗ｅ彿]]></simple-value></cell><cell expand="None" name="D7" row="7" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏂囦欢棰樺悕]]></simple-value></cell><cell expand="None" name="G7" row="7" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢靛瓙]]></simple-value></cell><cell expand="None" name="H7" row="7" col="8"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绾歌川]]></simple-value></cell><cell expand="None" name="I7" row="7" col="9"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璋冮槄鍘熶欢]]></simple-value></cell><cell expand="None" name="J7" row="7" col="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[瀵嗙骇]]></simple-value></cell><cell expand="None" name="K7" row="7" col="11"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[娑夊瘑椤电爜]]></simple-value></cell><cell expand="None" name="L7" row="7" col="12" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[澶囨敞]]></simple-value></cell><cell expand="Down" name="A8" row="8" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ARCHIVAL_CODE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="D8" row="8" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ITEM_TITLE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="G8" row="8" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ELECTRONIC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="H8" row="8" col="8"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="PAPER" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="I8" row="8" col="9"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ORIGINAL" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="J8" row="8" col="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="SECURITY_CLASSIFICATION" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="K8" row="8" col="11"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" wrap-compute="true" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="SECURITY_PAGE_NUM" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="L8" row="8" col="12" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A9" row="9" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜烘壙璇篯]></simple-value></cell><cell expand="None" name="D9" row="9" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[ 1.鏈汉鐢宠鐨勮祫鏂欎弗鏍兼寜鐓ф湰琛ㄤ腑濉啓鐨勭敤閫斾娇鐢紝涓嶅悜绗笁鏂规彁渚涳紝涓嶄互浠讳綍
+<?xml version="1.0" encoding="UTF-8"?><ureport><cell expand="None" name="A1" row="1" col="1" col-span="13"><cell-style font-size="14" forecolor="0,0,0" font-family="瀹嬩綋" bold="true" align="center" valign="middle"></cell-style><simple-value><![CDATA[鍦拌川璧勬枡鍊熼槄鐢宠琛╙]></simple-value></cell><cell expand="None" name="A2" row="2" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜篯]></simple-value></cell><cell expand="None" name="D2" row="2" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_USER_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G2" row="2" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢佃瘽]]></simple-value></cell><cell expand="None" name="I2" row="2" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_TEL" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A3" row="3" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鎵�鍦ㄩ儴闂╙]></simple-value></cell><cell expand="None" name="D3" row="3" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="DEPT_NAME" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A4" row="4" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠鏃ユ湡]]></simple-value></cell><cell expand="None" name="D4" row="4" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_DATE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="G4" row="4" col="7" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[褰掕繕鏃堕棿]]></simple-value></cell><cell expand="None" name="I4" row="4" col="9" col-span="5"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" format="yyyy-MM-dd" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鈻�1涓湀 鈻″氨鍦板�熼槄]]></simple-value></cell><cell expand="None" name="A5" row="5" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡鐢ㄩ�擼]></simple-value></cell><cell expand="None" name="D5" row="5" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table3" aggregate="group" property="BORROW_PURPOSE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A6" row="6" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璧勬枡瀵嗙骇]]></simple-value></cell><cell expand="None" name="D6" row="6" col="4"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="right" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[缁濆瘑]]></simple-value></cell><cell expand="Down" name="E6" row="6" col="5"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table1" aggregate="group" property="缁濆瘑" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="F6" row="6" col="6"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="right" valign="middle"><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏈哄瘑]]></simple-value></cell><cell expand="Down" name="G6" row="6" col="7"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table1" aggregate="group" property="鏈哄瘑" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="H6" row="6" col="8"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="right" valign="middle"><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绉樺瘑]]></simple-value></cell><cell expand="Down" name="I6" row="6" col="9"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table1" aggregate="group" property="绉樺瘑" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="J6" row="6" col="10"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="right" valign="middle"><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[宸ヤ綔绉樺瘑]]></simple-value></cell><cell expand="Down" name="K6" row="6" col="11"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table1" aggregate="group" property="宸ヤ綔绉樺瘑" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="L6" row="6" col="12"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="right" valign="middle"><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鍏紑]]></simple-value></cell><cell expand="Down" name="M6" row="6" col="13"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table1" aggregate="group" property="鍏紑" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="A7" row="7" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜烘壙璇篯]></simple-value></cell><cell expand="None" name="D7" row="7" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[ 1.鏈汉鐢宠鐨勮祫鏂欎弗鏍兼寜鐓ф湰琛ㄤ腑濉啓鐨勭敤閫斾娇鐢紝涓嶅悜绗笁鏂规彁渚涳紝涓嶄互浠讳綍
褰㈠紡鍦ㄤ簰鑱旂綉涓婁紶鎾��
2.涓ユ牸鎸夌収灞�淇濆瘑瑙勫畾瑕佹眰淇濈銆佷娇鐢紙濡傦細澶嶅嵃鐨勶紝濉啓銆婃秹瀵嗚浇浣撳唴閮�/閫佸
鍗板埗瀹℃壒琛ㄣ�嬶紙瑙佸眬銆婃秹瀵嗚浇浣撳嵃鍒朵繚瀵嗙鐞嗚瀹氥�嬶級灞ヨ瀹℃壒鎵嬬画锛涘鍏ユ秹瀵嗚绠�
鏈�,濉啓銆婃秹瀵嗚绠楁満淇℃伅杈撳叆瀹℃壒琛ㄣ�嬶紙瑙佸眬銆婁俊鎭畨鍏ㄤ繚瀵嗘搷浣滆绋嬨�嬶級灞ヨ
瀹℃壒鎵� 缁級銆�
3.瀵瑰洜鏈汉鎵�鍊熼槄鐨勮祫鏂欓�犳垚鐨勫け娉勫瘑鎵挎媴鍏ㄩ儴璐ｄ换锛屾帴鏀跺苟閰嶅悎淇濆瘑妫�鏌ャ��
- 4.鏈汉瀵圭敵璇疯〃濉啓鐨勫唴瀹圭殑鐪熷疄鎬ц礋璐]></simple-value></cell><cell expand="None" name="A10" row="10" col="1" row-span="2" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜烘墍鍦�
-閮ㄩ棬璐熻矗浜篯]></simple-value></cell><cell expand="None" name="D10" row="10" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堝伐浣滅瀵嗐�佺瀵嗙骇銆佹満瀵嗙骇瀹℃牳锛岀粷瀵嗙骇瀹℃牳锛涘鍒剁Щ浜ゅ鍗曚綅瀹℃牳锛塢]></simple-value></cell><cell expand="None" name="D11" row="11" col="4" col-span="10"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A12" row="12" col="1" row-span="2" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[椤圭洰绠＄悊/
+ 4.鏈汉瀵圭敵璇疯〃濉啓鐨勫唴瀹圭殑鐪熷疄鎬ц礋璐]></simple-value></cell><cell expand="None" name="A8" row="8" col="1" row-span="2" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢宠浜烘墍鍦�
+閮ㄩ棬璐熻矗浜篯]></simple-value></cell><cell expand="None" name="D8" row="8" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堝伐浣滅瀵嗐�佺瀵嗙骇銆佹満瀵嗙骇瀹℃牳锛岀粷瀵嗙骇瀹℃牳锛涘鍒剁Щ浜ゅ鍗曚綅瀹℃牳锛塢]></simple-value></cell><cell expand="None" name="D9" row="9" col="4" col-span="10"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A10" row="10" col="1" row-span="2" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[椤圭洰绠＄悊/
绉戝鎶�鏈
-璐熻矗浜篯]></simple-value></cell><cell expand="None" name="D12" row="12" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堢粷瀵嗙骇瀹℃牳锛塢]></simple-value></cell><cell expand="None" name="D13" row="13" col="4" col-span="10"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A14" row="14" col="1" row-span="2" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[灞�棰嗗]]></simple-value></cell><cell expand="None" name="D14" row="14" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堢粷瀵嗙骇瀹℃壒锛涘鍒剁Щ浜ゅ鍗曚綅瀹℃壒锛塢]></simple-value></cell><cell expand="None" name="D15" row="15" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><row row-number="1" height="26" band="title"/><row row-number="2" height="27" band="title"/><row row-number="3" height="26" band="title"/><row row-number="4" height="25" band="title"/><row row-number="5" height="29" band="title"/><row row-number="6" height="29" band="title"/><row row-number="7" height="26" band="title"/><row row-number="8" height="25"/><row row-number="9" height="152" band="summary"/><row row-number="10" height="33" band="summary"/><row row-number="11" height="33" band="summary"/><row row-number="12" height="22" band="summary"/><row row-number="13" height="42" band="summary"/><row row-number="14" height="23" band="summary"/><row row-number="15" height="50" band="summary"/><column col-number="1" width="34"/><column col-number="2" width="47"/><column col-number="3" width="15"/><column col-number="4" width="40"/><column col-number="5" width="64"/><column col-number="6" width="60"/><column col-number="7" width="50"/><column col-number="8" width="44"/><column col-number="9" width="44"/><column col-number="10" width="43"/><column col-number="11" width="45"/><column col-number="12" width="25"/><column col-number="13" width="28"/><footer font-family="瀹嬩綋" font-size="10" forecolor="0,0,0" margin="23"><center><![CDATA["绗�"+page()+"椤�,鍏�"+pages()+"椤�"]]></center></footer><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="table2" type="sql"><sql><![CDATA[SELECT
+璐熻矗浜篯]></simple-value></cell><cell expand="None" name="D10" row="10" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堢粷瀵嗙骇瀹℃牳锛塢]></simple-value></cell><cell expand="None" name="D11" row="11" col="4" col-span="10"><cell-style font-size="9" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A12" row="12" col="1" row-span="2" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[灞�棰嗗]]></simple-value></cell><cell expand="None" name="D12" row="12" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="left" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[锛堢粷瀵嗙骇瀹℃壒锛涘鍒剁Щ浜ゅ鍗曚綅瀹℃壒锛塢]></simple-value></cell><cell expand="None" name="D13" row="13" col="4" col-span="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><right-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><cell expand="None" name="A14" row="14" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[妗ｅ彿]]></simple-value></cell><cell expand="None" name="D14" row="14" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鏂囦欢棰樺悕]]></simple-value></cell><cell expand="None" name="G14" row="14" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[鐢靛瓙]]></simple-value></cell><cell expand="None" name="H14" row="14" col="8"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[绾歌川]]></simple-value></cell><cell expand="None" name="I14" row="14" col="9"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[璋冮槄鍘熶欢]]></simple-value></cell><cell expand="None" name="J14" row="14" col="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[瀵嗙骇]]></simple-value></cell><cell expand="None" name="K14" row="14" col="11"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[娑夊瘑椤电爜]]></simple-value></cell><cell expand="None" name="L14" row="14" col="12" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[澶囨敞]]></simple-value></cell><cell expand="Down" name="A15" row="15" col="1" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ARCHIVAL_CODE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="D15" row="15" col="4" col-span="3"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ITEM_TITLE" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="G15" row="15" col="7"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ELECTRONIC" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="H15" row="15" col="8"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="PAPER" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="I15" row="15" col="9"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="ORIGINAL" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="J15" row="15" col="10"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="SECURITY_CLASSIFICATION" order="none" mapping-type="simple"></dataset-value></cell><cell expand="Down" name="K15" row="15" col="11"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><dataset-value dataset-name="table2" aggregate="select" property="SECURITY_PAGE_NUM" order="none" mapping-type="simple"></dataset-value></cell><cell expand="None" name="L15" row="15" col="12" col-span="2"><cell-style font-size="11" forecolor="0,0,0" font-family="瀹嬩綋" align="center" valign="middle"><left-border width="1" style="solid" color="0,0,0"/><right-border width="1" style="solid" color="0,0,0"/><top-border width="1" style="solid" color="0,0,0"/><bottom-border width="1" style="solid" color="0,0,0"/></cell-style><simple-value><![CDATA[]]></simple-value></cell><row row-number="1" height="26" band="title"/><row row-number="2" height="27" band="title"/><row row-number="3" height="26" band="title"/><row row-number="4" height="25" band="title"/><row row-number="5" height="29" band="title"/><row row-number="6" height="29" band="title"/><row row-number="7" height="152" band="summary"/><row row-number="8" height="33" band="summary"/><row row-number="9" height="152" band="summary"/><row row-number="10" height="33" band="summary"/><row row-number="11" height="42" band="summary"/><row row-number="12" height="23" band="summary"/><row row-number="13" height="50" band="summary"/><row row-number="14" height="23" band="title"/><row row-number="15" height="50"/><column col-number="1" width="34"/><column col-number="2" width="47"/><column col-number="3" width="15"/><column col-number="4" width="40"/><column col-number="5" width="64"/><column col-number="6" width="60"/><column col-number="7" width="50"/><column col-number="8" width="44"/><column col-number="9" width="44"/><column col-number="10" width="43"/><column col-number="11" width="45"/><column col-number="12" width="25"/><column col-number="13" width="28"/><footer font-family="瀹嬩綋" font-size="10" forecolor="0,0,0" margin="23"><center><![CDATA["绗�"+page()+"椤�,鍏�"+pages()+"椤�"]]></center></footer><datasource name="鍐呯疆鏁版嵁婧�" type="buildin"><dataset name="table2" type="sql"><sql><![CDATA[SELECT
*,
case when ELECTRONIC = '1' and AGREE = '1' then '鈭�'
else '' end as ELECTRONIC,
@@ -18,6 +18,13 @@
else '' end as ORIGINAL
FROM UTL_BORROW_DETAIL WHERE FORM_ID = (:formId)]]></sql><field name="DETAIL_ID"/><field name="FORM_ID"/><field name="FILE_ID"/><field name="ITEM_ID"/><field name="ARCHIVAL_CODE"/><field name="ITEM_NUMBER"/><field name="FILE_TITLE"/><field name="ITEM_TITLE"/><field name="BORROW_TYPE"/><field name="AGREE"/><field name="SECURITY_CLASSIFICATION"/><field name="SECURITY_PAGE_NUM"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="MODIFY_TIME"/><field name="CREATE_TIME"/><field name="CREATE_DEPT_NAME"/><field name="CREATE_DEPT_ID"/><field name="ELECTRONIC"/><field name="PAPER"/><field name="ORIGINAL"/><field name="PAPER_BORROW"/><field name="ITEM_CODE"/><field name="ELECTRONIC"/><field name="PAPER"/><field name="ORIGINAL"/><parameter name="formId" type="String" default-value="-1"/></dataset><dataset name="table3" type="sql"><sql><![CDATA[SELECT
*
- FROM UTL_BORROW_FORM WHERE FORM_ID = (:formId)]]></sql><field name="FORM_ID"/><field name="APPLY_CODE"/><field name="BORROW_TYPE"/><field name="BORROW_USER_ID"/><field name="BORROW_USER_NAME"/><field name="POST_CODE"/><field name="CERTIFICATE_NUMBER"/><field name="TEL_NUMBER"/><field name="BORROW_TEL"/><field name="BORROW_DATE"/><field name="BORROW_VALID_DATE"/><field name="BORROW_PURPOSE"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="CREATE_TIME"/><field name="MODIFY_TIME"/><field name="CREATE_DEPT_ID"/><field name="CREATE_DEPT_NAME"/><field name="REMARK"/><field name="STATE"/><field name="SECURITY_CLASSIFICATION"/><field name="DEPT_NAME"/><field name="DEPT_ADDRESS"/><field name="FULLTEXT_STATE"/><field name="FLOW_STATE"/><field name="PROCESS_INSTANCE_ID"/><field name="FLOW_STEP"/><field name="SECURITY_CODE"/><field name="DELETE_STATE"/><field name="DELETE_TIME"/><field name="FILE_COUNT"/><field name="ITEM_COUNT"/><field name="ID_CARD"/><field name="UTILIZATION_METHOD"/><field name="PAPER_BORROW"/><parameter name="formId" type="String" default-value="-1"/></dataset></datasource><paper type="A4" left-margin="28" right-margin="28"
+ FROM UTL_BORROW_FORM WHERE FORM_ID = (:formId)]]></sql><field name="FORM_ID"/><field name="APPLY_CODE"/><field name="BORROW_TYPE"/><field name="BORROW_USER_ID"/><field name="BORROW_USER_NAME"/><field name="POST_CODE"/><field name="CERTIFICATE_NUMBER"/><field name="TEL_NUMBER"/><field name="BORROW_TEL"/><field name="BORROW_DATE"/><field name="BORROW_VALID_DATE"/><field name="BORROW_PURPOSE"/><field name="CREATE_USER_ID"/><field name="CREATE_USER_NAME"/><field name="CREATE_TIME"/><field name="MODIFY_TIME"/><field name="CREATE_DEPT_ID"/><field name="CREATE_DEPT_NAME"/><field name="REMARK"/><field name="STATE"/><field name="SECURITY_CLASSIFICATION"/><field name="DEPT_NAME"/><field name="DEPT_ADDRESS"/><field name="FULLTEXT_STATE"/><field name="FLOW_STATE"/><field name="PROCESS_INSTANCE_ID"/><field name="FLOW_STEP"/><field name="SECURITY_CODE"/><field name="DELETE_STATE"/><field name="DELETE_TIME"/><field name="FILE_COUNT"/><field name="ITEM_COUNT"/><field name="ID_CARD"/><field name="UTILIZATION_METHOD"/><field name="PAPER_BORROW"/><parameter name="formId" type="String" default-value="-1"/></dataset><dataset name="table1" type="sql"><sql><![CDATA[SELECT
+ SUM(CASE WHEN security_classification LIKE '%绉樺瘑%' THEN 1 ELSE 0 END)||'浠�' AS 绉樺瘑,
+ SUM(CASE WHEN security_classification LIKE '%缁濆瘑%' THEN 1 ELSE 0 END)||'浠�' AS 缁濆瘑,
+ SUM(CASE WHEN security_classification LIKE '%鏈哄瘑%' THEN 1 ELSE 0 END)||'浠�' AS 鏈哄瘑,
+ SUM(CASE WHEN security_classification LIKE '%宸ヤ綔绉樺瘑%' THEN 1 ELSE 0 END)||'浠�' AS 宸ヤ綔绉樺瘑,
+ SUM(CASE WHEN security_classification LIKE '%鍏紑%' or security_classification is null THEN 1 ELSE 0 END)||'浠�' AS 鍏紑
+FROM UTL_BORROW_DETAIL
+WHERE form_id = (:formId);]]></sql><field name="绉樺瘑"/><field name="缁濆瘑"/><field name="鏈哄瘑"/><field name="宸ヤ綔绉樺瘑"/><field name="鍏紑"/><parameter name="formId" type="String" default-value=""/></dataset></datasource><paper type="A4" left-margin="28" right-margin="28"
top-margin="57" bottom-margin="43" paging-mode="fitpage" fixrows="0"
width="595" height="842" orientation="portrait" html-report-align="left" bg-image="http://192.168.100.66//static/images/planFormStatistics.jpg" html-interval-refresh-value="0" column-enabled="false"></paper></ureport>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp b/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp
index 7395933..e110858 100644
--- a/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/borrow/borrowForm.jsp
@@ -87,6 +87,9 @@
<div class="pt-title-theme3">
<i class="fa fa-file-text"></i>
<h4>鍊熼槄鐢宠鍗�</h4>
+ <a href="javascript:showFlowDiagram();" style="float: right">
+ <span style="color: #0a84ff">娴佺▼绀烘剰鍥�</span>
+ </a>
</div>
<div class="ptbody">
<div class="pt-application-row">
@@ -313,10 +316,6 @@
<div class="pt-subtitle">
<i></i>
<span>娴佺▼璁板綍</span>
- <i></i>
- <a href="javascript:showFlowDiagram();">
- <span style="color: #0a84ff">娴佺▼绀烘剰鍥�</span>
- </a>
</div>
<div class="pt-tablelist">
<table cellspacing="0" cellpadding="0">
diff --git a/src/main/webapp/WEB-INF/view/gh/catAjjxx/checkIndex.jsp b/src/main/webapp/WEB-INF/view/gh/catAjjxx/checkIndex.jsp
index 0034197..da62126 100644
--- a/src/main/webapp/WEB-INF/view/gh/catAjjxx/checkIndex.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/catAjjxx/checkIndex.jsp
@@ -137,14 +137,14 @@
</div>
</td>
</tr>
- <tr id="tr_question">
- <td class="tbtitle">楠屾敹闂锛�</td>
- <td>
- <input id="question" class="easyui-textbox" name="question"
- style="width:260px;height:80px"
- data-options="">
- </td>
- </tr>
+<%-- <tr id="tr_question">--%>
+<%-- <td class="tbtitle">楠屾敹闂锛�</td>--%>
+<%-- <td>--%>
+<%-- <input id="question" class="easyui-textbox" name="question"--%>
+<%-- style="width:260px;height:80px"--%>
+<%-- data-options="">--%>
+<%-- </td>--%>
+<%-- </tr>--%>
</table>
<div class="progress" style="display: none;">
<span class="text">0%</span>
@@ -222,25 +222,32 @@
}
}
- //鐐瑰嚮鍚庯紝鎵撳紑鐭跨閫夋嫨妗�
function selectCheckQuestion() {
var haveSelected = checkQuestion;
+ var ids = params.ids;
top.layer.open({
title: "閫夋嫨闂娓呭崟",
type: 2,
area: ["900px", "600px"],
fixed: false,
- content: "gdMisManage/selectCheckQuestion",
+ // content: "gdMisManage/selectCheckQuestion",
+ content: "general/list?viewId=2004428410897367042",
success: function (layero, index) {
var body = window.top.layer.getChildFrame('body', index);
var iframeWin = window.top[layero.find('iframe')[0]['name']]; //寰楀埌iframe椤电殑绐楀彛瀵硅薄
//灏嗗洖璋冨嚱鏁颁紶缁欏瓙椤甸潰
- if (iframeWin && iframeWin.param) {
- iframeWin.param.haveSelected = haveSelected;
- // iframeWin.param.backOne = selectQuestionCallBack;
- iframeWin.param.backOne = window.selectQuestionCallBack;
+ // if (iframeWin && iframeWin.param) {
+ // iframeWin.param.haveSelected = haveSelected;
+ // // iframeWin.param.backOne = selectQuestionCallBack;
+ // iframeWin.param.backOne = window.selectQuestionCallBack;
+ // }
+ if (iframeWin.params) {
+ if (ids) {
+ iframeWin.params.ids = ids;
+ }
}
+
}
});
}
@@ -253,18 +260,18 @@
function checkNoFile() {
var id = params.ids[0];
var checkData = $('#checkData').textbox("getValue");
- var question = $('#question').textbox("getValue");
- if (question != null && question != "") {
- checkQuestion = checkQuestion + "," + "0" + "-" + "question";
- }
+ // var question = $('#question').textbox("getValue");
+ // if (question != null && question != "") {
+ // checkQuestion = checkQuestion + "," + "0" + "-" + "question";
+ // }
wcp.ui.setBusy("body", wcp.ajax({
url: "catAjjxx/check",
data: JSON.stringify({
checkState: checkState,
id: id,
- checkData: checkData,
- question: question,
- checkQuestion: checkQuestion
+ checkData: checkData
+ // question: question,
+ // checkQuestion: checkQuestion
}),
}).done(function (result) {
//鍏抽棴绐楀彛
@@ -283,4 +290,4 @@
$("#checkData").datebox('setValue', parsedate);
}
</script>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/gh/search/advancedQuery.jsp b/src/main/webapp/WEB-INF/view/gh/search/advancedQuery.jsp
index 25f81fc..8e63554 100644
--- a/src/main/webapp/WEB-INF/view/gh/search/advancedQuery.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/search/advancedQuery.jsp
@@ -85,6 +85,7 @@
<div class="pt-note pt-note-info" style="margin: 10px 0 0 0;">
<p>1.璇风偣鍑诲彸渚х殑鈥�+鈥濆彿鎸夐挳娣诲姞鏉′欢鎴栬�呭垎缁�</p>
<p>2.鍒嗙粍鎸囦竴缁勭嫭绔嬬殑閫昏緫鏉′欢锛屽湪涓庡叾浠栨潯浠剁粍鍚堟椂浼氱敤鎷彿杩涜閫昏緫闅旂</p>
+ <p>3.绛変簬銆佸寘鍚竴绫婚�傜敤浜庡叏閮ㄦ绱㈡潯浠讹紝灏忎簬绛変簬銆佸皬浜庛�佸ぇ浜庣瓑浜庛�佸ぇ浜庨�傜敤浜庢椂闂存垨鏁板瓧绫荤殑妫�绱㈡潯浠讹紝渚嬪骞翠唤銆佹暟閲�</p>
</div>
<form id="formAdvancedQuery" method="post">
<div class="ptbody">
diff --git a/src/main/webapp/WEB-INF/view/gh/search/searchResult.jsp b/src/main/webapp/WEB-INF/view/gh/search/searchResult.jsp
index 5aae789..62959e1 100644
--- a/src/main/webapp/WEB-INF/view/gh/search/searchResult.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/search/searchResult.jsp
@@ -601,11 +601,15 @@
type: 2,
area: ["800px", "550px"],
fixed: false,
+ scrollbar: false,
content: "search/advancedQuery",
success: function (layero, index) {
var body = window.top.layer.getChildFrame('body', index);
var iframeWin = window.top[layero.find('iframe')[0]['name']]; //寰楀埌iframe椤电殑绐楀彛瀵硅薄
iframeWin.params.callBack = superSearchKeyword;
+ // 绉婚櫎婊氬姩鏉�
+ body.css('overflow', 'hidden');
+ $(layero).find('.layui-layer-content').css('overflow', 'hidden');
}
});
}
diff --git a/src/main/webapp/WEB-INF/view/gh/utlStatistics/transferStatistics.jsp b/src/main/webapp/WEB-INF/view/gh/utlStatistics/transferStatistics.jsp
index 8fc08ea..4656f69 100644
--- a/src/main/webapp/WEB-INF/view/gh/utlStatistics/transferStatistics.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/utlStatistics/transferStatistics.jsp
@@ -65,11 +65,17 @@
<body class="pt-tree">
<div class="archives_statistics">
<h3 class="statistics_title">
- 銆愮Щ浜ょ粺璁°��
+ 銆愯祫鏂欑粺璁°��
</h3>
<div class="option_row clear">
<span class="option_col1">缁熻鏁版嵁杩囨护鏌ヨ</span>
<ul class="clear">
+ <li>缁熻瀛楁锛�
+ <select id="selectParameter" data-options="editable:false" editable="false" class="easyui-combobox" style="width:150px">
+ <option value="yj" selected>绉讳氦缁熻</option>
+ <option value="rk" >鍏ュ簱缁熻</option>
+ </select>
+ </li>
<%-- <li>鏃堕棿锛� <input class="easyui-textbox" id="year"--%>
<%-- style="width:150px; height: 24px;"/>--%>
@@ -125,8 +131,84 @@
// var year = $("#year").numberbox("getValue");
var startDate = $("#startDate").datebox("getValue");
var endDate = $("#endDate").datebox("getValue");
+ var selectParameter = $('#selectParameter').combobox('getValue');
- var url = "utlStatistics/getTransferStatistics?startDate=" + startDate + "&endDate=" + endDate;
+ var columns=[[
+ {
+ field: 'ck',
+ checkbox: true
+ },
+ {
+ field: 'XMKYQMC',
+ title: '椤圭洰鍚嶇О',
+ width: 100,
+ },{
+ field: 'YM',
+ title: '鎬婚〉鐮�',
+ width: 100,
+ }, {
+ field: 'SL',
+ title: '鎬绘暟閲�',
+ width: 100,
+ }, {
+ field: 'TRANSFERCOUNT',
+ title: '绉讳氦璧勬枡浠芥暟',
+ width: 100,
+ },
+ {
+ field: 'TRANSFERTIME',
+ title: '绉讳氦娆℃暟',
+ width: 100,
+ }, {
+ field: 'RETURNTIME',
+ title: '閫�鍥炴鏁�',
+ width: 100,
+ }, {
+ field: 'ACCEPTCOUNT',
+ title: '鎺ユ敹鏁伴噺',
+ width: 100,
+ }, {
+ field: 'TIDYCOUNT',
+ title: '鏁寸悊瀹屾垚鏁伴噺',
+ width: 100,
+ }, {
+ field: 'ACCEPTDATA',
+ title: '鎺ユ敹鏁版嵁閲�',
+ width: 100,
+ }
+ ]]
+ if (selectParameter=='rk'){
+ columns=[[
+ {
+ field: 'ck',
+ checkbox: true
+ },
+ {
+ field: 'XMKYQMC',
+ title: '椤圭洰鍚嶇О',
+ width: 100,
+ },{
+ field: 'YM',
+ title: '鎬婚〉鐮�',
+ width: 100,
+ }, {
+ field: 'SL',
+ title: '鎬绘暟閲�',
+ width: 100,
+ }, {
+ field: 'TRANSFERCOUNT',
+ title: '绉讳氦璧勬枡浠芥暟',
+ width: 100,
+ },
+ {
+ field: 'ACCEPTDATA',
+ title: '鎺ユ敹鏁版嵁閲�',
+ width: 100,
+ }
+ ]]
+ }
+
+ var url = "utlStatistics/getTransferStatistics?selectParameter="+selectParameter+"&startDate=" + startDate + "&endDate=" + endDate;
$("#tb_utilizationForm").datagrid({
rownumbers: true,
method: "get",
@@ -136,43 +218,7 @@
toolbar: "#toolbar_form",
emptyMsg: "娌℃湁鎵惧埌鍖归厤鐨勮褰�",
height: wh - 200,
- columns: [[
- {
- field: 'ck',
- checkbox: true
- },
- {
- field: 'XMKYQMC',
- title: '椤圭洰鍚嶇О',
- width: 100,
- }, {
- field: 'TRANSFERCOUNT',
- title: '绉讳氦璧勬枡浠芥暟',
- width: 100,
- },
- {
- field: 'TRANSFERTIME',
- title: '绉讳氦娆℃暟',
- width: 100,
- }, {
- field: 'RETURNTIME',
- title: '閫�鍥炴鏁�',
- width: 100,
- }, {
- field: 'ACCEPTCOUNT',
- title: '鎺ユ敹鏁伴噺',
- width: 100,
- }, {
- field: 'TIDYCOUNT',
- title: '鏁寸悊瀹屾垚鏁伴噺',
- width: 100,
- }, {
- field: 'ACCEPTDATA',
- title: '鎺ユ敹鏁版嵁閲�',
- width: 100,
- }
- ]]
-
+ columns: columns
})
diff --git a/src/main/webapp/WEB-INF/view/gh/utlStatistics/typeStatistics.jsp b/src/main/webapp/WEB-INF/view/gh/utlStatistics/typeStatistics.jsp
index 7fb12e0..b278555 100644
--- a/src/main/webapp/WEB-INF/view/gh/utlStatistics/typeStatistics.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/utlStatistics/typeStatistics.jsp
@@ -65,8 +65,23 @@
<body class="pt-tree">
<div class="archives_statistics">
<h3 class="statistics_title">
- 銆愭牴鎹祫鏂欑被鍒粺璁°��
+ 銆愭牴鎹瓧娈电粺璁°��
</h3>
+ <div class="option_row clear">
+ <span class="option_col1">缁熻鏁版嵁杩囨护鏌ヨ</span>
+ <ul class="clear">
+ <li>缁熻瀛楁锛�
+ <select id="selectParameter" data-options="editable:false" editable="false" class="easyui-combobox" style="width:150px">
+ <option value="zllb">璧勬枡绫诲埆</option>
+ <option value="ztlx" selected>杞戒綋绫诲瀷</option>
+ </select>
+ </li>
+ <li class="statistics_btn_row" style="display: flex;align-items:center;height:24px">
+ <button class="pt-btn pt-btn-purple" onclick="histogram()"><i class="fa fa-bar-chart"></i>寮�濮嬬粺璁�
+ </button>
+ </li>
+ </ul>
+ </div>
<div class="statistics_txt">
<div class="title">缁熻缁撴灉</div>
<div class="statistics_scroll">
@@ -162,11 +177,11 @@
};
myChart.showLoading(); //loading鍔ㄧ敾
// 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
-
+ var selectParameter = $('#selectParameter').combobox('getValue');
$.ajax({
type: "post",
async: true,
- url: "screen/getSearchConditionEchartsHistogram",
+ url: "screen/getSearchConditionEchartsHistogram?columnName="+selectParameter,
dataType: "json",
success: function (result) {
if (result) {
diff --git a/src/main/webapp/WEB-INF/view/gh/utlStatistics/utlStatisticsByDept.jsp b/src/main/webapp/WEB-INF/view/gh/utlStatistics/utlStatisticsByDept.jsp
index eb1d6ac..8ef56b9 100644
--- a/src/main/webapp/WEB-INF/view/gh/utlStatistics/utlStatisticsByDept.jsp
+++ b/src/main/webapp/WEB-INF/view/gh/utlStatistics/utlStatisticsByDept.jsp
@@ -73,6 +73,11 @@
<li>閮ㄩ棬鍚嶇О锛� <input class="easyui-textbox" id="deptName"
style="width:150px; height: 24px;"/>
</li>
+ <li>璧锋鏃堕棿锛�
+ <input class="easyui-datebox" id="startDate" style="width:150px;height:24px"/>
+ -
+ <input class="easyui-datebox" id="endDate" style="width:150px;height:24px"/>
+ </li>
<li class="statistics_btn_row" style="display: flex;align-items:center;height:24px">
<button class="pt-btn pt-btn-purple" onclick="utilizationStatistics()"><i class="fa fa-bar-chart"></i>寮�濮嬬粺璁�
</button>
@@ -134,9 +139,11 @@
var wh = $(window).height();
var deptName = $("#deptName").numberbox("getValue");
+ var startDate = $("#startDate").datebox("getValue");
+ var endDate = $("#endDate").datebox("getValue");
- var url = "utlStatistics/getUtlStatisticsByDept?deptName=" + deptName;
+ var url = "utlStatistics/getUtlStatisticsByDept?deptName=" + deptName + "&startData=" + startDate + "&endData=" + endDate;
$("#tb_utilizationForm").datagrid({
rownumbers: true,
method: "get",
--
Gitblit v1.9.1