修改所有的打印,时间一律改为年月日格式

pull/1/head
a15234804788@163.com 4 years ago
parent e9c11a95d5
commit a1eb17e4fd
  1. 2
      lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/listener/TaskEventListener.java
  2. 7
      lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/CkOrderController.java
  3. 2
      lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java
  4. 4
      lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
  5. 1
      lab-service/lab-user/src/main/java/org/springblade/system/user/test/TestUserController.java

@ -855,7 +855,7 @@ public class TaskEventListener implements TaskListener, ApplicationContextAware
}
// 18.接样日期
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
if (name.equals("samplingDate")) {
try {
entrust.setSamplingDate(simpleDateFormat.parse(value));

@ -40,6 +40,7 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -301,7 +302,7 @@ public class CkOrderController extends BladeController {
LambdaQueryWrapper<ApplyOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApplyOrderDetail::getOrderId, id);
List<ApplyOrderDetail> details = applyOrderDetailService.list(queryWrapper);
SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
Long aLong = Long.valueOf(id);
//需要批量生成的map
@ -319,9 +320,9 @@ public class CkOrderController extends BladeController {
Map<String, Object> result = new HashMap<>();
result.put("applyUser", applyOrder.getApplyUser());
result.put("applyTime", applyOrder.getApplyTime());
result.put("applyTime", format.format(applyOrder.getApplyTime()));
result.put("approvalUser", applyOrder.getApproveUser());
result.put("approvalTime", applyOrder.getApproveTime());
result.put("approvalTime", format.format(applyOrder.getApproveTime()));
result.put("applyRemark", applyOrder.getReason());
result.put("resultList", resultList);

@ -81,7 +81,7 @@ public class ApplyServiceImpl extends BaseServiceImpl<ApplyMapper, Apply> implem
Map<String, Object> result = new HashMap<>();
// 申领人
result.put("applyUser", apply.getApplyUser());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
// 申领时间
result.put("applyTime", format.format(apply.getApplyTime()));
// 审批人

@ -3217,7 +3217,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
}
String name = userClient.userInfoById(Long.parseLong(taskBlueprint.getTaskIssuedBy())).getData().getName();
result.put("taskIssued", name);//任务下达人
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
result.put("demandCompletionTime", format.format(eTask.getDemandCompletionTime()));
result.put("simpleReceiverName", eTask.getSimpleReceiverName());
if (eTask.getSimpleReceiveTime() != null) {
@ -3406,7 +3406,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
queryWrapper.eq("set_id", simpleSet.getId());
List<Simple> list1 = simpleService.list(queryWrapper);
Entrust currEntrust = this.getById(simpleSet.getEntrustId());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
for (Simple simple : list1) {
Map<String, Object> map = new HashMap<>();

@ -32,7 +32,6 @@ public class TestUserController {
//路由key
String luYouKey = "ttlmessage";
MessagePostProcessor messagePostProcessor = new MessagePostProcessor() {
@Override
public Message postProcessMessage(Message message) throws AmqpException {

Loading…
Cancel
Save