代码格式

master
erzhongxmu 2024-01-11 22:37:29 +08:00
parent 44b8f61bf4
commit f95d3a534e
2 changed files with 368 additions and 367 deletions

View File

@ -1,4 +1,5 @@
package com.zzjee.wm.controller;
import com.zzjee.md.entity.MdCusEntity;
import com.zzjee.wm.entity.WmImNoticeHEntity;
import com.zzjee.wm.entity.WmNoticeConfEntity;
@ -81,12 +82,11 @@ import org.springframework.http.MediaType;
import org.springframework.web.util.UriComponentsBuilder;
/**
* @author erzhongxmu
* @version V1.0
* @Title: Controller
* @Description:
* @author erzhongxmu
* @date 2017-08-15 23:18:21
* @version V1.0
*
*/
@Controller
@RequestMapping("/wmNoticeConfController")
@ -104,7 +104,6 @@ public class WmNoticeConfController extends BaseController {
private Validator validator;
/**
*
*
@ -125,16 +124,16 @@ public class WmNoticeConfController extends BaseController {
*/
@RequestMapping(params = "datagrid")
public void datagrid(WmNoticeConfEntity wmNoticeConf,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
public void datagrid(WmNoticeConfEntity wmNoticeConf, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
CriteriaQuery cq = new CriteriaQuery(WmNoticeConfEntity.class, dataGrid);
//查询条件组装器
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, wmNoticeConf, request.getParameterMap());
try{
try {
//自定义追加查询条件
}catch (Exception e) {
} catch (Exception e) {
throw new BusinessException(e.getMessage());
}
Map<String,Object> map1 = new HashMap<String,Object>();
Map<String, Object> map1 = new HashMap<String, Object>();
map1.put("wmNoticeId", "desc");
cq.setOrder(map1);
cq.add();
@ -154,10 +153,10 @@ public class WmNoticeConfController extends BaseController {
AjaxJson j = new AjaxJson();
wmNoticeConf = systemService.getEntity(WmNoticeConfEntity.class, wmNoticeConf.getId());
message = "回单管理删除成功";
try{
try {
wmNoticeConfService.delete(wmNoticeConf);
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
}catch(Exception e){
} catch (Exception e) {
e.printStackTrace();
message = "回单管理删除失败";
throw new BusinessException(e.getMessage());
@ -166,15 +165,15 @@ public class WmNoticeConfController extends BaseController {
return j;
}
@RequestMapping(params = "doGethuozhu",method ={RequestMethod.GET, RequestMethod.POST})
@RequestMapping(params = "doGethuozhu", method = {RequestMethod.GET, RequestMethod.POST})
@ResponseBody
public AjaxJson doGethuozhu(HttpServletRequest request) {
AjaxJson j = new AjaxJson();
WmOmNoticeHEntity wmOmNoticeHEntity = systemService.findUniqueByProperty(WmOmNoticeHEntity.class, "omNoticeId", oConvertUtils.getString(request.getParameter("wmNoticeId")));
if(wmOmNoticeHEntity!=null&&(!wmOmNoticeHEntity.getOmSta().equals("已删除")||!wmOmNoticeHEntity.getOmSta().equals("已完成"))){
if (wmOmNoticeHEntity != null && (!wmOmNoticeHEntity.getOmSta().equals("已删除") || !wmOmNoticeHEntity.getOmSta().equals("已完成"))) {
MdCusEntity md = systemService.findUniqueByProperty(MdCusEntity.class, "keHuBianMa", wmOmNoticeHEntity.getCusCode());
j.setObj(md);
}else{
} else {
j.setSuccess(false);
j.setMsg("不允许此操作");
}
@ -189,19 +188,19 @@ public class WmNoticeConfController extends BaseController {
*/
@RequestMapping(params = "doBatchDel")
@ResponseBody
public AjaxJson doBatchDel(String ids,HttpServletRequest request){
public AjaxJson doBatchDel(String ids, HttpServletRequest request) {
String message = null;
AjaxJson j = new AjaxJson();
message = "回单管理删除成功";
try{
for(String id:ids.split(",")){
try {
for (String id : ids.split(",")) {
WmNoticeConfEntity wmNoticeConf = systemService.getEntity(WmNoticeConfEntity.class,
id
);
wmNoticeConfService.delete(wmNoticeConf);
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
}
}catch(Exception e){
} catch (Exception e) {
e.printStackTrace();
message = "回单管理删除失败";
throw new BusinessException(e.getMessage());
@ -223,28 +222,28 @@ public class WmNoticeConfController extends BaseController {
String message = null;
AjaxJson j = new AjaxJson();
message = "回单管理添加成功";
try{
try {
WmOmNoticeHEntity wmOmNoticeHEntity = systemService.findUniqueByProperty(WmOmNoticeHEntity.class, "omNoticeId", wmNoticeConf.getWmNoticeId());
if(wmOmNoticeHEntity!=null){
if(wmOmNoticeHEntity.getOmSta().equals(Constants.wm_sta4)){
if (wmOmNoticeHEntity != null) {
if (wmOmNoticeHEntity.getOmSta().equals(Constants.wm_sta4)) {
j.setSuccess(false);
j.setMsg("此出货单已完成");
return j;
}else{
} else {
wmOmNoticeHEntity.setOmSta(Constants.wm_sta4);
systemService.saveOrUpdate(wmOmNoticeHEntity);
wmNoticeConfService.save(wmNoticeConf);
}
}else{
} else {
j.setSuccess(false);
j.setMsg("不存在此出货单");
return j;
}
systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO);
}catch(Exception e){
} catch (Exception e) {
e.printStackTrace();
message = "回单管理添加失败";
throw new BusinessException(e.getMessage());
@ -293,6 +292,7 @@ public class WmNoticeConfController extends BaseController {
}
return new ModelAndView("com/zzjee/wm/wmNoticeConf-add");
}
/**
*
*
@ -314,7 +314,7 @@ public class WmNoticeConfController extends BaseController {
*/
@RequestMapping(params = "upload")
public ModelAndView upload(HttpServletRequest req) {
req.setAttribute("controller_name","wmNoticeConfController");
req.setAttribute("controller_name", "wmNoticeConfController");
return new ModelAndView("common/upload/pub_excel_upload");
}
@ -325,18 +325,19 @@ public class WmNoticeConfController extends BaseController {
* @param response
*/
@RequestMapping(params = "exportXls")
public String exportXls(WmNoticeConfEntity wmNoticeConf,HttpServletRequest request,HttpServletResponse response
, DataGrid dataGrid,ModelMap modelMap) {
public String exportXls(WmNoticeConfEntity wmNoticeConf, HttpServletRequest request, HttpServletResponse response
, DataGrid dataGrid, ModelMap modelMap) {
CriteriaQuery cq = new CriteriaQuery(WmNoticeConfEntity.class, dataGrid);
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, wmNoticeConf, request.getParameterMap());
List<WmNoticeConfEntity> wmNoticeConfs = this.wmNoticeConfService.getListByCriteriaQuery(cq,false);
modelMap.put(NormalExcelConstants.FILE_NAME,"回单管理");
modelMap.put(NormalExcelConstants.CLASS,WmNoticeConfEntity.class);
modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("回单管理列表", "导出人:"+ResourceUtil.getSessionUserName().getRealName(),
List<WmNoticeConfEntity> wmNoticeConfs = this.wmNoticeConfService.getListByCriteriaQuery(cq, false);
modelMap.put(NormalExcelConstants.FILE_NAME, "回单管理");
modelMap.put(NormalExcelConstants.CLASS, WmNoticeConfEntity.class);
modelMap.put(NormalExcelConstants.PARAMS, new ExportParams("回单管理列表", "导出人:" + ResourceUtil.getSessionUserName().getRealName(),
"导出信息"));
modelMap.put(NormalExcelConstants.DATA_LIST,wmNoticeConfs);
modelMap.put(NormalExcelConstants.DATA_LIST, wmNoticeConfs);
return NormalExcelConstants.JEECG_EXCEL_VIEW;
}
/**
* excel 使
*
@ -344,13 +345,13 @@ public class WmNoticeConfController extends BaseController {
* @param response
*/
@RequestMapping(params = "exportXlsByT")
public String exportXlsByT(WmNoticeConfEntity wmNoticeConf,HttpServletRequest request,HttpServletResponse response
, DataGrid dataGrid,ModelMap modelMap) {
modelMap.put(NormalExcelConstants.FILE_NAME,"回单管理");
modelMap.put(NormalExcelConstants.CLASS,WmNoticeConfEntity.class);
modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("回单管理列表", "导出人:"+ResourceUtil.getSessionUserName().getRealName(),
public String exportXlsByT(WmNoticeConfEntity wmNoticeConf, HttpServletRequest request, HttpServletResponse response
, DataGrid dataGrid, ModelMap modelMap) {
modelMap.put(NormalExcelConstants.FILE_NAME, "回单管理");
modelMap.put(NormalExcelConstants.CLASS, WmNoticeConfEntity.class);
modelMap.put(NormalExcelConstants.PARAMS, new ExportParams("回单管理列表", "导出人:" + ResourceUtil.getSessionUserName().getRealName(),
"导出信息"));
modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList());
modelMap.put(NormalExcelConstants.DATA_LIST, new ArrayList());
return NormalExcelConstants.JEECG_EXCEL_VIEW;
}
@ -369,18 +370,18 @@ public class WmNoticeConfController extends BaseController {
params.setHeadRows(1);
params.setNeedSave(true);
try {
List<WmNoticeConfEntity> listWmNoticeConfEntitys = ExcelImportUtil.importExcel(file.getInputStream(),WmNoticeConfEntity.class,params);
List<WmNoticeConfEntity> listWmNoticeConfEntitys = ExcelImportUtil.importExcel(file.getInputStream(), WmNoticeConfEntity.class, params);
for (WmNoticeConfEntity wmNoticeConf : listWmNoticeConfEntitys) {
WmOmNoticeHEntity wmOmNoticeHEntity = systemService.findUniqueByProperty(WmOmNoticeHEntity.class, "omNoticeId", wmNoticeConf.getWmNoticeId());
if(wmOmNoticeHEntity!=null){
if(wmOmNoticeHEntity.getOmSta().equals(Constants.wm_sta4)){
if (wmOmNoticeHEntity != null) {
if (wmOmNoticeHEntity.getOmSta().equals(Constants.wm_sta4)) {
}else{
} else {
wmOmNoticeHEntity.setOmSta(Constants.wm_sta4);
systemService.saveOrUpdate(wmOmNoticeHEntity);
}
}else{
} else {
wmNoticeConfService.save(wmNoticeConf);
}
@ -390,7 +391,7 @@ public class WmNoticeConfController extends BaseController {
} catch (Exception e) {
j.setMsg("文件导入失败!");
logger.error(ExceptionUtil.getExceptionMessage(e));
}finally{
} finally {
try {
file.getInputStream().close();
} catch (IOException e) {
@ -404,7 +405,7 @@ public class WmNoticeConfController extends BaseController {
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public List<WmNoticeConfEntity> list() {
List<WmNoticeConfEntity> listWmNoticeConfs=wmNoticeConfService.getList(WmNoticeConfEntity.class);
List<WmNoticeConfEntity> listWmNoticeConfs = wmNoticeConfService.getList(WmNoticeConfEntity.class);
return listWmNoticeConfs;
}
@ -428,7 +429,7 @@ public class WmNoticeConfController extends BaseController {
}
//保存
try{
try {
wmNoticeConfService.save(wmNoticeConf);
} catch (Exception e) {
e.printStackTrace();
@ -452,7 +453,7 @@ public class WmNoticeConfController extends BaseController {
}
//保存
try{
try {
wmNoticeConfService.saveOrUpdate(wmNoticeConf);
} catch (Exception e) {
e.printStackTrace();