3
.gitignore
vendored
3
.gitignore
vendored
@@ -3,6 +3,7 @@
|
|||||||
# Mobile Tools for Java (J2ME)
|
# Mobile Tools for Java (J2ME)
|
||||||
.mtj.tmp/
|
.mtj.tmp/
|
||||||
|
|
||||||
|
*.iml
|
||||||
# Package Files #
|
# Package Files #
|
||||||
*.jar
|
*.jar
|
||||||
*.war
|
*.war
|
||||||
@@ -12,5 +13,7 @@
|
|||||||
hs_err_pid*
|
hs_err_pid*
|
||||||
|
|
||||||
.idea
|
.idea
|
||||||
|
/target
|
||||||
|
|
||||||
|
**/*.iml
|
||||||
|
|
||||||
|
|||||||
@@ -1,41 +1,33 @@
|
|||||||
package com.jsh.action.asset;
|
package com.jsh.action.asset;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.text.ParseException;
|
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
|
|
||||||
import com.jsh.base.BaseAction;
|
import com.jsh.base.BaseAction;
|
||||||
import com.jsh.base.Log;
|
import com.jsh.base.Log;
|
||||||
import com.jsh.util.AssetConstants;
|
import com.jsh.model.po.*;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.Asset;
|
|
||||||
import com.jsh.model.po.Assetname;
|
|
||||||
import com.jsh.model.po.Basicuser;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.po.Supplier;
|
|
||||||
import com.jsh.model.vo.asset.AssetModel;
|
import com.jsh.model.vo.asset.AssetModel;
|
||||||
import com.jsh.service.asset.AssetIService;
|
import com.jsh.service.asset.AssetIService;
|
||||||
import com.jsh.service.basic.AssetNameIService;
|
import com.jsh.service.basic.AssetNameIService;
|
||||||
import com.jsh.service.basic.CategoryIService;
|
import com.jsh.service.basic.CategoryIService;
|
||||||
import com.jsh.service.basic.SupplierIService;
|
import com.jsh.service.basic.SupplierIService;
|
||||||
import com.jsh.service.basic.UserIService;
|
import com.jsh.service.basic.UserIService;
|
||||||
|
import com.jsh.util.AssetConstants;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
import com.jsh.util.Tools;
|
import com.jsh.util.Tools;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.sql.Timestamp;
|
||||||
|
import java.text.ParseException;
|
||||||
|
import java.util.Calendar;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class AssetAction extends BaseAction<AssetModel>
|
public class AssetAction extends BaseAction<AssetModel> {
|
||||||
{
|
|
||||||
private AssetModel model = new AssetModel();
|
private AssetModel model = new AssetModel();
|
||||||
private AssetIService assetService;
|
private AssetIService assetService;
|
||||||
private CategoryIService categoryService;
|
private CategoryIService categoryService;
|
||||||
@@ -44,14 +36,12 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
private AssetNameIService assetnameService;
|
private AssetNameIService assetnameService;
|
||||||
|
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getBasicData()
|
public String getBasicData() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Map<String, Object> condition = pageUtil.getAdvSearch();
|
Map<String, Object> condition = pageUtil.getAdvSearch();
|
||||||
condition.put("id_s_order", "desc");
|
condition.put("id_s_order", "desc");
|
||||||
categoryService.find(pageUtil);
|
categoryService.find(pageUtil);
|
||||||
@@ -69,9 +59,7 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
|
|
||||||
assetnameService.find(pageUtil);
|
assetnameService.find(pageUtil);
|
||||||
mapData.put("assetnameList", pageUtil.getPageList());
|
mapData.put("assetnameList", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exceptoin");
|
model.getShowModel().setMsgTip("exceptoin");
|
||||||
}
|
}
|
||||||
@@ -80,14 +68,13 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加资产
|
* 增加资产
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加资产方法===================");
|
Log.infoFileSync("==================开始调用增加资产方法===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Asset asset = new Asset();
|
Asset asset = new Asset();
|
||||||
//添加设置
|
//添加设置
|
||||||
asset.setAssetname(new Assetname(model.getAssetNameID()));
|
asset.setAssetname(new Assetname(model.getAssetNameID()));
|
||||||
@@ -96,21 +83,17 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
asset.setStatus(model.getStatus());
|
asset.setStatus(model.getStatus());
|
||||||
asset.setPrice(model.getPrice());
|
asset.setPrice(model.getPrice());
|
||||||
|
|
||||||
if(null != model.getUserID())
|
if (null != model.getUserID()) {
|
||||||
{
|
|
||||||
asset.setUser(new Basicuser(model.getUserID()));
|
asset.setUser(new Basicuser(model.getUserID()));
|
||||||
}
|
}
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
//购买日期
|
//购买日期
|
||||||
asset.setPurchasedate(new Timestamp(Tools.parse(model.getPurchasedate(), "yyyy-MM-dd").getTime()));
|
asset.setPurchasedate(new Timestamp(Tools.parse(model.getPurchasedate(), "yyyy-MM-dd").getTime()));
|
||||||
//有效日期
|
//有效日期
|
||||||
asset.setPeriodofvalidity(new Timestamp(Tools.parse(model.getPeriodofvalidity(), "yyyy-MM-dd").getTime()));
|
asset.setPeriodofvalidity(new Timestamp(Tools.parse(model.getPeriodofvalidity(), "yyyy-MM-dd").getTime()));
|
||||||
//保修日期
|
//保修日期
|
||||||
asset.setWarrantydate(new Timestamp(Tools.parse(model.getWarrantydate(), "yyyy-MM-dd").getTime()));
|
asset.setWarrantydate(new Timestamp(Tools.parse(model.getWarrantydate(), "yyyy-MM-dd").getTime()));
|
||||||
}
|
} catch (ParseException e) {
|
||||||
catch (ParseException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -121,9 +104,9 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
asset.setSupplier(new Supplier(model.getSupplierID()));
|
asset.setSupplier(new Supplier(model.getSupplierID()));
|
||||||
asset.setDescription(model.getDescription());
|
asset.setDescription(model.getDescription());
|
||||||
|
|
||||||
asset.setCreatetime(new Timestamp(new Date().getTime()));
|
asset.setCreatetime(new Timestamp(System.currentTimeMillis()));
|
||||||
asset.setCreator(getUser());
|
asset.setCreator(getUser());
|
||||||
asset.setUpdatetime(new Timestamp(new Date().getTime()));
|
asset.setUpdatetime(new Timestamp(System.currentTimeMillis()));
|
||||||
asset.setUpdator(getUser());
|
asset.setUpdator(getUser());
|
||||||
asset.setAddMonth(Tools.getCurrentMonth());
|
asset.setAddMonth(Tools.getCurrentMonth());
|
||||||
assetService.create(asset);
|
assetService.create(asset);
|
||||||
@@ -132,22 +115,15 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加资产异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加资产异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加资产回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加资产回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -160,19 +136,16 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除资产
|
* 删除资产
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除资产信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除资产信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
assetService.delete(model.getAssetID());
|
assetService.delete(model.getAssetID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAssetID() + " 的资产异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAssetID() + " 的资产异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -187,13 +160,12 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新资产
|
* 更新资产
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Asset asset = assetService.get(model.getAssetID());
|
Asset asset = assetService.get(model.getAssetID());
|
||||||
|
|
||||||
//设置要更新的熟悉值
|
//设置要更新的熟悉值
|
||||||
@@ -203,21 +175,19 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
asset.setStatus(model.getStatus());
|
asset.setStatus(model.getStatus());
|
||||||
asset.setPrice(model.getPrice());
|
asset.setPrice(model.getPrice());
|
||||||
|
|
||||||
if(null != model.getUserID())
|
if (null != model.getUserID()) {
|
||||||
asset.setUser(new Basicuser(model.getUserID()));
|
asset.setUser(new Basicuser(model.getUserID()));
|
||||||
else
|
} else {
|
||||||
asset.setUser(null);
|
asset.setUser(null);
|
||||||
try
|
}
|
||||||
{
|
try {
|
||||||
//购买日期
|
//购买日期
|
||||||
asset.setPurchasedate(new Timestamp(Tools.parse(model.getPurchasedate(), "yyyy-MM-dd").getTime()));
|
asset.setPurchasedate(new Timestamp(Tools.parse(model.getPurchasedate(), "yyyy-MM-dd").getTime()));
|
||||||
//有效日期
|
//有效日期
|
||||||
asset.setPeriodofvalidity(new Timestamp(Tools.parse(model.getPeriodofvalidity(), "yyyy-MM-dd").getTime()));
|
asset.setPeriodofvalidity(new Timestamp(Tools.parse(model.getPeriodofvalidity(), "yyyy-MM-dd").getTime()));
|
||||||
//保修日期
|
//保修日期
|
||||||
asset.setWarrantydate(new Timestamp(Tools.parse(model.getWarrantydate(), "yyyy-MM-dd").getTime()));
|
asset.setWarrantydate(new Timestamp(Tools.parse(model.getWarrantydate(), "yyyy-MM-dd").getTime()));
|
||||||
}
|
} catch (ParseException e) {
|
||||||
catch (ParseException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -228,28 +198,21 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
asset.setSupplier(new Supplier(model.getSupplierID()));
|
asset.setSupplier(new Supplier(model.getSupplierID()));
|
||||||
asset.setDescription(model.getDescription());
|
asset.setDescription(model.getDescription());
|
||||||
|
|
||||||
asset.setUpdatetime(new Timestamp(new Date().getTime()));
|
asset.setUpdatetime(new Timestamp(System.currentTimeMillis()));
|
||||||
asset.setUpdator(getUser());
|
asset.setUpdator(getUser());
|
||||||
assetService.update(asset);
|
assetService.update(asset);
|
||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改资产ID为 : " + model.getAssetID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改资产ID为 : " + model.getAssetID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改资产回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改资产回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -260,20 +223,17 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID资产
|
* 批量删除指定ID资产
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
assetService.batchDelete(model.getAssetIDs());
|
assetService.batchDelete(model.getAssetIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除资产ID为:" + model.getAssetIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除资产ID为:" + model.getAssetIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -287,12 +247,11 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找资产信息
|
* 查找资产信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Asset> pageUtil = new PageUtil<Asset>();
|
PageUtil<Asset> pageUtil = new PageUtil<Asset>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -310,10 +269,8 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Asset asset : dataList) {
|
||||||
for(Asset asset:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", asset.getId());
|
item.put("id", asset.getId());
|
||||||
//添加资产属性
|
//添加资产属性
|
||||||
@@ -357,27 +314,22 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找资产信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找资产信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询资产信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询资产信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出excel表格
|
* 导出excel表格
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public String exportExcel()
|
public String exportExcel() {
|
||||||
{
|
|
||||||
Log.infoFileSync("===================调用导出资产信息action方法exportExcel开始=======================");
|
Log.infoFileSync("===================调用导出资产信息action方法exportExcel开始=======================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
PageUtil<Asset> pageUtil = (PageUtil<Asset>) getSession().get("pageUtil");
|
PageUtil<Asset> pageUtil = (PageUtil<Asset>) getSession().get("pageUtil");
|
||||||
|
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
@@ -386,9 +338,7 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
String isCurrentPage = model.getIsAllData();
|
String isCurrentPage = model.getIsAllData();
|
||||||
model.setFileName(Tools.changeUnicode(model.getFileName() + ".xls", model.getBrowserType()));
|
model.setFileName(Tools.changeUnicode(model.getFileName() + ".xls", model.getBrowserType()));
|
||||||
model.setExcelStream(assetService.exmportExcel(isCurrentPage, pageUtil));
|
model.setExcelStream(assetService.exmportExcel(isCurrentPage, pageUtil));
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出资产信息action方法exportExcel异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出资产信息action方法exportExcel异常", e);
|
||||||
model.getShowModel().setMsgTip("export excel exception");
|
model.getShowModel().setMsgTip("export excel exception");
|
||||||
}
|
}
|
||||||
@@ -400,39 +350,29 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
/**
|
/**
|
||||||
* 导入资产excel表格内容
|
* 导入资产excel表格内容
|
||||||
*/
|
*/
|
||||||
public String importExcel()
|
public String importExcel() {
|
||||||
{
|
|
||||||
//资产excel表格file
|
//资产excel表格file
|
||||||
Boolean result = false;
|
Boolean result = false;
|
||||||
String returnStr = "";
|
String returnStr = "";
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
InputStream in = assetService.importExcel(model.getAssetFile(), model.getIsCheck());
|
InputStream in = assetService.importExcel(model.getAssetFile(), model.getIsCheck());
|
||||||
|
|
||||||
if(null != in)
|
if (null != in) {
|
||||||
{
|
|
||||||
model.setFileName(Tools.getRandomChar() + Tools.getNow2(Calendar.getInstance().getTime()) + "_wrong.xls");
|
model.setFileName(Tools.getRandomChar() + Tools.getNow2(Calendar.getInstance().getTime()) + "_wrong.xls");
|
||||||
model.setExcelStream(in);
|
model.setExcelStream(in);
|
||||||
returnStr = AssetConstants.BusinessForExcel.EXCEL;
|
returnStr = AssetConstants.BusinessForExcel.EXCEL;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
result = true;
|
result = true;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
toClient(result.toString());
|
toClient(result.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写导入资产信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写导入资产信息结果异常", e);
|
||||||
}
|
}
|
||||||
//导入数据成功
|
//导入数据成功
|
||||||
returnStr = SUCCESS;
|
returnStr = SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>导入excel表格信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>导入excel表格信息异常", e);
|
||||||
}
|
}
|
||||||
return returnStr;
|
return returnStr;
|
||||||
@@ -440,10 +380,10 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -460,14 +400,13 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
/**
|
/**
|
||||||
* 根据状态码转化成说明字符串
|
* 根据状态码转化成说明字符串
|
||||||
* 资产的状态:0==在库,1==在用,2==消费
|
* 资产的状态:0==在库,1==在用,2==消费
|
||||||
|
*
|
||||||
* @param statusCode
|
* @param statusCode
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private String getStatusInfo(short statusCode)
|
private String getStatusInfo(short statusCode) {
|
||||||
{
|
|
||||||
String statusInfo = "";
|
String statusInfo = "";
|
||||||
switch(statusCode)
|
switch (statusCode) {
|
||||||
{
|
|
||||||
case AssetConstants.BusinessForExcel.EXCEl_STATUS_ZAIKU:
|
case AssetConstants.BusinessForExcel.EXCEl_STATUS_ZAIKU:
|
||||||
statusInfo = "在库";
|
statusInfo = "在库";
|
||||||
break;
|
break;
|
||||||
@@ -479,39 +418,35 @@ public class AssetAction extends BaseAction<AssetModel>
|
|||||||
case AssetConstants.BusinessForExcel.EXCEl_STATUS_CONSUME:
|
case AssetConstants.BusinessForExcel.EXCEl_STATUS_CONSUME:
|
||||||
statusInfo = "消费";
|
statusInfo = "消费";
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return statusInfo;
|
return statusInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
//=========Spring注入以及model驱动公共方法===========
|
//=========Spring注入以及model驱动公共方法===========
|
||||||
public void setAssetService(AssetIService assetService)
|
public void setAssetService(AssetIService assetService) {
|
||||||
{
|
|
||||||
this.assetService = assetService;
|
this.assetService = assetService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCategoryService(CategoryIService categoryService)
|
public void setCategoryService(CategoryIService categoryService) {
|
||||||
{
|
|
||||||
this.categoryService = categoryService;
|
this.categoryService = categoryService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSupplierService(SupplierIService supplierService)
|
public void setSupplierService(SupplierIService supplierService) {
|
||||||
{
|
|
||||||
this.supplierService = supplierService;
|
this.supplierService = supplierService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUserService(UserIService userService)
|
public void setUserService(UserIService userService) {
|
||||||
{
|
|
||||||
this.userService = userService;
|
this.userService = userService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAssetnameService(AssetNameIService assetnameService)
|
public void setAssetnameService(AssetNameIService assetnameService) {
|
||||||
{
|
|
||||||
this.assetnameService = assetnameService;
|
this.assetnameService = assetnameService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AssetModel getModel()
|
public AssetModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,30 +1,28 @@
|
|||||||
package com.jsh.action.asset;
|
package com.jsh.action.asset;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.Asset;
|
||||||
|
import com.jsh.model.vo.asset.ReportModel;
|
||||||
|
import com.jsh.service.asset.ReportIService;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.Asset;
|
|
||||||
import com.jsh.model.vo.asset.ReportModel;
|
|
||||||
import com.jsh.service.asset.ReportIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class ReportAction extends BaseAction<ReportModel>
|
public class ReportAction extends BaseAction<ReportModel> {
|
||||||
{
|
|
||||||
private ReportModel model = new ReportModel();
|
private ReportModel model = new ReportModel();
|
||||||
private ReportIService reportService;
|
private ReportIService reportService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找资产信息
|
* 查找资产信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String find()
|
public String find() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Asset> pageUtil = new PageUtil<Asset>();
|
PageUtil<Asset> pageUtil = new PageUtil<Asset>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
@@ -32,9 +30,7 @@ public class ReportAction extends BaseAction<ReportModel>
|
|||||||
String reportType = getReportType(new HashMap<String, Object>());
|
String reportType = getReportType(new HashMap<String, Object>());
|
||||||
reportService.find(pageUtil, reportType.split("_")[0], reportType.split("_")[1]);
|
reportService.find(pageUtil, reportType.split("_")[0], reportType.split("_")[1]);
|
||||||
model.getShowModel().setReportData(pageUtil.getPageList());
|
model.getShowModel().setReportData(pageUtil.getPageList());
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找资产信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找资产信息异常", e);
|
||||||
model.getShowModel().setMsgTip("get report data exception");
|
model.getShowModel().setMsgTip("get report data exception");
|
||||||
}
|
}
|
||||||
@@ -43,10 +39,10 @@ public class ReportAction extends BaseAction<ReportModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -64,10 +60,10 @@ public class ReportAction extends BaseAction<ReportModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取统计条件
|
* 获取统计条件
|
||||||
|
*
|
||||||
* @param condition
|
* @param condition
|
||||||
*/
|
*/
|
||||||
private String getReportType(Map<String,Object> condition)
|
private String getReportType(Map<String, Object> condition) {
|
||||||
{
|
|
||||||
// <option value="0">资产状态</option>
|
// <option value="0">资产状态</option>
|
||||||
// <option value="1">资产类型</option>
|
// <option value="1">资产类型</option>
|
||||||
// <option value="2">供应商</option>
|
// <option value="2">供应商</option>
|
||||||
@@ -76,8 +72,7 @@ public class ReportAction extends BaseAction<ReportModel>
|
|||||||
int reportType = model.getReportType();
|
int reportType = model.getReportType();
|
||||||
String reportTypeInfo = "";
|
String reportTypeInfo = "";
|
||||||
String reportTypeName = "";
|
String reportTypeName = "";
|
||||||
switch(reportType)
|
switch (reportType) {
|
||||||
{
|
|
||||||
case 0:
|
case 0:
|
||||||
condition.put("status_s_gb", "group");
|
condition.put("status_s_gb", "group");
|
||||||
reportTypeInfo = "status";
|
reportTypeInfo = "status";
|
||||||
@@ -103,18 +98,19 @@ public class ReportAction extends BaseAction<ReportModel>
|
|||||||
reportTypeInfo = "user.id";
|
reportTypeInfo = "user.id";
|
||||||
reportTypeName = "user.username";
|
reportTypeName = "user.username";
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return reportTypeInfo + "_" + reportTypeName;
|
return reportTypeInfo + "_" + reportTypeName;
|
||||||
}
|
}
|
||||||
|
|
||||||
//=========Spring注入以及model驱动公共方法===========
|
//=========Spring注入以及model驱动公共方法===========
|
||||||
public void setReportService(ReportIService reportService)
|
public void setReportService(ReportIService reportService) {
|
||||||
{
|
|
||||||
this.reportService = reportService;
|
this.reportService = reportService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ReportModel getModel()
|
public ReportModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,37 +1,34 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
import java.io.IOException;
|
import com.jsh.base.BaseAction;
|
||||||
import java.sql.Timestamp;
|
import com.jsh.base.Log;
|
||||||
import java.util.HashMap;
|
import com.jsh.model.po.*;
|
||||||
import java.util.List;
|
import com.jsh.model.vo.basic.AccountModel;
|
||||||
import java.util.Map;
|
import com.jsh.service.basic.AccountIService;
|
||||||
import java.text.*;
|
import com.jsh.service.materials.AccountHeadIService;
|
||||||
|
import com.jsh.service.materials.AccountItemIService;
|
||||||
import com.jsh.model.po.AccountHead;
|
import com.jsh.service.materials.DepotHeadIService;
|
||||||
import com.jsh.model.po.AccountItem;
|
|
||||||
import com.jsh.util.JshException;
|
import com.jsh.util.JshException;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import com.jsh.util.Tools;
|
||||||
import net.sf.json.JSONArray;
|
import net.sf.json.JSONArray;
|
||||||
import net.sf.json.JSONObject;
|
import net.sf.json.JSONObject;
|
||||||
import org.springframework.dao.DataAccessException;
|
import org.springframework.dao.DataAccessException;
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
import java.io.IOException;
|
||||||
import com.jsh.model.po.DepotHead;
|
import java.sql.Timestamp;
|
||||||
import com.jsh.model.po.Logdetails;
|
import java.text.DecimalFormat;
|
||||||
import com.jsh.model.po.Account;
|
import java.util.HashMap;
|
||||||
import com.jsh.model.vo.basic.AccountModel;
|
import java.util.List;
|
||||||
import com.jsh.service.basic.AccountIService;
|
import java.util.Map;
|
||||||
import com.jsh.service.materials.DepotHeadIService;
|
|
||||||
import com.jsh.service.materials.AccountHeadIService;
|
|
||||||
import com.jsh.service.materials.AccountItemIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
import com.jsh.util.Tools;
|
|
||||||
/**
|
/**
|
||||||
* 结算账户
|
* 结算账户
|
||||||
|
*
|
||||||
* @author ji sheng hua qq7527-18920
|
* @author ji sheng hua qq7527-18920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class AccountAction extends BaseAction<AccountModel>
|
public class AccountAction extends BaseAction<AccountModel> {
|
||||||
{
|
|
||||||
private AccountIService accountService;
|
private AccountIService accountService;
|
||||||
private DepotHeadIService depotHeadService;
|
private DepotHeadIService depotHeadService;
|
||||||
private AccountHeadIService accountHeadService;
|
private AccountHeadIService accountHeadService;
|
||||||
@@ -39,21 +36,17 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
private AccountModel model = new AccountModel();
|
private AccountModel model = new AccountModel();
|
||||||
|
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getAccount()
|
public String getAccount() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Map<String, Object> condition = pageUtil.getAdvSearch();
|
Map<String, Object> condition = pageUtil.getAdvSearch();
|
||||||
condition.put("Id_s_order", "asc");
|
condition.put("Id_s_order", "asc");
|
||||||
accountService.find(pageUtil);
|
accountService.find(pageUtil);
|
||||||
mapData.put("accountList", pageUtil.getPageList());
|
mapData.put("accountList", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找账户信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找账户信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exception");
|
model.getShowModel().setMsgTip("exception");
|
||||||
}
|
}
|
||||||
@@ -62,14 +55,13 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加结算账户
|
* 增加结算账户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加结算账户方法===================");
|
Log.infoFileSync("==================开始调用增加结算账户方法===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Account Account = new Account();
|
Account Account = new Account();
|
||||||
Account.setName(model.getName());
|
Account.setName(model.getName());
|
||||||
Account.setSerialNo(model.getSerialNo());
|
Account.setSerialNo(model.getSerialNo());
|
||||||
@@ -83,22 +75,15 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加结算账户异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加结算账户异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加结算账户回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加结算账户回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -111,19 +96,16 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除结算账户
|
* 删除结算账户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除结算账户信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除结算账户信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
accountService.delete(model.getAccountID());
|
accountService.delete(model.getAccountID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAccountID() + " 的结算账户异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAccountID() + " 的结算账户异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -138,13 +120,12 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新结算账户
|
* 更新结算账户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Account Account = accountService.get(model.getAccountID());
|
Account Account = accountService.get(model.getAccountID());
|
||||||
Account.setName(model.getName());
|
Account.setName(model.getName());
|
||||||
Account.setSerialNo(model.getSerialNo());
|
Account.setSerialNo(model.getSerialNo());
|
||||||
@@ -156,22 +137,15 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改结算账户ID为 : " + model.getAccountID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改结算账户ID为 : " + model.getAccountID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改结算账户回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改结算账户回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -182,13 +156,12 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新结算账户金额
|
* 更新结算账户金额
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void updateAmount()
|
public void updateAmount() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Account Account = accountService.get(model.getAccountID());
|
Account Account = accountService.get(model.getAccountID());
|
||||||
Account.setCurrentAmount(model.getCurrentAmount());
|
Account.setCurrentAmount(model.getCurrentAmount());
|
||||||
accountService.update(Account);
|
accountService.update(Account);
|
||||||
@@ -196,22 +169,15 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改结算账户ID为 : " + model.getAccountID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改结算账户ID为 : " + model.getAccountID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改结算账户回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改结算账户回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -222,6 +188,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新结算账户-设置是否默认
|
* 更新结算账户-设置是否默认
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void updateAmountIsDefault() {
|
public void updateAmountIsDefault() {
|
||||||
@@ -233,18 +200,15 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改结算账户ID为 : " + model.getAccountID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改结算账户ID为 : " + model.getAccountID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally {
|
|
||||||
try {
|
try {
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改结算账户回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改结算账户回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -257,20 +221,17 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID结算账户
|
* 批量删除指定ID结算账户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
accountService.batchDelete(model.getAccountIDs());
|
accountService.batchDelete(model.getAccountIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除结算账户ID为:" + model.getAccountIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除结算账户ID为:" + model.getAccountIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -285,25 +246,16 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = accountService.checkIsNameExist("name", model.getName(), "id", model.getAccountID());
|
flag = accountService.checkIsNameExist("name", model.getName(), "id", model.getAccountID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查结算账户名称为:" + model.getName() + " ID为: " + model.getAccountID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查结算账户名称为:" + model.getName() + " ID为: " + model.getAccountID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查结算账户名称为:" + model.getName() + " ID为: " + model.getAccountID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查结算账户名称为:" + model.getName() + " ID为: " + model.getAccountID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -311,12 +263,11 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找结算账户信息
|
* 查找结算账户信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Account> pageUtil = new PageUtil<Account>();
|
PageUtil<Account> pageUtil = new PageUtil<Account>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -328,10 +279,8 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Account account : dataList) {
|
||||||
for(Account account:dataList)
|
|
||||||
{
|
|
||||||
DecimalFormat df = new DecimalFormat(".##");
|
DecimalFormat df = new DecimalFormat(".##");
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", account.getId());
|
item.put("id", account.getId());
|
||||||
@@ -358,18 +307,16 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找结算账户信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找结算账户信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询结算账户信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询结算账户信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单个账户的金额求和-入库和出库
|
* 单个账户的金额求和-入库和出库
|
||||||
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -387,8 +334,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
accountSum = accountSum + depotHead.getChangeAmount();
|
accountSum = accountSum + depotHead.getChangeAmount();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找进销存信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找进销存信息异常", e);
|
||||||
}
|
}
|
||||||
return accountSum;
|
return accountSum;
|
||||||
@@ -396,6 +342,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 单个账户的金额求和-收入、支出、转账的单据表头的合计
|
* 单个账户的金额求和-收入、支出、转账的单据表头的合计
|
||||||
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -413,8 +360,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
accountSum = accountSum + accountHead.getChangeAmount();
|
accountSum = accountSum + accountHead.getChangeAmount();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找进销存信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找进销存信息异常", e);
|
||||||
}
|
}
|
||||||
return accountSum;
|
return accountSum;
|
||||||
@@ -422,6 +368,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 单个账户的金额求和-收款、付款、转账、收预付款的单据明细的合计
|
* 单个账户的金额求和-收款、付款、转账、收预付款的单据明细的合计
|
||||||
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -454,11 +401,9 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找进销存信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找进销存信息异常", e);
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>异常信息:", e);
|
Log.errorFileSync(">>>>>>>>>异常信息:", e);
|
||||||
}
|
}
|
||||||
return accountSum;
|
return accountSum;
|
||||||
@@ -466,6 +411,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 单个账户的金额求和-多账户的明细合计
|
* 单个账户的金额求和-多账户的明细合计
|
||||||
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -493,8 +439,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
|
||||||
}
|
}
|
||||||
return accountSum;
|
return accountSum;
|
||||||
@@ -502,12 +447,11 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找结算账户信息-下拉框
|
* 查找结算账户信息-下拉框
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBySelect()
|
public void findBySelect() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Account> pageUtil = new PageUtil<Account>();
|
PageUtil<Account> pageUtil = new PageUtil<Account>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
@@ -516,10 +460,8 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
List<Account> dataList = pageUtil.getPageList();
|
List<Account> dataList = pageUtil.getPageList();
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Account account : dataList) {
|
||||||
for(Account account:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", account.getId());
|
item.put("Id", account.getId());
|
||||||
//结算账户名称
|
//结算账户名称
|
||||||
@@ -529,13 +471,9 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找结算账户信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找结算账户信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询结算账户信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询结算账户信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -578,21 +516,19 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -606,10 +542,10 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-下拉框-结算账户
|
* 拼接搜索条件-下拉框-结算账户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_select()
|
private Map<String, Object> getCondition_select() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -620,10 +556,10 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_getSum(Long id,String timeStr,String type)
|
private Map<String, Object> getCondition_getSum(Long id, String timeStr, String type) {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -634,8 +570,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
if (type.equals("month")) {
|
if (type.equals("month")) {
|
||||||
condition.put("OperTime_s_gteq", timeStr + "-01 00:00:00");
|
condition.put("OperTime_s_gteq", timeStr + "-01 00:00:00");
|
||||||
condition.put("OperTime_s_lteq", timeStr + "-31 00:00:00");
|
condition.put("OperTime_s_lteq", timeStr + "-31 00:00:00");
|
||||||
}
|
} else if (type.equals("date")) {
|
||||||
else if(type.equals("date")){
|
|
||||||
condition.put("OperTime_s_lteq", timeStr);
|
condition.put("OperTime_s_lteq", timeStr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -644,10 +579,10 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_getManyAccountSum(Long id,String timeStr,String type)
|
private Map<String, Object> getCondition_getManyAccountSum(Long id, String timeStr, String type) {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -657,8 +592,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
if (type.equals("month")) {
|
if (type.equals("month")) {
|
||||||
condition.put("OperTime_s_gteq", timeStr + "-01 00:00:00");
|
condition.put("OperTime_s_gteq", timeStr + "-01 00:00:00");
|
||||||
condition.put("OperTime_s_lteq", timeStr + "-31 00:00:00");
|
condition.put("OperTime_s_lteq", timeStr + "-31 00:00:00");
|
||||||
}
|
} else if (type.equals("date")) {
|
||||||
else if(type.equals("date")){
|
|
||||||
condition.put("OperTime_s_lteq", timeStr);
|
condition.put("OperTime_s_lteq", timeStr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -667,10 +601,10 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_getSumByHead(Long id,String timeStr, String type)
|
private Map<String, Object> getCondition_getSumByHead(Long id, String timeStr, String type) {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -680,8 +614,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
if (type.equals("month")) {
|
if (type.equals("month")) {
|
||||||
condition.put("BillTime_s_gteq", timeStr + "-01 00:00:00");
|
condition.put("BillTime_s_gteq", timeStr + "-01 00:00:00");
|
||||||
condition.put("BillTime_s_lteq", timeStr + "-31 00:00:00");
|
condition.put("BillTime_s_lteq", timeStr + "-31 00:00:00");
|
||||||
}
|
} else if (type.equals("date")) {
|
||||||
else if(type.equals("date")) {
|
|
||||||
condition.put("BillTime_s_lteq", timeStr);
|
condition.put("BillTime_s_lteq", timeStr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -690,10 +623,10 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_getSumByHead(String timeStr, String type)
|
private Map<String, Object> getCondition_getSumByHead(String timeStr, String type) {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -702,8 +635,7 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
if (type.equals("month")) {
|
if (type.equals("month")) {
|
||||||
condition.put("BillTime_s_gteq", timeStr + "-01 00:00:00");
|
condition.put("BillTime_s_gteq", timeStr + "-01 00:00:00");
|
||||||
condition.put("BillTime_s_lteq", timeStr + "-31 00:00:00");
|
condition.put("BillTime_s_lteq", timeStr + "-31 00:00:00");
|
||||||
}
|
} else if (type.equals("date")) {
|
||||||
else if(type.equals("date")) {
|
|
||||||
condition.put("BillTime_s_lteq", timeStr);
|
condition.put("BillTime_s_lteq", timeStr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -712,10 +644,10 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_getSumByDetail(Long id, String ids)
|
private Map<String, Object> getCondition_getSumByDetail(Long id, String ids) {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -729,20 +661,22 @@ public class AccountAction extends BaseAction<AccountModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public AccountModel getModel()
|
public AccountModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setAccountService(AccountIService accountService)
|
|
||||||
{
|
public void setAccountService(AccountIService accountService) {
|
||||||
this.accountService = accountService;
|
this.accountService = accountService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDepotHeadService(DepotHeadIService depotHeadService) {
|
public void setDepotHeadService(DepotHeadIService depotHeadService) {
|
||||||
this.depotHeadService = depotHeadService;
|
this.depotHeadService = depotHeadService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccountHeadService(AccountHeadIService accountHeadService) {
|
public void setAccountHeadService(AccountHeadIService accountHeadService) {
|
||||||
this.accountHeadService = accountHeadService;
|
this.accountHeadService = accountHeadService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccountItemService(AccountItemIService accountItemService) {
|
public void setAccountItemService(AccountItemIService accountItemService) {
|
||||||
this.accountItemService = accountItemService;
|
this.accountItemService = accountItemService;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,36 +1,31 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileNotFoundException;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.io.OutputStream;
|
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.apache.struts2.ServletActionContext;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
import com.jsh.base.BaseAction;
|
||||||
import com.jsh.base.Log;
|
import com.jsh.base.Log;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.App;
|
import com.jsh.model.po.App;
|
||||||
import com.jsh.model.po.Logdetails;
|
import com.jsh.model.po.Logdetails;
|
||||||
import com.jsh.model.vo.basic.AppModel;
|
import com.jsh.model.vo.basic.AppModel;
|
||||||
import com.jsh.service.basic.AppIService;
|
import com.jsh.service.basic.AppIService;
|
||||||
import com.jsh.service.basic.UserBusinessIService;
|
import com.jsh.service.basic.UserBusinessIService;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.apache.struts2.ServletActionContext;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
|
import java.io.*;
|
||||||
|
import java.sql.Timestamp;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 应用
|
* 应用
|
||||||
|
*
|
||||||
* @author ji_sheng_hua qq752 718 920
|
* @author ji_sheng_hua qq752 718 920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class AppAction extends BaseAction<AppModel>
|
public class AppAction extends BaseAction<AppModel> {
|
||||||
{
|
|
||||||
private AppIService appService;
|
private AppIService appService;
|
||||||
private UserBusinessIService userBusinessService;
|
private UserBusinessIService userBusinessService;
|
||||||
private AppModel model = new AppModel();
|
private AppModel model = new AppModel();
|
||||||
@@ -38,8 +33,7 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
/**
|
/**
|
||||||
* 上传图片
|
* 上传图片
|
||||||
*/
|
*/
|
||||||
public void uploadImg()
|
public void uploadImg() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用上传图片方法uploadImg()===================");
|
Log.infoFileSync("==================开始调用上传图片方法uploadImg()===================");
|
||||||
File fileInfo = model.getFileInfo();
|
File fileInfo = model.getFileInfo();
|
||||||
String fileName = model.getFileInfoName(); //获取文件名
|
String fileName = model.getFileInfoName(); //获取文件名
|
||||||
@@ -57,12 +51,10 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
is.close();
|
is.close();
|
||||||
os.close();
|
os.close();
|
||||||
}
|
}
|
||||||
}
|
} catch (FileNotFoundException e) {
|
||||||
catch (FileNotFoundException e) {
|
|
||||||
// TODO Auto-generated catch block
|
// TODO Auto-generated catch block
|
||||||
// e.printStackTrace();
|
// e.printStackTrace();
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
// TODO Auto-generated catch block
|
// TODO Auto-generated catch block
|
||||||
// e.printStackTrace();
|
// e.printStackTrace();
|
||||||
}
|
}
|
||||||
@@ -71,14 +63,13 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加应用
|
* 增加应用
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加应用方法create()===================");
|
Log.infoFileSync("==================开始调用增加应用方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
App app = new App();
|
App app = new App();
|
||||||
app.setNumber(model.getNumber());
|
app.setNumber(model.getNumber());
|
||||||
app.setName(model.getName());
|
app.setName(model.getName());
|
||||||
@@ -101,22 +92,15 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加应用异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加应用异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加应用回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加应用回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -129,19 +113,16 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除应用
|
* 删除应用
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除应用方法delete()================");
|
Log.infoFileSync("====================开始调用删除应用方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
appService.delete(model.getAppID());
|
appService.delete(model.getAppID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAppID() + " 的应用异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAppID() + " 的应用异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -156,13 +137,12 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新仓库
|
* 更新仓库
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
App app = appService.get(model.getAppID());
|
App app = appService.get(model.getAppID());
|
||||||
app.setNumber(model.getNumber());
|
app.setNumber(model.getNumber());
|
||||||
app.setName(model.getName());
|
app.setName(model.getName());
|
||||||
@@ -183,22 +163,15 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改应用ID为 : " + model.getAppID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改应用ID为 : " + model.getAppID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改应用回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改应用回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -209,20 +182,17 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID应用
|
* 批量删除指定ID应用
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
appService.batchDelete(model.getAppIDs());
|
appService.batchDelete(model.getAppIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除应用ID为:" + model.getAppIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除应用ID为:" + model.getAppIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -237,25 +207,16 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = appService.checkIsNameExist("name", model.getName(), "Id", model.getAppID());
|
flag = appService.checkIsNameExist("name", model.getName(), "Id", model.getAppID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查应用名称为:" + model.getName() + " ID为: " + model.getAppID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查应用名称为:" + model.getName() + " ID为: " + model.getAppID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查应用名称为:" + model.getName() + " ID为: " + model.getAppID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查应用名称为:" + model.getName() + " ID为: " + model.getAppID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -263,12 +224,11 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找应用信息
|
* 查找应用信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<App> pageUtil = new PageUtil<App>();
|
PageUtil<App> pageUtil = new PageUtil<App>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -284,10 +244,8 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (App app : dataList) {
|
||||||
for(App app:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", app.getId());
|
item.put("Id", app.getId());
|
||||||
//应用名称
|
//应用名称
|
||||||
@@ -312,25 +270,20 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 桌面应用显示
|
* 桌面应用显示
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findDesk()
|
public void findDesk() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<App> pageUtil = new PageUtil<App>();
|
PageUtil<App> pageUtil = new PageUtil<App>();
|
||||||
pageUtil.setPageSize(100);
|
pageUtil.setPageSize(100);
|
||||||
//pageUtil.setCurPage(model.getPageNo());
|
//pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -345,10 +298,8 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
//开始拼接json数据
|
//开始拼接json数据
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray1 = new JSONArray();
|
JSONArray dataArray1 = new JSONArray();
|
||||||
if(null != dataList1)
|
if (null != dataList1) {
|
||||||
{
|
for (App app : dataList1) {
|
||||||
for(App app:dataList1)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", app.getId());
|
item.put("id", app.getId());
|
||||||
item.put("title", app.getName());
|
item.put("title", app.getName());
|
||||||
@@ -373,10 +324,8 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
//开始拼接json数据
|
//开始拼接json数据
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray2 = new JSONArray();
|
JSONArray dataArray2 = new JSONArray();
|
||||||
if(null != dataList2)
|
if (null != dataList2) {
|
||||||
{
|
for (App app : dataList2) {
|
||||||
for(App app:dataList2)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", app.getId());
|
item.put("id", app.getId());
|
||||||
item.put("title", app.getName());
|
item.put("title", app.getName());
|
||||||
@@ -394,13 +343,9 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
outer.put("desk", dataArray2);
|
outer.put("desk", dataArray2);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -408,12 +353,11 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 角色对应应用显示
|
* 角色对应应用显示
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findRoleAPP()
|
public void findRoleAPP() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<App> pageUtil = new PageUtil<App>();
|
PageUtil<App> pageUtil = new PageUtil<App>();
|
||||||
pageUtil.setPageSize(100);
|
pageUtil.setPageSize(100);
|
||||||
//pageUtil.setCurPage(model.getPageNo());
|
//pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -429,24 +373,21 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
outer.put("state", "open");
|
outer.put("state", "open");
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (App app : dataList) {
|
||||||
for(App app:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", app.getId());
|
item.put("id", app.getId());
|
||||||
item.put("text", app.getName());
|
item.put("text", app.getName());
|
||||||
//勾选判断1
|
//勾选判断1
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + app.getId().toString() + "]");
|
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + app.getId().toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的应用:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的应用:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
||||||
}
|
}
|
||||||
if (flag==true){item.put("checked", true);}
|
if (flag == true) {
|
||||||
|
item.put("checked", true);
|
||||||
|
}
|
||||||
//结束
|
//结束
|
||||||
dataArray.add(item);
|
dataArray.add(item);
|
||||||
}
|
}
|
||||||
@@ -454,23 +395,19 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
outer.put("children", dataArray);
|
outer.put("children", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient("[" + outer.toString() + "]");
|
toClient("[" + outer.toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -483,10 +420,10 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-桌面dock
|
* 拼接搜索条件-桌面dock
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_dock()
|
private Map<String, Object> getCondition_dock() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -499,10 +436,10 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-桌面desk
|
* 拼接搜索条件-桌面desk
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_desk()
|
private Map<String, Object> getCondition_desk() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -515,10 +452,10 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-角色对应应用
|
* 拼接搜索条件-角色对应应用
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_RoleAPP()
|
private Map<String, Object> getCondition_RoleAPP() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -530,12 +467,11 @@ public class AppAction extends BaseAction<AppModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public AppModel getModel()
|
public AppModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setAppService(AppIService appService)
|
|
||||||
{
|
public void setAppService(AppIService appService) {
|
||||||
this.appService = appService;
|
this.appService = appService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,5 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
import com.jsh.base.BaseAction;
|
||||||
import com.jsh.base.Log;
|
import com.jsh.base.Log;
|
||||||
import com.jsh.model.po.Assetname;
|
import com.jsh.model.po.Assetname;
|
||||||
@@ -16,23 +8,31 @@ import com.jsh.model.po.Logdetails;
|
|||||||
import com.jsh.model.vo.basic.AssetNameModel;
|
import com.jsh.model.vo.basic.AssetNameModel;
|
||||||
import com.jsh.service.basic.AssetNameIService;
|
import com.jsh.service.basic.AssetNameIService;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.sql.Timestamp;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class AssetNameAction extends BaseAction<AssetNameModel>
|
public class AssetNameAction extends BaseAction<AssetNameModel> {
|
||||||
{
|
|
||||||
private AssetNameModel model = new AssetNameModel();
|
private AssetNameModel model = new AssetNameModel();
|
||||||
|
|
||||||
private AssetNameIService assetnameService;
|
private AssetNameIService assetnameService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加资产名称
|
* 增加资产名称
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加资产名称方法create()===================");
|
Log.infoFileSync("==================开始调用增加资产名称方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Assetname assetname = new Assetname();
|
Assetname assetname = new Assetname();
|
||||||
assetname.setAssetname(model.getAssetName());
|
assetname.setAssetname(model.getAssetName());
|
||||||
//增加资产类型
|
//增加资产类型
|
||||||
@@ -48,22 +48,15 @@ public class AssetNameAction extends BaseAction<AssetNameModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加资产名称异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加资产名称异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加资产名称回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加资产名称回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -76,19 +69,16 @@ public class AssetNameAction extends BaseAction<AssetNameModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除资产名称
|
* 删除资产名称
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除资产名称信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除资产名称信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
assetnameService.delete(model.getAssetNameID());
|
assetnameService.delete(model.getAssetNameID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAssetNameID() + " 的资产名称异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAssetNameID() + " 的资产名称异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -103,13 +93,12 @@ public class AssetNameAction extends BaseAction<AssetNameModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新资产名称
|
* 更新资产名称
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Assetname assetname = assetnameService.get(model.getAssetNameID());
|
Assetname assetname = assetnameService.get(model.getAssetNameID());
|
||||||
//增加资产类型
|
//增加资产类型
|
||||||
assetname.setCategory(new Category(model.getCategoryID()));
|
assetname.setCategory(new Category(model.getCategoryID()));
|
||||||
@@ -121,22 +110,15 @@ public class AssetNameAction extends BaseAction<AssetNameModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改资产名称ID为 : " + model.getAssetNameID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改资产名称ID为 : " + model.getAssetNameID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改资产名称回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改资产名称回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -147,20 +129,17 @@ public class AssetNameAction extends BaseAction<AssetNameModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID资产名称
|
* 批量删除指定ID资产名称
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
assetnameService.batchDelete(model.getAssetNameIDs());
|
assetnameService.batchDelete(model.getAssetNameIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除资产名称ID为:" + model.getAssetNameIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除资产名称ID为:" + model.getAssetNameIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -175,25 +154,16 @@ public class AssetNameAction extends BaseAction<AssetNameModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = assetnameService.checkIsNameExist("assetname", model.getAssetName(), "id", model.getAssetNameID());
|
flag = assetnameService.checkIsNameExist("assetname", model.getAssetName(), "id", model.getAssetNameID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查资产名称名称为:" + model.getAssetName() + " ID为: " + model.getAssetNameID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查资产名称名称为:" + model.getAssetName() + " ID为: " + model.getAssetNameID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查资产名称名称为:" + model.getAssetName() + " ID为: " + model.getAssetNameID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查资产名称名称为:" + model.getAssetName() + " ID为: " + model.getAssetNameID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -201,12 +171,11 @@ public class AssetNameAction extends BaseAction<AssetNameModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找供应商信息
|
* 查找供应商信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Assetname> pageUtil = new PageUtil<Assetname>();
|
PageUtil<Assetname> pageUtil = new PageUtil<Assetname>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -222,10 +191,8 @@ public class AssetNameAction extends BaseAction<AssetNameModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Assetname assetname : dataList) {
|
||||||
for(Assetname assetname:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", assetname.getId());
|
item.put("id", assetname.getId());
|
||||||
//供应商名称
|
//供应商名称
|
||||||
@@ -243,23 +210,19 @@ public class AssetNameAction extends BaseAction<AssetNameModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找资产名称信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找资产名称信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询资产名称信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询资产名称信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -274,13 +237,11 @@ public class AssetNameAction extends BaseAction<AssetNameModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public AssetNameModel getModel()
|
public AssetNameModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAssetnameService(AssetNameIService assetnameService)
|
public void setAssetnameService(AssetNameIService assetnameService) {
|
||||||
{
|
|
||||||
this.assetnameService = assetnameService;
|
this.assetnameService = assetnameService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,5 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
import com.jsh.base.BaseAction;
|
||||||
import com.jsh.base.Log;
|
import com.jsh.base.Log;
|
||||||
import com.jsh.model.po.Category;
|
import com.jsh.model.po.Category;
|
||||||
@@ -15,24 +7,33 @@ import com.jsh.model.po.Logdetails;
|
|||||||
import com.jsh.model.vo.basic.CategoryModel;
|
import com.jsh.model.vo.basic.CategoryModel;
|
||||||
import com.jsh.service.basic.CategoryIService;
|
import com.jsh.service.basic.CategoryIService;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.sql.Timestamp;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @author jishenghua qq:7-5-2-7-1-8-9-2-0
|
* @author jishenghua qq:7-5-2-7-1-8-9-2-0
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class CategoryAction extends BaseAction<CategoryModel>
|
public class CategoryAction extends BaseAction<CategoryModel> {
|
||||||
{
|
|
||||||
private CategoryIService categoryService;
|
private CategoryIService categoryService;
|
||||||
private CategoryModel model = new CategoryModel();
|
private CategoryModel model = new CategoryModel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加资产类型
|
* 增加资产类型
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加资产类型方法create()===================");
|
Log.infoFileSync("==================开始调用增加资产类型方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Category category = new Category();
|
Category category = new Category();
|
||||||
category.setAssetname(model.getCategoryName());
|
category.setAssetname(model.getCategoryName());
|
||||||
category.setIsystem((short) 1);
|
category.setIsystem((short) 1);
|
||||||
@@ -44,22 +45,15 @@ public class CategoryAction extends BaseAction<CategoryModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加资产类型异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加资产类型异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加资产类型回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加资产类型回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -72,19 +66,16 @@ public class CategoryAction extends BaseAction<CategoryModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除资产类型
|
* 删除资产类型
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除资产类型信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除资产类型信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
categoryService.delete(model.getCategoryID());
|
categoryService.delete(model.getCategoryID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getCategoryID() + " 的资产类型异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getCategoryID() + " 的资产类型异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -99,13 +90,12 @@ public class CategoryAction extends BaseAction<CategoryModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新资产类型
|
* 更新资产类型
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Category category = categoryService.get(model.getCategoryID());
|
Category category = categoryService.get(model.getCategoryID());
|
||||||
category.setAssetname(model.getCategoryName());
|
category.setAssetname(model.getCategoryName());
|
||||||
category.setDescription(model.getDescription());
|
category.setDescription(model.getDescription());
|
||||||
@@ -114,22 +104,15 @@ public class CategoryAction extends BaseAction<CategoryModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改资产类型ID为 : " + model.getCategoryID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改资产类型ID为 : " + model.getCategoryID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改资产类型回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改资产类型回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -140,20 +123,17 @@ public class CategoryAction extends BaseAction<CategoryModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID资产类型
|
* 批量删除指定ID资产类型
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
categoryService.batchDelete(model.getCategoryIDs());
|
categoryService.batchDelete(model.getCategoryIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除资产类型ID为:" + model.getCategoryIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除资产类型ID为:" + model.getCategoryIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -168,25 +148,16 @@ public class CategoryAction extends BaseAction<CategoryModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = categoryService.checkIsNameExist("assetname", model.getCategoryName(), "id", model.getCategoryID());
|
flag = categoryService.checkIsNameExist("assetname", model.getCategoryName(), "id", model.getCategoryID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查资产类型名称为:" + model.getCategoryName() + " ID为: " + model.getCategoryID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查资产类型名称为:" + model.getCategoryName() + " ID为: " + model.getCategoryID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查资产类型名称为:" + model.getCategoryName() + " ID为: " + model.getCategoryID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查资产类型名称为:" + model.getCategoryName() + " ID为: " + model.getCategoryID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -194,12 +165,11 @@ public class CategoryAction extends BaseAction<CategoryModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找供应商信息
|
* 查找供应商信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Category> pageUtil = new PageUtil<Category>();
|
PageUtil<Category> pageUtil = new PageUtil<Category>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -215,10 +185,8 @@ public class CategoryAction extends BaseAction<CategoryModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Category category : dataList) {
|
||||||
for(Category category:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", category.getId());
|
item.put("id", category.getId());
|
||||||
//供应商名称
|
//供应商名称
|
||||||
@@ -232,23 +200,19 @@ public class CategoryAction extends BaseAction<CategoryModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找资产类型信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找资产类型信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询资产类型信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询资产类型信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -261,12 +225,11 @@ public class CategoryAction extends BaseAction<CategoryModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public CategoryModel getModel()
|
public CategoryModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setCategoryService(CategoryIService categoryService)
|
|
||||||
{
|
public void setCategoryService(CategoryIService categoryService) {
|
||||||
this.categoryService = categoryService;
|
this.categoryService = categoryService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,51 +1,47 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.Depot;
|
||||||
|
import com.jsh.model.po.Logdetails;
|
||||||
|
import com.jsh.model.vo.basic.DepotModel;
|
||||||
|
import com.jsh.service.basic.DepotIService;
|
||||||
|
import com.jsh.service.basic.UserBusinessIService;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.Depot;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.po.Role;
|
|
||||||
import com.jsh.model.vo.basic.DepotModel;
|
|
||||||
import com.jsh.service.basic.DepotIService;
|
|
||||||
import com.jsh.service.basic.UserBusinessIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
/**
|
/**
|
||||||
* 仓库管理
|
* 仓库管理
|
||||||
|
*
|
||||||
* @author jishenghua qq:7-5-2-7-1-8-9-2-0
|
* @author jishenghua qq:7-5-2-7-1-8-9-2-0
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class DepotAction extends BaseAction<DepotModel>
|
public class DepotAction extends BaseAction<DepotModel> {
|
||||||
{
|
|
||||||
private DepotIService depotService;
|
private DepotIService depotService;
|
||||||
private UserBusinessIService userBusinessService;
|
private UserBusinessIService userBusinessService;
|
||||||
private DepotModel model = new DepotModel();
|
private DepotModel model = new DepotModel();
|
||||||
|
|
||||||
|
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getBasicData()
|
public String getBasicData() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Map<String, Object> condition = pageUtil.getAdvSearch();
|
Map<String, Object> condition = pageUtil.getAdvSearch();
|
||||||
condition.put("sort_s_order", "asc");
|
condition.put("sort_s_order", "asc");
|
||||||
depotService.find(pageUtil);
|
depotService.find(pageUtil);
|
||||||
mapData.put("depotList", pageUtil.getPageList());
|
mapData.put("depotList", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exceptoin");
|
model.getShowModel().setMsgTip("exceptoin");
|
||||||
}
|
}
|
||||||
@@ -54,14 +50,13 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加仓库
|
* 增加仓库
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加仓库信息方法create()===================");
|
Log.infoFileSync("==================开始调用增加仓库信息方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Depot depot = new Depot();
|
Depot depot = new Depot();
|
||||||
depot.setName(model.getName());
|
depot.setName(model.getName());
|
||||||
depot.setAddress(model.getAddress());
|
depot.setAddress(model.getAddress());
|
||||||
@@ -77,22 +72,15 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加仓库信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加仓库信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加仓库信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加仓库信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -105,19 +93,16 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除仓库
|
* 删除仓库
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除仓库信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除仓库信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
depotService.delete(model.getDepotID());
|
depotService.delete(model.getDepotID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotID() + " 的仓库异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotID() + " 的仓库异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -132,13 +117,12 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新仓库
|
* 更新仓库
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Depot depot = depotService.get(model.getDepotID());
|
Depot depot = depotService.get(model.getDepotID());
|
||||||
depot.setName(model.getName());
|
depot.setName(model.getName());
|
||||||
depot.setAddress(model.getAddress());
|
depot.setAddress(model.getAddress());
|
||||||
@@ -152,22 +136,15 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改仓库ID为 : " + model.getDepotID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改仓库ID为 : " + model.getDepotID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改仓库回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改仓库回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -178,20 +155,17 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID仓库
|
* 批量删除指定ID仓库
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
depotService.batchDelete(model.getDepotIDs());
|
depotService.batchDelete(model.getDepotIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除仓库ID为:" + model.getDepotIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除仓库ID为:" + model.getDepotIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -206,25 +180,16 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = depotService.checkIsNameExist("name", model.getName(), "id", model.getDepotID());
|
flag = depotService.checkIsNameExist("name", model.getName(), "id", model.getDepotID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查仓库名称为:" + model.getName() + " ID为: " + model.getDepotID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查仓库名称为:" + model.getName() + " ID为: " + model.getDepotID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查仓库名称为:" + model.getName() + " ID为: " + model.getDepotID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查仓库名称为:" + model.getName() + " ID为: " + model.getDepotID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -232,12 +197,11 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找仓库信息
|
* 查找仓库信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Depot> pageUtil = new PageUtil<Depot>();
|
PageUtil<Depot> pageUtil = new PageUtil<Depot>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -249,10 +213,8 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Depot depot : dataList) {
|
||||||
for(Depot depot:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", depot.getId());
|
item.put("id", depot.getId());
|
||||||
//供应商名称
|
//供应商名称
|
||||||
@@ -270,25 +232,20 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找礼品卡-虚拟仓库
|
* 查找礼品卡-虚拟仓库
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findGiftByType()
|
public void findGiftByType() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Depot> pageUtil = new PageUtil<Depot>();
|
PageUtil<Depot> pageUtil = new PageUtil<Depot>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
@@ -297,10 +254,8 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
List<Depot> dataList = pageUtil.getPageList();
|
List<Depot> dataList = pageUtil.getPageList();
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Depot depot : dataList) {
|
||||||
for(Depot depot:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", depot.getId());
|
item.put("id", depot.getId());
|
||||||
//仓库名称
|
//仓库名称
|
||||||
@@ -310,25 +265,20 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找仓库信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找仓库信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询仓库信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询仓库信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户对应仓库显示
|
* 用户对应仓库显示
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findUserDepot()
|
public void findUserDepot() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Depot> pageUtil = new PageUtil<Depot>();
|
PageUtil<Depot> pageUtil = new PageUtil<Depot>();
|
||||||
pageUtil.setPageSize(100);
|
pageUtil.setPageSize(100);
|
||||||
//pageUtil.setCurPage(model.getPageNo());
|
//pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -344,24 +294,21 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
outer.put("state", "open");
|
outer.put("state", "open");
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Depot depot : dataList) {
|
||||||
for(Depot depot:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", depot.getId());
|
item.put("id", depot.getId());
|
||||||
item.put("text", depot.getName());
|
item.put("text", depot.getName());
|
||||||
//勾选判断1
|
//勾选判断1
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + depot.getId().toString() + "]");
|
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + depot.getId().toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的仓库:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的仓库:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
||||||
}
|
}
|
||||||
if (flag==true){item.put("checked", true);}
|
if (flag == true) {
|
||||||
|
item.put("checked", true);
|
||||||
|
}
|
||||||
//结束
|
//结束
|
||||||
dataArray.add(item);
|
dataArray.add(item);
|
||||||
}
|
}
|
||||||
@@ -369,19 +316,16 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
outer.put("children", dataArray);
|
outer.put("children", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient("[" + outer.toString() + "]");
|
toClient("[" + outer.toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据用户查找对应仓库列表-仅显示有权限的
|
* 根据用户查找对应仓库列表-仅显示有权限的
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findDepotByUserId() {
|
public void findDepotByUserId() {
|
||||||
@@ -395,19 +339,14 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
|
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Depot depot : dataList) {
|
||||||
for(Depot depot:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
//勾选判断1
|
//勾选判断1
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + depot.getId().toString() + "]");
|
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + depot.getId().toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>查询用户对应的仓库:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>查询用户对应的仓库:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
||||||
}
|
}
|
||||||
if (flag == true) {
|
if (flag == true) {
|
||||||
@@ -419,23 +358,19 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -449,10 +384,10 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getConditionByType()
|
private Map<String, Object> getConditionByType() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -464,10 +399,10 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-用户对应仓库
|
* 拼接搜索条件-用户对应仓库
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_UserDepot()
|
private Map<String, Object> getCondition_UserDepot() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -479,12 +414,11 @@ public class DepotAction extends BaseAction<DepotModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public DepotModel getModel()
|
public DepotModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setDepotService(DepotIService depotService)
|
|
||||||
{
|
public void setDepotService(DepotIService depotService) {
|
||||||
this.depotService = depotService;
|
this.depotService = depotService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,43 +1,42 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
import com.jsh.base.BaseAction;
|
||||||
import com.jsh.base.Log;
|
import com.jsh.base.Log;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.App;
|
|
||||||
import com.jsh.model.po.Functions;
|
import com.jsh.model.po.Functions;
|
||||||
import com.jsh.model.po.Logdetails;
|
import com.jsh.model.po.Logdetails;
|
||||||
import com.jsh.model.vo.basic.FunctionsModel;
|
import com.jsh.model.vo.basic.FunctionsModel;
|
||||||
import com.jsh.service.basic.FunctionsIService;
|
import com.jsh.service.basic.FunctionsIService;
|
||||||
import com.jsh.service.basic.UserBusinessIService;
|
import com.jsh.service.basic.UserBusinessIService;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.sql.Timestamp;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 功能管理
|
* 功能管理
|
||||||
* @author jishenghua qq:7-5-2-7-1-8-9-2-0
|
* @author jishenghua qq:7-5-2-7-1-8-9-2-0
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class FunctionsAction extends BaseAction<FunctionsModel>
|
public class FunctionsAction extends BaseAction<FunctionsModel> {
|
||||||
{
|
|
||||||
private FunctionsIService functionsService;
|
private FunctionsIService functionsService;
|
||||||
private UserBusinessIService userBusinessService;
|
private UserBusinessIService userBusinessService;
|
||||||
private FunctionsModel model = new FunctionsModel();
|
private FunctionsModel model = new FunctionsModel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加功能
|
* 增加功能
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加功能信息方法create()===================");
|
Log.infoFileSync("==================开始调用增加功能信息方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Functions functions = new Functions();
|
Functions functions = new Functions();
|
||||||
functions.setNumber(model.getNumber());
|
functions.setNumber(model.getNumber());
|
||||||
functions.setName(model.getName());
|
functions.setName(model.getName());
|
||||||
@@ -55,22 +54,15 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加功能信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加功能信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加功能信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加功能信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,19 +75,16 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除功能
|
* 删除功能
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除功能信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除功能信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
functionsService.delete(model.getFunctionsID());
|
functionsService.delete(model.getFunctionsID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getFunctionsID() + " 的功能异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getFunctionsID() + " 的功能异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -110,13 +99,12 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新功能
|
* 更新功能
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Functions functions = functionsService.get(model.getFunctionsID());
|
Functions functions = functionsService.get(model.getFunctionsID());
|
||||||
functions.setNumber(model.getNumber());
|
functions.setNumber(model.getNumber());
|
||||||
functions.setName(model.getName());
|
functions.setName(model.getName());
|
||||||
@@ -132,22 +120,15 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改功能ID为 : " + model.getFunctionsID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改功能ID为 : " + model.getFunctionsID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改功能回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改功能回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -158,20 +139,17 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID功能
|
* 批量删除指定ID功能
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
functionsService.batchDelete(model.getFunctionsIDs());
|
functionsService.batchDelete(model.getFunctionsIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除功能ID为:" + model.getFunctionsIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除功能ID为:" + model.getFunctionsIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -186,25 +164,16 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = functionsService.checkIsNameExist("Name", model.getName(), "Id", model.getFunctionsID());
|
flag = functionsService.checkIsNameExist("Name", model.getName(), "Id", model.getFunctionsID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查功能名称为:" + model.getName() + " ID为: " + model.getFunctionsID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查功能名称为:" + model.getName() + " ID为: " + model.getFunctionsID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查功能名称为:" + model.getName() + " ID为: " + model.getFunctionsID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查功能名称为:" + model.getName() + " ID为: " + model.getFunctionsID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -212,12 +181,11 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找功能信息
|
* 查找功能信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Functions> pageUtil = new PageUtil<Functions>();
|
PageUtil<Functions> pageUtil = new PageUtil<Functions>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -233,10 +201,8 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Functions functions : dataList) {
|
||||||
for(Functions functions:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", functions.getId());
|
item.put("Id", functions.getId());
|
||||||
item.put("Number", functions.getNumber());
|
item.put("Number", functions.getNumber());
|
||||||
@@ -255,23 +221,19 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找功能信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找功能信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询功能信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询功能信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据id列表查找功能信息
|
* 根据id列表查找功能信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findByIds()
|
public void findByIds() {
|
||||||
{
|
|
||||||
try {
|
try {
|
||||||
PageUtil<Functions> pageUtil = new PageUtil<Functions>();
|
PageUtil<Functions> pageUtil = new PageUtil<Functions>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
@@ -283,10 +245,8 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Functions functions : dataList) {
|
||||||
for(Functions functions:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", functions.getId());
|
item.put("Id", functions.getId());
|
||||||
item.put("Name", functions.getName());
|
item.put("Name", functions.getName());
|
||||||
@@ -298,13 +258,9 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找功能信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找功能信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询功能信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询功能信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -312,12 +268,11 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 角色对应功能显示
|
* 角色对应功能显示
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findRoleFunctions()
|
public void findRoleFunctions() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Functions> pageUtil = new PageUtil<Functions>();
|
PageUtil<Functions> pageUtil = new PageUtil<Functions>();
|
||||||
pageUtil.setPageSize(200);
|
pageUtil.setPageSize(200);
|
||||||
pageUtil.setAdvSearch(getCondition_RoleFunctions("0"));
|
pageUtil.setAdvSearch(getCondition_RoleFunctions("0"));
|
||||||
@@ -331,36 +286,31 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
outer.put("state", "open");
|
outer.put("state", "open");
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Functions functions : dataList) {
|
||||||
for(Functions functions:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", functions.getId());
|
item.put("id", functions.getId());
|
||||||
item.put("text", functions.getName());
|
item.put("text", functions.getName());
|
||||||
|
|
||||||
//勾选判断1
|
//勾选判断1
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + functions.getId().toString() + "]");
|
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + functions.getId().toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
||||||
}
|
}
|
||||||
if (flag==true){item.put("checked", true);}
|
if (flag == true) {
|
||||||
|
item.put("checked", true);
|
||||||
|
}
|
||||||
//结束
|
//结束
|
||||||
|
|
||||||
pageUtil.setAdvSearch(getCondition_RoleFunctions(functions.getNumber()));
|
pageUtil.setAdvSearch(getCondition_RoleFunctions(functions.getNumber()));
|
||||||
functionsService.find(pageUtil);
|
functionsService.find(pageUtil);
|
||||||
List<Functions> dataList1 = pageUtil.getPageList();
|
List<Functions> dataList1 = pageUtil.getPageList();
|
||||||
JSONArray dataArray1 = new JSONArray();
|
JSONArray dataArray1 = new JSONArray();
|
||||||
if(null != dataList1)
|
if (null != dataList1) {
|
||||||
{
|
|
||||||
|
|
||||||
for(Functions functions1:dataList1)
|
for (Functions functions1 : dataList1) {
|
||||||
{
|
|
||||||
item.put("state", "open"); //如果不为空,节点不展开
|
item.put("state", "open"); //如果不为空,节点不展开
|
||||||
JSONObject item1 = new JSONObject();
|
JSONObject item1 = new JSONObject();
|
||||||
item1.put("id", functions1.getId());
|
item1.put("id", functions1.getId());
|
||||||
@@ -368,26 +318,23 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
//勾选判断2
|
//勾选判断2
|
||||||
//Boolean flag = false;
|
//Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + functions1.getId().toString() + "]");
|
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + functions1.getId().toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
||||||
}
|
}
|
||||||
if (flag==true){item1.put("checked", true);}
|
if (flag == true) {
|
||||||
|
item1.put("checked", true);
|
||||||
|
}
|
||||||
//结束
|
//结束
|
||||||
|
|
||||||
pageUtil.setAdvSearch(getCondition_RoleFunctions(functions1.getNumber()));
|
pageUtil.setAdvSearch(getCondition_RoleFunctions(functions1.getNumber()));
|
||||||
functionsService.find(pageUtil);
|
functionsService.find(pageUtil);
|
||||||
List<Functions> dataList2 = pageUtil.getPageList();
|
List<Functions> dataList2 = pageUtil.getPageList();
|
||||||
JSONArray dataArray2 = new JSONArray();
|
JSONArray dataArray2 = new JSONArray();
|
||||||
if(null != dataList2)
|
if (null != dataList2) {
|
||||||
{
|
|
||||||
|
|
||||||
for(Functions functions2:dataList2)
|
for (Functions functions2 : dataList2) {
|
||||||
{
|
|
||||||
item1.put("state", "closed"); //如果不为空,节点不展开
|
item1.put("state", "closed"); //如果不为空,节点不展开
|
||||||
JSONObject item2 = new JSONObject();
|
JSONObject item2 = new JSONObject();
|
||||||
item2.put("id", functions2.getId());
|
item2.put("id", functions2.getId());
|
||||||
@@ -395,26 +342,23 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
//勾选判断3
|
//勾选判断3
|
||||||
//Boolean flag = false;
|
//Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + functions2.getId().toString() + "]");
|
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + functions2.getId().toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
||||||
}
|
}
|
||||||
if (flag==true){item2.put("checked", true);}
|
if (flag == true) {
|
||||||
|
item2.put("checked", true);
|
||||||
|
}
|
||||||
//结束
|
//结束
|
||||||
|
|
||||||
pageUtil.setAdvSearch(getCondition_RoleFunctions(functions2.getNumber()));
|
pageUtil.setAdvSearch(getCondition_RoleFunctions(functions2.getNumber()));
|
||||||
functionsService.find(pageUtil);
|
functionsService.find(pageUtil);
|
||||||
List<Functions> dataList3 = pageUtil.getPageList();
|
List<Functions> dataList3 = pageUtil.getPageList();
|
||||||
JSONArray dataArray3 = new JSONArray();
|
JSONArray dataArray3 = new JSONArray();
|
||||||
if(null != dataList3)
|
if (null != dataList3) {
|
||||||
{
|
|
||||||
|
|
||||||
for(Functions functions3:dataList3)
|
for (Functions functions3 : dataList3) {
|
||||||
{
|
|
||||||
item2.put("state", "closed"); //如果不为空,节点不展开
|
item2.put("state", "closed"); //如果不为空,节点不展开
|
||||||
JSONObject item3 = new JSONObject();
|
JSONObject item3 = new JSONObject();
|
||||||
item3.put("id", functions3.getId());
|
item3.put("id", functions3.getId());
|
||||||
@@ -422,15 +366,14 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
//勾选判断4
|
//勾选判断4
|
||||||
//Boolean flag = false;
|
//Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + functions3.getId().toString() + "]");
|
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + functions3.getId().toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
||||||
}
|
}
|
||||||
if (flag==true){item3.put("checked", true);}
|
if (flag == true) {
|
||||||
|
item3.put("checked", true);
|
||||||
|
}
|
||||||
//结束
|
//结束
|
||||||
|
|
||||||
dataArray3.add(item3);
|
dataArray3.add(item3);
|
||||||
@@ -455,13 +398,9 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient("[" + outer.toString() + "]");
|
toClient("[" + outer.toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -469,6 +408,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 页面显示菜单
|
* 页面显示菜单
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findMenu() {
|
public void findMenu() {
|
||||||
@@ -566,10 +506,10 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -582,10 +522,10 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-角色对应功能
|
* 拼接搜索条件-角色对应功能
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_RoleFunctions(String num)
|
private Map<String, Object> getCondition_RoleFunctions(String num) {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -598,6 +538,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-角色对应功能
|
* 拼接搜索条件-角色对应功能
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String, Object> getConditionByIds() {
|
private Map<String, Object> getConditionByIds() {
|
||||||
@@ -610,12 +551,11 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public FunctionsModel getModel()
|
public FunctionsModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setFunctionsService(FunctionsIService functionsService)
|
|
||||||
{
|
public void setFunctionsService(FunctionsIService functionsService) {
|
||||||
this.functionsService = functionsService;
|
this.functionsService = functionsService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,40 +1,41 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.InOutItem;
|
||||||
|
import com.jsh.model.po.Logdetails;
|
||||||
|
import com.jsh.model.vo.basic.InOutItemModel;
|
||||||
|
import com.jsh.service.basic.InOutItemIService;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.po.InOutItem;
|
|
||||||
import com.jsh.model.vo.basic.InOutItemModel;
|
|
||||||
import com.jsh.service.basic.InOutItemIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
/**
|
/**
|
||||||
* 收支项目
|
* 收支项目
|
||||||
|
*
|
||||||
* @author ji*sheng*hua qq 7.5.2.7.1.8.9.2.0
|
* @author ji*sheng*hua qq 7.5.2.7.1.8.9.2.0
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class InOutItemAction extends BaseAction<InOutItemModel>
|
public class InOutItemAction extends BaseAction<InOutItemModel> {
|
||||||
{
|
|
||||||
private InOutItemIService inOutItemService;
|
private InOutItemIService inOutItemService;
|
||||||
private InOutItemModel model = new InOutItemModel();
|
private InOutItemModel model = new InOutItemModel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加收支项目
|
* 增加收支项目
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加收支项目方法===================");
|
Log.infoFileSync("==================开始调用增加收支项目方法===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
InOutItem inOutItem = new InOutItem();
|
InOutItem inOutItem = new InOutItem();
|
||||||
inOutItem.setName(model.getName());
|
inOutItem.setName(model.getName());
|
||||||
inOutItem.setType(model.getType());
|
inOutItem.setType(model.getType());
|
||||||
@@ -46,22 +47,15 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加收支项目异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加收支项目异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加收支项目回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加收支项目回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,19 +68,16 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除收支项目
|
* 删除收支项目
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除收支项目信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除收支项目信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
inOutItemService.delete(model.getInOutItemID());
|
inOutItemService.delete(model.getInOutItemID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getInOutItemID() + " 的收支项目异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getInOutItemID() + " 的收支项目异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -101,13 +92,12 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新收支项目
|
* 更新收支项目
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
InOutItem inOutItem = inOutItemService.get(model.getInOutItemID());
|
InOutItem inOutItem = inOutItemService.get(model.getInOutItemID());
|
||||||
inOutItem.setName(model.getName());
|
inOutItem.setName(model.getName());
|
||||||
inOutItem.setType(model.getType());
|
inOutItem.setType(model.getType());
|
||||||
@@ -117,22 +107,15 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改收支项目ID为 : " + model.getInOutItemID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改收支项目ID为 : " + model.getInOutItemID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改收支项目回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改收支项目回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -143,20 +126,17 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID收支项目
|
* 批量删除指定ID收支项目
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
inOutItemService.batchDelete(model.getInOutItemIDs());
|
inOutItemService.batchDelete(model.getInOutItemIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除收支项目ID为:" + model.getInOutItemIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除收支项目ID为:" + model.getInOutItemIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -171,25 +151,16 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = inOutItemService.checkIsNameExist("name", model.getName(), "id", model.getInOutItemID());
|
flag = inOutItemService.checkIsNameExist("name", model.getName(), "id", model.getInOutItemID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查收支项目名称为:" + model.getName() + " ID为: " + model.getInOutItemID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查收支项目名称为:" + model.getName() + " ID为: " + model.getInOutItemID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查收支项目名称为:" + model.getName() + " ID为: " + model.getInOutItemID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查收支项目名称为:" + model.getName() + " ID为: " + model.getInOutItemID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -197,12 +168,11 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找收支项目信息
|
* 查找收支项目信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<InOutItem> pageUtil = new PageUtil<InOutItem>();
|
PageUtil<InOutItem> pageUtil = new PageUtil<InOutItem>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -214,10 +184,8 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (InOutItem inOutItem : dataList) {
|
||||||
for(InOutItem inOutItem:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", inOutItem.getId());
|
item.put("id", inOutItem.getId());
|
||||||
//收支项目名称
|
//收支项目名称
|
||||||
@@ -231,25 +199,20 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找收支项目信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找收支项目信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询收支项目信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询收支项目信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找收支项目信息-下拉框
|
* 查找收支项目信息-下拉框
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBySelect()
|
public void findBySelect() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<InOutItem> pageUtil = new PageUtil<InOutItem>();
|
PageUtil<InOutItem> pageUtil = new PageUtil<InOutItem>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
@@ -258,10 +221,8 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
List<InOutItem> dataList = pageUtil.getPageList();
|
List<InOutItem> dataList = pageUtil.getPageList();
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (InOutItem inOutItem : dataList) {
|
||||||
for(InOutItem inOutItem:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", inOutItem.getId());
|
item.put("Id", inOutItem.getId());
|
||||||
//收支项目名称
|
//收支项目名称
|
||||||
@@ -271,23 +232,19 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找收支项目信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找收支项目信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询收支项目信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询收支项目信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -300,18 +257,17 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-下拉框-收支项目
|
* 拼接搜索条件-下拉框-收支项目
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_select()
|
private Map<String, Object> getCondition_select() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
Map<String, Object> condition = new HashMap<String, Object>();
|
Map<String, Object> condition = new HashMap<String, Object>();
|
||||||
if (model.getType().equals("in")) {
|
if (model.getType().equals("in")) {
|
||||||
condition.put("type_s_eq", "收入");
|
condition.put("type_s_eq", "收入");
|
||||||
}
|
} else if (model.getType().equals("out")) {
|
||||||
else if(model.getType().equals("out")) {
|
|
||||||
condition.put("type_s_eq", "支出");
|
condition.put("type_s_eq", "支出");
|
||||||
}
|
}
|
||||||
condition.put("id_s_order", "desc");
|
condition.put("id_s_order", "desc");
|
||||||
@@ -320,12 +276,11 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public InOutItemModel getModel()
|
public InOutItemModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setInOutItemService(InOutItemIService inOutItemService)
|
|
||||||
{
|
public void setInOutItemService(InOutItemIService inOutItemService) {
|
||||||
this.inOutItemService = inOutItemService;
|
this.inOutItemService = inOutItemService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,5 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
import com.jsh.base.BaseAction;
|
||||||
import com.jsh.base.Log;
|
import com.jsh.base.Log;
|
||||||
import com.jsh.model.po.Logdetails;
|
import com.jsh.model.po.Logdetails;
|
||||||
@@ -15,34 +7,38 @@ import com.jsh.model.vo.basic.LogModel;
|
|||||||
import com.jsh.service.basic.UserIService;
|
import com.jsh.service.basic.UserIService;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
import com.jsh.util.Tools;
|
import com.jsh.util.Tools;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.sql.Timestamp;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*日志管理
|
*日志管理
|
||||||
* @author jishenghua qq:7-5-2-7-1-8-9-2-0
|
* @author jishenghua qq:7-5-2-7-1-8-9-2-0
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class LogAction extends BaseAction<LogModel>
|
public class LogAction extends BaseAction<LogModel> {
|
||||||
{
|
|
||||||
private LogModel model = new LogModel();
|
private LogModel model = new LogModel();
|
||||||
private UserIService userService;
|
private UserIService userService;
|
||||||
|
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getBasicData()
|
public String getBasicData() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Map<String, Object> condition = pageUtil.getAdvSearch();
|
Map<String, Object> condition = pageUtil.getAdvSearch();
|
||||||
condition.clear();
|
condition.clear();
|
||||||
condition.put("ismanager_n_eq", 0);
|
condition.put("ismanager_n_eq", 0);
|
||||||
userService.find(pageUtil);
|
userService.find(pageUtil);
|
||||||
mapData.put("userList", pageUtil.getPageList());
|
mapData.put("userList", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exceptoin");
|
model.getShowModel().setMsgTip("exceptoin");
|
||||||
}
|
}
|
||||||
@@ -51,19 +47,16 @@ public class LogAction extends BaseAction<LogModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除日志
|
* 删除日志
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除日志信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除日志信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
logService.delete(model.getLogID());
|
logService.delete(model.getLogID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getLogID() + " 的日志异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getLogID() + " 的日志异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -78,20 +71,17 @@ public class LogAction extends BaseAction<LogModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID日志
|
* 批量删除指定ID日志
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
logService.batchDelete(model.getLogIDs());
|
logService.batchDelete(model.getLogIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除日志ID为:" + model.getLogIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除日志ID为:" + model.getLogIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -105,12 +95,11 @@ public class LogAction extends BaseAction<LogModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找日志信息
|
* 查找日志信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Logdetails> pageUtil = new PageUtil<Logdetails>();
|
PageUtil<Logdetails> pageUtil = new PageUtil<Logdetails>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -126,10 +115,8 @@ public class LogAction extends BaseAction<LogModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Logdetails log : dataList) {
|
||||||
for(Logdetails log:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", log.getId());
|
item.put("id", log.getId());
|
||||||
item.put("clientIP", log.getClientIp());
|
item.put("clientIP", log.getClientIp());
|
||||||
@@ -146,23 +133,19 @@ public class LogAction extends BaseAction<LogModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找日志信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找日志信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询日志信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询日志信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -180,14 +163,12 @@ public class LogAction extends BaseAction<LogModel>
|
|||||||
}
|
}
|
||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
public void setUserService(UserIService userService)
|
public void setUserService(UserIService userService) {
|
||||||
{
|
|
||||||
this.userService = userService;
|
this.userService = userService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public LogModel getModel()
|
public LogModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,43 +1,42 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.Logdetails;
|
||||||
|
import com.jsh.model.po.Role;
|
||||||
|
import com.jsh.model.vo.basic.RoleModel;
|
||||||
|
import com.jsh.service.basic.RoleIService;
|
||||||
|
import com.jsh.service.basic.UserBusinessIService;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.App;
|
|
||||||
import com.jsh.model.po.Role;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.vo.basic.RoleModel;
|
|
||||||
import com.jsh.service.basic.RoleIService;
|
|
||||||
import com.jsh.service.basic.UserBusinessIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
/*
|
/*
|
||||||
* 角色管理
|
* 角色管理
|
||||||
* @author jishenghua qq:7-5-2-7-1-8-9-2-0
|
* @author jishenghua qq:7-5-2-7-1-8-9-2-0
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class RoleAction extends BaseAction<RoleModel>
|
public class RoleAction extends BaseAction<RoleModel> {
|
||||||
{
|
|
||||||
private RoleIService roleService;
|
private RoleIService roleService;
|
||||||
private UserBusinessIService userBusinessService;
|
private UserBusinessIService userBusinessService;
|
||||||
private RoleModel model = new RoleModel();
|
private RoleModel model = new RoleModel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加角色
|
* 增加角色
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加角色信息方法create()===================");
|
Log.infoFileSync("==================开始调用增加角色信息方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Role role = new Role();
|
Role role = new Role();
|
||||||
role.setName(model.getName());
|
role.setName(model.getName());
|
||||||
roleService.create(role);
|
roleService.create(role);
|
||||||
@@ -47,22 +46,15 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加角色信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加角色信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加角色信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加角色信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -75,19 +67,16 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除角色
|
* 删除角色
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除角色信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除角色信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
roleService.delete(model.getRoleID());
|
roleService.delete(model.getRoleID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getRoleID() + " 的角色异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getRoleID() + " 的角色异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -102,13 +91,12 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新角色
|
* 更新角色
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Role role = roleService.get(model.getRoleID());
|
Role role = roleService.get(model.getRoleID());
|
||||||
role.setName(model.getName());
|
role.setName(model.getName());
|
||||||
roleService.update(role);
|
roleService.update(role);
|
||||||
@@ -116,22 +104,15 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改角色ID为 : " + model.getRoleID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改角色ID为 : " + model.getRoleID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改角色回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改角色回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -142,20 +123,17 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID角色
|
* 批量删除指定ID角色
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
roleService.batchDelete(model.getRoleIDs());
|
roleService.batchDelete(model.getRoleIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除角色ID为:" + model.getRoleIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除角色ID为:" + model.getRoleIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -170,25 +148,16 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = roleService.checkIsNameExist("name", model.getName(), "Id", model.getRoleID());
|
flag = roleService.checkIsNameExist("name", model.getName(), "Id", model.getRoleID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查角色名称为:" + model.getName() + " ID为: " + model.getRoleID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查角色名称为:" + model.getName() + " ID为: " + model.getRoleID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查角色名称为:" + model.getName() + " ID为: " + model.getRoleID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查角色名称为:" + model.getName() + " ID为: " + model.getRoleID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -196,12 +165,11 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找角色信息
|
* 查找角色信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Role> pageUtil = new PageUtil<Role>();
|
PageUtil<Role> pageUtil = new PageUtil<Role>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -217,10 +185,8 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Role role : dataList) {
|
||||||
for(Role role:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", role.getId());
|
item.put("Id", role.getId());
|
||||||
//供应商名称
|
//供应商名称
|
||||||
@@ -232,25 +198,20 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找角色信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找角色信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询角色信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询角色信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户对应角色显示
|
* 用户对应角色显示
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findUserRole()
|
public void findUserRole() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Role> pageUtil = new PageUtil<Role>();
|
PageUtil<Role> pageUtil = new PageUtil<Role>();
|
||||||
pageUtil.setPageSize(100);
|
pageUtil.setPageSize(100);
|
||||||
//pageUtil.setCurPage(model.getPageNo());
|
//pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -266,24 +227,21 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
outer.put("state", "open");
|
outer.put("state", "open");
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Role role : dataList) {
|
||||||
for(Role role:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", role.getId());
|
item.put("id", role.getId());
|
||||||
item.put("text", role.getName());
|
item.put("text", role.getName());
|
||||||
//勾选判断1
|
//勾选判断1
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + role.getId().toString() + "]");
|
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + role.getId().toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的角色:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的角色:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
||||||
}
|
}
|
||||||
if (flag==true){item.put("checked", true);}
|
if (flag == true) {
|
||||||
|
item.put("checked", true);
|
||||||
|
}
|
||||||
//结束
|
//结束
|
||||||
dataArray.add(item);
|
dataArray.add(item);
|
||||||
}
|
}
|
||||||
@@ -291,23 +249,19 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
outer.put("children", dataArray);
|
outer.put("children", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient("[" + outer.toString() + "]");
|
toClient("[" + outer.toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找角色异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找角色异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询角色结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询角色结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -319,10 +273,10 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-用户对应角色
|
* 拼接搜索条件-用户对应角色
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_UserRole()
|
private Map<String, Object> getCondition_UserRole() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -333,14 +287,14 @@ public class RoleAction extends BaseAction<RoleModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public RoleModel getModel()
|
public RoleModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setRoleService(RoleIService roleService)
|
|
||||||
{
|
public void setRoleService(RoleIService roleService) {
|
||||||
this.roleService = roleService;
|
this.roleService = roleService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUserBusinessService(UserBusinessIService userBusinessService) {
|
public void setUserBusinessService(UserBusinessIService userBusinessService) {
|
||||||
this.userBusinessService = userBusinessService;
|
this.userBusinessService = userBusinessService;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,23 +28,22 @@ import java.util.Map;
|
|||||||
* @author ji-sheng-hua qq:7 5 2 7 1 8 9 2 0
|
* @author ji-sheng-hua qq:7 5 2 7 1 8 9 2 0
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class SupplierAction extends BaseAction<SupplierModel>
|
public class SupplierAction extends BaseAction<SupplierModel> {
|
||||||
{
|
public static final String EXCEL = "excel"; //action返回excel结果
|
||||||
|
private final static Integer ISYSTEM = 1;
|
||||||
private SupplierIService supplierService;
|
private SupplierIService supplierService;
|
||||||
private UserBusinessIService userBusinessService;
|
private UserBusinessIService userBusinessService;
|
||||||
private SupplierModel model = new SupplierModel();
|
private SupplierModel model = new SupplierModel();
|
||||||
private final static Integer ISYSTEM = 1;
|
|
||||||
public static final String EXCEL = "excel"; //action返回excel结果
|
|
||||||
/**
|
/**
|
||||||
* 增加供应商
|
* 增加供应商
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加供应商方法===================");
|
Log.infoFileSync("==================开始调用增加供应商方法===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Supplier supplier = new Supplier();
|
Supplier supplier = new Supplier();
|
||||||
supplier.setContacts(model.getContacts());
|
supplier.setContacts(model.getContacts());
|
||||||
supplier.setType(model.getType());
|
supplier.setType(model.getType());
|
||||||
@@ -73,22 +72,15 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加供应商异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加供应商异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加供应商回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加供应商回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -101,19 +93,16 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除供应商
|
* 删除供应商
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除供应商信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除供应商信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
supplierService.delete(model.getSupplierID());
|
supplierService.delete(model.getSupplierID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getSupplierID() + " 的供应商异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getSupplierID() + " 的供应商异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -128,13 +117,12 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新供应商
|
* 更新供应商
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Supplier supplier = supplierService.get(model.getSupplierID());
|
Supplier supplier = supplierService.get(model.getSupplierID());
|
||||||
supplier.setContacts(model.getContacts());
|
supplier.setContacts(model.getContacts());
|
||||||
supplier.setType(model.getType());
|
supplier.setType(model.getType());
|
||||||
@@ -161,22 +149,15 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改供应商ID为 : " + model.getSupplierID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改供应商ID为 : " + model.getSupplierID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改供应商回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改供应商回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -187,13 +168,12 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新供应商-只更新预付款,其余用原来的值
|
* 更新供应商-只更新预付款,其余用原来的值
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void updateAdvanceIn()
|
public void updateAdvanceIn() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Supplier supplier = supplierService.get(model.getSupplierID());
|
Supplier supplier = supplierService.get(model.getSupplierID());
|
||||||
supplier.setContacts(supplier.getContacts());
|
supplier.setContacts(supplier.getContacts());
|
||||||
supplier.setType(supplier.getType());
|
supplier.setType(supplier.getType());
|
||||||
@@ -220,22 +200,15 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改供应商ID为 : " + model.getSupplierID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改供应商ID为 : " + model.getSupplierID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改供应商回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改供应商回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -246,20 +219,17 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID供应商
|
* 批量删除指定ID供应商
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
supplierService.batchDelete(model.getSupplierIDs());
|
supplierService.batchDelete(model.getSupplierIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除供应商ID为:" + model.getSupplierIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除供应商ID为:" + model.getSupplierIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -273,20 +243,17 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量设置状态-启用或者禁用
|
* 批量设置状态-启用或者禁用
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchSetEnable()
|
public String batchSetEnable() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
supplierService.batchSetEnable(model.getEnabled(), model.getSupplierIDs());
|
supplierService.batchSetEnable(model.getEnabled(), model.getSupplierIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量修改状态,单位ID为:" + model.getSupplierIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量修改状态,单位ID为:" + model.getSupplierIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -301,25 +268,16 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = supplierService.checkIsNameExist("supplier", model.getSupplier(), "id", model.getSupplierID());
|
flag = supplierService.checkIsNameExist("supplier", model.getSupplier(), "id", model.getSupplierID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查供应商名称为:" + model.getSupplier() + " ID为: " + model.getSupplierID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查供应商名称为:" + model.getSupplier() + " ID为: " + model.getSupplierID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查供应商名称为:" + model.getSupplier() + " ID为: " + model.getSupplierID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查供应商名称为:" + model.getSupplier() + " ID为: " + model.getSupplierID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -327,12 +285,11 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找供应商信息
|
* 查找供应商信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
|
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -341,11 +298,9 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
String sName = "";
|
String sName = "";
|
||||||
if ((model.getType()).equals("供应商")) {
|
if ((model.getType()).equals("供应商")) {
|
||||||
sName = "pageUtilVendor";
|
sName = "pageUtilVendor";
|
||||||
}
|
} else if ((model.getType()).equals("客户")) {
|
||||||
else if((model.getType()).equals("客户")){
|
|
||||||
sName = "pageUtilCustomer";
|
sName = "pageUtilCustomer";
|
||||||
}
|
} else if ((model.getType()).equals("会员")) {
|
||||||
else if((model.getType()).equals("会员")){
|
|
||||||
sName = "pageUtilMember";
|
sName = "pageUtilMember";
|
||||||
}
|
}
|
||||||
getSession().put(sName, pageUtil);
|
getSession().put(sName, pageUtil);
|
||||||
@@ -355,10 +310,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Supplier supplier : dataList) {
|
||||||
for(Supplier supplier:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", supplier.getId());
|
item.put("id", supplier.getId());
|
||||||
//供应商名称
|
//供应商名称
|
||||||
@@ -389,19 +342,16 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据id查找信息
|
* 根据id查找信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findById() {
|
public void findById() {
|
||||||
@@ -416,10 +366,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Supplier supplier : dataList) {
|
||||||
for(Supplier supplier:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", supplier.getId());
|
item.put("id", supplier.getId());
|
||||||
//名称
|
//名称
|
||||||
@@ -450,23 +398,20 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找供应商信息-下拉框
|
* 查找供应商信息-下拉框
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBySelect_sup()
|
public void findBySelect_sup() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
|
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
@@ -475,10 +420,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
List<Supplier> dataList = pageUtil.getPageList();
|
List<Supplier> dataList = pageUtil.getPageList();
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Supplier supplier : dataList) {
|
||||||
for(Supplier supplier:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", supplier.getId());
|
item.put("id", supplier.getId());
|
||||||
//供应商名称
|
//供应商名称
|
||||||
@@ -488,18 +431,16 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找客户信息-下拉框
|
* 查找客户信息-下拉框
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBySelect_cus() {
|
public void findBySelect_cus() {
|
||||||
@@ -519,8 +460,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try {
|
try {
|
||||||
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + supplier.getId().toString() + "]");
|
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + supplier.getId().toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>查询用户对应的客户:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>查询用户对应的客户:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
||||||
}
|
}
|
||||||
if (flag == true) {
|
if (flag == true) {
|
||||||
@@ -532,23 +472,20 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找客户信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找客户信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找会员信息-下拉框
|
* 查找会员信息-下拉框
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBySelect_retail()
|
public void findBySelect_retail() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
|
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
@@ -557,10 +494,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
List<Supplier> dataList = pageUtil.getPageList();
|
List<Supplier> dataList = pageUtil.getPageList();
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Supplier supplier : dataList) {
|
||||||
for(Supplier supplier:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", supplier.getId());
|
item.put("id", supplier.getId());
|
||||||
//客户名称
|
//客户名称
|
||||||
@@ -571,13 +506,9 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找客户信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找客户信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -585,10 +516,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
/**
|
/**
|
||||||
* 查找非会员的id
|
* 查找非会员的id
|
||||||
*/
|
*/
|
||||||
public void findBySelectRetailNoPeople()
|
public void findBySelectRetailNoPeople() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
|
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
@@ -597,10 +526,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
List<Supplier> dataList = pageUtil.getPageList();
|
List<Supplier> dataList = pageUtil.getPageList();
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Supplier supplier : dataList) {
|
||||||
for(Supplier supplier:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", supplier.getId());
|
item.put("id", supplier.getId());
|
||||||
//客户名称
|
//客户名称
|
||||||
@@ -611,19 +538,16 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找客户信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找客户信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户对应客户显示
|
* 用户对应客户显示
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findUserCustomer() {
|
public void findUserCustomer() {
|
||||||
@@ -655,11 +579,12 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try {
|
try {
|
||||||
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + supplier.getId().toString() + "]");
|
flag = userBusinessService.checkIsUserBusinessExist("Type", model.getUBType(), "KeyId", model.getUBKeyId(), "Value", "[" + supplier.getId().toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的客户:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的客户:类型" + model.getUBType() + " KeyId为: " + model.getUBKeyId() + " 存在异常!");
|
||||||
}
|
}
|
||||||
if (flag==true){item.put("checked", true);}
|
if (flag == true) {
|
||||||
|
item.put("checked", true);
|
||||||
|
}
|
||||||
//结束
|
//结束
|
||||||
dataArray.add(item);
|
dataArray.add(item);
|
||||||
}
|
}
|
||||||
@@ -667,11 +592,9 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
outer.put("children", dataArray);
|
outer.put("children", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient("[" + outer.toString() + "]");
|
toClient("[" + outer.toString() + "]");
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找客户异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找客户异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询客户结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询客户结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -683,13 +606,11 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
try {
|
try {
|
||||||
InputStream in = supplierService.importExcel(model.getSupplierFile());
|
InputStream in = supplierService.importExcel(model.getSupplierFile());
|
||||||
|
|
||||||
if(null != in)
|
if (null != in) {
|
||||||
{
|
|
||||||
model.setFileName(Tools.getRandomChar() + Tools.getNow2(Calendar.getInstance().getTime()) + "_wrong.xls");
|
model.setFileName(Tools.getRandomChar() + Tools.getNow2(Calendar.getInstance().getTime()) + "_wrong.xls");
|
||||||
model.setExcelStream(in);
|
model.setExcelStream(in);
|
||||||
returnStr = SupplierConstants.BusinessForExcel.EXCEL;
|
returnStr = SupplierConstants.BusinessForExcel.EXCEL;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
result = true;
|
result = true;
|
||||||
try {
|
try {
|
||||||
toClient(result.toString());
|
toClient(result.toString());
|
||||||
@@ -700,9 +621,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
returnStr = SUCCESS;
|
returnStr = SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>导入excel表格信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>导入excel表格信息异常", e);
|
||||||
}
|
}
|
||||||
return returnStr;
|
return returnStr;
|
||||||
@@ -710,6 +629,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 导入excel表格-供应商
|
* 导入excel表格-供应商
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -719,6 +639,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 导入excel表格-客户
|
* 导入excel表格-客户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -728,6 +649,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 导入excel表格-会员
|
* 导入excel表格-会员
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -738,6 +660,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出excel表格
|
* 导出excel表格
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -752,8 +675,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
String isCurrentPage = "allPage";
|
String isCurrentPage = "allPage";
|
||||||
model.setFileName(Tools.changeUnicode("report" + System.currentTimeMillis() + ".xls", model.getBrowserType()));
|
model.setFileName(Tools.changeUnicode("report" + System.currentTimeMillis() + ".xls", model.getBrowserType()));
|
||||||
model.setExcelStream(supplierService.exmportExcel(isCurrentPage, pageUtil));
|
model.setExcelStream(supplierService.exmportExcel(isCurrentPage, pageUtil));
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常", e);
|
||||||
model.getShowModel().setMsgTip("export excel exception");
|
model.getShowModel().setMsgTip("export excel exception");
|
||||||
}
|
}
|
||||||
@@ -763,6 +685,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String, Object> getCondition() {
|
private Map<String, Object> getCondition() {
|
||||||
@@ -794,10 +717,10 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-下拉框-供应商
|
* 拼接搜索条件-下拉框-供应商
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_Select_sup()
|
private Map<String, Object> getCondition_Select_sup() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -810,10 +733,10 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-下拉框-客户
|
* 拼接搜索条件-下拉框-客户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_Select_cus()
|
private Map<String, Object> getCondition_Select_cus() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -826,10 +749,10 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-下拉框-会员
|
* 拼接搜索条件-下拉框-会员
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_Select_retail()
|
private Map<String, Object> getCondition_Select_retail() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -842,10 +765,10 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-非会员
|
* 拼接搜索条件-非会员
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_Select_retail_no_people()
|
private Map<String, Object> getCondition_Select_retail_no_people() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -858,12 +781,11 @@ public class SupplierAction extends BaseAction<SupplierModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public SupplierModel getModel()
|
public SupplierModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setSupplierService(SupplierIService supplierService)
|
|
||||||
{
|
public void setSupplierService(SupplierIService supplierService) {
|
||||||
this.supplierService = supplierService;
|
this.supplierService = supplierService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,20 +22,18 @@ import java.util.Map;
|
|||||||
* @author jishenghua qq:7-5-2-7 1-8-9-2-0
|
* @author jishenghua qq:7-5-2-7 1-8-9-2-0
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class SystemConfigAction extends BaseAction<SystemConfigModel>
|
public class SystemConfigAction extends BaseAction<SystemConfigModel> {
|
||||||
{
|
|
||||||
private SystemConfigIService systemConfigService;
|
private SystemConfigIService systemConfigService;
|
||||||
private SystemConfigModel model = new SystemConfigModel();
|
private SystemConfigModel model = new SystemConfigModel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新系统配置
|
* 更新系统配置
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
SystemConfig sysConfig = systemConfigService.get(model.getId());
|
SystemConfig sysConfig = systemConfigService.get(model.getId());
|
||||||
sysConfig.setType(sysConfig.getType());
|
sysConfig.setType(sysConfig.getType());
|
||||||
sysConfig.setName(sysConfig.getName());
|
sysConfig.setName(sysConfig.getName());
|
||||||
@@ -46,22 +44,15 @@ public class SystemConfigAction extends BaseAction<SystemConfigModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改系统配置ID为 : " + model.getId() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改系统配置ID为 : " + model.getId() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改系统配置回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改系统配置回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -72,12 +63,11 @@ public class SystemConfigAction extends BaseAction<SystemConfigModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找系统配置信息
|
* 查找系统配置信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<SystemConfig> pageUtil = new PageUtil<SystemConfig>();
|
PageUtil<SystemConfig> pageUtil = new PageUtil<SystemConfig>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
@@ -87,10 +77,8 @@ public class SystemConfigAction extends BaseAction<SystemConfigModel>
|
|||||||
JSONObject outer = new JSONObject();
|
JSONObject outer = new JSONObject();
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (SystemConfig sysConfig : dataList) {
|
||||||
for(SystemConfig sysConfig:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", sysConfig.getId());
|
item.put("id", sysConfig.getId());
|
||||||
item.put("type", sysConfig.getType());
|
item.put("type", sysConfig.getType());
|
||||||
@@ -104,23 +92,19 @@ public class SystemConfigAction extends BaseAction<SystemConfigModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找系统配置信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找系统配置信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询系统配置信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询系统配置信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -132,12 +116,11 @@ public class SystemConfigAction extends BaseAction<SystemConfigModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public SystemConfigModel getModel()
|
public SystemConfigModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setSystemConfigService(SystemConfigIService systemConfigService)
|
|
||||||
{
|
public void setSystemConfigService(SystemConfigIService systemConfigService) {
|
||||||
this.systemConfigService = systemConfigService;
|
this.systemConfigService = systemConfigService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ package com.jsh.action.basic;
|
|||||||
|
|
||||||
import com.jsh.base.BaseAction;
|
import com.jsh.base.BaseAction;
|
||||||
import com.jsh.base.Log;
|
import com.jsh.base.Log;
|
||||||
import com.jsh.model.po.Unit;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
import com.jsh.model.po.Logdetails;
|
||||||
|
import com.jsh.model.po.Unit;
|
||||||
import com.jsh.model.vo.basic.UnitModel;
|
import com.jsh.model.vo.basic.UnitModel;
|
||||||
import com.jsh.service.basic.UnitIService;
|
import com.jsh.service.basic.UnitIService;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
@@ -19,25 +19,24 @@ import java.util.Map;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 计量单位
|
* 计量单位
|
||||||
|
*
|
||||||
* @author ji shenghua qq:752 718 920
|
* @author ji shenghua qq:752 718 920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class UnitAction extends BaseAction<UnitModel>
|
public class UnitAction extends BaseAction<UnitModel> {
|
||||||
{
|
|
||||||
private UnitIService unitService;
|
private UnitIService unitService;
|
||||||
private UnitModel model = new UnitModel();
|
private UnitModel model = new UnitModel();
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加计量单位
|
* 增加计量单位
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加计量单位方法create()===================");
|
Log.infoFileSync("==================开始调用增加计量单位方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Unit unit = new Unit();
|
Unit unit = new Unit();
|
||||||
unit.setUName(model.getUName());
|
unit.setUName(model.getUName());
|
||||||
unitService.create(unit);
|
unitService.create(unit);
|
||||||
@@ -47,22 +46,15 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加计量单位异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加计量单位异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加计量单位回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加计量单位回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -75,6 +67,7 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除计量单位
|
* 删除计量单位
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete() {
|
public String delete() {
|
||||||
@@ -83,8 +76,7 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
unitService.delete(model.getUnitID());
|
unitService.delete(model.getUnitID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getUnitID() + " 的计量单位异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getUnitID() + " 的计量单位异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -99,6 +91,7 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新计量单位
|
* 更新计量单位
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update() {
|
public void update() {
|
||||||
@@ -111,18 +104,15 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改计量单位ID为 : " + model.getUnitID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改计量单位ID为 : " + model.getUnitID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally {
|
|
||||||
try {
|
try {
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改计量单位回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改计量单位回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -133,20 +123,17 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID计量单位
|
* 批量删除指定ID计量单位
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
unitService.batchDelete(model.getUnitIDs());
|
unitService.batchDelete(model.getUnitIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除计量单位ID为:" + model.getUnitIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除计量单位ID为:" + model.getUnitIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -161,25 +148,16 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = unitService.checkIsNameExist("UName", model.getUName(), "id", model.getUnitID());
|
flag = unitService.checkIsNameExist("UName", model.getUName(), "id", model.getUnitID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查计量单位名称为:" + model.getUName() + " ID为: " + model.getUnitID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查计量单位名称为:" + model.getUName() + " ID为: " + model.getUnitID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查计量单位名称为:" + model.getUName() + " ID为: " + model.getUnitID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查计量单位名称为:" + model.getUName() + " ID为: " + model.getUnitID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -187,12 +165,11 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找计量单位信息
|
* 查找计量单位信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Unit> pageUtil = new PageUtil<Unit>();
|
PageUtil<Unit> pageUtil = new PageUtil<Unit>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -204,10 +181,8 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Unit unit : dataList) {
|
||||||
for(Unit unit:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", unit.getId());
|
item.put("id", unit.getId());
|
||||||
//名称
|
//名称
|
||||||
@@ -219,19 +194,16 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找计量单位异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找计量单位异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询计量单位结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询计量单位结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找计量单位信息-下拉框
|
* 查找计量单位信息-下拉框
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findUnitDownList() {
|
public void findUnitDownList() {
|
||||||
@@ -256,23 +228,19 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找计量单位异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找计量单位异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询计量单位结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询计量单位结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -284,8 +252,7 @@ public class UnitAction extends BaseAction<UnitModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public UnitModel getModel()
|
public UnitModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,50 +1,48 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.Basicuser;
|
||||||
|
import com.jsh.model.po.Logdetails;
|
||||||
|
import com.jsh.model.vo.basic.UserModel;
|
||||||
|
import com.jsh.service.basic.UserIService;
|
||||||
|
import com.jsh.util.ExceptionCodeConstants;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import com.jsh.util.Tools;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.util.ExceptionCodeConstants;
|
|
||||||
import com.jsh.model.po.Basicuser;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.vo.basic.UserModel;
|
|
||||||
import com.jsh.service.basic.UserIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
import com.jsh.util.Tools;
|
|
||||||
/*
|
/*
|
||||||
* 用户管理
|
* 用户管理
|
||||||
* @author jishenghua qq:752718920
|
* @author jishenghua qq:752718920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class UserAction extends BaseAction<UserModel>
|
public class UserAction extends BaseAction<UserModel> {
|
||||||
{
|
|
||||||
private UserModel model = new UserModel();
|
private UserModel model = new UserModel();
|
||||||
private UserIService userService;
|
private UserIService userService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 需要判断用户状态,用户名密码错误不能登录 ,黑名单用户不能登录,如果已经登录过,不再进行处理,直接进入管理页面
|
* 需要判断用户状态,用户名密码错误不能登录 ,黑名单用户不能登录,如果已经登录过,不再进行处理,直接进入管理页面
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String login()
|
public String login() {
|
||||||
{
|
|
||||||
Log.infoFileSync("============用户登录 login 方法调用开始==============");
|
Log.infoFileSync("============用户登录 login 方法调用开始==============");
|
||||||
String username = model.getLoginame().trim();
|
String username = model.getLoginame().trim();
|
||||||
String password = model.getPassword().trim();
|
String password = model.getPassword().trim();
|
||||||
//因密码用MD5加密,需要对密码进行转化
|
//因密码用MD5加密,需要对密码进行转化
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
password = Tools.md5Encryp(password);
|
password = Tools.md5Encryp(password);
|
||||||
System.out.println(password);
|
System.out.println(password);
|
||||||
}
|
} catch (NoSuchAlgorithmException e) {
|
||||||
catch (NoSuchAlgorithmException e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>转化MD5字符串错误 :" + e.getMessage(), e);
|
Log.errorFileSync(">>>>>>>>>>>>>>转化MD5字符串错误 :" + e.getMessage(), e);
|
||||||
}
|
}
|
||||||
@@ -52,8 +50,7 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
//判断用户是否已经登录过,登录过不再处理
|
//判断用户是否已经登录过,登录过不再处理
|
||||||
Basicuser sessionUser = (Basicuser) getSession().get("user");
|
Basicuser sessionUser = (Basicuser) getSession().get("user");
|
||||||
if (null != sessionUser && username.equalsIgnoreCase(sessionUser.getLoginame())
|
if (null != sessionUser && username.equalsIgnoreCase(sessionUser.getLoginame())
|
||||||
&& sessionUser.getPassword().equals(password))
|
&& sessionUser.getPassword().equals(password)) {
|
||||||
{
|
|
||||||
Log.infoFileSync("====用户 " + username + "已经登录过, login 方法调用结束====");
|
Log.infoFileSync("====用户 " + username + "已经登录过, login 方法调用结束====");
|
||||||
model.getShowModel().setMsgTip("user already login");
|
model.getShowModel().setMsgTip("user already login");
|
||||||
/*return "login";*/
|
/*return "login";*/
|
||||||
@@ -61,17 +58,13 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
|
|
||||||
//获取用户状态
|
//获取用户状态
|
||||||
int userStatus = -1;
|
int userStatus = -1;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
userStatus = userService.validateUser(username, password);
|
userStatus = userService.validateUser(username, password);
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>用户 " + username + " 登录 login 方法 访问服务层异常====", e);
|
Log.errorFileSync(">>>>>>>>>>>>>用户 " + username + " 登录 login 方法 访问服务层异常====", e);
|
||||||
model.getShowModel().setMsgTip("access service exception");
|
model.getShowModel().setMsgTip("access service exception");
|
||||||
}
|
}
|
||||||
switch (userStatus)
|
switch (userStatus) {
|
||||||
{
|
|
||||||
case ExceptionCodeConstants.UserExceptionCode.USER_NOT_EXIST:
|
case ExceptionCodeConstants.UserExceptionCode.USER_NOT_EXIST:
|
||||||
model.getShowModel().setMsgTip("user is not exist");
|
model.getShowModel().setMsgTip("user is not exist");
|
||||||
break;
|
break;
|
||||||
@@ -85,17 +78,14 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
model.getShowModel().setMsgTip("access service error");
|
model.getShowModel().setMsgTip("access service error");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
//验证通过 ,可以登录,放入session,记录登录日志
|
//验证通过 ,可以登录,放入session,记录登录日志
|
||||||
Basicuser user = userService.getUser(username);
|
Basicuser user = userService.getUser(username);
|
||||||
logService.create(new Logdetails(user, "登录系统", model.getClientIp(),
|
logService.create(new Logdetails(user, "登录系统", model.getClientIp(),
|
||||||
new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户:" + username + " 登录系统", username + " 登录系统"));
|
new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户:" + username + " 登录系统", username + " 登录系统"));
|
||||||
model.getShowModel().setMsgTip("user can login");
|
model.getShowModel().setMsgTip("user can login");
|
||||||
getSession().put("user", user);
|
getSession().put("user", user);
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>查询用户名为:" + username + " ,用户信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>查询用户名为:" + username + " ,用户信息异常", e);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -108,10 +98,10 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户退出登录
|
* 用户退出登录
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String logout()
|
public String logout() {
|
||||||
{
|
|
||||||
logService.create(new Logdetails(getUser(), "退出系统", model.getClientIp(),
|
logService.create(new Logdetails(getUser(), "退出系统", model.getClientIp(),
|
||||||
new Timestamp(System.currentTimeMillis()), (short) 0,
|
new Timestamp(System.currentTimeMillis()), (short) 0,
|
||||||
"管理用户:" + getUser().getLoginame() + " 退出系统", getUser().getLoginame() + " 退出系统"));
|
"管理用户:" + getUser().getLoginame() + " 退出系统", getUser().getLoginame() + " 退出系统"));
|
||||||
@@ -121,14 +111,13 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加用户
|
* 增加用户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加用户方法===================");
|
Log.infoFileSync("==================开始调用增加用户方法===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Basicuser user = new Basicuser();
|
Basicuser user = new Basicuser();
|
||||||
user.setDepartment(model.getDepartment());
|
user.setDepartment(model.getDepartment());
|
||||||
user.setDescription(model.getDescription());
|
user.setDescription(model.getDescription());
|
||||||
@@ -139,12 +128,9 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
user.setLoginame(model.getLoginame());
|
user.setLoginame(model.getLoginame());
|
||||||
String password = "123456";
|
String password = "123456";
|
||||||
//因密码用MD5加密,需要对密码进行转化
|
//因密码用MD5加密,需要对密码进行转化
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
password = Tools.md5Encryp(password);
|
password = Tools.md5Encryp(password);
|
||||||
}
|
} catch (NoSuchAlgorithmException e) {
|
||||||
catch (NoSuchAlgorithmException e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>转化MD5字符串错误 :" + e.getMessage(), e);
|
Log.errorFileSync(">>>>>>>>>>>>>>转化MD5字符串错误 :" + e.getMessage(), e);
|
||||||
}
|
}
|
||||||
@@ -160,22 +146,15 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加用户异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加用户异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加用户回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加用户回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -188,19 +167,16 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除用户
|
* 删除用户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除用户信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除用户信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
userService.delete(model.getUserID());
|
userService.delete(model.getUserID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getUserID() + " 的用户异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getUserID() + " 的用户异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -215,13 +191,12 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新用户
|
* 更新用户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Basicuser user = userService.get(model.getUserID());
|
Basicuser user = userService.get(model.getUserID());
|
||||||
user.setDepartment(model.getDepartment());
|
user.setDepartment(model.getDepartment());
|
||||||
user.setDescription(model.getDescription());
|
user.setDescription(model.getDescription());
|
||||||
@@ -235,30 +210,22 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
userService.update(user);
|
userService.update(user);
|
||||||
|
|
||||||
//看是否需要更新seesion中user
|
//看是否需要更新seesion中user
|
||||||
if(getUser().getId() == model.getUserID())
|
if (getUser().getId() == model.getUserID()) {
|
||||||
{
|
|
||||||
getSession().put("user", user);
|
getSession().put("user", user);
|
||||||
}
|
}
|
||||||
|
|
||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改用户ID为 : " + model.getUserID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改用户ID为 : " + model.getUserID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改用户回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改用户回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -270,17 +237,14 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
/**
|
/**
|
||||||
* 修改密码
|
* 修改密码
|
||||||
*/
|
*/
|
||||||
public void updatePwd()
|
public void updatePwd() {
|
||||||
{
|
|
||||||
Integer flag = 0;
|
Integer flag = 0;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Basicuser user = getUser();
|
Basicuser user = getUser();
|
||||||
String orgPassword = Tools.md5Encryp(model.getOrgpwd());
|
String orgPassword = Tools.md5Encryp(model.getOrgpwd());
|
||||||
String md5Pwd = Tools.md5Encryp(model.getPassword());
|
String md5Pwd = Tools.md5Encryp(model.getPassword());
|
||||||
//必须和原始密码一致才可以更新密码
|
//必须和原始密码一致才可以更新密码
|
||||||
if(orgPassword.equalsIgnoreCase(user.getPassword()))
|
if (orgPassword.equalsIgnoreCase(user.getPassword())) {
|
||||||
{
|
|
||||||
|
|
||||||
user.setPassword(md5Pwd);
|
user.setPassword(md5Pwd);
|
||||||
userService.update(user);
|
userService.update(user);
|
||||||
@@ -294,30 +258,21 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
flag = 1;
|
flag = 1;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
flag = 2;
|
flag = 2;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改用户ID为 : " + model.getUserID() + "密码信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改用户ID为 : " + model.getUserID() + "密码信息失败", e);
|
||||||
flag = 3;
|
flag = 3;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改用户密码回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改用户密码回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -340,18 +295,15 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
flag = 1;
|
flag = 1;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改用户ID为 : " + model.getUserID() + "密码信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改用户ID为 : " + model.getUserID() + "密码信息失败", e);
|
||||||
flag = 0;
|
flag = 0;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally {
|
|
||||||
try {
|
try {
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改用户密码回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改用户密码回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -361,20 +313,17 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID用户
|
* 批量删除指定ID用户
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
userService.batchDelete(model.getUserIDs());
|
userService.batchDelete(model.getUserIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除用户ID为:" + model.getUserIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除用户ID为:" + model.getUserIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -389,37 +338,25 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
/**
|
/**
|
||||||
* 检查输入名称是否存在
|
* 检查输入名称是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsNameExist()
|
public void checkIsNameExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
String fieldName = "";
|
String fieldName = "";
|
||||||
String fieldValue = "";
|
String fieldValue = "";
|
||||||
try
|
try {
|
||||||
{
|
if (0 == model.getCheckFlag()) {
|
||||||
if(0 == model.getCheckFlag())
|
|
||||||
{
|
|
||||||
fieldName = "username";
|
fieldName = "username";
|
||||||
fieldValue = model.getUsername();
|
fieldValue = model.getUsername();
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
fieldName = "loginame";
|
fieldName = "loginame";
|
||||||
fieldValue = model.getLoginame();
|
fieldValue = model.getLoginame();
|
||||||
}
|
}
|
||||||
flag = userService.checkIsNameExist(fieldName, fieldValue, model.getUserID());
|
flag = userService.checkIsNameExist(fieldName, fieldValue, model.getUserID());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查用户名称为:" + fieldValue + " ID为: " + model.getUserID() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查用户名称为:" + fieldValue + " ID为: " + model.getUserID() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查用户名称为:" + fieldValue + " ID为: " + model.getUserID() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查用户名称为:" + fieldValue + " ID为: " + model.getUserID() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -427,12 +364,11 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找用户信息
|
* 查找用户信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Basicuser> pageUtil = new PageUtil<Basicuser>();
|
PageUtil<Basicuser> pageUtil = new PageUtil<Basicuser>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -448,10 +384,8 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Basicuser user : dataList) {
|
||||||
for(Basicuser user:dataList)
|
|
||||||
{
|
|
||||||
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("id", user.getId());
|
item.put("id", user.getId());
|
||||||
@@ -474,23 +408,19 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找用户信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找用户信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询用户信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询用户信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return 拼接后的条件
|
* @return 拼接后的条件
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -503,12 +433,11 @@ public class UserAction extends BaseAction<UserModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public UserModel getModel()
|
public UserModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setUserService(UserIService userService)
|
|
||||||
{
|
public void setUserService(UserIService userService) {
|
||||||
this.userService = userService;
|
this.userService = userService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,47 +1,42 @@
|
|||||||
package com.jsh.action.basic;
|
package com.jsh.action.basic;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.Logdetails;
|
||||||
|
import com.jsh.model.po.UserBusiness;
|
||||||
|
import com.jsh.model.vo.basic.UserBusinessModel;
|
||||||
|
import com.jsh.service.basic.UserBusinessIService;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.jsh.model.po.Functions;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.model.po.UserBusiness;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.vo.basic.UserBusinessModel;
|
|
||||||
import com.jsh.service.basic.UserBusinessIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
/*
|
/*
|
||||||
* 权限关系管理
|
* 权限关系管理
|
||||||
* @author jishenghua qq:752718920
|
* @author jishenghua qq:752718920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
public class UserBusinessAction extends BaseAction<UserBusinessModel> {
|
||||||
{
|
|
||||||
private UserBusinessIService userBusinessService;
|
private UserBusinessIService userBusinessService;
|
||||||
private UserBusinessModel model = new UserBusinessModel();
|
private UserBusinessModel model = new UserBusinessModel();
|
||||||
|
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getBasicData()
|
public String getBasicData() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Map<String, Object> condition = pageUtil.getAdvSearch();
|
Map<String, Object> condition = pageUtil.getAdvSearch();
|
||||||
condition.put("KeyId_s_eq", model.getKeyId());
|
condition.put("KeyId_s_eq", model.getKeyId());
|
||||||
condition.put("Type_s_eq", model.getType());
|
condition.put("Type_s_eq", model.getType());
|
||||||
userBusinessService.find(pageUtil);
|
userBusinessService.find(pageUtil);
|
||||||
mapData.put("userBusinessList", pageUtil.getPageList());
|
mapData.put("userBusinessList", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找UserBusiness信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找UserBusiness信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exceptoin");
|
model.getShowModel().setMsgTip("exceptoin");
|
||||||
}
|
}
|
||||||
@@ -52,21 +47,17 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
|||||||
* 测试hql语句的写法
|
* 测试hql语句的写法
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getceshi()
|
public String getceshi() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Map<String, Object> condition = pageUtil.getAdvSearch();
|
Map<String, Object> condition = pageUtil.getAdvSearch();
|
||||||
condition.put("Type_s_eq", model.getType());
|
condition.put("Type_s_eq", model.getType());
|
||||||
userBusinessService.find(pageUtil, "ceshi");
|
userBusinessService.find(pageUtil, "ceshi");
|
||||||
mapData.put("userBusinessList", pageUtil.getPageList());
|
mapData.put("userBusinessList", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找UserBusiness信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找UserBusiness信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exceptoin");
|
model.getShowModel().setMsgTip("exceptoin");
|
||||||
}
|
}
|
||||||
@@ -75,14 +66,13 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加UserBusiness
|
* 增加UserBusiness
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加UserBusiness信息方法create()===================");
|
Log.infoFileSync("==================开始调用增加UserBusiness信息方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
UserBusiness userBusiness = new UserBusiness();
|
UserBusiness userBusiness = new UserBusiness();
|
||||||
userBusiness.setType(model.getType());
|
userBusiness.setType(model.getType());
|
||||||
userBusiness.setKeyId(model.getKeyId());
|
userBusiness.setKeyId(model.getKeyId());
|
||||||
@@ -94,22 +84,15 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加UserBusiness信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加UserBusiness信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加UserBusiness信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加UserBusiness信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -122,24 +105,21 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新UserBusiness
|
* 更新UserBusiness
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
Long id = 0l;
|
Long id = 0l;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
PageUtil<UserBusiness> pageUtil = new PageUtil<UserBusiness>();
|
PageUtil<UserBusiness> pageUtil = new PageUtil<UserBusiness>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
pageUtil.setAdvSearch(getCondition_RoleAPP());
|
pageUtil.setAdvSearch(getCondition_RoleAPP());
|
||||||
userBusinessService.find(pageUtil);
|
userBusinessService.find(pageUtil);
|
||||||
List<UserBusiness> dataList = pageUtil.getPageList();
|
List<UserBusiness> dataList = pageUtil.getPageList();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (UserBusiness userBusiness : dataList) {
|
||||||
for(UserBusiness userBusiness:dataList)
|
|
||||||
{
|
|
||||||
id = userBusiness.getId();
|
id = userBusiness.getId();
|
||||||
}
|
}
|
||||||
UserBusiness userBusiness = userBusinessService.get(id);
|
UserBusiness userBusiness = userBusinessService.get(id);
|
||||||
@@ -152,22 +132,15 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改UserBusiness的ID为 : " + id + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改UserBusiness的ID为 : " + id + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改UserBusiness回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改UserBusiness回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -178,6 +151,7 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新角色的按钮权限
|
* 更新角色的按钮权限
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void updateBtnStr() {
|
public void updateBtnStr() {
|
||||||
@@ -192,18 +166,15 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改角色按钮权限的ID为 : " + model.getUserBusinessID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改角色按钮权限的ID为 : " + model.getUserBusinessID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally {
|
|
||||||
try {
|
try {
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改功能回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改功能回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -214,10 +185,10 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-RoleAPP
|
* 拼接搜索条件-RoleAPP
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_RoleAPP()
|
private Map<String, Object> getCondition_RoleAPP() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -230,25 +201,16 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
|||||||
/**
|
/**
|
||||||
* 检查角色对应应用/功能是否存在
|
* 检查角色对应应用/功能是否存在
|
||||||
*/
|
*/
|
||||||
public void checkIsValueExist()
|
public void checkIsValueExist() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
flag = userBusinessService.checkIsValueExist("Type", model.getType(), "KeyId", model.getKeyId());
|
flag = userBusinessService.checkIsValueExist("Type", model.getType(), "KeyId", model.getKeyId());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查角色对应应用/功能的类型为:" + model.getType() + " KeyId为: " + model.getKeyId() + " 是否存在异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查角色对应应用/功能的类型为:" + model.getType() + " KeyId为: " + model.getKeyId() + " 是否存在异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查角色对应应用/功能的类型为:" + model.getType() + " KeyId为: " + model.getKeyId() + " 是否存在异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查角色对应应用/功能的类型为:" + model.getType() + " KeyId为: " + model.getKeyId() + " 是否存在异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -256,12 +218,11 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public UserBusinessModel getModel()
|
public UserBusinessModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setUserBusinessService(UserBusinessIService userBusinessService)
|
|
||||||
{
|
public void setUserBusinessService(UserBusinessIService userBusinessService) {
|
||||||
this.userBusinessService = userBusinessService;
|
this.userBusinessService = userBusinessService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,38 +1,30 @@
|
|||||||
package com.jsh.action.materials;
|
package com.jsh.action.materials;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.*;
|
||||||
|
import com.jsh.model.vo.materials.AccountHeadModel;
|
||||||
|
import com.jsh.service.materials.AccountHeadIService;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import com.jsh.util.Tools;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.model.po.Account;
|
|
||||||
import com.jsh.model.po.AccountHead;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.po.Person;
|
|
||||||
import com.jsh.model.po.Supplier;
|
|
||||||
import com.jsh.model.vo.materials.AccountHeadModel;
|
|
||||||
import com.jsh.service.materials.AccountHeadIService;
|
|
||||||
import com.jsh.service.materials.DepotHeadIService;
|
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
import com.jsh.util.Tools;
|
|
||||||
/*
|
/*
|
||||||
* 财务表头管理
|
* 财务表头管理
|
||||||
* @author jishenghua qq:752718920
|
* @author jishenghua qq:752718920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
public class AccountHeadAction extends BaseAction<AccountHeadModel> {
|
||||||
{
|
|
||||||
private AccountHeadIService accountHeadService;
|
private AccountHeadIService accountHeadService;
|
||||||
private AccountHeadModel model = new AccountHeadModel();
|
private AccountHeadModel model = new AccountHeadModel();
|
||||||
|
|
||||||
@@ -40,19 +32,15 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
* 获取MaxId
|
* 获取MaxId
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getMaxId()
|
public String getMaxId() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
accountHeadService.find(pageUtil, "maxId");
|
accountHeadService.find(pageUtil, "maxId");
|
||||||
mapData.put("accountHeadMax", pageUtil.getPageList());
|
mapData.put("accountHeadMax", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找最大的Id信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找最大的Id信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exceptoin");
|
model.getShowModel().setMsgTip("exceptoin");
|
||||||
}
|
}
|
||||||
@@ -61,28 +49,30 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加财务
|
* 增加财务
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加财务信息方法create()===================");
|
Log.infoFileSync("==================开始调用增加财务信息方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
AccountHead accountHead = new AccountHead();
|
AccountHead accountHead = new AccountHead();
|
||||||
accountHead.setType(model.getType());
|
accountHead.setType(model.getType());
|
||||||
if(model.getOrganId()!=null){accountHead.setOrganId(new Supplier(model.getOrganId()));}
|
if (model.getOrganId() != null) {
|
||||||
if(model.getHandsPersonId()!=null){accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
|
accountHead.setOrganId(new Supplier(model.getOrganId()));
|
||||||
|
}
|
||||||
|
if (model.getHandsPersonId() != null) {
|
||||||
|
accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));
|
||||||
|
}
|
||||||
accountHead.setChangeAmount(model.getChangeAmount() == null ? 0 : model.getChangeAmount());
|
accountHead.setChangeAmount(model.getChangeAmount() == null ? 0 : model.getChangeAmount());
|
||||||
accountHead.setTotalPrice(model.getTotalPrice());
|
accountHead.setTotalPrice(model.getTotalPrice());
|
||||||
if(model.getAccountId()!=null){accountHead.setAccountId(new Account(model.getAccountId()));}
|
if (model.getAccountId() != null) {
|
||||||
accountHead.setBillNo(model.getBillNo());
|
accountHead.setAccountId(new Account(model.getAccountId()));
|
||||||
try
|
|
||||||
{
|
|
||||||
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
|
|
||||||
}
|
}
|
||||||
catch (ParseException e)
|
accountHead.setBillNo(model.getBillNo());
|
||||||
{
|
try {
|
||||||
|
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
|
||||||
|
} catch (ParseException e) {
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
||||||
}
|
}
|
||||||
accountHead.setRemark(model.getRemark());
|
accountHead.setRemark(model.getRemark());
|
||||||
@@ -93,22 +83,15 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加财务信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加财务信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加财务信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加财务信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -121,19 +104,16 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除财务
|
* 删除财务
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除财务信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除财务信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
accountHeadService.delete(model.getAccountHeadID());
|
accountHeadService.delete(model.getAccountHeadID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAccountHeadID() + " 的财务异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAccountHeadID() + " 的财务异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -148,27 +128,29 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新财务
|
* 更新财务
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
AccountHead accountHead = accountHeadService.get(model.getAccountHeadID());
|
AccountHead accountHead = accountHeadService.get(model.getAccountHeadID());
|
||||||
accountHead.setType(model.getType());
|
accountHead.setType(model.getType());
|
||||||
if(model.getOrganId()!=null){accountHead.setOrganId(new Supplier(model.getOrganId()));}
|
if (model.getOrganId() != null) {
|
||||||
if(model.getHandsPersonId()!=null){accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
|
accountHead.setOrganId(new Supplier(model.getOrganId()));
|
||||||
|
}
|
||||||
|
if (model.getHandsPersonId() != null) {
|
||||||
|
accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));
|
||||||
|
}
|
||||||
accountHead.setChangeAmount(model.getChangeAmount() == null ? 0 : model.getChangeAmount());
|
accountHead.setChangeAmount(model.getChangeAmount() == null ? 0 : model.getChangeAmount());
|
||||||
accountHead.setTotalPrice(model.getTotalPrice());
|
accountHead.setTotalPrice(model.getTotalPrice());
|
||||||
if(model.getAccountId()!=null){accountHead.setAccountId(new Account(model.getAccountId()));}
|
if (model.getAccountId() != null) {
|
||||||
accountHead.setBillNo(model.getBillNo());
|
accountHead.setAccountId(new Account(model.getAccountId()));
|
||||||
try
|
|
||||||
{
|
|
||||||
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
|
|
||||||
}
|
}
|
||||||
catch (ParseException e)
|
accountHead.setBillNo(model.getBillNo());
|
||||||
{
|
try {
|
||||||
|
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
|
||||||
|
} catch (ParseException e) {
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
||||||
}
|
}
|
||||||
accountHead.setRemark(model.getRemark());
|
accountHead.setRemark(model.getRemark());
|
||||||
@@ -177,22 +159,15 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改财务ID为 : " + model.getAccountHeadID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改财务ID为 : " + model.getAccountHeadID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改财务回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改财务回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -203,20 +178,17 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID财务
|
* 批量删除指定ID财务
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
accountHeadService.batchDelete(model.getAccountHeadIDs());
|
accountHeadService.batchDelete(model.getAccountHeadIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除财务ID为:" + model.getAccountHeadIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除财务ID为:" + model.getAccountHeadIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -230,12 +202,11 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找财务信息
|
* 查找财务信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<AccountHead> pageUtil = new PageUtil<AccountHead>();
|
PageUtil<AccountHead> pageUtil = new PageUtil<AccountHead>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -247,10 +218,8 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (AccountHead accountHead : dataList) {
|
||||||
for(AccountHead accountHead:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", accountHead.getId());
|
item.put("Id", accountHead.getId());
|
||||||
item.put("OrganId", accountHead.getOrganId() == null ? "" : accountHead.getOrganId().getId());
|
item.put("OrganId", accountHead.getOrganId() == null ? "" : accountHead.getOrganId().getId());
|
||||||
@@ -271,13 +240,9 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找财务信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找财务信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询财务信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询财务信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -311,22 +276,20 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(item.toString());
|
toClient(item.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询单位的累计应收和累计应付,收预付款不计入此处
|
* 查询单位的累计应收和累计应付,收预付款不计入此处
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findTotalPay() {
|
public void findTotalPay() {
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
JSONObject outer = new JSONObject();
|
JSONObject outer = new JSONObject();
|
||||||
Double sum = 0.0;
|
Double sum = 0.0;
|
||||||
String getS = model.getSupplierId();
|
String getS = model.getSupplierId();
|
||||||
@@ -334,8 +297,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
int i = 1;
|
int i = 1;
|
||||||
if (supType.equals("customer")) { //客户
|
if (supType.equals("customer")) { //客户
|
||||||
i = 1;
|
i = 1;
|
||||||
}
|
} else if (supType.equals("vendor")) { //供应商
|
||||||
else if(supType.equals("vendor")){ //供应商
|
|
||||||
i = -1;
|
i = -1;
|
||||||
}
|
}
|
||||||
//收付款部分
|
//收付款部分
|
||||||
@@ -345,19 +307,16 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
sum = sum - (allMoney(getS, "支出", "合计") - allMoney(getS, "支出", "实际")) * i;
|
sum = sum - (allMoney(getS, "支出", "合计") - allMoney(getS, "支出", "实际")) * i;
|
||||||
outer.put("getAllMoney", sum);
|
outer.put("getAllMoney", sum);
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 统计总金额
|
* 统计总金额
|
||||||
|
*
|
||||||
* @param type
|
* @param type
|
||||||
* @param mode 合计或者金额
|
* @param mode 合计或者金额
|
||||||
* @return
|
* @return
|
||||||
@@ -399,15 +358,17 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
Map<String, Object> condition = new HashMap<String, Object>();
|
Map<String, Object> condition = new HashMap<String, Object>();
|
||||||
{condition.put("BillNo_s_like", model.getBillNo());}
|
{
|
||||||
|
condition.put("BillNo_s_like", model.getBillNo());
|
||||||
|
}
|
||||||
condition.put("Type_s_eq", model.getType());
|
condition.put("Type_s_eq", model.getType());
|
||||||
condition.put("BillTime_s_gteq", model.getBeginTime());
|
condition.put("BillTime_s_gteq", model.getBeginTime());
|
||||||
condition.put("BillTime_s_lteq", model.getEndTime());
|
condition.put("BillTime_s_lteq", model.getEndTime());
|
||||||
@@ -415,20 +376,18 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
|
|||||||
return condition;
|
return condition;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String,Object> getConditionHead_byEndTime()
|
private Map<String, Object> getConditionHead_byEndTime() {
|
||||||
{
|
|
||||||
Map<String, Object> condition = new HashMap<String, Object>();
|
Map<String, Object> condition = new HashMap<String, Object>();
|
||||||
condition.put("BillTime_s_lteq", model.getEndTime());
|
condition.put("BillTime_s_lteq", model.getEndTime());
|
||||||
return condition;
|
return condition;
|
||||||
}
|
}
|
||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
public AccountHeadModel getModel()
|
public AccountHeadModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setAccountHeadService(AccountHeadIService accountHeadService)
|
|
||||||
{
|
public void setAccountHeadService(AccountHeadIService accountHeadService) {
|
||||||
this.accountHeadService = accountHeadService;
|
this.accountHeadService = accountHeadService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,43 +1,39 @@
|
|||||||
package com.jsh.action.materials;
|
package com.jsh.action.materials;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.*;
|
||||||
|
import com.jsh.model.vo.materials.AccountItemModel;
|
||||||
|
import com.jsh.service.materials.AccountItemIService;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.model.po.AccountHead;
|
|
||||||
import com.jsh.model.po.AccountItem;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.po.Account;
|
|
||||||
import com.jsh.model.po.InOutItem;
|
|
||||||
import com.jsh.model.vo.materials.AccountItemModel;
|
|
||||||
import com.jsh.service.materials.AccountItemIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
/*
|
/*
|
||||||
* 财务明细管理(收支|收付款|转账)
|
* 财务明细管理(收支|收付款|转账)
|
||||||
* @author jishenghua qq:752718920
|
* @author jishenghua qq:752718920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class AccountItemAction extends BaseAction<AccountItemModel>
|
public class AccountItemAction extends BaseAction<AccountItemModel> {
|
||||||
{
|
|
||||||
private AccountItemIService accountItemService;
|
private AccountItemIService accountItemService;
|
||||||
private AccountItemModel model = new AccountItemModel();
|
private AccountItemModel model = new AccountItemModel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 保存明细
|
* 保存明细
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void saveDetials()
|
public void saveDetials() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用保存财务明细信息方法saveDetials()===================");
|
Log.infoFileSync("==================开始调用保存财务明细信息方法saveDetials()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Long headerId = model.getHeaderId();
|
Long headerId = model.getHeaderId();
|
||||||
String listType = model.getListType(); //单据类型
|
String listType = model.getListType(); //单据类型
|
||||||
String inserted = model.getInserted();
|
String inserted = model.getInserted();
|
||||||
@@ -47,54 +43,54 @@ public class AccountItemAction extends BaseAction<AccountItemModel>
|
|||||||
JSONArray insertedJson = JSONArray.fromObject(inserted);
|
JSONArray insertedJson = JSONArray.fromObject(inserted);
|
||||||
JSONArray deletedJson = JSONArray.fromObject(deleted);
|
JSONArray deletedJson = JSONArray.fromObject(deleted);
|
||||||
JSONArray updatedJson = JSONArray.fromObject(updated);
|
JSONArray updatedJson = JSONArray.fromObject(updated);
|
||||||
if(null != insertedJson)
|
if (null != insertedJson) {
|
||||||
{
|
for (int i = 0; i < insertedJson.size(); i++) {
|
||||||
for(int i = 0;i < insertedJson.size(); i++)
|
|
||||||
{
|
|
||||||
AccountItem accountItem = new AccountItem();
|
AccountItem accountItem = new AccountItem();
|
||||||
JSONObject tempInsertedJson = JSONObject.fromObject(insertedJson.get(i));
|
JSONObject tempInsertedJson = JSONObject.fromObject(insertedJson.get(i));
|
||||||
accountItem.setHeaderId(new AccountHead(headerId));
|
accountItem.setHeaderId(new AccountHead(headerId));
|
||||||
if(tempInsertedJson.get("AccountId")!=null&&!tempInsertedJson.get("AccountId").equals("")){accountItem.setAccountId(new Account(tempInsertedJson.getLong("AccountId")));}
|
if (tempInsertedJson.get("AccountId") != null && !tempInsertedJson.get("AccountId").equals("")) {
|
||||||
if(tempInsertedJson.get("InOutItemId")!=null&&!tempInsertedJson.get("InOutItemId").equals("")){accountItem.setInOutItemId(new InOutItem(tempInsertedJson.getLong("InOutItemId")));}
|
accountItem.setAccountId(new Account(tempInsertedJson.getLong("AccountId")));
|
||||||
|
}
|
||||||
|
if (tempInsertedJson.get("InOutItemId") != null && !tempInsertedJson.get("InOutItemId").equals("")) {
|
||||||
|
accountItem.setInOutItemId(new InOutItem(tempInsertedJson.getLong("InOutItemId")));
|
||||||
|
}
|
||||||
if (tempInsertedJson.get("EachAmount") != null && !tempInsertedJson.get("EachAmount").equals("")) {
|
if (tempInsertedJson.get("EachAmount") != null && !tempInsertedJson.get("EachAmount").equals("")) {
|
||||||
Double eachAmount = tempInsertedJson.getDouble("EachAmount");
|
Double eachAmount = tempInsertedJson.getDouble("EachAmount");
|
||||||
if (listType.equals("付款")) {
|
if (listType.equals("付款")) {
|
||||||
eachAmount = 0 - eachAmount;
|
eachAmount = 0 - eachAmount;
|
||||||
}
|
}
|
||||||
accountItem.setEachAmount(eachAmount);
|
accountItem.setEachAmount(eachAmount);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
accountItem.setEachAmount(0.0);
|
accountItem.setEachAmount(0.0);
|
||||||
}
|
}
|
||||||
accountItem.setRemark(tempInsertedJson.getString("Remark"));
|
accountItem.setRemark(tempInsertedJson.getString("Remark"));
|
||||||
accountItemService.create(accountItem);
|
accountItemService.create(accountItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(null != deletedJson)
|
if (null != deletedJson) {
|
||||||
{
|
for (int i = 0; i < deletedJson.size(); i++) {
|
||||||
for(int i = 0;i < deletedJson.size(); i++)
|
|
||||||
{
|
|
||||||
JSONObject tempDeletedJson = JSONObject.fromObject(deletedJson.get(i));
|
JSONObject tempDeletedJson = JSONObject.fromObject(deletedJson.get(i));
|
||||||
accountItemService.delete(tempDeletedJson.getLong("Id"));
|
accountItemService.delete(tempDeletedJson.getLong("Id"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(null != updatedJson)
|
if (null != updatedJson) {
|
||||||
{
|
for (int i = 0; i < updatedJson.size(); i++) {
|
||||||
for(int i = 0;i < updatedJson.size(); i++)
|
|
||||||
{
|
|
||||||
JSONObject tempUpdatedJson = JSONObject.fromObject(updatedJson.get(i));
|
JSONObject tempUpdatedJson = JSONObject.fromObject(updatedJson.get(i));
|
||||||
AccountItem accountItem = accountItemService.get(tempUpdatedJson.getLong("Id"));
|
AccountItem accountItem = accountItemService.get(tempUpdatedJson.getLong("Id"));
|
||||||
accountItem.setHeaderId(new AccountHead(headerId));
|
accountItem.setHeaderId(new AccountHead(headerId));
|
||||||
if(tempUpdatedJson.get("AccountId")!=null&&!tempUpdatedJson.get("AccountId").equals("")){accountItem.setAccountId(new Account(tempUpdatedJson.getLong("AccountId")));}
|
if (tempUpdatedJson.get("AccountId") != null && !tempUpdatedJson.get("AccountId").equals("")) {
|
||||||
if(tempUpdatedJson.get("InOutItemId")!=null&&!tempUpdatedJson.get("InOutItemId").equals("")){accountItem.setInOutItemId(new InOutItem(tempUpdatedJson.getLong("InOutItemId")));}
|
accountItem.setAccountId(new Account(tempUpdatedJson.getLong("AccountId")));
|
||||||
|
}
|
||||||
|
if (tempUpdatedJson.get("InOutItemId") != null && !tempUpdatedJson.get("InOutItemId").equals("")) {
|
||||||
|
accountItem.setInOutItemId(new InOutItem(tempUpdatedJson.getLong("InOutItemId")));
|
||||||
|
}
|
||||||
if (tempUpdatedJson.get("EachAmount") != null && !tempUpdatedJson.get("EachAmount").equals("")) {
|
if (tempUpdatedJson.get("EachAmount") != null && !tempUpdatedJson.get("EachAmount").equals("")) {
|
||||||
Double eachAmount = tempUpdatedJson.getDouble("EachAmount");
|
Double eachAmount = tempUpdatedJson.getDouble("EachAmount");
|
||||||
if (listType.equals("付款")) {
|
if (listType.equals("付款")) {
|
||||||
eachAmount = 0 - eachAmount;
|
eachAmount = 0 - eachAmount;
|
||||||
}
|
}
|
||||||
accountItem.setEachAmount(eachAmount);
|
accountItem.setEachAmount(eachAmount);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
accountItem.setEachAmount(0.0);
|
accountItem.setEachAmount(0.0);
|
||||||
}
|
}
|
||||||
accountItem.setRemark(tempUpdatedJson.getString("Remark"));
|
accountItem.setRemark(tempUpdatedJson.getString("Remark"));
|
||||||
@@ -107,22 +103,15 @@ public class AccountItemAction extends BaseAction<AccountItemModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>保存财务明细信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>保存财务明细信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>保存财务明细信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>保存财务明细信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -136,12 +125,11 @@ public class AccountItemAction extends BaseAction<AccountItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找财务信息
|
* 查找财务信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<AccountItem> pageUtil = new PageUtil<AccountItem>();
|
PageUtil<AccountItem> pageUtil = new PageUtil<AccountItem>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -153,10 +141,8 @@ public class AccountItemAction extends BaseAction<AccountItemModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (AccountItem accountItem : dataList) {
|
||||||
for(AccountItem accountItem:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", accountItem.getId());
|
item.put("Id", accountItem.getId());
|
||||||
item.put("AccountId", accountItem.getAccountId() == null ? "" : accountItem.getAccountId().getId());
|
item.put("AccountId", accountItem.getAccountId() == null ? "" : accountItem.getAccountId().getId());
|
||||||
@@ -173,23 +159,19 @@ public class AccountItemAction extends BaseAction<AccountItemModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找财务信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找财务信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询财务信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询财务信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -201,12 +183,11 @@ public class AccountItemAction extends BaseAction<AccountItemModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public AccountItemModel getModel()
|
public AccountItemModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setAccountItemService(AccountItemIService accountItemService)
|
|
||||||
{
|
public void setAccountItemService(AccountItemIService accountItemService) {
|
||||||
this.accountItemService = accountItemService;
|
this.accountItemService = accountItemService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,32 +1,23 @@
|
|||||||
package com.jsh.action.materials;
|
package com.jsh.action.materials;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.text.ParseException;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
|
|
||||||
import com.jsh.base.BaseAction;
|
import com.jsh.base.BaseAction;
|
||||||
import com.jsh.base.Log;
|
import com.jsh.base.Log;
|
||||||
import com.jsh.model.po.Account;
|
import com.jsh.model.po.*;
|
||||||
import com.jsh.model.po.Depot;
|
|
||||||
import com.jsh.model.po.DepotHead;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.po.Person;
|
|
||||||
import com.jsh.model.po.Supplier;
|
|
||||||
import com.jsh.model.vo.materials.DepotHeadModel;
|
import com.jsh.model.vo.materials.DepotHeadModel;
|
||||||
import com.jsh.service.materials.DepotHeadIService;
|
import com.jsh.service.materials.DepotHeadIService;
|
||||||
import com.jsh.util.JshException;
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
import com.jsh.util.Tools;
|
import com.jsh.util.Tools;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.sql.Timestamp;
|
||||||
|
import java.text.ParseException;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -34,8 +25,7 @@ import com.jsh.util.Tools;
|
|||||||
* @author jishenghua qq:752718920
|
* @author jishenghua qq:752718920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
public class DepotHeadAction extends BaseAction<DepotHeadModel> {
|
||||||
{
|
|
||||||
private DepotHeadIService depotHeadService;
|
private DepotHeadIService depotHeadService;
|
||||||
private DepotHeadModel model = new DepotHeadModel();
|
private DepotHeadModel model = new DepotHeadModel();
|
||||||
|
|
||||||
@@ -43,19 +33,15 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
* 获取MaxId
|
* 获取MaxId
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getMaxId()
|
public String getMaxId() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
depotHeadService.find(pageUtil, "maxId");
|
depotHeadService.find(pageUtil, "maxId");
|
||||||
mapData.put("depotHeadMax", pageUtil.getPageList());
|
mapData.put("depotHeadMax", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找最大的Id信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找最大的Id信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exceptoin");
|
model.getShowModel().setMsgTip("exceptoin");
|
||||||
}
|
}
|
||||||
@@ -64,17 +50,19 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加单据
|
* 增加单据
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create() {
|
public void create() {
|
||||||
Log.infoFileSync("==================开始调用增加单据信息信息方法create()===================");
|
Log.infoFileSync("==================开始调用增加单据信息信息方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
DepotHead depotHead = new DepotHead();
|
DepotHead depotHead = new DepotHead();
|
||||||
depotHead.setType(model.getType());
|
depotHead.setType(model.getType());
|
||||||
depotHead.setSubType(model.getSubType());
|
depotHead.setSubType(model.getSubType());
|
||||||
if(model.getProjectId()!=null){depotHead.setProjectId(new Depot(model.getProjectId()));}
|
if (model.getProjectId() != null) {
|
||||||
|
depotHead.setProjectId(new Depot(model.getProjectId()));
|
||||||
|
}
|
||||||
//构造新的编号
|
//构造新的编号
|
||||||
String dNumber = model.getDefaultNumber();
|
String dNumber = model.getDefaultNumber();
|
||||||
String number = dNumber.substring(0, 12); //截取前缀
|
String number = dNumber.substring(0, 12); //截取前缀
|
||||||
@@ -86,19 +74,24 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
depotHead.setDefaultNumber(allNewNumber); //初始编号,一直都从后台取值
|
depotHead.setDefaultNumber(allNewNumber); //初始编号,一直都从后台取值
|
||||||
|
|
||||||
depotHead.setOperPersonName(getUser().getUsername());
|
depotHead.setOperPersonName(getUser().getUsername());
|
||||||
depotHead.setCreateTime(new Timestamp(new Date().getTime()));
|
depotHead.setCreateTime(new Timestamp(System.currentTimeMillis()));
|
||||||
try {
|
try {
|
||||||
depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
|
depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
|
||||||
}
|
} catch (ParseException e) {
|
||||||
catch (ParseException e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
||||||
}
|
}
|
||||||
if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));}
|
if (model.getOrganId() != null) {
|
||||||
if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
|
depotHead.setOrganId(new Supplier(model.getOrganId()));
|
||||||
|
}
|
||||||
|
if (model.getHandsPersonId() != null) {
|
||||||
|
depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));
|
||||||
|
}
|
||||||
if (model.getSalesman() != null) {
|
if (model.getSalesman() != null) {
|
||||||
depotHead.setSalesman(model.getSalesman().toString());
|
depotHead.setSalesman(model.getSalesman().toString());
|
||||||
}
|
}
|
||||||
if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));}
|
if (model.getAccountId() != null) {
|
||||||
|
depotHead.setAccountId(new Account(model.getAccountId()));
|
||||||
|
}
|
||||||
depotHead.setChangeAmount(model.getChangeAmount());
|
depotHead.setChangeAmount(model.getChangeAmount());
|
||||||
depotHead.setAccountIdList(model.getAccountIdList());
|
depotHead.setAccountIdList(model.getAccountIdList());
|
||||||
depotHead.setAccountMoneyList(model.getAccountMoneyList());
|
depotHead.setAccountMoneyList(model.getAccountMoneyList());
|
||||||
@@ -109,7 +102,9 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
depotHead.setOtherMoneyList(model.getOtherMoneyList());
|
depotHead.setOtherMoneyList(model.getOtherMoneyList());
|
||||||
depotHead.setOtherMoneyItem(model.getOtherMoneyItem());
|
depotHead.setOtherMoneyItem(model.getOtherMoneyItem());
|
||||||
depotHead.setAccountDay(model.getAccountDay());
|
depotHead.setAccountDay(model.getAccountDay());
|
||||||
if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));}
|
if (model.getAllocationProjectId() != null) {
|
||||||
|
depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));
|
||||||
|
}
|
||||||
depotHead.setTotalPrice(model.getTotalPrice());
|
depotHead.setTotalPrice(model.getTotalPrice());
|
||||||
depotHead.setPayType(model.getPayType());
|
depotHead.setPayType(model.getPayType());
|
||||||
depotHead.setStatus(false);
|
depotHead.setStatus(false);
|
||||||
@@ -121,18 +116,15 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加单据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加单据信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally {
|
|
||||||
try {
|
try {
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加单据信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加单据信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -145,6 +137,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除单据
|
* 删除单据
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete() {
|
public String delete() {
|
||||||
@@ -153,8 +146,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
depotHeadService.delete(model.getDepotHeadID());
|
depotHeadService.delete(model.getDepotHeadID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotHeadID() + " 的单据异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotHeadID() + " 的单据异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -169,6 +161,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新单据
|
* 更新单据
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update() {
|
public void update() {
|
||||||
@@ -177,22 +170,26 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
DepotHead depotHead = depotHeadService.get(model.getDepotHeadID());
|
DepotHead depotHead = depotHeadService.get(model.getDepotHeadID());
|
||||||
depotHead.setType(model.getType());
|
depotHead.setType(model.getType());
|
||||||
depotHead.setSubType(model.getSubType());
|
depotHead.setSubType(model.getSubType());
|
||||||
if(model.getProjectId()!=null){depotHead.setProjectId(new Depot(model.getProjectId()));}
|
if (model.getProjectId() != null) {
|
||||||
|
depotHead.setProjectId(new Depot(model.getProjectId()));
|
||||||
|
}
|
||||||
depotHead.setNumber(model.getNumber());
|
depotHead.setNumber(model.getNumber());
|
||||||
depotHead.setOperPersonName(getUser().getUsername());
|
depotHead.setOperPersonName(getUser().getUsername());
|
||||||
try {
|
try {
|
||||||
depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
|
depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
|
||||||
}
|
} catch (ParseException e) {
|
||||||
catch (ParseException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>解析入库时间格式异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>解析入库时间格式异常", e);
|
||||||
}
|
}
|
||||||
if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));}
|
if (model.getOrganId() != null) {
|
||||||
if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
|
depotHead.setOrganId(new Supplier(model.getOrganId()));
|
||||||
|
}
|
||||||
|
if (model.getHandsPersonId() != null) {
|
||||||
|
depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));
|
||||||
|
}
|
||||||
depotHead.setSalesman(model.getSalesman());
|
depotHead.setSalesman(model.getSalesman());
|
||||||
if (model.getAccountId() != null) {
|
if (model.getAccountId() != null) {
|
||||||
depotHead.setAccountId(new Account(model.getAccountId()));
|
depotHead.setAccountId(new Account(model.getAccountId()));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
depotHead.setAccountId(null);
|
depotHead.setAccountId(null);
|
||||||
}
|
}
|
||||||
depotHead.setChangeAmount(model.getChangeAmount());
|
depotHead.setChangeAmount(model.getChangeAmount());
|
||||||
@@ -205,7 +202,9 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
depotHead.setOtherMoneyList(model.getOtherMoneyList());
|
depotHead.setOtherMoneyList(model.getOtherMoneyList());
|
||||||
depotHead.setOtherMoneyItem(model.getOtherMoneyItem());
|
depotHead.setOtherMoneyItem(model.getOtherMoneyItem());
|
||||||
depotHead.setAccountDay(model.getAccountDay());
|
depotHead.setAccountDay(model.getAccountDay());
|
||||||
if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));}
|
if (model.getAllocationProjectId() != null) {
|
||||||
|
depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));
|
||||||
|
}
|
||||||
depotHead.setTotalPrice(model.getTotalPrice());
|
depotHead.setTotalPrice(model.getTotalPrice());
|
||||||
depotHead.setPayType(model.getPayType());
|
depotHead.setPayType(model.getPayType());
|
||||||
depotHead.setStatus(false);
|
depotHead.setStatus(false);
|
||||||
@@ -215,18 +214,15 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改单据ID为 : " + model.getDepotHeadID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改单据ID为 : " + model.getDepotHeadID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally {
|
|
||||||
try {
|
try {
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改单据回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改单据回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -237,20 +233,17 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID单据
|
* 批量删除指定ID单据
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
depotHeadService.batchDelete(model.getDepotHeadIDs());
|
depotHeadService.batchDelete(model.getDepotHeadIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除单据ID为:" + model.getDepotHeadIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除单据ID为:" + model.getDepotHeadIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -264,6 +257,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量设置状态-审核或者反审核
|
* 批量设置状态-审核或者反审核
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchSetStatus() {
|
public String batchSetStatus() {
|
||||||
@@ -273,8 +267,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量修改状态,单据ID为:" + model.getDepotHeadIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量修改状态,单据ID为:" + model.getDepotHeadIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -293,19 +286,12 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try {
|
try {
|
||||||
flag = depotHeadService.checkIsNameExist("Number", model.getNumber(), "Id", model.getDepotHeadID());
|
flag = depotHeadService.checkIsNameExist("Number", model.getNumber(), "Id", model.getDepotHeadID());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查单据编号为:" + model.getNumber() + " ID为: " + model.getDepotHeadID() + " 是否存在出现异常!");
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查单据编号为:" + model.getNumber() + " ID为: " + model.getDepotHeadID() + " 是否存在出现异常!");
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>回写检查单据编号为:" + model.getNumber() + " ID为: " + model.getDepotHeadID() + " 是否存在出现异常!", e);
|
Log.errorFileSync(">>>>>>>>>>>>回写检查单据编号为:" + model.getNumber() + " ID为: " + model.getDepotHeadID() + " 是否存在出现异常!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -323,17 +309,16 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
outer.put("DefaultNumber", newNumber);
|
outer.put("DefaultNumber", newNumber);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>单据编号生成异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>单据编号生成异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写单据编号生成接口异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写单据编号生成接口异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找单据编号
|
* 查找单据编号
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String buildNumberFun(String type, String subType, String beginTime, String endTime) {
|
public String buildNumberFun(String type, String subType, String beginTime, String endTime) {
|
||||||
@@ -366,8 +351,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>单据编号生成异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>单据编号生成异常", e);
|
||||||
}
|
}
|
||||||
return newNumber;
|
return newNumber;
|
||||||
@@ -400,17 +384,16 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
outer.put("ret", allReturn);
|
outer.put("ret", allReturn);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找单据信息
|
* 查找单据信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy() {
|
public void findBy() {
|
||||||
@@ -467,11 +450,9 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -524,22 +505,20 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(item.toString());
|
toClient(item.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找单据_根据月份(报表)
|
* 查找单据_根据月份(报表)
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findByMonth() {
|
public void findByMonth() {
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
PageUtil<DepotHead> pageUtil = new PageUtil<DepotHead>();
|
PageUtil<DepotHead> pageUtil = new PageUtil<DepotHead>();
|
||||||
pageUtil.setPageSize(1000);
|
pageUtil.setPageSize(1000);
|
||||||
pageUtil.setCurPage(1);
|
pageUtil.setCurPage(1);
|
||||||
@@ -548,10 +527,8 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
List<DepotHead> dataList = pageUtil.getPageList();
|
List<DepotHead> dataList = pageUtil.getPageList();
|
||||||
JSONObject outer = new JSONObject();
|
JSONObject outer = new JSONObject();
|
||||||
String headId = "";
|
String headId = "";
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (DepotHead depotHead : dataList) {
|
||||||
for(DepotHead depotHead:dataList)
|
|
||||||
{
|
|
||||||
headId = headId + depotHead.getId() + ",";
|
headId = headId + depotHead.getId() + ",";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -560,19 +537,16 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
}
|
}
|
||||||
outer.put("HeadIds", headId);
|
outer.put("HeadIds", headId);
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找统计信息_根据礼品卡(报表)
|
* 查找统计信息_根据礼品卡(报表)
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findGiftReport() {
|
public void findGiftReport() {
|
||||||
@@ -606,22 +580,20 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
}
|
}
|
||||||
outer.put("HeadIds", headId);
|
outer.put("HeadIds", headId);
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询单位的累计应收和累计应付,零售不能计入
|
* 查询单位的累计应收和累计应付,零售不能计入
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findTotalPay() {
|
public void findTotalPay() {
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
JSONObject outer = new JSONObject();
|
JSONObject outer = new JSONObject();
|
||||||
Double sum = 0.0;
|
Double sum = 0.0;
|
||||||
String getS = model.getSupplierId();
|
String getS = model.getSupplierId();
|
||||||
@@ -629,8 +601,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
int i = 1;
|
int i = 1;
|
||||||
if (supType.equals("customer")) { //客户
|
if (supType.equals("customer")) { //客户
|
||||||
i = 1;
|
i = 1;
|
||||||
}
|
} else if (supType.equals("vendor")) { //供应商
|
||||||
else if(supType.equals("vendor")){ //供应商
|
|
||||||
i = -1;
|
i = -1;
|
||||||
}
|
}
|
||||||
//进销部分
|
//进销部分
|
||||||
@@ -640,13 +611,9 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
sum = sum + (allMoney(getS, "出库", "采购退货", "合计") - allMoney(getS, "出库", "采购退货", "实际")) * i;
|
sum = sum + (allMoney(getS, "出库", "采购退货", "合计") - allMoney(getS, "出库", "采购退货", "实际")) * i;
|
||||||
outer.put("getAllMoney", sum);
|
outer.put("getAllMoney", sum);
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -654,6 +621,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 统计总金额
|
* 统计总金额
|
||||||
|
*
|
||||||
* @param type
|
* @param type
|
||||||
* @param subType
|
* @param subType
|
||||||
* @param mode 合计或者金额
|
* @param mode 合计或者金额
|
||||||
@@ -729,11 +697,9 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -775,11 +741,9 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -796,8 +760,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
if (allReturn.equals("null")) {
|
if (allReturn.equals("null")) {
|
||||||
allReturn = "";
|
allReturn = "";
|
||||||
}
|
}
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
}
|
||||||
return allReturn;
|
return allReturn;
|
||||||
@@ -817,8 +780,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
int j = 1;
|
int j = 1;
|
||||||
if (supType.equals("客户")) { //客户
|
if (supType.equals("客户")) { //客户
|
||||||
j = 1;
|
j = 1;
|
||||||
}
|
} else if (supType.equals("供应商")) { //供应商
|
||||||
else if(supType.equals("供应商")){ //供应商
|
|
||||||
j = -1;
|
j = -1;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
@@ -853,26 +815,19 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
}
|
}
|
||||||
if (type.equals("采购入库")) {
|
if (type.equals("采购入库")) {
|
||||||
allPrice = -(p1 - p2);
|
allPrice = -(p1 - p2);
|
||||||
}
|
} else if (type.equals("销售退货入库")) {
|
||||||
else if(type.equals("销售退货入库")) {
|
|
||||||
allPrice = -(p1 - p2);
|
allPrice = -(p1 - p2);
|
||||||
}
|
} else if (type.equals("销售出库")) {
|
||||||
else if(type.equals("销售出库")) {
|
|
||||||
allPrice = p1 - p2;
|
allPrice = p1 - p2;
|
||||||
}
|
} else if (type.equals("采购退货出库")) {
|
||||||
else if(type.equals("采购退货出库")) {
|
|
||||||
allPrice = p1 - p2;
|
allPrice = p1 - p2;
|
||||||
}
|
} else if (type.equals("付款")) {
|
||||||
else if(type.equals("付款")) {
|
|
||||||
allPrice = p1 + p2;
|
allPrice = p1 + p2;
|
||||||
}
|
} else if (type.equals("收款")) {
|
||||||
else if(type.equals("收款")) {
|
|
||||||
allPrice = -(p1 + p2);
|
allPrice = -(p1 + p2);
|
||||||
}
|
} else if (type.equals("收入")) {
|
||||||
else if(type.equals("收入")) {
|
|
||||||
allPrice = p1 - p2;
|
allPrice = p1 - p2;
|
||||||
}
|
} else if (type.equals("支出")) {
|
||||||
else if(type.equals("支出")) {
|
|
||||||
allPrice = -(p1 - p2);
|
allPrice = -(p1 - p2);
|
||||||
}
|
}
|
||||||
item.put("discountLastMoney", p1); //金额
|
item.put("discountLastMoney", p1); //金额
|
||||||
@@ -886,11 +841,9 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -903,10 +856,10 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -931,8 +884,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
return condition;
|
return condition;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String,Object> getConditionHead()
|
private Map<String, Object> getConditionHead() {
|
||||||
{
|
|
||||||
Map<String, Object> condition = new HashMap<String, Object>();
|
Map<String, Object> condition = new HashMap<String, Object>();
|
||||||
condition.put("OperTime_s_lteq", model.getMonthTime() + "-31 00:00:00");
|
condition.put("OperTime_s_lteq", model.getMonthTime() + "-31 00:00:00");
|
||||||
return condition;
|
return condition;
|
||||||
@@ -951,20 +903,18 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
|||||||
return condition;
|
return condition;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String,Object> getConditionHead_byEndTime()
|
private Map<String, Object> getConditionHead_byEndTime() {
|
||||||
{
|
|
||||||
Map<String, Object> condition = new HashMap<String, Object>();
|
Map<String, Object> condition = new HashMap<String, Object>();
|
||||||
condition.put("OperTime_s_lteq", model.getEndTime());
|
condition.put("OperTime_s_lteq", model.getEndTime());
|
||||||
return condition;
|
return condition;
|
||||||
}
|
}
|
||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
public DepotHeadModel getModel()
|
public DepotHeadModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setDepotHeadService(DepotHeadIService depotHeadService)
|
|
||||||
{
|
public void setDepotHeadService(DepotHeadIService depotHeadService) {
|
||||||
this.depotHeadService = depotHeadService;
|
this.depotHeadService = depotHeadService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,23 +19,24 @@ import java.sql.Timestamp;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 单据明细管理
|
* 单据明细管理
|
||||||
* @author jishenghua qq:752718920
|
* @author jishenghua qq:752718920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class DepotItemAction extends BaseAction<DepotItemModel>
|
public class DepotItemAction extends BaseAction<DepotItemModel> {
|
||||||
{
|
|
||||||
private MaterialIService materialService;
|
|
||||||
private DepotItemIService depotItemService;
|
|
||||||
private DepotItemModel model = new DepotItemModel();
|
|
||||||
/**
|
/**
|
||||||
* action返回excel结果
|
* action返回excel结果
|
||||||
*/
|
*/
|
||||||
public static final String EXCEL = "excel";
|
public static final String EXCEL = "excel";
|
||||||
|
private MaterialIService materialService;
|
||||||
|
private DepotItemIService depotItemService;
|
||||||
|
private DepotItemModel model = new DepotItemModel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 保存明细
|
* 保存明细
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void saveDetials() {
|
public void saveDetials() {
|
||||||
@@ -73,16 +74,13 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
Integer ratio = Integer.parseInt(RatioList.substring(RatioList.indexOf(":") + 1).replace(")", "")); //比例
|
Integer ratio = Integer.parseInt(RatioList.substring(RatioList.indexOf(":") + 1).replace(")", "")); //比例
|
||||||
if (Unit.equals(basicUnit)) { //如果等于基础单位
|
if (Unit.equals(basicUnit)) { //如果等于基础单位
|
||||||
depotItem.setBasicNumber(oNumber); //数量一致
|
depotItem.setBasicNumber(oNumber); //数量一致
|
||||||
}
|
} else if (Unit.equals(otherUnit)) { //如果等于副单位
|
||||||
else if(Unit.equals(otherUnit)){ //如果等于副单位
|
|
||||||
depotItem.setBasicNumber(oNumber * ratio); //数量乘以比例
|
depotItem.setBasicNumber(oNumber * ratio); //数量乘以比例
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
depotItem.setBasicNumber(oNumber); //其他情况
|
depotItem.setBasicNumber(oNumber); //其他情况
|
||||||
}
|
}
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch(Exception e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -111,12 +109,24 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
if (!StringUtils.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())) {
|
if (!StringUtils.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())) {
|
||||||
depotItem.setTaxLastMoney(tempInsertedJson.getDouble("TaxLastMoney"));
|
depotItem.setTaxLastMoney(tempInsertedJson.getDouble("TaxLastMoney"));
|
||||||
}
|
}
|
||||||
if(tempInsertedJson.get("OtherField1")!=null){depotItem.setOtherField1(tempInsertedJson.getString("OtherField1"));}
|
if (tempInsertedJson.get("OtherField1") != null) {
|
||||||
if(tempInsertedJson.get("OtherField2")!=null){depotItem.setOtherField2(tempInsertedJson.getString("OtherField2"));}
|
depotItem.setOtherField1(tempInsertedJson.getString("OtherField1"));
|
||||||
if(tempInsertedJson.get("OtherField3")!=null){depotItem.setOtherField3(tempInsertedJson.getString("OtherField3"));}
|
}
|
||||||
if(tempInsertedJson.get("OtherField4")!=null){depotItem.setOtherField4(tempInsertedJson.getString("OtherField4"));}
|
if (tempInsertedJson.get("OtherField2") != null) {
|
||||||
if(tempInsertedJson.get("OtherField5")!=null){depotItem.setOtherField5(tempInsertedJson.getString("OtherField5"));}
|
depotItem.setOtherField2(tempInsertedJson.getString("OtherField2"));
|
||||||
if(tempInsertedJson.get("MType")!=null){depotItem.setMType(tempInsertedJson.getString("MType"));}
|
}
|
||||||
|
if (tempInsertedJson.get("OtherField3") != null) {
|
||||||
|
depotItem.setOtherField3(tempInsertedJson.getString("OtherField3"));
|
||||||
|
}
|
||||||
|
if (tempInsertedJson.get("OtherField4") != null) {
|
||||||
|
depotItem.setOtherField4(tempInsertedJson.getString("OtherField4"));
|
||||||
|
}
|
||||||
|
if (tempInsertedJson.get("OtherField5") != null) {
|
||||||
|
depotItem.setOtherField5(tempInsertedJson.getString("OtherField5"));
|
||||||
|
}
|
||||||
|
if (tempInsertedJson.get("MType") != null) {
|
||||||
|
depotItem.setMType(tempInsertedJson.getString("MType"));
|
||||||
|
}
|
||||||
depotItemService.create(depotItem);
|
depotItemService.create(depotItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -148,16 +158,13 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
Integer ratio = Integer.parseInt(RatioList.substring(RatioList.indexOf(":") + 1).replace(")", "")); //比例
|
Integer ratio = Integer.parseInt(RatioList.substring(RatioList.indexOf(":") + 1).replace(")", "")); //比例
|
||||||
if (Unit.equals(basicUnit)) { //如果等于基础单位
|
if (Unit.equals(basicUnit)) { //如果等于基础单位
|
||||||
depotItem.setBasicNumber(oNumber); //数量一致
|
depotItem.setBasicNumber(oNumber); //数量一致
|
||||||
}
|
} else if (Unit.equals(otherUnit)) { //如果等于副单位
|
||||||
else if(Unit.equals(otherUnit)){ //如果等于副单位
|
|
||||||
depotItem.setBasicNumber(oNumber * ratio); //数量乘以比例
|
depotItem.setBasicNumber(oNumber * ratio); //数量乘以比例
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
depotItem.setBasicNumber(oNumber); //其他情况
|
depotItem.setBasicNumber(oNumber); //其他情况
|
||||||
}
|
}
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch(Exception e){
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -201,18 +208,15 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>保存仓管通明细信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>保存仓管通明细信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally {
|
|
||||||
try {
|
try {
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>保存仓管通明细信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>保存仓管通明细信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -225,6 +229,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询计量单位信息
|
* 查询计量单位信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String findUnitName(Long mId) {
|
public String findUnitName(Long mId) {
|
||||||
@@ -241,8 +246,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
unitName = "";
|
unitName = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e) {
|
|
||||||
// TODO Auto-generated catch block
|
// TODO Auto-generated catch block
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
@@ -252,6 +256,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找明细信息
|
* 查找明细信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy() {
|
public void findBy() {
|
||||||
@@ -276,8 +281,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
String ratio; //比例
|
String ratio; //比例
|
||||||
if (depotItem.getMaterialId().getUnitId() == null || depotItem.getMaterialId().getUnitId().equals("")) {
|
if (depotItem.getMaterialId().getUnitId() == null || depotItem.getMaterialId().getUnitId().equals("")) {
|
||||||
ratio = "";
|
ratio = "";
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
ratio = depotItem.getMaterialId().getUnitId().getUName();
|
ratio = depotItem.getMaterialId().getUnitId().getUName();
|
||||||
ratio = ratio.substring(ratio.indexOf("("));
|
ratio = ratio.substring(ratio.indexOf("("));
|
||||||
}
|
}
|
||||||
@@ -314,17 +318,16 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找所有的明细
|
* 查找所有的明细
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findByAll() {
|
public void findByAll() {
|
||||||
@@ -376,19 +379,16 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据商品id和仓库id查询库存数量
|
* 根据商品id和仓库id查询库存数量
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findStockNumById() {
|
public void findStockNumById() {
|
||||||
@@ -420,19 +420,16 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 只根据商品id查询库存数量
|
* 只根据商品id查询库存数量
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findStockNumByMaterialId() {
|
public void findStockNumByMaterialId() {
|
||||||
@@ -462,19 +459,16 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 只根据商品id查询单据列表
|
* 只根据商品id查询单据列表
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findDetailByTypeAndMaterialId() {
|
public void findDetailByTypeAndMaterialId() {
|
||||||
@@ -504,17 +498,16 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e) {
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找礼品卡信息
|
* 查找礼品卡信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findGiftByAll() {
|
public void findGiftByAll() {
|
||||||
@@ -553,23 +546,20 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 进货统计
|
* 进货统计
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void buyIn()
|
public void buyIn() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>();
|
PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -582,10 +572,8 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (DepotItem depotItem : dataList) {
|
||||||
for(DepotItem depotItem:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
Integer InSum = sumNumberBuyOrSale("入库", "采购", depotItem.getMaterialId().getId(), model.getMonthTime());
|
Integer InSum = sumNumberBuyOrSale("入库", "采购", depotItem.getMaterialId().getId(), model.getMonthTime());
|
||||||
Integer OutSum = sumNumberBuyOrSale("出库", "采购退货", depotItem.getMaterialId().getId(), model.getMonthTime());
|
Integer OutSum = sumNumberBuyOrSale("出库", "采购退货", depotItem.getMaterialId().getId(), model.getMonthTime());
|
||||||
@@ -610,24 +598,20 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 销售统计
|
* 销售统计
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void saleOut()
|
public void saleOut() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>();
|
PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -640,10 +624,8 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (DepotItem depotItem : dataList) {
|
||||||
for(DepotItem depotItem:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
Integer OutSumRetail = sumNumberBuyOrSale("出库", "零售", depotItem.getMaterialId().getId(), model.getMonthTime());
|
Integer OutSumRetail = sumNumberBuyOrSale("出库", "零售", depotItem.getMaterialId().getId(), model.getMonthTime());
|
||||||
Integer OutSum = sumNumberBuyOrSale("出库", "销售", depotItem.getMaterialId().getId(), model.getMonthTime());
|
Integer OutSum = sumNumberBuyOrSale("出库", "销售", depotItem.getMaterialId().getId(), model.getMonthTime());
|
||||||
@@ -672,24 +654,20 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 统计总计金额
|
* 统计总计金额
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void totalCountMoney()
|
public void totalCountMoney() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>();
|
PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
@@ -700,10 +678,8 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
JSONObject outer = new JSONObject();
|
JSONObject outer = new JSONObject();
|
||||||
Integer pid = model.getProjectId();
|
Integer pid = model.getProjectId();
|
||||||
Double thisAllPrice = 0.0;
|
Double thisAllPrice = 0.0;
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (DepotItem depotItem : dataList) {
|
||||||
for(DepotItem depotItem:dataList)
|
|
||||||
{
|
|
||||||
Double prevPrice = sumPrice("入库", pid, depotItem.getMaterialId().getId(), model.getMonthTime(), true) - sumPrice("出库", pid, depotItem.getMaterialId().getId(), model.getMonthTime(), true);
|
Double prevPrice = sumPrice("入库", pid, depotItem.getMaterialId().getId(), model.getMonthTime(), true) - sumPrice("出库", pid, depotItem.getMaterialId().getId(), model.getMonthTime(), true);
|
||||||
Double InPrice = sumPrice("入库", pid, depotItem.getMaterialId().getId(), model.getMonthTime(), false);
|
Double InPrice = sumPrice("入库", pid, depotItem.getMaterialId().getId(), model.getMonthTime(), false);
|
||||||
Double OutPrice = sumPrice("出库", pid, depotItem.getMaterialId().getId(), model.getMonthTime(), false);
|
Double OutPrice = sumPrice("出库", pid, depotItem.getMaterialId().getId(), model.getMonthTime(), false);
|
||||||
@@ -713,19 +689,16 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
outer.put("totalCount", thisAllPrice);
|
outer.put("totalCount", thisAllPrice);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出excel表格
|
* 导出excel表格
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -774,8 +747,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
String isCurrentPage = "allPage";
|
String isCurrentPage = "allPage";
|
||||||
model.setFileName(Tools.changeUnicode("report.xls", model.getBrowserType()));
|
model.setFileName(Tools.changeUnicode("report.xls", model.getBrowserType()));
|
||||||
model.setExcelStream(depotItemService.exmportExcel(isCurrentPage, dataArray));
|
model.setExcelStream(depotItemService.exmportExcel(isCurrentPage, dataArray));
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常", e);
|
||||||
model.getShowModel().setMsgTip("export excel exception");
|
model.getShowModel().setMsgTip("export excel exception");
|
||||||
}
|
}
|
||||||
@@ -785,6 +757,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 数量合计
|
* 数量合计
|
||||||
|
*
|
||||||
* @param type
|
* @param type
|
||||||
* @param MId
|
* @param MId
|
||||||
* @param MonthTime
|
* @param MonthTime
|
||||||
@@ -816,6 +789,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 仅根据商品Id进行数量合计
|
* 仅根据商品Id进行数量合计
|
||||||
|
*
|
||||||
* @param type
|
* @param type
|
||||||
* @param MId
|
* @param MId
|
||||||
* @return
|
* @return
|
||||||
@@ -845,6 +819,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 数量合计-礼品卡
|
* 数量合计-礼品卡
|
||||||
|
*
|
||||||
* @param type
|
* @param type
|
||||||
* @param MId
|
* @param MId
|
||||||
* @param MonthTime
|
* @param MonthTime
|
||||||
@@ -876,6 +851,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 价格合计
|
* 价格合计
|
||||||
|
*
|
||||||
* @param type
|
* @param type
|
||||||
* @param MId
|
* @param MId
|
||||||
* @param MonthTime
|
* @param MonthTime
|
||||||
@@ -928,6 +904,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
sumNumber = Integer.parseInt(allNumber);
|
sumNumber = Integer.parseInt(allNumber);
|
||||||
return sumNumber;
|
return sumNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public Double sumPriceBuyOrSale(String type, String subType, Long MId, String MonthTime) {
|
public Double sumPriceBuyOrSale(String type, String subType, Long MId, String MonthTime) {
|
||||||
Double sumPrice = 0.0;
|
Double sumPrice = 0.0;
|
||||||
@@ -954,6 +931,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取扩展信息
|
* 获取扩展信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String getOtherInfo(String[] mpArr, DepotItem depotItem) {
|
public String getOtherInfo(String[] mpArr, DepotItem depotItem) {
|
||||||
@@ -980,12 +958,13 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
}
|
}
|
||||||
return materialOther;
|
return materialOther;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -995,8 +974,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
return condition;
|
return condition;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String,Object> getConditionALL()
|
private Map<String, Object> getConditionALL() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -1018,12 +996,11 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public DepotItemModel getModel()
|
public DepotItemModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setDepotItemService(DepotItemIService depotItemService)
|
|
||||||
{
|
public void setDepotItemService(DepotItemIService depotItemService) {
|
||||||
this.depotItemService = depotItemService;
|
this.depotItemService = depotItemService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,21 @@
|
|||||||
package com.jsh.action.materials;
|
package com.jsh.action.materials;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.Logdetails;
|
||||||
|
import com.jsh.model.po.Material;
|
||||||
|
import com.jsh.model.po.MaterialCategory;
|
||||||
|
import com.jsh.model.po.Unit;
|
||||||
|
import com.jsh.model.vo.materials.MaterialModel;
|
||||||
|
import com.jsh.service.materials.MaterialIService;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
|
import com.jsh.util.MaterialConstants;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import com.jsh.util.Tools;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
@@ -8,39 +24,25 @@ import java.util.HashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.jsh.model.po.*;
|
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.util.MaterialConstants;
|
|
||||||
import com.jsh.util.Tools;
|
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.model.vo.materials.MaterialModel;
|
|
||||||
import com.jsh.service.materials.MaterialIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
/*
|
/*
|
||||||
* 商品管理
|
* 商品管理
|
||||||
* @author jishenghua qq:752718920
|
* @author jishenghua qq:752718920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class MaterialAction extends BaseAction<MaterialModel>
|
public class MaterialAction extends BaseAction<MaterialModel> {
|
||||||
{
|
public static final String EXCEL = "excel"; //action返回excel结果
|
||||||
private MaterialIService materialService;
|
private MaterialIService materialService;
|
||||||
private MaterialModel model = new MaterialModel();
|
private MaterialModel model = new MaterialModel();
|
||||||
public static final String EXCEL = "excel"; //action返回excel结果
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加商品
|
* 增加商品
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加商品信息方法create()===================");
|
Log.infoFileSync("==================开始调用增加商品信息方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Material material = new Material();
|
Material material = new Material();
|
||||||
material.setMaterialCategory(new MaterialCategory(model.getCategoryId()));
|
material.setMaterialCategory(new MaterialCategory(model.getCategoryId()));
|
||||||
|
|
||||||
@@ -58,8 +60,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
material.setPresetPriceTwo(model.getPresetPriceTwo());
|
material.setPresetPriceTwo(model.getPresetPriceTwo());
|
||||||
if (model.getUnitId() != null) {
|
if (model.getUnitId() != null) {
|
||||||
material.setUnitId(new Unit(model.getUnitId()));
|
material.setUnitId(new Unit(model.getUnitId()));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
material.setUnitId(null);
|
material.setUnitId(null);
|
||||||
}
|
}
|
||||||
material.setFirstOutUnit(model.getFirstOutUnit());
|
material.setFirstOutUnit(model.getFirstOutUnit());
|
||||||
@@ -77,22 +78,15 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加商品信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加商品信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加商品信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加商品信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -105,19 +99,16 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除商品
|
* 删除商品
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除商品信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除商品信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
materialService.delete(model.getMaterialID());
|
materialService.delete(model.getMaterialID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialID() + " 的商品异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialID() + " 的商品异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -132,13 +123,12 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新商品
|
* 更新商品
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Material material = materialService.get(model.getMaterialID());
|
Material material = materialService.get(model.getMaterialID());
|
||||||
material.setMaterialCategory(new MaterialCategory(model.getCategoryId()));
|
material.setMaterialCategory(new MaterialCategory(model.getCategoryId()));
|
||||||
|
|
||||||
@@ -156,8 +146,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
material.setPresetPriceTwo(model.getPresetPriceTwo());
|
material.setPresetPriceTwo(model.getPresetPriceTwo());
|
||||||
if (model.getUnitId() != null) {
|
if (model.getUnitId() != null) {
|
||||||
material.setUnitId(new Unit(model.getUnitId()));
|
material.setUnitId(new Unit(model.getUnitId()));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
material.setUnitId(null);
|
material.setUnitId(null);
|
||||||
}
|
}
|
||||||
material.setFirstOutUnit(model.getFirstOutUnit());
|
material.setFirstOutUnit(model.getFirstOutUnit());
|
||||||
@@ -172,22 +161,15 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改商品ID为 : " + model.getMaterialID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改商品ID为 : " + model.getMaterialID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改商品回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改商品回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -198,20 +180,17 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID商品
|
* 批量删除指定ID商品
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
materialService.batchDelete(model.getMaterialIDs());
|
materialService.batchDelete(model.getMaterialIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除商品ID为:" + model.getMaterialIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除商品ID为:" + model.getMaterialIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -225,20 +204,17 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量设置状态-启用或者禁用
|
* 批量设置状态-启用或者禁用
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchSetEnable()
|
public String batchSetEnable() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
materialService.batchSetEnable(model.getEnabled(), model.getMaterialIDs());
|
materialService.batchSetEnable(model.getEnabled(), model.getMaterialIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量修改状态,商品ID为:" + model.getMaterialIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量修改状态,商品ID为:" + model.getMaterialIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -252,6 +228,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找该商品是否存在
|
* 查找该商品是否存在
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void checkIsExist() {
|
public void checkIsExist() {
|
||||||
@@ -265,29 +242,25 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
List<Material> dataList = pageUtil.getPageList();
|
List<Material> dataList = pageUtil.getPageList();
|
||||||
if (null != dataList && dataList.size() > 0) {
|
if (null != dataList && dataList.size() > 0) {
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
flag = false;
|
flag = false;
|
||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找商品信息
|
* 查找商品信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Material> pageUtil = new PageUtil<Material>();
|
PageUtil<Material> pageUtil = new PageUtil<Material>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -295,9 +268,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
if (1 == lei) //判断值还真不能用String类型的判断
|
if (1 == lei) //判断值还真不能用String类型的判断
|
||||||
{
|
{
|
||||||
pageUtil.setAdvSearch(getCondition_all());
|
pageUtil.setAdvSearch(getCondition_all());
|
||||||
}
|
} else if (1 != lei) {
|
||||||
else if(1!=lei)
|
|
||||||
{
|
|
||||||
pageUtil.setAdvSearch(getCondition());
|
pageUtil.setAdvSearch(getCondition());
|
||||||
}
|
}
|
||||||
materialService.find(pageUtil);
|
materialService.find(pageUtil);
|
||||||
@@ -309,10 +280,8 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Material material : dataList) {
|
||||||
for(Material material:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", material.getId());
|
item.put("Id", material.getId());
|
||||||
item.put("Name", material.getName());
|
item.put("Name", material.getName());
|
||||||
@@ -369,24 +338,20 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据id来查询商品名称
|
* 根据id来查询商品名称
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findById() {
|
public void findById() {
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
PageUtil<Material> pageUtil = new PageUtil<Material>();
|
PageUtil<Material> pageUtil = new PageUtil<Material>();
|
||||||
pageUtil.setAdvSearch(getConditionById());
|
pageUtil.setAdvSearch(getConditionById());
|
||||||
materialService.find(pageUtil);
|
materialService.find(pageUtil);
|
||||||
@@ -395,10 +360,8 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Material material : dataList) {
|
||||||
for(Material material:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", material.getId());
|
item.put("Id", material.getId());
|
||||||
item.put("Name", material.getName());
|
item.put("Name", material.getName());
|
||||||
@@ -426,19 +389,16 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找商品信息-下拉框
|
* 查找商品信息-下拉框
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBySelect() {
|
public void findBySelect() {
|
||||||
@@ -460,8 +420,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
String ratio; //比例
|
String ratio; //比例
|
||||||
if (material.getUnitId() == null || material.getUnitId().equals("")) {
|
if (material.getUnitId() == null || material.getUnitId().equals("")) {
|
||||||
ratio = "";
|
ratio = "";
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
ratio = material.getUnitId().getUName();
|
ratio = material.getUnitId().getUName();
|
||||||
ratio = ratio.substring(ratio.indexOf("("));
|
ratio = ratio.substring(ratio.indexOf("("));
|
||||||
}
|
}
|
||||||
@@ -494,11 +453,9 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
@@ -507,12 +464,11 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找商品信息-统计排序
|
* 查找商品信息-统计排序
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findByOrder()
|
public void findByOrder() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Material> pageUtil = new PageUtil<Material>();
|
PageUtil<Material> pageUtil = new PageUtil<Material>();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
@@ -522,10 +478,8 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONObject outer = new JSONObject();
|
JSONObject outer = new JSONObject();
|
||||||
String mId = "";
|
String mId = "";
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Material material : dataList) {
|
||||||
for(Material material:dataList)
|
|
||||||
{
|
|
||||||
mId = mId + material.getId() + ",";
|
mId = mId + material.getId() + ",";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -535,19 +489,16 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
outer.put("mIds", mId);
|
outer.put("mIds", mId);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导入excel表格-供应商
|
* 导入excel表格-供应商
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -558,13 +509,11 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
try {
|
try {
|
||||||
InputStream in = materialService.importExcel(model.getMaterialFile());
|
InputStream in = materialService.importExcel(model.getMaterialFile());
|
||||||
|
|
||||||
if(null != in)
|
if (null != in) {
|
||||||
{
|
|
||||||
model.setFileName(Tools.getRandomChar() + Tools.getNow2(Calendar.getInstance().getTime()) + "_wrong.xls");
|
model.setFileName(Tools.getRandomChar() + Tools.getNow2(Calendar.getInstance().getTime()) + "_wrong.xls");
|
||||||
model.setExcelStream(in);
|
model.setExcelStream(in);
|
||||||
returnStr = MaterialConstants.BusinessForExcel.EXCEL;
|
returnStr = MaterialConstants.BusinessForExcel.EXCEL;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
result = true;
|
result = true;
|
||||||
try {
|
try {
|
||||||
toClient(result.toString());
|
toClient(result.toString());
|
||||||
@@ -575,9 +524,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
returnStr = SUCCESS;
|
returnStr = SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} catch (JshException e) {
|
||||||
catch (JshException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>导入excel表格信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>导入excel表格信息异常", e);
|
||||||
}
|
}
|
||||||
return returnStr;
|
return returnStr;
|
||||||
@@ -585,6 +532,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出excel表格
|
* 导出excel表格
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -598,8 +546,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
String isCurrentPage = "allPage";
|
String isCurrentPage = "allPage";
|
||||||
model.setFileName(Tools.changeUnicode("goods" + System.currentTimeMillis() + ".xls", model.getBrowserType()));
|
model.setFileName(Tools.changeUnicode("goods" + System.currentTimeMillis() + ".xls", model.getBrowserType()));
|
||||||
model.setExcelStream(materialService.exmportExcel(isCurrentPage, pageUtil));
|
model.setExcelStream(materialService.exmportExcel(isCurrentPage, pageUtil));
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常", e);
|
||||||
model.getShowModel().setMsgTip("export excel exception");
|
model.getShowModel().setMsgTip("export excel exception");
|
||||||
}
|
}
|
||||||
@@ -609,10 +556,10 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件(查全部)
|
* 拼接搜索条件(查全部)
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_all()
|
private Map<String, Object> getCondition_all() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -626,6 +573,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String, Object> getCondition() {
|
private Map<String, Object> getCondition() {
|
||||||
@@ -665,10 +613,10 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getConditionById()
|
private Map<String, Object> getConditionById() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -679,10 +627,10 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-下拉框
|
* 拼接搜索条件-下拉框
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_Select()
|
private Map<String, Object> getCondition_Select() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -694,10 +642,10 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件-下拉框
|
* 拼接搜索条件-下拉框
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition_Order()
|
private Map<String, Object> getCondition_Order() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -708,12 +656,11 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public MaterialModel getModel()
|
public MaterialModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setMaterialService(MaterialIService materialService)
|
|
||||||
{
|
public void setMaterialService(MaterialIService materialService) {
|
||||||
this.materialService = materialService;
|
this.materialService = materialService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,49 +1,46 @@
|
|||||||
package com.jsh.action.materials;
|
package com.jsh.action.materials;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.Logdetails;
|
||||||
|
import com.jsh.model.po.MaterialCategory;
|
||||||
|
import com.jsh.model.vo.materials.MaterialCategoryModel;
|
||||||
|
import com.jsh.service.materials.MaterialCategoryIService;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.model.po.MaterialCategory;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.vo.materials.MaterialCategoryModel;
|
|
||||||
import com.jsh.service.materials.MaterialCategoryIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
/*
|
/*
|
||||||
* 商品类型管理
|
* 商品类型管理
|
||||||
* @author jishenghua qq:752718920
|
* @author jishenghua qq:752718920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel> {
|
||||||
{
|
|
||||||
private MaterialCategoryIService materialCategoryService;
|
private MaterialCategoryIService materialCategoryService;
|
||||||
private MaterialCategoryModel model = new MaterialCategoryModel();
|
private MaterialCategoryModel model = new MaterialCategoryModel();
|
||||||
|
|
||||||
|
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getBasicData()
|
public String getBasicData() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Map<String, Object> condition = pageUtil.getAdvSearch();
|
Map<String, Object> condition = pageUtil.getAdvSearch();
|
||||||
condition.put("ParentId_n_eq", model.getParentId());
|
condition.put("ParentId_n_eq", model.getParentId());
|
||||||
condition.put("Id_n_neq", 1);
|
condition.put("Id_n_neq", 1);
|
||||||
condition.put("Id_s_order", "asc");
|
condition.put("Id_s_order", "asc");
|
||||||
materialCategoryService.find(pageUtil);
|
materialCategoryService.find(pageUtil);
|
||||||
mapData.put("materialCategoryList", pageUtil.getPageList());
|
mapData.put("materialCategoryList", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找商品类别信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找商品类别信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exceptoin");
|
model.getShowModel().setMsgTip("exceptoin");
|
||||||
}
|
}
|
||||||
@@ -52,14 +49,13 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加商品类别
|
* 增加商品类别
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加商品类别信息方法create()===================");
|
Log.infoFileSync("==================开始调用增加商品类别信息方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
MaterialCategory materialCategory = new MaterialCategory();
|
MaterialCategory materialCategory = new MaterialCategory();
|
||||||
materialCategory.setMaterialCategory(new MaterialCategory(model.getParentId()));
|
materialCategory.setMaterialCategory(new MaterialCategory(model.getParentId()));
|
||||||
|
|
||||||
@@ -72,22 +68,15 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加商品类别信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加商品类别信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加商品类别信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加商品类别信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -100,19 +89,16 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除商品类别
|
* 删除商品类别
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除商品类别信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除商品类别信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
materialCategoryService.delete(model.getMaterialCategoryID());
|
materialCategoryService.delete(model.getMaterialCategoryID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialCategoryID() + " 的商品类别异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialCategoryID() + " 的商品类别异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -127,13 +113,12 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新商品类别
|
* 更新商品类别
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
MaterialCategory materialCategory = materialCategoryService.get(model.getMaterialCategoryID());
|
MaterialCategory materialCategory = materialCategoryService.get(model.getMaterialCategoryID());
|
||||||
materialCategory.setMaterialCategory(new MaterialCategory(model.getParentId()));
|
materialCategory.setMaterialCategory(new MaterialCategory(model.getParentId()));
|
||||||
|
|
||||||
@@ -144,22 +129,15 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改商品类别ID为 : " + model.getMaterialCategoryID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改商品类别ID为 : " + model.getMaterialCategoryID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改商品类别回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改商品类别回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -170,20 +148,17 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID商品类别
|
* 批量删除指定ID商品类别
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
materialCategoryService.batchDelete(model.getMaterialCategoryIDs());
|
materialCategoryService.batchDelete(model.getMaterialCategoryIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除商品类别ID为:" + model.getMaterialCategoryIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除商品类别ID为:" + model.getMaterialCategoryIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -197,12 +172,11 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找商品类别信息
|
* 查找商品类别信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<MaterialCategory> pageUtil = new PageUtil<MaterialCategory>();
|
PageUtil<MaterialCategory> pageUtil = new PageUtil<MaterialCategory>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -218,10 +192,8 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (MaterialCategory materialCategory : dataList) {
|
||||||
for(MaterialCategory materialCategory:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", materialCategory.getId());
|
item.put("Id", materialCategory.getId());
|
||||||
item.put("ParentId", materialCategory.getMaterialCategory().getId());
|
item.put("ParentId", materialCategory.getMaterialCategory().getId());
|
||||||
@@ -235,19 +207,16 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品类别信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品类别信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品类别信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品类别信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据id来查询商品名称
|
* 根据id来查询商品名称
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findById() {
|
public void findById() {
|
||||||
@@ -265,23 +234,19 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品类别信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品类别信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品类别信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品类别信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -295,6 +260,7 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String, Object> getConditionById() {
|
private Map<String, Object> getConditionById() {
|
||||||
@@ -308,12 +274,11 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public MaterialCategoryModel getModel()
|
public MaterialCategoryModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setMaterialCategoryService(MaterialCategoryIService materialCategoryService)
|
|
||||||
{
|
public void setMaterialCategoryService(MaterialCategoryIService materialCategoryService) {
|
||||||
this.materialCategoryService = materialCategoryService;
|
this.materialCategoryService = materialCategoryService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,13 +22,13 @@ import java.util.Map;
|
|||||||
* @author ji s h e n g hua qq:75 27 18 920
|
* @author ji s h e n g hua qq:75 27 18 920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class MaterialPropertyAction extends BaseAction<MaterialPropertyModel>
|
public class MaterialPropertyAction extends BaseAction<MaterialPropertyModel> {
|
||||||
{
|
|
||||||
private MaterialPropertyIService materialPropertyService;
|
private MaterialPropertyIService materialPropertyService;
|
||||||
private MaterialPropertyModel model = new MaterialPropertyModel();
|
private MaterialPropertyModel model = new MaterialPropertyModel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新商品属性
|
* 更新商品属性
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update() {
|
public void update() {
|
||||||
@@ -44,18 +44,15 @@ public class MaterialPropertyAction extends BaseAction<MaterialPropertyModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改商品属性ID为 : " + model.getId() + "失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改商品属性ID为 : " + model.getId() + "失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally {
|
|
||||||
try {
|
try {
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改商品属性回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改商品属性回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -66,6 +63,7 @@ public class MaterialPropertyAction extends BaseAction<MaterialPropertyModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找商品属性
|
* 查找商品属性
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy() {
|
public void findBy() {
|
||||||
@@ -95,23 +93,19 @@ public class MaterialPropertyAction extends BaseAction<MaterialPropertyModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品属性异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品属性异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品属性结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品属性结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -126,6 +120,7 @@ public class MaterialPropertyAction extends BaseAction<MaterialPropertyModel>
|
|||||||
public MaterialPropertyModel getModel() {
|
public MaterialPropertyModel getModel() {
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMaterialPropertyService(MaterialPropertyIService materialPropertyService) {
|
public void setMaterialPropertyService(MaterialPropertyIService materialPropertyService) {
|
||||||
this.materialPropertyService = materialPropertyService;
|
this.materialPropertyService = materialPropertyService;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,47 +1,43 @@
|
|||||||
package com.jsh.action.materials;
|
package com.jsh.action.materials;
|
||||||
|
|
||||||
|
import com.jsh.base.BaseAction;
|
||||||
|
import com.jsh.base.Log;
|
||||||
|
import com.jsh.model.po.Logdetails;
|
||||||
|
import com.jsh.model.po.Person;
|
||||||
|
import com.jsh.model.vo.materials.PersonModel;
|
||||||
|
import com.jsh.service.materials.PersonIService;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import net.sf.json.JSONArray;
|
||||||
|
import net.sf.json.JSONObject;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import net.sf.json.JSONArray;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import com.jsh.base.BaseAction;
|
|
||||||
import com.jsh.base.Log;
|
|
||||||
import com.jsh.model.po.Depot;
|
|
||||||
import com.jsh.model.po.Person;
|
|
||||||
import com.jsh.model.po.Logdetails;
|
|
||||||
import com.jsh.model.vo.materials.PersonModel;
|
|
||||||
import com.jsh.service.materials.PersonIService;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
/*
|
/*
|
||||||
* 经手人管理
|
* 经手人管理
|
||||||
* @author jishenghua qq:752718920
|
* @author jishenghua qq:752718920
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class PersonAction extends BaseAction<PersonModel>
|
public class PersonAction extends BaseAction<PersonModel> {
|
||||||
{
|
|
||||||
private PersonIService personService;
|
private PersonIService personService;
|
||||||
private PersonModel model = new PersonModel();
|
private PersonModel model = new PersonModel();
|
||||||
|
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getBasicData()
|
public String getBasicData() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Map<String, Object> condition = pageUtil.getAdvSearch();
|
Map<String, Object> condition = pageUtil.getAdvSearch();
|
||||||
condition.put("Id_s_order", "asc");
|
condition.put("Id_s_order", "asc");
|
||||||
personService.find(pageUtil);
|
personService.find(pageUtil);
|
||||||
mapData.put("personList", pageUtil.getPageList());
|
mapData.put("personList", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exceptoin");
|
model.getShowModel().setMsgTip("exceptoin");
|
||||||
}
|
}
|
||||||
@@ -49,22 +45,18 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public String getPersonByType()
|
public String getPersonByType() {
|
||||||
{
|
|
||||||
Map<String, List> mapData = model.getShowModel().getMap();
|
Map<String, List> mapData = model.getShowModel().getMap();
|
||||||
PageUtil pageUtil = new PageUtil();
|
PageUtil pageUtil = new PageUtil();
|
||||||
pageUtil.setPageSize(0);
|
pageUtil.setPageSize(0);
|
||||||
pageUtil.setCurPage(0);
|
pageUtil.setCurPage(0);
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Map<String, Object> condition = pageUtil.getAdvSearch();
|
Map<String, Object> condition = pageUtil.getAdvSearch();
|
||||||
condition.put("Type_s_eq", model.getType());
|
condition.put("Type_s_eq", model.getType());
|
||||||
condition.put("Id_s_order", "asc");
|
condition.put("Id_s_order", "asc");
|
||||||
personService.find(pageUtil);
|
personService.find(pageUtil);
|
||||||
mapData.put("personList", pageUtil.getPageList());
|
mapData.put("personList", pageUtil.getPageList());
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
|
||||||
model.getShowModel().setMsgTip("exceptoin");
|
model.getShowModel().setMsgTip("exceptoin");
|
||||||
}
|
}
|
||||||
@@ -73,6 +65,7 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据类型获取经手人信息 1-业务员,2-仓管员,3-财务员
|
* 根据类型获取经手人信息 1-业务员,2-仓管员,3-财务员
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void getPersonByNumType() {
|
public void getPersonByNumType() {
|
||||||
@@ -84,11 +77,9 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
String type = "";
|
String type = "";
|
||||||
if (model.getType().equals("1")) {
|
if (model.getType().equals("1")) {
|
||||||
type = "业务员";
|
type = "业务员";
|
||||||
}
|
} else if (model.getType().equals("2")) {
|
||||||
else if(model.getType().equals("2")){
|
|
||||||
type = "仓管员";
|
type = "仓管员";
|
||||||
}
|
} else if (model.getType().equals("3")) {
|
||||||
else if(model.getType().equals("3")){
|
|
||||||
type = "财务员";
|
type = "财务员";
|
||||||
}
|
}
|
||||||
condition.put("Type_s_eq", type);
|
condition.put("Type_s_eq", type);
|
||||||
@@ -106,17 +97,16 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(dataArray.toString());
|
toClient(dataArray.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据Id获取经手人信息
|
* 根据Id获取经手人信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void getPersonByIds() {
|
public void getPersonByIds() {
|
||||||
@@ -137,25 +127,22 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
}
|
}
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(sb.toString());
|
toClient(sb.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
|
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
Log.errorFileSync(">>>>>>>>>回写查询信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>回写查询信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加经手人
|
* 增加经手人
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void create()
|
public void create() {
|
||||||
{
|
|
||||||
Log.infoFileSync("==================开始调用增加经手人信息方法create()===================");
|
Log.infoFileSync("==================开始调用增加经手人信息方法create()===================");
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Person person = new Person();
|
Person person = new Person();
|
||||||
|
|
||||||
person.setType(model.getType());
|
person.setType(model.getType());
|
||||||
@@ -167,22 +154,15 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加经手人信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加经手人信息异常", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>增加经手人信息回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>增加经手人信息回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -195,19 +175,16 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除经手人
|
* 删除经手人
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String delete()
|
public String delete() {
|
||||||
{
|
|
||||||
Log.infoFileSync("====================开始调用删除经手人信息方法delete()================");
|
Log.infoFileSync("====================开始调用删除经手人信息方法delete()================");
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
personService.delete(model.getPersonID());
|
personService.delete(model.getPersonID());
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getPersonID() + " 的经手人异常", e);
|
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getPersonID() + " 的经手人异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -222,13 +199,12 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新经手人
|
* 更新经手人
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void update()
|
public void update() {
|
||||||
{
|
|
||||||
Boolean flag = false;
|
Boolean flag = false;
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
Person person = personService.get(model.getPersonID());
|
Person person = personService.get(model.getPersonID());
|
||||||
|
|
||||||
person.setType(model.getType());
|
person.setType(model.getType());
|
||||||
@@ -238,22 +214,15 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
flag = true;
|
flag = true;
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>修改经手人ID为 : " + model.getPersonID() + "信息失败", e);
|
Log.errorFileSync(">>>>>>>>>>>>>修改经手人ID为 : " + model.getPersonID() + "信息失败", e);
|
||||||
flag = false;
|
flag = false;
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
}
|
} finally {
|
||||||
finally
|
try {
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
toClient(flag.toString());
|
toClient(flag.toString());
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>修改经手人回写客户端结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>修改经手人回写客户端结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -264,20 +233,17 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除指定ID经手人
|
* 批量删除指定ID经手人
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String batchDelete()
|
public String batchDelete() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
personService.batchDelete(model.getPersonIDs());
|
personService.batchDelete(model.getPersonIDs());
|
||||||
model.getShowModel().setMsgTip("成功");
|
model.getShowModel().setMsgTip("成功");
|
||||||
//记录操作日志使用
|
//记录操作日志使用
|
||||||
tipMsg = "成功";
|
tipMsg = "成功";
|
||||||
tipType = 0;
|
tipType = 0;
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>批量删除经手人ID为:" + model.getPersonIDs() + "信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>批量删除经手人ID为:" + model.getPersonIDs() + "信息异常", e);
|
||||||
tipMsg = "失败";
|
tipMsg = "失败";
|
||||||
tipType = 1;
|
tipType = 1;
|
||||||
@@ -291,12 +257,11 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找经手人信息
|
* 查找经手人信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public void findBy()
|
public void findBy() {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
PageUtil<Person> pageUtil = new PageUtil<Person>();
|
PageUtil<Person> pageUtil = new PageUtil<Person>();
|
||||||
pageUtil.setPageSize(model.getPageSize());
|
pageUtil.setPageSize(model.getPageSize());
|
||||||
pageUtil.setCurPage(model.getPageNo());
|
pageUtil.setCurPage(model.getPageNo());
|
||||||
@@ -308,10 +273,8 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
outer.put("total", pageUtil.getTotalCount());
|
outer.put("total", pageUtil.getTotalCount());
|
||||||
//存放数据json数组
|
//存放数据json数组
|
||||||
JSONArray dataArray = new JSONArray();
|
JSONArray dataArray = new JSONArray();
|
||||||
if(null != dataList)
|
if (null != dataList) {
|
||||||
{
|
for (Person person : dataList) {
|
||||||
for(Person person:dataList)
|
|
||||||
{
|
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", person.getId());
|
item.put("Id", person.getId());
|
||||||
item.put("Type", person.getType());
|
item.put("Type", person.getType());
|
||||||
@@ -323,23 +286,19 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
outer.put("rows", dataArray);
|
outer.put("rows", dataArray);
|
||||||
//回写查询结果
|
//回写查询结果
|
||||||
toClient(outer.toString());
|
toClient(outer.toString());
|
||||||
}
|
} catch (DataAccessException e) {
|
||||||
catch (DataAccessException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找经手人信息异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找经手人信息异常", e);
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询经手人信息结果异常", e);
|
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询经手人信息结果异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private Map<String,Object> getCondition()
|
private Map<String, Object> getCondition() {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 拼接搜索条件
|
* 拼接搜索条件
|
||||||
*/
|
*/
|
||||||
@@ -351,12 +310,11 @@ public class PersonAction extends BaseAction<PersonModel>
|
|||||||
|
|
||||||
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
//=============以下spring注入以及Model驱动公共方法,与Action处理无关==================
|
||||||
@Override
|
@Override
|
||||||
public PersonModel getModel()
|
public PersonModel getModel() {
|
||||||
{
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
public void setPersonService(PersonIService personService)
|
|
||||||
{
|
public void setPersonService(PersonIService personService) {
|
||||||
this.personService = personService;
|
this.personService = personService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,26 +1,25 @@
|
|||||||
package com.jsh.base;
|
package com.jsh.base;
|
||||||
|
|
||||||
import java.io.IOException;
|
import com.jsh.model.po.Basicuser;
|
||||||
import java.util.Map;
|
import com.jsh.service.basic.LogIService;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
|
|
||||||
import org.apache.struts2.ServletActionContext;
|
|
||||||
|
|
||||||
import com.opensymphony.xwork2.ActionContext;
|
import com.opensymphony.xwork2.ActionContext;
|
||||||
import com.opensymphony.xwork2.ActionSupport;
|
import com.opensymphony.xwork2.ActionSupport;
|
||||||
import com.opensymphony.xwork2.ModelDriven;
|
import com.opensymphony.xwork2.ModelDriven;
|
||||||
import com.jsh.model.po.Basicuser;
|
import org.apache.struts2.ServletActionContext;
|
||||||
import com.jsh.service.basic.LogIService;
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struts2工具类
|
* struts2工具类
|
||||||
|
*
|
||||||
* @author jishenghua qq752718920
|
* @author jishenghua qq752718920
|
||||||
* struts2 base action 一些常用方法获取
|
* struts2 base action 一些常用方法获取
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public abstract class BaseAction<T> extends ActionSupport implements ModelDriven<T>
|
public abstract class BaseAction<T> extends ActionSupport implements ModelDriven<T> {
|
||||||
{
|
|
||||||
public LogIService logService;
|
public LogIService logService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -33,82 +32,82 @@ public abstract class BaseAction<T> extends ActionSupport implements ModelDriven
|
|||||||
*/
|
*/
|
||||||
public short tipType = 0;
|
public short tipType = 0;
|
||||||
|
|
||||||
public void setLogService(LogIService logService)
|
|
||||||
{
|
|
||||||
this.logService = logService;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取session
|
* 获取session
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static Map<String,Object> getSession()
|
public static Map<String, Object> getSession() {
|
||||||
{
|
|
||||||
return ActionContext.getContext().getSession();
|
return ActionContext.getContext().getSession();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取request
|
* 获取request
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static HttpServletRequest getRequest()
|
public static HttpServletRequest getRequest() {
|
||||||
{
|
|
||||||
return ServletActionContext.getRequest();
|
return ServletActionContext.getRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取response
|
* 获取response
|
||||||
|
*
|
||||||
* @return response
|
* @return response
|
||||||
*/
|
*/
|
||||||
public static HttpServletResponse getResponse()
|
public static HttpServletResponse getResponse() {
|
||||||
{
|
|
||||||
return ServletActionContext.getResponse();
|
return ServletActionContext.getResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setLogService(LogIService logService) {
|
||||||
|
this.logService = logService;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加错误信息
|
* 添加错误信息
|
||||||
|
*
|
||||||
* @param anErrorMessage
|
* @param anErrorMessage
|
||||||
*/
|
*/
|
||||||
public void addActionError(String anErrorMessage)
|
public void addActionError(String anErrorMessage) {
|
||||||
{
|
|
||||||
super.addActionError(anErrorMessage);
|
super.addActionError(anErrorMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加消息
|
* 添加消息
|
||||||
|
*
|
||||||
* @param aMessage
|
* @param aMessage
|
||||||
*/
|
*/
|
||||||
public void addActionMessage(String aMessage)
|
public void addActionMessage(String aMessage) {
|
||||||
{
|
|
||||||
clearErrorsAndMessages();
|
clearErrorsAndMessages();
|
||||||
super.addActionMessage(aMessage);
|
super.addActionMessage(aMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加字段错误
|
* 添加字段错误
|
||||||
|
*
|
||||||
* @param fieldName
|
* @param fieldName
|
||||||
* @param errorMessage
|
* @param errorMessage
|
||||||
*/
|
*/
|
||||||
public void addFieldError(String fieldName, String errorMessage)
|
public void addFieldError(String fieldName, String errorMessage) {
|
||||||
{
|
|
||||||
clearErrorsAndMessages();
|
clearErrorsAndMessages();
|
||||||
super.addFieldError(fieldName, errorMessage);
|
super.addFieldError(fieldName, errorMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 登录用户信息
|
* 登录用户信息
|
||||||
|
*
|
||||||
* @return 登录用户对象
|
* @return 登录用户对象
|
||||||
*/
|
*/
|
||||||
public Basicuser getUser()
|
public Basicuser getUser() {
|
||||||
{
|
|
||||||
return (Basicuser) getSession().get("user");
|
return (Basicuser) getSession().get("user");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 回写客户端数据
|
* 回写客户端数据
|
||||||
|
*
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
*/
|
*/
|
||||||
public void toClient(String jsonData) throws IOException
|
public void toClient(String jsonData) throws IOException {
|
||||||
{
|
|
||||||
HttpServletResponse response = ServletActionContext.getResponse();
|
HttpServletResponse response = ServletActionContext.getResponse();
|
||||||
response.setContentType("text/html;charset=utf-8");
|
response.setContentType("text/html;charset=utf-8");
|
||||||
response.getWriter().print(jsonData);
|
response.getWriter().print(jsonData);
|
||||||
|
|||||||
@@ -1,67 +1,59 @@
|
|||||||
package com.jsh.base;
|
package com.jsh.base;
|
||||||
|
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import com.jsh.util.SearchConditionUtil;
|
||||||
|
import org.hibernate.Query;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.hibernate.Query;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
|
|
||||||
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
import com.jsh.util.SearchConditionUtil;
|
|
||||||
/**
|
/**
|
||||||
* 基础dao
|
* 基础dao
|
||||||
|
*
|
||||||
* @author ji_sheng_hua qq:752718920
|
* @author ji_sheng_hua qq:752718920
|
||||||
*/
|
*/
|
||||||
public class BaseDAO<T> extends HibernateDaoSupport implements BaseIDAO<T>
|
public class BaseDAO<T> extends HibernateDaoSupport implements BaseIDAO<T> {
|
||||||
{
|
|
||||||
protected Class<T> entityClass;
|
protected Class<T> entityClass;
|
||||||
|
|
||||||
public void setPoJoClass(Class<T> c)
|
public void setPoJoClass(Class<T> c) {
|
||||||
{
|
|
||||||
this.entityClass = c;
|
this.entityClass = c;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Class<T> getEntityClass()
|
protected Class<T> getEntityClass() {
|
||||||
{
|
|
||||||
return this.entityClass;
|
return this.entityClass;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Serializable create(T t) throws DataAccessException
|
public Serializable create(T t) throws DataAccessException {
|
||||||
{
|
|
||||||
return this.getHibernateTemplate().save(t);
|
return this.getHibernateTemplate().save(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void delete(T t) throws DataAccessException
|
public void delete(T t) throws DataAccessException {
|
||||||
{
|
|
||||||
this.getHibernateTemplate().delete(t);
|
this.getHibernateTemplate().delete(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public T get(Long objID) throws DataAccessException
|
public T get(Long objID) throws DataAccessException {
|
||||||
{
|
|
||||||
return (T) this.getHibernateTemplate().get(getEntityClass(), objID);
|
return (T) this.getHibernateTemplate().get(getEntityClass(), objID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update(T t) throws DataAccessException
|
public void update(T t) throws DataAccessException {
|
||||||
{
|
|
||||||
this.getHibernateTemplate().update(t);
|
this.getHibernateTemplate().update(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void batchDelete(String objIDs) throws DataAccessException
|
public void batchDelete(String objIDs) throws DataAccessException {
|
||||||
{
|
|
||||||
this.getHibernateTemplate().bulkUpdate("delete from " + getEntityClass().getName() + " where id in (" + objIDs + ")");
|
this.getHibernateTemplate().bulkUpdate("delete from " + getEntityClass().getName() + " where id in (" + objIDs + ")");
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public void find(PageUtil<T> pageUtil) throws DataAccessException
|
public void find(PageUtil<T> pageUtil) throws DataAccessException {
|
||||||
{
|
|
||||||
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession()
|
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession()
|
||||||
.createQuery(" from " + getEntityClass().getName() + " where 1=1 " +
|
.createQuery(" from " + getEntityClass().getName() + " where 1=1 " +
|
||||||
SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
@@ -70,8 +62,7 @@ public class BaseDAO<T> extends HibernateDaoSupport implements BaseIDAO<T>
|
|||||||
// 分页查询
|
// 分页查询
|
||||||
int pageNo = pageUtil.getCurPage();
|
int pageNo = pageUtil.getCurPage();
|
||||||
int pageSize = pageUtil.getPageSize();
|
int pageSize = pageUtil.getPageSize();
|
||||||
if (0 != pageNo && 0 != pageSize)
|
if (0 != pageNo && 0 != pageSize) {
|
||||||
{
|
|
||||||
query.setFirstResult((pageNo - 1) * pageSize);
|
query.setFirstResult((pageNo - 1) * pageSize);
|
||||||
query.setMaxResults(pageSize);
|
query.setMaxResults(pageSize);
|
||||||
}
|
}
|
||||||
@@ -94,8 +85,7 @@ public class BaseDAO<T> extends HibernateDaoSupport implements BaseIDAO<T>
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public List<T> find(Map<String, Object> conditon, int pageSize, int pageNo)throws DataAccessException
|
public List<T> find(Map<String, Object> conditon, int pageSize, int pageNo) throws DataAccessException {
|
||||||
{
|
|
||||||
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession()
|
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession()
|
||||||
.createQuery(" from " + getEntityClass().getName() + " where 1=1 " + SearchConditionUtil.getCondition(conditon));
|
.createQuery(" from " + getEntityClass().getName() + " where 1=1 " + SearchConditionUtil.getCondition(conditon));
|
||||||
query.setFirstResult((pageNo - 1) * pageSize);
|
query.setFirstResult((pageNo - 1) * pageSize);
|
||||||
@@ -105,8 +95,7 @@ public class BaseDAO<T> extends HibernateDaoSupport implements BaseIDAO<T>
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public List<T> find(String hql, int pageSize, int pageNo)throws DataAccessException
|
public List<T> find(String hql, int pageSize, int pageNo) throws DataAccessException {
|
||||||
{
|
|
||||||
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession()
|
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession()
|
||||||
.createQuery(" from " + getEntityClass().getName() + " where 1=1 " + hql);
|
.createQuery(" from " + getEntityClass().getName() + " where 1=1 " + hql);
|
||||||
query.setFirstResult((pageNo - 1) * pageSize);
|
query.setFirstResult((pageNo - 1) * pageSize);
|
||||||
@@ -116,8 +105,7 @@ public class BaseDAO<T> extends HibernateDaoSupport implements BaseIDAO<T>
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public Integer countSum(Map<String, Object> conditon)throws DataAccessException
|
public Integer countSum(Map<String, Object> conditon) throws DataAccessException {
|
||||||
{
|
|
||||||
List<T> dataList = this.getHibernateTemplate().getSessionFactory().getCurrentSession()
|
List<T> dataList = this.getHibernateTemplate().getSessionFactory().getCurrentSession()
|
||||||
.createQuery(" from " + getEntityClass().getName() + " where 1=1 " + SearchConditionUtil.getCondition(conditon)).list();
|
.createQuery(" from " + getEntityClass().getName() + " where 1=1 " + SearchConditionUtil.getCondition(conditon)).list();
|
||||||
return dataList == null ? 0 : dataList.size();
|
return dataList == null ? 0 : dataList.size();
|
||||||
@@ -125,16 +113,14 @@ public class BaseDAO<T> extends HibernateDaoSupport implements BaseIDAO<T>
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public Integer countSum(String hql) throws DataAccessException
|
public Integer countSum(String hql) throws DataAccessException {
|
||||||
{
|
|
||||||
List<T> dataList = this.getHibernateTemplate().getSessionFactory().getCurrentSession()
|
List<T> dataList = this.getHibernateTemplate().getSessionFactory().getCurrentSession()
|
||||||
.createQuery(" from " + getEntityClass().getName() + " where 1=1 " + hql).list();
|
.createQuery(" from " + getEntityClass().getName() + " where 1=1 " + hql).list();
|
||||||
return dataList == null ? 0 : dataList.size();
|
return dataList == null ? 0 : dataList.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void save(T t) throws DataAccessException
|
public void save(T t) throws DataAccessException {
|
||||||
{
|
|
||||||
this.getHibernateTemplate().save(t);
|
this.getHibernateTemplate().save(t);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,29 +1,30 @@
|
|||||||
package com.jsh.base;
|
package com.jsh.base;
|
||||||
|
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 常用增删改查操作
|
* 常用增删改查操作
|
||||||
* @author ji-sheng-hua qq752718920
|
*
|
||||||
* @param <T>
|
* @param <T>
|
||||||
|
* @author ji-sheng-hua qq752718920
|
||||||
*/
|
*/
|
||||||
public interface BaseIDAO<T>
|
public interface BaseIDAO<T> {
|
||||||
{
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置操作类对象
|
* 设置操作类对象
|
||||||
|
*
|
||||||
* @param paramClass
|
* @param paramClass
|
||||||
*/
|
*/
|
||||||
void setPoJoClass(Class<T> paramClass);
|
void setPoJoClass(Class<T> paramClass);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加
|
* 增加
|
||||||
|
*
|
||||||
* @param t 对象
|
* @param t 对象
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -31,6 +32,7 @@ public interface BaseIDAO<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加
|
* 增加
|
||||||
|
*
|
||||||
* @param t 对象
|
* @param t 对象
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -38,6 +40,7 @@ public interface BaseIDAO<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除
|
* 删除
|
||||||
|
*
|
||||||
* @param t 对象
|
* @param t 对象
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -45,6 +48,7 @@ public interface BaseIDAO<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取
|
* 获取
|
||||||
|
*
|
||||||
* @param objID ID
|
* @param objID ID
|
||||||
* @return 对象
|
* @return 对象
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
@@ -53,6 +57,7 @@ public interface BaseIDAO<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改信息
|
* 修改信息
|
||||||
|
*
|
||||||
* @param t 要修改的对象
|
* @param t 要修改的对象
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -60,6 +65,7 @@ public interface BaseIDAO<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除信息
|
* 批量删除信息
|
||||||
|
*
|
||||||
* @param 以逗号分割的ID
|
* @param 以逗号分割的ID
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -67,6 +73,7 @@ public interface BaseIDAO<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找列表
|
* 查找列表
|
||||||
|
*
|
||||||
* @param pageUtil 分页工具类
|
* @param pageUtil 分页工具类
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -88,6 +95,7 @@ public interface BaseIDAO<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据搜索条件查询--分页
|
* 根据搜索条件查询--分页
|
||||||
|
*
|
||||||
* @param conditon 查询条件
|
* @param conditon 查询条件
|
||||||
* @param pageSize 每页个数
|
* @param pageSize 每页个数
|
||||||
* @param pageNo 页码
|
* @param pageNo 页码
|
||||||
@@ -98,6 +106,7 @@ public interface BaseIDAO<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据hql查询--分页
|
* 根据hql查询--分页
|
||||||
|
*
|
||||||
* @param hql hibernate查询语句
|
* @param hql hibernate查询语句
|
||||||
* @param pageSize 每页个数
|
* @param pageSize 每页个数
|
||||||
* @param pageNo 页码
|
* @param pageNo 页码
|
||||||
@@ -108,6 +117,7 @@ public interface BaseIDAO<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找符合条件的总数
|
* 查找符合条件的总数
|
||||||
|
*
|
||||||
* @param conditon
|
* @param conditon
|
||||||
* @return
|
* @return
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
@@ -116,6 +126,7 @@ public interface BaseIDAO<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找符合条件的总数
|
* 查找符合条件的总数
|
||||||
|
*
|
||||||
* @param hql
|
* @param hql
|
||||||
* @return
|
* @return
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
|
|||||||
@@ -1,19 +1,20 @@
|
|||||||
package com.jsh.base;
|
package com.jsh.base;
|
||||||
|
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
/**
|
/**
|
||||||
* 服务层底层接口
|
* 服务层底层接口
|
||||||
* @author ji-sheng-hua qq752718920
|
*
|
||||||
* @param <T>
|
* @param <T>
|
||||||
|
* @author ji-sheng-hua qq752718920
|
||||||
*/
|
*/
|
||||||
public interface BaseIService<T>
|
public interface BaseIService<T> {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 增加
|
* 增加
|
||||||
|
*
|
||||||
* @param t 对象
|
* @param t 对象
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -21,6 +22,7 @@ public interface BaseIService<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 增加
|
* 增加
|
||||||
|
*
|
||||||
* @param t 对象
|
* @param t 对象
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -28,6 +30,7 @@ public interface BaseIService<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除
|
* 删除
|
||||||
|
*
|
||||||
* @param t 对象
|
* @param t 对象
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -35,6 +38,7 @@ public interface BaseIService<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除
|
* 删除
|
||||||
|
*
|
||||||
* @param id 对象ID
|
* @param id 对象ID
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -42,6 +46,7 @@ public interface BaseIService<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取
|
* 获取
|
||||||
|
*
|
||||||
* @param objID ID
|
* @param objID ID
|
||||||
* @return 对象
|
* @return 对象
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
@@ -50,6 +55,7 @@ public interface BaseIService<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改信息
|
* 修改信息
|
||||||
|
*
|
||||||
* @param t 要修改的对象
|
* @param t 要修改的对象
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -57,6 +63,7 @@ public interface BaseIService<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除信息
|
* 批量删除信息
|
||||||
|
*
|
||||||
* @param 以逗号分割的ID
|
* @param 以逗号分割的ID
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -64,6 +71,7 @@ public interface BaseIService<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查找列表
|
* 查找列表
|
||||||
|
*
|
||||||
* @param pageUtil 分页工具类
|
* @param pageUtil 分页工具类
|
||||||
* @throws DataAccessException
|
* @throws DataAccessException
|
||||||
*/
|
*/
|
||||||
@@ -71,6 +79,7 @@ public interface BaseIService<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 检查名称是否存在,页面唯一性效验使用
|
* 检查名称是否存在,页面唯一性效验使用
|
||||||
|
*
|
||||||
* @param filedName 效验的字段名称
|
* @param filedName 效验的字段名称
|
||||||
* @param filedVale 校验值
|
* @param filedVale 校验值
|
||||||
* @param idFiled ID字段名称
|
* @param idFiled ID字段名称
|
||||||
@@ -82,6 +91,7 @@ public interface BaseIService<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 检查UserBusiness是否存在,页面唯一性效验使用
|
* 检查UserBusiness是否存在,页面唯一性效验使用
|
||||||
|
*
|
||||||
* @param TypeName 类型名称
|
* @param TypeName 类型名称
|
||||||
* @param TypeVale 类型值
|
* @param TypeVale 类型值
|
||||||
* @param KeyIdName 关键id
|
* @param KeyIdName 关键id
|
||||||
@@ -95,6 +105,7 @@ public interface BaseIService<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 检查UserBusiness是否存在,页面唯一性效验使用
|
* 检查UserBusiness是否存在,页面唯一性效验使用
|
||||||
|
*
|
||||||
* @param TypeName 类型名称
|
* @param TypeName 类型名称
|
||||||
* @param TypeVale 类型值
|
* @param TypeVale 类型值
|
||||||
* @param KeyIdName 关键id
|
* @param KeyIdName 关键id
|
||||||
@@ -105,5 +116,4 @@ public interface BaseIService<T>
|
|||||||
Boolean checkIsValueExist(String TypeName, String TypeVale, String KeyIdName, String KeyIdValue) throws DataAccessException;
|
Boolean checkIsValueExist(String TypeName, String TypeVale, String KeyIdName, String KeyIdValue) throws DataAccessException;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,98 +1,83 @@
|
|||||||
package com.jsh.base;
|
package com.jsh.base;
|
||||||
|
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import org.springframework.dao.DataAccessException;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
|
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.Basicuser;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
/**
|
/**
|
||||||
* 底层服务层
|
* 底层服务层
|
||||||
* @author ji-sheng-hua qq752718920
|
*
|
||||||
* @param <T>
|
* @param <T>
|
||||||
|
* @author ji-sheng-hua qq752718920
|
||||||
*/
|
*/
|
||||||
public abstract class BaseService<T> implements BaseIService<T>
|
public abstract class BaseService<T> implements BaseIService<T> {
|
||||||
{
|
protected Class<T> entityClass;
|
||||||
/**
|
/**
|
||||||
* Dao对象
|
* Dao对象
|
||||||
*/
|
*/
|
||||||
private BaseIDAO<T> baseDao;
|
private BaseIDAO<T> baseDao;
|
||||||
|
|
||||||
protected Class<T> entityClass;
|
protected BaseIDAO<T> getBaseDao() {
|
||||||
|
return this.baseDao;
|
||||||
|
}
|
||||||
|
|
||||||
public void setBaseDao(BaseIDAO<T> baseDao)
|
public void setBaseDao(BaseIDAO<T> baseDao) {
|
||||||
{
|
|
||||||
this.baseDao = baseDao;
|
this.baseDao = baseDao;
|
||||||
setPoJoClass(getEntityClass());
|
setPoJoClass(getEntityClass());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected BaseIDAO<T> getBaseDao()
|
private void setPoJoClass(Class<T> c) {
|
||||||
{
|
|
||||||
return this.baseDao;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setPoJoClass(Class<T> c)
|
|
||||||
{
|
|
||||||
this.baseDao.setPoJoClass(c);
|
this.baseDao.setPoJoClass(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract Class<T> getEntityClass();
|
protected abstract Class<T> getEntityClass();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Serializable create(T t) throws DataAccessException
|
public Serializable create(T t) throws DataAccessException {
|
||||||
{
|
|
||||||
return baseDao.create(t);
|
return baseDao.create(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void save(T t) throws DataAccessException
|
public void save(T t) throws DataAccessException {
|
||||||
{
|
|
||||||
baseDao.save(t);
|
baseDao.save(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void delete(T t) throws DataAccessException
|
public void delete(T t) throws DataAccessException {
|
||||||
{
|
|
||||||
baseDao.delete(t);
|
baseDao.delete(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void delete(Long id) throws DataAccessException
|
public void delete(Long id) throws DataAccessException {
|
||||||
{
|
|
||||||
baseDao.batchDelete(id.toString());
|
baseDao.batchDelete(id.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public T get(Long objID) throws DataAccessException
|
public T get(Long objID) throws DataAccessException {
|
||||||
{
|
|
||||||
return baseDao.get(objID);
|
return baseDao.get(objID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update(T t) throws DataAccessException
|
public void update(T t) throws DataAccessException {
|
||||||
{
|
|
||||||
baseDao.update(t);
|
baseDao.update(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void batchDelete(String objIDs) throws DataAccessException
|
public void batchDelete(String objIDs) throws DataAccessException {
|
||||||
{
|
|
||||||
baseDao.batchDelete(objIDs);
|
baseDao.batchDelete(objIDs);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void find(PageUtil<T> pageUtil) throws DataAccessException
|
public void find(PageUtil<T> pageUtil) throws DataAccessException {
|
||||||
{
|
|
||||||
baseDao.find(pageUtil);
|
baseDao.find(pageUtil);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean checkIsNameExist(String filedName, String filedVale,String idFiled,Long objectID) throws DataAccessException
|
public Boolean checkIsNameExist(String filedName, String filedVale, String idFiled, Long objectID) throws DataAccessException {
|
||||||
{
|
|
||||||
PageUtil<T> pageUtil = new PageUtil<T>();
|
PageUtil<T> pageUtil = new PageUtil<T>();
|
||||||
Map<String, Object> condition = new HashMap<String, Object>();
|
Map<String, Object> condition = new HashMap<String, Object>();
|
||||||
condition.put(filedName + "_s_eq", filedVale);
|
condition.put(filedName + "_s_eq", filedVale);
|
||||||
@@ -107,8 +92,7 @@ public abstract class BaseService<T> implements BaseIService<T>
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean checkIsUserBusinessExist(String TypeName,String TypeVale,String KeyIdName,String KeyIdValue,String UBName,String UBValue) throws DataAccessException
|
public Boolean checkIsUserBusinessExist(String TypeName, String TypeVale, String KeyIdName, String KeyIdValue, String UBName, String UBValue) throws DataAccessException {
|
||||||
{
|
|
||||||
PageUtil<T> pageUtil = new PageUtil<T>();
|
PageUtil<T> pageUtil = new PageUtil<T>();
|
||||||
Map<String, Object> condition = new HashMap<String, Object>();
|
Map<String, Object> condition = new HashMap<String, Object>();
|
||||||
condition.put(TypeName + "_s_eq", TypeVale);
|
condition.put(TypeName + "_s_eq", TypeVale);
|
||||||
@@ -124,8 +108,7 @@ public abstract class BaseService<T> implements BaseIService<T>
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean checkIsValueExist(String TypeName, String TypeVale, String KeyIdName, String KeyIdValue) throws DataAccessException
|
public Boolean checkIsValueExist(String TypeName, String TypeVale, String KeyIdName, String KeyIdValue) throws DataAccessException {
|
||||||
{
|
|
||||||
PageUtil<T> pageUtil = new PageUtil<T>();
|
PageUtil<T> pageUtil = new PageUtil<T>();
|
||||||
Map<String, Object> condition = new HashMap<String, Object>();
|
Map<String, Object> condition = new HashMap<String, Object>();
|
||||||
condition.put(TypeName + "_s_eq", TypeVale);
|
condition.put(TypeName + "_s_eq", TypeVale);
|
||||||
|
|||||||
@@ -4,159 +4,150 @@ import org.apache.log4j.Logger;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 封装log4j日志信息,打印日志信息类
|
* 封装log4j日志信息,打印日志信息类
|
||||||
|
*
|
||||||
* @author ji/sheng/hua qq_7527.18920
|
* @author ji/sheng/hua qq_7527.18920
|
||||||
* @since 2014-01-22
|
* @since 2014-01-22
|
||||||
*/
|
*/
|
||||||
public class Log
|
public class Log {
|
||||||
{
|
/**
|
||||||
|
* Info级别日志前缀
|
||||||
|
*/
|
||||||
|
public static final String LOG_INFO_PREFIX = "==========";
|
||||||
|
/**
|
||||||
|
* error级别日志前缀
|
||||||
|
*/
|
||||||
|
public static final String LOG_ERROR_PREFIX = ">>>>>>>>>>";
|
||||||
|
/**
|
||||||
|
* debug级别日志前缀
|
||||||
|
*/
|
||||||
|
public static final String LOG_DEBUG_PREFIX = "-----------";
|
||||||
|
/**
|
||||||
|
* fatal级别日志前缀
|
||||||
|
*/
|
||||||
|
public static final String LOG_FATAL_PREFIX = "$$$$$$$$$$";
|
||||||
|
/**
|
||||||
|
* warn级别日志前缀
|
||||||
|
*/
|
||||||
|
public static final String LOG_WARN_PREFIX = "##########";
|
||||||
/**
|
/**
|
||||||
* 根据异常信息获取调用类的信息
|
* 根据异常信息获取调用类的信息
|
||||||
*/
|
*/
|
||||||
private static final Exception ex = new Exception();
|
private static final Exception ex = new Exception();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取Log4j实例
|
* 获取Log4j实例
|
||||||
*/
|
*/
|
||||||
private static final Logger log = Logger.getLogger("jsh");
|
private static final Logger log = Logger.getLogger("jsh");
|
||||||
|
|
||||||
/**
|
|
||||||
* Info级别日志前缀
|
|
||||||
*/
|
|
||||||
public static final String LOG_INFO_PREFIX = "==========";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* error级别日志前缀
|
|
||||||
*/
|
|
||||||
public static final String LOG_ERROR_PREFIX = ">>>>>>>>>>";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* debug级别日志前缀
|
|
||||||
*/
|
|
||||||
public static final String LOG_DEBUG_PREFIX = "-----------";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* fatal级别日志前缀
|
|
||||||
*/
|
|
||||||
public static final String LOG_FATAL_PREFIX = "$$$$$$$$$$";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* warn级别日志前缀
|
|
||||||
*/
|
|
||||||
public static final String LOG_WARN_PREFIX = "##########";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打印deug日期信息
|
* 打印deug日期信息
|
||||||
|
*
|
||||||
* @param msg 日志信息
|
* @param msg 日志信息
|
||||||
*/
|
*/
|
||||||
public static void debugFileSync(Object msg)
|
public static void debugFileSync(Object msg) {
|
||||||
{
|
|
||||||
log.debug(getLogDetail(msg));
|
log.debug(getLogDetail(msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打印debug异常信息
|
* 打印debug异常信息
|
||||||
|
*
|
||||||
* @param msg 日志信息
|
* @param msg 日志信息
|
||||||
* @param e 异常堆栈
|
* @param e 异常堆栈
|
||||||
*/
|
*/
|
||||||
public static void debugFileSync(Object msg, Throwable e)
|
public static void debugFileSync(Object msg, Throwable e) {
|
||||||
{
|
|
||||||
log.debug(getLogDetail(msg), e);
|
log.debug(getLogDetail(msg), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打印info日志信息
|
* 打印info日志信息
|
||||||
|
*
|
||||||
* @param msg 日志信息
|
* @param msg 日志信息
|
||||||
*/
|
*/
|
||||||
public static void infoFileSync(Object msg)
|
public static void infoFileSync(Object msg) {
|
||||||
{
|
|
||||||
log.info(getLogDetail(msg));
|
log.info(getLogDetail(msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打印 info日志带异常信息
|
* 打印 info日志带异常信息
|
||||||
|
*
|
||||||
* @param msg 日志信息
|
* @param msg 日志信息
|
||||||
* @param e 异常堆栈
|
* @param e 异常堆栈
|
||||||
*/
|
*/
|
||||||
public static void infoFileSync(Object msg, Throwable e)
|
public static void infoFileSync(Object msg, Throwable e) {
|
||||||
{
|
|
||||||
log.info(getLogDetail(msg), e);
|
log.info(getLogDetail(msg), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打印warn日期信息
|
* 打印warn日期信息
|
||||||
|
*
|
||||||
* @param msg 日志信息
|
* @param msg 日志信息
|
||||||
*/
|
*/
|
||||||
public static void warnFileSync(Object msg)
|
public static void warnFileSync(Object msg) {
|
||||||
{
|
|
||||||
log.warn(getLogDetail(msg));
|
log.warn(getLogDetail(msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打印warn日志信息带异常
|
* 打印warn日志信息带异常
|
||||||
|
*
|
||||||
* @param msg日志信息
|
* @param msg日志信息
|
||||||
* @param e 异常堆栈
|
* @param e 异常堆栈
|
||||||
*/
|
*/
|
||||||
public static void warnFileSync(Object msg, Throwable e)
|
public static void warnFileSync(Object msg, Throwable e) {
|
||||||
{
|
|
||||||
log.warn(getLogDetail(msg), e);
|
log.warn(getLogDetail(msg), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打印error日志信息
|
* 打印error日志信息
|
||||||
|
*
|
||||||
* @param msg 日志信息
|
* @param msg 日志信息
|
||||||
*/
|
*/
|
||||||
public static void errorFileSync(Object msg)
|
public static void errorFileSync(Object msg) {
|
||||||
{
|
|
||||||
log.error(getLogDetail(msg));
|
log.error(getLogDetail(msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打印error日志信息带异常
|
* 打印error日志信息带异常
|
||||||
|
*
|
||||||
* @param msg 日志信息
|
* @param msg 日志信息
|
||||||
* @param e 异常堆栈
|
* @param e 异常堆栈
|
||||||
*/
|
*/
|
||||||
public static void errorFileSync(Object msg, Throwable e)
|
public static void errorFileSync(Object msg, Throwable e) {
|
||||||
{
|
|
||||||
log.error(getLogDetail(msg), e);
|
log.error(getLogDetail(msg), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打印fatal日志信息
|
* 打印fatal日志信息
|
||||||
|
*
|
||||||
* @param msg 日志信息
|
* @param msg 日志信息
|
||||||
*/
|
*/
|
||||||
public static void fatalFileSync(Object msg)
|
public static void fatalFileSync(Object msg) {
|
||||||
{
|
|
||||||
log.fatal(getLogDetail(msg));
|
log.fatal(getLogDetail(msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打印fatal日志信息带异常
|
* 打印fatal日志信息带异常
|
||||||
|
*
|
||||||
* @param msg 日志信息
|
* @param msg 日志信息
|
||||||
* @param e 异常堆栈
|
* @param e 异常堆栈
|
||||||
*/
|
*/
|
||||||
public static void fatalFileSync(Object msg, Throwable e)
|
public static void fatalFileSync(Object msg, Throwable e) {
|
||||||
{
|
|
||||||
log.fatal(getLogDetail(msg), e);
|
log.fatal(getLogDetail(msg), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拼装日志详细信息
|
* 拼装日志详细信息
|
||||||
|
*
|
||||||
* @param message 要打印的日志信息
|
* @param message 要打印的日志信息
|
||||||
* @return 封装后的日志详细信息
|
* @return 封装后的日志详细信息
|
||||||
*/
|
*/
|
||||||
private static synchronized String getLogDetail(Object message)
|
private static synchronized String getLogDetail(Object message) {
|
||||||
{
|
|
||||||
String msg = "";
|
String msg = "";
|
||||||
if (null != message)
|
if (null != message)
|
||||||
msg = message.toString();
|
msg = message.toString();
|
||||||
StringBuffer bf = new StringBuffer();
|
StringBuffer bf = new StringBuffer();
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
ex.fillInStackTrace();
|
ex.fillInStackTrace();
|
||||||
throw ex;
|
throw ex;
|
||||||
}
|
} catch (Exception ex) {
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
StackTraceElement[] trace = ex.getStackTrace();
|
StackTraceElement[] trace = ex.getStackTrace();
|
||||||
//获取异常堆栈中的调用类信息
|
//获取异常堆栈中的调用类信息
|
||||||
final int pos = 2;
|
final int pos = 2;
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.asset;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Asset;
|
import com.jsh.model.po.Asset;
|
||||||
|
|
||||||
public class AssetDAO extends BaseDAO<Asset> implements AssetIDAO
|
public class AssetDAO extends BaseDAO<Asset> implements AssetIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Asset> getEntityClass()
|
public Class<Asset> getEntityClass() {
|
||||||
{
|
|
||||||
return Asset.class;
|
return Asset.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.asset;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.Asset;
|
import com.jsh.model.po.Asset;
|
||||||
|
|
||||||
public interface AssetIDAO extends BaseIDAO<Asset>
|
public interface AssetIDAO extends BaseIDAO<Asset> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,16 @@
|
|||||||
package com.jsh.dao.asset;
|
package com.jsh.dao.asset;
|
||||||
|
|
||||||
|
import com.jsh.model.po.Asset;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
|
import com.jsh.util.PageUtil;
|
||||||
|
import com.jsh.util.SearchConditionUtil;
|
||||||
import org.hibernate.Query;
|
import org.hibernate.Query;
|
||||||
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
|
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
|
||||||
|
|
||||||
import com.jsh.util.JshException;
|
public class ReportDAO extends HibernateDaoSupport implements ReportIDAO {
|
||||||
import com.jsh.model.po.Asset;
|
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
import com.jsh.util.SearchConditionUtil;
|
|
||||||
|
|
||||||
public class ReportDAO extends HibernateDaoSupport implements ReportIDAO
|
|
||||||
{
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public void find(PageUtil<Asset> pageUtil,String reportType,String reportName) throws JshException
|
public void find(PageUtil<Asset> pageUtil, String reportType, String reportName) throws JshException {
|
||||||
{
|
|
||||||
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select count(" + reportType + ") as dataSum, " + reportName + " from Asset asset where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select count(" + reportType + ") as dataSum, " + reportName + " from Asset asset where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
pageUtil.setTotalCount(query.list().size());
|
pageUtil.setTotalCount(query.list().size());
|
||||||
pageUtil.setPageList(query.list());
|
pageUtil.setPageList(query.list());
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
package com.jsh.dao.asset;
|
package com.jsh.dao.asset;
|
||||||
|
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.Asset;
|
import com.jsh.model.po.Asset;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
|
|
||||||
public interface ReportIDAO
|
public interface ReportIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 查找资产列表
|
* 查找资产列表
|
||||||
|
*
|
||||||
* @param pageUtil 分页工具类
|
* @param pageUtil 分页工具类
|
||||||
* @param reportType 报表统计字段
|
* @param reportType 报表统计字段
|
||||||
* @throws JshException
|
* @throws JshException
|
||||||
|
|||||||
@@ -7,15 +7,14 @@ import com.jsh.util.PageUtil;
|
|||||||
import com.jsh.util.SearchConditionUtil;
|
import com.jsh.util.SearchConditionUtil;
|
||||||
import org.hibernate.Query;
|
import org.hibernate.Query;
|
||||||
|
|
||||||
public class AccountDAO extends BaseDAO<Account> implements AccountIDAO
|
public class AccountDAO extends BaseDAO<Account> implements AccountIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Account> getEntityClass()
|
public Class<Account> getEntityClass() {
|
||||||
{
|
|
||||||
return Account.class;
|
return Account.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.App;
|
import com.jsh.model.po.App;
|
||||||
|
|
||||||
public class AppDAO extends BaseDAO<App> implements AppIDAO
|
public class AppDAO extends BaseDAO<App> implements AppIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<App> getEntityClass()
|
public Class<App> getEntityClass() {
|
||||||
{
|
|
||||||
return App.class;
|
return App.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.App;
|
import com.jsh.model.po.App;
|
||||||
|
|
||||||
public interface AppIDAO extends BaseIDAO<App>
|
public interface AppIDAO extends BaseIDAO<App> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Assetname;
|
import com.jsh.model.po.Assetname;
|
||||||
|
|
||||||
public class AssetNameDAO extends BaseDAO<Assetname> implements AssetNameIDAO
|
public class AssetNameDAO extends BaseDAO<Assetname> implements AssetNameIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Assetname> getEntityClass()
|
public Class<Assetname> getEntityClass() {
|
||||||
{
|
|
||||||
return Assetname.class;
|
return Assetname.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.Assetname;
|
import com.jsh.model.po.Assetname;
|
||||||
|
|
||||||
public interface AssetNameIDAO extends BaseIDAO<Assetname>
|
public interface AssetNameIDAO extends BaseIDAO<Assetname> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Category;
|
import com.jsh.model.po.Category;
|
||||||
|
|
||||||
public class CategoryDAO extends BaseDAO<Category> implements CategoryIDAO
|
public class CategoryDAO extends BaseDAO<Category> implements CategoryIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Category> getEntityClass()
|
public Class<Category> getEntityClass() {
|
||||||
{
|
|
||||||
return Category.class;
|
return Category.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.Category;
|
import com.jsh.model.po.Category;
|
||||||
|
|
||||||
public interface CategoryIDAO extends BaseIDAO<Category>
|
public interface CategoryIDAO extends BaseIDAO<Category> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Depot;
|
import com.jsh.model.po.Depot;
|
||||||
|
|
||||||
public class DepotDAO extends BaseDAO<Depot> implements DepotIDAO
|
public class DepotDAO extends BaseDAO<Depot> implements DepotIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Depot> getEntityClass()
|
public Class<Depot> getEntityClass() {
|
||||||
{
|
|
||||||
return Depot.class;
|
return Depot.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.Depot;
|
import com.jsh.model.po.Depot;
|
||||||
|
|
||||||
public interface DepotIDAO extends BaseIDAO<Depot>
|
public interface DepotIDAO extends BaseIDAO<Depot> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Functions;
|
import com.jsh.model.po.Functions;
|
||||||
|
|
||||||
public class FunctionsDAO extends BaseDAO<Functions> implements FunctionsIDAO
|
public class FunctionsDAO extends BaseDAO<Functions> implements FunctionsIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Functions> getEntityClass()
|
public Class<Functions> getEntityClass() {
|
||||||
{
|
|
||||||
return Functions.class;
|
return Functions.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.Functions;
|
import com.jsh.model.po.Functions;
|
||||||
|
|
||||||
public interface FunctionsIDAO extends BaseIDAO<Functions>
|
public interface FunctionsIDAO extends BaseIDAO<Functions> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.InOutItem;
|
import com.jsh.model.po.InOutItem;
|
||||||
|
|
||||||
public class InOutItemDAO extends BaseDAO<InOutItem> implements InOutItemIDAO
|
public class InOutItemDAO extends BaseDAO<InOutItem> implements InOutItemIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<InOutItem> getEntityClass()
|
public Class<InOutItem> getEntityClass() {
|
||||||
{
|
|
||||||
return InOutItem.class;
|
return InOutItem.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.InOutItem;
|
import com.jsh.model.po.InOutItem;
|
||||||
|
|
||||||
public interface InOutItemIDAO extends BaseIDAO<InOutItem>
|
public interface InOutItemIDAO extends BaseIDAO<InOutItem> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Logdetails;
|
import com.jsh.model.po.Logdetails;
|
||||||
|
|
||||||
public class LogDAO extends BaseDAO<Logdetails> implements LogIDAO
|
public class LogDAO extends BaseDAO<Logdetails> implements LogIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Logdetails> getEntityClass()
|
public Class<Logdetails> getEntityClass() {
|
||||||
{
|
|
||||||
return Logdetails.class;
|
return Logdetails.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ import com.jsh.model.po.Logdetails;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 日志相关处理接口
|
* 日志相关处理接口
|
||||||
|
*
|
||||||
* @author angel
|
* @author angel
|
||||||
*/
|
*/
|
||||||
public interface LogIDAO extends BaseIDAO<Logdetails>
|
public interface LogIDAO extends BaseIDAO<Logdetails> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Role;
|
import com.jsh.model.po.Role;
|
||||||
|
|
||||||
public class RoleDAO extends BaseDAO<Role> implements RoleIDAO
|
public class RoleDAO extends BaseDAO<Role> implements RoleIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Role> getEntityClass()
|
public Class<Role> getEntityClass() {
|
||||||
{
|
|
||||||
return Role.class;
|
return Role.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.Role;
|
import com.jsh.model.po.Role;
|
||||||
|
|
||||||
public interface RoleIDAO extends BaseIDAO<Role>
|
public interface RoleIDAO extends BaseIDAO<Role> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,19 +2,16 @@ package com.jsh.dao.basic;
|
|||||||
|
|
||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Supplier;
|
import com.jsh.model.po.Supplier;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.util.SearchConditionUtil;
|
|
||||||
import org.hibernate.Query;
|
import org.hibernate.Query;
|
||||||
|
|
||||||
public class SupplierDAO extends BaseDAO<Supplier> implements SupplierIDAO
|
public class SupplierDAO extends BaseDAO<Supplier> implements SupplierIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Supplier> getEntityClass()
|
public Class<Supplier> getEntityClass() {
|
||||||
{
|
|
||||||
return Supplier.class;
|
return Supplier.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.Supplier;
|
import com.jsh.model.po.Supplier;
|
||||||
|
|
||||||
public interface SupplierIDAO extends BaseIDAO<Supplier>
|
public interface SupplierIDAO extends BaseIDAO<Supplier> {
|
||||||
{
|
|
||||||
public void batchSetEnable(Boolean enable, String supplierIDs);
|
public void batchSetEnable(Boolean enable, String supplierIDs);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.SystemConfig;
|
import com.jsh.model.po.SystemConfig;
|
||||||
|
|
||||||
public class SystemConfigDAO extends BaseDAO<SystemConfig> implements SystemConfigIDAO
|
public class SystemConfigDAO extends BaseDAO<SystemConfig> implements SystemConfigIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<SystemConfig> getEntityClass()
|
public Class<SystemConfig> getEntityClass() {
|
||||||
{
|
|
||||||
return SystemConfig.class;
|
return SystemConfig.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.SystemConfig;
|
import com.jsh.model.po.SystemConfig;
|
||||||
|
|
||||||
public interface SystemConfigIDAO extends BaseIDAO<SystemConfig>
|
public interface SystemConfigIDAO extends BaseIDAO<SystemConfig> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Unit;
|
import com.jsh.model.po.Unit;
|
||||||
|
|
||||||
public class UnitDAO extends BaseDAO<Unit> implements UnitIDAO
|
public class UnitDAO extends BaseDAO<Unit> implements UnitIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Unit> getEntityClass()
|
public Class<Unit> getEntityClass() {
|
||||||
{
|
|
||||||
return Unit.class;
|
return Unit.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.Unit;
|
import com.jsh.model.po.Unit;
|
||||||
|
|
||||||
public interface UnitIDAO extends BaseIDAO<Unit>
|
public interface UnitIDAO extends BaseIDAO<Unit> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,30 +1,26 @@
|
|||||||
package com.jsh.dao.basic;
|
package com.jsh.dao.basic;
|
||||||
|
|
||||||
import org.hibernate.Query;
|
|
||||||
|
|
||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.Asset;
|
|
||||||
import com.jsh.model.po.UserBusiness;
|
import com.jsh.model.po.UserBusiness;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
import com.jsh.util.SearchConditionUtil;
|
import com.jsh.util.SearchConditionUtil;
|
||||||
|
import org.hibernate.Query;
|
||||||
|
|
||||||
public class UserBusinessDAO extends BaseDAO<UserBusiness> implements UserBusinessIDAO
|
public class UserBusinessDAO extends BaseDAO<UserBusiness> implements UserBusinessIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<UserBusiness> getEntityClass()
|
public Class<UserBusiness> getEntityClass() {
|
||||||
{
|
|
||||||
return UserBusiness.class;
|
return UserBusiness.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public void find(PageUtil<UserBusiness> pageUtil,String ceshi) throws JshException
|
public void find(PageUtil<UserBusiness> pageUtil, String ceshi) throws JshException {
|
||||||
{
|
|
||||||
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select count(id),sum(id) from UserBusiness userBusiness where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select count(id),sum(id) from UserBusiness userBusiness where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
pageUtil.setTotalCount(query.list().size());
|
pageUtil.setTotalCount(query.list().size());
|
||||||
pageUtil.setPageList(query.list());
|
pageUtil.setPageList(query.list());
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
package com.jsh.dao.basic;
|
package com.jsh.dao.basic;
|
||||||
|
|
||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.UserBusiness;
|
import com.jsh.model.po.UserBusiness;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
|
|
||||||
public interface UserBusinessIDAO extends BaseIDAO<UserBusiness>
|
public interface UserBusinessIDAO extends BaseIDAO<UserBusiness> {
|
||||||
{
|
|
||||||
/*
|
/*
|
||||||
* 测试hql语句
|
* 测试hql语句
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Basicuser;
|
import com.jsh.model.po.Basicuser;
|
||||||
|
|
||||||
public class UserDAO extends BaseDAO<Basicuser> implements UserIDAO
|
public class UserDAO extends BaseDAO<Basicuser> implements UserIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Basicuser> getEntityClass()
|
public Class<Basicuser> getEntityClass() {
|
||||||
{
|
|
||||||
return Basicuser.class;
|
return Basicuser.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.basic;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.Basicuser;
|
import com.jsh.model.po.Basicuser;
|
||||||
|
|
||||||
public interface UserIDAO extends BaseIDAO<Basicuser>
|
public interface UserIDAO extends BaseIDAO<Basicuser> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,44 +1,42 @@
|
|||||||
package com.jsh.dao.materials;
|
package com.jsh.dao.materials;
|
||||||
|
|
||||||
import org.hibernate.Query;
|
|
||||||
|
|
||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.AccountHead;
|
import com.jsh.model.po.AccountHead;
|
||||||
import com.jsh.model.po.DepotHead;
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.model.po.UserBusiness;
|
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
import com.jsh.util.SearchConditionUtil;
|
import com.jsh.util.SearchConditionUtil;
|
||||||
|
import org.hibernate.Query;
|
||||||
|
|
||||||
public class AccountHeadDAO extends BaseDAO<AccountHead> implements AccountHeadIDAO
|
/**
|
||||||
{
|
* @author alan
|
||||||
|
*/
|
||||||
|
public class AccountHeadDAO extends BaseDAO<AccountHead> implements AccountHeadIDAO {
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<AccountHead> getEntityClass()
|
public Class<AccountHead> getEntityClass() {
|
||||||
{
|
|
||||||
return AccountHead.class;
|
return AccountHead.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void find(PageUtil<AccountHead> pageUtil,String maxid) throws JshException
|
@Override
|
||||||
{
|
public void find(PageUtil<AccountHead> pageUtil, String maxid) throws JshException {
|
||||||
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select max(Id) as Id from AccountHead accountHead where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select max(Id) as Id from AccountHead accountHead where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
pageUtil.setTotalCount(query.list().size());
|
pageUtil.setTotalCount(query.list().size());
|
||||||
pageUtil.setPageList(query.list());
|
pageUtil.setPageList(query.list());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void findAllMoney(PageUtil<AccountHead> pageUtil, Integer supplierId, String type, String mode) throws JshException
|
@Override
|
||||||
{
|
public void findAllMoney(PageUtil<AccountHead> pageUtil, Integer supplierId, String type, String mode) throws JshException {
|
||||||
Query query;
|
Query query;
|
||||||
String modeName = "";
|
String modeName = "";
|
||||||
if (mode.equals("实际")) {
|
if (mode.equals("实际")) {
|
||||||
modeName = "ChangeAmount";
|
modeName = "ChangeAmount";
|
||||||
}
|
} else if (mode.equals("合计")) {
|
||||||
else if(mode.equals("合计")){
|
|
||||||
modeName = "TotalPrice";
|
modeName = "TotalPrice";
|
||||||
}
|
}
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select sum(" + modeName + ") as allMoney from AccountHead accountHead where Type='" + type + "' and OrganId =" + supplierId + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select sum(" + modeName + ") as allMoney from AccountHead accountHead where Type='" + type + "' and OrganId =" + supplierId + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
|
|||||||
@@ -1,14 +1,11 @@
|
|||||||
package com.jsh.dao.materials;
|
package com.jsh.dao.materials;
|
||||||
|
|
||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.AccountHead;
|
import com.jsh.model.po.AccountHead;
|
||||||
import com.jsh.model.po.DepotHead;
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.model.po.UserBusiness;
|
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
|
|
||||||
public interface AccountHeadIDAO extends BaseIDAO<AccountHead>
|
public interface AccountHeadIDAO extends BaseIDAO<AccountHead> {
|
||||||
{
|
|
||||||
/*
|
/*
|
||||||
* 获取MaxId
|
* 获取MaxId
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,22 +1,16 @@
|
|||||||
package com.jsh.dao.materials;
|
package com.jsh.dao.materials;
|
||||||
|
|
||||||
import org.hibernate.Query;
|
|
||||||
|
|
||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.AccountItem;
|
import com.jsh.model.po.AccountItem;
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
import com.jsh.util.SearchConditionUtil;
|
|
||||||
|
|
||||||
public class AccountItemDAO extends BaseDAO<AccountItem> implements AccountItemIDAO
|
public class AccountItemDAO extends BaseDAO<AccountItem> implements AccountItemIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<AccountItem> getEntityClass()
|
public Class<AccountItem> getEntityClass() {
|
||||||
{
|
|
||||||
return AccountItem.class;
|
return AccountItem.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,9 @@
|
|||||||
package com.jsh.dao.materials;
|
package com.jsh.dao.materials;
|
||||||
|
|
||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.AccountItem;
|
import com.jsh.model.po.AccountItem;
|
||||||
import com.jsh.util.PageUtil;
|
|
||||||
|
|
||||||
public interface AccountItemIDAO extends BaseIDAO<AccountItem>
|
public interface AccountItemIDAO extends BaseIDAO<AccountItem> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,41 +1,39 @@
|
|||||||
package com.jsh.dao.materials;
|
package com.jsh.dao.materials;
|
||||||
|
|
||||||
import org.hibernate.Query;
|
|
||||||
|
|
||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.DepotHead;
|
import com.jsh.model.po.DepotHead;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
import com.jsh.util.SearchConditionUtil;
|
import com.jsh.util.SearchConditionUtil;
|
||||||
|
import org.hibernate.Query;
|
||||||
|
|
||||||
public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
|
public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<DepotHead> getEntityClass()
|
public Class<DepotHead> getEntityClass() {
|
||||||
{
|
|
||||||
return DepotHead.class;
|
return DepotHead.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void find(PageUtil<DepotHead> pageUtil,String maxid) throws JshException
|
@Override
|
||||||
{
|
public void find(PageUtil<DepotHead> pageUtil, String maxid) throws JshException {
|
||||||
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select max(Id) as Id from DepotHead depotHead where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select max(Id) as Id from DepotHead depotHead where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
pageUtil.setTotalCount(query.list().size());
|
pageUtil.setTotalCount(query.list().size());
|
||||||
pageUtil.setPageList(query.list());
|
pageUtil.setPageList(query.list());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void findAllMoney(PageUtil<DepotHead> pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException
|
@Override
|
||||||
{
|
public void findAllMoney(PageUtil<DepotHead> pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException {
|
||||||
Query query;
|
Query query;
|
||||||
String modeName = "";
|
String modeName = "";
|
||||||
if (mode.equals("实际")) {
|
if (mode.equals("实际")) {
|
||||||
modeName = "ChangeAmount";
|
modeName = "ChangeAmount";
|
||||||
}
|
} else if (mode.equals("合计")) {
|
||||||
else if(mode.equals("合计")){
|
|
||||||
modeName = "DiscountLastMoney";
|
modeName = "DiscountLastMoney";
|
||||||
}
|
}
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select sum(" + modeName + ") as allMoney from DepotHead depotHead where Type='" + type + "' and SubType = '" + subType + "' and OrganId =" + supplierId + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select sum(" + modeName + ") as allMoney from DepotHead depotHead where Type='" + type + "' and SubType = '" + subType + "' and OrganId =" + supplierId + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
@@ -51,6 +49,7 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
|
|||||||
query.executeUpdate();
|
query.executeUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void findInDetail(PageUtil pageUtil, String beginTime, String endTime, String type, Long pid, String dids, Long oId) throws JshException {
|
public void findInDetail(PageUtil pageUtil, String beginTime, String endTime, String type, Long pid, String dids, Long oId) throws JshException {
|
||||||
StringBuffer queryString = new StringBuffer();
|
StringBuffer queryString = new StringBuffer();
|
||||||
@@ -66,8 +65,7 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
|
|||||||
}
|
}
|
||||||
if (pid != null) {
|
if (pid != null) {
|
||||||
queryString.append(" and di.DepotId=" + pid);
|
queryString.append(" and di.DepotId=" + pid);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
queryString.append(" and di.DepotId in (" + dids + ")");
|
queryString.append(" and di.DepotId in (" + dids + ")");
|
||||||
}
|
}
|
||||||
if (type != null && !type.equals("")) {
|
if (type != null && !type.equals("")) {
|
||||||
@@ -87,6 +85,7 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
|
|||||||
pageUtil.setPageList(query.list());
|
pageUtil.setPageList(query.list());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void findInOutMaterialCount(PageUtil pageUtil, String beginTime, String endTime, String type, Long pid, String dids, Long oId) throws JshException {
|
public void findInOutMaterialCount(PageUtil pageUtil, String beginTime, String endTime, String type, Long pid, String dids, Long oId) throws JshException {
|
||||||
StringBuffer queryString = new StringBuffer();
|
StringBuffer queryString = new StringBuffer();
|
||||||
@@ -100,8 +99,7 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
|
|||||||
}
|
}
|
||||||
if (pid != null) {
|
if (pid != null) {
|
||||||
queryString.append(" and jdi.DepotId=" + pid);
|
queryString.append(" and jdi.DepotId=" + pid);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
queryString.append(" and jdi.DepotId in (" + dids + ")");
|
queryString.append(" and jdi.DepotId in (" + dids + ")");
|
||||||
}
|
}
|
||||||
queryString.append(" ) numSum, ");
|
queryString.append(" ) numSum, ");
|
||||||
@@ -114,8 +112,7 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
|
|||||||
}
|
}
|
||||||
if (pid != null) {
|
if (pid != null) {
|
||||||
queryString.append(" and jdi.DepotId=" + pid);
|
queryString.append(" and jdi.DepotId=" + pid);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
queryString.append(" and jdi.DepotId in (" + dids + ")");
|
queryString.append(" and jdi.DepotId in (" + dids + ")");
|
||||||
}
|
}
|
||||||
queryString.append(" ) priceSum ");
|
queryString.append(" ) priceSum ");
|
||||||
@@ -128,8 +125,7 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
|
|||||||
}
|
}
|
||||||
if (pid != null) {
|
if (pid != null) {
|
||||||
queryString.append(" and di.DepotId=" + pid);
|
queryString.append(" and di.DepotId=" + pid);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
queryString.append(" and di.DepotId in (" + dids + ")");
|
queryString.append(" and di.DepotId in (" + dids + ")");
|
||||||
}
|
}
|
||||||
queryString.append(" GROUP BY di.MaterialId,m.mName,m.Model,m.categoryName ");
|
queryString.append(" GROUP BY di.MaterialId,m.mName,m.Model,m.categoryName ");
|
||||||
@@ -185,6 +181,7 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
|
|||||||
pageUtil.setPageList(query.list());
|
pageUtil.setPageList(query.list());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void getHeaderIdByMaterial(PageUtil pageUtil, String materialParam, String depotIds) throws JshException {
|
public void getHeaderIdByMaterial(PageUtil pageUtil, String materialParam, String depotIds) throws JshException {
|
||||||
StringBuffer queryString = new StringBuffer();
|
StringBuffer queryString = new StringBuffer();
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
package com.jsh.dao.materials;
|
package com.jsh.dao.materials;
|
||||||
|
|
||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.DepotHead;
|
import com.jsh.model.po.DepotHead;
|
||||||
import com.jsh.model.po.UserBusiness;
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
|
|
||||||
public interface DepotHeadIDAO extends BaseIDAO<DepotHead>
|
public interface DepotHeadIDAO extends BaseIDAO<DepotHead> {
|
||||||
{
|
|
||||||
/*
|
/*
|
||||||
* 获取MaxId
|
* 获取MaxId
|
||||||
*/
|
*/
|
||||||
@@ -15,16 +13,16 @@ public interface DepotHeadIDAO extends BaseIDAO<DepotHead>
|
|||||||
|
|
||||||
void findAllMoney(PageUtil<DepotHead> pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException;
|
void findAllMoney(PageUtil<DepotHead> pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException;
|
||||||
|
|
||||||
public void batchSetStatus(Boolean status,String depotHeadIDs);
|
void batchSetStatus(Boolean status, String depotHeadIDs);
|
||||||
|
|
||||||
public void findInDetail(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids,Long oId) throws JshException;
|
void findInDetail(PageUtil pageUtil, String beginTime, String endTime, String type, Long pid, String dids, Long oId) throws JshException;
|
||||||
|
|
||||||
public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids, Long oId) throws JshException;
|
void findInOutMaterialCount(PageUtil pageUtil, String beginTime, String endTime, String type, Long pid, String dids, Long oId) throws JshException;
|
||||||
|
|
||||||
public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId) throws JshException;
|
void findMaterialsListByHeaderId(PageUtil pageUtil, Long headerId) throws JshException;
|
||||||
|
|
||||||
public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime,Long organId, String supType) throws JshException;
|
void findStatementAccount(PageUtil pageUtil, String beginTime, String endTime, Long organId, String supType) throws JshException;
|
||||||
|
|
||||||
public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam,String depotIds) throws JshException;
|
void getHeaderIdByMaterial(PageUtil pageUtil, String materialParam, String depotIds) throws JshException;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +1,25 @@
|
|||||||
package com.jsh.dao.materials;
|
package com.jsh.dao.materials;
|
||||||
|
|
||||||
import org.hibernate.Query;
|
|
||||||
|
|
||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.DepotHead;
|
|
||||||
import com.jsh.model.po.DepotItem;
|
import com.jsh.model.po.DepotItem;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
import com.jsh.util.SearchConditionUtil;
|
import com.jsh.util.SearchConditionUtil;
|
||||||
|
import org.hibernate.Query;
|
||||||
|
|
||||||
|
public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO {
|
||||||
|
private final static String TYPE = "入库";
|
||||||
|
private final static String SUM_TYPE = "Number";
|
||||||
|
private final static String IN = "in";
|
||||||
|
private final static String OUT = "out";
|
||||||
|
|
||||||
public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
|
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<DepotItem> getEntityClass()
|
public Class<DepotItem> getEntityClass() {
|
||||||
{
|
|
||||||
return DepotItem.class;
|
return DepotItem.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,34 +28,29 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
|
|||||||
public void findByType(PageUtil<DepotItem> pageUtil, String type, Integer dId, Long MId, String MonthTime, Boolean isPrev) throws JshException {
|
public void findByType(PageUtil<DepotItem> pageUtil, String type, Integer dId, Long MId, String MonthTime, Boolean isPrev) throws JshException {
|
||||||
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
||||||
Query query;
|
Query query;
|
||||||
StringBuffer queryString = new StringBuffer();
|
StringBuilder queryString = new StringBuilder();
|
||||||
if(type.equals("入库")) {
|
if (TYPE.equals(type)) {
|
||||||
if (isPrev) {
|
if (isPrev) {
|
||||||
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh where di.HeaderId = dh.id ");
|
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh where di.HeaderId = dh.id ");
|
||||||
queryString.append(" and ((type='入库' and DepotId='" + dId + "') " +
|
queryString.append(" and ((type='入库' and DepotId='").append(dId).append("') ").append(" or (SubType='调拨' and AnotherDepotId='").append(dId).append("') ").append(" or (SubType='礼品充值' and AnotherDepotId='").append(dId).append("')) ");
|
||||||
" or (SubType='调拨' and AnotherDepotId='" + dId + "') " +
|
queryString.append(" and MaterialId =").append(MId).append(" and dh.OperTime <'").append(MonthTime).append("-01 00:00:00' ");
|
||||||
" or (SubType='礼品充值' and AnotherDepotId='" + dId + "')) ");
|
|
||||||
queryString.append(" and MaterialId =" + MId + " and dh.OperTime <'" + MonthTime + "-01 00:00:00' ");
|
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
} else {
|
} else {
|
||||||
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh where di.HeaderId = dh.id ");
|
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh where di.HeaderId = dh.id ");
|
||||||
queryString.append(" and ((type='入库' and DepotId='" + dId + "') " +
|
queryString.append(" and ((type='入库' and DepotId='").append(dId).append("') ").append(" or (SubType='调拨' and AnotherDepotId='").append(dId).append("') ").append(" or (SubType='礼品充值' and AnotherDepotId='").append(dId).append("')) ");
|
||||||
" or (SubType='调拨' and AnotherDepotId='" + dId + "') " +
|
queryString.append(" and MaterialId =").append(MId).append(" and dh.OperTime >='").append(MonthTime).append("-01 00:00:00' and dh.OperTime <='").append(MonthTime).append("-31 59:59:59' ");
|
||||||
" or (SubType='礼品充值' and AnotherDepotId='" + dId + "')) ");
|
|
||||||
queryString.append(" and MaterialId =" + MId + " and dh.OperTime >='" + MonthTime + "-01 00:00:00' and dh.OperTime <='" + MonthTime + "-31 59:59:59' ");
|
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
if (isPrev) {
|
if (isPrev) {
|
||||||
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'");
|
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'");
|
||||||
queryString.append(" and DepotId='" + dId + "'");
|
queryString.append(" and DepotId='").append(dId).append("'");
|
||||||
queryString.append(" and MaterialId =" + MId + " and jsh_depothead.OperTime <'" + MonthTime + "-01 00:00:00' ");
|
queryString.append(" and MaterialId =").append(MId).append(" and jsh_depothead.OperTime <'").append(MonthTime).append("-01 00:00:00' ");
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
} else {
|
} else {
|
||||||
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'");
|
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'");
|
||||||
queryString.append(" and DepotId='" + dId + "'");
|
queryString.append(" and DepotId='").append(dId).append("'");
|
||||||
queryString.append(" and MaterialId =" + MId + " and jsh_depothead.OperTime >='" + MonthTime + "-01 00:00:00' and jsh_depothead.OperTime <='" + MonthTime + "-31 59:59:59' ");
|
queryString.append(" and MaterialId =").append(MId).append(" and jsh_depothead.OperTime >='").append(MonthTime).append("-01 00:00:00' and jsh_depothead.OperTime <='").append(MonthTime).append("-31 59:59:59' ");
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -63,38 +60,32 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public void findPriceByType(PageUtil<DepotItem> pageUtil,String type,Integer dId,Long MId,String MonthTime,Boolean isPrev) throws JshException
|
public void findPriceByType(PageUtil<DepotItem> pageUtil, String type, Integer dId, Long MId, String MonthTime, Boolean isPrev) throws JshException {
|
||||||
{
|
|
||||||
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
||||||
Query query;
|
Query query;
|
||||||
StringBuffer queryString = new StringBuffer();
|
StringBuilder queryString = new StringBuilder();
|
||||||
if(type.equals("入库")) {
|
if (TYPE.equals(type)) {
|
||||||
if (isPrev) {
|
if (isPrev) {
|
||||||
queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem di,jsh_depothead dh where di.HeaderId = dh.id ");
|
queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem di,jsh_depothead dh where di.HeaderId = dh.id ");
|
||||||
queryString.append(" and ((type='入库' and DepotId='" + dId + "') " +
|
queryString.append(" and ((type='入库' and DepotId='").append(dId).append("') ").append(" or (SubType='调拨' and AnotherDepotId='").append(dId).append("') ").append(" or (SubType='礼品充值' and AnotherDepotId='").append(dId).append("')) ");
|
||||||
" or (SubType='调拨' and AnotherDepotId='" + dId + "') " +
|
queryString.append(" and MaterialId =").append(MId).append(" and dh.OperTime <'").append(MonthTime).append("-01 00:00:00' ");
|
||||||
" or (SubType='礼品充值' and AnotherDepotId='" + dId + "')) ");
|
|
||||||
queryString.append(" and MaterialId =" + MId + " and dh.OperTime <'" + MonthTime + "-01 00:00:00' ");
|
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
} else {
|
} else {
|
||||||
queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem di,jsh_depothead dh where di.HeaderId = dh.id ");
|
queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem di,jsh_depothead dh where di.HeaderId = dh.id ");
|
||||||
queryString.append(" and ((type='入库' and DepotId='" + dId + "') " +
|
queryString.append(" and ((type='入库' and DepotId='").append(dId).append("') ").append(" or (SubType='调拨' and AnotherDepotId='").append(dId).append("') ").append(" or (SubType='礼品充值' and AnotherDepotId='").append(dId).append("')) ");
|
||||||
" or (SubType='调拨' and AnotherDepotId='" + dId + "') " +
|
queryString.append(" and MaterialId =").append(MId).append(" and dh.OperTime >='").append(MonthTime).append("-01 00:00:00' and dh.OperTime <='").append(MonthTime).append("-31 59:59:59' ");
|
||||||
" or (SubType='礼品充值' and AnotherDepotId='" + dId + "')) ");
|
|
||||||
queryString.append(" and MaterialId =" + MId + " and dh.OperTime >='" + MonthTime + "-01 00:00:00' and dh.OperTime <='" + MonthTime + "-31 59:59:59' ");
|
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
if (isPrev) {
|
if (isPrev) {
|
||||||
queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'");
|
queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'");
|
||||||
queryString.append(" and DepotId='" + dId + "'");
|
queryString.append(" and DepotId='").append(dId).append("'");
|
||||||
queryString.append(" and MaterialId =" + MId + " and jsh_depothead.OperTime <'" + MonthTime + "-01 00:00:00' ");
|
queryString.append(" and MaterialId =").append(MId).append(" and jsh_depothead.OperTime <'").append(MonthTime).append("-01 00:00:00' ");
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
} else {
|
} else {
|
||||||
queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'");
|
queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'");
|
||||||
queryString.append(" and DepotId='" + dId + "'");
|
queryString.append(" and DepotId='").append(dId).append("'");
|
||||||
queryString.append(" and MaterialId =" + MId + " and jsh_depothead.OperTime >='" + MonthTime + "-01 00:00:00' and jsh_depothead.OperTime <='" + MonthTime + "-31 59:59:59' ");
|
queryString.append(" and MaterialId =").append(MId).append(" and jsh_depothead.OperTime >='").append(MonthTime).append("-01 00:00:00' and jsh_depothead.OperTime <='").append(MonthTime).append("-31 59:59:59' ");
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -107,15 +98,14 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
|
|||||||
public void findByTypeAndMaterialId(PageUtil<DepotItem> pageUtil, String type, Long MId) throws JshException {
|
public void findByTypeAndMaterialId(PageUtil<DepotItem> pageUtil, String type, Long MId) throws JshException {
|
||||||
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
||||||
Query query;
|
Query query;
|
||||||
StringBuffer queryString = new StringBuffer();
|
StringBuilder queryString = new StringBuilder();
|
||||||
if(type.equals("入库")) {
|
if (TYPE.equals(type)) {
|
||||||
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='入库'");
|
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='入库'");
|
||||||
queryString.append(" and MaterialId ="+ MId);
|
queryString.append(" and MaterialId =").append(MId);
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='出库'");
|
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type='出库'");
|
||||||
queryString.append(" and SubType!='调拨' and SubType!='礼品充值' and MaterialId ="+ MId);
|
queryString.append(" and SubType!='调拨' and SubType!='礼品充值' and MaterialId =").append(MId);
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
}
|
}
|
||||||
pageUtil.setTotalCount(query.list().size());
|
pageUtil.setTotalCount(query.list().size());
|
||||||
@@ -127,13 +117,13 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
|
|||||||
public void findDetailByTypeAndMaterialId(PageUtil<DepotItem> pageUtil, Long MId) throws JshException {
|
public void findDetailByTypeAndMaterialId(PageUtil<DepotItem> pageUtil, Long MId) throws JshException {
|
||||||
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
||||||
Query query;
|
Query query;
|
||||||
StringBuffer queryString = new StringBuffer();
|
StringBuilder queryString = new StringBuilder();
|
||||||
queryString.append("select dh.Number,concat(dh.SubType,dh.Type) as newType, " +
|
queryString.append("select dh.Number,concat(dh.SubType,dh.Type) as newType, " +
|
||||||
"case when type='入库' then di.BasicNumber when type='出库' then 0-di.BasicNumber else 0 end as b_num, " +
|
"case when type='入库' then di.BasicNumber when type='出库' then 0-di.BasicNumber else 0 end as b_num, " +
|
||||||
"date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime " +
|
"date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime " +
|
||||||
"from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type!='其它' " +
|
"from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type!='其它' " +
|
||||||
"and SubType!='调拨' and SubType!='礼品充值' ");
|
"and SubType!='调拨' and SubType!='礼品充值' ");
|
||||||
queryString.append(" and MaterialId ="+ MId +" ORDER BY oTime desc ");
|
queryString.append(" and MaterialId =").append(MId).append(" ORDER BY oTime desc ");
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
pageUtil.setTotalCount(query.list().size());
|
pageUtil.setTotalCount(query.list().size());
|
||||||
// 分页查询
|
// 分页查询
|
||||||
@@ -148,14 +138,12 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public void buyOrSale(PageUtil<DepotItem> pageUtil,String type, String subType,Long MId,String MonthTime, String sumType) throws JshException
|
public void buyOrSale(PageUtil<DepotItem> pageUtil, String type, String subType, Long MId, String MonthTime, String sumType) throws JshException {
|
||||||
{
|
|
||||||
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
||||||
Query query;
|
Query query;
|
||||||
if(sumType.equals("Number")) {
|
if (SUM_TYPE.equals(sumType)) {
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type + "' and subType='" + subType + "' and MaterialId =" + MId + " and jsh_depothead.OperTime >='" + MonthTime + "-01 00:00:00' and jsh_depothead.OperTime <='" + MonthTime + "-31 59:59:59' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type + "' and subType='" + subType + "' and MaterialId =" + MId + " and jsh_depothead.OperTime >='" + MonthTime + "-01 00:00:00' and jsh_depothead.OperTime <='" + MonthTime + "-31 59:59:59' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type + "' and subType='" + subType + "' and MaterialId =" + MId + " and jsh_depothead.OperTime >='" + MonthTime + "-01 00:00:00' and jsh_depothead.OperTime <='" + MonthTime + "-31 59:59:59' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type + "' and subType='" + subType + "' and MaterialId =" + MId + " and jsh_depothead.OperTime >='" + MonthTime + "-01 00:00:00' and jsh_depothead.OperTime <='" + MonthTime + "-31 59:59:59' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
}
|
}
|
||||||
pageUtil.setTotalCount(query.list().size());
|
pageUtil.setTotalCount(query.list().size());
|
||||||
@@ -164,21 +152,19 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public void findGiftByType(PageUtil<DepotItem> pageUtil,String subType,Integer ProjectId,Long MId,String type) throws JshException
|
public void findGiftByType(PageUtil<DepotItem> pageUtil, String subType, Integer ProjectId, Long MId, String type) throws JshException {
|
||||||
{
|
|
||||||
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
//多表联查,多表连查,此处用到了createSQLQuery,可以随便写sql语句,很方便
|
||||||
Query query;
|
Query query;
|
||||||
StringBuffer queryString = new StringBuffer();
|
StringBuilder queryString = new StringBuilder();
|
||||||
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='" + subType +"'");
|
queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='").append(subType).append("'");
|
||||||
if (ProjectId != null) {
|
if (ProjectId != null) {
|
||||||
if(type.equals("in")){
|
if (IN.equals(type)) {
|
||||||
queryString.append(" and jsh_depotitem.AnotherDepotId='" + ProjectId +"'"); //礼品充值时
|
queryString.append(" and jsh_depotitem.AnotherDepotId='").append(ProjectId).append("'"); //礼品充值时
|
||||||
}
|
} else if (OUT.equals(type)) {
|
||||||
else if(type.equals("out")){
|
queryString.append(" and jsh_depotitem.DepotId='").append(ProjectId).append("'");
|
||||||
queryString.append(" and jsh_depotitem.DepotId='" + ProjectId +"'");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
queryString.append(" and jsh_depotitem.MaterialId ="+ MId);
|
queryString.append(" and jsh_depotitem.MaterialId =").append(MId);
|
||||||
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
|
||||||
pageUtil.setTotalCount(query.list().size());
|
pageUtil.setTotalCount(query.list().size());
|
||||||
pageUtil.setPageList(query.list());
|
pageUtil.setPageList(query.list());
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
package com.jsh.dao.materials;
|
package com.jsh.dao.materials;
|
||||||
|
|
||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.util.JshException;
|
|
||||||
import com.jsh.model.po.DepotHead;
|
|
||||||
import com.jsh.model.po.DepotItem;
|
import com.jsh.model.po.DepotItem;
|
||||||
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
|
|
||||||
public interface DepotItemIDAO extends BaseIDAO<DepotItem>
|
public interface DepotItemIDAO extends BaseIDAO<DepotItem> {
|
||||||
{
|
|
||||||
public void findByType(PageUtil<DepotItem> pageUtil, String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) throws JshException;
|
public void findByType(PageUtil<DepotItem> pageUtil, String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) throws JshException;
|
||||||
|
|
||||||
public void findByTypeAndMaterialId(PageUtil<DepotItem> pageUtil, String type, Long MId) throws JshException;
|
public void findByTypeAndMaterialId(PageUtil<DepotItem> pageUtil, String type, Long MId) throws JshException;
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.materials;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.MaterialCategory;
|
import com.jsh.model.po.MaterialCategory;
|
||||||
|
|
||||||
public class MaterialCategoryDAO extends BaseDAO<MaterialCategory> implements MaterialCategoryIDAO
|
public class MaterialCategoryDAO extends BaseDAO<MaterialCategory> implements MaterialCategoryIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<MaterialCategory> getEntityClass()
|
public Class<MaterialCategory> getEntityClass() {
|
||||||
{
|
|
||||||
return MaterialCategory.class;
|
return MaterialCategory.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.materials;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.MaterialCategory;
|
import com.jsh.model.po.MaterialCategory;
|
||||||
|
|
||||||
public interface MaterialCategoryIDAO extends BaseIDAO<MaterialCategory>
|
public interface MaterialCategoryIDAO extends BaseIDAO<MaterialCategory> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,15 +7,14 @@ import com.jsh.util.PageUtil;
|
|||||||
import com.jsh.util.SearchConditionUtil;
|
import com.jsh.util.SearchConditionUtil;
|
||||||
import org.hibernate.Query;
|
import org.hibernate.Query;
|
||||||
|
|
||||||
public class MaterialDAO extends BaseDAO<Material> implements MaterialIDAO
|
public class MaterialDAO extends BaseDAO<Material> implements MaterialIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Material> getEntityClass()
|
public Class<Material> getEntityClass() {
|
||||||
{
|
|
||||||
return Material.class;
|
return Material.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,7 @@ import com.jsh.model.po.Material;
|
|||||||
import com.jsh.util.JshException;
|
import com.jsh.util.JshException;
|
||||||
import com.jsh.util.PageUtil;
|
import com.jsh.util.PageUtil;
|
||||||
|
|
||||||
public interface MaterialIDAO extends BaseIDAO<Material>
|
public interface MaterialIDAO extends BaseIDAO<Material> {
|
||||||
{
|
|
||||||
public void batchSetEnable(Boolean enable, String supplierIDs);
|
public void batchSetEnable(Boolean enable, String supplierIDs);
|
||||||
|
|
||||||
public void findUnitName(PageUtil<Material> pageUtil, Long mId) throws JshException;
|
public void findUnitName(PageUtil<Material> pageUtil, Long mId) throws JshException;
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.materials;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.MaterialProperty;
|
import com.jsh.model.po.MaterialProperty;
|
||||||
|
|
||||||
public class MaterialPropertyDAO extends BaseDAO<MaterialProperty> implements MaterialPropertyIDAO
|
public class MaterialPropertyDAO extends BaseDAO<MaterialProperty> implements MaterialPropertyIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<MaterialProperty> getEntityClass()
|
public Class<MaterialProperty> getEntityClass() {
|
||||||
{
|
|
||||||
return MaterialProperty.class;
|
return MaterialProperty.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.materials;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.MaterialProperty;
|
import com.jsh.model.po.MaterialProperty;
|
||||||
|
|
||||||
public interface MaterialPropertyIDAO extends BaseIDAO<MaterialProperty>
|
public interface MaterialPropertyIDAO extends BaseIDAO<MaterialProperty> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,14 @@ package com.jsh.dao.materials;
|
|||||||
import com.jsh.base.BaseDAO;
|
import com.jsh.base.BaseDAO;
|
||||||
import com.jsh.model.po.Person;
|
import com.jsh.model.po.Person;
|
||||||
|
|
||||||
public class PersonDAO extends BaseDAO<Person> implements PersonIDAO
|
public class PersonDAO extends BaseDAO<Person> implements PersonIDAO {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 设置dao映射基类
|
* 设置dao映射基类
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Class<Person> getEntityClass()
|
public Class<Person> getEntityClass() {
|
||||||
{
|
|
||||||
return Person.class;
|
return Person.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.jsh.dao.materials;
|
|||||||
import com.jsh.base.BaseIDAO;
|
import com.jsh.base.BaseIDAO;
|
||||||
import com.jsh.model.po.Person;
|
import com.jsh.model.po.Person;
|
||||||
|
|
||||||
public interface PersonIDAO extends BaseIDAO<Person>
|
public interface PersonIDAO extends BaseIDAO<Person> {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Account implements java.io.Serializable
|
public class Account implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private String Name;
|
private String Name;
|
||||||
private String SerialNo;
|
private String SerialNo;
|
||||||
@@ -11,13 +10,11 @@ public class Account implements java.io.Serializable
|
|||||||
private Boolean IsDefault;
|
private Boolean IsDefault;
|
||||||
private String Remark;
|
private String Remark;
|
||||||
|
|
||||||
public Account()
|
public Account() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Account(Long Id)
|
public Account(Long Id) {
|
||||||
{
|
|
||||||
this.Id = Id;
|
this.Id = Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,56 +27,46 @@ public class Account implements java.io.Serializable
|
|||||||
Remark = remark;
|
Remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public Long getId() {
|
||||||
{
|
|
||||||
Id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getId()
|
|
||||||
{
|
|
||||||
return Id;
|
return Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setName(String name)
|
public void setId(Long id) {
|
||||||
{
|
Id = id;
|
||||||
Name = name;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName()
|
public String getName() {
|
||||||
{
|
|
||||||
return Name;
|
return Name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSerialNo(String serialNo)
|
public void setName(String name) {
|
||||||
{
|
Name = name;
|
||||||
SerialNo = serialNo;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSerialNo()
|
public String getSerialNo() {
|
||||||
{
|
|
||||||
return SerialNo;
|
return SerialNo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setInitialAmount(Double initialAmount)
|
public void setSerialNo(String serialNo) {
|
||||||
{
|
SerialNo = serialNo;
|
||||||
InitialAmount = initialAmount;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getInitialAmount()
|
public Double getInitialAmount() {
|
||||||
{
|
|
||||||
return InitialAmount;
|
return InitialAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCurrentAmount(Double currentAmount)
|
public void setInitialAmount(Double initialAmount) {
|
||||||
{
|
InitialAmount = initialAmount;
|
||||||
CurrentAmount = currentAmount;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getCurrentAmount()
|
public Double getCurrentAmount() {
|
||||||
{
|
|
||||||
return CurrentAmount;
|
return CurrentAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setCurrentAmount(Double currentAmount) {
|
||||||
|
CurrentAmount = currentAmount;
|
||||||
|
}
|
||||||
|
|
||||||
public Boolean getIsDefault() {
|
public Boolean getIsDefault() {
|
||||||
return IsDefault;
|
return IsDefault;
|
||||||
}
|
}
|
||||||
@@ -88,13 +75,11 @@ public class Account implements java.io.Serializable
|
|||||||
IsDefault = isDefault;
|
IsDefault = isDefault;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRemark(String remark)
|
public String getRemark() {
|
||||||
{
|
|
||||||
Remark = remark;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getRemark()
|
|
||||||
{
|
|
||||||
return Remark;
|
return Remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setRemark(String remark) {
|
||||||
|
Remark = remark;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ package com.jsh.model.po;
|
|||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class AccountHead implements java.io.Serializable
|
public class AccountHead implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private String Type;
|
private String Type;
|
||||||
private Supplier OrganId;
|
private Supplier OrganId;
|
||||||
@@ -16,20 +15,17 @@ public class AccountHead implements java.io.Serializable
|
|||||||
private Timestamp BillTime;
|
private Timestamp BillTime;
|
||||||
private String Remark;
|
private String Remark;
|
||||||
|
|
||||||
public AccountHead()
|
public AccountHead() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public AccountHead(Long Id)
|
public AccountHead(Long Id) {
|
||||||
{
|
|
||||||
this.Id = Id;
|
this.Id = Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public AccountHead(String type, Supplier organId,
|
public AccountHead(String type, Supplier organId,
|
||||||
Person handsPersonId, Double changeAmount, Double totalPrice,
|
Person handsPersonId, Double changeAmount, Double totalPrice,
|
||||||
Account accountId, String billNo, Timestamp billTime, String remark)
|
Account accountId, String billNo, Timestamp billTime, String remark) {
|
||||||
{
|
|
||||||
super();
|
super();
|
||||||
Type = type;
|
Type = type;
|
||||||
OrganId = organId;
|
OrganId = organId;
|
||||||
@@ -42,102 +38,84 @@ public class AccountHead implements java.io.Serializable
|
|||||||
Remark = remark;
|
Remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public Long getId() {
|
||||||
{
|
|
||||||
Id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getId()
|
|
||||||
{
|
|
||||||
return Id;
|
return Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setType(String type)
|
public void setId(Long id) {
|
||||||
{
|
Id = id;
|
||||||
Type = type;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getType()
|
public String getType() {
|
||||||
{
|
|
||||||
return Type;
|
return Type;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOrganId(Supplier organId)
|
public void setType(String type) {
|
||||||
{
|
Type = type;
|
||||||
OrganId = organId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Supplier getOrganId()
|
public Supplier getOrganId() {
|
||||||
{
|
|
||||||
return OrganId;
|
return OrganId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setHandsPersonId(Person handsPersonId)
|
public void setOrganId(Supplier organId) {
|
||||||
{
|
OrganId = organId;
|
||||||
HandsPersonId = handsPersonId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Person getHandsPersonId()
|
public Person getHandsPersonId() {
|
||||||
{
|
|
||||||
return HandsPersonId;
|
return HandsPersonId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setChangeAmount(Double changeAmount)
|
public void setHandsPersonId(Person handsPersonId) {
|
||||||
{
|
HandsPersonId = handsPersonId;
|
||||||
ChangeAmount = changeAmount;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getChangeAmount()
|
public Double getChangeAmount() {
|
||||||
{
|
|
||||||
return ChangeAmount;
|
return ChangeAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTotalPrice(Double totalPrice) {
|
public void setChangeAmount(Double changeAmount) {
|
||||||
TotalPrice = totalPrice;
|
ChangeAmount = changeAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getTotalPrice() {
|
public Double getTotalPrice() {
|
||||||
return TotalPrice;
|
return TotalPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccountId(Account accountId)
|
public void setTotalPrice(Double totalPrice) {
|
||||||
{
|
TotalPrice = totalPrice;
|
||||||
AccountId = accountId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Account getAccountId()
|
public Account getAccountId() {
|
||||||
{
|
|
||||||
return AccountId;
|
return AccountId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBillNo(String billNo)
|
public void setAccountId(Account accountId) {
|
||||||
{
|
AccountId = accountId;
|
||||||
BillNo = billNo;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getBillNo()
|
public String getBillNo() {
|
||||||
{
|
|
||||||
return BillNo;
|
return BillNo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBillTime(Timestamp billTime)
|
public void setBillNo(String billNo) {
|
||||||
{
|
BillNo = billNo;
|
||||||
BillTime = billTime;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Timestamp getBillTime()
|
public Timestamp getBillTime() {
|
||||||
{
|
|
||||||
return BillTime;
|
return BillTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRemark(String remark)
|
public void setBillTime(Timestamp billTime) {
|
||||||
{
|
BillTime = billTime;
|
||||||
Remark = remark;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRemark()
|
public String getRemark() {
|
||||||
{
|
|
||||||
return Remark;
|
return Remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setRemark(String remark) {
|
||||||
|
Remark = remark;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class AccountItem implements java.io.Serializable
|
public class AccountItem implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private AccountHead HeaderId;
|
private AccountHead HeaderId;
|
||||||
private Account AccountId;
|
private Account AccountId;
|
||||||
@@ -10,19 +9,16 @@ public class AccountItem implements java.io.Serializable
|
|||||||
private Double EachAmount;
|
private Double EachAmount;
|
||||||
private String Remark;
|
private String Remark;
|
||||||
|
|
||||||
public AccountItem()
|
public AccountItem() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public AccountItem(Long Id)
|
public AccountItem(Long Id) {
|
||||||
{
|
|
||||||
this.Id = Id;
|
this.Id = Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public AccountItem(AccountHead headerId, Account accountId,
|
public AccountItem(AccountHead headerId, Account accountId,
|
||||||
InOutItem inOutItemId, Double eachAmount, String remark)
|
InOutItem inOutItemId, Double eachAmount, String remark) {
|
||||||
{
|
|
||||||
super();
|
super();
|
||||||
HeaderId = headerId;
|
HeaderId = headerId;
|
||||||
AccountId = accountId;
|
AccountId = accountId;
|
||||||
@@ -31,64 +27,52 @@ public class AccountItem implements java.io.Serializable
|
|||||||
Remark = remark;
|
Remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public Long getId() {
|
||||||
{
|
|
||||||
Id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getId()
|
|
||||||
{
|
|
||||||
return Id;
|
return Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setHeaderId(AccountHead headerId)
|
public void setId(Long id) {
|
||||||
{
|
Id = id;
|
||||||
HeaderId = headerId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public AccountHead getHeaderId()
|
public AccountHead getHeaderId() {
|
||||||
{
|
|
||||||
return HeaderId;
|
return HeaderId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccountId(Account accountId)
|
public void setHeaderId(AccountHead headerId) {
|
||||||
{
|
HeaderId = headerId;
|
||||||
AccountId = accountId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Account getAccountId()
|
public Account getAccountId() {
|
||||||
{
|
|
||||||
return AccountId;
|
return AccountId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setInOutItemId(InOutItem inOutItemId)
|
public void setAccountId(Account accountId) {
|
||||||
{
|
AccountId = accountId;
|
||||||
InOutItemId = inOutItemId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public InOutItem getInOutItemId()
|
public InOutItem getInOutItemId() {
|
||||||
{
|
|
||||||
return InOutItemId;
|
return InOutItemId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setEachAmount(Double eachAmount)
|
public void setInOutItemId(InOutItem inOutItemId) {
|
||||||
{
|
InOutItemId = inOutItemId;
|
||||||
EachAmount = eachAmount;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getEachAmount()
|
public Double getEachAmount() {
|
||||||
{
|
|
||||||
return EachAmount;
|
return EachAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRemark(String remark)
|
public void setEachAmount(Double eachAmount) {
|
||||||
{
|
EachAmount = eachAmount;
|
||||||
Remark = remark;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRemark()
|
public String getRemark() {
|
||||||
{
|
|
||||||
return Remark;
|
return Remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setRemark(String remark) {
|
||||||
|
Remark = remark;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class App implements java.io.Serializable
|
public class App implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private String Number;
|
private String Number;
|
||||||
private String Name;
|
private String Name;
|
||||||
@@ -20,20 +19,17 @@ public class App implements java.io.Serializable
|
|||||||
private Boolean Enabled;
|
private Boolean Enabled;
|
||||||
|
|
||||||
|
|
||||||
public App()
|
public App() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public App(Long Id)
|
public App(Long Id) {
|
||||||
{
|
|
||||||
this.Id = Id;
|
this.Id = Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public App(String Number, String Name, String Type, String Icon, String URL, String Width,
|
public App(String Number, String Name, String Type, String Icon, String URL, String Width,
|
||||||
String Height, Boolean ReSize, Boolean OpenMax, Boolean Flash, String ZL, String Sort,
|
String Height, Boolean ReSize, Boolean OpenMax, Boolean Flash, String ZL, String Sort,
|
||||||
String Remark, Boolean Enabled)
|
String Remark, Boolean Enabled) {
|
||||||
{
|
|
||||||
this.Number = Number;
|
this.Number = Number;
|
||||||
this.Name = Name;
|
this.Name = Name;
|
||||||
this.Type = Type;
|
this.Type = Type;
|
||||||
|
|||||||
@@ -4,8 +4,7 @@ import java.sql.Timestamp;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Asset implements java.io.Serializable
|
public class Asset implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long id;
|
private Long id;
|
||||||
private Assetname assetname;
|
private Assetname assetname;
|
||||||
private String location;
|
private String location;
|
||||||
@@ -67,13 +66,11 @@ public class Asset implements java.io.Serializable
|
|||||||
*/
|
*/
|
||||||
private String warrantydateStr;
|
private String warrantydateStr;
|
||||||
|
|
||||||
public Asset()
|
public Asset() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Asset(Long id)
|
public Asset(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,8 +79,7 @@ public class Asset implements java.io.Serializable
|
|||||||
Timestamp periodofvalidity, Timestamp warrantydate,
|
Timestamp periodofvalidity, Timestamp warrantydate,
|
||||||
String assetnum, String serialnum, Supplier supplier,
|
String assetnum, String serialnum, Supplier supplier,
|
||||||
String description, Timestamp createtime, Basicuser creator,
|
String description, Timestamp createtime, Basicuser creator,
|
||||||
Timestamp updatetime,String labels, Basicuser updator,String addMonth)
|
Timestamp updatetime, String labels, Basicuser updator, String addMonth) {
|
||||||
{
|
|
||||||
super();
|
super();
|
||||||
this.assetname = assetname;
|
this.assetname = assetname;
|
||||||
this.location = location;
|
this.location = location;
|
||||||
@@ -106,274 +102,219 @@ public class Asset implements java.io.Serializable
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public Long getId() {
|
||||||
public Long getId()
|
|
||||||
{
|
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public void setId(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Assetname getAssetname()
|
public Assetname getAssetname() {
|
||||||
{
|
|
||||||
return assetname;
|
return assetname;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAssetname(Assetname assetname)
|
public void setAssetname(Assetname assetname) {
|
||||||
{
|
|
||||||
this.assetname = assetname;
|
this.assetname = assetname;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLocation()
|
public String getLocation() {
|
||||||
{
|
|
||||||
return location;
|
return location;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLocation(String location)
|
public void setLocation(String location) {
|
||||||
{
|
|
||||||
this.location = location;
|
this.location = location;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Short getStatus()
|
public Short getStatus() {
|
||||||
{
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setStatus(Short status)
|
public void setStatus(Short status) {
|
||||||
{
|
|
||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Basicuser getUser()
|
public Basicuser getUser() {
|
||||||
{
|
|
||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUser(Basicuser user)
|
public void setUser(Basicuser user) {
|
||||||
{
|
|
||||||
this.user = user;
|
this.user = user;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getPrice()
|
public Double getPrice() {
|
||||||
{
|
|
||||||
return price;
|
return price;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPrice(Double price)
|
public void setPrice(Double price) {
|
||||||
{
|
|
||||||
this.price = price;
|
this.price = price;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Timestamp getPurchasedate()
|
public Timestamp getPurchasedate() {
|
||||||
{
|
|
||||||
return purchasedate;
|
return purchasedate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPurchasedate(Timestamp purchasedate)
|
public void setPurchasedate(Timestamp purchasedate) {
|
||||||
{
|
|
||||||
this.purchasedate = purchasedate;
|
this.purchasedate = purchasedate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Timestamp getPeriodofvalidity()
|
public Timestamp getPeriodofvalidity() {
|
||||||
{
|
|
||||||
return periodofvalidity;
|
return periodofvalidity;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPeriodofvalidity(Timestamp periodofvalidity)
|
public void setPeriodofvalidity(Timestamp periodofvalidity) {
|
||||||
{
|
|
||||||
this.periodofvalidity = periodofvalidity;
|
this.periodofvalidity = periodofvalidity;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Timestamp getWarrantydate()
|
public Timestamp getWarrantydate() {
|
||||||
{
|
|
||||||
return warrantydate;
|
return warrantydate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setWarrantydate(Timestamp warrantydate)
|
public void setWarrantydate(Timestamp warrantydate) {
|
||||||
{
|
|
||||||
this.warrantydate = warrantydate;
|
this.warrantydate = warrantydate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAssetnum()
|
public String getAssetnum() {
|
||||||
{
|
|
||||||
return assetnum;
|
return assetnum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAssetnum(String assetnum)
|
public void setAssetnum(String assetnum) {
|
||||||
{
|
|
||||||
this.assetnum = assetnum;
|
this.assetnum = assetnum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSerialnum()
|
public String getSerialnum() {
|
||||||
{
|
|
||||||
return serialnum;
|
return serialnum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSerialnum(String serialnum)
|
public void setSerialnum(String serialnum) {
|
||||||
{
|
|
||||||
this.serialnum = serialnum;
|
this.serialnum = serialnum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Supplier getSupplier()
|
public Supplier getSupplier() {
|
||||||
{
|
|
||||||
return supplier;
|
return supplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSupplier(Supplier supplier)
|
public void setSupplier(Supplier supplier) {
|
||||||
{
|
|
||||||
this.supplier = supplier;
|
this.supplier = supplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDescription()
|
public String getDescription() {
|
||||||
{
|
|
||||||
return description;
|
return description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDescription(String description)
|
public void setDescription(String description) {
|
||||||
{
|
|
||||||
this.description = description;
|
this.description = description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Timestamp getCreatetime()
|
public Timestamp getCreatetime() {
|
||||||
{
|
|
||||||
return createtime;
|
return createtime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCreatetime(Timestamp createtime)
|
public void setCreatetime(Timestamp createtime) {
|
||||||
{
|
|
||||||
this.createtime = createtime;
|
this.createtime = createtime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Basicuser getCreator()
|
public Basicuser getCreator() {
|
||||||
{
|
|
||||||
return creator;
|
return creator;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCreator(Basicuser creator)
|
public void setCreator(Basicuser creator) {
|
||||||
{
|
|
||||||
this.creator = creator;
|
this.creator = creator;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Timestamp getUpdatetime()
|
public Timestamp getUpdatetime() {
|
||||||
{
|
|
||||||
return updatetime;
|
return updatetime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUpdatetime(Timestamp updatetime)
|
public void setUpdatetime(Timestamp updatetime) {
|
||||||
{
|
|
||||||
this.updatetime = updatetime;
|
this.updatetime = updatetime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Basicuser getUpdator()
|
public Basicuser getUpdator() {
|
||||||
{
|
|
||||||
return updator;
|
return updator;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUpdator(Basicuser updator)
|
public void setUpdator(Basicuser updator) {
|
||||||
{
|
|
||||||
this.updator = updator;
|
this.updator = updator;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLabels()
|
public String getLabels() {
|
||||||
{
|
|
||||||
return labels;
|
return labels;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLabels(String labels)
|
public void setLabels(String labels) {
|
||||||
{
|
|
||||||
this.labels = labels;
|
this.labels = labels;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAddMonth()
|
public String getAddMonth() {
|
||||||
{
|
|
||||||
return addMonth;
|
return addMonth;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAddMonth(String addMonth)
|
public void setAddMonth(String addMonth) {
|
||||||
{
|
|
||||||
this.addMonth = addMonth;
|
this.addMonth = addMonth;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Integer getRowLineNum()
|
public Integer getRowLineNum() {
|
||||||
{
|
|
||||||
return rowLineNum;
|
return rowLineNum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRowLineNum(Integer rowLineNum)
|
public void setRowLineNum(Integer rowLineNum) {
|
||||||
{
|
|
||||||
this.rowLineNum = rowLineNum;
|
this.rowLineNum = rowLineNum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Map<Integer, String> getCellInfo()
|
public Map<Integer, String> getCellInfo() {
|
||||||
{
|
|
||||||
return cellInfo;
|
return cellInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCellInfo(Map<Integer, String> cellInfo)
|
public void setCellInfo(Map<Integer, String> cellInfo) {
|
||||||
{
|
|
||||||
this.cellInfo = cellInfo;
|
this.cellInfo = cellInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPriceStr()
|
public String getPriceStr() {
|
||||||
{
|
|
||||||
return priceStr;
|
return priceStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPriceStr(String priceStr)
|
public void setPriceStr(String priceStr) {
|
||||||
{
|
|
||||||
this.priceStr = priceStr;
|
this.priceStr = priceStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAssetnameStr()
|
public String getAssetnameStr() {
|
||||||
{
|
|
||||||
return assetnameStr;
|
return assetnameStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAssetnameStr(String assetnameStr)
|
public void setAssetnameStr(String assetnameStr) {
|
||||||
{
|
|
||||||
this.assetnameStr = assetnameStr;
|
this.assetnameStr = assetnameStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getCategory()
|
public String getCategory() {
|
||||||
{
|
|
||||||
return category;
|
return category;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCategory(String category)
|
public void setCategory(String category) {
|
||||||
{
|
|
||||||
this.category = category;
|
this.category = category;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPurchasedateStr()
|
public String getPurchasedateStr() {
|
||||||
{
|
|
||||||
return purchasedateStr;
|
return purchasedateStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPurchasedateStr(String purchasedateStr)
|
public void setPurchasedateStr(String purchasedateStr) {
|
||||||
{
|
|
||||||
this.purchasedateStr = purchasedateStr;
|
this.purchasedateStr = purchasedateStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPeriodofvalidityStr()
|
public String getPeriodofvalidityStr() {
|
||||||
{
|
|
||||||
return periodofvalidityStr;
|
return periodofvalidityStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPeriodofvalidityStr(String periodofvalidityStr)
|
public void setPeriodofvalidityStr(String periodofvalidityStr) {
|
||||||
{
|
|
||||||
this.periodofvalidityStr = periodofvalidityStr;
|
this.periodofvalidityStr = periodofvalidityStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getWarrantydateStr()
|
public String getWarrantydateStr() {
|
||||||
{
|
|
||||||
return warrantydateStr;
|
return warrantydateStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setWarrantydateStr(String warrantydateStr)
|
public void setWarrantydateStr(String warrantydateStr) {
|
||||||
{
|
|
||||||
this.warrantydateStr = warrantydateStr;
|
this.warrantydateStr = warrantydateStr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Assetname implements java.io.Serializable
|
public class Assetname implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long id;
|
private Long id;
|
||||||
private String assetname;
|
private String assetname;
|
||||||
private Short isystem;
|
private Short isystem;
|
||||||
@@ -10,19 +9,16 @@ public class Assetname implements java.io.Serializable
|
|||||||
private String description;
|
private String description;
|
||||||
private Short isconsumables;
|
private Short isconsumables;
|
||||||
|
|
||||||
public Assetname()
|
public Assetname() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Assetname(Long id)
|
public Assetname(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Assetname(String assetname, Short isystem, String description,
|
public Assetname(String assetname, Short isystem, String description,
|
||||||
Short isconsumables,Category category)
|
Short isconsumables, Category category) {
|
||||||
{
|
|
||||||
this.assetname = assetname;
|
this.assetname = assetname;
|
||||||
this.isystem = isystem;
|
this.isystem = isystem;
|
||||||
this.description = description;
|
this.description = description;
|
||||||
@@ -30,63 +26,51 @@ public class Assetname implements java.io.Serializable
|
|||||||
this.category = category;
|
this.category = category;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getId()
|
public Long getId() {
|
||||||
{
|
|
||||||
return this.id;
|
return this.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public void setId(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAssetname()
|
public String getAssetname() {
|
||||||
{
|
|
||||||
return this.assetname;
|
return this.assetname;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAssetname(String assetname)
|
public void setAssetname(String assetname) {
|
||||||
{
|
|
||||||
this.assetname = assetname;
|
this.assetname = assetname;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Short getIsystem()
|
public Short getIsystem() {
|
||||||
{
|
|
||||||
return this.isystem;
|
return this.isystem;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setIsystem(Short isystem)
|
public void setIsystem(Short isystem) {
|
||||||
{
|
|
||||||
this.isystem = isystem;
|
this.isystem = isystem;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDescription()
|
public String getDescription() {
|
||||||
{
|
|
||||||
return this.description;
|
return this.description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDescription(String description)
|
public void setDescription(String description) {
|
||||||
{
|
|
||||||
this.description = description;
|
this.description = description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Short getIsconsumables()
|
public Short getIsconsumables() {
|
||||||
{
|
|
||||||
return this.isconsumables;
|
return this.isconsumables;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setIsconsumables(Short isconsumables)
|
public void setIsconsumables(Short isconsumables) {
|
||||||
{
|
|
||||||
this.isconsumables = isconsumables;
|
this.isconsumables = isconsumables;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Category getCategory()
|
public Category getCategory() {
|
||||||
{
|
|
||||||
return category;
|
return category;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCategory(Category category)
|
public void setCategory(Category category) {
|
||||||
{
|
|
||||||
this.category = category;
|
this.category = category;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Basicuser implements java.io.Serializable
|
public class Basicuser implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long id;
|
private Long id;
|
||||||
private String username;
|
private String username;
|
||||||
private String loginame;
|
private String loginame;
|
||||||
@@ -17,20 +16,17 @@ public class Basicuser implements java.io.Serializable
|
|||||||
private String description;
|
private String description;
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
public Basicuser()
|
public Basicuser() {
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Basicuser(Long id)
|
public Basicuser(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Basicuser(String username, String loginame, String password,
|
public Basicuser(String username, String loginame, String password,
|
||||||
String position, String department, String email, String phonenum,
|
String position, String department, String email, String phonenum,
|
||||||
Short ismanager, Short isystem, Short status, String description,
|
Short ismanager, Short isystem, Short status, String description,
|
||||||
String remark)
|
String remark) {
|
||||||
{
|
|
||||||
this.username = username;
|
this.username = username;
|
||||||
this.loginame = loginame;
|
this.loginame = loginame;
|
||||||
this.password = password;
|
this.password = password;
|
||||||
@@ -45,133 +41,107 @@ public class Basicuser implements java.io.Serializable
|
|||||||
this.remark = remark;
|
this.remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getId()
|
public Long getId() {
|
||||||
{
|
|
||||||
return this.id;
|
return this.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public void setId(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getUsername()
|
public String getUsername() {
|
||||||
{
|
|
||||||
return this.username;
|
return this.username;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUsername(String username)
|
public void setUsername(String username) {
|
||||||
{
|
|
||||||
this.username = username;
|
this.username = username;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLoginame()
|
public String getLoginame() {
|
||||||
{
|
|
||||||
return this.loginame;
|
return this.loginame;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLoginame(String loginame)
|
public void setLoginame(String loginame) {
|
||||||
{
|
|
||||||
this.loginame = loginame;
|
this.loginame = loginame;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPassword()
|
public String getPassword() {
|
||||||
{
|
|
||||||
return this.password;
|
return this.password;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPassword(String password)
|
public void setPassword(String password) {
|
||||||
{
|
|
||||||
this.password = password;
|
this.password = password;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPosition()
|
public String getPosition() {
|
||||||
{
|
|
||||||
return this.position;
|
return this.position;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPosition(String position)
|
public void setPosition(String position) {
|
||||||
{
|
|
||||||
this.position = position;
|
this.position = position;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDepartment()
|
public String getDepartment() {
|
||||||
{
|
|
||||||
return this.department;
|
return this.department;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDepartment(String department)
|
public void setDepartment(String department) {
|
||||||
{
|
|
||||||
this.department = department;
|
this.department = department;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getEmail()
|
public String getEmail() {
|
||||||
{
|
|
||||||
return this.email;
|
return this.email;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setEmail(String email)
|
public void setEmail(String email) {
|
||||||
{
|
|
||||||
this.email = email;
|
this.email = email;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPhonenum()
|
public String getPhonenum() {
|
||||||
{
|
|
||||||
return this.phonenum;
|
return this.phonenum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPhonenum(String phonenum)
|
public void setPhonenum(String phonenum) {
|
||||||
{
|
|
||||||
this.phonenum = phonenum;
|
this.phonenum = phonenum;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Short getIsmanager()
|
public Short getIsmanager() {
|
||||||
{
|
|
||||||
return this.ismanager;
|
return this.ismanager;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setIsmanager(Short ismanager)
|
public void setIsmanager(Short ismanager) {
|
||||||
{
|
|
||||||
this.ismanager = ismanager;
|
this.ismanager = ismanager;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Short getIsystem()
|
public Short getIsystem() {
|
||||||
{
|
|
||||||
return this.isystem;
|
return this.isystem;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setIsystem(Short isystem)
|
public void setIsystem(Short isystem) {
|
||||||
{
|
|
||||||
this.isystem = isystem;
|
this.isystem = isystem;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Short getStatus()
|
public Short getStatus() {
|
||||||
{
|
|
||||||
return this.status;
|
return this.status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setStatus(Short status)
|
public void setStatus(Short status) {
|
||||||
{
|
|
||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDescription()
|
public String getDescription() {
|
||||||
{
|
|
||||||
return this.description;
|
return this.description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDescription(String description)
|
public void setDescription(String description) {
|
||||||
{
|
|
||||||
this.description = description;
|
this.description = description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRemark()
|
public String getRemark() {
|
||||||
{
|
|
||||||
return this.remark;
|
return this.remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRemark(String remark)
|
public void setRemark(String remark) {
|
||||||
{
|
|
||||||
this.remark = remark;
|
this.remark = remark;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,67 +1,55 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Category implements java.io.Serializable
|
public class Category implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long id;
|
private Long id;
|
||||||
private String assetname;
|
private String assetname;
|
||||||
private Short isystem;
|
private Short isystem;
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
public Category()
|
public Category() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Category(Long id)
|
public Category(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Category(String assetname, Short isystem, String description)
|
public Category(String assetname, Short isystem, String description) {
|
||||||
{
|
|
||||||
this.assetname = assetname;
|
this.assetname = assetname;
|
||||||
this.isystem = isystem;
|
this.isystem = isystem;
|
||||||
this.description = description;
|
this.description = description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getId()
|
public Long getId() {
|
||||||
{
|
|
||||||
return this.id;
|
return this.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public void setId(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAssetname()
|
public String getAssetname() {
|
||||||
{
|
|
||||||
return this.assetname;
|
return this.assetname;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAssetname(String assetname)
|
public void setAssetname(String assetname) {
|
||||||
{
|
|
||||||
this.assetname = assetname;
|
this.assetname = assetname;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Short getIsystem()
|
public Short getIsystem() {
|
||||||
{
|
|
||||||
return this.isystem;
|
return this.isystem;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setIsystem(Short isystem)
|
public void setIsystem(Short isystem) {
|
||||||
{
|
|
||||||
this.isystem = isystem;
|
this.isystem = isystem;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDescription()
|
public String getDescription() {
|
||||||
{
|
|
||||||
return this.description;
|
return this.description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDescription(String description)
|
public void setDescription(String description) {
|
||||||
{
|
|
||||||
this.description = description;
|
this.description = description;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Depot implements java.io.Serializable
|
public class Depot implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long id;
|
private Long id;
|
||||||
private String name;
|
private String name;
|
||||||
private String address;
|
private String address;
|
||||||
@@ -12,18 +11,15 @@ public class Depot implements java.io.Serializable
|
|||||||
private String sort;
|
private String sort;
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
public Depot()
|
public Depot() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Depot(Long id)
|
public Depot(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Depot(String name, String address, Double warehousing, Double truckage, Integer type, String sort, String remark)
|
public Depot(String name, String address, Double warehousing, Double truckage, Integer type, String sort, String remark) {
|
||||||
{
|
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.address = address;
|
this.address = address;
|
||||||
this.warehousing = warehousing;
|
this.warehousing = warehousing;
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ package com.jsh.model.po;
|
|||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class DepotHead implements java.io.Serializable
|
public class DepotHead implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private String Type;
|
private String Type;
|
||||||
private String SubType;
|
private String SubType;
|
||||||
@@ -34,13 +33,11 @@ public class DepotHead implements java.io.Serializable
|
|||||||
private Boolean Status = false; //单据状态
|
private Boolean Status = false; //单据状态
|
||||||
private String Remark;
|
private String Remark;
|
||||||
|
|
||||||
public DepotHead()
|
public DepotHead() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public DepotHead(Long Id)
|
public DepotHead(Long Id) {
|
||||||
{
|
|
||||||
this.Id = Id;
|
this.Id = Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class DepotItem implements java.io.Serializable
|
public class DepotItem implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private DepotHead HeaderId;
|
private DepotHead HeaderId;
|
||||||
private Material MaterialId;
|
private Material MaterialId;
|
||||||
@@ -27,13 +26,11 @@ public class DepotItem implements java.io.Serializable
|
|||||||
private String MType; //商品类型
|
private String MType; //商品类型
|
||||||
|
|
||||||
|
|
||||||
public DepotItem()
|
public DepotItem() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public DepotItem(Long Id)
|
public DepotItem(Long Id) {
|
||||||
{
|
|
||||||
this.Id = Id;
|
this.Id = Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Functions implements java.io.Serializable
|
public class Functions implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private String Number;
|
private String Number;
|
||||||
private String Name;
|
private String Name;
|
||||||
@@ -14,8 +13,7 @@ public class Functions implements java.io.Serializable
|
|||||||
private String Type;
|
private String Type;
|
||||||
private String PushBtn;
|
private String PushBtn;
|
||||||
|
|
||||||
public Functions()
|
public Functions() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,17 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class InOutItem implements java.io.Serializable
|
public class InOutItem implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private String Name;
|
private String Name;
|
||||||
private String Type;
|
private String Type;
|
||||||
private String Remark;
|
private String Remark;
|
||||||
|
|
||||||
public InOutItem()
|
public InOutItem() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public InOutItem(Long Id)
|
public InOutItem(Long Id) {
|
||||||
{
|
|
||||||
this.Id = Id;
|
this.Id = Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -24,43 +21,35 @@ public class InOutItem implements java.io.Serializable
|
|||||||
Remark = remark;
|
Remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public Long getId() {
|
||||||
{
|
|
||||||
Id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getId()
|
|
||||||
{
|
|
||||||
return Id;
|
return Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setName(String name)
|
public void setId(Long id) {
|
||||||
{
|
Id = id;
|
||||||
Name = name;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName()
|
public String getName() {
|
||||||
{
|
|
||||||
return Name;
|
return Name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setType(String type)
|
public void setName(String name) {
|
||||||
{
|
Name = name;
|
||||||
Type = type;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getType()
|
public String getType() {
|
||||||
{
|
|
||||||
return Type;
|
return Type;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRemark(String remark)
|
public void setType(String type) {
|
||||||
{
|
Type = type;
|
||||||
Remark = remark;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRemark()
|
public String getRemark() {
|
||||||
{
|
|
||||||
return Remark;
|
return Remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setRemark(String remark) {
|
||||||
|
Remark = remark;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ package com.jsh.model.po;
|
|||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Logdetails implements java.io.Serializable
|
public class Logdetails implements java.io.Serializable {
|
||||||
{
|
|
||||||
|
|
||||||
private Long id;
|
private Long id;
|
||||||
private Basicuser user;
|
private Basicuser user;
|
||||||
@@ -15,20 +14,17 @@ public class Logdetails implements java.io.Serializable
|
|||||||
private String contentdetails;
|
private String contentdetails;
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
public Logdetails()
|
public Logdetails() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Logdetails(Long id)
|
public Logdetails(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Logdetails(Basicuser user, String operation, String clientIp,
|
public Logdetails(Basicuser user, String operation, String clientIp,
|
||||||
Timestamp createtime, Short status, String contentdetails,
|
Timestamp createtime, Short status, String contentdetails,
|
||||||
String remark)
|
String remark) {
|
||||||
{
|
|
||||||
this.user = user;
|
this.user = user;
|
||||||
this.operation = operation;
|
this.operation = operation;
|
||||||
this.clientIp = clientIp;
|
this.clientIp = clientIp;
|
||||||
@@ -38,13 +34,11 @@ public class Logdetails implements java.io.Serializable
|
|||||||
this.remark = remark;
|
this.remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getId()
|
public Long getId() {
|
||||||
{
|
|
||||||
return this.id;
|
return this.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public void setId(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,63 +50,51 @@ public class Logdetails implements java.io.Serializable
|
|||||||
this.user = user;
|
this.user = user;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOperation()
|
public String getOperation() {
|
||||||
{
|
|
||||||
return this.operation;
|
return this.operation;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOperation(String operation)
|
public void setOperation(String operation) {
|
||||||
{
|
|
||||||
this.operation = operation;
|
this.operation = operation;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getClientIp()
|
public String getClientIp() {
|
||||||
{
|
|
||||||
return this.clientIp;
|
return this.clientIp;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setClientIp(String clientIp)
|
public void setClientIp(String clientIp) {
|
||||||
{
|
|
||||||
this.clientIp = clientIp;
|
this.clientIp = clientIp;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Timestamp getCreatetime()
|
public Timestamp getCreatetime() {
|
||||||
{
|
|
||||||
return this.createtime;
|
return this.createtime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCreatetime(Timestamp createtime)
|
public void setCreatetime(Timestamp createtime) {
|
||||||
{
|
|
||||||
this.createtime = createtime;
|
this.createtime = createtime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Short getStatus()
|
public Short getStatus() {
|
||||||
{
|
|
||||||
return this.status;
|
return this.status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setStatus(Short status)
|
public void setStatus(Short status) {
|
||||||
{
|
|
||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getContentdetails()
|
public String getContentdetails() {
|
||||||
{
|
|
||||||
return this.contentdetails;
|
return this.contentdetails;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setContentdetails(String contentdetails)
|
public void setContentdetails(String contentdetails) {
|
||||||
{
|
|
||||||
this.contentdetails = contentdetails;
|
this.contentdetails = contentdetails;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRemark()
|
public String getRemark() {
|
||||||
{
|
|
||||||
return this.remark;
|
return this.remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRemark(String remark)
|
public void setRemark(String remark) {
|
||||||
{
|
|
||||||
this.remark = remark;
|
this.remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ package com.jsh.model.po;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Material implements java.io.Serializable
|
public class Material implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private MaterialCategory materialCategory;
|
private MaterialCategory materialCategory;
|
||||||
private String Name;
|
private String Name;
|
||||||
@@ -42,13 +41,11 @@ public class Material implements java.io.Serializable
|
|||||||
|
|
||||||
private String safetyStockStr;
|
private String safetyStockStr;
|
||||||
|
|
||||||
public Material()
|
public Material() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Material(Long Id)
|
public Material(Long Id) {
|
||||||
{
|
|
||||||
this.Id = Id;
|
this.Id = Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,43 +79,35 @@ public class Material implements java.io.Serializable
|
|||||||
OtherField3 = otherField3;
|
OtherField3 = otherField3;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getId()
|
public Long getId() {
|
||||||
{
|
|
||||||
return Id;
|
return Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public void setId(Long id) {
|
||||||
{
|
|
||||||
Id = id;
|
Id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MaterialCategory getMaterialCategory()
|
public MaterialCategory getMaterialCategory() {
|
||||||
{
|
|
||||||
return materialCategory;
|
return materialCategory;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMaterialCategory(MaterialCategory materialCategory)
|
public void setMaterialCategory(MaterialCategory materialCategory) {
|
||||||
{
|
|
||||||
this.materialCategory = materialCategory;
|
this.materialCategory = materialCategory;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName()
|
public String getName() {
|
||||||
{
|
|
||||||
return Name;
|
return Name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setName(String name)
|
public void setName(String name) {
|
||||||
{
|
|
||||||
Name = name;
|
Name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getModel()
|
public String getModel() {
|
||||||
{
|
|
||||||
return Model;
|
return Model;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setModel(String model)
|
public void setModel(String model) {
|
||||||
{
|
|
||||||
Model = model;
|
Model = model;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -130,13 +119,11 @@ public class Material implements java.io.Serializable
|
|||||||
Standard = standard;
|
Standard = standard;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getColor()
|
public String getColor() {
|
||||||
{
|
|
||||||
return Color;
|
return Color;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setColor(String color)
|
public void setColor(String color) {
|
||||||
{
|
|
||||||
Color = color;
|
Color = color;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,53 +135,43 @@ public class Material implements java.io.Serializable
|
|||||||
Unit = unit;
|
Unit = unit;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRetailPrice(Double retailPrice)
|
public Double getRetailPrice() {
|
||||||
{
|
|
||||||
RetailPrice = retailPrice;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getRetailPrice()
|
|
||||||
{
|
|
||||||
return RetailPrice;
|
return RetailPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLowPrice(Double lowPrice)
|
public void setRetailPrice(Double retailPrice) {
|
||||||
{
|
RetailPrice = retailPrice;
|
||||||
LowPrice = lowPrice;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getLowPrice()
|
public Double getLowPrice() {
|
||||||
{
|
|
||||||
return LowPrice;
|
return LowPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPresetPriceOne(Double presetPriceOne)
|
public void setLowPrice(Double lowPrice) {
|
||||||
{
|
LowPrice = lowPrice;
|
||||||
PresetPriceOne = presetPriceOne;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getPresetPriceOne()
|
public Double getPresetPriceOne() {
|
||||||
{
|
|
||||||
return PresetPriceOne;
|
return PresetPriceOne;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPresetPriceTwo(Double presetPriceTwo)
|
public void setPresetPriceOne(Double presetPriceOne) {
|
||||||
{
|
PresetPriceOne = presetPriceOne;
|
||||||
PresetPriceTwo = presetPriceTwo;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getPresetPriceTwo()
|
public Double getPresetPriceTwo() {
|
||||||
{
|
|
||||||
return PresetPriceTwo;
|
return PresetPriceTwo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRemark()
|
public void setPresetPriceTwo(Double presetPriceTwo) {
|
||||||
{
|
PresetPriceTwo = presetPriceTwo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRemark() {
|
||||||
return Remark;
|
return Remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRemark(String remark)
|
public void setRemark(String remark) {
|
||||||
{
|
|
||||||
Remark = remark;
|
Remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +1,18 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class MaterialCategory implements java.io.Serializable
|
public class MaterialCategory implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private String Name;
|
private String Name;
|
||||||
private Short CategoryLevel;
|
private Short CategoryLevel;
|
||||||
private MaterialCategory materialCategory;
|
private MaterialCategory materialCategory;
|
||||||
|
|
||||||
|
|
||||||
public MaterialCategory()
|
public MaterialCategory() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public MaterialCategory(Long Id)
|
public MaterialCategory(Long Id) {
|
||||||
{
|
|
||||||
this.Id = Id;
|
this.Id = Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,8 +12,7 @@ public class MaterialProperty implements java.io.Serializable {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public MaterialProperty(Long id)
|
public MaterialProperty(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +1,16 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Person implements java.io.Serializable
|
public class Person implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private String Type;
|
private String Type;
|
||||||
private String Name;
|
private String Name;
|
||||||
|
|
||||||
public Person()
|
public Person() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Person(Long Id)
|
public Person(Long Id) {
|
||||||
{
|
|
||||||
this.Id = Id;
|
this.Id = Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Role implements java.io.Serializable
|
public class Role implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long Id;
|
private Long Id;
|
||||||
private String Name;
|
private String Name;
|
||||||
|
|
||||||
public Role()
|
public Role() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ package com.jsh.model.po;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Supplier implements java.io.Serializable
|
public class Supplier implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long id = 0l;
|
private Long id = 0l;
|
||||||
private String supplier = "";
|
private String supplier = "";
|
||||||
private String type = "";
|
private String type = "";
|
||||||
@@ -49,13 +48,11 @@ public class Supplier implements java.io.Serializable
|
|||||||
private String enabledStr;
|
private String enabledStr;
|
||||||
|
|
||||||
|
|
||||||
public Supplier()
|
public Supplier() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Supplier(Long id)
|
public Supplier(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,18 +83,15 @@ public class Supplier implements java.io.Serializable
|
|||||||
this.taxRate = taxRate;
|
this.taxRate = taxRate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getId()
|
public Long getId() {
|
||||||
{
|
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id)
|
public void setId(Long id) {
|
||||||
{
|
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSupplier()
|
public String getSupplier() {
|
||||||
{
|
|
||||||
return supplier;
|
return supplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,46 +131,38 @@ public class Supplier implements java.io.Serializable
|
|||||||
this.email = email;
|
this.email = email;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBeginNeedGet(Double beginNeedGet)
|
public Double getBeginNeedGet() {
|
||||||
{
|
|
||||||
BeginNeedGet = beginNeedGet;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getBeginNeedGet()
|
|
||||||
{
|
|
||||||
return BeginNeedGet;
|
return BeginNeedGet;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBeginNeedPay(Double beginNeedPay)
|
public void setBeginNeedGet(Double beginNeedGet) {
|
||||||
{
|
BeginNeedGet = beginNeedGet;
|
||||||
BeginNeedPay = beginNeedPay;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getBeginNeedPay()
|
public Double getBeginNeedPay() {
|
||||||
{
|
|
||||||
return BeginNeedPay;
|
return BeginNeedPay;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAllNeedGet(Double allNeedGet)
|
public void setBeginNeedPay(Double beginNeedPay) {
|
||||||
{
|
BeginNeedPay = beginNeedPay;
|
||||||
AllNeedGet = allNeedGet;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getAllNeedGet()
|
public Double getAllNeedGet() {
|
||||||
{
|
|
||||||
return AllNeedGet;
|
return AllNeedGet;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAllNeedPay(Double allNeedPay)
|
public void setAllNeedGet(Double allNeedGet) {
|
||||||
{
|
AllNeedGet = allNeedGet;
|
||||||
AllNeedPay = allNeedPay;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getAllNeedPay()
|
public Double getAllNeedPay() {
|
||||||
{
|
|
||||||
return AllNeedPay;
|
return AllNeedPay;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setAllNeedPay(Double allNeedPay) {
|
||||||
|
AllNeedPay = allNeedPay;
|
||||||
|
}
|
||||||
|
|
||||||
public Short getIsystem() {
|
public Short getIsystem() {
|
||||||
return isystem;
|
return isystem;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class SystemConfig implements java.io.Serializable
|
public class SystemConfig implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long id;
|
private Long id;
|
||||||
private String type;
|
private String type;
|
||||||
private String name;
|
private String name;
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
package com.jsh.model.po;
|
package com.jsh.model.po;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class Unit implements java.io.Serializable
|
public class Unit implements java.io.Serializable {
|
||||||
{
|
|
||||||
private Long id;
|
private Long id;
|
||||||
private String UName;
|
private String UName;
|
||||||
|
|
||||||
public Unit()
|
public Unit() {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -15,8 +13,7 @@ public class Unit implements java.io.Serializable
|
|||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Unit(String UName)
|
public Unit(String UName) {
|
||||||
{
|
|
||||||
this.UName = UName;
|
this.UName = UName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user