Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
b9aa20b5 由 康伟
选项

kangwei:解决药剂验收单：mybaitsplus 实体类与表名不一致 queryById 返回null

1 个父辈 d9595810
内嵌 并排
正在显示 6 个修改的文件 包含 70 行增加 和 70 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialAcceptanceFormController.java
......@@ -70,9 +70,9 @@ public class MaterialAcceptanceFormController {
@ApiOperation(value="erp--物料验收单-分页列表查询", notes="erp--物料验收单-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MaterialAcceptanceForm>> queryPageList(MaterialAcceptanceForm materialAcceptanceForm,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<MaterialAcceptanceForm>> result = new Result<IPage<MaterialAcceptanceForm>>();
QueryWrapper<MaterialAcceptanceForm> queryWrapper = QueryGenerator.initQueryWrapper(materialAcceptanceForm, req.getParameterMap());
Page<MaterialAcceptanceForm> page = new Page<MaterialAcceptanceForm>(pageNo, pageSize);
......@@ -136,7 +136,7 @@ public class MaterialAcceptanceFormController {
@PutMapping(value = "/edit")
public Result<MaterialAcceptanceForm> edit(@RequestBody MaterialAcceptanceForm materialAcceptanceForm) {
Result<MaterialAcceptanceForm> result = new Result<MaterialAcceptanceForm>();
/* */
/* */
if(StringUtils.isNotBlank(materialAcceptanceForm.getReceiverSign())){
materialAcceptanceForm.setConfirmStatus("1");
}
......@@ -151,8 +151,6 @@ public class MaterialAcceptanceFormController {
result.success("修改成功!");
return result;
}
/**
* <pre>
* 通过id删除
......@@ -188,7 +186,7 @@ public class MaterialAcceptanceFormController {
@GetMapping(value = "/queryById")
public Result<MaterialAcceptanceForm> queryById(@RequestParam(name="id",required=true) String id) {
Result<MaterialAcceptanceForm> result = new Result<MaterialAcceptanceForm>();
MaterialAcceptanceForm materialAcceptanceForm = materialAcceptanceFormService.getById(id);
MaterialAcceptanceForm materialAcceptanceForm = materialAcceptanceFormService.queryById(id);
if(materialAcceptanceForm==null) {
//result.error500("未找到对应实体");
materialAcceptanceForm = new MaterialAcceptanceForm();
......@@ -229,13 +227,15 @@ public class MaterialAcceptanceFormController {
//result.error500("未找到对应实体");
materialAcceptanceFormService.save(materialAcceptanceForm);
}else {
materialAcceptanceFormService.updateById(materialAcceptanceForm);
acceptanceForm.setConfirmStatus(materialAcceptanceForm.getConfirmStatus());
acceptanceForm.setSenderSign(materialAcceptanceForm.getSenderSign());
materialAcceptanceFormService.updateById(acceptanceForm);
}
MaterialIN materialIN =materialINService.getById(materialAcceptanceForm.getId());
materialIN.setConfirmStatus(materialAcceptanceForm.getConfirmStatus());
materialINService.updateById( materialIN);
result.setResult(materialAcceptanceForm);
result.setResult(acceptanceForm);
result.success("修改成功!");
return result;
}
......@@ -263,7 +263,7 @@ public class MaterialAcceptanceFormController {
/**
/**
* <pre>
* 导出excel
* </pre>
......@@ -274,33 +274,33 @@ public class MaterialAcceptanceFormController {
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
// Step.1 组装查询条件
QueryWrapper<MaterialAcceptanceForm> queryWrapper = null;
try {
String paramsStr = request.getParameter("paramsStr");
if (ConvertUtils.isNotEmpty(paramsStr)) {
String deString = URLDecoder.decode(paramsStr, "UTF-8");
MaterialAcceptanceForm materialAcceptanceForm = JSON.parseObject(deString, MaterialAcceptanceForm.class);
queryWrapper = QueryGenerator.initQueryWrapper(materialAcceptanceForm, request.getParameterMap());
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
// Step.1 组装查询条件
QueryWrapper<MaterialAcceptanceForm> queryWrapper = null;
try {
String paramsStr = request.getParameter("paramsStr");
if (ConvertUtils.isNotEmpty(paramsStr)) {
String deString = URLDecoder.decode(paramsStr, "UTF-8");
MaterialAcceptanceForm materialAcceptanceForm = JSON.parseObject(deString, MaterialAcceptanceForm.class);
queryWrapper = QueryGenerator.initQueryWrapper(materialAcceptanceForm, request.getParameterMap());
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<MaterialAcceptanceForm> pageList = materialAcceptanceFormService.list(queryWrapper);
//导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "物料验收单列表");
mv.addObject(NormalExcelConstants.CLASS, MaterialAcceptanceForm.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("物料验收单列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<MaterialAcceptanceForm> pageList = materialAcceptanceFormService.list(queryWrapper);
//导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "物料验收单列表");
mv.addObject(NormalExcelConstants.CLASS, MaterialAcceptanceForm.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("物料验收单列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
/**
/**
* <pre>
* 通过excel导入数据
* </pre>
......@@ -310,32 +310,32 @@ public class MaterialAcceptanceFormController {
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
params.setNeedSave(true);
try {
List<MaterialAcceptanceForm> listMaterialAcceptanceForms = ExcelImportUtil.importExcel(file.getInputStream(), MaterialAcceptanceForm.class, params);
materialAcceptanceFormService.saveBatch(listMaterialAcceptanceForms);
return Result.ok("文件导入成功！数据行数:" + listMaterialAcceptanceForms.size());
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return Result.ok("文件导入失败！");
}
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
params.setNeedSave(true);
try {
List<MaterialAcceptanceForm> listMaterialAcceptanceForms = ExcelImportUtil.importExcel(file.getInputStream(), MaterialAcceptanceForm.class, params);
materialAcceptanceFormService.saveBatch(listMaterialAcceptanceForms);
return Result.ok("文件导入成功！数据行数:" + listMaterialAcceptanceForms.size());
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return Result.ok("文件导入失败！");
}
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/TestMetricInfoController.java
......@@ -300,4 +300,6 @@ public class TestMetricInfoController {
return result;
}
}
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IMaterialAcceptanceFormService.java
......@@ -20,4 +20,6 @@ public interface IMaterialAcceptanceFormService extends IService<MaterialAccepta
List<MaterialAcceptanceForm> queryArrivalRecordByList(MaterialIN materialIN);
void saveOrUpdateMaterialAcceptanceForm(MaterialAcceptanceForm materialAcceptanceForm);
MaterialAcceptanceForm queryById(String id);
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialAcceptanceFormServiceImpl.java
......@@ -40,4 +40,7 @@ public class MaterialAcceptanceFormServiceImpl extends ServiceImpl<MaterialAccep
baseMapper.updateMaterialINConfirmStatus(materialAcceptanceForm.getId(),materialAcceptanceForm.getConfirmStatus());
}
public MaterialAcceptanceForm queryById(String id){
return baseMapper.selectById(id);
}
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerLevelManageController.java
package com.skua.modules.safe.controller;
import java.io.File;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.io.IOException;
......@@ -14,7 +13,6 @@ import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.core.query.QueryGenerator;
import com.skua.core.util.ConvertUtils;
import com.skua.core.util.DateUtils;
import com.skua.modules.safe.entity.DangerLevelManage;
import com.skua.modules.safe.entity.DangerLevelManageShare;
import com.skua.modules.safe.service.IDangerLevelManageService;
......@@ -22,8 +20,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.safe.service.IDangerLevelManageShareService;
import com.skua.modules.system.datestandard.entity.SysStructDict;
import com.skua.modules.system.entity.SysDepart;
import com.skua.modules.system.service.ISysConfigService;
import com.skua.modules.system.service.ISysDepartService;
import com.skua.tool.util.JSUtils;
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerLevelManage.java
package com.skua.modules.safe.entity;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
......@@ -17,8 +16,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import javax.persistence.Column;
/**
* 风险分级管控清单
*/
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!