diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java index ccca219..3efcdea 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java @@ -215,9 +215,9 @@ public class CaseEventController { if (r.getCode() == CommonConstants.SUCCESS) { caseOwnOrg = (SysOrg) r.getData(); - Date happenTime = Date.from(caseEvent.getHappenTime().atZone(ZoneId.systemDefault()).toInstant()); - ; - caseEvent.setCaseNo(caseEventService.getNewCaseCode(caseOwnOrg.getOrgCode(), happenTime)); +// Date happenTime = Date.from(caseEvent.getHappenTime().atZone(ZoneId.systemDefault()).toInstant()); + + caseEvent.setCaseNo(caseEventService.getNewCaseCode(caseOwnOrg.getOrgCode(), caseEvent.getHappenTime())); } else { return R.failed(String.format("没有找到 orgId 为 %s 的机构, 请确认案件所属机构(CaseOwnOrg)的正确性!", caseEvent.getCaseOwnOrgId())); } @@ -645,35 +645,35 @@ public class CaseEventController { //===================================================================================== // 测试, 创建 100 个案件 - @GetMapping("/create100") - public R xxx_TestCreate100() { - for (int i = 0; i < 100; i++) { - CaseEvent cj = new CaseEvent(); - cj.setId(IdWorker.get32UUID().toUpperCase()); - String ownOrgId = "520100"; - String ownOrgCode = "520100"; - cj.setHappenTime(LocalDateTime.now()); - cj.setCaseName("第" + i + "个测试案件"); - cj.setCaseType(String.format("%d", RandomUtil.randomInt(1, 6))); - //cj.setCriminalType(String.format("%d",RandomUtil.randomInt(1, 5)*1000)); - cj.setCaseArea(RandomUtil.randomNumbers(6)); - cj.setCaseAddress(RandomUtil.randomString(100)); - cj.setCaseOwnOrgId(ownOrgId); - - // 如果没有提供案件编码, 生成一个 - Date happenTime = Date.from(cj.getHappenTime().atZone(ZoneId.systemDefault()).toInstant()); - ; - cj.setCaseNo(caseEventService.getNewCaseCode(ownOrgCode, happenTime)); - - if (caseEventService.save(cj)) { - System.out.println("新增案件成功"); - } else { - System.out.println("新增案件失败"); - } - - } - return R.ok("100 of case ware Created"); - /*this is new update*/ - } +// @GetMapping("/create100") +// public R xxx_TestCreate100() { +// for (int i = 0; i < 100; i++) { +// CaseEvent cj = new CaseEvent(); +// cj.setId(IdWorker.get32UUID().toUpperCase()); +// String ownOrgId = "520100"; +// String ownOrgCode = "520100"; +// cj.setHappenTime(LocalDateTime.now()); +// cj.setCaseName("第" + i + "个测试案件"); +// cj.setCaseType(String.format("%d", RandomUtil.randomInt(1, 6))); +// //cj.setCriminalType(String.format("%d",RandomUtil.randomInt(1, 5)*1000)); +// cj.setCaseArea(RandomUtil.randomNumbers(6)); +// cj.setCaseAddress(RandomUtil.randomString(100)); +// cj.setCaseOwnOrgId(ownOrgId); +// +// // 如果没有提供案件编码, 生成一个 +// Date happenTime = Date.from(cj.getHappenTime().atZone(ZoneId.systemDefault()).toInstant()); +// ; +// cj.setCaseNo(caseEventService.getNewCaseCode(ownOrgCode, happenTime)); +// +// if (caseEventService.save(cj)) { +// System.out.println("新增案件成功"); +// } else { +// System.out.println("新增案件失败"); +// } +// +// } +// return R.ok("100 of case ware Created"); +// /*this is new update*/ +// } } diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvent.java b/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvent.java index e323c3b..86dfae4 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvent.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvent.java @@ -7,6 +7,7 @@ import digital.laboratory.platform.common.mybatis.base.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; +import java.time.LocalDate; import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; @@ -59,7 +60,7 @@ public class CaseEvent extends BaseEntity { * 案发时间 */ @ApiModelProperty(value="案发时间") - private LocalDateTime happenTime; + private LocalDate happenTime; /** * 案发地详细地点 diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java index f2e509d..8c4c7d9 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java @@ -505,20 +505,26 @@ public class EntrustmentIdentificationMaterial extends BaseEntity { @ApiModelProperty(value = "委托检材顺序号，由系统根据录入顺序生成") private Integer orderNo; - @ApiModelProperty(value = "提取时间") - private LocalDateTime extractionTime; + /***************************** 贵阳新增需求 ***********************************************/ + /** + * 提取时间--贵阳新增需求 + */ + @ApiModelProperty(value = "提取时间--贵阳新增需求") + private LocalDateTime drawTime; - @ApiModelProperty(value = "打印提取时间") - @TableField(exist = false) - private String printExtractionTime; + /** + * 提取地点--贵阳新增需求 + */ + @ApiModelProperty(value = "提取地点--贵阳新增需求") + private String drawPlace; - @ApiModelProperty(value = "提取地点") - private String extractionSite; + /** + * 包装是否完整--贵阳新增需求 + */ + @ApiModelProperty(value = "包装是否完整--贵阳新增需求") + private Boolean packComplete; - @ApiModelProperty(value = "留存样个数") - private Integer rtSampleQuantity; - @ApiModelProperty(value = "包装是否完整") - private boolean completePackage; + /*****************************************************************************************/ public String getOrderNo1() { return this.orderNo + "号检材"; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/CaseEventService.java b/src/main/java/digital/laboratory/platform/entrustment/service/CaseEventService.java index ebcad94..3a433b4 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/CaseEventService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/CaseEventService.java @@ -8,6 +8,7 @@ import digital.laboratory.platform.entrustment.entity.CaseEvent; import digital.laboratory.platform.othersys.vo.EntrustDataVo; import digital.laboratory.platform.entrustment.vo.CaseEventVO; +import java.time.LocalDate; import java.util.Date; import java.util.List; import java.util.Map; @@ -59,7 +60,7 @@ public interface CaseEventService extends IService { * @param date * @return */ - String getNewCaseCode(String caseOwnOrgCode, Date date); + String getNewCaseCode(String caseOwnOrgCode, LocalDate date); /** * 检查案件是否有提交审核以后的委托存在 */ diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEventServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEventServiceImpl.java index 80836a1..edd3c24 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEventServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEventServiceImpl.java @@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; @@ -119,8 +120,8 @@ public class CaseEventServiceImpl extends ServiceImpl> listR = remoteOrgService.innerGetOrgList(sysOrg); if (listR.getCode() == CommonConstants.SUCCESS) { if (listR.getData().size() > 0) { - caseEvent.setCaseNo(this.getNewCaseCode(listR.getData().get(0).getOrgCode(), happenTime1)); + caseEvent.setCaseNo(this.getNewCaseCode(listR.getData().get(0).getOrgCode(), caseEvent.getHappenTime())); } else { - caseEvent.setCaseNo(this.getNewCaseCode(entrustDataVo.getCityCode(), happenTime1)); + caseEvent.setCaseNo(this.getNewCaseCode(entrustDataVo.getCityCode(), caseEvent.getHappenTime())); } } @@ -244,7 +245,7 @@ public class CaseEventServiceImpl extends ServiceImpl