雷海东 / factory-java · 提交

转到一个项目

作者 Win10-2023FDZSZ\Administrator
提交 efc4ec1b57c1d645dcdc8f77094be017b1626f1b 2 个父辈 f2f25036 894d6325

Merge branch 'dev' of http://39.105.222.208:1024/leihd/factory-java into dev

内嵌 并排对比
正在显示 3 个修改的文件 包含 213 行增加 和 155 行删除
@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse; @@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse;
16 import cn.hutool.core.collection.CollectionUtil; 16 import cn.hutool.core.collection.CollectionUtil;
17 import cn.hutool.core.date.DatePattern; 17 import cn.hutool.core.date.DatePattern;
18 import cn.hutool.core.date.DateUtil; 18 import cn.hutool.core.date.DateUtil;
  19 +import org.apache.commons.lang3.StringUtils;
19 import org.jeecg.common.api.vo.Result; 20 import org.jeecg.common.api.vo.Result;
20 import org.jeecg.common.system.query.QueryGenerator; 21 import org.jeecg.common.system.query.QueryGenerator;
21 import org.jeecg.common.util.oConvertUtils; 22 import org.jeecg.common.util.oConvertUtils;
@@ -82,9 +83,21 @@ public class TblTradeInventoryController extends JeecgController<TblTradeInvento @@ -82,9 +83,21 @@ public class TblTradeInventoryController extends JeecgController<TblTradeInvento
82 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, 83 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
83 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, 84 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
84 HttpServletRequest req) { 85 HttpServletRequest req) {
85 - TblTradeMeterial tblTradeMeterial = new TblTradeMeterial();  
86 - tblTradeMeterial.setMeterialReview(tblTradeInventory.getMaterialDescription());  
87 - QueryWrapper<TblTradeMeterial> queryWrapper = QueryGenerator.initQueryWrapper(tblTradeMeterial, req.getParameterMap()); 86 +// TblTradeMeterial tblTradeMeterial = new TblTradeMeterial();
  87 +// tblTradeMeterial.setMeterialReview(tblTradeInventory.getMaterialDescription());
  88 +// QueryWrapper<TblTradeMeterial> queryWrapper = QueryGenerator.initQueryWrapper(tblTradeMeterial, req.getParameterMap());
  89 +
  90 + QueryWrapper<TblTradeMeterial> queryWrapper = new QueryWrapper<>();
  91 + if (StringUtils.isNotBlank( tblTradeInventory.getMaterialDescription())){
  92 + queryWrapper.like("meterial_review", tblTradeInventory.getMaterialDescription());
  93 + }
  94 + if (StringUtils.isNotBlank(tblTradeInventory.getMaterialCode())){
  95 + queryWrapper.eq("meterial_code", tblTradeInventory.getMaterialCode());
  96 + }
  97 + if (StringUtils.isNotBlank(tblTradeInventory.getBrand())){
  98 + queryWrapper.like("brand", tblTradeInventory.getBrand());
  99 + }
  100 +
88 Page<TblTradeMeterial> page = new Page<TblTradeMeterial>(pageNo, pageSize); 101 Page<TblTradeMeterial> page = new Page<TblTradeMeterial>(pageNo, pageSize);
89 IPage<TblTradeMeterial> pageList = tblTradeMeterialService.page(page, queryWrapper); 102 IPage<TblTradeMeterial> pageList = tblTradeMeterialService.page(page, queryWrapper);
90 List<TblTradeMeterial> records = pageList.getRecords(); 103 List<TblTradeMeterial> records = pageList.getRecords();
@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse; @@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
13 13
14 import cn.hutool.core.collection.CollectionUtil; 14 import cn.hutool.core.collection.CollectionUtil;
15 import cn.hutool.core.util.StrUtil; 15 import cn.hutool.core.util.StrUtil;
  16 +import org.apache.commons.lang3.StringUtils;
16 import org.jeecg.common.api.vo.Result; 17 import org.jeecg.common.api.vo.Result;
17 import org.jeecg.common.system.query.QueryGenerator; 18 import org.jeecg.common.system.query.QueryGenerator;
18 import org.jeecg.common.util.oConvertUtils; 19 import org.jeecg.common.util.oConvertUtils;
@@ -42,165 +43,209 @@ import io.swagger.annotations.Api; @@ -42,165 +43,209 @@ import io.swagger.annotations.Api;
42 import io.swagger.annotations.ApiOperation; 43 import io.swagger.annotations.ApiOperation;
43 import org.jeecg.common.aspect.annotation.AutoLog; 44 import org.jeecg.common.aspect.annotation.AutoLog;
44 45
45 - /** 46 +/**
46 * @Description: 贸易管理物料表 47 * @Description: 贸易管理物料表
47 * @Author: jeecg-boot 48 * @Author: jeecg-boot
48 - * @Date: 2024-12-21 49 + * @Date: 2024-12-21
49 * @Version: V1.0 50 * @Version: V1.0
50 */ 51 */
51 -@Api(tags="贸易管理物料表") 52 +@Api(tags = "贸易管理物料表")
52 @RestController 53 @RestController
53 @RequestMapping("/trade/tblTradeMeterial") 54 @RequestMapping("/trade/tblTradeMeterial")
54 @Slf4j 55 @Slf4j
55 public class TblTradeMeterialController extends JeecgController<TblTradeMeterial, ITblTradeMeterialService> { 56 public class TblTradeMeterialController extends JeecgController<TblTradeMeterial, ITblTradeMeterialService> {
56 - @Autowired  
57 - private ITblTradeMeterialService tblTradeMeterialService;  
58 - @Autowired  
59 - private ITblTradeInventoryService tblTradeInventoryService;  
60 -  
61 -  
62 - @ApiOperation(value = "根据物料编号查询物料基础信息", notes = "根据物料编号查询物料基础信息")  
63 - @GetMapping(value = "/queryByMaterialCode")  
64 - public Result<TblTradeMeterial> queryByMaterialCode(TblTradeMeterial tblTradeMeterial){  
65 - String meterialCode = tblTradeMeterial.getMeterialCode();  
66 - QueryWrapper<TblTradeMeterial> queryWrapper = new QueryWrapper<>();  
67 - queryWrapper.eq("meterial_code", meterialCode);  
68 - List<TblTradeMeterial> list = tblTradeMeterialService.list(queryWrapper);  
69 - if (CollectionUtil.isEmpty(list)) {  
70 - return Result.error("未找到对应物料信息");  
71 - }  
72 - if (list.size() > 1) {  
73 - return Result.error("物料编码重复，请联系管理员");  
74 - }  
75 - return Result.OK(list.get(0));  
76 - }  
77 -  
78 - /**  
79 - * 分页列表查询  
80 - *  
81 - * @param tblTradeMeterial  
82 - * @param pageNo  
83 - * @param pageSize  
84 - * @param req  
85 - * @return  
86 - */  
87 - //@AutoLog(value = "贸易管理物料表-分页列表查询")  
88 - @ApiOperation(value="贸易管理物料表-分页列表查询", notes="贸易管理物料表-分页列表查询")  
89 - @GetMapping(value = "/list")  
90 - public Result<IPage<TblTradeMeterial>> queryPageList(TblTradeMeterial tblTradeMeterial,  
91 - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,  
92 - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,  
93 - HttpServletRequest req) {  
94 - QueryWrapper<TblTradeMeterial> queryWrapper = QueryGenerator.initQueryWrapper(tblTradeMeterial, req.getParameterMap());  
95 - Page<TblTradeMeterial> page = new Page<TblTradeMeterial>(pageNo, pageSize);  
96 - IPage<TblTradeMeterial> pageList = tblTradeMeterialService.page(page, queryWrapper);  
97 - return Result.OK(pageList);  
98 - }  
99 -  
100 - /**  
101 - * 添加  
102 - *  
103 - * @param tblTradeMeterial  
104 - * @return  
105 - */  
106 - @AutoLog(value = "贸易管理物料表-添加")  
107 - @ApiOperation(value="贸易管理物料表-添加", notes="贸易管理物料表-添加")  
108 - @PostMapping(value = "/add")  
109 - public Result<String> add(@RequestBody TblTradeMeterial tblTradeMeterial) {  
110 - if (StrUtil.isNotBlank(tblTradeMeterial.getCert())){  
111 - tblTradeMeterial.setCertDate(new Date());  
112 - }  
113 - if (StrUtil.isNotBlank(tblTradeMeterial.getModelChange())){  
114 - tblTradeMeterial.setModelChangeDate(new Date());  
115 - }  
116 - if (StrUtil.isNotBlank(tblTradeMeterial.getOther())){  
117 - tblTradeMeterial.setOtherDate(new Date());  
118 - }  
119 - tblTradeMeterialService.save(tblTradeMeterial);  
120 - TblTradeInventory record = new TblTradeInventory(tblTradeMeterial);  
121 - tblTradeInventoryService.save(record);  
122 - return Result.OK("添加成功！");  
123 - }  
124 -  
125 - /**  
126 - * 编辑  
127 - *  
128 - * @param tblTradeMeterial  
129 - * @return  
130 - */  
131 - @AutoLog(value = "贸易管理物料表-编辑")  
132 - @ApiOperation(value="贸易管理物料表-编辑", notes="贸易管理物料表-编辑")  
133 - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})  
134 - public Result<String> edit(@RequestBody TblTradeMeterial tblTradeMeterial) {  
135 - tblTradeMeterialService.updateById(tblTradeMeterial);  
136 - TblTradeInventory record = new TblTradeInventory(tblTradeMeterial);  
137 - tblTradeInventoryService.updateById(record);  
138 - return Result.OK("编辑成功!");  
139 - }  
140 -  
141 - /**  
142 - * 通过id删除  
143 - *  
144 - * @param id  
145 - * @return  
146 - */  
147 - @AutoLog(value = "贸易管理物料表-通过id删除")  
148 - @ApiOperation(value="贸易管理物料表-通过id删除", notes="贸易管理物料表-通过id删除")  
149 - @DeleteMapping(value = "/delete")  
150 - public Result<String> delete(@RequestParam(name="id",required=true) String id) {  
151 - tblTradeMeterialService.removeById(id);  
152 - return Result.OK("删除成功!");  
153 - }  
154 -  
155 - /**  
156 - * 批量删除  
157 - *  
158 - * @param ids  
159 - * @return  
160 - */  
161 - @AutoLog(value = "贸易管理物料表-批量删除")  
162 - @ApiOperation(value="贸易管理物料表-批量删除", notes="贸易管理物料表-批量删除")  
163 - @DeleteMapping(value = "/deleteBatch")  
164 - public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {  
165 - this.tblTradeMeterialService.removeByIds(Arrays.asList(ids.split(",")));  
166 - return Result.OK("批量删除成功!");  
167 - }  
168 -  
169 - /**  
170 - * 通过id查询  
171 - *  
172 - * @param id  
173 - * @return  
174 - */  
175 - //@AutoLog(value = "贸易管理物料表-通过id查询")  
176 - @ApiOperation(value="贸易管理物料表-通过id查询", notes="贸易管理物料表-通过id查询")  
177 - @GetMapping(value = "/queryById")  
178 - public Result<TblTradeMeterial> queryById(@RequestParam(name="id",required=true) String id) {  
179 - TblTradeMeterial tblTradeMeterial = tblTradeMeterialService.getById(id);  
180 - if(tblTradeMeterial==null) {  
181 - return Result.error("未找到对应数据");  
182 - }  
183 - return Result.OK(tblTradeMeterial);  
184 - } 57 + @Autowired
  58 + private ITblTradeMeterialService tblTradeMeterialService;
  59 + @Autowired
  60 + private ITblTradeInventoryService tblTradeInventoryService;
  61 +
  62 +
  63 + @ApiOperation(value = "根据物料编号查询物料基础信息", notes = "根据物料编号查询物料基础信息")
  64 + @GetMapping(value = "/queryByMaterialCode")
  65 + public Result<TblTradeMeterial> queryByMaterialCode(TblTradeMeterial tblTradeMeterial) {
  66 + String meterialCode = tblTradeMeterial.getMeterialCode();
  67 + QueryWrapper<TblTradeMeterial> queryWrapper = new QueryWrapper<>();
  68 + queryWrapper.eq("meterial_code", meterialCode);
  69 + List<TblTradeMeterial> list = tblTradeMeterialService.list(queryWrapper);
  70 + if (CollectionUtil.isEmpty(list)) {
  71 + return Result.error("未找到对应物料信息");
  72 + }
  73 + if (list.size() > 1) {
  74 + return Result.error("物料编码重复，请联系管理员");
  75 + }
  76 + return Result.OK(list.get(0));
  77 + }
  78 +
  79 + /**
  80 + * 分页列表查询
  81 + *
  82 + * @param tblTradeMeterial
  83 + * @param pageNo
  84 + * @param pageSize
  85 + * @param req
  86 + * @return
  87 + */
  88 + //@AutoLog(value = "贸易管理物料表-分页列表查询")
  89 + @ApiOperation(value = "贸易管理物料表-分页列表查询", notes = "贸易管理物料表-分页列表查询")
  90 + @GetMapping(value = "/list")
  91 + public Result<IPage<TblTradeMeterial>> queryPageList(TblTradeMeterial tblTradeMeterial,
  92 + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
  93 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
  94 + HttpServletRequest req) {
  95 + QueryWrapper<TblTradeMeterial> queryWrapper = new QueryWrapper<>();
  96 + if (StringUtils.isNotBlank(tblTradeMeterial.getMeterialReview())) {
  97 + queryWrapper.like("meterial_review", tblTradeMeterial.getMeterialReview());
  98 + }
  99 + if (StringUtils.isNotBlank(tblTradeMeterial.getMeterialCode())) {
  100 + queryWrapper.eq("meterial_code", tblTradeMeterial.getMeterialCode());
  101 + }
  102 + if (StringUtils.isNotBlank(tblTradeMeterial.getBrand())){
  103 + queryWrapper.eq("brand", tblTradeMeterial.getBrand());
  104 + }
  105 + Page<TblTradeMeterial> page = new Page<TblTradeMeterial>(pageNo, pageSize);
  106 + IPage<TblTradeMeterial> pageList = tblTradeMeterialService.page(page, queryWrapper);
  107 + return Result.OK(pageList);
  108 + }
  109 +
  110 + /**
  111 + * 添加
  112 + *
  113 + * @param tblTradeMeterial
  114 + * @return
  115 + */
  116 + @AutoLog(value = "贸易管理物料表-添加")
  117 + @ApiOperation(value = "贸易管理物料表-添加", notes = "贸易管理物料表-添加")
  118 + @PostMapping(value = "/add")
  119 + public Result<String> add(@RequestBody TblTradeMeterial tblTradeMeterial) {
  120 + if (StrUtil.isNotBlank(tblTradeMeterial.getCert())) {
  121 + tblTradeMeterial.setCertDate(new Date());
  122 + }
  123 + if (StrUtil.isNotBlank(tblTradeMeterial.getModelChange())) {
  124 + tblTradeMeterial.setModelChangeDate(new Date());
  125 + }
  126 + if (StrUtil.isNotBlank(tblTradeMeterial.getOther())) {
  127 + tblTradeMeterial.setOtherDate(new Date());
  128 + }
  129 + tblTradeMeterialService.save(tblTradeMeterial);
  130 + TblTradeInventory record = new TblTradeInventory(tblTradeMeterial);
  131 + tblTradeInventoryService.save(record);
  132 + return Result.OK("添加成功！");
  133 + }
  134 +
  135 + /**
  136 + * 编辑
  137 + *
  138 + * @param tblTradeMeterial
  139 + * @return
  140 + */
  141 + @AutoLog(value = "贸易管理物料表-编辑")
  142 + @ApiOperation(value = "贸易管理物料表-编辑", notes = "贸易管理物料表-编辑")
  143 + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
  144 + public Result<String> edit(@RequestBody TblTradeMeterial tblTradeMeterial) {
  145 + if (tblTradeMeterial == null || tblTradeMeterial.getId() == null) {
  146 + return Result.error("参数不正确");
  147 + }
  148 + //数据库记录信息
  149 + TblTradeMeterial meterial = tblTradeMeterialService.getById(tblTradeMeterial.getId());
  150 + if (meterial == null) {
  151 + return Result.error("未找到对应数据");
  152 + }
  153 +// 比对此次更新型号变更说明、合格证、其他是否进行了更改，若更改了则将其更新时间进行修改
  154 + String modelChange = meterial.getModelChange();
  155 + String cert = meterial.getCert();
  156 + String other = meterial.getOther();
  157 + if ((StrUtil.isNotBlank(modelChange) && StrUtil.isBlank(tblTradeMeterial.getModelChange()))
  158 + || (StrUtil.isBlank(modelChange) && StrUtil.isNotBlank(tblTradeMeterial.getModelChange()))) {
  159 + tblTradeMeterial.setModelChangeDate(new Date());
  160 + }else if (modelChange != null && !modelChange.equals(tblTradeMeterial.getModelChange())){
  161 + tblTradeMeterial.setModelChangeDate(new Date());
  162 + }
  163 +
  164 + if ((StrUtil.isNotBlank(cert) && StrUtil.isBlank(tblTradeMeterial.getCert()))
  165 + || (StrUtil.isBlank(cert) && StrUtil.isNotBlank(tblTradeMeterial.getCert()))) {
  166 +
  167 + tblTradeMeterial.setCertDate(new Date());
  168 + } else if (cert != null && !cert.equals(tblTradeMeterial.getCert())){
  169 +
  170 + tblTradeMeterial.setCertDate(new Date());
  171 + }
  172 +
  173 + if ((StrUtil.isNotBlank(other) && StrUtil.isBlank(tblTradeMeterial.getOther()))
  174 + || (StrUtil.isBlank(other) && StrUtil.isNotBlank(tblTradeMeterial.getOther()))) {
  175 + tblTradeMeterial.setOtherDate(new Date());
  176 + } else if (other != null && !other.equals(tblTradeMeterial.getOther())){
  177 + tblTradeMeterial.setOtherDate(new Date());
  178 + }
  179 +
  180 + tblTradeMeterialService.updateById(tblTradeMeterial);
  181 + TblTradeInventory record = new TblTradeInventory(tblTradeMeterial);
  182 + tblTradeInventoryService.updateById(record);
  183 + return Result.OK("编辑成功!");
  184 + }
  185 +
  186 + /**
  187 + * 通过id删除
  188 + *
  189 + * @param id
  190 + * @return
  191 + */
  192 + @AutoLog(value = "贸易管理物料表-通过id删除")
  193 + @ApiOperation(value = "贸易管理物料表-通过id删除", notes = "贸易管理物料表-通过id删除")
  194 + @DeleteMapping(value = "/delete")
  195 + public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
  196 + tblTradeMeterialService.removeById(id);
  197 + return Result.OK("删除成功!");
  198 + }
  199 +
  200 + /**
  201 + * 批量删除
  202 + *
  203 + * @param ids
  204 + * @return
  205 + */
  206 + @AutoLog(value = "贸易管理物料表-批量删除")
  207 + @ApiOperation(value = "贸易管理物料表-批量删除", notes = "贸易管理物料表-批量删除")
  208 + @DeleteMapping(value = "/deleteBatch")
  209 + public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
  210 + this.tblTradeMeterialService.removeByIds(Arrays.asList(ids.split(",")));
  211 + return Result.OK("批量删除成功!");
  212 + }
  213 +
  214 + /**
  215 + * 通过id查询
  216 + *
  217 + * @param id
  218 + * @return
  219 + */
  220 + //@AutoLog(value = "贸易管理物料表-通过id查询")
  221 + @ApiOperation(value = "贸易管理物料表-通过id查询", notes = "贸易管理物料表-通过id查询")
  222 + @GetMapping(value = "/queryById")
  223 + public Result<TblTradeMeterial> queryById(@RequestParam(name = "id", required = true) String id) {
  224 + TblTradeMeterial tblTradeMeterial = tblTradeMeterialService.getById(id);
  225 + if (tblTradeMeterial == null) {
  226 + return Result.error("未找到对应数据");
  227 + }
  228 + return Result.OK(tblTradeMeterial);
  229 + }
185 230
186 /** 231 /**
187 - * 导出excel  
188 - *  
189 - * @param request  
190 - * @param tblTradeMeterial  
191 - */ 232 + * 导出excel
  233 + *
  234 + * @param request
  235 + * @param tblTradeMeterial
  236 + */
192 @RequestMapping(value = "/exportXls") 237 @RequestMapping(value = "/exportXls")
193 public ModelAndView exportXls(HttpServletRequest request, TblTradeMeterial tblTradeMeterial) { 238 public ModelAndView exportXls(HttpServletRequest request, TblTradeMeterial tblTradeMeterial) {
194 return super.exportXls(request, tblTradeMeterial, TblTradeMeterial.class, "贸易管理物料表"); 239 return super.exportXls(request, tblTradeMeterial, TblTradeMeterial.class, "贸易管理物料表");
195 } 240 }
196 241
197 /** 242 /**
198 - * 通过excel导入数据  
199 - *  
200 - * @param request  
201 - * @param response  
202 - * @return  
203 - */ 243 + * 通过excel导入数据
  244 + *
  245 + * @param request
  246 + * @param response
  247 + * @return
  248 + */
204 @RequestMapping(value = "/importExcel", method = RequestMethod.POST) 249 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
205 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { 250 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
206 return super.importExcel(request, response, TblTradeMeterial.class); 251 return super.importExcel(request, response, TblTradeMeterial.class);
@@ -78,9 +78,9 @@ public class TblTradeMeterial implements Serializable { @@ -78,9 +78,9 @@ public class TblTradeMeterial implements Serializable {
78 @ApiModelProperty(value = "型号变更说明") 78 @ApiModelProperty(value = "型号变更说明")
79 private java.lang.String modelChange; 79 private java.lang.String modelChange;
80 /**日期时间*/ 80 /**日期时间*/
81 - @Excel(name = "日期时间", width = 15, format = "yyyy-MM-dd")  
82 - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")  
83 - @DateTimeFormat(pattern="yyyy-MM-dd") 81 + @Excel(name = "日期时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
  82 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
  83 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
84 @ApiModelProperty(value = "日期时间") 84 @ApiModelProperty(value = "日期时间")
85 private java.util.Date modelChangeDate; 85 private java.util.Date modelChangeDate;
86 /**合格证*/ 86 /**合格证*/
@@ -88,9 +88,9 @@ public class TblTradeMeterial implements Serializable { @@ -88,9 +88,9 @@ public class TblTradeMeterial implements Serializable {
88 @ApiModelProperty(value = "合格证") 88 @ApiModelProperty(value = "合格证")
89 private java.lang.String cert; 89 private java.lang.String cert;
90 /**日期时间*/ 90 /**日期时间*/
91 - @Excel(name = "日期时间", width = 15, format = "yyyy-MM-dd")  
92 - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")  
93 - @DateTimeFormat(pattern="yyyy-MM-dd") 91 + @Excel(name = "日期时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
  92 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
  93 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
94 @ApiModelProperty(value = "日期时间") 94 @ApiModelProperty(value = "日期时间")
95 private java.util.Date certDate; 95 private java.util.Date certDate;
96 /**其他*/ 96 /**其他*/
@@ -98,9 +98,9 @@ public class TblTradeMeterial implements Serializable { @@ -98,9 +98,9 @@ public class TblTradeMeterial implements Serializable {
98 @ApiModelProperty(value = "其他") 98 @ApiModelProperty(value = "其他")
99 private java.lang.String other; 99 private java.lang.String other;
100 /**日期时间*/ 100 /**日期时间*/
101 - @Excel(name = "日期时间", width = 15, format = "yyyy-MM-dd")  
102 - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")  
103 - @DateTimeFormat(pattern="yyyy-MM-dd") 101 + @Excel(name = "日期时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
  102 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
  103 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
104 @ApiModelProperty(value = "日期时间") 104 @ApiModelProperty(value = "日期时间")
105 private java.util.Date otherDate; 105 private java.util.Date otherDate;
106 106